diff --git a/firmware/common/message.hpp b/firmware/common/message.hpp
index 745dd13a..172aff88 100644
--- a/firmware/common/message.hpp
+++ b/firmware/common/message.hpp
@@ -81,39 +81,34 @@ public:
 		SamplerateConfig = 24,
 		BTLERxConfigure = 25,
 		NRFRxConfigure = 26,
-
-		TXProgress = 30,
-		Retune = 31,
-		
-		TonesConfigure = 32,
-		AFSKTxConfigure = 33,
-		PitchRSSIConfigure = 34,
-		OOKConfigure = 35,
-		RDSConfigure = 36,
-		AudioTXConfig = 37,
-		POCSAGConfigure = 38,
-		DTMFTXConfig = 39,
-		ADSBConfigure = 40,
-		JammerConfigure = 41,
-		WidebandSpectrumConfig = 42,
-		FSKConfigure = 43,
-		SSTVConfigure = 44,
-		SigGenConfig = 43,
-		SigGenTone = 44,
-		
-		POCSAGPacket = 45,
-		ADSBFrame = 46,
-		AFSKData = 47,
-		TestAppPacket = 48,
-		
-		RequestSignal = 49,
-		FIFOData = 50,
-		
-		AudioLevelReport = 51,
-		CodedSquelch = 52,
-		AudioSpectrum = 53,
-		APRSPacket = 54,
-		APRSRxConfigure = 55,
+		TXProgress = 27,
+		Retune = 28,
+		TonesConfigure = 29,
+		AFSKTxConfigure = 30,
+		PitchRSSIConfigure = 31,
+		OOKConfigure = 32,
+		RDSConfigure = 33,
+		AudioTXConfig = 34,
+		POCSAGConfigure = 35,
+		DTMFTXConfig = 36,
+		ADSBConfigure = 37,
+		JammerConfigure = 38,
+		WidebandSpectrumConfig = 39,
+		FSKConfigure = 40,
+		SSTVConfigure = 41,
+		SigGenConfig = 42,
+		SigGenTone = 43,
+		POCSAGPacket = 44,
+		ADSBFrame = 45,
+		AFSKData = 46,
+		TestAppPacket = 47,
+		RequestSignal = 48,
+		FIFOData = 49,
+		AudioLevelReport = 50,
+		CodedSquelch = 51,
+		AudioSpectrum = 52,
+		APRSPacket = 53,
+		APRSRxConfigure = 54,
 		MAX
 	};