diff --git a/automations/cloudy_inside_on_home.yaml b/automations/cloudy_inside_on_home.yaml
index dafd4ae..b7e10df 100644
--- a/automations/cloudy_inside_on_home.yaml
+++ b/automations/cloudy_inside_on_home.yaml
@@ -12,5 +12,4 @@ condition:
 action:
   - service: notify.notify
     data:
-      title: "It's Cloudy"
-      message: "It's Cloudy, you might need more light"
+      title: "HA: Turning on Lights - Cloudy"
diff --git a/automations/good_morning.yaml b/automations/good_morning.yaml
index 8f800f0..ec8647f 100644
--- a/automations/good_morning.yaml
+++ b/automations/good_morning.yaml
@@ -8,4 +8,4 @@ action:
     entity_id: scene.livingroom_normal
   - service: notify.notify
     data:
-      message: "Good Morning, Anchorage House is up and online."
+      title: "Good Morning, Anchorage House is up and online."
diff --git a/automations/good_night.yaml b/automations/good_night.yaml
index c0d5232..606f96b 100644
--- a/automations/good_night.yaml
+++ b/automations/good_night.yaml
@@ -9,4 +9,4 @@ action:
     entity_id: scene.livingroom_night
   - service: notify.notify
     data:
-      message: "Shutting down for the night, Good Night"
+      title: "Shutting down for the night, Good Night"
diff --git a/automations/sunrise_outside_off.yaml b/automations/sunrise_outside_off.yaml
index 3c054d2..7985e51 100644
--- a/automations/sunrise_outside_off.yaml
+++ b/automations/sunrise_outside_off.yaml
@@ -5,6 +5,6 @@ trigger:
 action:
   - service: notify.notify
     data:
-      title: 'Sun is Up!'
-      message: "Turning off Outside Lights."
-  - service: script.outside_all_off
\ No newline at end of file
+      title: 'HA: Turning Off Outside Ligts'
+      message: "Sun is up."
+  - service: script.outside_all_off
diff --git a/scripts/inside_all_off.yaml b/scripts/inside_all_off.yaml
index 4e95b2b..f071d85 100644
--- a/scripts/inside_all_off.yaml
+++ b/scripts/inside_all_off.yaml
@@ -8,4 +8,4 @@ sequence:
     entity_id: switch.tower_lamp
 - service: notify.notify
   data:
-    message: "Inside lights are off"
+    title: "HA: Inside lights are off"
diff --git a/scripts/inside_all_on.yaml b/scripts/inside_all_on.yaml
index ad62be6..8a0fc96 100644
--- a/scripts/inside_all_on.yaml
+++ b/scripts/inside_all_on.yaml
@@ -11,4 +11,4 @@ sequence:
     entity_id: scene.livingroom_normal
 - service: notify.notify
   data:
-    title: "Inside lights are on"
+    title: "HA: Inside lights are on"
diff --git a/scripts/outside_all_off.yaml b/scripts/outside_all_off.yaml
index 3037c63..52ff06b 100644
--- a/scripts/outside_all_off.yaml
+++ b/scripts/outside_all_off.yaml
@@ -17,4 +17,4 @@ sequence:
     entity_id: switch.front_porch_right
 - service: notify.notify
   data:
-    message: "Outside lights are off"
+    title: "HA: Outside lights are off"
diff --git a/scripts/outside_all_on.yaml b/scripts/outside_all_on.yaml
index 7859e23..f764498 100644
--- a/scripts/outside_all_on.yaml
+++ b/scripts/outside_all_on.yaml
@@ -17,4 +17,4 @@ sequence:
     entity_id: switch.front_porch_right
 - service: notify.notify
   data:
-    title: "Outside lights are on"
+    title: "HA: Outside lights are on"
diff --git a/switches/garage.yaml b/switches/garage.yaml
index cfe9431..8b13789 100644
--- a/switches/garage.yaml
+++ b/switches/garage.yaml
@@ -1,10 +1 @@
-- platform: mqtt
-  name: "Garage Door"
-  state_topic: 'smartthings/Garage Door/contact'
-  command_topic: 'smartthings/Garage Door/door'
-  state_open: 'open'
-  state_closed: 'closed'
-  service_open: 'open'
-  service_close: 'close'
-  retain: true
-  optimistic: true
+