diff --git a/src/midi.h b/src/midi.h
new file mode 100644
index 0000000..4538df7
--- /dev/null
+++ b/src/midi.h
@@ -0,0 +1,48 @@
+//
+// midi.h
+//
+// MiniDexed - Dexed FM synthesizer for bare metal Raspberry Pi
+// Copyright (C) 2025  The MiniDexed Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+#ifndef _midi_h
+#define _midi_h
+
+#define MIDI_NOTE_OFF		0b1000
+#define MIDI_NOTE_ON		0b1001
+#define MIDI_AFTERTOUCH		0b1010			// TODO
+#define MIDI_CHANNEL_AFTERTOUCH 0b1101   // right now Synth_Dexed just manage Channel Aftertouch not Polyphonic AT -> 0b1010
+#define MIDI_CONTROL_CHANGE	0b1011
+
+#define MIDI_CC_BANK_SELECT_MSB		0
+#define MIDI_CC_MODULATION		1
+#define MIDI_CC_BREATH_CONTROLLER	2 
+#define MIDI_CC_FOOT_PEDAL 		4
+#define MIDI_CC_VOLUME			7
+#define MIDI_CC_PAN_POSITION		10
+#define MIDI_CC_EXPRESSION		11
+#define MIDI_CC_BANK_SELECT_LSB		32
+#define MIDI_CC_BANK_SUSTAIN		64
+#define MIDI_CC_RESONANCE		71
+#define MIDI_CC_FREQUENCY_CUTOFF	74
+#define MIDI_CC_REVERB_LEVEL		91
+#define MIDI_CC_DETUNE_LEVEL		94
+#define MIDI_CC_ALL_SOUND_OFF		120
+#define MIDI_CC_ALL_NOTES_OFF		123
+
+#define MIDI_PROGRAM_CHANGE	0b1100
+#define MIDI_PITCH_BEND		0b1110
+
+#endif
diff --git a/src/mididevice.cpp b/src/mididevice.cpp
index fefe9fc..fcdad51 100644
--- a/src/mididevice.cpp
+++ b/src/mididevice.cpp
@@ -27,32 +27,11 @@
 #include "config.h"
 #include <stdio.h>
 #include <assert.h>
+#include "midi.h"
 #include "userinterface.h"
 
 LOGMODULE ("mididevice");
 
-#define MIDI_NOTE_OFF		0b1000
-#define MIDI_NOTE_ON		0b1001
-#define MIDI_AFTERTOUCH		0b1010			// TODO
-#define MIDI_CHANNEL_AFTERTOUCH 0b1101   // right now Synth_Dexed just manage Channel Aftertouch not Polyphonic AT -> 0b1010
-#define MIDI_CONTROL_CHANGE	0b1011
-	#define MIDI_CC_BANK_SELECT_MSB		0
-	#define MIDI_CC_MODULATION		1
-	#define MIDI_CC_BREATH_CONTROLLER	2 
-	#define MIDI_CC_FOOT_PEDAL 		4
-	#define MIDI_CC_VOLUME			7
-	#define MIDI_CC_PAN_POSITION		10
-	#define MIDI_CC_EXPRESSION		11
-	#define MIDI_CC_BANK_SELECT_LSB		32
-	#define MIDI_CC_BANK_SUSTAIN		64
-	#define MIDI_CC_RESONANCE		71
-	#define MIDI_CC_FREQUENCY_CUTOFF	74
-	#define MIDI_CC_REVERB_LEVEL		91
-	#define MIDI_CC_DETUNE_LEVEL		94
-	#define MIDI_CC_ALL_SOUND_OFF		120
-	#define MIDI_CC_ALL_NOTES_OFF		123
-#define MIDI_PROGRAM_CHANGE	0b1100
-#define MIDI_PITCH_BEND		0b1110
 
 // MIDI "System" level (i.e. all TG) custom CC maps
 // Note: Even if number of TGs is not 8, there are only 8
diff --git a/src/uibuttons.cpp b/src/uibuttons.cpp
index ae206dc..d014a48 100644
--- a/src/uibuttons.cpp
+++ b/src/uibuttons.cpp
@@ -22,6 +22,7 @@
 #include <assert.h>
 #include <circle/timer.h>
 #include <string.h>
+#include "midi.h"
 
 LOGMODULE ("uibuttons");
 
@@ -492,20 +493,21 @@ void CUIButtons::ResetButton (unsigned pinNumber)
 
 void CUIButtons::BtnMIDICmdHandler (unsigned nMidiCmd, unsigned nMidiData1, unsigned nMidiData2)
 {
+	u8 ucType = nMidiCmd >> 4;
 	if (m_notesMidi > 0) {
 //		LOGDBG("BtnMIDICmdHandler (notes): %x %x %x)", nMidiCmd, nMidiData1, nMidiData2);
 		// Using MIDI Note messages for MIDI buttons
 		unsigned midiPin = ccToMidiPin(nMidiData1);
 		for (unsigned i=0; i<MAX_BUTTONS; i++) {
 			if (m_buttons[i].getPinNumber() == midiPin) {
-				if (nMidiCmd == 0x80) {
-					// NoteOff = Button OFF
+				if (ucType == MIDI_NOTE_OFF) {
+					// Button OFF
 					m_buttons[i].Write (0);
-				} else if ((nMidiCmd == 0x90) && (nMidiData2 == 0)) {
-					// NoteOn with Vel == 0 = Button OFF
+				} else if ((ucType == MIDI_NOTE_ON) && (nMidiData2 == 0)) {
+					// Button OFF (MIDI_NOTE_ON with Vel == 0)
 					m_buttons[i].Write (0);
-				} else if (nMidiCmd == 0x90) {
-					// NoteOn = Button ON
+				} else if (ucType == MIDI_NOTE_ON) {
+					// Button ON
 					m_buttons[i].Write (127);
 				} else {
 					// Ignore other MIDI commands
@@ -515,7 +517,7 @@ void CUIButtons::BtnMIDICmdHandler (unsigned nMidiCmd, unsigned nMidiData1, unsi
 	} else {
 //		LOGDBG("BtnMIDICmdHandler (CC): %x %x %x)", nMidiCmd, nMidiData1, nMidiData2);
 		// Using MIDI CC messages for MIDI buttons
-		if (nMidiCmd == 0xB0) {  // Control Message
+		if (ucType == MIDI_CONTROL_CHANGE) {
 			unsigned midiPin = ccToMidiPin(nMidiData1);
 			for (unsigned i=0; i<MAX_BUTTONS; i++) {
 				if (m_buttons[i].getPinNumber() == midiPin) {
@@ -523,5 +525,5 @@ void CUIButtons::BtnMIDICmdHandler (unsigned nMidiCmd, unsigned nMidiData1, unsi
 				}
 			}
 		}
-	}	
+	}
 }