--- nekobee-dssi.c	2009-01-18 02:08:29.000000000 +0100
+++ /home/ng/nekobee-0.1.7-mine/src/nekobee-dssi.c	2009-11-25 14:53:41.000000000 +0100
@@ -348,7 +348,7 @@
 		case XSYNTH_PORT_ACCENT:
 			return DSSI_CC(MIDI_CTL_ACCENT);
 		case XSYNTH_PORT_VOLUME:
-			return DSSI_CC(MIDI_CTL_MSB_MAIN_VOLUME);
+			return DSSI_CC(MIDI_CTL_VOLUME); /* return DSSI_CC(MIDI_CTL_MSB_MAIN_VOLUME); */
 		
       default:
         break;
--- nekobee_synth.h	2009-01-18 02:08:29.000000000 +0100
+++ /home/ng/nekobee-0.1.7-mine/src/nekobee_synth.h	2009-11-25 16:18:26.000000000 +0100
@@ -136,7 +136,9 @@
 #define MIDI_CTL_SUSTAIN                0x40    /**< Sustain pedal */
 
 // nekobee defines
+#ifdef DEFAULT_MIDI_MAPPING
 
+#define MIDI_CTL_VOLUME			0x27	/**< Main volume */
 #define MIDI_CTL_TUNING					0x4b	// impossible
 #define MIDI_CTL_WAVEFORM				0x46	// select waveform
 #define MIDI_CTL_CUTOFF					0x4a	// VCF Cutoff
@@ -145,6 +147,24 @@
 #define MIDI_CTL_DECAY					0x48	// Decay time (well release really)
 #define MIDI_CTL_ACCENT					0x4c	// impossible
 
+#else
+
+/* Navaho Gunleg 20091125:
+	Map these to the top 8 fiddly bits on the X-Session Pro
+ */
+#define MIDI_CTL_TUNING					0x18	// impossible
+#define MIDI_CTL_WAVEFORM				0x1b	// select waveform
+#define MIDI_CTL_CUTOFF					0x22	// VCF Cutoff
+#define MIDI_CTL_RESONANCE				0x1f	// VCF Resonance
+
+#define MIDI_CTL_ENVMOD					0x19	// cheat and use modwheel
+#define MIDI_CTL_DECAY					0x1c	// Decay time (well release really)
+#define MIDI_CTL_ACCENT					0x23	// impossible
+
+#define MIDI_CTL_VOLUME					0x20	// volume control
+
+#endif /* DEFAULT_MIDI_MAPPING */
+
 #define MIDI_CTL_ALL_SOUNDS_OFF         0x78    /**< All sounds off */
 #define MIDI_CTL_RESET_CONTROLLERS      0x79    /**< Reset Controllers */
 #define MIDI_CTL_ALL_NOTES_OFF          0x7b    /**< All notes off */