diff --git a/packages/sensor/consumo_caldera.yaml b/packages/sensor/consumo_caldera.yaml
index d76d1df..d25792e 100644
--- a/packages/sensor/consumo_caldera.yaml
+++ b/packages/sensor/consumo_caldera.yaml
@@ -8,4 +8,4 @@ sensor:
     name: "Consumo Diario Calefacción"
     state_topic: "shellies/shelly4pro-061E6E/relay/2/energy"
     unit_of_measurement: "kW"
-    value_template: "{{ value | multiply(0.001) | float | round(2)}}"
+    value_template: "{{ value | multiply(0.000017) | float | round(2)}}"
diff --git a/packages/sensor/consumo_coche_electrico.yaml b/packages/sensor/consumo_coche_electrico.yaml
index 5a15204..92b05c0 100644
--- a/packages/sensor/consumo_coche_electrico.yaml
+++ b/packages/sensor/consumo_coche_electrico.yaml
@@ -8,4 +8,4 @@ sensor:
     name: "Consumo Diario Coche Eléctrico"
     state_topic: "shellies/shelly4pro-061E6E/relay/3/energy"
     unit_of_measurement: "kW"
-    value_template: "{{ value | multiply(0.001) | float | round(2)}}"
+    value_template: "{{ value | multiply(0.000017) | float | round(2)}}"
diff --git a/packages/sensor/consumo_luces.yaml b/packages/sensor/consumo_luces.yaml
index d08b135..b6c8ca3 100644
--- a/packages/sensor/consumo_luces.yaml
+++ b/packages/sensor/consumo_luces.yaml
@@ -8,4 +8,4 @@ sensor:
     name: "Consumo Diario Luces"
     state_topic: "shellies/shelly4pro-061E6E/relay/0/energy"
     unit_of_measurement: "kW"
-    value_template: "{{ value | multiply(0.001) | float | round(2)}}"
+    value_template: "{{ value | multiply(0.000017) | float | round(2)}}"
diff --git a/packages/sensor/consumo_persianas.yaml b/packages/sensor/consumo_persianas.yaml
index 22edc84..5394e2e 100644
--- a/packages/sensor/consumo_persianas.yaml
+++ b/packages/sensor/consumo_persianas.yaml
@@ -8,4 +8,4 @@ sensor:
     name: "Consumo Diario Persianas"
     state_topic: "shellies/shelly4pro-061E6E/relay/1/energy"
     unit_of_measurement: "kW"
-    value_template: "{{ value | multiply(0.001) | float | round(2)}}"
+    value_template: "{{ value | multiply(0.000017) | float | round(2)}}"
diff --git a/packages/sensor/consumo_tarificacion_general.yaml b/packages/sensor/consumo_tarificacion_general.yaml
new file mode 100644
index 0000000..bae6518
--- /dev/null
+++ b/packages/sensor/consumo_tarificacion_general.yaml
@@ -0,0 +1,35 @@
+utility_meter:
+  periodo_consumo_diario_general:
+    source: sensor.consumo_integrado_general
+    cycle: daily
+    tariffs:
+      - punta
+      - valle
+  periodo_consumo_mensual_general:
+    source: sensor.consumo_integrado_general
+    cycle: monthly
+    offset:
+      days: 1
+      hours: 0
+      minutes: 0
+    tariffs:
+      - punta
+      - valle
+
+sensor:
+  - platform: integration
+    source: sensor.consumo_general
+    name: Consumo Integrado General
+    unit_prefix: k
+    round: 2
+
+  - platform: template
+    sensors:
+      consumo_diario_general:
+        friendly_name: Consumo Diario General
+        unit_of_measurement: kWh
+        value_template: "{{ (states('sensor.periodo_consumo_diario_general_punta')|float + states('sensor.periodo_consumo_diario_general_valle')|float) |round(2) }}"
+      consumo_mensual_general:
+        friendly_name: Consumo Mensual General
+        unit_of_measurement: kWh
+        value_template: "{{ (states('sensor.periodo_consumo_mensual_general_punta')|float + states('sensor.periodo_consumo_mensual_general_valle')|float) |round(2) }}"
diff --git a/packages/sensor/consumo_tarificacion_varios_2.yaml b/packages/sensor/consumo_tarificacion_varios_2.yaml
new file mode 100644
index 0000000..3c82dc2
--- /dev/null
+++ b/packages/sensor/consumo_tarificacion_varios_2.yaml
@@ -0,0 +1,41 @@
+utility_meter:
+  periodo_consumo_diario_varios_2:
+    source: sensor.consumo_varios_2
+    cycle: daily
+    tariffs:
+      - punta
+      - valle
+  periodo_consumo_mensual_varios_2:
+    source: sensor.consumo_varios_2
+    cycle: monthly
+    offset:
+      days: 1
+      hours: 0
+      minutes: 0
+    tariffs:
+      - punta
+      - valle
+
+sensor:
+  - platform: template
+    sensors:
+      consumo_bruto_diario_varios_2:
+        friendly_name: Consumo Bruto Diario Varios 2
+        unit_of_measurement: kWh
+        value_template: "{{ states('sensor.periodo_consumo_diario_varios_2_punta')|float + states('sensor.periodo_consumo_diario_varios_2_valle')|float |round(2) }}"
+      consumo_bruto_mensual_varios_2:
+        friendly_name: Consumo Bruto Mensual Varios 2
+        unit_of_measurement: kWh
+        value_template: "{{ states('sensor.periodo_consumo_mensual_varios_2_punta')|float + states('sensor.periodo_consumo_mensual_varios_2_valle')|float |round(2) }}"
+
+  - platform: integration
+    source: sensor.consumo_bruto_diario_varios_2
+    name: Consumo Integrado Diario Varios 2
+    unit: kWh
+    round: 2
+
+  - platform: integration
+    source: sensor.consumo_bruto_mensual_varios_2
+    name: Consumo Integrado Mensual Varios 2
+    unit: kWh
+    round: 2
diff --git a/packages/sensor/consumo_varios_1.yaml b/packages/sensor/consumo_varios_1.yaml
new file mode 100644
index 0000000..9bae5f2
--- /dev/null
+++ b/packages/sensor/consumo_varios_1.yaml
@@ -0,0 +1,12 @@
+sensor:
+  - platform: template
+    sensors:
+      consumo_varios_1:
+        friendly_name: "Consumo Varios 1"
+        unit_of_measurement: 'W'
+        value_template: "{{(states('sensor.consumo_varios_1_completo')|float - states('sensor.consumo_nevera')|float)|round(2)}}"
+
+      consumo_diario_varios_1:
+        friendly_name: "Consumo Diario Varios 1"
+        unit_of_measurement: 'kW'
+        value_template: "{{(states('sensor.consumo_diario_varios_1_completo')|float - states('sensor.consumo_diario_nevera')|float)|round(2)}}"
diff --git a/packages/sensor/consumos_x_integracion.yaml b/packages/sensor/consumos_x_integracion.yaml
new file mode 100644
index 0000000..726ccf9
--- /dev/null
+++ b/packages/sensor/consumos_x_integracion.yaml
@@ -0,0 +1,69 @@
+sensor:
+  - platform: integration
+    source: sensor.consumo_varios_1
+    name: Consumo Diario Integracion Varios 1
+    round: 2
+    unit_time: d
+    unit: kW
+
+  - platform: integration
+    source: sensor.consumo_varios_2
+    name: Consumo Diario Integracion Varios 2
+    round: 2
+    unit_time: d
+    unit: kW
+
+  - platform: integration
+    source: sensor.consumo_horno
+    name: Consumo Diario Integracion Horno
+    round: 2
+    unit_time: d
+    unit: kW
+  - platform: integration
+    source: sensor.consumo_lavadora
+    name: Consumo Diario Integracion lavadora
+    round: 2
+    unit_time: d
+    unit: kW
+  - platform: integration
+    source: sensor.consumo_lavavajillas
+    name: Consumo Diario Integracion lavavajillas
+    round: 2
+    unit_time: d
+    unit: kW
+  - platform: integration
+    source: sensor.consumo_humedos
+    name: Consumo Diario Integracion Humedos
+    round: 2
+    unit_time: d
+    unit: kW
+  - platform: integration
+    source: sensor.consumo_luces
+    name: Consumo Diario Integracion luces
+    round: 2
+    unit_time: d
+    unit: kW
+  - platform: integration
+    source: sensor.consumo_calefacion
+    name: Consumo Diario Integracion calefaccion
+    round: 2
+    unit_time: d
+    unit: kW
+  - platform: integration
+    source: sensor.consumo_coche_electrico
+    name: Consumo Diario Integracion coche electrico
+    round: 2
+    unit_time: d
+    unit: kW
+  - platform: integration
+    source: sensor.consumo_persianas
+    name: Consumo Diario Integracion persianas
+    round: 2
+    unit_time: d
+    unit: kW
+  - platform: integration
+    source: sensor.consumo_nevera
+    name: Consumo Diario Integracion nevera
+    round: 2
+    unit_time: d
+    unit: kW
diff --git a/packages/sensor/energia.yaml b/packages/sensor/energia.yaml
index 32acb7f..4ca891e 100644
--- a/packages/sensor/energia.yaml
+++ b/packages/sensor/energia.yaml
@@ -8,7 +8,7 @@ sensor:
 FROM 
 ((SELECT DATE(created) as ayer, (AVG(CAST ( state AS numeric ))*12*0.082/1000) AS avr_day_0_12,0 as avr_day_12_22,0 as avr_day_22_23, 0 as avr_day_full
                 FROM states
-                WHERE entity_id = 'sensor.qubino_zmnhtdx_smart_meter_s4_s5_s6_power'
+                WHERE entity_id = 'sensor.consumo_general'
                 AND state != 'unknown'
                 AND state != ''
                 AND CAST(state AS numeric) >= 0
@@ -20,7 +20,7 @@ FROM
 UNION
 (SELECT DATE(created),0,(AVG(CAST ( state AS numeric ))*10*0.161/1000) AS avr_day_12_22,0,0
                 FROM states
-                WHERE entity_id = 'sensor.qubino_zmnhtdx_smart_meter_s4_s5_s6_power'
+                WHERE entity_id = 'sensor.consumo_general'
                 AND state != 'unknown'
                 AND state != ''
                 AND CAST(state AS numeric) >= 0
@@ -32,7 +32,7 @@ UNION
 UNION
 (SELECT DATE(created),0,0, (AVG(CAST ( state AS numeric ))*2*0.082/1000) AS avr_day_23_00, 0
                 FROM states
-                WHERE entity_id = 'sensor.qubino_zmnhtdx_smart_meter_s4_s5_s6_power'
+                WHERE entity_id = 'sensor.consumo_general'
                 AND state != 'unknown'
                 AND state != ''
                 AND CAST(state AS numeric) >= 0
@@ -44,7 +44,7 @@ UNION
 UNION
 (SELECT DATE(created),0,0,0, (AVG(CAST ( state AS numeric ))*24*0.139/1000) AS avr_day_full
                 FROM states
-                WHERE entity_id = 'sensor.qubino_zmnhtdx_smart_meter_s4_s5_s6_power'
+                WHERE entity_id = 'sensor.consumo_general'
                 AND state != 'unknown'
                 AND state != ''
                 AND CAST(state AS numeric) >= 0
@@ -60,7 +60,7 @@ group by ayer;"
       - name: Coste Ayer TSDH
         query: "SELECT DATE(created), (AVG(CAST ( state AS numeric ))*24*0.139/1000) AS total
                 FROM states
-                WHERE entity_id = 'sensor.qubino_zmnhtdx_smart_meter_s4_s5_s6_power'
+                WHERE entity_id = 'sensor.consumo_general'
                 AND state != 'unknown'
                 AND state != ''
                 AND CAST(state AS numeric) >= 0