diff --git a/config/logger.yaml b/config/logger.yaml
index f4a88ef4..845e34fa 100755
--- a/config/logger.yaml
+++ b/config/logger.yaml
@@ -41,7 +41,7 @@ logs:
   homeassistant.components.sensor.pi_hole: critical
   homeassistant.components.sensor.rest: info
   homeassistant.components.sensor.darksky: warn
-  homeassistant.components.tplink.switch: error
+  homeassistant.components.tplink.button: error
   homeassistant.components.unifi: error
   homeassistant.components.device_tracker.unifi: error
   homeassistant.components.switch.unifi: error
diff --git a/config/packages/skybellhd.yaml.disabled b/config/packages/skybellhd.yaml.disabled
index 6ece46a7..8ed04e68 100755
--- a/config/packages/skybellhd.yaml.disabled
+++ b/config/packages/skybellhd.yaml.disabled
@@ -31,7 +31,7 @@ sensor:
     monitored_conditions:
       - chime_level
 
-switch:
+button:
   - platform: skybell
     monitored_conditions:
 #      - do_not_disturb
diff --git a/config/packages/tplink.yaml.disabled b/config/packages/tplink.yaml.disabled
deleted file mode 100755
index afed8aa9..00000000
--- a/config/packages/tplink.yaml.disabled
+++ /dev/null
@@ -1,12 +0,0 @@
-#-------------------------------------------
-# @CCOSTAN
-# Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
-###################################
-## TPink compatible Devices - https://www.vcloudinfo.com/2018/12/how-to-waterproof-your-outdoor-smart.html
-
-TPLink no longer needed as it was moved into the UI.
-###################################
-tplink:
-#  discovery: false
-  switch:
-    - host: 192.168.10.116
diff --git a/config/packages/triggers/mqtt_screens.yaml.disabled b/config/packages/triggers/mqtt_screens.yaml.disabled
index b4536603..de1c8ed6 100755
--- a/config/packages/triggers/mqtt_screens.yaml.disabled
+++ b/config/packages/triggers/mqtt_screens.yaml.disabled
@@ -9,11 +9,9 @@ homeassistant:
       friendly_name: 'Computer Screens'
       icon: mdi:monitor-multiple
       emulated_hue_
-      
-      
-
+   
 #-------------------------------------------
-switch:
+button:
   - platform: mqtt
     name: computer_screens
     state_topic: 'carlo-ultra/monitor/all/power/state'
diff --git a/config/shell_scripts/basketball.yaml b/config/shell_scripts/basketball.yaml
index b4748059..180b1f97 100755
--- a/config/shell_scripts/basketball.yaml
+++ b/config/shell_scripts/basketball.yaml
@@ -251,7 +251,7 @@ light:
           use_random_color: true
           fade_out_rate: 50
 
-switch:
+button:
   - platform: template
     name: Basketball Status Lights
     id: bb_on_lights_off