diff --git a/flow.json b/flow.json
index 30e2f8f..7d84272 100644
--- a/flow.json
+++ b/flow.json
@@ -1 +1 @@
-[{"id":"69ee7ca9.14282c","type":"tab","label":"Flow 1","disabled":false,"info":""},{"id":"87862e4c.07f4d","type":"tab","label":"Flow 2","disabled":false,"info":""},{"id":"defeae81.bf9e88","type":"mqtt-broker","z":"","name":"Broker","broker":"172.16.2.16","port":"1883","clientid":"","usetls":false,"compatmode":true,"keepalive":"60","cleansession":true,"birthTopic":"","birthQos":"0","birthPayload":"","closeTopic":"","closeQos":"0","closePayload":"","willTopic":"","willQos":"0","willPayload":""},{"id":"f3ff988a.dc53f8","type":"alexa-smart-home-v3-conf","z":"","username":"wollud1969","mqttserver":"mq-red.cb-net.co.uk","webapiurl":"red.cb-net.co.uk"},{"id":"1a6ead56.939503","type":"amazon-echo-hub","z":"69ee7ca9.14282c","port":"80","processinput":"2","x":130,"y":120,"wires":[["b2281460.3bf8d","338758f7.e6854","fb4608af.05bca8","92c2a6c0.88c4e","e1935d85.a5b4e","8b978e39.8471d","70f09d2d.4c5c74","72be8b87.3e69ac","6ad3fb70.457974","abc32665.98e6e8","a5bff4bd.4a2d38","fdbb2288.245eb","8956ff.1f9919","11373258.f1681e","72ea4062.ffd038","c65a79f3.10d448"]]},{"id":"b2281460.3bf8d","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Nachtlicht Wolfgang","topic":"NR/Bedroom/NachtlichtWolfgang","x":460,"y":120,"wires":[["ddd23f9b.50c878"]]},{"id":"eb12b391.f466d","type":"mqtt out","z":"69ee7ca9.14282c","name":"","topic":"","qos":"","retain":"","broker":"defeae81.bf9e88","x":1250,"y":180,"wires":[]},{"id":"338758f7.e6854","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Schlummerlicht","topic":"NR/Bedroom/Schlummerlicht","x":440,"y":160,"wires":[["ddd23f9b.50c878"]]},{"id":"316ee8a.0336418","type":"debug","z":"69ee7ca9.14282c","name":"AlexaCmdDebug","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"true","targetType":"full","x":970,"y":120,"wires":[]},{"id":"ddd23f9b.50c878","type":"function","z":"69ee7ca9.14282c","name":"pass","func":"return msg;","outputs":1,"noerr":0,"x":750,"y":120,"wires":[["316ee8a.0336418","363890f3.588228"]]},{"id":"363890f3.588228","type":"function","z":"69ee7ca9.14282c","name":"JSON-Stringify whole message","func":"let inp = JSON.stringify(msg)\nmsg.payload = inp\nreturn msg;","outputs":1,"noerr":0,"x":1010,"y":180,"wires":[["eb12b391.f466d"]]},{"id":"fb4608af.05bca8","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Espressomaschine","topic":"NR/Kitchen/Espresso","x":450,"y":200,"wires":[["ddd23f9b.50c878"]]},{"id":"92c2a6c0.88c4e","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Fensterbanklicht Küche","topic":"NR/Kitchen/Fensterbanklicht","x":470,"y":240,"wires":[["ddd23f9b.50c878"]]},{"id":"e1935d85.a5b4e","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Licht Küche","topic":"NR/Kitchen/Deckenlicht","x":430,"y":280,"wires":[["ddd23f9b.50c878"]]},{"id":"8b978e39.8471d","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Schreibtischlampe","topic":"NR/Hallway/Schreibtischlicht","x":450,"y":320,"wires":[["ddd23f9b.50c878"]]},{"id":"70f09d2d.4c5c74","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Licht Wohnzimmer","topic":"NR/Livingroom/Licht","x":450,"y":360,"wires":[["ddd23f9b.50c878"]]},{"id":"72be8b87.3e69ac","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Licht Esszimmer","topic":"NR/Diningroom/Licht","x":440,"y":400,"wires":[["ddd23f9b.50c878"]]},{"id":"6ad3fb70.457974","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Licht Keller","topic":"NR/Basement/HallwayLight","x":430,"y":440,"wires":[["ddd23f9b.50c878"]]},{"id":"abc32665.98e6e8","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Licht Waschküche","topic":"NR/Basement/LaundryLight","x":450,"y":480,"wires":[["ddd23f9b.50c878"]]},{"id":"a5bff4bd.4a2d38","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Licht Werkstatt","topic":"NR/Basement/WorkshopLight","x":440,"y":520,"wires":[["ddd23f9b.50c878"]]},{"id":"fdbb2288.245eb","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Licht Studierzimmer","topic":"NR/Basement/StudyroomLight","x":460,"y":560,"wires":[["ddd23f9b.50c878"]]},{"id":"3be3b4d1.c3f67c","type":"alexa-smart-home-v3","z":"87862e4c.07f4d","conf":"f3ff988a.dc53f8","device":"4618","acknowledge":true,"name":"Heizung Wohnzimmer","topic":"NR/Livingroom/Heating","x":260,"y":200,"wires":[["5f2ae99b.d2392"]]},{"id":"5f2ae99b.d2392","type":"function","z":"87862e4c.07f4d","name":"pass","func":"return msg;","outputs":1,"noerr":0,"x":670,"y":200,"wires":[["ff707639.49b9","cf0a408d.807cb"]]},{"id":"cf0a408d.807cb","type":"function","z":"87862e4c.07f4d","name":"JSON-Stringify whole message","func":"let inp = JSON.stringify(msg)\nmsg.payload = inp\nreturn msg;","outputs":1,"noerr":0,"x":930,"y":260,"wires":[["e5daa6b2.736d58"]]},{"id":"ff707639.49b9","type":"debug","z":"87862e4c.07f4d","name":"AlexaSecondCmdDebug","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"true","targetType":"full","x":910,"y":200,"wires":[]},{"id":"e5daa6b2.736d58","type":"mqtt out","z":"87862e4c.07f4d","name":"","topic":"","qos":"","retain":"","broker":"defeae81.bf9e88","x":1170,"y":260,"wires":[]},{"id":"f4c45311.f81268","type":"alexa-smart-home-v3","z":"87862e4c.07f4d","conf":"f3ff988a.dc53f8","device":"4628","acknowledge":true,"name":"Heizung Esszimmer","topic":"NR/Diningroom/Heating","x":250,"y":260,"wires":[["5f2ae99b.d2392"]]},{"id":"9ae03571.2c871","type":"alexa-smart-home-v3","z":"87862e4c.07f4d","conf":"f3ff988a.dc53f8","device":"4629","acknowledge":true,"name":"Heizung Küche","topic":"NR/Kitchen/Heating","x":240,"y":320,"wires":[["5f2ae99b.d2392"]]},{"id":"c25508f.51381f8","type":"alexa-smart-home-v3","z":"87862e4c.07f4d","conf":"f3ff988a.dc53f8","device":"4630","acknowledge":true,"name":"Heizung Schlafzimmer","topic":"NR/Bedroom/Heating","x":260,"y":380,"wires":[["5f2ae99b.d2392"]]},{"id":"74ce9b8f.a3115c","type":"alexa-smart-home-v3","z":"87862e4c.07f4d","conf":"f3ff988a.dc53f8","device":"4631","acknowledge":true,"name":"Heizung Matthias Zimmer","topic":"NR/Matthias/Heating","x":270,"y":440,"wires":[["5f2ae99b.d2392"]]},{"id":"a1b8656e.f5257","type":"alexa-smart-home-v3","z":"87862e4c.07f4d","conf":"f3ff988a.dc53f8","device":"4632","acknowledge":true,"name":"Heizung Annas Zimmer","topic":"NR/Anna/Heating","x":260,"y":500,"wires":[["5f2ae99b.d2392"]]},{"id":"90a6eeeb.6281b8","type":"comment","z":"87862e4c.07f4d","name":"Device Configuration","info":"Configure devices here: https://red.cb-net.co.uk/devices","x":260,"y":80,"wires":[]},{"id":"8956ff.1f9919","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Tageslicht","topic":"NR/Common/Daylight","x":420,"y":600,"wires":[["ddd23f9b.50c878"]]},{"id":"11373258.f1681e","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Morgenlicht","topic":"NR/Common/Morninglight","x":430,"y":640,"wires":[["ddd23f9b.50c878"]]},{"id":"72ea4062.ffd038","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Alles","topic":"NR/Common/Everything","x":410,"y":680,"wires":[["ddd23f9b.50c878"]]},{"id":"c65a79f3.10d448","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Licht Garten","topic":"NR/Garden/Spot","x":430,"y":720,"wires":[["ddd23f9b.50c878"]]}]
\ No newline at end of file
+[{"id":"69ee7ca9.14282c","type":"tab","label":"Flow 1","disabled":false,"info":""},{"id":"87862e4c.07f4d","type":"tab","label":"Flow 2","disabled":false,"info":""},{"id":"defeae81.bf9e88","type":"mqtt-broker","z":"","name":"Broker","broker":"172.16.2.16","port":"1883","clientid":"","usetls":false,"compatmode":true,"keepalive":"60","cleansession":true,"birthTopic":"","birthQos":"0","birthPayload":"","closeTopic":"","closeQos":"0","closePayload":"","willTopic":"","willQos":"0","willPayload":""},{"id":"f3ff988a.dc53f8","type":"alexa-smart-home-v3-conf","z":"","username":"wollud1969","mqttserver":"mq-red.cb-net.co.uk","webapiurl":"red.cb-net.co.uk"},{"id":"1a6ead56.939503","type":"amazon-echo-hub","z":"69ee7ca9.14282c","port":"80","processinput":"2","x":130,"y":120,"wires":[["b2281460.3bf8d","338758f7.e6854","fb4608af.05bca8","92c2a6c0.88c4e","e1935d85.a5b4e","8b978e39.8471d","70f09d2d.4c5c74","72be8b87.3e69ac","6ad3fb70.457974","abc32665.98e6e8","a5bff4bd.4a2d38","fdbb2288.245eb","8956ff.1f9919","11373258.f1681e","72ea4062.ffd038","c65a79f3.10d448","a6e4321.5ababd","1486272c.2b0771","49148021.b95e48"]]},{"id":"b2281460.3bf8d","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Nachtlicht Wolfgang","topic":"NR/Bedroom/NachtlichtWolfgang","x":460,"y":120,"wires":[["ddd23f9b.50c878"]]},{"id":"eb12b391.f466d","type":"mqtt out","z":"69ee7ca9.14282c","name":"","topic":"","qos":"","retain":"","broker":"defeae81.bf9e88","x":1250,"y":180,"wires":[]},{"id":"338758f7.e6854","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Schlummerlicht","topic":"NR/Bedroom/Schlummerlicht","x":440,"y":160,"wires":[["ddd23f9b.50c878"]]},{"id":"316ee8a.0336418","type":"debug","z":"69ee7ca9.14282c","name":"AlexaCmdDebug","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"true","targetType":"full","x":970,"y":120,"wires":[]},{"id":"ddd23f9b.50c878","type":"function","z":"69ee7ca9.14282c","name":"pass","func":"return msg;","outputs":1,"noerr":0,"x":750,"y":120,"wires":[["316ee8a.0336418","363890f3.588228"]]},{"id":"363890f3.588228","type":"function","z":"69ee7ca9.14282c","name":"JSON-Stringify whole message","func":"let inp = JSON.stringify(msg)\nmsg.payload = inp\nreturn msg;","outputs":1,"noerr":0,"x":1010,"y":180,"wires":[["eb12b391.f466d"]]},{"id":"fb4608af.05bca8","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Espressomaschine","topic":"NR/Kitchen/Espresso","x":450,"y":200,"wires":[["ddd23f9b.50c878"]]},{"id":"92c2a6c0.88c4e","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Fensterbanklicht Küche","topic":"NR/Kitchen/Fensterbanklicht","x":470,"y":240,"wires":[["ddd23f9b.50c878"]]},{"id":"e1935d85.a5b4e","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Licht Küche","topic":"NR/Kitchen/Deckenlicht","x":430,"y":280,"wires":[["ddd23f9b.50c878"]]},{"id":"8b978e39.8471d","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Schreibtischlampe","topic":"NR/Hallway/Schreibtischlicht","x":450,"y":320,"wires":[["ddd23f9b.50c878"]]},{"id":"70f09d2d.4c5c74","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Licht Wohnzimmer","topic":"NR/Livingroom/Licht","x":450,"y":360,"wires":[["ddd23f9b.50c878"]]},{"id":"72be8b87.3e69ac","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Licht Esszimmer","topic":"NR/Diningroom/Licht","x":440,"y":400,"wires":[["ddd23f9b.50c878"]]},{"id":"6ad3fb70.457974","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Licht Keller","topic":"NR/Basement/HallwayLight","x":430,"y":440,"wires":[["ddd23f9b.50c878"]]},{"id":"abc32665.98e6e8","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Licht Waschküche","topic":"NR/Basement/LaundryLight","x":450,"y":480,"wires":[["ddd23f9b.50c878"]]},{"id":"a5bff4bd.4a2d38","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Licht Werkstatt","topic":"NR/Basement/WorkshopLight","x":440,"y":520,"wires":[["ddd23f9b.50c878"]]},{"id":"fdbb2288.245eb","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Licht Studierzimmer","topic":"NR/Basement/StudyroomLight","x":460,"y":560,"wires":[["ddd23f9b.50c878"]]},{"id":"3be3b4d1.c3f67c","type":"alexa-smart-home-v3","z":"87862e4c.07f4d","conf":"f3ff988a.dc53f8","device":"4618","acknowledge":true,"name":"Heizung Wohnzimmer","topic":"NR/Livingroom/Heating","x":260,"y":200,"wires":[["5f2ae99b.d2392"]]},{"id":"5f2ae99b.d2392","type":"function","z":"87862e4c.07f4d","name":"pass","func":"return msg;","outputs":1,"noerr":0,"x":670,"y":200,"wires":[["ff707639.49b9","cf0a408d.807cb"]]},{"id":"cf0a408d.807cb","type":"function","z":"87862e4c.07f4d","name":"JSON-Stringify whole message","func":"let inp = JSON.stringify(msg)\nmsg.payload = inp\nreturn msg;","outputs":1,"noerr":0,"x":930,"y":260,"wires":[["e5daa6b2.736d58"]]},{"id":"ff707639.49b9","type":"debug","z":"87862e4c.07f4d","name":"AlexaSecondCmdDebug","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"true","targetType":"full","x":910,"y":200,"wires":[]},{"id":"e5daa6b2.736d58","type":"mqtt out","z":"87862e4c.07f4d","name":"","topic":"","qos":"","retain":"","broker":"defeae81.bf9e88","x":1170,"y":260,"wires":[]},{"id":"f4c45311.f81268","type":"alexa-smart-home-v3","z":"87862e4c.07f4d","conf":"f3ff988a.dc53f8","device":"4628","acknowledge":true,"name":"Heizung Esszimmer","topic":"NR/Diningroom/Heating","x":250,"y":260,"wires":[["5f2ae99b.d2392"]]},{"id":"9ae03571.2c871","type":"alexa-smart-home-v3","z":"87862e4c.07f4d","conf":"f3ff988a.dc53f8","device":"4629","acknowledge":true,"name":"Heizung Küche","topic":"NR/Kitchen/Heating","x":240,"y":320,"wires":[["5f2ae99b.d2392"]]},{"id":"c25508f.51381f8","type":"alexa-smart-home-v3","z":"87862e4c.07f4d","conf":"f3ff988a.dc53f8","device":"4630","acknowledge":true,"name":"Heizung Schlafzimmer","topic":"NR/Bedroom/Heating","x":260,"y":380,"wires":[["5f2ae99b.d2392"]]},{"id":"74ce9b8f.a3115c","type":"alexa-smart-home-v3","z":"87862e4c.07f4d","conf":"f3ff988a.dc53f8","device":"4631","acknowledge":true,"name":"Heizung Matthias Zimmer","topic":"NR/Matthias/Heating","x":270,"y":440,"wires":[["5f2ae99b.d2392"]]},{"id":"a1b8656e.f5257","type":"alexa-smart-home-v3","z":"87862e4c.07f4d","conf":"f3ff988a.dc53f8","device":"4632","acknowledge":true,"name":"Heizung Annas Zimmer","topic":"NR/Anna/Heating","x":260,"y":500,"wires":[["5f2ae99b.d2392"]]},{"id":"90a6eeeb.6281b8","type":"comment","z":"87862e4c.07f4d","name":"Device Configuration","info":"Configure devices here: https://red.cb-net.co.uk/devices","x":260,"y":80,"wires":[]},{"id":"8956ff.1f9919","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Tageslicht","topic":"NR/Common/Daylight","x":420,"y":600,"wires":[["ddd23f9b.50c878"]]},{"id":"11373258.f1681e","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Morgenlicht","topic":"NR/Common/Morninglight","x":430,"y":640,"wires":[["ddd23f9b.50c878"]]},{"id":"72ea4062.ffd038","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Alles","topic":"NR/Common/Everything","x":410,"y":680,"wires":[["ddd23f9b.50c878"]]},{"id":"c65a79f3.10d448","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Licht Garten","topic":"NR/Garden/Spot","x":430,"y":720,"wires":[["ddd23f9b.50c878"]]},{"id":"a6e4321.5ababd","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Licht Terrasse","topic":"NR/Garden/Terrasse","x":440,"y":760,"wires":[["ddd23f9b.50c878"]]},{"id":"1486272c.2b0771","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Licht Schlafzimmer","topic":"NR/Bedroom/Light","x":450,"y":800,"wires":[["ddd23f9b.50c878"]]},{"id":"49148021.b95e48","type":"amazon-echo-device","z":"69ee7ca9.14282c","name":"Licht Dachboden","topic":"NR/Attic/Light","x":450,"y":840,"wires":[["ddd23f9b.50c878"]]}]
\ No newline at end of file