diff --git a/esphome/esp-garagelights.yaml b/esphome/esp-garagelights.yaml
index c4eee61..d8bce68 100644
--- a/esphome/esp-garagelights.yaml
+++ b/esphome/esp-garagelights.yaml
@@ -41,7 +41,6 @@
 #    - Accurate time is NOT needed (SNTP not required) for core operation
 #:########################################################################################:#
 
-
 #:########################################################################################:#
 # SUBSTITUTIONS: Specific device variable substitutions
 # If NOT using a secrets file, just replace these with the passwords etc (in quotes)
@@ -56,7 +55,7 @@ substitutions:
 
   # Project Naming
   project_name: "Sonoff Technologies.Sonoff Basic V1" # Project Details
-  project_version: "v2.1"  # Project V denotes release of yaml file, allowing checking of deployed vs latest version
+  project_version: "v2.1" # Project V denotes release of yaml file, allowing checking of deployed vs latest version
 
   # Passwords & Secrets (unfortunately you can't use substitutions inside secrets names)
   api_key: !secret esp-api_key
@@ -72,8 +71,8 @@ substitutions:
   mqtt_status_main_topic: !secret mqtt_status_main_topic
   mqtt_command_topic_1: "${mqtt_command_main_topic}/${mqtt_device_name_1}"
   mqtt_status_topic_1: "${mqtt_status_main_topic}/${mqtt_device_name_1}"
-  mqtt_command_ON: "ON"
-  mqtt_command_OFF: "OFF"
+  mqtt_command_ON: "On"
+  mqtt_command_OFF: "Off"
 
   # I/O Naming
   relay_1_name: "Garage Lights"
@@ -84,7 +83,6 @@ substitutions:
   log_level: "ERROR" # Define logging level: NONE, ERROR, WARN, INFO, DEBUG (Default), VERBOSE, VERY_VERBOSE
   update_interval: "60s" # update time for for general sensors etc
 
-
 #:########################################################################################:#
 # PACKAGES: Included Common Packages
 # https://esphome.io/components/packages.html
@@ -124,7 +122,6 @@ packages:
   #diag_debug: !include common/include_debug_diag_sensors.yaml
   #diag_resetcount: !include common/include_resetcount_diag_sensors.yaml
 
-
 #:########################################################################################:#
 # ESPHOME:
 # https://esphome.io/components/esphome.html
@@ -144,7 +141,6 @@ esphome:
 #      - "-fno-exceptions"       # strip C++ exceptions
 #      - "-fno-rtti"             # strip C++ RTTI
 
-
 #:########################################################################################:#
 # ESP PLATFORM AND FRAMEWORK:
 # https://esphome.io/components/esp8266.html
@@ -159,7 +155,6 @@ preferences:
 mdns:
   disabled: false
 
-
 #:########################################################################################:#
 # LOGGING:
 # https://esphome.io/components/logger.html
@@ -170,7 +165,6 @@ logger:
   #esp8266_store_log_strings_in_flash: false
   #tx_buffer_size: 64
 
-
 #:########################################################################################:#
 # SWITCH COMPONENT:
 # https://esphome.io/components/switch/
@@ -184,7 +178,6 @@ switch:
     restore_mode: RESTORE_DEFAULT_OFF
     icon: "${relay_icon}"
 
-
 #:########################################################################################:#
 # BINARY SENSORS:
 # https://esphome.io/components/binary_sensor/
@@ -228,7 +221,6 @@ binary_sensor:
           topic: "${mqtt_status_topic_1}"
           payload: "${mqtt_command_OFF}"
 
-
 #:########################################################################################:#
 # STATUS LED:
 # https://esphome.io/components/status_led.html
@@ -239,7 +231,6 @@ status_led:
     number: GPIO13
     inverted: true
 
-
 #:########################################################################################:#
 # MQTT:
 # This adds device-specific MQTT command triggers to the common MQTT configuration.
@@ -281,4 +272,4 @@ mqtt:
       - mqtt.publish:
           topic: "${mqtt_status_topic_1}"
           payload: !lambda 'return id(relay1).state ? "ON" : "OFF";'
-          #retain: true
\ No newline at end of file
+          #retain: true