diff --git a/config/lights.yaml b/config/lights.yaml
index edce21a..59aca43 100644
--- a/config/lights.yaml
+++ b/config/lights.yaml
@@ -1,46 +1 @@
-
-
-# # Outside
-# - platform: mqtt
-#   name: "Side Door Light"
-#   command_topic: "zwave2mqtt/side_door_bulb/38/1/0/set"    
-#   brightness_command_topic: "zwave2mqtt/side_door_bulb/38/1/0/set"
-#   brightness_scale: 99
-#   brightness_state_topic: "zwave2mqtt/side_door_bulb/38/1/0"
-#   on_command_type: "brightness"
-#   payload_off: '0'
-
-# # Kitchen
-
-# - platform: mqtt
-#   name: "Kitchen Cabinets"
-#   command_topic: "zwave2mqtt/kitchen_cabinets/38/1/0/set"    
-#   brightness_command_topic: "zwave2mqtt/kitchen_cabinets/38/1/0/set"
-#   brightness_scale: 99
-#   brightness_state_topic: "zwave2mqtt/kitchen_cabinets/38/1/0"
-#   on_command_type: "brightness"
-#   payload_off: '0'
-#   retain: true
-
-# - platform: mqtt
-#   name: "Kat Lamp"
-#   command_topic: "zwave2mqtt/jeff_bedside_lamp/38/1/0/set"    
-#   brightness_command_topic: "zwave2mqtt/jeff_bedside_lamp/38/1/0/set"
-#   brightness_scale: 99
-#   brightness_state_topic: "zwave2mqtt/jeff_bedside_lamp/38/1/0"
-#   on_command_type: "brightness"
-#   payload_off: '0'
-#   retain: true
-
-
-# # Theater
-
-# - platform: mqtt
-#   name: Theater Light
-#   command_topic: "zwave2mqtt/theater/38/1/0/set"    
-#   brightness_command_topic: "zwave2mqtt/theater/38/1/0/set"
-#   brightness_scale: 99
-#   brightness_state_topic: "zwave2mqtt/theater/38/1/0"
-#   on_command_type: "brightness"
-# #   payload_off: '0'
-#   retain: true
+### Not Used ##
\ No newline at end of file
diff --git a/config/packages/integrations.yaml b/config/packages/integrations.yaml
index 95f19ab..81aa470 100755
--- a/config/packages/integrations.yaml
+++ b/config/packages/integrations.yaml
@@ -83,24 +83,25 @@ wemo:
   static:
   - 192.168.7.99
 
-homekit:
-  filter:
-    include_domains:
-      - light
-    include_entities:
-      - switch.croft_fan
-      - switch.driveway_light_2
-      - switch.incense
-      - switch.livingroom_fan
-      - switch.rail_lights
-      - switch.croft_light
-      - switch.kitchen_light_strip
-      - switch.artemis
-      - switch.fireplace_lights_2
-      - switch.desk
-      - switch.forest_incense
-      - switch.front_porch_light
-      - input_boolean.house_party_protocol
-      - switch.christmas_tree
-      - switch.rainbow_light
-      - switch.garage_fan
\ No newline at end of file
+# homekit:
+#   filter:
+#     include_domains:
+#       - light
+#     include_entities:
+#       - switch.croft_fan
+#       - switch.driveway_light_2
+#       - switch.incense
+#       - switch.livingroom_fan
+#       - switch.rail_lights
+#       - switch.croft_light
+#       - switch.kitchen_light_strip
+#       - switch.artemis
+#       - switch.fireplace_lights_2
+#       - switch.desk
+#       - switch.forest_incense
+#       - switch.front_porch_light
+#       - input_boolean.house_party_protocol
+#       - switch.christmas_tree
+#       - switch.rainbow_light
+#       - switch.garage_fan
+
diff --git a/config/packages/presence.yaml b/config/packages/presence.yaml
index d446968..bfda774 100755
--- a/config/packages/presence.yaml
+++ b/config/packages/presence.yaml
@@ -67,14 +67,14 @@ sensor:
               school
             {% elif is_state('calendar.skylar_events', 'on') %}
                   {{ states.calendar.skylar_events.attributes.message }}
-            {%- elif is_state('sensor.jeff_location', 'home') and is_state('sensor.kat_location', 'home') and is_state('input_boolean.skylar_school', 'off')%}
+            {%- elif is_state('person.jeffrey', 'home') and is_state('person.katherine', 'home') and is_state('input_boolean.skylar_school', 'off')%}
               home
-            {%- elif is_state('sensor.jeff_location', 'Summit') and is_state('input_boolean.skylar_school', 'off')%}
+            {%- elif is_state('person.jeffrey', 'Summit') and is_state('input_boolean.skylar_school', 'off')%}
               {{ states.sensor.kat_location.state }}
-            {%- elif is_state('sensor.kat_location', 'ZooAtlanta') and is_state('input_boolean.skylar_school', 'off')%}
-              {{ states.sensor.jeff_location.state }}
+            {%- elif is_state('person.katherine', 'ZooAtlanta') and is_state('input_boolean.skylar_school', 'off')%}
+              {{ states.person.jeffrey.state }}
             {% else %}
-              Unknown
+              {{ states.person.skylar.state }}
             {%- endif %}
   - platform: template
     sensors:
diff --git a/config/packages/twitter.yaml b/config/packages/twitter.yaml
index 2d52852..ab87e9a 100755
--- a/config/packages/twitter.yaml
+++ b/config/packages/twitter.yaml
@@ -82,17 +82,17 @@ automation:
         data:
           who: 'thejeffreystone'
 
-  - id: tweet_recent_content_js
-    alias: Tweet Recent Content js
-    initial_state: true
-    trigger:
-    - platform: time
-      at: '13:00:00'
-    action:
-      - delay: '0{{ (range(1, 5)|random|int) }}:{{ range(0,5) | random | int }}{{ range(0,9) | random | int }}:00'
-      - service: script.twitter_recent_content
-        data:
-          who: 'thejeffreystone'
+  # - id: tweet_recent_content_js
+  #   alias: Tweet Recent Content js
+  #   initial_state: true
+  #   trigger:
+  #   - platform: time
+  #     at: '13:00:00'
+  #   action:
+  #     - delay: '0{{ (range(1, 5)|random|int) }}:{{ range(0,5) | random | int }}{{ range(0,9) | random | int }}:00'
+  #     - service: script.twitter_recent_content
+  #       data:
+  #         who: 'thejeffreystone'
 
   - id: tweet_recent_content
     alias: Tweet Recent Contents
@@ -142,20 +142,20 @@ automation:
 
   # The whole purpose of this automation is to tweet out some links to great Home Assistant content. This is not sponsored in any way.
   # I just wanted a way to give back to those I have borrowed from. Tweets ever Friday.
-  - id: tweet_some_great_content
-    alias: Tweet Some Great Content
-    initial_state: true
-    trigger:
-    - platform: time
-      at: '13:00:00'
-    condition:
-    - condition: time
-      weekday: fri
-    action:
-      - delay: '0{{ (range(1, 5)|random|int) }}:{{ range(0,5) | random | int }}{{ range(0,9) | random | int }}:00'
-      - service: script.twitter_great_content
-        data:
-          who: 'slackerlabs'
+  # - id: tweet_some_great_content
+  #   alias: Tweet Some Great Content
+  #   initial_state: true
+  #   trigger:
+  #   - platform: time
+  #     at: '13:00:00'
+  #   condition:
+  #   - condition: time
+  #     weekday: fri
+  #   action:
+  #     - delay: '0{{ (range(1, 5)|random|int) }}:{{ range(0,5) | random | int }}{{ range(0,9) | random | int }}:00'
+  #     - service: script.twitter_great_content
+  #       data:
+  #         who: 'slackerlabs'
 
   - id: bot_info
     alias: Bot Info
diff --git a/config/sensors/github.yaml b/config/sensors/github.yaml
index 5600578..f79ad20 100755
--- a/config/sensors/github.yaml
+++ b/config/sensors/github.yaml
@@ -9,5 +9,4 @@
   value_template: '{{ value_json.name }}'
   json_attributes:
   - open_issues
-  - stargazers_count
-
+  - stargazers_count
\ No newline at end of file