diff --git a/app/aircopy.c b/app/aircopy.c
index c257e28..1fb0f9a 100644
--- a/app/aircopy.c
+++ b/app/aircopy.c
@@ -57,7 +57,7 @@ void AIRCOPY_SendMessage(void)
 
 	BK4819_SendFSKData(g_FSK_Buffer);
 	BK4819_SetupPowerAmplifier(0, 0);
-	BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1, false);
+	BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29, false);
 
 	gAircopySendCountdown = 30;
 }
diff --git a/app/app.c b/app/app.c
index 4c862dd..2f59fd5 100644
--- a/app/app.c
+++ b/app/app.c
@@ -783,13 +783,13 @@ void APP_CheckRadioInterrupts(void)
 		if (interrupt_status_bits & BK4819_REG_02_SQUELCH_LOST)
 		{
 			g_SquelchLost = true;
-			BK4819_ToggleGpioOut(BK4819_GPIO0_PIN28_GREEN, true);
+			BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2_GREEN, true);
 		}
 
 		if (interrupt_status_bits & BK4819_REG_02_SQUELCH_FOUND)
 		{
 			g_SquelchLost = false;
-			BK4819_ToggleGpioOut(BK4819_GPIO0_PIN28_GREEN, false);
+			BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2_GREEN, false);
 		}
 
 		#ifdef ENABLE_AIRCOPY
@@ -1127,7 +1127,7 @@ void APP_Update(void)
 
 			BK4819_DisableVox();
 			BK4819_Sleep();
-			BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2, false);
+			BK4819_ToggleGpioOut(BK4819_GPIO0_PIN28, false);
 
 			// Authentic device checked removed
 
@@ -1375,9 +1375,9 @@ void APP_TimeSlice10ms(void)
 
 						RADIO_EnableCxCSS();
 						BK4819_SetupPowerAmplifier(0, 0);
-						BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1, false);
+						BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29, false);
 						BK4819_Enable_AfDac_DiscMode_TxDsp();
-						BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_RED, false);
+						BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1_RED, false);
 
 						GUI_DisplayScreen();
 					}
@@ -1387,7 +1387,7 @@ void APP_TimeSlice10ms(void)
 
 						GUI_DisplayScreen();
 
-						BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_RED, true);
+						BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1_RED, true);
 						RADIO_SetTxParameters();
 						BK4819_TransmitTone(true, 500);
 						SYSTEM_DelayMs(2);
diff --git a/app/spectrum.c b/app/spectrum.c
index 279d8a0..37435a4 100644
--- a/app/spectrum.c
+++ b/app/spectrum.c
@@ -323,7 +323,7 @@ static void ToggleAudio(bool on) {
 static void ToggleRX(bool on) {
   isListening = on;
 
-  BK4819_ToggleGpioOut(BK4819_GPIO0_PIN28_GREEN, on);
+  BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2_GREEN, on);
 
   ToggleAudio(on);
   ToggleAFDAC(on);
@@ -905,8 +905,8 @@ void OnKeyDownStill(KEY_Code_t key) {
     break;
   case KEY_PTT:
     // TODO: start transmit
-    /* BK4819_ToggleGpioOut(BK4819_GPIO0_PIN28_GREEN, false);
-    BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_RED, true); */
+    /* BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2_GREEN, false);
+    BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1_RED, true); */
     break;
   case KEY_MENU:
     if (menuState == ARRAY_SIZE(registerSpecs) - 1) {
diff --git a/driver/bk4819-regs.h b/driver/bk4819-regs.h
index 2e44c07..ebbdbcd 100644
--- a/driver/bk4819-regs.h
+++ b/driver/bk4819-regs.h
@@ -95,13 +95,12 @@ enum BK4819_REGISTER_t {
 typedef enum BK4819_REGISTER_t BK4819_REGISTER_t;
 
 enum BK4819_GPIO_PIN_t {
-	BK4819_GPIO6_PIN2        = 0,
-	BK4819_GPIO5_PIN1        = 1,
-	BK4819_GPIO4_PIN32       = 2,
+	BK4819_GPIO0_PIN28        = 0,
+	BK4819_GPIO1_PIN29        = 1,
 	BK4819_GPIO3_PIN31       = 3,
-	BK4819_GPIO2_PIN30       = 4,
-	BK4819_GPIO1_PIN29_RED   = 5,
-	BK4819_GPIO0_PIN28_GREEN = 6,
+	BK4819_GPIO4_PIN32       = 4,
+	BK4819_GPIO5_PIN1_RED   = 5,
+	BK4819_GPIO6_PIN2_GREEN = 6,
 };
 
 typedef enum BK4819_GPIO_PIN_t BK4819_GPIO_PIN_t;
diff --git a/driver/bk4819.c b/driver/bk4819.c
index 0d921d7..e84c9de 100644
--- a/driver/bk4819.c
+++ b/driver/bk4819.c
@@ -844,18 +844,18 @@ void BK4819_PickRXFilterPathBasedOnFrequency(uint32_t Frequency)
 {
 	if (Frequency < 28000000)
 	{
-		BK4819_ToggleGpioOut(BK4819_GPIO2_PIN30, true);
+		BK4819_ToggleGpioOut(BK4819_GPIO4_PIN32, true);
 		BK4819_ToggleGpioOut(BK4819_GPIO3_PIN31, false);
 	}
 	else
 	if (Frequency == 0xFFFFFFFF)
 	{
-		BK4819_ToggleGpioOut(BK4819_GPIO2_PIN30, false);
+		BK4819_ToggleGpioOut(BK4819_GPIO4_PIN32, false);
 		BK4819_ToggleGpioOut(BK4819_GPIO3_PIN31, false);
 	}
 	else
 	{
-		BK4819_ToggleGpioOut(BK4819_GPIO2_PIN30, false);
+		BK4819_ToggleGpioOut(BK4819_GPIO4_PIN32, false);
 		BK4819_ToggleGpioOut(BK4819_GPIO3_PIN31, true);
 	}
 }
@@ -1198,7 +1198,7 @@ void BK4819_Conditional_RX_TurnOn_and_GPIO6_Enable(void)
 {
 	if (gRxIdleMode)
 	{
-		BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2, true);
+		BK4819_ToggleGpioOut(BK4819_GPIO0_PIN28, true);
 		BK4819_RX_TurnOn();
 	}
 }
diff --git a/functions.c b/functions.c
index 49d8cff..6e4e0c6 100644
--- a/functions.c
+++ b/functions.c
@@ -145,7 +145,7 @@ void FUNCTION_Select(FUNCTION_Type_t Function)
 			BK4819_DisableVox();			
 			BK4819_Sleep();
 
-			BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2, false);
+			BK4819_ToggleGpioOut(BK4819_GPIO0_PIN28, false);
 
 			gUpdateStatus = true;
 
@@ -204,7 +204,7 @@ void FUNCTION_Select(FUNCTION_Type_t Function)
 			RADIO_SetTxParameters();
 
 			// turn the RED LED on
-			BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_RED, true);
+			BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1_RED, true);
 
 			DTMF_Reply();
 
diff --git a/radio.c b/radio.c
index 842d0c0..2927daf 100644
--- a/radio.c
+++ b/radio.c
@@ -578,7 +578,7 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
 
 	gEnableSpeaker = false;
 
-	BK4819_ToggleGpioOut(BK4819_GPIO0_PIN28_GREEN, false);
+	BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2_GREEN, false);
 
 	switch (Bandwidth)
 	{
@@ -596,11 +596,11 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
 			break;
 	}
 
-	BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_RED, false);
+	BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1_RED, false);
 
 	BK4819_SetupPowerAmplifier(0, 0);
 
-	BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1, false);
+	BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29, false);
 
 	while (1)
 	{
@@ -634,7 +634,7 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
 	BK4819_PickRXFilterPathBasedOnFrequency(Frequency);
 
 	// what does this in do ?
-	BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2, true);
+	BK4819_ToggleGpioOut(BK4819_GPIO0_PIN28, true);
 
 	// AF RX Gain and DAC
 	BK4819_WriteRegister(BK4819_REG_48, 0xB3A8);  // 1011 00 111010 1000
@@ -828,7 +828,7 @@ void RADIO_SetTxParameters(void)
 
 	gEnableSpeaker = false;
 
-	BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2, false);
+	BK4819_ToggleGpioOut(BK4819_GPIO0_PIN28, false);
 
 	switch (Bandwidth)
 	{
@@ -857,7 +857,7 @@ void RADIO_SetTxParameters(void)
 
 	BK4819_PickRXFilterPathBasedOnFrequency(gCurrentVfo->pTX->Frequency);
 
-	BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1, true);
+	BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29, true);
 
 	SYSTEM_DelayMs(5);