diff --git a/alexa/alexa_confirm.yaml b/alexa/alexa_confirm.yaml
deleted file mode 100755
index c0a06f5..0000000
--- a/alexa/alexa_confirm.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
->
-{{ [
-"OK",
-"Sure",
-"If you insist",
-"Done",
-"No worries",
-"I can do that",
-"Leave it to me",
-"Consider it done",
-"As you wish",
-"By your command",
-"Affirmative",
-"Yes oh revered one",
-"I will",
-"As you decree, so shall it be",
-"No Problem"
-] | random }} 
diff --git a/alexa/intents.yaml b/alexa/intents.yaml
deleted file mode 100755
index 3bb0c8d..0000000
--- a/alexa/intents.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-intents:
-    WhereAreWeIntent:
-      speech:
-        type: plaintext
-        text: >
-          {%- if is_state('device_tracker.owntracks_jeffreysphone', 'home') and
-                 is_state('device_tracker.katherinestonesiphone', 'home') -%}
-            You are both home
-          {%- else -%}
-            Jeff is at {{ states("device_tracker.owntracks_jeffreysphone") }}
-            and Kat is at {{ states("device_tracker.katherinestonesiphone") }}
-          {% endif %}
-
-    WhereIsJeffIntent:
-      speech:
-        type: plaintext
-        text: >
-          {%- if is_state('device_tracker.owntracks_jeffreysphone', 'home') -%}
-            It appears Jeff is here somewhere
-          {%- else -%}
-            {%- if is_state('device_tracker.owntracks_jeffreysphone', 'not_home') -%}
-              Jeff is not here
-            {%- else -%}
-              Jeff is at {{ states("device_tracker.owntracks_jeffreysphone") }}
-            {% endif %}
-          {% endif %}
-
-    WhereIsCatherineIntent:
-      speech:
-        type: plaintext
-        text: >
-          {%- if is_state('device_tracker.katherinestonesiphone', 'home') -%}
-            Kat is at home
-          {%- else -%}
-            {%- if is_state('device_tracker.katherinestonesiphone', 'not_home') -%}
-              Kat is not here
-            {%- else -%}
-              Kat is at {{ states("device_tracker.katherinestonesiphone") }}
-            {% endif %}
-          {% endif %}
\ No newline at end of file
diff --git a/automation.yaml b/automation.yaml
deleted file mode 100755
index 0623249..0000000
--- a/automation.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# General
-- !include automations/good_morning.yaml
-- !include automations/good_night.yaml
-# Sun Based
-- !include automations/sunset_outside_on.yaml
-- !include automations/sunset_inside_on.yaml
-- !include automations/sunrise_outside_off.yaml
-- !include automations/sunrise_inside_off.yaml
-# Weather Based
-- !include automations/cloudy_inside_on_home.yaml
-# Jeff
-- !include automations/jeff_home_enter.yaml
-- !include automations/jeff_home_leave.yaml
-- !include automations/jeff_status_moving.yaml
-- !include automations/jeff_status_stationary.yaml
-- !include automations/jeff_status_lost.yaml
-# Kat
-- !include automations/kat_home_enter.yaml
-- !include automations/kat_home_leave.yaml
-# Garage
-- !include automations/close_garage_at_nine.yaml
-- !include automations/close_garage_on_away.yaml
diff --git a/automations/close_garage_at_nine.yaml b/automations/close_garage_at_nine.yaml
deleted file mode 100755
index 4763547..0000000
--- a/automations/close_garage_at_nine.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-alias: "Close Garage at Nine"
-trigger:
-  platform: time
-  hours: 21
-  minutes: 00
-  seconds: 00
-condition:
-  condition: state
-  entity_id: cover.garage_door
-  state: "open"
-action:
-  - service: cover.close_cover
-    entity_id: cover.garage_door
-  - service: notify.ios_jeffreystonesiphone
-    data:
-      message: "9pm, Closing Garage Door"
diff --git a/automations/close_garage_on_away.yaml b/automations/close_garage_on_away.yaml
deleted file mode 100755
index a866411..0000000
--- a/automations/close_garage_on_away.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-alias: "Close Garage if we leave"
-trigger:
-  - platform: state
-    entity_id: group.family
-    state: "not home"
-condition:
-  - condition: state
-    entity_id: cover.garage_door
-    state: "open"
-action:
-  - service: notify.ios_jeffreystonesiphone
-    data:
-      message: "No one home, Closing Garage"
-  - service: cover.close_cover
diff --git a/automations/cloudy_inside_on_home.yaml b/automations/cloudy_inside_on_home.yaml
deleted file mode 100755
index 7bf55d1..0000000
--- a/automations/cloudy_inside_on_home.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-alias: "Cloudy, inside on if home"
-trigger:
-  platform: time
-  after: '14:00:00'
-condition:
-  - condition: numeric_state
-    entity_id: sensor.dark_sky_cloud_coverage
-    above: 90
-  - condition: state
-    entity_id: group.family
-    state: "home"
-action:
-  - service: notify.ios_jeffreystonesiphone
-    data:
-      message: "Cloudy, turning on LR Lamp"
diff --git a/automations/good_morning.yaml b/automations/good_morning.yaml
deleted file mode 100755
index cc39273..0000000
--- a/automations/good_morning.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-alias: "Good Morning"
-trigger:
-  platform: time
-  hours: 05
-  minutes: 15
-  seconds: 00
-action:
-  - service: scene.turn_on
-    entity_id: scene.livingroom_normal
-  - service: notify.ios_jeffreystonesiphone
-    data:
-      message: "Good Morning, Anchorage House is up and online."
diff --git a/automations/good_night.yaml b/automations/good_night.yaml
deleted file mode 100755
index edcff05..0000000
--- a/automations/good_night.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-alias: "Good Night"
-trigger:
-  platform: time
-  hours: 22
-  minutes: 00
-  seconds: 00
-action:
-  - service: scene.turn_on
-    entity_id: scene.livingroom_night
-  - service: notify.ios_jeffreystonesiphone
-    data:
-      message: "House shutting down for the night, Good Night"
diff --git a/automations/jeff_home_enter.yaml b/automations/jeff_home_enter.yaml
deleted file mode 100755
index 006d013..0000000
--- a/automations/jeff_home_enter.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-alias: "Jeff Arrives Home"
-trigger:
-  platform: zone
-  event: enter
-  zone: zone.home
-  entity_id: device_tracker.jeffreystonesiphone
-action:
-  - service: notify.ios_katherinestonesiphone
-    data:
-      message: "Jeff is home"
diff --git a/automations/jeff_home_leave.yaml b/automations/jeff_home_leave.yaml
deleted file mode 100755
index cc282ce..0000000
--- a/automations/jeff_home_leave.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-alias: "Jeff Leaves Home"
-trigger:
-  platform: zone
-  event: leave
-  zone: zone.home
-  entity_id: device_tracker.jeffreystonesiphone
-action:
-  - service: notify.ios_katherinestonesiphone
-    data:
-      message: "Jeff left home"
diff --git a/automations/jeff_status_lost.yaml b/automations/jeff_status_lost.yaml
deleted file mode 100755
index 1d66254..0000000
--- a/automations/jeff_status_lost.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-alias: "Jeff Status Lost"
-trigger:
-  platform: mqtt
-  topic: anchoragehouse/jeffrey/status
-  payload: 'unknown'
-action:
-  service: script.jeff_unknown
diff --git a/automations/jeff_status_moving.yaml b/automations/jeff_status_moving.yaml
deleted file mode 100755
index 1315ff5..0000000
--- a/automations/jeff_status_moving.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-alias: "Jeff Status Moving"
-trigger:
-  platform: mqtt
-  topic: anchoragehouse/jeffrey/status
-  payload: 'moving'
-action:
-  service: script.jeff_is_moving
diff --git a/automations/jeff_status_stationary.yaml b/automations/jeff_status_stationary.yaml
deleted file mode 100755
index 3a1a745..0000000
--- a/automations/jeff_status_stationary.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-alias: "Jeff Status Stationary"
-trigger:
-  platform: mqtt
-  topic: anchoragehouse/jeffrey/status
-  payload: 'stationary'
-action:
-  service: script.jeff_is_stationary
diff --git a/automations/jeff_summit_enter.yaml b/automations/jeff_summit_enter.yaml
deleted file mode 100755
index 4185d78..0000000
--- a/automations/jeff_summit_enter.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-alias: "Jeff Arrives At Summit"
-trigger:
-  platform: zone
-  event: enter
-  zone: zone.summit
-  entity_id: device_tracker.jeffreystonesiphone
-action:
-  - service: notify.ios_katherinestonesiphone
-    data:
-      message: "Jeff arrived at Summit"
diff --git a/automations/jeff_summit_leave.yaml b/automations/jeff_summit_leave.yaml
deleted file mode 100755
index 87024e9..0000000
--- a/automations/jeff_summit_leave.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-alias: "Jeff Leaves Summit"
-trigger:
-  platform: zone
-  event: leave
-  zone: zone.summit
-  entity_id: device_tracker.jeffreystonesiphone
-action:
-  - service: notify.ios_katherinestonesiphone
-    data:
-      message: "Jeff left summit"
diff --git a/automations/kat_home_enter.yaml b/automations/kat_home_enter.yaml
deleted file mode 100755
index 430d2ce..0000000
--- a/automations/kat_home_enter.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-alias: "Kat Arrives Home"
-trigger:
-  platform: zone
-  event: enter
-  zone: zone.home
-  entity_id: device_tracker.katherinestonesiphone
-action:
-  - service: notify.ios_jeffreystonesiphone
-    data:
-      message: "Kat is home"
diff --git a/automations/kat_home_leave.yaml b/automations/kat_home_leave.yaml
deleted file mode 100755
index 22ec5d8..0000000
--- a/automations/kat_home_leave.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-alias: "Kat Leaves Home"
-trigger:
-  platform: zone
-  event: leave
-  zone: zone.home
-  entity_id: device_tracker.katherinestonesiphone
-action:
-  - service: notify.ios_jeffreystonesiphone
-    data:
-      message: "Kat left home"
diff --git a/automations/sunrise_inside_off.yaml b/automations/sunrise_inside_off.yaml
deleted file mode 100755
index ea9fb15..0000000
--- a/automations/sunrise_inside_off.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-alias: "Sunrise Inside off"
-trigger:
-  platform: time
-  hours: 07
-  minutes: 00
-  seconds: 00
-action:
-  service: script.inside_all_off
diff --git a/automations/sunrise_outside_off.yaml b/automations/sunrise_outside_off.yaml
deleted file mode 100755
index c8af16c..0000000
--- a/automations/sunrise_outside_off.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-alias: "Sunrise Outside off"
-trigger:
-  platform: sun
-  event: sunrise
-action:
-  - service: script.outside_all_off
diff --git a/automations/sunset_inside_on.yaml b/automations/sunset_inside_on.yaml
deleted file mode 100755
index 7c676ef..0000000
--- a/automations/sunset_inside_on.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-alias: "Sunset Inside on"
-trigger:
-  platform: sun
-  event: sunset
-  offset: "-01:00:00"
-action:
-  service: script.inside_all_on
\ No newline at end of file
diff --git a/automations/sunset_outside_on.yaml b/automations/sunset_outside_on.yaml
deleted file mode 100755
index 6cdbb50..0000000
--- a/automations/sunset_outside_on.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-alias: "Sunset Outside on"
-trigger:
-  platform: sun
-  event: sunset
-  offset: "-00:30:00"
-action:
-  service: script.outside_all_on
\ No newline at end of file
diff --git a/automations/test.yaml b/automations/test.yaml
deleted file mode 100755
index f0cd003..0000000
--- a/automations/test.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-alias: test
-trigger:
-  platform: time
-  minutes: 10
-  seconds: 00
-action:
-  service: notify.ios_jeffreystonesiphone
-  data:
-    message: "Test Alert"
-    data:
-      message: "Test Alert"
-      subtitle: "Just a test"
diff --git a/configuration.yaml b/configuration.yaml
old mode 100755
new mode 100644
diff --git a/customize.yaml b/customize.yaml
old mode 100755
new mode 100644
diff --git a/groups.yaml b/groups.yaml
old mode 100755
new mode 100644
diff --git a/input_select.yaml b/input_select.yaml
old mode 100755
new mode 100644
diff --git a/lights/living_room.yaml b/lights/living_room.yaml
old mode 100755
new mode 100644
diff --git a/scenes.yaml b/scenes.yaml
old mode 100755
new mode 100644
diff --git a/scripts.yaml b/scripts.yaml
deleted file mode 100755
index 08d3962..0000000
--- a/scripts.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-refresh_devices: !include scripts/refresh_devices.yaml
-inside_all_on: !include scripts/inside_all_on.yaml
-outside_all_on: !include scripts/outside_all_on.yaml
-inside_all_off: !include scripts/inside_all_off.yaml
-outside_all_off: !include scripts/outside_all_off.yaml
-jeff_is_moving: !include scripts/jeff_is_moving.yaml
-jeff_is_stationary: !include scripts/jeff_is_stationary.yaml
-jeff_unknown: !include scripts/jeff_unknown.yaml
diff --git a/scripts/inside_all_off.yaml b/scripts/inside_all_off.yaml
old mode 100755
new mode 100644
diff --git a/scripts/inside_all_on.yaml b/scripts/inside_all_on.yaml
old mode 100755
new mode 100644
diff --git a/scripts/jeff_is_moving.yaml b/scripts/jeff_is_moving.yaml
old mode 100755
new mode 100644
diff --git a/scripts/jeff_is_stationary.yaml b/scripts/jeff_is_stationary.yaml
old mode 100755
new mode 100644
diff --git a/scripts/jeff_unknown.yaml b/scripts/jeff_unknown.yaml
deleted file mode 100755
index 8421b59..0000000
--- a/scripts/jeff_unknown.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-sequence:
-- event: LOGBOOK_ENTRY
-  event_data:
-    name: EVENT
-    message: "Jeff Status Unknown"
-- service: input_select.select_option
-  data:
-    entity_id: input_select.jeff_status
-    option: unknown
diff --git a/scripts/outside_all_off.yaml b/scripts/outside_all_off.yaml
old mode 100755
new mode 100644
diff --git a/scripts/outside_all_on.yaml b/scripts/outside_all_on.yaml
old mode 100755
new mode 100644
diff --git a/scripts/refresh_devices.yaml b/scripts/refresh_devices.yaml
deleted file mode 100755
index 09f16f7..0000000
--- a/scripts/refresh_devices.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-sequence:
-- service: mqtt.publish
-  data:
-    topic: "owntracks/owntracks/jeffreysphone/cmd"
-    payload_template: '{"_type":"cmd","action":"reportLocation"}'
diff --git a/sensors/devices.yaml b/sensors/devices.yaml
old mode 100755
new mode 100644
diff --git a/sensors/google_travel_time.yaml b/sensors/google_travel_time.yaml
old mode 100755
new mode 100644
diff --git a/sensors/owntracks.yaml b/sensors/owntracks.yaml
old mode 100755
new mode 100644
diff --git a/sensors/smartthings.yaml b/sensors/smartthings.yaml
deleted file mode 100755
index be8de51..0000000
--- a/sensors/smartthings.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-- platform: template
-  sensors:
-    garage_door:
-      unit_of_measurement: ''
-      value_template: >-
-          {%- if is_state("cover.garage_door", "open") %}
-                Open
-            {%  elif is_state("cover.garage_door", "opening") %}
-                Opening
-            {% elif is_state("cover.garage_door", "closed") %}
-                Closed
-            {% elif is_state("cover.garage_door", "closing") %}
-                Closing
-            {% else %}
-                Unknown
-            {%- endif %}
-      icon_template: >-
-        {%- if is_state("cover.garage_door", "closed") %}
-          mdi:garage
-        {%- elif is_state("cover.garage_door", "open") %}
-          mdi:garage-open
-        {% else %}
-          mdi:sync-alert
-        {%- endif %}
diff --git a/sensors/speedtest.yaml b/sensors/speedtest.yaml
old mode 100755
new mode 100644
diff --git a/sensors/weather.yaml b/sensors/weather.yaml
old mode 100755
new mode 100644
diff --git a/sensors/wunderground.yaml b/sensors/wunderground.yaml
old mode 100755
new mode 100644
diff --git a/switches/garage.yaml b/switches/garage.yaml
deleted file mode 100755
index 8b13789..0000000
--- a/switches/garage.yaml
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/switches/living_room.yaml b/switches/living_room.yaml
old mode 100755
new mode 100644
diff --git a/switches/outside.yaml b/switches/outside.yaml
old mode 100755
new mode 100644