diff --git a/.gitignore b/.gitignore
index 12bd8b8..4a25428 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
 .storage*
 .log
 .db
+.1
 
diff --git a/homeassistant/configuration.yaml b/homeassistant/configuration.yaml
index b003e47..e8a8db5 100644
--- a/homeassistant/configuration.yaml
+++ b/homeassistant/configuration.yaml
@@ -14,89 +14,74 @@ scene: !include scenes.yaml
 
 #MQTT Broker for milight hub:
 mqtt:
-  broker: mqtt
-  port: 1883
-  discovery: true
-  discovery_prefix: homeassistant
+  sensor 1:
+    state_topic: 'living/sensor1'
+    name: 'Temperature'
+    unit_of_measurement: '°C'
+    value_template: '{{ value_json.temperature }}'
 
-sensor 1:
-  platform: mqtt
-  state_topic: 'living/sensor1'
-  name: 'Temperature'
-  unit_of_measurement: '°C'
-  value_template: '{{ value_json.temperature }}'
+  sensor 2:
+    state_topic: 'living/sensor1'
+    name: 'Humidity'
+    unit_of_measurement: '%'
+    value_template: '{{ value_json.humidity }}'
 
-sensor 2:
-  platform: mqtt
-  state_topic: 'living/sensor1'
-  name: 'Humidity'
-  unit_of_measurement: '%'
-  value_template: '{{ value_json.humidity }}'
+  sensor 3:
+    state_topic: 'living/sensor2'
+    name: 'Temperature 2'
+    unit_of_measurement: '°C'
+    value_template: '{{ value_json.temperature }}'
 
-sensor 3:
-  platform: mqtt
-  state_topic: 'living/sensor2'
-  name: 'Temperature 2'
-  unit_of_measurement: '°C'
-  value_template: '{{ value_json.temperature }}'
+  sensor 4:
+    state_topic: 'living/sensor2'
+    name: 'Humidity 2'
+    unit_of_measurement: '%'
+    value_template: '{{ value_json.humidity }}'
 
-sensor 4:
-  platform: mqtt
-  state_topic: 'living/sensor2'
-  name: 'Humidity 2'
-  unit_of_measurement: '%'
-  value_template: '{{ value_json.humidity }}'
-
-sensor 5:
-  platform: mqtt
-  state_topic: 'living/sensor2'
-  name: 'Humidity 3'
-  unit_of_measurement: '%'
-  value_template: '{{ value_json.soilhumidity }}'
-sensor 6:
-  platform: mqtt
-  state_topic: 'living/sensor2'
-  name: 'Battery'
-  unit_of_measurement: 'mV'
-  value_template: '{{ value_json.battery }}'
+  sensor 5:
+    state_topic: 'living/sensor2'
+    name: 'Humidity 3'
+    unit_of_measurement: '%'
+    value_template: '{{ value_json.soilhumidity }}'
+ 
+  sensor 6:
+    state_topic: 'living/sensor2'
+    name: 'Battery'
+    unit_of_measurement: 'mV'
+    value_template: '{{ value_json.battery }}'
 
 
-switch 1:
-- platform: mqtt
-  command_topic: living/plug
-  payload_on: "83029"
-  payload_off: "83028"
-  name: "Schalter 1 Schreibtisch"
+  switch 1:
+    command_topic: living/plug
+    payload_on: "83029"
+    payload_off: "83028"
+    name: "Schalter 1 Schreibtisch"
 
-switch 2:
-- platform: mqtt
-  command_topic: living/plug
-  payload_on: "86101"
-  payload_off: "86100"
-  name: "Schalter 2 HerrBert"
+  switch 2:
+    command_topic: living/plug
+    payload_on: "86101"
+    payload_off: "86100"
+    name: "Schalter 2 HerrBert"
 
 
-switch 3:
-- platform: mqtt
-  command_topic: living/plug
-  payload_on: "70741"
-  payload_off: "70740"
-  name: "Schalter 3 Schlafzimmer TV"
+  switch 3:
+    command_topic: living/plug
+    payload_on: "70741"
+    payload_off: "70740"
+    name: "Schalter 3 Schlafzimmer TV"
 
-switch 4:
-- platform: mqtt
-  command_topic: living/plug
-  payload_on: "21589"
-  payload_off: "21588"
-  name: "Steckdose 4"
+  switch 4:
+    command_topic: living/plug
+    payload_on: "21589"
+    payload_off: "21588"
+    name: "Steckdose 4"
 
-switch 5:
-- platform: mqtt
-  command_topic: greenhousino/pump
-  state_topic: greenhousino/pumpstate
-  payload_on: "90000"
-  payload_off: "off"
-  name: "Pumpe"
+  switch 5:
+    command_topic: greenhousino/pump
+    state_topic: greenhousino/pumpstate
+    payload_on: "90000"
+    payload_off: "off"
+    name: "Pumpe"
 
 # enable the recorder integration (optional)
 recorder: