diff --git a/automations.yaml b/automations.yaml
index 619c7d4..7186c76 100644
--- a/automations.yaml
+++ b/automations.yaml
@@ -211,7 +211,7 @@
   action:
   - if:
     - condition: state
-      entity_id: input_boolean.early_night_mode
+      entity_id: binary_sensor.early_night_mode
       state: 'on'
     then:
     - service: script.family_is_home_night
@@ -352,7 +352,7 @@
           state: 'on'
           alias: Is holiday mode on?
         - condition: state
-          entity_id: input_boolean.early_night_mode
+          entity_id: binary_sensor.early_night_mode
           state: 'on'
           alias: Is early night mode on?
         alias: Test conditions
diff --git a/input_boolean.yaml b/input_boolean.yaml
index fb0431a..8f41581 100644
--- a/input_boolean.yaml
+++ b/input_boolean.yaml
@@ -28,9 +28,6 @@ kallen_overnight:
 night_mode:
   name: Night Mode
   icon: mdi:lightbulb-night
-early_night_mode:
-  name: Early Night Mode
-  icon: mdi:lightbulb-night-outline
 toggle_testing:
   name: Toggle Testing
   icon: mdi:test-tube
\ No newline at end of file
diff --git a/node-red/projects/NerdFlows b/node-red/projects/NerdFlows
index 88d281f..0aaf78e 160000
--- a/node-red/projects/NerdFlows
+++ b/node-red/projects/NerdFlows
@@ -1 +1 @@
-Subproject commit 88d281f51cc5fdeacfad6ade448cad68246f457d
+Subproject commit 0aaf78e89905f33bf2d9b435d4252fa4d3273494
diff --git a/packages/climate.yaml b/packages/climate.yaml
index cb97ea8..4f03984 100644
--- a/packages/climate.yaml
+++ b/packages/climate.yaml
@@ -245,7 +245,7 @@ script:
       - choose:
         - conditions:
           - condition: state
-            entity_id: input_boolean.early_night_mode
+            entity_id: binary_sensor.early_night_mode
             state: 'on'
           sequence:
           - service: input_select.select_option
diff --git a/packages/lighting_and_scenes.yaml b/packages/lighting_and_scenes.yaml
index 9926bbc..2ab2dd1 100644
--- a/packages/lighting_and_scenes.yaml
+++ b/packages/lighting_and_scenes.yaml
@@ -386,7 +386,7 @@ automation:
         then:
         - if:
           - condition: state
-            entity_id: input_boolean.early_night_mode
+            entity_id: binary_sensor.early_night_mode
             state: 'off'
           then:
           - service: input_select.select_option
@@ -398,7 +398,7 @@ automation:
           - condition: and
             conditions:
               - condition: state
-                entity_id: input_boolean.early_night_mode
+                entity_id: binary_sensor.early_night_mode
                 state: 'on'
               - condition: state
                 entity_id: input_boolean.give_me_darkness
diff --git a/scripts.yaml b/scripts.yaml
index 50ee7c8..2cec4eb 100644
--- a/scripts.yaml
+++ b/scripts.yaml
@@ -438,7 +438,6 @@ freeze_cleanup:
     data: {}
     target:
       entity_id:
-      - input_boolean.early_night_mode
       - input_boolean.night_mode
       - input_boolean.shower_mode
   - service: switch.turn_off
diff --git a/templates/speech/welcome_home.yaml b/templates/speech/welcome_home.yaml
index 0553ba4..c0a4f25 100644
--- a/templates/speech/welcome_home.yaml
+++ b/templates/speech/welcome_home.yaml
@@ -135,7 +135,7 @@
 
     <p>
       {% if is_state('light.living_room_lights','on') %}
-        {% if is_state('input_boolean.early_night_mode','on') %}
+        {% if is_state('binary_sensor.early_night_mode','on') %}
           "Because it is getting dark, I have turned on some lights for your convenience. "
         {% else %}
           "Due to less than optimal sunlight, I have turned on some lights for your convenience. "