diff --git a/src/addons/neopicoleds.cpp b/src/addons/neopicoleds.cpp
index 76ad1cd22..62f742859 100644
--- a/src/addons/neopicoleds.cpp
+++ b/src/addons/neopicoleds.cpp
@@ -436,53 +436,28 @@ std::vector<std::vector<Pixel>> NeoPicoLEDAddon::createLEDLayout(ButtonLayout la
 
 	switch (static_cast<ButtonLayout>(layout))
 	{
+		case BUTTON_LAYOUT_STICKLESS:
+		case BUTTON_LAYOUT_OPENCORE0WASDA:
+		case BUTTON_LAYOUT_STICKLESS_13:
+		case BUTTON_LAYOUT_STICKLESS_14:
+		case BUTTON_LAYOUT_STICKLESS_16:
+		case BUTTON_LAYOUT_BOARD_DEFINED_A:
+			return generatedLEDStickless(&positions);
+		case BUTTON_LAYOUT_FIGHTBOARD_MIRRORED:
+			return generatedLEDWasdFBM(&positions);
+		case BUTTON_LAYOUT_BUTTONS_ANGLED:
+		case BUTTON_LAYOUT_FIGHTBOARD_STICK:
+			return generatedLEDWasd(&positions);
 		case BUTTON_LAYOUT_BLANKA:
-			return generatedLEDButtons(&positions);
-
 		case BUTTON_LAYOUT_BUTTONS_BASIC:
-			return generatedLEDButtons(&positions);
-
 		case BUTTON_LAYOUT_KEYBOARD_ANGLED:
-			return generatedLEDButtons(&positions);
-
 		case BUTTON_LAYOUT_KEYBOARDA:
-			return generatedLEDButtons(&positions);
-
 		case BUTTON_LAYOUT_DANCEPADA:
-			return generatedLEDButtons(&positions);
-
 		case BUTTON_LAYOUT_TWINSTICKA:
-			return generatedLEDButtons(&positions);
-
 		case BUTTON_LAYOUT_ARCADE:
-			return generatedLEDButtons(&positions);
-
-		case BUTTON_LAYOUT_STICKLESS:
-			return generatedLEDStickless(&positions);
-
-		case BUTTON_LAYOUT_BUTTONS_ANGLED:
-			return generatedLEDWasd(&positions);
-
 		case BUTTON_LAYOUT_VLXA:
+		default:
 			return generatedLEDButtons(&positions);
-
-		case BUTTON_LAYOUT_FIGHTBOARD_STICK:
-			return generatedLEDWasd(&positions);
-
-		case BUTTON_LAYOUT_FIGHTBOARD_MIRRORED:
-			return generatedLEDWasdFBM(&positions);
-
-		case BUTTON_LAYOUT_OPENCORE0WASDA:
-			return generatedLEDStickless(&positions);
-
-		case BUTTON_LAYOUT_STICKLESS_13:
-			return generatedLEDStickless(&positions);	
-			
-		case BUTTON_LAYOUT_STICKLESS_16:
-			return generatedLEDStickless(&positions);
-
-		case BUTTON_LAYOUT_STICKLESS_14:
-			return generatedLEDStickless(&positions);		
 	}
 
 	assert(false);