diff --git a/automations.yaml b/automations.yaml
old mode 100755
new mode 100644
index c427167..47dbcbd
--- a/automations.yaml
+++ b/automations.yaml
@@ -36,7 +36,7 @@
     service: light.turn_off
   mode: single
 - id: '1578994958446'
-  alias: Warn garage gate Open
+  alias: Garagem  - Warn gate Open
   description: ''
   trigger:
   - entity_id: cover.portao_garagem
@@ -50,7 +50,7 @@
       title: '*Portao da garagem*'
     service: notify.buttler
 - id: '1579542436595'
-  alias: warn portao garagem closed
+  alias: Garagem  - warn gate closed
   description: ''
   trigger:
   - entity_id: cover.portao_garagem
@@ -396,3 +396,38 @@
     data:
       message: Luz WC Castanho acesa
   mode: single
+- id: '1640114920854'
+  alias: Garagem  - Turn light on at night
+  description: ''
+  trigger:
+  - entity_id: cover.portao_garagem
+    from: closed
+    platform: state
+    to: open
+  condition:
+  - condition: or
+    conditions:
+    - condition: sun
+      before: sunrise
+    - condition: sun
+      after: sunset
+  action:
+  - data:
+      message: ligar luz
+      title: ligar luz temp
+    service: notify.buttler
+  - service: light.turn_on
+    target:
+      entity_id: light.luz_garagem_1
+  - delay:
+      hours: 0
+      minutes: 5
+      seconds: 0
+      milliseconds: 0
+  - service: light.turn_off
+    target:
+      entity_id: light.luz_garagem_1
+  - service: notify.buttler
+    data:
+      message: luz desligada
+  mode: single
diff --git a/configuration.yaml b/configuration.yaml
index 3def09e..ef0ec4f 100755
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -70,3 +70,8 @@ vacuum:
   - platform: xiaomi_miio
     host: !secret aleixoIP
     token: !secret aleixoToken
+
+utility_meter:
+  energy:
+    source: sensor.energy_aqua_hoje
+    cycle: hourly
diff --git a/groups.yaml b/groups.yaml
index 7a2d15e..1711d65 100755
--- a/groups.yaml
+++ b/groups.yaml
@@ -29,7 +29,7 @@
 #    icon: mdi:play-protected-content
 #    entities:
 #      - group.media
-      
+
 #  internet:
 #    name: Internet
 #    control: hidden
@@ -61,25 +61,33 @@
 #      - device_tracker.oneplus_3
 #      - device_tracker.android6b624d787f17d7a5
 
-  sisHealth:
-    name: Sistema
-    entities:
-      - sensor.cpu_speed
-      - sensor.disk_use_percent_home
-      - sensor.memory_free
-      - sensor.last_boot
-      - group.internet
+sisHealth:
+  name: Sistema
+  entities:
+    - sensor.cpu_speed
+    - sensor.disk_use_percent_home
+    - sensor.memory_free
+    - sensor.last_boot
+    - group.internet
 
-  lightsout:
-    name: Luzes Fora
-    entities:
-      - light.luz_varanda_sala
-      - light.luz_varanda_quarto_principal
-      - light.luz_hall_tras_fora
-      - light.luz_jardim_frente
-      - light.Luz_jardim_frente_lado
-  coverSala:
-    name: Estores Sala
-    entities:
-      - cover.coversaladir
-      - cover.coversalaesq
\ No newline at end of file
+lightsout:
+  name: Luzes Fora
+  entities:
+    - light.luz_varanda_sala
+    - light.luz_varanda_quarto_principal
+    - light.luz_hall_tras_fora
+    - light.luz_jardim_frente
+    - light.Luz_jardim_frente_lado
+alllights:
+  name: Todas Luzes
+  entities:
+    - light.luz_varanda_sala
+    - light.luz_varanda_quarto_principal
+    - light.luz_hall_tras_fora
+    - light.luz_jardim_frente
+    - light.Luz_jardim_frente_lado
+coverSala:
+  name: Estores Sala
+  entities:
+    - cover.coversaladir
+    - cover.coversalaesq
diff --git a/light.yaml b/light.yaml
index 6eacb9c..e1a3b19 100755
--- a/light.yaml
+++ b/light.yaml
@@ -97,12 +97,6 @@
   payload_off: "OFF"
   retain: true
 
-#  - platform: philips_ambilight
-#    name: TV Ambilight
-#    host: !secret philipstv_ip
-#    username: !secret philipstv_user
-#    password: !secret philipstv_pass
-
 - platform: mqtt
   unique_id: luz_varanda_quarto_principal
   name: "Luz Varanda Quarto Principal"
diff --git a/sensor.yaml b/sensor.yaml
index e2db0c8..5bc6046 100755
--- a/sensor.yaml
+++ b/sensor.yaml
@@ -1,82 +1,88 @@
-  - platform: cpuspeed
-  - platform: systemmonitor
-    resources:
-      - type: disk_use_percent
-        arg: /home
-      - type: memory_free
-      - type: last_boot
-  - platform: mqtt
-    name: "sensor aquario"
-    state_topic: "tele/SonoffluzAquario/SENSOR"
-    value_template: "{{ value_json['DS18B20'].Temperature }}"
-    unit_of_measurement: 'C'
-  - platform: mqtt
-    name: "Temperatura Escritorio"
-    state_topic: "tele/sonoffEscritorio/SENSOR"
-    value_template: "{{ value_json['DHT11'].Temperature }}"
-    unit_of_measurement: 'C'
-  - platform: mqtt
-    name: "Humidade Escritorio"
-    state_topic: "tele/sonoffEscritorio/SENSOR"
-    value_template: "{{ value_json['DHT11'].Humidity }}"
-    unit_of_measurement: '%'
-  - platform: mqtt
-    name: "Aquecimento Piso Amperes"
-    state_topic: "tele/soaquecepiso/SENSOR"
-    value_template: "{{ value_json['ENERGY'].Current }}"
-    unit_of_measurement: 'A'
-  - platform: mqtt
-    name: "Aquecimento Piso Watts"
-    state_topic: "tele/soaquecepiso/SENSOR"
-    value_template: "{{ value_json['ENERGY'].Power }}"
-    unit_of_measurement: 'W'
-  - platform: mqtt
-    name: "Aquecimento Piso Volts"
-    state_topic: "tele/soaquecepiso/SENSOR"
-    value_template: "{{ value_json['ENERGY'].Voltage }}"
-    unit_of_measurement: 'V'
-  - platform: mqtt
-    name: "Aquecimento Piso Watts Hoje"
-    state_topic: "tele/soaquecepiso/SENSOR"
-    value_template: "{{ value_json['ENERGY'].Today }}"
-    unit_of_measurement: 'W'  
-  - platform: mqtt
-    name: "Aquecimento Piso Watts Ontem"
-    state_topic: "tele/soaquecepiso/SENSOR"
-    value_template: "{{ value_json['ENERGY'].Yesterday }}"
-    unit_of_measurement: 'W'
-  - platform: mqtt
-    name: "Aquecimento Piso Watts Total"
-    state_topic: "tele/soaquecepiso/SENSOR"
-    value_template: "{{ value_json['ENERGY'].Total }}"
-    unit_of_measurement: 'W'
-  - platform: mqtt
-    name: "Aquecimento Agua Amperes"
-    state_topic: "tele/soaqueceagua/SENSOR"
-    value_template: "{{ value_json['ENERGY'].Current }}"
-    unit_of_measurement: 'A'
-  - platform: mqtt
-    name: "Aquecimento Agua Watts"
-    state_topic: "tele/soaqueceagua/SENSOR"
-    value_template: "{{ value_json['ENERGY'].Power }}"
-    unit_of_measurement: 'W'
-  - platform: mqtt
-    name: "Aquecimento Agua Volts"
-    state_topic: "tele/soaqueceagua/SENSOR"
-    value_template: "{{ value_json['ENERGY'].Voltage }}"
-    unit_of_measurement: 'V'
-  - platform: mqtt
-    name: "Aquecimento Agua Watts Hoje"
-    state_topic: "tele/soaqueceagua/SENSOR"
-    value_template: "{{ value_json['ENERGY'].Today }}"
-    unit_of_measurement: 'W' 
-  - platform: mqtt
-    name: "Aquecimento Agua Watts Ontem"
-    state_topic: "tele/soaqueceagua/SENSOR"
-    value_template: "{{ value_json['ENERGY'].Yesterday }}"
-    unit_of_measurement: 'W'    
-  - platform: mqtt
-    name: "Aquecimento Agua Watts Total"
-    state_topic: "tele/soaqueceagua/SENSOR"
-    value_template: "{{ value_json['ENERGY'].Total }}"
-    unit_of_measurement: 'W'
+- platform: integration
+  source: sensor.aquecimento_agua_watts_hoje
+  name: energy_aqua_hoje
+  unit_prefix: k
+  round: 2
+  method: left
+- platform: cpuspeed
+- platform: systemmonitor
+  resources:
+    - type: disk_use_percent
+      arg: /home
+    - type: memory_free
+    - type: last_boot
+- platform: mqtt
+  name: "sensor aquario"
+  state_topic: "tele/SonoffluzAquario/SENSOR"
+  value_template: "{{ value_json['DS18B20'].Temperature }}"
+  unit_of_measurement: "C"
+- platform: mqtt
+  name: "Temperatura Escritorio"
+  state_topic: "tele/sonoffEscritorio/SENSOR"
+  value_template: "{{ value_json['DHT11'].Temperature }}"
+  unit_of_measurement: "C"
+- platform: mqtt
+  name: "Humidade Escritorio"
+  state_topic: "tele/sonoffEscritorio/SENSOR"
+  value_template: "{{ value_json['DHT11'].Humidity }}"
+  unit_of_measurement: "%"
+- platform: mqtt
+  name: "Aquecimento Piso Amperes"
+  state_topic: "tele/soaquecepiso/SENSOR"
+  value_template: "{{ value_json['ENERGY'].Current }}"
+  unit_of_measurement: "A"
+- platform: mqtt
+  name: "Aquecimento Piso Watts"
+  state_topic: "tele/soaquecepiso/SENSOR"
+  value_template: "{{ value_json['ENERGY'].Power }}"
+  unit_of_measurement: "W"
+- platform: mqtt
+  name: "Aquecimento Piso Volts"
+  state_topic: "tele/soaquecepiso/SENSOR"
+  value_template: "{{ value_json['ENERGY'].Voltage }}"
+  unit_of_measurement: "V"
+- platform: mqtt
+  name: "Aquecimento Piso Watts Hoje"
+  state_topic: "tele/soaquecepiso/SENSOR"
+  value_template: "{{ value_json['ENERGY'].Today }}"
+  unit_of_measurement: "W"
+- platform: mqtt
+  name: "Aquecimento Piso Watts Ontem"
+  state_topic: "tele/soaquecepiso/SENSOR"
+  value_template: "{{ value_json['ENERGY'].Yesterday }}"
+  unit_of_measurement: "W"
+- platform: mqtt
+  name: "Aquecimento Piso Watts Total"
+  state_topic: "tele/soaquecepiso/SENSOR"
+  value_template: "{{ value_json['ENERGY'].Total }}"
+  unit_of_measurement: "W"
+- platform: mqtt
+  name: "Aquecimento Agua Amperes"
+  state_topic: "tele/soaqueceagua/SENSOR"
+  value_template: "{{ value_json['ENERGY'].Current }}"
+  unit_of_measurement: "A"
+- platform: mqtt
+  name: "Aquecimento Agua Watts"
+  state_topic: "tele/soaqueceagua/SENSOR"
+  value_template: "{{ value_json['ENERGY'].Power }}"
+  unit_of_measurement: "W"
+- platform: mqtt
+  name: "Aquecimento Agua Volts"
+  state_topic: "tele/soaqueceagua/SENSOR"
+  value_template: "{{ value_json['ENERGY'].Voltage }}"
+  unit_of_measurement: "V"
+- platform: mqtt
+  name: "Aquecimento Agua Watts Hoje"
+  state_topic: "tele/soaqueceagua/SENSOR"
+  value_template: "{{ value_json['ENERGY'].Today }}"
+  unit_of_measurement: "W"
+- platform: mqtt
+  name: "Aquecimento Agua Watts Ontem"
+  state_topic: "tele/soaqueceagua/SENSOR"
+  value_template: "{{ value_json['ENERGY'].Yesterday }}"
+  unit_of_measurement: "W"
+- platform: mqtt
+  name: "Aquecimento Agua Watts Total"
+  state_topic: "tele/soaqueceagua/SENSOR"
+  value_template: "{{ value_json['ENERGY'].Total }}"
+  unit_of_measurement: "W"