diff --git a/switch/rf_outlets.yaml b/switch/rf_outlets.yaml
index 549145ab..370edd48 100755
--- a/switch/rf_outlets.yaml
+++ b/switch/rf_outlets.yaml
@@ -2,6 +2,7 @@
 ##  Awesome [Etekcity Outlets](http://amzn.to/2efNoBP) control via RF
 ### connected to
 ## [433Mhz Transmitter and receiver](http://amzn.to/2dceNY2)
+## Migrated to http://amzn.to/2DJPfdl
 ######################################################################
 
 - platform: tplink
@@ -33,6 +34,35 @@
       command_on: 'sh8yAAcSBxMHEwcTBxIUBgcTBxMHExMGEwcTBwcTFAYHExMHBxMHEwcSBxMHEgcSEwcTBge9AAAAAAAA'
       command_off: 'skIyAAcTBxIHEgcSBxMTBgcTBxIHExQGEwYUBgcTEwcHExQGBxMHEgcTBxITBxMGBxMHEge8AAAAAAAA'
 
+    master_bathroom_accents:
+      friendly_name: "Master Bathroom Accents"
+      command_on: 'siAyAAUTEQcFExEIBhMGEwYTBhMGExEHBhMRCAYTEQgGExEHBRMFExEIEQgGEwYTEQcRBwa1AAAAAAAA'
+      command_off: 'sjsyAAYSEgcGEhIHBhIGEgYTBhMGExIHBhIRBwYSEQcGExIHBhIGEhIHEQcSBxEHBhIGEga0AAAAAAAA'
+
+    1412_2_outlet:
+      friendly_name: "1412_2 Outlet"
+      command_on: 'sjYyAAYSEgcGEhEHBhIGEgYSBhMGEhIHBhISBwYSEgcGEhIHEgcSBwYSBhIGEwYSEgcRBwa0AAAAAAAA'
+      command_off: 'siwyAAYSEQcGExEHBhIGEwYTBhMGExEHBhMRBwYTEQcGExEHEQcRBwYSBhMSBxEHBhIGEwa1AAAAAAAA'
+
+    1412_3_outlet:
+      friendly_name: "1412_3 Outlet"
+      command_on: 'siUyAAYSEgcGEhIHBhIGEgYSBhIGEhIHBhISBwYSEgYSBxIHBhIGEgYSBhIGEgYSEgcSBwa0AAAAAAAA'
+      command_off: 'smMyAAcSEgcGExIHBhIHEgcSBhIGEhIHBhISBgcSEgcSBxIHBxIGEgcSBhISBxIHBhIGEge0AAAAAAAA'
+
+    printer_outlet:
+      friendly_name: "Printer Outlet"
+      command_on: 'shkyAAcSBxIHEwcSBxITBgcSBxMHExMGBxITBgcTEwcTBxMGBxMHEgcTBxMHEgcSEwYTBge7AAAAAAAA'
+      command_off: 'slEyAAcTBxMHEwcSBxMTBwcTBxMHExMGBxMTBwcTEwcTBxMHBxMHEwcTBxMTBxMHBxMHEge7AAAAAAAA'
+
+    front_door_outlet:
+      friendly_name: "Front Door Outlet"
+      command_on: 'skYyAAcTBxMHEgcSBxMTBgcSBxIHExMHBxMTBxMHEwYHEhMGBxIHEgcTBxIHEgcSEwYTBge7AAAAAAAA'
+      command_off: 'sjwyAAcTBxIHEwcTBxMTBwcTBxIHExMGBxMTBhMGEwYHEhMGBxMHEwcTBxMTBxMGBxMGEwe7AAAAAAAA'
+
+    garage_outlet:
+      friendly_name: "Garage Outlet"
+      command_on: 'sioyAAYTEwcHExMHBxMHEwcTEwcHExMHBxMTBxMHEwcHExMHBxMGEwcTBxMHEwYTEwcTBwe/AAAAAAAA'
+      command_off: 'smQyAAcTEwcHExMHBxMGEwcTEwcHExMHBxMTBxMHEwcHExMHBhMGEwcTBhMTBxMHBxMGEwe/AAAAAAAA'
 
 # - platform: rpi_rf
 #   gpio: 17
@@ -55,7 +85,7 @@
 #
 #   # Outlet 1412_3
 # #    Living_Room_Amp:
-#     1412_3_Outlet:
+#     1412_3_outlet:
 #       protocol: 1
 #       pulselength: 186
 #       code_on: 5265155
@@ -63,7 +93,7 @@
 #       signal_repetitions: 40
 #
 # # Outlet 1412_2
-#     1412_2_Outlet:
+#     1412_2_outlet:
 #       protocol: 1
 #       pulselength: 186
 #       code_on: 5264835
@@ -71,7 +101,7 @@
 #       signal_repetitions: 40
 #
 # # # Outlet 311_5
-# #     Foyer_Outlet:
+# #     Foyer_outlet:
 # #       protocol: 1
 # #       pulselength: 186
 # #       code_on: 292099
@@ -95,7 +125,7 @@
 # #       signal_repetitions: 40
 #
 # # Outlet 311_3
-#     Printer_Outlet:
+#     Printer_outlet:
 #       protocol: 1
 #       pulselength: 186
 #       code_on: 284419
@@ -103,7 +133,7 @@
 #       signal_repetitions: 40
 #
 # # Outlet 311_4
-#     Front_Door_Outlet:
+#     Front_Door_outlet:
 #       protocol: 1
 #       pulselength: 186
 #       code_on: 285955
@@ -111,7 +141,7 @@
 #       signal_repetitions: 50
 #
 # # Outlet 304_2
-#     Living_Room_Outlet:
+#     Living_Room_outlet:
 #       protocol: 1
 #       pulselength: 186
 #       code_on: 5330371
@@ -119,7 +149,7 @@
 #       signal_repetitions: 40
 #
 # # # Outlet 304_3
-# #     Den_Outlet:
+# #     Den_outlet:
 # #       protocol: 1
 # #       pulselength: 186
 # #       code_on: 5330691
@@ -127,7 +157,7 @@
 # #       signal_repetitions: 50
 #
 # # Outlet_304_4
-#     Garage_Outlet:
+#     Garage_outlet:
 #       protocol: 1
 #       pulselength: 186
 #       code_on: 5332227