diff --git a/.gitignore b/.gitignore
index 606ad0d..2730274 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,6 @@
 
 # Ensure these YAML files are ignored, otherwise your secret data/credentials will leak.
 ip_bans.yaml
-secrets.yaml
\ No newline at end of file
+secrets.yaml
+zigbee2mqtt/log/*.*
+.gitignore
diff --git a/esphome/wavin9000.yaml b/esphome/wavin9000.yaml
index cb19eb3..c84b2ba 100644
--- a/esphome/wavin9000.yaml
+++ b/esphome/wavin9000.yaml
@@ -27,10 +27,12 @@
 
 captive_portal:
 
+wavinahc9000v2:
+
 packages:
   remote_package:
     url: https://github.com/dkgof/esphome_components
-    ref: main
+    ref: dev
     files: 
       - components/wavinahc9000v2/configs/basic.yaml # REQUIRED FOR WAVIN AHC 9000
       - components/wavinahc9000v2/configs/channel_01.yaml
@@ -38,7 +40,7 @@
       - components/wavinahc9000v2/configs/channel_03.yaml
       - components/wavinahc9000v2/configs/channel_04.yaml 
       - components/wavinahc9000v2/configs/channel_05.yaml 
-      - components/wavinahc9000v2/configs/channel_06.yaml 
+#      - components/wavinahc9000v2/configs/channel_06.yaml 
       - components/wavinahc9000v2/configs/channel_07.yaml 
       - components/wavinahc9000v2/configs/channel_08.yaml 
       - components/wavinahc9000v2/configs/channel_09.yaml 
@@ -75,7 +77,7 @@
   channel_03_friendly_name: "Gang"
   channel_04_friendly_name: "Niels Værelse"
   channel_05_friendly_name: "Køkken"
-  channel_06_friendly_name: "Køkken Dummy"
+#  channel_06_friendly_name: "Køkken Dummy"
   channel_07_friendly_name: "Kontor"
   channel_08_friendly_name: "Soveværelse"
   channel_09_friendly_name: "Stue"
@@ -88,9 +90,45 @@
   channel_03_id: gang
   channel_04_id: niels
   channel_05_id: kokken
-  channel_06_id: kokken_dummy
+#  channel_06_id: kokken_dummy
   channel_07_id: kontor
   channel_08_id: sove
   channel_09_id: stue
   channel_10_id: stort_bad
   channel_11_id: lille_bad
+
+ # CHANNEL Alignments (ONLY change if you have offsets in channel vs temperature. Some have reported this if using multiple strings pr. room thermostat)
+  channel_01: "0x00"
+  channel_02: "0x01"
+  channel_03: "0x02"
+  channel_04: "0x03"
+  channel_05: "0x04"
+#  channel_06: "0x05"
+  channel_07: "0x06"
+  channel_08: "0x06"
+  channel_09: "0x08"
+  channel_10: "0x09"
+  channel_11: "0x0A"
+  channel_12: "0x0B"
+  channel_13: "0x0C"
+  channel_14: "0x0D"
+  channel_15: "0x0E"
+  channel_16: "0x0F"
+
+# CHANNEL Sensor Alignments (ONLY change if you have offsets in channel vs temperature. Some have reported this if using multiple strings pr. room thermostat)
+  channel_01_sensor: "0x00"
+  channel_02_sensor: "0x01"
+  channel_03_sensor: "0x02"
+  channel_04_sensor: "0x03"
+  channel_05_sensor: "0x04"
+#  channel_06_sensor: "0x05"
+  channel_07_sensor: "0x05"
+  channel_08_sensor: "0x06"
+  channel_09_sensor: "0x07"
+  channel_10_sensor: "0x08"
+  channel_11_sensor: "0x09"
+  channel_12_sensor: "0x0A"
+  channel_13_sensor: "0x0B"
+  channel_14_sensor: "0x0C"
+  channel_15_sensor: "0x0D"
+  channel_16_sensor: "0x0E"
\ No newline at end of file
diff --git a/sensors/solcelle.yaml b/sensors/solcelle.yaml
deleted file mode 100644
index de62637..0000000
--- a/sensors/solcelle.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-- platform: mqtt
-  state_topic: "stecamonitor/solcelle"
-  name: "Solcelle produktion"
-  unique_id: solar_production
-  unit_of_measurement: "W"
-  value_template: "{{ value_json.watt }}"
-  device_class: power
-  state_class: measurement