diff --git a/BinaryData/TopEdgeButton.png b/BinaryData/TopEdgeButton.png
index cf79bf5b..56886c05 100644
Binary files a/BinaryData/TopEdgeButton.png and b/BinaryData/TopEdgeButton.png differ
diff --git a/Source/IncrMidiNotesMapping.cpp b/Source/IncrMidiNotesMapping.cpp
index f65401f9..fde0ff2e 100644
--- a/Source/IncrMidiNotesMapping.cpp
+++ b/Source/IncrMidiNotesMapping.cpp
@@ -87,7 +87,7 @@ IncrMidiNotesMapping::IncrMidiNotesMapping ()
 		channelBox->addItem(String(i), i);
 
 	// Default: multi channel
-	// XXX (Or: latest choice by user, from settings)
+	// Todo latest choice by user, from settings
 	channelAutoIncrButton->setToggleState(true, juce::NotificationType::sendNotification);
 
 	//noteLabel->attachToComponent(noteBox, true);
diff --git a/Source/IncrMidiNotesMapping.h b/Source/IncrMidiNotesMapping.h
index b53a0e48..a47b9b6d 100644
--- a/Source/IncrMidiNotesMapping.h
+++ b/Source/IncrMidiNotesMapping.h
@@ -21,7 +21,7 @@
 #define __JUCE_HEADER_B85945BB76A8470__
 
 //[Headers]     -- You can add your own extra header files here --
-#include "../../JuceLibraryCode/JuceHeader.h"
+#include "../JuceLibraryCode/JuceHeader.h"
 #include "MappingLogic.h"
 //[/Headers]
 
diff --git a/Source/IsomorphicMassAssign.cpp b/Source/IsomorphicMassAssign.cpp
index 59f87e1a..918e2b5f 100644
--- a/Source/IsomorphicMassAssign.cpp
+++ b/Source/IsomorphicMassAssign.cpp
@@ -7,7 +7,7 @@
   the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
   and re-saved.
 
-  Created with Projucer version: 4.2.1
+  Created with Projucer version: 4.3.1
 
   ------------------------------------------------------------------------------
 
@@ -18,6 +18,7 @@
 */
 
 //[Headers] You can add your own extra header files here...
+#include "ViewConstants.h"
 #include "Main.h"
 #include "MainComponent.h"
 //[/Headers]
@@ -32,15 +33,19 @@
 IsomorphicMassAssign::IsomorphicMassAssign ()
 {
     //[Constructor_pre] You can add your own custom stuff here..
+	incrMidiNotesMapping = new IncrMidiNotesMapping();
+	addAndMakeVisible(incrMidiNotesMapping);
+	incrMidiNotesMapping->setVisible(false);
+
 	mappingLogic = nullptr;
     //[/Constructor_pre]
 
-    addAndMakeVisible (startingPointeBox = new ComboBox ("startingPointBox"));
-    startingPointeBox->setEditableText (false);
-    startingPointeBox->setJustificationType (Justification::centredLeft);
-    startingPointeBox->setTextWhenNothingSelected (String());
-    startingPointeBox->setTextWhenNoChoicesAvailable (TRANS("(no choices)"));
-    startingPointeBox->addListener (this);
+    addAndMakeVisible (startingPointBox = new ComboBox ("startingPointBox"));
+    startingPointBox->setEditableText (false);
+    startingPointBox->setJustificationType (Justification::centredLeft);
+    startingPointBox->setTextWhenNothingSelected (String());
+    startingPointBox->setTextWhenNoChoicesAvailable (TRANS("(no choices)"));
+    startingPointBox->addListener (this);
 
     addAndMakeVisible (labelStartingPoint = new Label ("labelStartingPoint",
                                                        TRANS("Starting value")));
@@ -94,6 +99,25 @@ IsomorphicMassAssign::IsomorphicMassAssign ()
     editInstructionText->setColour (TextEditor::textColourId, Colours::black);
     editInstructionText->setColour (TextEditor::backgroundColourId, Colour (0x00000000));
 
+    addAndMakeVisible (groupMapping = new GroupComponent ("groupMapping",
+                                                          TRANS("Mapping")));
+
+    addAndMakeVisible (cbMappingStyle = new ComboBox ("cbMappingStyle"));
+    cbMappingStyle->setEditableText (false);
+    cbMappingStyle->setJustificationType (Justification::centredLeft);
+    cbMappingStyle->setTextWhenNothingSelected (String());
+    cbMappingStyle->setTextWhenNoChoicesAvailable (TRANS("(no choices)"));
+    cbMappingStyle->addItem (TRANS("MIDI notes, increasing order"), 1);
+    cbMappingStyle->addListener (this);
+
+    addAndMakeVisible (labelMappingStyle = new Label ("labelMappingStyle",
+                                                      TRANS("Style:")));
+    labelMappingStyle->setFont (Font (15.00f, Font::plain));
+    labelMappingStyle->setJustificationType (Justification::centredLeft);
+    labelMappingStyle->setEditable (false, false, false);
+    labelMappingStyle->setColour (TextEditor::textColourId, Colours::black);
+    labelMappingStyle->setColour (TextEditor::backgroundColourId, Colour (0x00000000));
+
 
     //[UserPreSize]
     //[/UserPreSize]
@@ -102,23 +126,33 @@ IsomorphicMassAssign::IsomorphicMassAssign ()
 
 
     //[Constructor] You can add your own custom stuff here..
-	editHorizontalSteps->setInputRestrictions(0, "0123456789-");
-	editRightUpwardSteps->setInputRestrictions(0, "0123456789-");
+
+	incrMidiNotesMapping->getMappingLogic()->addListener(this);
+
+
+	// Default selection
+	// Todo: read from user settings
+	cbMappingStyle->setSelectedItemIndex(0, juce::NotificationType::sendNotification);
+
     //[/Constructor]
 }
 
 IsomorphicMassAssign::~IsomorphicMassAssign()
 {
     //[Destructor_pre]. You can add your own custom destruction code here..
+	incrMidiNotesMapping = nullptr;
     //[/Destructor_pre]
 
-    startingPointeBox = nullptr;
+    startingPointBox = nullptr;
     labelStartingPoint = nullptr;
     labelHorizontalSteps = nullptr;
     editHorizontalSteps = nullptr;
     labelRightUpwardSteps = nullptr;
     editRightUpwardSteps = nullptr;
     editInstructionText = nullptr;
+    groupMapping = nullptr;
+    cbMappingStyle = nullptr;
+    labelMappingStyle = nullptr;
 
 
     //[Destructor]. You can add your own custom destruction code here..
@@ -133,12 +167,6 @@ void IsomorphicMassAssign::paint (Graphics& g)
 
     g.fillAll (Colour (0xffbad0de));
 
-    g.setColour (Colour (0xff010e0c));
-    g.fillPath (internalPath1);
-
-    g.setColour (Colour (0xff02020e));
-    g.fillPath (internalPath2);
-
     //[UserPaint] Add your own custom painting code here..
     //[/UserPaint]
 }
@@ -146,27 +174,19 @@ void IsomorphicMassAssign::paint (Graphics& g)
 void IsomorphicMassAssign::resized()
 {
     //[UserPreResize] Add your own custom resize code here..
+	incrMidiNotesMapping->setBounds(16, MAPPINGSUBWINTOP, EDITSUBWINWIDTH, MAPPINGSUBWINHEIGHT);
     //[/UserPreResize]
 
-    startingPointeBox->setBounds (24, 128, 150, 24);
-    labelStartingPoint->setBounds (24, 104, 150, 24);
-    labelHorizontalSteps->setBounds (232, 96, 150, 24);
-    editHorizontalSteps->setBounds (232, 120, 40, 24);
-    labelRightUpwardSteps->setBounds (160, 48, 150, 24);
-    editRightUpwardSteps->setBounds (160, 72, 39, 24);
-    editInstructionText->setBounds (8, 8, 416, 40);
-    internalPath1.clear();
-    internalPath1.startNewSubPath (188.0f, 132.0f);
-    internalPath1.lineTo (212.0f, 136.0f);
-    internalPath1.lineTo (192.0f, 144.0f);
-    internalPath1.closeSubPath();
-
-    internalPath2.clear();
-    internalPath2.startNewSubPath (168.0f, 104.0f);
-    internalPath2.lineTo (168.0f, 120.0f);
-    internalPath2.lineTo (160.0f, 120.0f);
-    internalPath2.closeSubPath();
-
+    startingPointBox->setBounds (12, 291, 150, 24);
+    labelStartingPoint->setBounds (12, 267, 150, 24);
+    labelHorizontalSteps->setBounds (220, 259, 150, 24);
+    editHorizontalSteps->setBounds (220, 283, 40, 24);
+    labelRightUpwardSteps->setBounds (148, 211, 150, 24);
+    editRightUpwardSteps->setBounds (148, 235, 39, 24);
+    editInstructionText->setBounds (0, 168, 416, 40);
+    groupMapping->setBounds (0, 8, 416, 152);
+    cbMappingStyle->setBounds (105, 31, 296, 24);
+    labelMappingStyle->setBounds (12, 32, 88, 24);
     //[UserResized] Add your own custom resize handling here..
     //[/UserResized]
 }
@@ -176,10 +196,22 @@ void IsomorphicMassAssign::comboBoxChanged (ComboBox* comboBoxThatHasChanged)
     //[UsercomboBoxChanged_Pre]
     //[/UsercomboBoxChanged_Pre]
 
-    if (comboBoxThatHasChanged == startingPointeBox)
+    if (comboBoxThatHasChanged == startingPointBox)
+    {
+        //[UserComboBoxCode_startingPointBox] -- add your combo box handling code here..
+        //[/UserComboBoxCode_startingPointBox]
+    }
+    else if (comboBoxThatHasChanged == cbMappingStyle)
     {
-        //[UserComboBoxCode_startingPointeBox] -- add your combo box handling code here..
-        //[/UserComboBoxCode_startingPointeBox]
+        //[UserComboBoxCode_cbMappingStyle] -- add your combo box handling code here..
+		int mappingStyle = cbMappingStyle->getSelectedItemIndex();
+
+		// Show sub window corresponding to selected mapping style. Currently there is only one
+		if (mappingStyle == 0)
+			incrMidiNotesMapping->setVisible(true);
+		else
+			incrMidiNotesMapping->setVisible(false);
+        //[/UserComboBoxCode_cbMappingStyle]
     }
 
     //[UsercomboBoxChanged_Post]
@@ -226,7 +258,7 @@ void IsomorphicMassAssign::fillLine(int setSelection, TerpstraBoardGeometry::Str
 }
 
 // Fill a horizontal line and its cutting upwards lines, recursively. Fill only those that have not been filled yet. Starting point is assumed to have been set.
-void IsomorphicMassAssign::fill2DHorizLineRecursive(int setSelection, TerpstraBoardGeometry::StraightLine& horizLine, int startPos, int startNoteIndex, 
+void IsomorphicMassAssign::fill2DHorizLineRecursive(int setSelection, TerpstraBoardGeometry::StraightLine& horizLine, int startPos, int startNoteIndex,
 	int horizStepSize, int rUpwStepSize,
 	TerpstraBoardGeometry::StraightLineSet& finishedLines)
 {
@@ -249,7 +281,7 @@ void IsomorphicMassAssign::fill2DHorizLineRecursive(int setSelection, TerpstraBo
 			// Start note index: the value that has been set to the horizontal line element
 			int rUpStartNoteIndex = this->mappingLogic->terpstraKeyToIndex(
 				((MainContentComponent*)(getParentComponent()->getParentComponent()))->getMappingInEdit().sets[setSelection].theKeys[horizLine[linepos]]);
-			
+
 			// Fill it and its cutting lines, if it has not been done before. Check of the latter is done inside.
 			fill2DRUpwLineRecursive(setSelection, rUpLine, rUpStartPos, rUpStartNoteIndex, horizStepSize, rUpwStepSize, finishedLines);
 		}
@@ -287,21 +319,19 @@ void IsomorphicMassAssign::fill2DRUpwLineRecursive(int setSelection, TerpstraBoa
 	}
 }
 
-
 // Implementation of MappingLogicListener
 void IsomorphicMassAssign::mappingLogicChanged(MappingLogicBase* mappingLogicThatChanged)
 {
 	this->mappingLogic = mappingLogicThatChanged;
 
 	// Fill note combo with values according to mapping logic
-	// XXX Same code as in SingleNoteAssign
-	startingPointeBox->clear(juce::NotificationType::dontSendNotification);
+	startingPointBox->clear(juce::NotificationType::dontSendNotification);
 
 	for (int i = 0; i < mappingLogicThatChanged->globalMappingSize(); i++)
 	{
 		TerpstraKey keyData = mappingLogicThatChanged->indexToTerpstraKey(i);
 		// XXX format text
-		startingPointeBox->addItem(String(i) + ": Key_" + String(keyData.noteNumber) + ", Chan_" + String(keyData.channelNumber), i + 1);
+		startingPointBox->addItem(String(i) + ": Key_" + String(keyData.noteNumber) + ", Chan_" + String(keyData.channelNumber), i + 1);
 	}
 }
 
@@ -310,7 +340,7 @@ void IsomorphicMassAssign::PerformMouseClickEdit(int setSelection, int keySelect
 {
 	jassert(setSelection >= 0 && setSelection < NUMBEROFBOARDS && keySelection >= 0 && keySelection < TERPSTRABOARDSIZE);
 
-	int startNoteIndex = this->startingPointeBox->getSelectedItemIndex();
+	int startNoteIndex = this->startingPointBox->getSelectedItemIndex();
 	if (this->mappingLogic != nullptr && startNoteIndex >= 0)
 	{
 		// Set value of starting point
@@ -339,7 +369,7 @@ void IsomorphicMassAssign::PerformMouseClickEdit(int setSelection, int keySelect
 		else if (horizStepSize != 0 && rUpwStepSize != 0)
 		{
 			TerpstraBoardGeometry::StraightLineSet finishedLines;	// List of lines that have been finished, so the recursion ends
-			
+
 			// Find the horizontal line
 			TerpstraBoardGeometry::StraightLine horizLine = boardGeometry.horizontalLineOfField(keySelection);
 			int startPos = horizLine.indexOf(keySelection);
@@ -363,45 +393,52 @@ void IsomorphicMassAssign::PerformMouseClickEdit(int setSelection, int keySelect
 BEGIN_JUCER_METADATA
 
 <JUCER_COMPONENT documentType="Component" className="IsomorphicMassAssign" componentName=""
-                 parentClasses="public Component, public MappingLogicListener"
-                 constructorParams="" variableInitialisers="" snapPixels="8" snapActive="1"
-                 snapShown="1" overlayOpacity="0.330" fixedSize="0" initialWidth="428"
-                 initialHeight="220">
-  <BACKGROUND backgroundColour="ffbad0de">
-    <PATH pos="0 0 100 100" fill="solid: ff010e0c" hasStroke="0" nonZeroWinding="1">s 188 132 l 212 136 l 192 144 x</PATH>
-    <PATH pos="0 0 100 100" fill="solid: ff02020e" hasStroke="0" nonZeroWinding="1">s 168 104 l 168 120 l 160 120 x</PATH>
-  </BACKGROUND>
-  <COMBOBOX name="startingPointBox" id="d526f69bdc196fea" memberName="startingPointeBox"
-            virtualName="" explicitFocusOrder="0" pos="24 128 150 24" editable="0"
+                 parentClasses="public Component" constructorParams="" variableInitialisers=""
+                 snapPixels="8" snapActive="1" snapShown="1" overlayOpacity="0.330"
+                 fixedSize="0" initialWidth="428" initialHeight="220">
+  <BACKGROUND backgroundColour="ffbad0de"/>
+  <COMBOBOX name="startingPointBox" id="d526f69bdc196fea" memberName="startingPointBox"
+            virtualName="" explicitFocusOrder="0" pos="12 291 150 24" editable="0"
             layout="33" items="" textWhenNonSelected="" textWhenNoItems="(no choices)"/>
   <LABEL name="labelStartingPoint" id="5401a3246c13771e" memberName="labelStartingPoint"
-         virtualName="" explicitFocusOrder="0" pos="24 104 150 24" tooltip="Value that will be assigned to the key at mouse pposition when clicking"
+         virtualName="" explicitFocusOrder="0" pos="12 267 150 24" tooltip="Value that will be assigned to the key at mouse pposition when clicking"
          edTextCol="ff000000" edBkgCol="0" labelText="Starting value"
          editableSingleClick="0" editableDoubleClick="0" focusDiscardsChanges="0"
          fontname="Default font" fontsize="15" bold="0" italic="0" justification="33"/>
   <LABEL name="labelHorizontalSteps" id="3e6663aecf1474c8" memberName="labelHorizontalSteps"
-         virtualName="" explicitFocusOrder="0" pos="232 96 150 24" edTextCol="ff000000"
+         virtualName="" explicitFocusOrder="0" pos="220 259 150 24" edTextCol="ff000000"
          edBkgCol="0" labelText="Horizontal steps" editableSingleClick="0"
          editableDoubleClick="0" focusDiscardsChanges="0" fontname="Default font"
          fontsize="15" bold="0" italic="0" justification="33"/>
   <TEXTEDITOR name="editHorizontalSteps" id="8d2f5f07f337b9ef" memberName="editHorizontalSteps"
-              virtualName="" explicitFocusOrder="0" pos="232 120 40 24" initialText=""
+              virtualName="" explicitFocusOrder="0" pos="220 283 40 24" initialText=""
               multiline="0" retKeyStartsLine="0" readonly="0" scrollbars="1"
               caret="1" popupmenu="1"/>
   <LABEL name="labelRightUpwardSteps" id="43530804741d9cb7" memberName="labelRightUpwardSteps"
-         virtualName="" explicitFocusOrder="0" pos="160 48 150 24" edTextCol="ff000000"
+         virtualName="" explicitFocusOrder="0" pos="148 211 150 24" edTextCol="ff000000"
          edBkgCol="0" labelText="Right upward steps" editableSingleClick="0"
          editableDoubleClick="0" focusDiscardsChanges="0" fontname="Default font"
          fontsize="15" bold="0" italic="0" justification="33"/>
   <TEXTEDITOR name="editRightUpwardSteps" id="3a1cf8588366e0ca" memberName="editRightUpwardSteps"
-              virtualName="" explicitFocusOrder="0" pos="160 72 39 24" initialText=""
+              virtualName="" explicitFocusOrder="0" pos="148 235 39 24" initialText=""
               multiline="0" retKeyStartsLine="0" readonly="0" scrollbars="1"
               caret="1" popupmenu="1"/>
   <LABEL name="editInstructionText" id="c03ef432c2b4599" memberName="editInstructionText"
-         virtualName="" explicitFocusOrder="0" pos="8 8 416 40" edTextCol="ff000000"
+         virtualName="" explicitFocusOrder="0" pos="0 168 416 40" edTextCol="ff000000"
          edBkgCol="0" labelText="Fill a line or the whole field with constant step distances. &#10;Click on desired key field to start."
          editableSingleClick="0" editableDoubleClick="0" focusDiscardsChanges="0"
          fontname="Default font" fontsize="15" bold="0" italic="0" justification="9"/>
+  <GROUPCOMPONENT name="groupMapping" id="fbb69100a7b12118" memberName="groupMapping"
+                  virtualName="" explicitFocusOrder="0" pos="0 8 416 152" title="Mapping"/>
+  <COMBOBOX name="cbMappingStyle" id="a7825b65cfb78392" memberName="cbMappingStyle"
+            virtualName="" explicitFocusOrder="0" pos="105 31 296 24" editable="0"
+            layout="33" items="MIDI notes, increasing order" textWhenNonSelected=""
+            textWhenNoItems="(no choices)"/>
+  <LABEL name="labelMappingStyle" id="d77d8a4b80130afc" memberName="labelMappingStyle"
+         virtualName="" explicitFocusOrder="0" pos="12 32 88 24" edTextCol="ff000000"
+         edBkgCol="0" labelText="Style:" editableSingleClick="0" editableDoubleClick="0"
+         focusDiscardsChanges="0" fontname="Default font" fontsize="15"
+         bold="0" italic="0" justification="33"/>
 </JUCER_COMPONENT>
 
 END_JUCER_METADATA
diff --git a/Source/IsomorphicMassAssign.h b/Source/IsomorphicMassAssign.h
index 798f2467..07bd3210 100644
--- a/Source/IsomorphicMassAssign.h
+++ b/Source/IsomorphicMassAssign.h
@@ -7,7 +7,7 @@
   the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
   and re-saved.
 
-  Created with Projucer version: 4.2.1
+  Created with Projucer version: 4.3.1
 
   ------------------------------------------------------------------------------
 
@@ -21,8 +21,9 @@
 #define __JUCE_HEADER_730F20A4628CA114__
 
 //[Headers]     -- You can add your own extra header files here --
-#include "../../JuceLibraryCode/JuceHeader.h"
+#include "../JuceLibraryCode/JuceHeader.h"
 #include "MappingLogic.h"
+#include "IncrMidiNotesMapping.h"
 #include "BoardGeometry.h"
 //[/Headers]
 
@@ -37,8 +38,8 @@
                                                                     //[/Comments]
 */
 class IsomorphicMassAssign  : public Component,
-                              public MappingLogicListener,
-                              public ComboBoxListener
+                              public ComboBoxListener,
+                              public MappingLogicListener
 {
 public:
     //==============================================================================
@@ -47,6 +48,7 @@ class IsomorphicMassAssign  : public Component,
 
     //==============================================================================
     //[UserMethods]     -- You can add your own custom methods in this section.
+	// Implementation of MappingLogicListener
 	// Set, save and maybe send data of one key
 	void setSaveSend(int setSelection, int keySelection, int noteIndex);
 
@@ -55,7 +57,7 @@ class IsomorphicMassAssign  : public Component,
 
 	// Fill a horizontal line and its cutting upwards lines, recursively
 	void fill2DHorizLineRecursive(int setSelection, TerpstraBoardGeometry::StraightLine& horizLine, int startPos, int startNoteIndex,
-		int horizStepSize, int rUpwStepSize, 
+		int horizStepSize, int rUpwStepSize,
 		TerpstraBoardGeometry::StraightLineSet& finishedLines);
 
 	// Fill a right upward line and its cutting horizontal lines, recursively
@@ -63,10 +65,9 @@ class IsomorphicMassAssign  : public Component,
 		int horizStepSize, int rUpwStepSize,
 		TerpstraBoardGeometry::StraightLineSet& finishedLines);
 
-
 	// Implementation of MappingLogicListener
 	void mappingLogicChanged(MappingLogicBase* mappingLogicThatChanged) override;
-	// Edit operation when a key field in MainComponent has been clicked
+
 	void PerformMouseClickEdit(int setSelection, int keySelection);
     //[/UserMethods]
 
@@ -75,22 +76,26 @@ class IsomorphicMassAssign  : public Component,
     void comboBoxChanged (ComboBox* comboBoxThatHasChanged) override;
 
 
+
 private:
     //[UserVariables]   -- You can add your own custom variables in this section.
+	ScopedPointer<IncrMidiNotesMapping>	incrMidiNotesMapping;
+
 	MappingLogicBase*		mappingLogic;
 	TerpstraBoardGeometry	boardGeometry;
     //[/UserVariables]
 
     //==============================================================================
-    ScopedPointer<ComboBox> startingPointeBox;
+    ScopedPointer<ComboBox> startingPointBox;
     ScopedPointer<Label> labelStartingPoint;
     ScopedPointer<Label> labelHorizontalSteps;
     ScopedPointer<TextEditor> editHorizontalSteps;
     ScopedPointer<Label> labelRightUpwardSteps;
     ScopedPointer<TextEditor> editRightUpwardSteps;
     ScopedPointer<Label> editInstructionText;
-    Path internalPath1;
-    Path internalPath2;
+    ScopedPointer<GroupComponent> groupMapping;
+    ScopedPointer<ComboBox> cbMappingStyle;
+    ScopedPointer<Label> labelMappingStyle;
 
 
     //==============================================================================
diff --git a/Source/KeyboardDataStructure.cpp b/Source/KeyboardDataStructure.cpp
index 3d053440..a276895a 100644
--- a/Source/KeyboardDataStructure.cpp
+++ b/Source/KeyboardDataStructure.cpp
@@ -69,8 +69,6 @@ void TerpstraKeyMapping::fromStringArray(const StringArray& stringArray)
 				else
 					jassert(false);
 			}
-			else
-				jassert(false);
 		}
 		else if ((pos1 = currentLine.indexOf("Chan_")) >= 0)
 		{
@@ -79,7 +77,7 @@ void TerpstraKeyMapping::fromStringArray(const StringArray& stringArray)
 			{
 				int keyIndex = currentLine.substring(pos1 + 5, pos2).getIntValue();
 				int keyValue = currentLine.substring(pos2 + 1).getIntValue();
-				if (boardIndex >= 0 && boardIndex < NUMBEROFBOARDS && keyIndex >= 0 && keyIndex < TERPSTRABOARDSIZE )
+				if (boardIndex >= 0 && boardIndex < NUMBEROFBOARDS && keyIndex >= 0 && keyIndex < TERPSTRABOARDSIZE)
 				{
 					sets[boardIndex].theKeys[keyIndex].channelNumber = keyValue;
 					// XXX if keyValue is illegal: error status?
@@ -88,6 +86,23 @@ void TerpstraKeyMapping::fromStringArray(const StringArray& stringArray)
 					jassert(false);
 			}
 		}
+		else if ((pos1 = currentLine.indexOf("Col_")) >= 0)
+		{
+			pos2 = currentLine.indexOf("=");
+			if (pos2 >= 0 && pos2 > pos1)
+			{
+				int keyIndex = currentLine.substring(pos1 + 4, pos2).getIntValue();
+				int colValue = currentLine.substring(pos2 + 1).getHexValue32();
+				if (boardIndex >= 0 && boardIndex < NUMBEROFBOARDS && keyIndex >= 0 && keyIndex < TERPSTRABOARDSIZE)
+				{
+					sets[boardIndex].theKeys[keyIndex].colour = colValue;
+				}
+				else
+					jassert(false);
+			}
+			else
+				jassert(false);
+		}
 	}
 }
 
@@ -107,8 +122,24 @@ StringArray TerpstraKeyMapping::toStringArray()
 		{
 			result.add("Key_" + String(keyIndex) + "=" + String(sets[boardIndex].theKeys[keyIndex].noteNumber));
 			result.add("Chan_" + String(keyIndex) + "=" + String(sets[boardIndex].theKeys[keyIndex].channelNumber));
+			result.add("Col_" + String(keyIndex) + "=" + String::toHexString( (sets[boardIndex].theKeys[keyIndex].colour)));
 		}
 	}
 
 	return result;
 }
+
+SortedSet<int> TerpstraKeyMapping::getUsedColours()
+{
+	SortedSet<int> result;
+
+	for (int boardIndex = 0; boardIndex < NUMBEROFBOARDS; boardIndex++)
+	{
+		for (int keyIndex = 0; keyIndex < TERPSTRABOARDSIZE; keyIndex++)
+		{
+			result.add(sets[boardIndex].theKeys[keyIndex].colour);
+		}
+	}
+
+	return result;
+}
\ No newline at end of file
diff --git a/Source/KeyboardDataStructure.h b/Source/KeyboardDataStructure.h
index c218f6b7..974ef06d 100644
--- a/Source/KeyboardDataStructure.h
+++ b/Source/KeyboardDataStructure.h
@@ -54,6 +54,8 @@ class TerpstraKeyMapping
 
 	void fromStringArray(const StringArray& stringArray);
 	StringArray toStringArray();
+	// The colours that are used 
+	SortedSet<int> getUsedColours();
 
 public:
 	TerpstraKeys	sets[NUMBEROFBOARDS];
diff --git a/Source/MacroButtonsWindow.cpp b/Source/MacroButtonsWindow.cpp
new file mode 100644
index 00000000..25d578c8
--- /dev/null
+++ b/Source/MacroButtonsWindow.cpp
@@ -0,0 +1,200 @@
+/*
+  ==============================================================================
+
+  This is an automatically generated GUI class created by the Projucer!
+
+  Be careful when adding custom code to these files, as only the code within
+  the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
+  and re-saved.
+
+  Created with Projucer version: 4.3.1
+
+  ------------------------------------------------------------------------------
+
+  The Projucer is part of the JUCE library - "Jules' Utility Class Extensions"
+  Copyright (c) 2015 - ROLI Ltd.
+
+  ==============================================================================
+*/
+
+//[Headers] You can add your own extra header files here...
+//[/Headers]
+
+#include "MacroButtonsWindow.h"
+
+
+//[MiscUserDefs] You can add your own user definitions and misc code here...
+//[/MiscUserDefs]
+
+//==============================================================================
+MacroButtonsWindow::MacroButtonsWindow ()
+{
+    //[Constructor_pre] You can add your own custom stuff here..
+    //[/Constructor_pre]
+
+    addAndMakeVisible (btnEnableMacroButtons = new ToggleButton ("btnEnableMacroButtons"));
+    btnEnableMacroButtons->setButtonText (TRANS("Enable Macro Buttons"));
+    btnEnableMacroButtons->addListener (this);
+
+    addAndMakeVisible (lblMacroButtonsInfo = new Label ("lblMacroButtonsInfo",
+                                                        TRANS("When the corresponding macro button is pressed, the selected key mapping file will be sent to the keyboard.")));
+    lblMacroButtonsInfo->setFont (Font (15.00f, Font::plain));
+    lblMacroButtonsInfo->setJustificationType (Justification::centredLeft);
+    lblMacroButtonsInfo->setEditable (false, false, false);
+    lblMacroButtonsInfo->setColour (TextEditor::textColourId, Colours::black);
+    lblMacroButtonsInfo->setColour (TextEditor::backgroundColourId, Colour (0x00000000));
+
+    addAndMakeVisible (lblButton1 = new Label ("lblButton1",
+                                               TRANS("1")));
+    lblButton1->setFont (Font (15.00f, Font::plain));
+    lblButton1->setJustificationType (Justification::centredLeft);
+    lblButton1->setEditable (false, false, false);
+    lblButton1->setColour (TextEditor::textColourId, Colours::black);
+    lblButton1->setColour (TextEditor::backgroundColourId, Colour (0x00000000));
+
+    addAndMakeVisible (textMacroFile1 = new TextEditor ("textMacroFile1"));
+    textMacroFile1->setMultiLine (false);
+    textMacroFile1->setReturnKeyStartsNewLine (false);
+    textMacroFile1->setReadOnly (false);
+    textMacroFile1->setScrollbarsShown (true);
+    textMacroFile1->setCaretVisible (true);
+    textMacroFile1->setPopupMenuEnabled (true);
+    textMacroFile1->setText (String());
+
+    addAndMakeVisible (btnFileSelectMacro1 = new TextButton ("btnFileSelectMacro1"));
+    btnFileSelectMacro1->setButtonText (TRANS("..."));
+    btnFileSelectMacro1->addListener (this);
+
+    drawable1 = Drawable::createFromImageData (BinaryData::TopEdgeButton_png, BinaryData::TopEdgeButton_pngSize);
+
+    //[UserPreSize]
+    //[/UserPreSize]
+
+    setSize (428, 400);
+
+
+    //[Constructor] You can add your own custom stuff here..
+    //[/Constructor]
+}
+
+MacroButtonsWindow::~MacroButtonsWindow()
+{
+    //[Destructor_pre]. You can add your own custom destruction code here..
+    //[/Destructor_pre]
+
+    btnEnableMacroButtons = nullptr;
+    lblMacroButtonsInfo = nullptr;
+    lblButton1 = nullptr;
+    textMacroFile1 = nullptr;
+    btnFileSelectMacro1 = nullptr;
+    drawable1 = nullptr;
+
+
+    //[Destructor]. You can add your own custom destruction code here..
+    //[/Destructor]
+}
+
+//==============================================================================
+void MacroButtonsWindow::paint (Graphics& g)
+{
+    //[UserPrePaint] Add your own custom painting code here..
+    //[/UserPrePaint]
+
+    g.fillAll (Colour (0xffbad0de));
+
+    g.setColour (Colours::black);
+    jassert (drawable1 != 0);
+    if (drawable1 != 0)
+        drawable1->drawWithin (g, Rectangle<float> (12, 20, 100, 46),
+                               RectanglePlacement::stretchToFit, 1.000f);
+
+    //[UserPaint] Add your own custom painting code here..
+    //[/UserPaint]
+}
+
+void MacroButtonsWindow::resized()
+{
+    //[UserPreResize] Add your own custom resize code here..
+    //[/UserPreResize]
+
+    btnEnableMacroButtons->setBounds (136, 24, 150, 24);
+    lblMacroButtonsInfo->setBounds (8, 80, 440, 48);
+    lblButton1->setBounds (8, 136, 31, 24);
+    textMacroFile1->setBounds (48, 136, 150, 24);
+    btnFileSelectMacro1->setBounds (208, 136, 32, 24);
+    //[UserResized] Add your own custom resize handling here..
+    //[/UserResized]
+}
+
+void MacroButtonsWindow::buttonClicked (Button* buttonThatWasClicked)
+{
+    //[UserbuttonClicked_Pre]
+    //[/UserbuttonClicked_Pre]
+
+    if (buttonThatWasClicked == btnEnableMacroButtons)
+    {
+        //[UserButtonCode_btnEnableMacroButtons] -- add your button handler code here..
+        //[/UserButtonCode_btnEnableMacroButtons]
+    }
+    else if (buttonThatWasClicked == btnFileSelectMacro1)
+    {
+        //[UserButtonCode_btnFileSelectMacro1] -- add your button handler code here..
+        //[/UserButtonCode_btnFileSelectMacro1]
+    }
+
+    //[UserbuttonClicked_Post]
+    //[/UserbuttonClicked_Post]
+}
+
+
+
+//[MiscUserCode] You can add your own definitions of your custom methods or any other code here...
+//[/MiscUserCode]
+
+
+//==============================================================================
+#if 0
+/*  -- Projucer information section --
+
+    This is where the Projucer stores the metadata that describe this GUI layout, so
+    make changes in here at your peril!
+
+BEGIN_JUCER_METADATA
+
+<JUCER_COMPONENT documentType="Component" className="MacroButtonsWindow" componentName=""
+                 parentClasses="public Component" constructorParams="" variableInitialisers=""
+                 snapPixels="8" snapActive="1" snapShown="1" overlayOpacity="0.330"
+                 fixedSize="0" initialWidth="428" initialHeight="400">
+  <BACKGROUND backgroundColour="ffbad0de">
+    <IMAGE pos="12 20 100 46" resource="BinaryData::TopEdgeButton_png" opacity="1"
+           mode="0"/>
+  </BACKGROUND>
+  <TOGGLEBUTTON name="btnEnableMacroButtons" id="9e31c84073a54686" memberName="btnEnableMacroButtons"
+                virtualName="" explicitFocusOrder="0" pos="136 24 150 24" buttonText="Enable Macro Buttons"
+                connectedEdges="0" needsCallback="1" radioGroupId="0" state="0"/>
+  <LABEL name="lblMacroButtonsInfo" id="199c7576a5017f09" memberName="lblMacroButtonsInfo"
+         virtualName="" explicitFocusOrder="0" pos="8 80 440 48" edTextCol="ff000000"
+         edBkgCol="0" labelText="When the corresponding macro button is pressed, the selected key mapping file will be sent to the keyboard."
+         editableSingleClick="0" editableDoubleClick="0" focusDiscardsChanges="0"
+         fontname="Default font" fontsize="15" bold="0" italic="0" justification="33"/>
+  <LABEL name="lblButton1" id="20c692b045b913d5" memberName="lblButton1"
+         virtualName="" explicitFocusOrder="0" pos="8 136 31 24" edTextCol="ff000000"
+         edBkgCol="0" labelText="1" editableSingleClick="0" editableDoubleClick="0"
+         focusDiscardsChanges="0" fontname="Default font" fontsize="15"
+         bold="0" italic="0" justification="33"/>
+  <TEXTEDITOR name="textMacroFile1" id="b9bc5baf677ed902" memberName="textMacroFile1"
+              virtualName="" explicitFocusOrder="0" pos="48 136 150 24" initialText=""
+              multiline="0" retKeyStartsLine="0" readonly="0" scrollbars="1"
+              caret="1" popupmenu="1"/>
+  <TEXTBUTTON name="btnFileSelectMacro1" id="23cc77cbad6653d7" memberName="btnFileSelectMacro1"
+              virtualName="" explicitFocusOrder="0" pos="208 136 32 24" buttonText="..."
+              connectedEdges="0" needsCallback="1" radioGroupId="0"/>
+</JUCER_COMPONENT>
+
+END_JUCER_METADATA
+*/
+#endif
+
+
+//[EndFile] You can add extra defines here...
+//[/EndFile]
diff --git a/Source/MacroButtonsWindow.h b/Source/MacroButtonsWindow.h
new file mode 100644
index 00000000..67a5d812
--- /dev/null
+++ b/Source/MacroButtonsWindow.h
@@ -0,0 +1,75 @@
+/*
+  ==============================================================================
+
+  This is an automatically generated GUI class created by the Projucer!
+
+  Be careful when adding custom code to these files, as only the code within
+  the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
+  and re-saved.
+
+  Created with Projucer version: 4.3.1
+
+  ------------------------------------------------------------------------------
+
+  The Projucer is part of the JUCE library - "Jules' Utility Class Extensions"
+  Copyright (c) 2015 - ROLI Ltd.
+
+  ==============================================================================
+*/
+
+#ifndef __JUCE_HEADER_3061B0123720EED2__
+#define __JUCE_HEADER_3061B0123720EED2__
+
+//[Headers]     -- You can add your own extra header files here --
+#include "../JuceLibraryCode/JuceHeader.h"
+//[/Headers]
+
+
+
+//==============================================================================
+/**
+                                                                    //[Comments]
+    An auto-generated component, created by the Projucer.
+
+    Describe your class and how it works here!
+                                                                    //[/Comments]
+*/
+class MacroButtonsWindow  : public Component,
+                            public ButtonListener
+{
+public:
+    //==============================================================================
+    MacroButtonsWindow ();
+    ~MacroButtonsWindow();
+
+    //==============================================================================
+    //[UserMethods]     -- You can add your own custom methods in this section.
+    //[/UserMethods]
+
+    void paint (Graphics& g) override;
+    void resized() override;
+    void buttonClicked (Button* buttonThatWasClicked) override;
+
+
+
+private:
+    //[UserVariables]   -- You can add your own custom variables in this section.
+    //[/UserVariables]
+
+    //==============================================================================
+    ScopedPointer<ToggleButton> btnEnableMacroButtons;
+    ScopedPointer<Label> lblMacroButtonsInfo;
+    ScopedPointer<Label> lblButton1;
+    ScopedPointer<TextEditor> textMacroFile1;
+    ScopedPointer<TextButton> btnFileSelectMacro1;
+    ScopedPointer<Drawable> drawable1;
+
+
+    //==============================================================================
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MacroButtonsWindow)
+};
+
+//[EndFile] You can add extra defines here...
+//[/EndFile]
+
+#endif   // __JUCE_HEADER_3061B0123720EED2__
diff --git a/Source/Main.cpp b/Source/Main.cpp
index 41c99f7d..1610d8ce 100644
--- a/Source/Main.cpp
+++ b/Source/Main.cpp
@@ -51,7 +51,6 @@ void TerpstraSysExApplication::initialise(const String& commandLine)
 	{
 		// commandLine is supposed to contain a file name. Try to open it.
 		currentFile = File(commandLine);
-
 		if (!currentFile.existsAsFile())
 		{
 			// If file name is with quotes, try removing the quotes
@@ -59,7 +58,7 @@ void TerpstraSysExApplication::initialise(const String& commandLine)
 				currentFile = File(commandLine.substring(1, commandLine.length() - 1));
 		}
 
-		openFromCurrentFile(); 
+		openFromCurrentFile();
 	}
 }
 
@@ -329,7 +328,7 @@ bool TerpstraSysExApplication::aboutTerpstraSysEx()
 	// XXX Version: there are the internal constants JUCE_APP_VERSION and JUCE_APP_VERSION_HEX...
 	m << "Terpstra SysEx Utility" << newLine
 		<< newLine
-		<< "Version 0.3.1"	<< newLine
+		<< "Version 0.4.0"	<< newLine
 		<< newLine
 		<< "Original design @ Dylan Horvath 2007" << newLine
 		<< "Reengineered @ Hans Straub 2014" << newLine
diff --git a/Source/Main.h b/Source/Main.h
index ddef9c05..9cce9bab 100644
--- a/Source/Main.h
+++ b/Source/Main.h
@@ -78,6 +78,10 @@ class TerpstraSysExApplication : public JUCEApplication
 			setContentOwned(new MainContentComponent(), true);
 
 			centreWithSize(getWidth(), getHeight());
+#if JUCE_ANDROID
+			setFullScreen(true);
+#endif
+
 			setVisible(true);
 		}
 
diff --git a/Source/MainComponent.cpp b/Source/MainComponent.cpp
index d3e506b6..c0b8ebb5 100644
--- a/Source/MainComponent.cpp
+++ b/Source/MainComponent.cpp
@@ -128,6 +128,8 @@ void MainContentComponent::setData(TerpstraKeyMapping& newData)
 {
 	mappingData = newData;
 
+	noteEditArea->onSetData(newData);
+
 	changeSetSelection(-1);
 	changeSetSelection(0);
 }
diff --git a/Source/MainComponent.h b/Source/MainComponent.h
index a62150ec..d6caf71b 100644
--- a/Source/MainComponent.h
+++ b/Source/MainComponent.h
@@ -15,6 +15,7 @@
 
 #include "ViewComponents.h"
 #include "KeyboardDataStructure.h"
+#include "TerpstraMidiDriver.h"
 #include "MidiEditArea.h"
 #include "NoteEditArea.h"
 
@@ -34,7 +35,7 @@ class MainContentComponent : public Component, public ButtonListener
 	// Transfer of data
 	void setData(TerpstraKeyMapping& newData);
 	void getData(TerpstraKeyMapping& newData);
-	TerpstraKeyMapping&	getMappingInEdit() { return this->mappingData;  }
+	TerpstraKeyMapping&	getMappingInEdit() { return this->mappingData; }
 
 
 	// GUI implementation
@@ -44,7 +45,7 @@ class MainContentComponent : public Component, public ButtonListener
 	void mouseDown(const MouseEvent &event);
 
 private:
-	void changeSetSelection(int newSelection, bool forceRefresh=false);
+	void changeSetSelection(int newSelection, bool forceRefresh = false);
 	void changeSingleKeySelection(int newSelection);
 
 private:
diff --git a/Source/NoteEditArea.cpp b/Source/NoteEditArea.cpp
index a90bcf2b..dad55293 100644
--- a/Source/NoteEditArea.cpp
+++ b/Source/NoteEditArea.cpp
@@ -7,7 +7,7 @@
   the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
   and re-saved.
 
-  Created with Projucer version: 4.2.1
+  Created with Projucer version: 4.3.1
 
   ------------------------------------------------------------------------------
 
@@ -31,10 +31,6 @@
 NoteEditArea::NoteEditArea ()
 {
     //[Constructor_pre] You can add your own custom stuff here..
-	incrMidiNotesMapping = new IncrMidiNotesMapping();
-	addAndMakeVisible(incrMidiNotesMapping);
-	incrMidiNotesMapping->setVisible(false);
-
 	singleNoteAssign = new SingleNoteAssign();
 	addAndMakeVisible(singleNoteAssign);
 	singleNoteAssign->setVisible(false);
@@ -43,23 +39,10 @@ NoteEditArea::NoteEditArea ()
 	addAndMakeVisible(isomorphicMassAssign);
 	isomorphicMassAssign->setVisible(false);
 
-    //[/Constructor_pre]
-
-    addAndMakeVisible (cbMappingStyle = new ComboBox ("cbMappingStyle"));
-    cbMappingStyle->setEditableText (false);
-    cbMappingStyle->setJustificationType (Justification::centredLeft);
-    cbMappingStyle->setTextWhenNothingSelected (String());
-    cbMappingStyle->setTextWhenNoChoicesAvailable (TRANS("(no choices)"));
-    cbMappingStyle->addItem (TRANS("MIDI notes, increasing order"), 1);
-    cbMappingStyle->addListener (this);
-
-    addAndMakeVisible (labelMappingStyle = new Label ("labelMappingStyle",
-                                                      TRANS("Style:")));
-    labelMappingStyle->setFont (Font (15.00f, Font::plain));
-    labelMappingStyle->setJustificationType (Justification::centredLeft);
-    labelMappingStyle->setEditable (false, false, false);
-    labelMappingStyle->setColour (TextEditor::textColourId, Colours::black);
-    labelMappingStyle->setColour (TextEditor::backgroundColourId, Colour (0x00000000));
+	macroButtonsWindow = new MacroButtonsWindow();
+	addAndMakeVisible(macroButtonsWindow);
+	macroButtonsWindow->setVisible(false);
+	//[/Constructor_pre]
 
     addAndMakeVisible (cbEditMode = new ComboBox ("cbEditMode"));
     cbEditMode->setEditableText (false);
@@ -68,19 +51,17 @@ NoteEditArea::NoteEditArea ()
     cbEditMode->setTextWhenNoChoicesAvailable (TRANS("(no choices)"));
     cbEditMode->addItem (TRANS("Assign notes to keys one by one"), 1);
     cbEditMode->addItem (TRANS("Isomorphic mass assign"), 2);
+    cbEditMode->addItem (TRANS("Macro Buttons"), 3);
     cbEditMode->addListener (this);
 
     addAndMakeVisible (labelEditMode = new Label ("labelEditMode",
-                                                  TRANS("Edit Mode:")));
+                                                  TRANS("Edit Function:")));
     labelEditMode->setFont (Font (15.00f, Font::plain));
     labelEditMode->setJustificationType (Justification::centredLeft);
     labelEditMode->setEditable (false, false, false);
     labelEditMode->setColour (TextEditor::textColourId, Colours::black);
     labelEditMode->setColour (TextEditor::backgroundColourId, Colour (0x00000000));
 
-    addAndMakeVisible (groupMapping = new GroupComponent ("groupMapping",
-                                                          TRANS("Mapping")));
-
 
     //[UserPreSize]
     //[/UserPreSize]
@@ -90,13 +71,9 @@ NoteEditArea::NoteEditArea ()
 
     //[Constructor] You can add your own custom stuff here..
 
-	// MappingLogic listener
-	incrMidiNotesMapping->getMappingLogic()->addListener(singleNoteAssign);
-	incrMidiNotesMapping->getMappingLogic()->addListener(isomorphicMassAssign);
-
 	// Default selection
 	// Todo: read from user settings
-	cbMappingStyle->setSelectedItemIndex(0, juce::NotificationType::sendNotification);
+	cbEditMode->setSelectedItemIndex(0, juce::NotificationType::sendNotification);
 
     //[/Constructor]
 }
@@ -104,14 +81,13 @@ NoteEditArea::NoteEditArea ()
 NoteEditArea::~NoteEditArea()
 {
     //[Destructor_pre]. You can add your own custom destruction code here..
-	incrMidiNotesMapping = nullptr;
+	singleNoteAssign = nullptr;
+	isomorphicMassAssign = nullptr;
+	macroButtonsWindow = nullptr;
     //[/Destructor_pre]
 
-    cbMappingStyle = nullptr;
-    labelMappingStyle = nullptr;
     cbEditMode = nullptr;
     labelEditMode = nullptr;
-    groupMapping = nullptr;
 
 
     //[Destructor]. You can add your own custom destruction code here..
@@ -133,17 +109,13 @@ void NoteEditArea::paint (Graphics& g)
 void NoteEditArea::resized()
 {
     //[UserPreResize] Add your own custom resize code here..
-	incrMidiNotesMapping->setBounds(16, MAPPINGSUBWINTOP, EDITSUBWINWIDTH, MAPPINGSUBWINHEIGHT);
+	singleNoteAssign->setBounds(0, NOTEASSIGNSUBWINTOP, EDITSUBWINWIDTH, NOTEASSIGNSUBWINHEIGHT);
+	isomorphicMassAssign->setBounds(0, NOTEASSIGNSUBWINTOP, EDITSUBWINWIDTH, NOTEASSIGNSUBWINHEIGHT);
+	macroButtonsWindow->setBounds(0, NOTEASSIGNSUBWINTOP, EDITSUBWINWIDTH, NOTEASSIGNSUBWINHEIGHT);
+	//[/UserPreResize]
 
-	singleNoteAssign->setBounds(16, NOTEASSIGNSUBWINTOP, EDITSUBWINWIDTH, NOTEASSIGNSUBWINHEIGHT);
-	isomorphicMassAssign->setBounds(16, NOTEASSIGNSUBWINTOP, EDITSUBWINWIDTH, NOTEASSIGNSUBWINHEIGHT);
-    //[/UserPreResize]
-
-    cbMappingStyle->setBounds (112, 24, 296, 24);
-    labelMappingStyle->setBounds (16, 24, 88, 24);
-    cbEditMode->setBounds (112, 176, 296, 24);
-    labelEditMode->setBounds (16, 176, 88, 24);
-    groupMapping->setBounds (8, 8, 416, 152);
+    cbEditMode->setBounds (102, 15, 296, 24);
+    labelEditMode->setBounds (6, 15, 88, 24);
     //[UserResized] Add your own custom resize handling here..
     //[/UserResized]
 }
@@ -153,20 +125,7 @@ void NoteEditArea::comboBoxChanged (ComboBox* comboBoxThatHasChanged)
     //[UsercomboBoxChanged_Pre]
     //[/UsercomboBoxChanged_Pre]
 
-    if (comboBoxThatHasChanged == cbMappingStyle)
-    {
-        //[UserComboBoxCode_cbMappingStyle] -- add your combo box handling code here..
-		int mappingStyle = cbMappingStyle->getSelectedItemIndex();
-
-		// Show sub window corresponding to selected mapping style. Currently there is only one
-		if (mappingStyle == 0)
-			incrMidiNotesMapping->setVisible(true);
-		else
-			incrMidiNotesMapping->setVisible(false);
-
-        //[/UserComboBoxCode_cbMappingStyle]
-    }
-    else if (comboBoxThatHasChanged == cbEditMode)
+    if (comboBoxThatHasChanged == cbEditMode)
     {
         //[UserComboBoxCode_cbEditMode] -- add your combo box handling code here..
 		int editMode = cbEditMode->getSelectedItemIndex();
@@ -177,18 +136,26 @@ void NoteEditArea::comboBoxChanged (ComboBox* comboBoxThatHasChanged)
 		case 0:
 			singleNoteAssign->setVisible(true);
 			isomorphicMassAssign->setVisible(false);
+			macroButtonsWindow->setVisible(false);
 			break;
 		case 1:
 			singleNoteAssign->setVisible(false);
 			isomorphicMassAssign->setVisible(true);
+			macroButtonsWindow->setVisible(false);
+			break;
+		case 2:
+			singleNoteAssign->setVisible(false);
+			isomorphicMassAssign->setVisible(false);
+			// macroButtonsWindow->setVisible(true);
+			// XXX for now: no macro buttons
+			macroButtonsWindow->setVisible(false);
 			break;
 		default:
 			singleNoteAssign->setVisible(false);
 			isomorphicMassAssign->setVisible(false);
+			macroButtonsWindow->setVisible(false);
 			break;
 		}
-		// XXX
-
         //[/UserComboBoxCode_cbEditMode]
     }
 
@@ -200,6 +167,7 @@ void NoteEditArea::comboBoxChanged (ComboBox* comboBoxThatHasChanged)
 
 //[MiscUserCode] You can add your own definitions of your custom methods or any other code here...
 
+// Called from MainComponent when one of the keys is clicked
 void NoteEditArea::PerformMouseClickEdit(int setSelection, int keySelection)
 {
 	jassert(setSelection >= 0 && setSelection < NUMBEROFBOARDS && keySelection >= 0 && keySelection < TERPSTRABOARDSIZE);
@@ -213,8 +181,17 @@ void NoteEditArea::PerformMouseClickEdit(int setSelection, int keySelection)
 	case 1:
 		isomorphicMassAssign->PerformMouseClickEdit(setSelection, keySelection);
 		break;
+
+		// case 2 (macro buttons): no functionality for clicking on a key
 	}
 }
+
+void NoteEditArea::onSetData(TerpstraKeyMapping& newData)
+{
+	// Add colours of the mapping to the cpolozr combo box 
+	singleNoteAssign->onSetData(newData);
+}
+
 //[/MiscUserCode]
 
 
@@ -232,26 +209,15 @@ BEGIN_JUCER_METADATA
                  snapPixels="8" snapActive="1" snapShown="1" overlayOpacity="0.330"
                  fixedSize="0" initialWidth="428" initialHeight="480">
   <BACKGROUND backgroundColour="ffbad0de"/>
-  <COMBOBOX name="cbMappingStyle" id="a7825b65cfb78392" memberName="cbMappingStyle"
-            virtualName="" explicitFocusOrder="0" pos="112 24 296 24" editable="0"
-            layout="33" items="MIDI notes, increasing order" textWhenNonSelected=""
-            textWhenNoItems="(no choices)"/>
-  <LABEL name="labelMappingStyle" id="d77d8a4b80130afc" memberName="labelMappingStyle"
-         virtualName="" explicitFocusOrder="0" pos="16 24 88 24" edTextCol="ff000000"
-         edBkgCol="0" labelText="Style:" editableSingleClick="0" editableDoubleClick="0"
-         focusDiscardsChanges="0" fontname="Default font" fontsize="15"
-         bold="0" italic="0" justification="33"/>
   <COMBOBOX name="cbEditMode" id="1f22301dd42b968e" memberName="cbEditMode"
-            virtualName="" explicitFocusOrder="0" pos="112 176 296 24" editable="0"
-            layout="33" items="Assign notes to keys one by one&#10;Isomorphic mass assign"
+            virtualName="" explicitFocusOrder="0" pos="102 15 296 24" editable="0"
+            layout="33" items="Assign notes to keys one by one&#10;Isomorphic mass assign&#10;Macro Buttons"
             textWhenNonSelected="" textWhenNoItems="(no choices)"/>
   <LABEL name="labelEditMode" id="55d538af27203498" memberName="labelEditMode"
-         virtualName="" explicitFocusOrder="0" pos="16 176 88 24" edTextCol="ff000000"
-         edBkgCol="0" labelText="Edit Mode:" editableSingleClick="0" editableDoubleClick="0"
-         focusDiscardsChanges="0" fontname="Default font" fontsize="15"
-         bold="0" italic="0" justification="33"/>
-  <GROUPCOMPONENT name="groupMapping" id="fbb69100a7b12118" memberName="groupMapping"
-                  virtualName="" explicitFocusOrder="0" pos="8 8 416 152" title="Mapping"/>
+         virtualName="" explicitFocusOrder="0" pos="6 15 88 24" edTextCol="ff000000"
+         edBkgCol="0" labelText="Edit Function:" editableSingleClick="0"
+         editableDoubleClick="0" focusDiscardsChanges="0" fontname="Default font"
+         fontsize="15" bold="0" italic="0" justification="33"/>
 </JUCER_COMPONENT>
 
 END_JUCER_METADATA
diff --git a/Source/NoteEditArea.h b/Source/NoteEditArea.h
index 51964de4..da4f199f 100644
--- a/Source/NoteEditArea.h
+++ b/Source/NoteEditArea.h
@@ -7,7 +7,7 @@
   the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
   and re-saved.
 
-  Created with Projucer version: 4.2.1
+  Created with Projucer version: 4.3.1
 
   ------------------------------------------------------------------------------
 
@@ -21,10 +21,10 @@
 #define __JUCE_HEADER_8469F5B08F113FE2__
 
 //[Headers]     -- You can add your own extra header files here --
-#include "../../JuceLibraryCode/JuceHeader.h"
-#include "IncrMidiNotesMapping.h"
+#include "../JuceLibraryCode/JuceHeader.h"
 #include "SingleNoteAssign.h"
 #include "IsomorphicMassAssign.h"
+#include "MacroButtonsWindow.h"
 //[/Headers]
 
 
@@ -47,8 +47,9 @@ class NoteEditArea  : public Component,
 
     //==============================================================================
     //[UserMethods]     -- You can add your own custom methods in this section.
-	// Edit operation when a key field has been clicked
 	void PerformMouseClickEdit(int setSelection, int keySelection);
+	// Things to be done when a new mapping is loaded. E. g. fill the colour combo box with the colours appearing in the mapping. 
+	void onSetData(TerpstraKeyMapping& newData);
     //[/UserMethods]
 
     void paint (Graphics& g) override;
@@ -59,18 +60,14 @@ class NoteEditArea  : public Component,
 
 private:
     //[UserVariables]   -- You can add your own custom variables in this section.
-	ScopedPointer<IncrMidiNotesMapping>	incrMidiNotesMapping;
-
 	ScopedPointer<SingleNoteAssign> singleNoteAssign;
 	ScopedPointer<IsomorphicMassAssign> isomorphicMassAssign;
+	ScopedPointer<MacroButtonsWindow> macroButtonsWindow;
     //[/UserVariables]
 
     //==============================================================================
-    ScopedPointer<ComboBox> cbMappingStyle;
-    ScopedPointer<Label> labelMappingStyle;
     ScopedPointer<ComboBox> cbEditMode;
     ScopedPointer<Label> labelEditMode;
-    ScopedPointer<GroupComponent> groupMapping;
 
 
     //==============================================================================
diff --git a/Source/SingleNoteAssign.cpp b/Source/SingleNoteAssign.cpp
index a79cd6e3..b8ab9963 100644
--- a/Source/SingleNoteAssign.cpp
+++ b/Source/SingleNoteAssign.cpp
@@ -7,7 +7,7 @@
   the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
   and re-saved.
 
-  Created with Projucer version: 4.2.1
+  Created with Projucer version: 4.3.1
 
   ------------------------------------------------------------------------------
 
@@ -32,44 +32,94 @@
 SingleNoteAssign::SingleNoteAssign ()
 {
     //[Constructor_pre] You can add your own custom stuff here..
-	this->mappingLogic = nullptr;
     //[/Constructor_pre]
 
+    addAndMakeVisible (noteAndChannelAssGroup = new GroupComponent ("noteAndChannelAssGroup",
+                                                                    TRANS("Key Note and Channel Assignments")));
+
     addAndMakeVisible (editInstructionText = new Label ("editInstructionText",
-                                                        TRANS("Assign value to a key by clicking on the desired key-face.")));
+                                                        TRANS("Assign these values to a key by clicking on the desired key-face.")));
     editInstructionText->setFont (Font (15.00f, Font::plain));
-    editInstructionText->setJustificationType (Justification::topLeft);
+    editInstructionText->setJustificationType (Justification::centredLeft);
     editInstructionText->setEditable (false, false, false);
     editInstructionText->setColour (TextEditor::textColourId, Colours::black);
     editInstructionText->setColour (TextEditor::backgroundColourId, Colour (0x00000000));
 
+    addAndMakeVisible (noteBox = new ComboBox ("noteBox"));
+    noteBox->setEditableText (false);
+    noteBox->setJustificationType (Justification::centredLeft);
+    noteBox->setTextWhenNothingSelected (String());
+    noteBox->setTextWhenNoChoicesAvailable (TRANS("(no choices)"));
+    noteBox->addListener (this);
+
     addAndMakeVisible (noteAutoIncrButton = new ToggleButton ("noteAutoIncrButton"));
-    noteAutoIncrButton->setButtonText (TRANS("Auto Increment after click"));
+    noteAutoIncrButton->setButtonText (TRANS("Auto Increment"));
     noteAutoIncrButton->addListener (this);
 
-    addAndMakeVisible (nextValueBox = new ComboBox ("nextValueBox"));
-    nextValueBox->setEditableText (false);
-    nextValueBox->setJustificationType (Justification::centredLeft);
-    nextValueBox->setTextWhenNothingSelected (String());
-    nextValueBox->setTextWhenNoChoicesAvailable (TRANS("(no choices)"));
-    nextValueBox->addListener (this);
-
-    addAndMakeVisible (labelNextValue = new Label ("labelNextValue",
-                                                   TRANS("Next value")));
-    labelNextValue->setFont (Font (15.00f, Font::plain));
-    labelNextValue->setJustificationType (Justification::centredLeft);
-    labelNextValue->setEditable (false, false, false);
-    labelNextValue->setColour (TextEditor::textColourId, Colours::black);
-    labelNextValue->setColour (TextEditor::backgroundColourId, Colour (0x00000000));
+    addAndMakeVisible (channelBox = new ComboBox ("channelBox"));
+    channelBox->setEditableText (false);
+    channelBox->setJustificationType (Justification::centredLeft);
+    channelBox->setTextWhenNothingSelected (String());
+    channelBox->setTextWhenNoChoicesAvailable (TRANS("(no choices)"));
+    channelBox->addListener (this);
+
+    addAndMakeVisible (channelAutoIncrButton = new ToggleButton ("channelAutoIncrButton"));
+    channelAutoIncrButton->setButtonText (TRANS("Increment after Note #"));
+    channelAutoIncrButton->addListener (this);
+
+    addAndMakeVisible (channelAutoIncrNoteBox = new ComboBox ("channelAutoIncrNoteBox"));
+    channelAutoIncrNoteBox->setTooltip (TRANS("After reaching this note, the channel is incremented and the note is reset to 0."));
+    channelAutoIncrNoteBox->setEditableText (false);
+    channelAutoIncrNoteBox->setJustificationType (Justification::centredLeft);
+    channelAutoIncrNoteBox->setTextWhenNothingSelected (String());
+    channelAutoIncrNoteBox->setTextWhenNoChoicesAvailable (TRANS("(no choices)"));
+    channelAutoIncrNoteBox->addListener (this);
+
+    addAndMakeVisible (setNoteToggleButton = new ToggleButton ("setNoteToggleButton"));
+    setNoteToggleButton->setButtonText (TRANS("Note (0-127):"));
+    setNoteToggleButton->addListener (this);
+
+    addAndMakeVisible (setChannelToggleButton = new ToggleButton ("setChannelToggleButton"));
+    setChannelToggleButton->setButtonText (TRANS("Channel (1-16):"));
+    setChannelToggleButton->addListener (this);
+
+    addAndMakeVisible (setColourToggleButton = new ToggleButton ("setColourToggleButton"));
+    setColourToggleButton->setButtonText (TRANS("Colour:"));
+    setColourToggleButton->addListener (this);
+
+    addAndMakeVisible (btnColourPicker = new TextButton ("btnColourPicker"));
+    btnColourPicker->setButtonText (TRANS("Colour picker"));
+    btnColourPicker->addListener (this);
+
+    addAndMakeVisible (colourCombo = new ColourComboBox ("colourCombo"));
+    colourCombo->setEditableText (true);
+    colourCombo->setJustificationType (Justification::centredLeft);
+    colourCombo->setTextWhenNothingSelected (String());
+    colourCombo->setTextWhenNoChoicesAvailable (TRANS("(no choices)"));
+    colourCombo->addListener (this);
 
 
     //[UserPreSize]
     //[/UserPreSize]
 
-    setSize (428, 220);
+    setSize (428, 325);
 
 
     //[Constructor] You can add your own custom stuff here..
+	for (int i = 0; i <= 127; i++)
+	{
+		noteBox->addItem(String(i), i + 1);
+		channelAutoIncrNoteBox->addItem(String(i), i + 1);
+	}
+
+	for (int i = 1; i <= 16; i++)
+		channelBox->addItem(String(i), i);
+
+	setNoteToggleButton->setToggleState(true, juce::NotificationType::sendNotification);
+	setChannelToggleButton->setToggleState(true, juce::NotificationType::sendNotification);
+	setColourToggleButton->setToggleState(true, juce::NotificationType::sendNotification);
+
+	//colourCombo->setTextFieldToColour(XXX);
     //[/Constructor]
 }
 
@@ -78,10 +128,18 @@ SingleNoteAssign::~SingleNoteAssign()
     //[Destructor_pre]. You can add your own custom destruction code here..
     //[/Destructor_pre]
 
+    noteAndChannelAssGroup = nullptr;
     editInstructionText = nullptr;
+    noteBox = nullptr;
     noteAutoIncrButton = nullptr;
-    nextValueBox = nullptr;
-    labelNextValue = nullptr;
+    channelBox = nullptr;
+    channelAutoIncrButton = nullptr;
+    channelAutoIncrNoteBox = nullptr;
+    setNoteToggleButton = nullptr;
+    setChannelToggleButton = nullptr;
+    setColourToggleButton = nullptr;
+    btnColourPicker = nullptr;
+    colourCombo = nullptr;
 
 
     //[Destructor]. You can add your own custom destruction code here..
@@ -105,14 +163,52 @@ void SingleNoteAssign::resized()
     //[UserPreResize] Add your own custom resize code here..
     //[/UserPreResize]
 
-    editInstructionText->setBounds (8, 8, 416, 32);
-    noteAutoIncrButton->setBounds (192, 64, 200, 24);
-    nextValueBox->setBounds (16, 64, 150, 24);
-    labelNextValue->setBounds (16, 40, 150, 24);
+    noteAndChannelAssGroup->setBounds (0, 8, 424, 176);
+    editInstructionText->setBounds (8, 32, 352, 24);
+    noteBox->setBounds (120, 64, 56, 24);
+    noteAutoIncrButton->setBounds (192, 64, 160, 24);
+    channelBox->setBounds (120, 96, 56, 24);
+    channelAutoIncrButton->setBounds (192, 96, 160, 24);
+    channelAutoIncrNoteBox->setBounds (360, 96, 56, 24);
+    setNoteToggleButton->setBounds (8, 64, 112, 24);
+    setChannelToggleButton->setBounds (8, 96, 112, 24);
+    setColourToggleButton->setBounds (8, 136, 112, 24);
+    btnColourPicker->setBounds (216, 136, 104, 24);
+    colourCombo->setBounds (120, 136, 79, 24);
     //[UserResized] Add your own custom resize handling here..
     //[/UserResized]
 }
 
+void SingleNoteAssign::comboBoxChanged (ComboBox* comboBoxThatHasChanged)
+{
+    //[UsercomboBoxChanged_Pre]
+    //[/UsercomboBoxChanged_Pre]
+
+    if (comboBoxThatHasChanged == noteBox)
+    {
+        //[UserComboBoxCode_noteBox] -- add your combo box handling code here..
+        //[/UserComboBoxCode_noteBox]
+    }
+    else if (comboBoxThatHasChanged == channelBox)
+    {
+        //[UserComboBoxCode_channelBox] -- add your combo box handling code here..
+        //[/UserComboBoxCode_channelBox]
+    }
+    else if (comboBoxThatHasChanged == channelAutoIncrNoteBox)
+    {
+        //[UserComboBoxCode_channelAutoIncrNoteBox] -- add your combo box handling code here..
+        //[/UserComboBoxCode_channelAutoIncrNoteBox]
+    }
+    else if (comboBoxThatHasChanged == colourCombo)
+    {
+        //[UserComboBoxCode_colourCombo] -- add your combo box handling code here..
+        //[/UserComboBoxCode_colourCombo]
+    }
+
+    //[UsercomboBoxChanged_Post]
+    //[/UsercomboBoxChanged_Post]
+}
+
 void SingleNoteAssign::buttonClicked (Button* buttonThatWasClicked)
 {
     //[UserbuttonClicked_Pre]
@@ -123,44 +219,69 @@ void SingleNoteAssign::buttonClicked (Button* buttonThatWasClicked)
         //[UserButtonCode_noteAutoIncrButton] -- add your button handler code here..
         //[/UserButtonCode_noteAutoIncrButton]
     }
+    else if (buttonThatWasClicked == channelAutoIncrButton)
+    {
+        //[UserButtonCode_channelAutoIncrButton] -- add your button handler code here..
+        //[/UserButtonCode_channelAutoIncrButton]
+    }
+    else if (buttonThatWasClicked == setNoteToggleButton)
+    {
+        //[UserButtonCode_setNoteToggleButton] -- add your button handler code here..
+		bool fieldActive = setNoteToggleButton->getToggleState();
+		noteBox->setEnabled(fieldActive);
+		noteAutoIncrButton->setEnabled(fieldActive);
+        //[/UserButtonCode_setNoteToggleButton]
+    }
+    else if (buttonThatWasClicked == setChannelToggleButton)
+    {
+        //[UserButtonCode_setChannelToggleButton] -- add your button handler code here..
+		bool fieldActive = setChannelToggleButton->getToggleState();
+		channelBox->setEnabled(fieldActive);
+		channelAutoIncrButton->setEnabled(fieldActive);
+		channelAutoIncrNoteBox->setEnabled(fieldActive);
+        //[/UserButtonCode_setChannelToggleButton]
+    }
+    else if (buttonThatWasClicked == setColourToggleButton)
+    {
+        //[UserButtonCode_setColourToggleButton] -- add your button handler code here..
+		bool fieldActive = setColourToggleButton->getToggleState();
+		colourCombo->setEnabled(fieldActive);
+		btnColourPicker->setEnabled(fieldActive);
+        //[/UserButtonCode_setColourToggleButton]
+    }
+    else if (buttonThatWasClicked == btnColourPicker)
+    {
+        //[UserButtonCode_btnColourPicker] -- add your button handler code here..
+		ColourSelector* colourSelector = new ColourSelector(ColourSelector::showSliders | ColourSelector::showColourspace);
+		colourSelector->setName("Colour picker");
+		colourSelector->addChangeListener(this);
 
-    //[UserbuttonClicked_Post]
-    //[/UserbuttonClicked_Post]
-}
+		Colour currentColor = colourCombo->getColourAsObjectFromText(ColourComboBox::DoNotAddColourToCombobox);
 
-void SingleNoteAssign::comboBoxChanged (ComboBox* comboBoxThatHasChanged)
-{
-    //[UsercomboBoxChanged_Pre]
-    //[/UsercomboBoxChanged_Pre]
+		colourSelector->setCurrentColour(currentColor);
 
-    if (comboBoxThatHasChanged == nextValueBox)
-    {
-        //[UserComboBoxCode_nextValueBox] -- add your combo box handling code here..
-        //[/UserComboBoxCode_nextValueBox]
+		colourSelector->setColour(ColourSelector::backgroundColourId, currentColor );
+		colourSelector->setSize(300, 400);
+
+		CallOutBox::launchAsynchronously(colourSelector, buttonThatWasClicked->getScreenBounds(), nullptr);
+        //[/UserButtonCode_btnColourPicker]
     }
 
-    //[UsercomboBoxChanged_Post]
-    //[/UsercomboBoxChanged_Post]
+    //[UserbuttonClicked_Post]
+    //[/UserbuttonClicked_Post]
 }
 
 
 
 //[MiscUserCode] You can add your own definitions of your custom methods or any other code here...
 
-// Implementation of MappingLogicListener
-void SingleNoteAssign::mappingLogicChanged(MappingLogicBase* mappingLogicThatChanged)
+void SingleNoteAssign::changeListenerCallback(ChangeBroadcaster *source)
 {
-	this->mappingLogic = mappingLogicThatChanged;
+	ColourSelector* cs = dynamic_cast <ColourSelector*> (source);
 
-	// Fill note combo with values according to mapping logic
-	nextValueBox->clear(juce::NotificationType::dontSendNotification);
+	Colour currentColor = cs->getCurrentColour();
 
-	for (int i = 0; i < mappingLogicThatChanged->globalMappingSize(); i++)
-	{
-		TerpstraKey keyData = mappingLogicThatChanged->indexToTerpstraKey(i);
-		// XXX format text
-		nextValueBox->addItem(String(i) + ": Key_" + String(keyData.noteNumber) + ", Chan_" + String(keyData.channelNumber), i + 1);
-	}
+	colourCombo->setTextFieldToColourAsObject(currentColor);
 }
 
 // Called from MainComponent when one of the keys is clicked
@@ -168,30 +289,58 @@ void SingleNoteAssign::PerformMouseClickEdit(int setSelection, int keySelection)
 {
 	jassert(setSelection >= 0 && setSelection < NUMBEROFBOARDS && keySelection >= 0 && keySelection < TERPSTRABOARDSIZE);
 
-	TerpstraKey keyData;	// Default constructor constructs and "empty" object
+	TerpstraKey& keyData = ((MainContentComponent*)(getParentComponent()->getParentComponent()))->getMappingInEdit().sets[setSelection].theKeys[keySelection];
+
+	// Set note if specified
+	if (setNoteToggleButton->getToggleState())
+	{
+		keyData.noteNumber = noteBox->getSelectedItemIndex(); //-1 for no selection or 0-127
+		if (keyData.noteNumber < 0) keyData.noteNumber = 0;
+	}
 
-	// Can only be done if there is a mapping defined and a value has been selected in the combo box
-	int noteIndex = this->nextValueBox->getSelectedItemIndex();
-	if (this->mappingLogic != nullptr && noteIndex >= 0)
-		keyData = this->mappingLogic->indexToTerpstraKey(noteIndex);
-	// XXX set empty values, too?
+	// Set channel if specified
+	if (setChannelToggleButton->getToggleState())
+	{
+		keyData.channelNumber = channelBox->getSelectedId();	// 0 for no selection or 1-16
+	}
 
-	((MainContentComponent*)(getParentComponent()->getParentComponent()))->getMappingInEdit().sets[setSelection].theKeys[keySelection] = keyData;		// Save data
+	// Set colour if specified
+	if (setColourToggleButton->getToggleState())
+	{
+		keyData.colour = colourCombo->getColourAsNumberFromText(ColourComboBox::AddColourToComboBox);
+	}
 
 	// Send to device
 	TerpstraSysExApplication::getApp().getMidiDriver().sendAndMaybeSaveKeyParam(setSelection + 1, keySelection, keyData);
 
 	// Auto increment note
-	if (this->noteAutoIncrButton->getToggleState())
+	if (noteAutoIncrButton->getToggleState())
 	{
-		noteIndex++;
-		if (noteIndex > this->mappingLogic->globalMappingSize())
-			noteIndex = -1;	// This means stop here
-
-		this->nextValueBox->setSelectedItemIndex(noteIndex);	// Set to "nothing" at the end
+		int newNote = keyData.noteNumber + 1;
+
+		// Auto increment channel
+		if (channelAutoIncrButton->getToggleState() && channelAutoIncrNoteBox->getSelectedItemIndex() > 0 &&
+			newNote > channelAutoIncrNoteBox->getSelectedItemIndex())
+		{
+			newNote = 0;
+			int newChannel = keyData.channelNumber + 1;
+			if (newChannel > 16)
+				newChannel = 1;
+			channelBox->setSelectedId(newChannel);
+		}
+
+		if (newNote > 127)
+			newNote = 0;
+
+		noteBox->setSelectedItemIndex(newNote);
 	}
+}
 
-	// Refresh display: done in MainComponent
+void SingleNoteAssign::onSetData(TerpstraKeyMapping& newData)
+{
+	SortedSet<int> usedColours = newData.getUsedColours();
+	for (int pos = 0; pos < usedColours.size(); pos++)
+		colourCombo->addColourToBox(usedColours[pos]);
 }
 
 //[/MiscUserCode]
@@ -207,27 +356,47 @@ void SingleNoteAssign::PerformMouseClickEdit(int setSelection, int keySelection)
 BEGIN_JUCER_METADATA
 
 <JUCER_COMPONENT documentType="Component" className="SingleNoteAssign" componentName=""
-                 parentClasses="public Component, public MappingLogicListener"
-                 constructorParams="" variableInitialisers="" snapPixels="8" snapActive="1"
-                 snapShown="1" overlayOpacity="0.330" fixedSize="0" initialWidth="428"
-                 initialHeight="220">
+                 parentClasses="public Component" constructorParams="" variableInitialisers=""
+                 snapPixels="8" snapActive="1" snapShown="1" overlayOpacity="0.330"
+                 fixedSize="0" initialWidth="428" initialHeight="325">
   <BACKGROUND backgroundColour="ffbad0de"/>
+  <GROUPCOMPONENT name="noteAndChannelAssGroup" id="cd12ee7381d485a1" memberName="noteAndChannelAssGroup"
+                  virtualName="" explicitFocusOrder="0" pos="0 8 424 176" title="Key Note and Channel Assignments"/>
   <LABEL name="editInstructionText" id="c03ef432c2b4599" memberName="editInstructionText"
-         virtualName="" explicitFocusOrder="0" pos="8 8 416 32" edTextCol="ff000000"
-         edBkgCol="0" labelText="Assign value to a key by clicking on the desired key-face."
+         virtualName="" explicitFocusOrder="0" pos="8 32 352 24" edTextCol="ff000000"
+         edBkgCol="0" labelText="Assign these values to a key by clicking on the desired key-face."
          editableSingleClick="0" editableDoubleClick="0" focusDiscardsChanges="0"
-         fontname="Default font" fontsize="15" bold="0" italic="0" justification="9"/>
+         fontname="Default font" fontsize="15" bold="0" italic="0" justification="33"/>
+  <COMBOBOX name="noteBox" id="123cacc6155f964" memberName="noteBox" virtualName=""
+            explicitFocusOrder="0" pos="120 64 56 24" editable="0" layout="33"
+            items="" textWhenNonSelected="" textWhenNoItems="(no choices)"/>
   <TOGGLEBUTTON name="noteAutoIncrButton" id="49829699593b11f7" memberName="noteAutoIncrButton"
-                virtualName="" explicitFocusOrder="0" pos="192 64 200 24" buttonText="Auto Increment after click"
+                virtualName="" explicitFocusOrder="0" pos="192 64 160 24" buttonText="Auto Increment"
                 connectedEdges="0" needsCallback="1" radioGroupId="0" state="0"/>
-  <COMBOBOX name="nextValueBox" id="d526f69bdc196fea" memberName="nextValueBox"
-            virtualName="" explicitFocusOrder="0" pos="16 64 150 24" editable="0"
+  <COMBOBOX name="channelBox" id="208bbc8901c22319" memberName="channelBox"
+            virtualName="" explicitFocusOrder="0" pos="120 96 56 24" editable="0"
             layout="33" items="" textWhenNonSelected="" textWhenNoItems="(no choices)"/>
-  <LABEL name="labelNextValue" id="f3311767abde1a79" memberName="labelNextValue"
-         virtualName="" explicitFocusOrder="0" pos="16 40 150 24" edTextCol="ff000000"
-         edBkgCol="0" labelText="Next value" editableSingleClick="0" editableDoubleClick="0"
-         focusDiscardsChanges="0" fontname="Default font" fontsize="15"
-         bold="0" italic="0" justification="33"/>
+  <TOGGLEBUTTON name="channelAutoIncrButton" id="1749290d10236ec3" memberName="channelAutoIncrButton"
+                virtualName="" explicitFocusOrder="0" pos="192 96 160 24" buttonText="Increment after Note #"
+                connectedEdges="0" needsCallback="1" radioGroupId="0" state="0"/>
+  <COMBOBOX name="channelAutoIncrNoteBox" id="4560285c5e467e2f" memberName="channelAutoIncrNoteBox"
+            virtualName="" explicitFocusOrder="0" pos="360 96 56 24" tooltip="After reaching this note, the channel is incremented and the note is reset to 0."
+            editable="0" layout="33" items="" textWhenNonSelected="" textWhenNoItems="(no choices)"/>
+  <TOGGLEBUTTON name="setNoteToggleButton" id="79f2522d584925d1" memberName="setNoteToggleButton"
+                virtualName="" explicitFocusOrder="0" pos="8 64 112 24" buttonText="Note (0-127):"
+                connectedEdges="0" needsCallback="1" radioGroupId="0" state="0"/>
+  <TOGGLEBUTTON name="setChannelToggleButton" id="f79f82eef6095c3c" memberName="setChannelToggleButton"
+                virtualName="" explicitFocusOrder="0" pos="8 96 112 24" buttonText="Channel (1-16):"
+                connectedEdges="0" needsCallback="1" radioGroupId="0" state="0"/>
+  <TOGGLEBUTTON name="setColourToggleButton" id="fb41f2b9539dfb3f" memberName="setColourToggleButton"
+                virtualName="" explicitFocusOrder="0" pos="8 136 112 24" buttonText="Colour:"
+                connectedEdges="0" needsCallback="1" radioGroupId="0" state="0"/>
+  <TEXTBUTTON name="btnColourPicker" id="fb8f62a75c5cd9ec" memberName="btnColourPicker"
+              virtualName="" explicitFocusOrder="0" pos="216 136 104 24" buttonText="Colour picker"
+              connectedEdges="0" needsCallback="1" radioGroupId="0"/>
+  <COMBOBOX name="colourCombo" id="86628debb1bafc04" memberName="colourCombo"
+            virtualName="ColourComboBox" explicitFocusOrder="0" pos="120 136 79 24"
+            editable="1" layout="33" items="" textWhenNonSelected="" textWhenNoItems="(no choices)"/>
 </JUCER_COMPONENT>
 
 END_JUCER_METADATA
diff --git a/Source/SingleNoteAssign.h b/Source/SingleNoteAssign.h
index c09a2b7f..cc10d4a9 100644
--- a/Source/SingleNoteAssign.h
+++ b/Source/SingleNoteAssign.h
@@ -7,7 +7,7 @@
   the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
   and re-saved.
 
-  Created with Projucer version: 4.2.1
+  Created with Projucer version: 4.3.1
 
   ------------------------------------------------------------------------------
 
@@ -22,7 +22,8 @@
 
 //[Headers]     -- You can add your own extra header files here --
 #include "JuceHeader.h"
-#include "MappingLogic.h"
+#include "KeyboardDataStructure.h"
+#include "ViewComponents.h"
 //[/Headers]
 
 
@@ -36,9 +37,9 @@
                                                                     //[/Comments]
 */
 class SingleNoteAssign  : public Component,
-                          public MappingLogicListener,
+                          public ComboBoxListener,
                           public ButtonListener,
-                          public ComboBoxListener
+                          public ChangeListener
 {
 public:
     //==============================================================================
@@ -47,29 +48,35 @@ class SingleNoteAssign  : public Component,
 
     //==============================================================================
     //[UserMethods]     -- You can add your own custom methods in this section.
-	// Implementation of MappingLogicListener
-	void mappingLogicChanged(MappingLogicBase* mappingLogicThatChanged) override;
-
-	// Edit operation when a key field in MainComponent has been clicked
+	void changeListenerCallback(ChangeBroadcaster *source) override;
 	void PerformMouseClickEdit(int setSelection, int keySelection);
-	//[/UserMethods]
+	void onSetData(TerpstraKeyMapping& newData);
+    //[/UserMethods]
 
     void paint (Graphics& g) override;
     void resized() override;
-    void buttonClicked (Button* buttonThatWasClicked) override;
     void comboBoxChanged (ComboBox* comboBoxThatHasChanged) override;
+    void buttonClicked (Button* buttonThatWasClicked) override;
+
 
 
 private:
     //[UserVariables]   -- You can add your own custom variables in this section.
-	MappingLogicBase*	mappingLogic;
     //[/UserVariables]
 
     //==============================================================================
+    ScopedPointer<GroupComponent> noteAndChannelAssGroup;
     ScopedPointer<Label> editInstructionText;
+    ScopedPointer<ComboBox> noteBox;
     ScopedPointer<ToggleButton> noteAutoIncrButton;
-    ScopedPointer<ComboBox> nextValueBox;
-    ScopedPointer<Label> labelNextValue;
+    ScopedPointer<ComboBox> channelBox;
+    ScopedPointer<ToggleButton> channelAutoIncrButton;
+    ScopedPointer<ComboBox> channelAutoIncrNoteBox;
+    ScopedPointer<ToggleButton> setNoteToggleButton;
+    ScopedPointer<ToggleButton> setChannelToggleButton;
+    ScopedPointer<ToggleButton> setColourToggleButton;
+    ScopedPointer<TextButton> btnColourPicker;
+    ScopedPointer<ColourComboBox> colourCombo;
 
 
     //==============================================================================
diff --git a/Source/ViewComponents.cpp b/Source/ViewComponents.cpp
index fd38df3b..102a8cda 100644
--- a/Source/ViewComponents.cpp
+++ b/Source/ViewComponents.cpp
@@ -18,23 +18,16 @@ TerpstraKeyEdit class
 */
 
 TerpstraKeyEdit::TerpstraKeyEdit()
-: isSelected(false)
+	: isSelected(false), keyColour(0)
 {
 	midiNoteLabel = new Label("midiNoteLabel", "0");
 	addAndMakeVisible(midiNoteLabel);
 	midiNoteLabel->setBounds((TERPSTRASINGLEKEYFLDSIZE - 30) / 2, TERPSTRASINGLEKEYFLDSIZE / 2 - 15, 30, STANDARDLABELHEIGTH);
 	midiNoteLabel->setFont( midiNoteLabel->getFont().boldened());
 
-	//channelTextLabel = new Label("channelTextLabel", "Ch.");
-	//addAndMakeVisible(channelTextLabel);
-	//channelTextLabel->setBounds(TERPSTRASINGLEKEYFLDSIZE / 2-10, 25, 10, 10);
-	//channelTextLabel->setText("Ch.", sendNotification);
-
 	midiChannelLabel = new Label("midiChannelLabel", "0");
 	addAndMakeVisible(midiChannelLabel);
 	midiChannelLabel->setBounds((TERPSTRASINGLEKEYFLDSIZE - 25) / 2, TERPSTRASINGLEKEYFLDSIZE / 2, 25, STANDARDLABELHEIGTH);
-
-	//channelTextLabel->attachToComponent(midiChannelLabel, true);
 }
 
 TerpstraKeyEdit::~TerpstraKeyEdit()
@@ -47,7 +40,7 @@ TerpstraKey TerpstraKeyEdit::getValue() const
 	TerpstraKey newValue;
 	newValue.noteNumber = midiNoteLabel->getText().getIntValue();
 	newValue.channelNumber = midiChannelLabel->getText().getIntValue();
-	// XXX colour
+	newValue.colour = keyColour;
 
 	return newValue;
 }
@@ -56,7 +49,7 @@ void TerpstraKeyEdit::setValue(TerpstraKey newValue)
 {
 	midiNoteLabel->setText(String(newValue.noteNumber), juce::NotificationType::sendNotification);
 	midiChannelLabel->setText(String(newValue.channelNumber), juce::NotificationType::sendNotification);
-	// XXX colour
+	keyColour = newValue.colour;
 
 	repaint();
 }
@@ -76,14 +69,18 @@ void TerpstraKeyEdit::paint(Graphics& g)
 	float w = this->getWidth();
 	float h = this->getHeight();
 
+	// Selected or not: color and thickness of the line
+	float lineWidth = isSelected ? TERPSTRASELECTEDKEYFLDLINEWIDTH : TERPSTRASINGLEKEYFLDLINEWIDTH;
+	juce::Colour lineColor = isSelected ? Colour(TERPSTRASELECTEDFLDLINECOLOUR) : Colours::black;
+
 	// Draw hexagon
 	Path hexPath;
-	hexPath.startNewSubPath(w / 2.0f, TERPSTRASINGLEKEYFLDLINEWIDTH );
-	hexPath.lineTo(w - TERPSTRASINGLEKEYFLDLINEWIDTH, h / 4.0f);
-	hexPath.lineTo(w - TERPSTRASINGLEKEYFLDLINEWIDTH, 3.0f * h / 4.0f);
-	hexPath.lineTo(w / 2.0f, h - TERPSTRASINGLEKEYFLDLINEWIDTH);
-	hexPath.lineTo(TERPSTRASINGLEKEYFLDLINEWIDTH, 3.0f * h / 4.0f);
-	hexPath.lineTo(TERPSTRASINGLEKEYFLDLINEWIDTH, h / 4.0f);
+	hexPath.startNewSubPath(w / 2.0f, lineWidth);
+	hexPath.lineTo(w - lineWidth, h / 4.0f);
+	hexPath.lineTo(w - lineWidth, 3.0f * h / 4.0f);
+	hexPath.lineTo(w / 2.0f, h - lineWidth);
+	hexPath.lineTo(lineWidth, 3.0f * h / 4.0f);
+	hexPath.lineTo(lineWidth, h / 4.0f);
 	hexPath.closeSubPath();
 
 	// Rotate slightly counterclockwise around the center
@@ -92,21 +89,30 @@ void TerpstraKeyEdit::paint(Graphics& g)
 	transform = transform.translated(w / 2.0f, h / 2.0f);
 	
 	hexPath.applyTransform(transform);
-	hexPath.scaleToFit(TERPSTRASINGLEKEYFLDLINEWIDTH, TERPSTRASINGLEKEYFLDLINEWIDTH, w - TERPSTRASINGLEKEYFLDLINEWIDTH, h - TERPSTRASINGLEKEYFLDLINEWIDTH, true );
-	// Selected or not: fill
-	if (isSelected)
-		g.setColour(Colour(MAINWINDOWSELECTEDCOLOUR));
-	else if (getValue().isEmpty() )
-		//g.setColour(Colour(MAINWINDOWBGCOLOUR).withMultipliedSaturation(0.5));
-		//g.setColour(Colour(MAINWINDOWBGCOLOUR).withMultipliedSaturation(0.5).darker());
-		g.setColour(Colour(MAINWINDOWBGCOLOUR).darker(0.08f));
-	else
-		g.setColour(Colour(MAINWINDOWBGCOLOUR));
-	// XXX yet different colour if edited
+	hexPath.scaleToFit(lineWidth, lineWidth, w - lineWidth, h - lineWidth, true);
+	// Color: empty or the parametrized color
+	TerpstraKey currentValue = getValue();
+
+	// Parametrized colour
+	g.setColour(Colour(MAINWINDOWBGCOLOUR).overlaidWith(Colour(currentValue.colour).withAlpha((uint8)0x40)));
 
 	g.fillPath(hexPath);
-	g.setColour(Colours::black);
-	g.strokePath(hexPath, PathStrokeType(TERPSTRASINGLEKEYFLDLINEWIDTH));
+
+	// Draw line
+	g.setColour(lineColor);
+	g.strokePath(hexPath, PathStrokeType(lineWidth));
+
+	// Something parametrized or not?  
+	if (currentValue.isEmpty())
+	{
+		midiChannelLabel->setAlpha(0.3);
+		midiNoteLabel->setAlpha(0.3);
+	}
+	else
+	{
+		midiChannelLabel->setAlpha(1.0);
+		midiNoteLabel->setAlpha(1.0);
+	}
 }
 
 void TerpstraKeyEdit::resized()
@@ -138,3 +144,55 @@ TerpstraKeySetEdit::~TerpstraKeySetEdit()
 
 }
 
+/*
+==============================================================================
+ColourComboBox class
+==============================================================================
+*/
+
+ColourComboBox::ColourComboBox(const String& componentName) : ComboBox(componentName)
+{
+}
+
+void ColourComboBox::setTextFieldToColourAsObject(Colour newColourAsObject,	NotificationType notification)
+{
+	setText(newColourAsObject.toDisplayString(false));
+	
+	// XXX Add to box
+}
+
+int ColourComboBox::getColourAsNumberFromText(colourComboboxOptions boxOptions)
+{
+	String colourString = getText();
+	
+	// XXX validation of colour value
+	int colourAsNumber = colourString.getHexValue32();
+
+	if (boxOptions == colourComboboxOptions::AddColourToComboBox)
+		addColourToBox(colourString);
+
+	return colourAsNumber;
+}
+
+// Add colour to combo box
+void ColourComboBox::addColourToBox(String newColourAsString)
+{
+	int pos;
+	for (pos = 0; pos < getNumItems(); pos++)
+	{
+		if (getItemText(pos) == newColourAsString)
+			break;
+	}
+
+	if (pos >= getNumItems())
+	{
+		// Colour is not in list yet - add it
+		addItem(newColourAsString, pos + 1);
+	}
+}
+
+Colour ColourComboBox::getColourAsObjectFromText(colourComboboxOptions boxOptions)
+{
+	int colourAsNumber = getColourAsNumberFromText(boxOptions);
+	return Colour(colourAsNumber);
+}
\ No newline at end of file
diff --git a/Source/ViewComponents.h b/Source/ViewComponents.h
index 3474da4a..cdf2c48f 100644
--- a/Source/ViewComponents.h
+++ b/Source/ViewComponents.h
@@ -39,8 +39,9 @@ class TerpstraKeyEdit : public Component
 	bool isSelected;
 
 	Label*	midiNoteLabel;
-	//Label*  channelTextLabel;
 	Label*  midiChannelLabel;
+
+	int keyColour;
 };
 
 
@@ -58,4 +59,35 @@ class TerpstraKeySetEdit : public ImageButton
 	void setIsSelected(bool newValue) { setToggleState(newValue, dontSendNotification); };
 };
 
+
+/*
+==============================================================================
+Combo box with colours
+==============================================================================
+*/
+
+#define ADDCOLOURTOCOMBOBOX true
+#define DONTADDCOLOURTOCOMBOBOX false
+
+class ColourComboBox : public ComboBox
+{
+public:
+	enum colourComboboxOptions
+	{
+		DoNotAddColourToCombobox = 0,
+		AddColourToComboBox
+	};
+
+	explicit ColourComboBox(const String& componentName = String());
+
+	void setTextFieldToColourAsObject(Colour newColourAsObject,
+		NotificationType notification = sendNotificationAsync);
+	int getColourAsNumberFromText(colourComboboxOptions boxOptions);
+	Colour getColourAsObjectFromText(colourComboboxOptions boxOptions);
+
+	void addColourToBox(String newColourAsString);
+	void addColourToBox(Colour newColourAsObject) { addColourToBox(newColourAsObject.toDisplayString(false)); }
+	void addColourToBox(int newColourAsNumber) { addColourToBox(Colour(newColourAsNumber)); }
+};
+
 #endif  // VIEWCOMPOONENTS_H_INCLUDED
diff --git a/Source/ViewConstants.h b/Source/ViewConstants.h
index fe923efa..d62c27d3 100644
--- a/Source/ViewConstants.h
+++ b/Source/ViewConstants.h
@@ -30,21 +30,21 @@
 #define TERPSTRASINGLEKEYFIELDFIRSTYPOS 300
 #define TERPSTRASINGLEKEYFLDSIZE 56
 #define TERPSTRASINGLEKEYFLDLINEWIDTH 2.0f
+#define TERPSTRASELECTEDKEYFLDLINEWIDTH 3.0f
 #define TERPSTRASINGLEKEYROTATIONANGLE -0.20f
+#define TERPSTRASELECTEDFLDLINECOLOUR 0xfff7990d
 
 // Edit area
 #define EDITAREAFIRSTCOLPOS 480
 #define EDITAREAWIDTH 428
-
 #define MIDIEDITAREAHEIGHT 130
-#define EDITFUNCTIONAREAHEIGHT 480
+#define EDITFUNCTIONAREAHEIGHT 360
 
-#define EDITSUBWINWIDTH 408
+#define EDITSUBWINWIDTH 428
+#define NOTEASSIGNSUBWINTOP 44
+#define NOTEASSIGNSUBWINHEIGHT 320
 
 #define MAPPINGSUBWINTOP 56
 #define MAPPINGSUBWINHEIGHT 128
 
-#define NOTEASSIGNSUBWINTOP 202
-#define NOTEASSIGNSUBWINHEIGHT 152
-
 #endif  // VIEWCONSTANTS_H_INCLUDED
diff --git a/TerpstraSysEx.jucer b/TerpstraSysEx.jucer
index 26d9a04f..150e03ba 100644
--- a/TerpstraSysEx.jucer
+++ b/TerpstraSysEx.jucer
@@ -1,33 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<JUCERPROJECT id="oPBJmN" name="TerpstraSysEx" projectType="guiapp" version="0.3.1"
+<JUCERPROJECT id="oPBJmN" name="TerpstraSysEx" projectType="guiapp" version="0.4.0"
               bundleIdentifier="HansStraub.Terpstra.TerpstraSysEx" includeBinaryInAppConfig="1"
-              jucerVersion="4.2.1" companyName="Hans Straub">
+              jucerVersion="4.3.1" companyName="Hans Straub">
   <MAINGROUP id="obWLli" name="TerpstraSysEx">
     <GROUP id="{31606CD9-167B-B953-3A0D-86939C49A59D}" name="BinaryData">
+      <FILE id="rp33Hj" name="TopEdgeButton.png" compile="0" resource="1"
+            file="BinaryData/TopEdgeButton.png"/>
       <FILE id="KQ7uKE" name="TerpstraIcon.png" compile="0" resource="1"
             file="BinaryData/TerpstraIcon.png"/>
       <FILE id="SxzwMb" name="OctaveGraphic.png" compile="0" resource="1"
             file="BinaryData/OctaveGraphic.png"/>
     </GROUP>
     <GROUP id="{A73AEEF5-637C-D160-EE91-9A6158A5A60C}" name="Source">
-      <FILE id="DxCAea" name="BoardGeometry.cpp" compile="1" resource="0"
+      <FILE id="hLpEXr" name="MacroButtonsWindow.cpp" compile="1" resource="0"
+            file="Source/MacroButtonsWindow.cpp"/>
+      <FILE id="txOljN" name="MacroButtonsWindow.h" compile="0" resource="0"
+            file="Source/MacroButtonsWindow.h"/>
+      <FILE id="iv4rRX" name="BoardGeometry.cpp" compile="1" resource="0"
             file="Source/BoardGeometry.cpp"/>
-      <FILE id="RpY79d" name="BoardGeometry.h" compile="0" resource="0" file="Source/BoardGeometry.h"/>
-      <FILE id="ljSkWE" name="MappingLogic.cpp" compile="1" resource="0"
+      <FILE id="pu1qcb" name="BoardGeometry.h" compile="0" resource="0" file="Source/BoardGeometry.h"/>
+      <FILE id="OjtwC9" name="MappingLogic.cpp" compile="1" resource="0"
             file="Source/MappingLogic.cpp"/>
-      <FILE id="V8nnQn" name="MappingLogic.h" compile="0" resource="0" file="Source/MappingLogic.h"/>
-      <FILE id="YDIQtJ" name="IsomorphicMassAssign.cpp" compile="1" resource="0"
-            file="Source/IsomorphicMassAssign.cpp"/>
-      <FILE id="qBUG3N" name="IsomorphicMassAssign.h" compile="0" resource="0"
-            file="Source/IsomorphicMassAssign.h"/>
-      <FILE id="q40fDd" name="IncrMidiNotesMapping.cpp" compile="1" resource="0"
+      <FILE id="QrQZFP" name="MappingLogic.h" compile="0" resource="0" file="Source/MappingLogic.h"/>
+      <FILE id="Q7w4Rw" name="IncrMidiNotesMapping.cpp" compile="1" resource="0"
             file="Source/IncrMidiNotesMapping.cpp"/>
-      <FILE id="KKndNj" name="IncrMidiNotesMapping.h" compile="0" resource="0"
+      <FILE id="JnIXBl" name="IncrMidiNotesMapping.h" compile="0" resource="0"
             file="Source/IncrMidiNotesMapping.h"/>
-      <FILE id="d4Z2sj" name="NoteEditArea.cpp" compile="1" resource="0"
+      <FILE id="zA8qLO" name="IsomorphicMassAssign.cpp" compile="1" resource="0"
+            file="Source/IsomorphicMassAssign.cpp"/>
+      <FILE id="dS56Ii" name="IsomorphicMassAssign.h" compile="0" resource="0"
+            file="Source/IsomorphicMassAssign.h"/>
+      <FILE id="QYlVR1" name="NoteEditArea.cpp" compile="1" resource="0"
             file="Source/NoteEditArea.cpp"/>
-      <FILE id="g7jboS" name="NoteEditArea.h" compile="0" resource="0" file="Source/NoteEditArea.h"/>
+      <FILE id="CK4g7A" name="NoteEditArea.h" compile="0" resource="0" file="Source/NoteEditArea.h"/>
       <FILE id="xyNXsq" name="Main.h" compile="0" resource="0" file="Source/Main.h"/>
       <FILE id="lAtXEV" name="SingleNoteAssign.cpp" compile="1" resource="0"
             file="Source/SingleNoteAssign.cpp"/>
@@ -72,7 +78,6 @@
         <MODULEPATH id="juce_events" path="..\..\JUCE\modules"/>
         <MODULEPATH id="juce_data_structures" path="..\..\JUCE\modules"/>
         <MODULEPATH id="juce_core" path="..\..\JUCE\modules"/>
-        <MODULEPATH id="juce_audio_formats" path="..\..\JUCE\modules"/>
         <MODULEPATH id="juce_audio_devices" path="..\..\JUCE\modules"/>
         <MODULEPATH id="juce_audio_basics" path="..\..\JUCE\modules"/>
       </MODULEPATHS>
@@ -91,7 +96,6 @@
         <MODULEPATH id="juce_events" path="..\..\JUCE\modules"/>
         <MODULEPATH id="juce_data_structures" path="..\..\JUCE\modules"/>
         <MODULEPATH id="juce_core" path="..\..\JUCE\modules"/>
-        <MODULEPATH id="juce_audio_formats" path="..\..\JUCE\modules"/>
         <MODULEPATH id="juce_audio_devices" path="..\..\JUCE\modules"/>
         <MODULEPATH id="juce_audio_basics" path="..\..\JUCE\modules"/>
       </MODULEPATHS>
@@ -100,7 +104,6 @@
   <MODULES>
     <MODULES id="juce_audio_basics" showAllCode="1" useLocalCopy="1"/>
     <MODULES id="juce_audio_devices" showAllCode="1" useLocalCopy="1"/>
-    <MODULES id="juce_audio_formats" showAllCode="1" useLocalCopy="1"/>
     <MODULES id="juce_core" showAllCode="1" useLocalCopy="1"/>
     <MODULES id="juce_data_structures" showAllCode="1" useLocalCopy="1"/>
     <MODULES id="juce_events" showAllCode="1" useLocalCopy="1"/>
@@ -109,7 +112,4 @@
     <MODULES id="juce_gui_extra" showAllCode="1" useLocalCopy="1"/>
   </MODULES>
   <JUCEOPTIONS/>
-  <LIVE_SETTINGS>
-    <WINDOWS/>
-  </LIVE_SETTINGS>
 </JUCERPROJECT>