diff --git a/configuration.yaml b/configuration.yaml
index f5fa85b5..592317db 100755
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -22,6 +22,15 @@ light:
   host: 192.168.10.75
   allow_unreachable: true
 
+emulated_hue:
+  host_ip: 192.168.10.10
+#  expose_by_default: false
+  exposed_domains:
+    - group
+    - input_boolean
+    - media_player
+    - switch
+  
 ifttt:
   key: !secret ifttt_key
 
diff --git a/customize/switches.yaml b/customize/switches.yaml
new file mode 100755
index 00000000..554bc750
--- /dev/null
+++ b/customize/switches.yaml
@@ -0,0 +1,13 @@
+###################################
+##  Switches Section
+###################################
+switch.outlet_garage: 
+  friendly_name: 'Garage Outlet'
+  icon: mdi:power-plug
+switch.living_room_amp:
+  friendly_name: 'Living Room AMP'
+  icon: mdi:music-circle
+switch.bathroom_amp:
+  friendly_name: 'Bathroom AMP'
+  icon: mdi:music-circle
+
diff --git a/group/amps.yaml b/group/amps.yaml
new file mode 100755
index 00000000..9acc6a7c
--- /dev/null
+++ b/group/amps.yaml
@@ -0,0 +1,4 @@
+AMPs:
+  entities:
+    - switch.living_room_amp
+    - switch.bathroom_amp
\ No newline at end of file
diff --git a/switch/rf_outlets.yaml b/switch/rf_outlets.yaml
index 26fa0cac..416c487a 100755
--- a/switch/rf_outlets.yaml
+++ b/switch/rf_outlets.yaml
@@ -1,17 +1,20 @@
 - platform: rpi_rf
   gpio: 17
   switches:
-    Outlet_Living_Room:
+# Outlet 1
+    Living_Room_Amp:
       protocol: 1
       pulselength: 186
       code_on: 5265155
       code_off: 5265164
-    Outlet_2:
+# Outlet 2
+    Bathroom_Amp:
       protocol: 1
       pulselength: 186
       code_on: 5264835
       code_off: 5264844
-    Outlet_Garage:
+# Outlet 3
+    Garage_Outlet:
       protocol: 1
       pulselength: 186
       code_on: 5264691