diff --git a/schematic/KiCad/ESP8266_dual_NRF24l01_gateway.sch b/schematic/KiCad/ESP8266_dual_NRF24l01_gateway.sch
index 1ee8014..d6ea5bb 100644
--- a/schematic/KiCad/ESP8266_dual_NRF24l01_gateway.sch
+++ b/schematic/KiCad/ESP8266_dual_NRF24l01_gateway.sch
@@ -14,10 +14,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L RF_Module:ESP-12F U?
+L RF_Module:ESP-12F U5
 U 1 1 5FEB152D
 P 3050 3900
-F 0 "U?" H 3250 4750 50  0000 C CNN
+F 0 "U5" H 3250 4750 50  0000 C CNN
 F 1 "ESP-12F" H 3250 4650 50  0000 C CNN
 F 2 "RF_Module:ESP-12E" H 3050 3900 50  0001 C CNN
 F 3 "http://wiki.ai-thinker.com/_media/esp8266/esp8266_series_modules_user_manual_v1.1.pdf" H 2700 4000 50  0001 C CNN
@@ -25,10 +25,10 @@ F 3 "http://wiki.ai-thinker.com/_media/esp8266/esp8266_series_modules_user_manua
 	1    0    0    -1  
 $EndComp
 $Comp
-L Regulator_Linear:AMS1117-3.3 U?
+L Regulator_Linear:AMS1117-3.3 U1
 U 1 1 5FEB2790
 P 4000 1300
-F 0 "U?" H 4000 1542 50  0000 C CNN
+F 0 "U1" H 4000 1542 50  0000 C CNN
 F 1 "AMS1117-3.3" H 4000 1451 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-223-3_TabPin2" H 4000 1500 50  0001 C CNN
 F 3 "http://www.advanced-monolithic.com/pdf/ds1117.pdf" H 4100 1050 50  0001 C CNN
@@ -36,10 +36,10 @@ F 3 "http://www.advanced-monolithic.com/pdf/ds1117.pdf" H 4100 1050 50  0001 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C?
+L Device:C C3
 U 1 1 5FEB48F8
 P 3200 1450
-F 0 "C?" H 3315 1496 50  0000 L CNN
+F 0 "C3" H 3315 1496 50  0000 L CNN
 F 1 "0.1µF" H 3315 1405 50  0000 L CNN
 F 2 "" H 3238 1300 50  0001 C CNN
 F 3 "~" H 3200 1450 50  0001 C CNN
@@ -47,10 +47,10 @@ F 3 "~" H 3200 1450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:CP C?
+L Device:CP C4
 U 1 1 5FEB59DD
 P 4750 1450
-F 0 "C?" H 4868 1496 50  0000 L CNN
+F 0 "C4" H 4868 1496 50  0000 L CNN
 F 1 "22µF" H 4868 1405 50  0000 L CNN
 F 2 "" H 4788 1300 50  0001 C CNN
 F 3 "~" H 4750 1450 50  0001 C CNN
@@ -58,21 +58,21 @@ F 3 "~" H 4750 1450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L RF:NRF24L01_Breakout U?
+L RF:NRF24L01_Breakout U2
 U 1 1 5FEB7354
 P 7400 1800
-F 0 "U?" H 7780 1846 50  0000 L CNN
-F 1 "NRF24L01_Breakout" H 7780 1755 50  0000 L CNN
+F 0 "U2" H 7800 1800 50  0000 L CNN
+F 1 "NRF24L01_Breakout" H 7800 1700 50  0000 L CNN
 F 2 "RF_Module:nRF24L01_Breakout" H 7550 2400 50  0001 L CIN
 F 3 "http://www.nordicsemi.com/eng/content/download/2730/34105/file/nRF24L01_Product_Specification_v2_0.pdf" H 7400 1700 50  0001 C CNN
 	1    7400 1800
 	1    0    0    -1  
 $EndComp
 $Comp
-L RF:NRF24L01_Breakout U?
+L RF:NRF24L01_Breakout U3
 U 1 1 5FEB9BC2
 P 9650 1800
-F 0 "U?" H 10030 1846 50  0000 L CNN
+F 0 "U3" H 10030 1846 50  0000 L CNN
 F 1 "NRF24L01_Breakout" H 10030 1755 50  0000 L CNN
 F 2 "RF_Module:nRF24L01_Breakout" H 9800 2400 50  0001 L CIN
 F 3 "http://www.nordicsemi.com/eng/content/download/2730/34105/file/nRF24L01_Product_Specification_v2_0.pdf" H 9650 1700 50  0001 C CNN
@@ -80,10 +80,10 @@ F 3 "http://www.nordicsemi.com/eng/content/download/2730/34105/file/nRF24L01_Pro
 	1    0    0    -1  
 $EndComp
 $Comp
-L Connector:USB_B_Micro J?
+L Connector:USB_B_Micro J1
 U 1 1 5FEBBE29
 P 1500 1600
-F 0 "J?" H 1557 2067 50  0000 C CNN
+F 0 "J1" H 1557 2067 50  0000 C CNN
 F 1 "USB_B_Micro" H 1557 1976 50  0000 C CNN
 F 2 "" H 1650 1550 50  0001 C CNN
 F 3 "~" H 1650 1550 50  0001 C CNN
@@ -91,10 +91,10 @@ F 3 "~" H 1650 1550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Switch:SW_DPDT_x2 SW?
+L Switch:SW_DPDT_x2 SW1
 U 1 1 5FEC0D76
 P 2450 1400
-F 0 "SW?" H 2450 1685 50  0000 C CNN
+F 0 "SW1" H 2450 1685 50  0000 C CNN
 F 1 "SW_DPDT_x2" H 2450 1594 50  0000 C CNN
 F 2 "" H 2450 1400 50  0001 C CNN
 F 3 "~" H 2450 1400 50  0001 C CNN
@@ -103,9 +103,6 @@ F 3 "~" H 2450 1400 50  0001 C CNN
 $EndComp
 Wire Wire Line
 	1800 1400 2250 1400
-Wire Wire Line
-	2500 1300 2650 1300
-Connection ~ 2650 1300
 Wire Wire Line
 	2650 1300 3200 1300
 Wire Wire Line
@@ -125,10 +122,10 @@ Wire Wire Line
 Wire Wire Line
 	1400 2200 1400 2000
 $Comp
-L power:GND #PWR?
+L power:GND #PWR0101
 U 1 1 5FEC5E7C
 P 1450 2200
-F 0 "#PWR?" H 1450 1950 50  0001 C CNN
+F 0 "#PWR0101" H 1450 1950 50  0001 C CNN
 F 1 "GND" H 1455 2027 50  0000 C CNN
 F 2 "" H 1450 2200 50  0001 C CNN
 F 3 "" H 1450 2200 50  0001 C CNN
@@ -139,10 +136,10 @@ Connection ~ 1450 2200
 Wire Wire Line
 	1450 2200 1400 2200
 $Comp
-L power:GND #PWR?
+L power:GND #PWR0102
 U 1 1 5FEC6FBD
 P 4000 1700
-F 0 "#PWR?" H 4000 1450 50  0001 C CNN
+F 0 "#PWR0102" H 4000 1450 50  0001 C CNN
 F 1 "GND" H 4005 1527 50  0000 C CNN
 F 2 "" H 4000 1700 50  0001 C CNN
 F 3 "" H 4000 1700 50  0001 C CNN
@@ -153,10 +150,10 @@ Wire Wire Line
 	4000 1700 4000 1600
 NoConn ~ 2650 1500
 $Comp
-L Device:C C?
+L Device:C C5
 U 1 1 5FEC815D
 P 2900 2850
-F 0 "C?" H 3015 2896 50  0000 L CNN
+F 0 "C5" H 3015 2896 50  0000 L CNN
 F 1 "1µF" H 3015 2805 50  0000 L CNN
 F 2 "" H 2938 2700 50  0001 C CNN
 F 3 "~" H 2900 2850 50  0001 C CNN
@@ -164,10 +161,10 @@ F 3 "~" H 2900 2850 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR0103
 U 1 1 5FED094F
 P 3050 5150
-F 0 "#PWR?" H 3050 4900 50  0001 C CNN
+F 0 "#PWR0103" H 3050 4900 50  0001 C CNN
 F 1 "GND" H 3055 4977 50  0000 C CNN
 F 2 "" H 3050 5150 50  0001 C CNN
 F 3 "" H 3050 5150 50  0001 C CNN
@@ -175,10 +172,10 @@ F 3 "" H 3050 5150 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR?
+L power:+3.3V #PWR0104
 U 1 1 5FED2100
 P 5050 1300
-F 0 "#PWR?" H 5050 1150 50  0001 C CNN
+F 0 "#PWR0104" H 5050 1150 50  0001 C CNN
 F 1 "+3.3V" H 5065 1473 50  0000 C CNN
 F 2 "" H 5050 1300 50  0001 C CNN
 F 3 "" H 5050 1300 50  0001 C CNN
@@ -191,10 +188,10 @@ Connection ~ 4750 1300
 Wire Wire Line
 	3050 2850 3050 3100
 $Comp
-L power:GND #PWR?
+L power:GND #PWR0105
 U 1 1 5FED89F7
 P 2700 2950
-F 0 "#PWR?" H 2700 2700 50  0001 C CNN
+F 0 "#PWR0105" H 2700 2700 50  0001 C CNN
 F 1 "GND" H 2705 2777 50  0000 C CNN
 F 2 "" H 2700 2950 50  0001 C CNN
 F 3 "" H 2700 2950 50  0001 C CNN
@@ -206,10 +203,10 @@ Wire Wire Line
 Wire Wire Line
 	2700 2850 2700 2950
 $Comp
-L Switch:SW_Push SW_RST
+L Switch:SW_Push SW_RST1
 U 1 1 5FEDCAE1
 P 2300 4900
-F 0 "SW_RST" H 2300 5185 50  0000 C CNN
+F 0 "SW_RST1" H 2300 5185 50  0000 C CNN
 F 1 "SW_Push" H 2300 5094 50  0000 C CNN
 F 2 "" H 2300 5100 50  0001 C CNN
 F 3 "~" H 2300 5100 50  0001 C CNN
@@ -217,10 +214,10 @@ F 3 "~" H 2300 5100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Switch:SW_Push SW_FLASH
+L Switch:SW_Push SW_FLASH1
 U 1 1 5FEDF55D
 P 5550 4900
-F 0 "SW_FLASH" H 5550 5185 50  0000 C CNN
+F 0 "SW_FLASH1" H 5550 5185 50  0000 C CNN
 F 1 "SW_Push" H 5550 5094 50  0000 C CNN
 F 2 "" H 5550 5100 50  0001 C CNN
 F 3 "~" H 5550 5100 50  0001 C CNN
@@ -234,10 +231,10 @@ NoConn ~ 2450 4400
 NoConn ~ 2450 4300
 NoConn ~ 2450 3700
 $Comp
-L power:+3.3V #PWR?
+L power:+3.3V #PWR0106
 U 1 1 5FEE0D3D
 P 3050 2600
-F 0 "#PWR?" H 3050 2450 50  0001 C CNN
+F 0 "#PWR0106" H 3050 2450 50  0001 C CNN
 F 1 "+3.3V" H 3065 2773 50  0000 C CNN
 F 2 "" H 3050 2600 50  0001 C CNN
 F 3 "" H 3050 2600 50  0001 C CNN
@@ -248,10 +245,10 @@ Wire Wire Line
 	3050 2850 3050 2650
 Connection ~ 3050 2850
 $Comp
-L Device:R R?
+L Device:R R3
 U 1 1 5FEE1AFE
 P 2100 3150
-F 0 "R?" H 2170 3196 50  0000 L CNN
+F 0 "R3" H 2170 3196 50  0000 L CNN
 F 1 "22k" H 2170 3105 50  0000 L CNN
 F 2 "" V 2030 3150 50  0001 C CNN
 F 3 "~" H 2100 3150 50  0001 C CNN
@@ -273,10 +270,10 @@ Wire Wire Line
 	1900 3300 2100 3300
 Connection ~ 2100 3300
 $Comp
-L Device:R R?
+L Device:R R12
 U 1 1 5FEE4893
 P 1800 4900
-F 0 "R?" H 1870 4946 50  0000 L CNN
+F 0 "R12" H 1870 4946 50  0000 L CNN
 F 1 "3.9k" H 1870 4855 50  0000 L CNN
 F 2 "" V 1730 4900 50  0001 C CNN
 F 3 "~" H 1800 4900 50  0001 C CNN
@@ -297,10 +294,10 @@ ESP_RST
 Wire Wire Line
 	1450 4900 1650 4900
 $Comp
-L Device:R R?
+L Device:R R2
 U 1 1 5FEEDCF8
 P 1350 3150
-F 0 "R?" H 1420 3196 50  0000 L CNN
+F 0 "R2" H 1420 3196 50  0000 L CNN
 F 1 "10k" H 1420 3105 50  0000 L CNN
 F 2 "" V 1280 3150 50  0001 C CNN
 F 3 "~" H 1350 3150 50  0001 C CNN
@@ -317,10 +314,10 @@ Wire Wire Line
 	1350 2650 2100 2650
 Connection ~ 2100 2650
 $Comp
-L Device:R R?
+L Device:R R4
 U 1 1 5FEF01C6
 P 3850 3150
-F 0 "R?" H 3920 3196 50  0000 L CNN
+F 0 "R4" H 3920 3196 50  0000 L CNN
 F 1 "33k" H 3920 3105 50  0000 L CNN
 F 2 "" V 3780 3150 50  0001 C CNN
 F 3 "~" H 3850 3150 50  0001 C CNN
@@ -334,10 +331,10 @@ Wire Wire Line
 Wire Wire Line
 	3850 3300 3650 3300
 $Comp
-L Device:R R?
+L Device:R R13
 U 1 1 5FEF5122
 P 6050 4900
-F 0 "R?" H 6120 4946 50  0000 L CNN
+F 0 "R13" H 6120 4946 50  0000 L CNN
 F 1 "4.7k" H 6120 4855 50  0000 L CNN
 F 2 "" V 5980 4900 50  0001 C CNN
 F 3 "~" H 6050 4900 50  0001 C CNN
@@ -351,10 +348,10 @@ ESP_GPIO_0
 Wire Wire Line
 	6200 4900 6300 4900
 $Comp
-L Device:R R?
+L Device:R R9
 U 1 1 5FF007C7
 P 4900 4550
-F 0 "R?" H 4970 4596 50  0000 L CNN
+F 0 "R9" H 4970 4596 50  0000 L CNN
 F 1 "10k" H 4970 4505 50  0000 L CNN
 F 2 "" V 4830 4550 50  0001 C CNN
 F 3 "~" H 4900 4550 50  0001 C CNN
@@ -385,10 +382,10 @@ Connection ~ 3850 2650
 Wire Wire Line
 	3850 2250 3850 2350
 $Comp
-L Device:R R?
+L Device:R R1
 U 1 1 5FF084F1
 P 3850 2500
-F 0 "R?" H 3700 2450 50  0000 L CNN
+F 0 "R1" H 3700 2450 50  0000 L CNN
 F 1 "22k" H 3650 2550 50  0000 L CNN
 F 2 "" V 3780 2500 50  0001 C CNN
 F 3 "~" H 3850 2500 50  0001 C CNN
@@ -410,10 +407,10 @@ ESP_GPIO_13_MOSI
 Text GLabel 3650 4100 2    50   Input ~ 0
 ESP_GPIO_14_CLK
 $Comp
-L Device:C C?
+L Device:C C1
 U 1 1 5FF2123F
 P 7250 1050
-F 0 "C?" H 7365 1096 50  0000 L CNN
+F 0 "C1" H 7365 1096 50  0000 L CNN
 F 1 "1µF" H 7365 1005 50  0000 L CNN
 F 2 "" H 7288 900 50  0001 C CNN
 F 3 "~" H 7250 1050 50  0001 C CNN
@@ -421,10 +418,10 @@ F 3 "~" H 7250 1050 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L Device:C C?
+L Device:C C2
 U 1 1 5FF2254F
 P 9500 1050
-F 0 "C?" H 9615 1096 50  0000 L CNN
+F 0 "C2" H 9615 1096 50  0000 L CNN
 F 1 "1µF" H 9615 1005 50  0000 L CNN
 F 2 "" H 9538 900 50  0001 C CNN
 F 3 "~" H 9500 1050 50  0001 C CNN
@@ -436,10 +433,10 @@ Wire Wire Line
 Wire Wire Line
 	7400 1050 7400 1200
 $Comp
-L power:GND #PWR?
+L power:GND #PWR0107
 U 1 1 5FF2B7D0
 P 7400 2400
-F 0 "#PWR?" H 7400 2150 50  0001 C CNN
+F 0 "#PWR0107" H 7400 2150 50  0001 C CNN
 F 1 "GND" H 7405 2227 50  0000 C CNN
 F 2 "" H 7400 2400 50  0001 C CNN
 F 3 "" H 7400 2400 50  0001 C CNN
@@ -447,10 +444,10 @@ F 3 "" H 7400 2400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR0108
 U 1 1 5FF2C5B6
 P 9650 2400
-F 0 "#PWR?" H 9650 2150 50  0001 C CNN
+F 0 "#PWR0108" H 9650 2150 50  0001 C CNN
 F 1 "GND" H 9655 2227 50  0000 C CNN
 F 2 "" H 9650 2400 50  0001 C CNN
 F 3 "" H 9650 2400 50  0001 C CNN
@@ -458,10 +455,10 @@ F 3 "" H 9650 2400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR0109
 U 1 1 5FF2CD92
 P 9250 1100
-F 0 "#PWR?" H 9250 850 50  0001 C CNN
+F 0 "#PWR0109" H 9250 850 50  0001 C CNN
 F 1 "GND" H 9255 927 50  0000 C CNN
 F 2 "" H 9250 1100 50  0001 C CNN
 F 3 "" H 9250 1100 50  0001 C CNN
@@ -469,10 +466,10 @@ F 3 "" H 9250 1100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR0110
 U 1 1 5FF2D309
 P 7000 1100
-F 0 "#PWR?" H 7000 850 50  0001 C CNN
+F 0 "#PWR0110" H 7000 850 50  0001 C CNN
 F 1 "GND" H 7005 927 50  0000 C CNN
 F 2 "" H 7000 1100 50  0001 C CNN
 F 3 "" H 7000 1100 50  0001 C CNN
@@ -488,10 +485,10 @@ Wire Wire Line
 Wire Wire Line
 	7000 1050 7000 1100
 $Comp
-L power:+3.3V #PWR?
+L power:+3.3V #PWR0111
 U 1 1 5FF322E3
 P 7400 900
-F 0 "#PWR?" H 7400 750 50  0001 C CNN
+F 0 "#PWR0111" H 7400 750 50  0001 C CNN
 F 1 "+3.3V" H 7415 1073 50  0000 C CNN
 F 2 "" H 7400 900 50  0001 C CNN
 F 3 "" H 7400 900 50  0001 C CNN
@@ -499,10 +496,10 @@ F 3 "" H 7400 900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR?
+L power:+3.3V #PWR0112
 U 1 1 5FF3348C
 P 9650 1000
-F 0 "#PWR?" H 9650 850 50  0001 C CNN
+F 0 "#PWR0112" H 9650 850 50  0001 C CNN
 F 1 "+3.3V" H 9665 1173 50  0000 C CNN
 F 2 "" H 9650 1000 50  0001 C CNN
 F 3 "" H 9650 1000 50  0001 C CNN
@@ -552,10 +549,10 @@ ESP_GPIO_15
 Wire Wire Line
 	9000 2000 9150 2000
 $Comp
-L Interface_Expansion:PCF8574 U?
+L Interface_Expansion:PCF8574 U4
 U 1 1 5FF4B128
 P 6200 3700
-F 0 "U?" H 6400 4500 50  0000 C CNN
+F 0 "U4" H 6400 4500 50  0000 C CNN
 F 1 "PCF8574" H 6400 4400 50  0000 C CNN
 F 2 "" H 6200 3700 50  0001 C CNN
 F 3 "http://www.nxp.com/documents/data_sheet/PCF8574_PCF8574A.pdf" H 6200 3700 50  0001 C CNN
@@ -563,54 +560,43 @@ F 3 "http://www.nxp.com/documents/data_sheet/PCF8574_PCF8574A.pdf" H 6200 3700 5
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:LED_RGBC D?
-U 1 1 5FF4E403
-P 9650 5700
-F 0 "D?" H 9650 6197 50  0000 C CNN
-F 1 "LED_RGBC" H 9650 6106 50  0000 C CNN
-F 2 "" H 9650 5650 50  0001 C CNN
-F 3 "~" H 9650 5650 50  0001 C CNN
-	1    9650 5700
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R?
+L Device:R R10
 U 1 1 5FF530EA
-P 10150 5500
-F 0 "R?" V 9943 5500 50  0000 C CNN
-F 1 "R" V 10034 5500 50  0000 C CNN
-F 2 "" V 10080 5500 50  0001 C CNN
-F 3 "~" H 10150 5500 50  0001 C CNN
-	1    10150 5500
+P 9450 4550
+F 0 "R10" V 9350 4450 50  0000 C CNN
+F 1 "330" V 9350 4600 50  0000 C CNN
+F 2 "" V 9380 4550 50  0001 C CNN
+F 3 "~" H 9450 4550 50  0001 C CNN
+	1    9450 4550
 	0    1    1    0   
 $EndComp
 $Comp
-L Device:R R?
+L Device:R R11
 U 1 1 5FF53E00
-P 10150 5700
-F 0 "R?" V 9943 5700 50  0000 C CNN
-F 1 "R" V 10034 5700 50  0000 C CNN
-F 2 "" V 10080 5700 50  0001 C CNN
-F 3 "~" H 10150 5700 50  0001 C CNN
-	1    10150 5700
+P 9450 4750
+F 0 "R11" V 9350 4650 50  0000 C CNN
+F 1 "330" V 9350 4800 50  0000 C CNN
+F 2 "" V 9380 4750 50  0001 C CNN
+F 3 "~" H 9450 4750 50  0001 C CNN
+	1    9450 4750
 	0    1    1    0   
 $EndComp
 $Comp
-L Device:R R?
+L Device:R R14
 U 1 1 5FF540AA
-P 10150 5900
-F 0 "R?" V 9943 5900 50  0000 C CNN
-F 1 "R" V 10034 5900 50  0000 C CNN
-F 2 "" V 10080 5900 50  0001 C CNN
-F 3 "~" H 10150 5900 50  0001 C CNN
-	1    10150 5900
+P 9450 4950
+F 0 "R14" V 9350 4850 50  0000 C CNN
+F 1 "330" V 9350 5000 50  0000 C CNN
+F 2 "" V 9380 4950 50  0001 C CNN
+F 3 "~" H 9450 4950 50  0001 C CNN
+	1    9450 4950
 	0    1    1    0   
 $EndComp
 $Comp
-L Connector:Conn_01x05_Female J_FTDI
+L Connector:Conn_01x05_Female J_FTDI1
 U 1 1 5FF69E88
 P 1900 6200
-F 0 "J_FTDI" H 1928 6226 50  0000 L CNN
+F 0 "J_FTDI1" H 1928 6226 50  0000 L CNN
 F 1 "Conn_01x05_Female" H 1928 6135 50  0000 L CNN
 F 2 "" H 1900 6200 50  0001 C CNN
 F 3 "~" H 1900 6200 50  0001 C CNN
@@ -618,10 +604,10 @@ F 3 "~" H 1900 6200 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR0113
 U 1 1 5FF6D27C
 P 950 6400
-F 0 "#PWR?" H 950 6150 50  0001 C CNN
+F 0 "#PWR0113" H 950 6150 50  0001 C CNN
 F 1 "GND" H 955 6227 50  0000 C CNN
 F 2 "" H 950 6400 50  0001 C CNN
 F 3 "" H 950 6400 50  0001 C CNN
@@ -636,27 +622,15 @@ Text GLabel 1700 6100 0    50   Input ~ 0
 ESP_GPIO_3_RXD
 Text GLabel 1700 6000 0    50   Input ~ 0
 ESP_GPIO_1_TXD
-Text GLabel 7750 5100 2    50   Input ~ 0
-ESP_GPIO_4_SDA
-Text GLabel 7750 5200 2    50   Input ~ 0
-ESP_GPIO_5_SCL
-Text GLabel 7750 5300 2    50   Input ~ 0
-ESP_GPIO_3_RXD
-Text GLabel 2300 4200 0    50   Input ~ 0
-ESP_GPIO_10
-Wire Wire Line
-	2300 4200 2450 4200
-Text GLabel 7750 5400 2    50   Input ~ 0
-ESP_GPIO_10
 Text GLabel 6750 1800 0    50   Input ~ 0
 ESP_GPIO_4_SDA
 Text GLabel 9000 1800 0    50   Input ~ 0
 ESP_GPIO_5_SCL
 $Comp
-L power:GND #PWR?
+L power:GND #PWR0114
 U 1 1 5FF79CED
 P 6200 4400
-F 0 "#PWR?" H 6200 4150 50  0001 C CNN
+F 0 "#PWR0114" H 6200 4150 50  0001 C CNN
 F 1 "GND" H 6205 4227 50  0000 C CNN
 F 2 "" H 6200 4400 50  0001 C CNN
 F 3 "" H 6200 4400 50  0001 C CNN
@@ -664,10 +638,10 @@ F 3 "" H 6200 4400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C?
+L Device:C C6
 U 1 1 5FF80F5E
 P 6050 2850
-F 0 "C?" V 5900 2800 50  0000 L CNN
+F 0 "C6" V 5900 2800 50  0000 L CNN
 F 1 "1µF" V 6200 2800 50  0000 L CNN
 F 2 "" H 6088 2700 50  0001 C CNN
 F 3 "~" H 6050 2850 50  0001 C CNN
@@ -677,10 +651,10 @@ $EndComp
 Wire Wire Line
 	6200 2850 6200 3000
 $Comp
-L power:GND #PWR?
+L power:GND #PWR0115
 U 1 1 5FF80F65
 P 5650 2850
-F 0 "#PWR?" H 5650 2600 50  0001 C CNN
+F 0 "#PWR0115" H 5650 2600 50  0001 C CNN
 F 1 "GND" H 5655 2677 50  0000 C CNN
 F 2 "" H 5650 2850 50  0001 C CNN
 F 3 "" H 5650 2850 50  0001 C CNN
@@ -688,10 +662,10 @@ F 3 "" H 5650 2850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR?
+L power:+3.3V #PWR0116
 U 1 1 5FF80F6D
 P 6200 2700
-F 0 "#PWR?" H 6200 2550 50  0001 C CNN
+F 0 "#PWR0116" H 6200 2550 50  0001 C CNN
 F 1 "+3.3V" H 6215 2873 50  0000 C CNN
 F 2 "" H 6200 2700 50  0001 C CNN
 F 3 "" H 6200 2700 50  0001 C CNN
@@ -715,7 +689,7 @@ ESP_GPIO_2
 Wire Wire Line
 	4450 3300 4450 3400
 Wire Wire Line
-	4450 3400 5700 3400
+	4450 3400 4700 3400
 Wire Wire Line
 	3850 3300 4450 3300
 Wire Wire Line
@@ -732,4 +706,130 @@ Wire Wire Line
 	8900 3400 8900 2100
 Wire Wire Line
 	8900 2100 9150 2100
+$Comp
+L Device:LED_RGBA D1
+U 1 1 607ADA27
+P 9800 4750
+F 0 "D1" H 9800 5247 50  0000 C CNN
+F 1 "LED_RGBA" H 9800 5156 50  0000 C CNN
+F 2 "" H 9800 4700 50  0001 C CNN
+F 3 "~" H 9800 4700 50  0001 C CNN
+	1    9800 4750
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3.3V #PWR0117
+U 1 1 607C47BE
+P 10200 4750
+F 0 "#PWR0117" H 10200 4600 50  0001 C CNN
+F 1 "+3.3V" H 10215 4923 50  0000 C CNN
+F 2 "" H 10200 4750 50  0001 C CNN
+F 3 "" H 10200 4750 50  0001 C CNN
+	1    10200 4750
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	10000 4750 10200 4750
+Text GLabel 6700 3500 2    50   Input ~ 0
+P_2
+Text GLabel 6700 3600 2    50   Input ~ 0
+P_3
+Text GLabel 6700 3700 2    50   Input ~ 0
+P_4
+Text GLabel 9300 4550 0    50   Input ~ 0
+P_2
+Text GLabel 9300 4750 0    50   Input ~ 0
+P_3
+Text GLabel 9300 4950 0    50   Input ~ 0
+P_4
+$Comp
+L Device:R R5
+U 1 1 607D5790
+P 5400 3600
+F 0 "R5" V 5350 3750 50  0000 C CNN
+F 1 "10k" V 5400 3600 50  0000 C CNN
+F 2 "" V 5330 3600 50  0001 C CNN
+F 3 "~" H 5400 3600 50  0001 C CNN
+	1    5400 3600
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:R R6
+U 1 1 607D6F0E
+P 5400 3700
+F 0 "R6" V 5350 3850 50  0000 C CNN
+F 1 "10k" V 5400 3700 50  0000 C CNN
+F 2 "" V 5330 3700 50  0001 C CNN
+F 3 "~" H 5400 3700 50  0001 C CNN
+	1    5400 3700
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:R R7
+U 1 1 607D70C7
+P 5400 3800
+F 0 "R7" V 5350 3950 50  0000 C CNN
+F 1 "10k" V 5400 3800 50  0000 C CNN
+F 2 "" V 5330 3800 50  0001 C CNN
+F 3 "~" H 5400 3800 50  0001 C CNN
+	1    5400 3800
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	5550 3600 5700 3600
+Wire Wire Line
+	5550 3700 5700 3700
+Wire Wire Line
+	5550 3800 5700 3800
+Wire Wire Line
+	5250 3600 5250 3700
+Wire Wire Line
+	5250 3700 5250 3800
+Connection ~ 5250 3700
+$Comp
+L power:GND #PWR0118
+U 1 1 607E2A07
+P 5050 3750
+F 0 "#PWR0118" H 5050 3500 50  0001 C CNN
+F 1 "GND" H 5055 3577 50  0000 C CNN
+F 2 "" H 5050 3750 50  0001 C CNN
+F 3 "" H 5050 3750 50  0001 C CNN
+	1    5050 3750
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5050 3750 5050 3700
+Wire Wire Line
+	5050 3700 5250 3700
+Text Notes 850  7300 0    79   ~ 0
+ESP_GPIO_10 can only bes used in DIO mode /!\\n
+$Comp
+L Device:R R8
+U 1 1 607ED4ED
+P 5550 4100
+F 0 "R8" V 5650 4050 50  0000 C CNN
+F 1 "1k" V 5650 4150 50  0000 C CNN
+F 2 "" V 5480 4100 50  0001 C CNN
+F 3 "~" H 5550 4100 50  0001 C CNN
+	1    5550 4100
+	0    1    1    0   
+$EndComp
+Text GLabel 5300 4100 0    50   Input ~ 0
+ESP_GPIO_3_RXD
+Wire Wire Line
+	5300 4100 5400 4100
+NoConn ~ 6700 4000
+NoConn ~ 6700 3900
+NoConn ~ 6700 3800
+NoConn ~ 1800 1600
+NoConn ~ 1800 1700
+NoConn ~ 1800 1800
+NoConn ~ 2450 4200
+Text GLabel 4700 3200 1    50   Input ~ 0
+ESP_GPIO_0
+Wire Wire Line
+	4700 3200 4700 3400
+Connection ~ 4700 3400
+Wire Wire Line
+	4700 3400 5700 3400
 $EndSCHEMATC
diff --git a/schematic/KiCad/ESP8266_dual_NRF24l01_gateway.sch-bak b/schematic/KiCad/ESP8266_dual_NRF24l01_gateway.sch-bak
index c00127d..9fc0446 100644
--- a/schematic/KiCad/ESP8266_dual_NRF24l01_gateway.sch-bak
+++ b/schematic/KiCad/ESP8266_dual_NRF24l01_gateway.sch-bak
@@ -61,8 +61,8 @@ $Comp
 L RF:NRF24L01_Breakout U?
 U 1 1 5FEB7354
 P 7400 1800
-F 0 "U?" H 7780 1846 50  0000 L CNN
-F 1 "NRF24L01_Breakout" H 7780 1755 50  0000 L CNN
+F 0 "U?" H 7800 1800 50  0000 L CNN
+F 1 "NRF24L01_Breakout" H 7800 1700 50  0000 L CNN
 F 2 "RF_Module:nRF24L01_Breakout" H 7550 2400 50  0001 L CIN
 F 3 "http://www.nordicsemi.com/eng/content/download/2730/34105/file/nRF24L01_Product_Specification_v2_0.pdf" H 7400 1700 50  0001 C CNN
 	1    7400 1800
@@ -364,8 +364,6 @@ $EndComp
 Wire Wire Line
 	4900 4700 4900 4900
 Connection ~ 4900 4900
-Wire Wire Line
-	4900 4900 5350 4900
 Wire Wire Line
 	4900 4400 4900 4300
 Text GLabel 4800 4300 0    50   Input ~ 0
@@ -565,47 +563,36 @@ F 3 "http://www.nxp.com/documents/data_sheet/PCF8574_PCF8574A.pdf" H 6200 3700 5
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:LED_RGBC D?
-U 1 1 5FF4E403
-P 9650 5700
-F 0 "D?" H 9650 6197 50  0000 C CNN
-F 1 "LED_RGBC" H 9650 6106 50  0000 C CNN
-F 2 "" H 9650 5650 50  0001 C CNN
-F 3 "~" H 9650 5650 50  0001 C CNN
-	1    9650 5700
-	1    0    0    -1  
-$EndComp
-$Comp
 L Device:R R?
 U 1 1 5FF530EA
-P 10150 5500
-F 0 "R?" V 9943 5500 50  0000 C CNN
-F 1 "R" V 10034 5500 50  0000 C CNN
-F 2 "" V 10080 5500 50  0001 C CNN
-F 3 "~" H 10150 5500 50  0001 C CNN
-	1    10150 5500
+P 9450 4550
+F 0 "R?" V 9350 4450 50  0000 C CNN
+F 1 "330" V 9350 4600 50  0000 C CNN
+F 2 "" V 9380 4550 50  0001 C CNN
+F 3 "~" H 9450 4550 50  0001 C CNN
+	1    9450 4550
 	0    1    1    0   
 $EndComp
 $Comp
 L Device:R R?
 U 1 1 5FF53E00
-P 10150 5700
-F 0 "R?" V 9943 5700 50  0000 C CNN
-F 1 "R" V 10034 5700 50  0000 C CNN
-F 2 "" V 10080 5700 50  0001 C CNN
-F 3 "~" H 10150 5700 50  0001 C CNN
-	1    10150 5700
+P 9450 4750
+F 0 "R?" V 9350 4650 50  0000 C CNN
+F 1 "330" V 9350 4800 50  0000 C CNN
+F 2 "" V 9380 4750 50  0001 C CNN
+F 3 "~" H 9450 4750 50  0001 C CNN
+	1    9450 4750
 	0    1    1    0   
 $EndComp
 $Comp
 L Device:R R?
 U 1 1 5FF540AA
-P 10150 5900
-F 0 "R?" V 9943 5900 50  0000 C CNN
-F 1 "R" V 10034 5900 50  0000 C CNN
-F 2 "" V 10080 5900 50  0001 C CNN
-F 3 "~" H 10150 5900 50  0001 C CNN
-	1    10150 5900
+P 9450 4950
+F 0 "R?" V 9350 4850 50  0000 C CNN
+F 1 "330" V 9350 5000 50  0000 C CNN
+F 2 "" V 9380 4950 50  0001 C CNN
+F 3 "~" H 9450 4950 50  0001 C CNN
+	1    9450 4950
 	0    1    1    0   
 $EndComp
 $Comp
@@ -638,18 +625,10 @@ Text GLabel 1700 6100 0    50   Input ~ 0
 ESP_GPIO_3_RXD
 Text GLabel 1700 6000 0    50   Input ~ 0
 ESP_GPIO_1_TXD
-Text GLabel 7750 5100 2    50   Input ~ 0
-ESP_GPIO_4_SDA
-Text GLabel 7750 5200 2    50   Input ~ 0
-ESP_GPIO_5_SCL
-Text GLabel 7750 5300 2    50   Input ~ 0
-ESP_GPIO_3_RXD
 Text GLabel 2300 4200 0    50   Input ~ 0
 ESP_GPIO_10
 Wire Wire Line
 	2300 4200 2450 4200
-Text GLabel 7750 5400 2    50   Input ~ 0
-ESP_GPIO_10
 Text GLabel 6750 1800 0    50   Input ~ 0
 ESP_GPIO_4_SDA
 Text GLabel 9000 1800 0    50   Input ~ 0
@@ -720,4 +699,133 @@ Wire Wire Line
 	4450 3400 5700 3400
 Wire Wire Line
 	3850 3300 4450 3300
+Wire Wire Line
+	4900 4900 5350 4900
+Wire Wire Line
+	6700 3300 6800 3300
+Wire Wire Line
+	6800 3300 6800 2100
+Wire Wire Line
+	6800 2100 6900 2100
+Wire Wire Line
+	6700 3400 8900 3400
+Wire Wire Line
+	8900 3400 8900 2100
+Wire Wire Line
+	8900 2100 9150 2100
+$Comp
+L Device:LED_RGBA D?
+U 1 1 607ADA27
+P 9800 4750
+F 0 "D?" H 9800 5247 50  0000 C CNN
+F 1 "LED_RGBA" H 9800 5156 50  0000 C CNN
+F 2 "" H 9800 4700 50  0001 C CNN
+F 3 "~" H 9800 4700 50  0001 C CNN
+	1    9800 4750
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3.3V #PWR?
+U 1 1 607C47BE
+P 10200 4750
+F 0 "#PWR?" H 10200 4600 50  0001 C CNN
+F 1 "+3.3V" H 10215 4923 50  0000 C CNN
+F 2 "" H 10200 4750 50  0001 C CNN
+F 3 "" H 10200 4750 50  0001 C CNN
+	1    10200 4750
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	10000 4750 10200 4750
+Text GLabel 6700 3500 2    50   Input ~ 0
+P_2
+Text GLabel 6700 3600 2    50   Input ~ 0
+P_3
+Text GLabel 6700 3700 2    50   Input ~ 0
+P_4
+Text GLabel 9300 4550 0    50   Input ~ 0
+P_2
+Text GLabel 9300 4750 0    50   Input ~ 0
+P_3
+Text GLabel 9300 4950 0    50   Input ~ 0
+P_4
+$Comp
+L Device:R R?
+U 1 1 607D5790
+P 5400 3600
+F 0 "R?" V 5300 3600 50  0000 C CNN
+F 1 "R" V 5300 3500 50  0000 C CNN
+F 2 "" V 5330 3600 50  0001 C CNN
+F 3 "~" H 5400 3600 50  0001 C CNN
+	1    5400 3600
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 607D6F0E
+P 5400 3700
+F 0 "R?" V 5400 3750 50  0000 C CNN
+F 1 "R" V 5400 3650 50  0000 C CNN
+F 2 "" V 5330 3700 50  0001 C CNN
+F 3 "~" H 5400 3700 50  0001 C CNN
+	1    5400 3700
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 607D70C7
+P 5400 3800
+F 0 "R?" V 5500 3800 50  0000 C CNN
+F 1 "R" V 5500 3700 50  0000 C CNN
+F 2 "" V 5330 3800 50  0001 C CNN
+F 3 "~" H 5400 3800 50  0001 C CNN
+	1    5400 3800
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	5550 3600 5700 3600
+Wire Wire Line
+	5550 3700 5700 3700
+Wire Wire Line
+	5550 3800 5700 3800
+Wire Wire Line
+	5250 3600 5250 3700
+Wire Wire Line
+	5250 3700 5250 3800
+Connection ~ 5250 3700
+$Comp
+L power:GND #PWR?
+U 1 1 607E2A07
+P 5050 3750
+F 0 "#PWR?" H 5050 3500 50  0001 C CNN
+F 1 "GND" H 5055 3577 50  0000 C CNN
+F 2 "" H 5050 3750 50  0001 C CNN
+F 3 "" H 5050 3750 50  0001 C CNN
+	1    5050 3750
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5050 3750 5050 3700
+Wire Wire Line
+	5050 3700 5250 3700
+Text Notes 850  7300 0    79   ~ 0
+ESP_GPIO_10 can only bes used in DIO mode /!\\n
+$Comp
+L Device:R R?
+U 1 1 607ED4ED
+P 5550 4100
+F 0 "R?" V 5650 4100 50  0000 C CNN
+F 1 "1k" V 5650 4000 50  0000 C CNN
+F 2 "" V 5480 4100 50  0001 C CNN
+F 3 "~" H 5550 4100 50  0001 C CNN
+	1    5550 4100
+	0    1    1    0   
+$EndComp
+Text GLabel 5300 4100 0    50   Input ~ 0
+ESP_GPIO_3_RXD
+Wire Wire Line
+	5300 4100 5400 4100
+NoConn ~ 6700 4000
+NoConn ~ 6700 3900
+NoConn ~ 6700 3800
 $EndSCHEMATC