diff --git a/node_red_diele_nachtbeleuchtung.json b/node_red_diele_nachtbeleuchtung.json
index a4251d8..90a5473 100644
--- a/node_red_diele_nachtbeleuchtung.json
+++ b/node_red_diele_nachtbeleuchtung.json
@@ -17,12 +17,14 @@
             "43d024d394d94663",
             "00b3ef7322366374",
             "87806c641c86c3d9",
-            "14c3a212afc4cd78"
+            "14c3a212afc4cd78",
+            "7e7074a18d177e16",
+            "38767c1f739f3c8d"
         ],
         "x": 14,
-        "y": 419,
+        "y": 399,
         "w": 1412,
-        "h": 142
+        "h": 222
     },
     {
         "id": "ec44baea08cc2923",
@@ -76,11 +78,12 @@
             }
         ],
         "x": 150,
-        "y": 500,
+        "y": 520,
         "wires": [
             [
                 "c51f9311d8d05015",
-                "00b3ef7322366374"
+                "00b3ef7322366374",
+                "38767c1f739f3c8d"
             ],
             []
         ]
@@ -126,7 +129,8 @@
         "y": 460,
         "wires": [
             [
-                "c8a63c6fa6d37a51"
+                "c8a63c6fa6d37a51",
+                "7e7074a18d177e16"
             ],
             []
         ]
@@ -135,6 +139,7 @@
         "id": "c8a63c6fa6d37a51",
         "type": "time-range-switch",
         "z": "a1055886e0cbd337",
+        "d": true,
         "g": "23b8f90b282ac8a2",
         "name": "Nur Nachts 20-8",
         "lat": "51.2115333",
@@ -144,7 +149,7 @@
         "startOffset": 0,
         "endOffset": 0,
         "x": 800,
-        "y": 460,
+        "y": 480,
         "wires": [
             [
                 "5b5ec57984037a5c"
@@ -180,7 +185,7 @@
         "domain": "light",
         "service": "turn_on",
         "x": 1270,
-        "y": 460,
+        "y": 480,
         "wires": [
             []
         ]
@@ -213,7 +218,7 @@
         "domain": "light",
         "service": "turn_off",
         "x": 1270,
-        "y": 520,
+        "y": 540,
         "wires": [
             []
         ]
@@ -237,7 +242,7 @@
         "allowrate": false,
         "outputs": 1,
         "x": 1020,
-        "y": 520,
+        "y": 540,
         "wires": [
             [
                 "f0c5e4339b494c3a"
@@ -248,6 +253,7 @@
         "id": "00b3ef7322366374",
         "type": "time-range-switch",
         "z": "a1055886e0cbd337",
+        "d": true,
         "g": "23b8f90b282ac8a2",
         "name": "Nur Nachts 20-8",
         "lat": "51.2115333",
@@ -257,7 +263,7 @@
         "startOffset": 0,
         "endOffset": 0,
         "x": 380,
-        "y": 520,
+        "y": 540,
         "wires": [
             [
                 "87806c641c86c3d9"
@@ -277,7 +283,7 @@
         "halt_if": "0",
         "halt_if_type": "num",
         "halt_if_compare": "gt",
-        "entity_id": "input_number.diele_timer_nachtlicht",
+        "entity_id": "input_number.diele_nachtlicht_timer",
         "state_type": "num",
         "blockInputOverrides": true,
         "outputProperties": [
@@ -303,7 +309,7 @@
         "entity_location": "data",
         "override_data": "msg",
         "x": 600,
-        "y": 520,
+        "y": 540,
         "wires": [
             [
                 "14c3a212afc4cd78"
@@ -325,13 +331,105 @@
         "finalize": "",
         "libs": [],
         "x": 810,
-        "y": 520,
+        "y": 540,
         "wires": [
             [
                 "43d024d394d94663"
             ]
         ]
     },
+    {
+        "id": "7e7074a18d177e16",
+        "type": "api-current-state",
+        "z": "a1055886e0cbd337",
+        "g": "23b8f90b282ac8a2",
+        "name": "Nachtlich Zeitplan",
+        "server": "387b3091.65c5",
+        "version": 3,
+        "outputs": 2,
+        "halt_if": "on",
+        "halt_if_type": "str",
+        "halt_if_compare": "is",
+        "entity_id": "schedule.diele_nachtlicht_zeitplan",
+        "state_type": "str",
+        "blockInputOverrides": true,
+        "outputProperties": [
+            {
+                "property": "payload",
+                "propertyType": "msg",
+                "value": "",
+                "valueType": "entityState"
+            },
+            {
+                "property": "data",
+                "propertyType": "msg",
+                "value": "",
+                "valueType": "entity"
+            }
+        ],
+        "for": "0",
+        "forType": "num",
+        "forUnits": "minutes",
+        "override_topic": false,
+        "state_location": "payload",
+        "override_payload": "msg",
+        "entity_location": "data",
+        "override_data": "msg",
+        "x": 790,
+        "y": 440,
+        "wires": [
+            [
+                "5b5ec57984037a5c"
+            ],
+            []
+        ]
+    },
+    {
+        "id": "38767c1f739f3c8d",
+        "type": "api-current-state",
+        "z": "a1055886e0cbd337",
+        "g": "23b8f90b282ac8a2",
+        "name": "Nachtlich Zeitplan",
+        "server": "387b3091.65c5",
+        "version": 3,
+        "outputs": 2,
+        "halt_if": "on",
+        "halt_if_type": "str",
+        "halt_if_compare": "is",
+        "entity_id": "schedule.diele_nachtlicht_zeitplan",
+        "state_type": "str",
+        "blockInputOverrides": true,
+        "outputProperties": [
+            {
+                "property": "payload",
+                "propertyType": "msg",
+                "value": "",
+                "valueType": "entityState"
+            },
+            {
+                "property": "data",
+                "propertyType": "msg",
+                "value": "",
+                "valueType": "entity"
+            }
+        ],
+        "for": "0",
+        "forType": "num",
+        "forUnits": "minutes",
+        "override_topic": false,
+        "state_location": "payload",
+        "override_payload": "msg",
+        "entity_location": "data",
+        "override_data": "msg",
+        "x": 390,
+        "y": 580,
+        "wires": [
+            [
+                "87806c641c86c3d9"
+            ],
+            []
+        ]
+    },
     {
         "id": "387b3091.65c5",
         "type": "server",