diff --git a/CMakeLists.txt b/CMakeLists.txt
index e181f12c..d22078f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,11 +84,17 @@ if (UNIX)
     )
 endif()
 
-file(GLOB_RECURSE BinaryData
+file(GLOB_RECURSE LibraryBinaryData
+        CONFIGURE_DEPENDS
+            "${CMAKE_CURRENT_SOURCE_DIR}/Source/lumatone_editor_library/assets/*"
+    )
+juce_add_binary_data(LumatoneEditorLibraryAssets SOURCES ${LibraryBinaryData})
+
+file(GLOB_RECURSE EditorBinaryData
         CONFIGURE_DEPENDS
             "${CMAKE_CURRENT_SOURCE_DIR}/BinaryData/*"
     )
-juce_add_binary_data(LumatoneEditorAssets SOURCES ${BinaryData})
+juce_add_binary_data(LumatoneEditorAssets SOURCES ${EditorBinaryData})
 
 # juce_add_bundle_resources_directory(LumatoneEditor "${CMAKE_CURRENT_SOURCE_DIR}/Libraries/mac/lib")
 
diff --git a/Source/AllKeysOverview.cpp b/Source/AllKeysOverview.cpp
deleted file mode 100644
index 7e848676..00000000
--- a/Source/AllKeysOverview.cpp
+++ /dev/null
@@ -1,637 +0,0 @@
-/*
-  ==============================================================================
-
-  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: 6.0.8
-
-  ------------------------------------------------------------------------------
-
-  The Projucer is part of the JUCE library.
-  Copyright (c) 2020 - Raw Material Software Limited.
-
-  ==============================================================================
-*/
-
-//[Headers] You can add your own extra header files here...
-#include "ViewComponents.h"
-#include "MainComponent.h"
-#include "Main.h"
-#include "LumatoneMenu.h"
-#include "lumatone_assets.h"
-//[/Headers]
-
-#include "AllKeysOverview.h"
-
-
-//[MiscUserDefs] You can add your own user definitions and misc code here...
-
-
-//==============================================================================
-KeyMiniDisplayInsideAllKeysOverview::KeyMiniDisplayInsideAllKeysOverview(int newBoardIndex, int newKeyIndex, const LumatoneKey& keyDataIn)
-	: MappedLumatoneKey(keyDataIn, newBoardIndex, newKeyIndex)
-	, Component("AllKeysOverview_Key" + String(newKeyIndex) + "," + String(newBoardIndex))
-{
-	renderMode = LumatoneComponentRenderMode::GraphicInteractive;
-//	TerpstraSysExApplication::getApp().getLumatoneController()->addMidiListener(this);
-}
-
-KeyMiniDisplayInsideAllKeysOverview::~KeyMiniDisplayInsideAllKeysOverview()
-{
-//	TerpstraSysExApplication::getApp().getLumatoneController()->removeMidiListener(this);
-}
-
-void KeyMiniDisplayInsideAllKeysOverview::paint(Graphics& g)
-{
-	jassert(getParentComponent() != nullptr);
-	bool boardIsSelected = boardIndex == dynamic_cast<AllKeysOverview*>(getParentComponent())->getCurrentSetSelection();
-
-	juce::Colour hexagonColour = getKeyColour();
-	// juce::Colour hexagonColour = findColour(LumatoneKeyEdit::backgroundColourId).overlaidWith(getKeyColour());
-	// if (hexagonColour.getPerceivedBrightness() >= 0.6f)
-	//    hexagonColour = hexagonColour.darker((1.0f - hexagonColour.getPerceivedBrightness()));
-
-	// set color
-	juce::Colour drawColour = hexagonColour;
-
-	//switch (renderMode)
-	//{
-	//default:
-	//	break;
-
-	//case LumatoneComponentRenderMode::ShapeInteractive:
-	//case LumatoneComponentRenderMode::GraphicInteractive:
-	//case LumatoneComponentRenderMode::MaxRes:
-	//	if (isSelected)
-	//	{
-	//		drawColour = drawColour.overlaidWith(juce::Colours::slateblue.withAlpha(0.2f));
-	//	}
-	//	if (isNoteOn || isClicked)
-	//	{
-	//		drawColour = hexagonColour.contrasting(0.5f);
-	//	}
-	//	else if (mouseIsOver)
-	//	{
-	//		drawColour = drawColour.contrasting(0.25f);
-	//	}
-	//	break;
-	//}
-
-	// draw
-	switch (renderMode)
-	{
-	default:
-		break;
-
-	case LumatoneComponentRenderMode::Shape:
-	case LumatoneComponentRenderMode::ShapeInteractive:
-		break; // TODO
-
-	case LumatoneComponentRenderMode::Graphic:
-	case LumatoneComponentRenderMode::GraphicInteractive:
-	{
-		if (colourGraphic.isValid() && shadowGraphic.isValid())
-		{
-			int x = 0;
-			int y = 0;
-
-			g.setColour(drawColour);
-
-			g.drawImageAt(colourGraphic, x, y, true);
-			g.drawImageAt(shadowGraphic, x, y);
-		}
-		break;
-	}
-
-	case LumatoneComponentRenderMode::MaxRes:
-	{
-		if (drawColour != hexagonColour && shadowGraphic.isValid())
-		{
-			g.setColour(juce::Colours::black.withAlpha(0.2f).overlaidWith(drawColour));
-			g.drawImageAt(shadowGraphic, 0, 0, true);
-		}
-		break;
-	}
-	}
-}
-
-void KeyMiniDisplayInsideAllKeysOverview::resized()
-{
-
-}
-
-void KeyMiniDisplayInsideAllKeysOverview::mouseDown(const MouseEvent& e)
-{
-	Component::mouseDown(e);
-
-	// Select this octave board
-	jassert(getParentComponent() != nullptr);
-	jassert(getParentComponent()->getParentComponent() != nullptr);
-	dynamic_cast<MainContentComponent*>(getParentComponent()->getParentComponent())->
-		getOctaveBoardSelectorTab()->setCurrentTabIndex(boardIndex);
-
-	isHighlighted = true;
-	repaint();
-
-	if (e.mods.isRightButtonDown())
-	{
-		// Right mouse click: popup menu
-		PopupMenu menu;
-		TerpstraSysExApplication::getApp().getMainMenu()->createEditMenu(menu);
-		menu.showMenuAsync(PopupMenu::Options());
-	}
-
-	// TODO integrate interaction through LumatoneController
-
-	//else
-	//{
-	//	// NoteOn MIDI message
-	//	auto keyData = getKeyData();
-	//	if (keyData != nullptr && keyData->channelNumber > 0)
-	//	{
-	//		if (keyData->keyType == LumatoneKeyType::noteOnNoteOff)
-	//		{
-	//			// Send "note on" event
-	//			//TerpstraSysExApplication::getApp().getMidiDriver().sendNoteOnMessage(keyData->noteNumber, keyData->channelNumber, 60);
-	//		}
-	//		// ToDo if keyType is "continuous controller": send controller event?
-	//	}
-	//}
-}
-
-void KeyMiniDisplayInsideAllKeysOverview::mouseUp(const MouseEvent& e)
-{
-	Component::mouseDown(e);
-
-	isHighlighted = false;
-	repaint();
-
-	// TODO integrate interaction through LumatoneController
-
-	//// NoteOff MIDI message
-	//auto keyData = getKeyData();
-	//if (keyData != nullptr && keyData->channelNumber > 0)
-	//{
-	//	if (keyData->keyType == TerpstraKey::noteOnNoteOff)
-	//	{
-	//		// Send "note off" event
-	//		TerpstraSysExApplication::getApp().getMidiDriver().sendNoteOffMessage(keyData->noteNumber, keyData->channelNumber, 60);
-	//	}
-	//}
-}
-
-void KeyMiniDisplayInsideAllKeysOverview::handleMidiMessage(const MidiMessage& msg)
-{
-	// auto keyData = getKeyData();
-	// if (keyData != nullptr && msg.getChannel() == keyData.channelNumber && msg.getNoteNumber() == keyData.noteNumber)
-	// {
-	// 	isHighlighted = msg.isNoteOn();
-	// 	repaint();
-	// }
-}
-
-//LumatoneKey KeyMiniDisplayInsideAllKeysOverview::getKeyData() const
-//{
-//	if (boardIndex >= 0 && boardIndex < MAXNUMBOARDS && keyIndex >= 0 && keyIndex < TerpstraSysExApplication::getApp().getOctaveBoardSize())
-//	{
-//		return TerpstraSysExApplication::getApp().getMappingData()->getBoard(boardIndex)->theKeys[keyIndex];
-//	}
-//
-//	return LumatoneKey();
-//}
-
-Colour KeyMiniDisplayInsideAllKeysOverview::getKeyColour() const
-{
-	return TerpstraSysExApplication::getApp().getColourModel()->getModelColour(colour);
-}
-
-void KeyMiniDisplayInsideAllKeysOverview::setRenderMode(LumatoneComponentRenderMode modeIn)
-{
-	renderMode = modeIn;
-}
-
-void KeyMiniDisplayInsideAllKeysOverview::setKeyGraphics(Image colourGraphicIn, Image shadowGraphicIn)
-{
-	colourGraphic = colourGraphicIn;
-	shadowGraphic = shadowGraphicIn;
-}
-
-//[/MiscUserDefs]
-
-//==============================================================================
-AllKeysOverview::AllKeysOverview ()
-{
-    //[Constructor_pre] You can add your own custom stuff here..
-    //[/Constructor_pre]
-
-    setName ("AllKeysOverview");
-    btnLoadFile.reset (new juce::TextButton ("btnLoadFile"));
-    addAndMakeVisible (btnLoadFile.get());
-    btnLoadFile->setButtonText (TRANS("LoadFile"));
-    btnLoadFile->addListener (this);
-
-    btnLoadFile->setBounds (368, 8, 96, 24);
-
-    btnSaveFile.reset (new juce::TextButton ("btnSaveFile"));
-    addAndMakeVisible (btnSaveFile.get());
-    btnSaveFile->setButtonText (TRANS("SaveFile"));
-    btnSaveFile->addListener (this);
-
-    btnSaveFile->setBounds (472, 8, 96, 24);
-
-    buttonReceive.reset (new juce::TextButton ("buttonReceive"));
-    addAndMakeVisible (buttonReceive.get());
-    buttonReceive->setTooltip (TRANS("ImportTooltip"));
-    buttonReceive->setButtonText (TRANS("Import from Lumatone"));
-    buttonReceive->addListener (this);
-
-    buttonReceive->setBounds (584, 8, 176, 24);
-
-
-    //[UserPreSize]
-	btnLoadFile->getProperties().set(LumatoneEditorStyleIDs::textButtonIconHashCode, LumatoneEditorIcon::LoadIcon);
-	btnSaveFile->getProperties().set(LumatoneEditorStyleIDs::textButtonIconHashCode, LumatoneEditorIcon::SaveIcon);
-	buttonReceive->getProperties().set(LumatoneEditorStyleIDs::textButtonIconHashCode, LumatoneEditorIcon::ArrowUp);
-	buttonReceive->getProperties().set(LumatoneEditorStyleIDs::textButtonIconPlacement, LumatoneEditorStyleIDs::TextButtonIconPlacement::RightOfText);
-
-	lblFirmwareVersion.reset(new Label("FirmwareVersionLabel"));
-	addChildComponent(lblFirmwareVersion.get());
-
-	TerpstraSysExApplication::getApp().getLumatoneController()->addStatusListener(this);
-	TerpstraSysExApplication::getApp().getLumatoneController()->addFirmwareListener(this);
-
-	renderMode = LumatoneComponentRenderMode::Graphic;
-	resetOctaveSize();
-
-    //[/UserPreSize]
-
-    setSize (928, 214);
-
-
-    //[Constructor] You can add your own custom stuff here..
-	currentSetSelection = -1;
-    buttonReceive->setVisible(false);
-    showDeveloperMode(TerpstraSysExApplication::getApp().getPropertiesFile()->getBoolValue("DeveloperMode", false));
-    //[/Constructor]
-}
-
-AllKeysOverview::~AllKeysOverview()
-{
-    //[Destructor_pre]. You can add your own custom destruction code here..
-    //[/Destructor_pre]
-
-    btnLoadFile = nullptr;
-    btnSaveFile = nullptr;
-    buttonReceive = nullptr;
-
-
-    //[Destructor]. You can add your own custom destruction code here..
-	//imageProcessor = nullptr;
-    //[/Destructor]
-}
-
-//==============================================================================
-void AllKeysOverview::paint (juce::Graphics& g)
-{
-    //[UserPrePaint] Add your own custom painting code here..
-    //[/UserPrePaint]
-
-    //[UserPaint] Add your own custom painting code here..
-
-	switch (renderMode)
-	{
-	case LumatoneComponentRenderMode::Graphic:
-	case LumatoneComponentRenderMode::GraphicInteractive:
-		g.drawImageAt(lumatoneGraphic, lumatoneBounds.getX(), lumatoneBounds.getY());
-		break;
-
-	case LumatoneComponentRenderMode::MaxRes:
-		if (currentRender.isValid())
-			g.drawImageAt(currentRender, lumatoneBounds.getX(), lumatoneBounds.getY());
-		else if (lumatoneGraphic.isValid())
-			g.drawImageAt(lumatoneGraphic, lumatoneBounds.getX(), lumatoneBounds.getY());
-		break;
-	}
-
-	// Draw a line under the selected sub board
-	if (currentSetSelection >= 0 && currentSetSelection < MAXNUMBOARDS)
-	{
-		Path selectionMarkPath;
-		selectionMarkPath.startNewSubPath(octaveBoards[currentSetSelection]->leftPos, octaveLineY);
-		selectionMarkPath.lineTo(octaveBoards[currentSetSelection]->rightPos, octaveLineY);
-
-		Colour lineColour = findColour(TerpstraKeyEdit::outlineColourId);
-		g.setColour(lineColour);
-		g.strokePath(selectionMarkPath, PathStrokeType(1.0f));
-	}
-
-    //[/UserPaint]
-}
-
-void AllKeysOverview::resized()
-{
-    //[UserPreResize] Add your own custom resize code here..
-    //[/UserPreResize]
-
-    //[UserResized] Add your own custom resize handling here..
-
-	// Prepare position helpers for graphics
-	currentHeight = roundToInt(getHeight() * imageHeight);
-	currentWidth = roundToInt(imageAspect * currentHeight);
-
-	lumatoneBounds.setBounds(
-		roundToInt((getWidth() - currentWidth) * 0.5f), roundToInt(getHeight() * imageY),
-		currentWidth, currentHeight
-	);
-
-	int btnHeight = roundToInt(getHeight() * saveLoadH);
-	int btnMargin = roundToInt(getWidth() * saveloadMarginW);
-	int saveLoadWidth = roundToInt(getWidth() * saveLoadW);
-	int btnY = lumatoneBounds.getY() - roundToInt(getHeight() * btnYFromImageTop);
-
-	int halfWidthX = roundToInt(getWidth() * 0.5f);
-
-	btnLoadFile->setBounds(halfWidthX - btnMargin - saveLoadWidth, btnY, saveLoadWidth, btnHeight);
-	btnSaveFile->setBounds(halfWidthX + btnMargin, btnY, saveLoadWidth, btnHeight);
-
-	octaveLineY = lumatoneBounds.getBottom() + roundToInt(getHeight() * octaveLineYRatio);
-
-	int importY = lumatoneBounds.getY() - roundToInt(getHeight() * importYFromImageTop);
-	int importWidth = roundToInt(getWidth() * importW);
-	buttonReceive->setBounds(lumatoneBounds.getRight() - importWidth, importY, importWidth, btnHeight);
-
-	resizeLabelWithHeight(lblFirmwareVersion.get(), btnHeight * 0.6f);
-	lblFirmwareVersion->setTopLeftPosition(lumatoneBounds.getX(), lumatoneBounds.getY() - btnHeight * 0.6f);
-
-	keyWidth = roundToInt(lumatoneBounds.getWidth() * keyW);
-	keyHeight = roundToInt(lumatoneBounds.getHeight() * keyH);
-
-	switch (renderMode)
-	{
-	default:
-	case LumatoneComponentRenderMode::Graphic:
-	case LumatoneComponentRenderMode::GraphicInteractive:
-		lumatoneGraphic = lumatoneRender.getResizedAsset(LumatoneAssets::ID::LumatoneGraphic, lumatoneBounds.getWidth(), lumatoneBounds.getHeight());
-		keyShapeGraphic = lumatoneRender.getResizedAsset(LumatoneAssets::ID::KeyShape, keyWidth, keyHeight);
-		keyShadowGraphic = lumatoneRender.getResizedAsset(LumatoneAssets::ID::KeyShadow, keyWidth, keyHeight);
-		break;
-	case LumatoneComponentRenderMode::MaxRes:
-		currentRender = lumatoneRender.getResizedRender(lumatoneBounds.getWidth(), lumatoneBounds.getHeight());
-		break;
-	}
-
-	int octaveIndex = 0;
-	octaveBoards[octaveIndex]->leftPos = keyCentres[0].getX() * lumatoneBounds.getWidth() + lumatoneBounds.getX() - keyWidth * 0.5f;
-
-	for (int keyIndex = 0; keyIndex < keyCentres.size(); keyIndex++)
-	{
-		int keyOctaveIndex = keyIndex % TerpstraSysExApplication::getApp().getOctaveBoardSize();
-
-		juce::Point<int> keyPos = juce::Point<int>(
-            (int)(keyCentres[keyIndex].x * lumatoneBounds.getWidth() + lumatoneBounds.getX() - keyWidth * 0.5f),
-            (int)(keyCentres[keyIndex].y * lumatoneBounds.getHeight() + lumatoneBounds.getY() - keyHeight * 0.5f)
-        );
-
-        auto key = octaveBoards[octaveIndex]->keyMiniDisplay[keyOctaveIndex];
-        key->setKeyGraphics(keyShapeGraphic, keyShadowGraphic);
-        key->setBounds(keyPos.x, keyPos.y, keyWidth, keyHeight);
-
-		if (keyOctaveIndex + 1 == TerpstraSysExApplication::getApp().getOctaveBoardSize())
-		{
-			octaveBoards[octaveIndex]->rightPos = key->getRight();
-			octaveIndex++;
-
-			if (octaveIndex < MAXNUMBOARDS)
-				octaveBoards[octaveIndex]->leftPos = key->getX();
-		}
-	}
-
-    //[/UserResized]
-}
-
-void AllKeysOverview::buttonClicked (juce::Button* buttonThatWasClicked)
-{
-    //[UserbuttonClicked_Pre]
-    //[/UserbuttonClicked_Pre]
-
-    if (buttonThatWasClicked == btnLoadFile.get())
-    {
-        //[UserButtonCode_btnLoadFile] -- add your button handler code here..
-		TerpstraSysExApplication::getApp().openSysExMapping();
-        //[/UserButtonCode_btnLoadFile]
-    }
-    else if (buttonThatWasClicked == btnSaveFile.get())
-    {
-        //[UserButtonCode_btnSaveFile] -- add your button handler code here..
-		TerpstraSysExApplication::getApp().saveSysExMappingAs();
-        //[/UserButtonCode_btnSaveFile]
-    }
-    else if (buttonThatWasClicked == buttonReceive.get())
-    {
-        //[UserButtonCode_buttonReceive] -- add your button handler code here..
-		TerpstraSysExApplication::getApp().requestConfigurationFromDevice();
-        //[/UserButtonCode_buttonReceive]
-    }
-
-    //[UserbuttonClicked_Post]
-    //[/UserbuttonClicked_Post]
-}
-
-
-
-//[MiscUserCode] You can add your own definitions of your custom methods or any other code here...
-
-void AllKeysOverview::setFirmwareVersion(FirmwareVersion versionIn)
-{
-	if (versionIn.isValid())
-	{
-		if (versionIn.major == 0 && versionIn.minor == 0)
-		{
-			if (versionIn.revision == 55)
-			{
-				lblFirmwareVersion->setText("55-keys Prototype", NotificationType::dontSendNotification);
-			}
-		}
-		else
-		{
-#if JUCE_DEBUG
-			lblFirmwareVersion->setText("Firmware version: " + versionIn.toString(), NotificationType::dontSendNotification);
-#else
-			lblFirmwareVersion->setText("Firmware version: " + versionIn.toDisplayString(), NotificationType::dontSendNotification);
-#endif
-		}
-
-		lblFirmwareVersion->setVisible(true);
-		resized();
-	}
-    else
-    {
-        lblFirmwareVersion->setVisible(false);
-    }
-
-    repaint();
-}
-
-void AllKeysOverview::showDeveloperMode(bool developerModeOn)
-{
-	if (developerModeOn)
-		buttonReceive->setVisible(true);
-
-    repaint();
-}
-
-void AllKeysOverview::connectionEstablished(int, int)
-{
-	buttonReceive->setVisible(true);
-}
-
-void AllKeysOverview::connectionLost()
-{
-	buttonReceive->setVisible(false);
-}
-
-void AllKeysOverview::firmwareRevisionReceived(FirmwareVersion version)
-{
-	setFirmwareVersion(version);
-}
-
-void AllKeysOverview::resetOctaveSize()
-{
-	int octaveSize = TerpstraSysExApplication::getApp().getOctaveBoardSize();
-	if (currentOctaveSize != octaveSize)
-	{
-		octaveBoards.clear();
-
-		for (int subBoardIndex = 0; subBoardIndex < MAXNUMBOARDS; subBoardIndex++)
-		{
-			OctaveBoard* board = octaveBoards.add(new OctaveBoard());
-
-			for (int keyIndex = 0; keyIndex < octaveSize; keyIndex++)
-			{
-				auto keyData = TerpstraSysExApplication::getApp().getMappingData()->readKey(subBoardIndex, keyIndex);
-				auto keyDisplay= board->keyMiniDisplay.add(new KeyMiniDisplayInsideAllKeysOverview(subBoardIndex, keyIndex, *keyData));
-				keyDisplay->setRenderMode(renderMode);
-				addAndMakeVisible(keyDisplay);
-			}
-
-			jassert(board->keyMiniDisplay.size() == octaveSize);
-		}
-
-		currentOctaveSize = octaveSize;
-	}
-
-	jassert(octaveBoards.size() == MAXNUMBOARDS);
-
-	lumatoneRender.resetOctaveSize();
-	keyCentres = lumatoneRender.getKeyCentres();
-	resized();
-}
-
-void AllKeysOverview::refreshMappingData(int boardIndex, int keyIndex, bool repaint)
-{
-	const LumatoneKey* key = TerpstraSysExApplication::getApp().getMappingData()->readKey(boardIndex, keyIndex);
-	KeyMiniDisplayInsideAllKeysOverview* keyDisplay = octaveBoards[boardIndex]->keyMiniDisplay[keyIndex];
-	*(LumatoneKey*)keyDisplay = *key;
-
-	if (repaint)
-	{
-		if (renderMode == LumatoneComponentRenderMode::MaxRes)
-		{
-			rerender();
-		}
-		else
-			keyDisplay->repaint();
-	}
-}
-
-void AllKeysOverview::refreshMappingData(int boardIndex, bool repaint)
-{
-	for (int i = 0; i < currentOctaveSize; i++)
-		refreshMappingData(boardIndex, i, repaint);
-}
-
-void AllKeysOverview::refreshMappingData()
-{
-	bool doRepaint = renderMode != LumatoneComponentRenderMode::MaxRes;
-
-	for (int i = 0; i < TerpstraSysExApplication::getApp().getNumBoards(); i++)
-		refreshMappingData(i, doRepaint);
-	
-	if (renderMode == LumatoneComponentRenderMode::MaxRes)
-	{
-		rerender();
-	}
-}
-
-void AllKeysOverview::setRenderMode(LumatoneComponentRenderMode modeIn)
-{
-	renderMode = modeIn;
-	for (int boardIndex = 0; boardIndex < octaveBoards.size(); boardIndex++)
-	{
-		auto board = octaveBoards[boardIndex];
-
-		for (int keyIndex = 0; keyIndex < board->keyMiniDisplay.size(); keyIndex++)
-		{
-			auto key = board->keyMiniDisplay[keyIndex];
-			key->setRenderMode(renderMode);
-		}
-	}
-
-	if (renderMode == LumatoneComponentRenderMode::MaxRes)
-		lumatoneRender.render();
-
-	if (currentWidth == 0 || currentHeight == 0)
-		return;
-
-	resized();
-}
-
-void AllKeysOverview::rerender()
-{
-	lumatoneRender.render();
-	currentRender = lumatoneRender.getResizedRender(lumatoneBounds.getWidth(), lumatoneBounds.getHeight());
-	repaint(lumatoneBounds);
-}
-
-//[/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="AllKeysOverview" componentName="AllKeysOverview"
-                 parentClasses="public juce::Component, public LumatoneEditor::StatusListener, public LumatoneEditor::FirmwareListener"
-                 constructorParams="" variableInitialisers="" snapPixels="8" snapActive="1"
-                 snapShown="1" overlayOpacity="0.330" fixedSize="0" initialWidth="928"
-                 initialHeight="214">
-  <BACKGROUND backgroundColour="0"/>
-  <TEXTBUTTON name="btnLoadFile" id="6c0c074c9f137f23" memberName="btnLoadFile"
-              virtualName="" explicitFocusOrder="0" pos="368 8 96 24" buttonText="Load File"
-              connectedEdges="0" needsCallback="1" radioGroupId="0"/>
-  <TEXTBUTTON name="btnSaveFile" id="abbc33d699ba1e52" memberName="btnSaveFile"
-              virtualName="" explicitFocusOrder="0" pos="472 8 96 24" buttonText="Save File"
-              connectedEdges="0" needsCallback="1" radioGroupId="0"/>
-  <TEXTBUTTON name="buttonReceive" id="6a7ed19ee86a3b97" memberName="buttonReceive"
-              virtualName="" explicitFocusOrder="0" pos="584 8 176 24" tooltip="Receive current layout from connected Lumatone"
-              buttonText="Import from Lumatone" connectedEdges="0" needsCallback="1"
-              radioGroupId="0"/>
-</JUCER_COMPONENT>
-
-END_JUCER_METADATA
-*/
-#endif
-
-
-//[EndFile] You can add extra defines here...
-
-//[/EndFile]
\ No newline at end of file
diff --git a/Source/AllKeysOverview.h b/Source/AllKeysOverview.h
deleted file mode 100644
index 54cc8300..00000000
--- a/Source/AllKeysOverview.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
-  ==============================================================================
-
-  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: 6.0.8
-
-  ------------------------------------------------------------------------------
-
-  The Projucer is part of the JUCE library.
-  Copyright (c) 2020 - Raw Material Software Limited.
-
-  ==============================================================================
-*/
-
-#pragma once
-
-//[Headers]     -- You can add your own extra header files here --
-#include <JuceHeader.h>
-
-#include "lumatone_render.h"
-#include "LumatoneController.h"
-
-enum class LumatoneComponentRenderMode
-{
-	NoDisplay = -1,
-
-	Shape = 0x000010,
-	ShapeInteractive = 0x000011,
-
-	Graphic = 0x000020,
-	GraphicInteractive = 0x000021,
-
-	MaxRes = 0x000030,
-};
-
-// Representation of a key inside the overview
-class KeyMiniDisplayInsideAllKeysOverview : public MappedLumatoneKey, public Component, public LumatoneEditor::MidiListener
-{
-public:
-	KeyMiniDisplayInsideAllKeysOverview(int newBoardIndex, int newKeyIndex, const LumatoneKey& keyDataIn);
-	~KeyMiniDisplayInsideAllKeysOverview();
-
-	void paint(Graphics&) override;
-	void resized() override;
-	void mouseDown(const MouseEvent& e) override;
-	void mouseUp(const juce::MouseEvent& e) override;
-
-	LumatoneComponentRenderMode getRenderMode() const { return renderMode; }
-	void setRenderMode(LumatoneComponentRenderMode uiModeIn);
-
-	juce::Colour getKeyColour() const;
-	void setKeyGraphics(Image colourGraphicIn, Image shadowGraphicIn);
-
-	// Implementation of TerpstraNidiDriver::Listener
-	//void midiMessageReceived(const MidiMessage& midiMessage) override;
-	//void midiMessageSent(const MidiMessage& midiMessage) override {}
-	//void midiSendQueueSize(int queueSize) override {}
-	//void generalLogMessage(String textMessage, HajuErrorVisualizer::ErrorLevel errorLevel) override {}
-	void handleMidiMessage(const MidiMessage& msg) override;
-
-private:
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(KeyMiniDisplayInsideAllKeysOverview)
-
-	LumatoneComponentRenderMode renderMode;
-
-	bool isHighlighted = false;
-
-	juce::Image colourGraphic;
-	juce::Image shadowGraphic;
-};
-
-//[/Headers]
-
-
-
-//==============================================================================
-/**
-                                                                    //[Comments]
-    An auto-generated component, created by the Projucer.
-
-    Describe your class and how it works here!
-                                                                    //[/Comments]
-*/
-class AllKeysOverview  : public juce::Component,
-                         public LumatoneEditor::StatusListener,
-                         public LumatoneEditor::FirmwareListener,
-                         public juce::Button::Listener
-{
-public:
-    //==============================================================================
-    AllKeysOverview ();
-    ~AllKeysOverview() override;
-
-    //==============================================================================
-    //[UserMethods]     -- You can add your own custom methods in this section.
-
-	int getCurrentSetSelection() const { return currentSetSelection ;}
-	void setCurrentSetSelection(int newSetSelection) { currentSetSelection = newSetSelection; repaint(); }
-
-    void showDeveloperMode(bool developerModeOn);
-
-    void setFirmwareVersion(FirmwareVersion versionIn);
-
-	void resetOctaveSize();
-
-	void refreshMappingData(int boardIndex, int keyIndex, bool repaint=true);
-	void refreshMappingData(int boardIndex, bool repaint = true);
-	void refreshMappingData();
-
-	LumatoneComponentRenderMode getRenderMode() const { return renderMode; }
-	void setRenderMode(LumatoneComponentRenderMode modeIn);
-
-	void rerender();
-
-	// LumatoneEditor::StatusListener
-	void connectionEstablished(int, int) override;
-	void connectionLost() override;
-
-	// LumatoneEditor::FirmwareListener implementation
-	void firmwareRevisionReceived(FirmwareVersion version) override;
-
-    //[/UserMethods]
-
-    void paint (juce::Graphics& g) override;
-    void resized() override;
-    void buttonClicked (juce::Button* buttonThatWasClicked) override;
-
-
-
-private:
-    //[UserVariables]   -- You can add your own custom variables in this section.
-
-	struct OctaveBoard
-	{
-		OwnedArray<KeyMiniDisplayInsideAllKeysOverview>	keyMiniDisplay;
-		int leftPos;
-		int rightPos;
-	};
-
-	OwnedArray<OctaveBoard> octaveBoards;
-
-	int			currentOctaveSize = 0;
-	int			currentSetSelection;
-
-	LumatoneComponentRenderMode renderMode;
-	LumatoneRender lumatoneRender;
-
-    std::unique_ptr<Label> lblFirmwareVersion;
-
-	//==============================================================================
-	// Style helpers
-
-    int currentWidth = 0;
-    int currentHeight = 0;
-
-	Rectangle<int> lumatoneBounds;
-	int octaveLineY = 0;
-
- 	int keyWidth = 0;
-    int keyHeight = 0;
-
-    juce::Array<juce::Point<float>> keyCentres;
-
-	juce::Image lumatoneGraphic;
-	juce::Image keyShapeGraphic;
-	juce::Image keyShadowGraphic;
-	
-	juce::Image currentRender;
-
-	//==============================================================================
-	// Position and sizing constants in reference to parent bounds
-
-	const float imageAspect = 2.498233f;
-	const float imageY      = 1.0f / 7.0f;
-	const float imageHeight = 5.0f / 7.0f;
-
-	const float importYFromImageTop = 0.0752688f;
-	const float importH             = 0.0526882f;
-	const float importW             = 0.132f;
-
-	const float btnYFromImageTop    = 0.04172043f;
-	const float saveLoadW           = 0.07416f;
-	const float saveLoadH           = 0.0537634f;
-	const float saveloadMarginW     = 0.0034f;
-
-	const float filenameBaselineY   = 0.1221505f;
-
-	const float octaveLineYRatio    = 0.0236559f;
-
-	// In reference to lumatoneBounds
-	const float keybedX = 0.06908748f;
-
-	const float keyW = 0.027352f;
-	const float keyH = 0.07307f;
-
-
-	//===============================================================================
-
-    //[/UserVariables]
-
-    //==============================================================================
-    std::unique_ptr<juce::TextButton> btnLoadFile;
-    std::unique_ptr<juce::TextButton> btnSaveFile;
-    std::unique_ptr<juce::TextButton> buttonReceive;
-
-
-    //==============================================================================
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AllKeysOverview)
-};
-
-//[EndFile] You can add extra defines here...
-//[/EndFile]
diff --git a/Source/ApplicationListeners.h b/Source/ApplicationListeners.h
deleted file mode 100644
index d6d8ddca..00000000
--- a/Source/ApplicationListeners.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-  ==============================================================================
-
-    ApplicationListeners.h
-    Created: 22 Mar 2022 10:11:10pm
-    Author:  Vincenzo Sicurella
- 
-    Various listener and enums that should be shared throughout the app
-
-  ==============================================================================
-*/
-
-#pragma once
-#include  <JuceHeader.h>
-#include "LumatoneFirmwareDefinitions.h"
-
-enum sysExSendingMode
-{
-    liveEditor = 0,
-    offlineEditor = 1,
-    firmwareUpdate = 2
-};
-
-namespace LumatoneEditor
-{
-    //============================================================================
-    // Public interface for Lumatone connection status
-
-    class StatusListener
-    {
-    public:
-
-        virtual ~StatusListener() {}
-
-        virtual void connectionFailed() {}
-        virtual void connectionEstablished(int inputMidiDevice, int outputMidiDevice) {}
-        virtual void connectionLost() {}
-    };
-
-    //============================================================================
-    // Public interface for Lumatone firmware communication
-    class FirmwareListener
-    {
-    public:
-        
-        virtual ~FirmwareListener() {}
-
-        // rgbFlag uses 0 for red, 1 for green, 2 for blue
-        virtual void octaveColourConfigReceived(int octaveIndex, uint8 rgbFlag, const int* colourData) {};
-
-        virtual void octaveChannelConfigReceived(int octaveIndex, const int* channelData) {};
-
-        virtual void octaveNoteConfigReceived(int octaveIndex, const int* noteData) {};
-
-        virtual void keyTypeConfigReceived(int octaveIndex, const int* keyTypeData) {};
-
-        virtual void velocityConfigReceived(const int* velocityData) {};
-
-        virtual void aftertouchConfigReceived(const int* aftertouch) {};
-
-        virtual void velocityIntervalConfigReceived(const int* velocityData) {};
-
-        virtual void faderConfigReceived(const int* faderData) {};
-
-        virtual void faderTypeConfigReceived(int octaveIndex, const int* faderTypeData) {};
-
-        virtual void serialIdentityReceived(int inputDeviceIndex, const int* serialBytes) {};
-        
-        virtual void calibratePitchModWheelAnswer(TerpstraMIDIAnswerReturnCode code) {};
-
-        virtual void lumatouchConfigReceived(const int* lumatouchData) {};
-
-        virtual void firmwareRevisionReceived(FirmwareVersion version) {};
-
-        virtual void pingResponseReceived(int inputDeviceIndex, unsigned int pingValue) {};
-
-        virtual void peripheralMidiChannelsReceived(PeripheralChannelSettings channelSettings) {};
-
-        virtual void pedalCalibrationDataReceived(int minBound, int maxBound, bool pedalIsActive) {};
-
-        virtual void wheelsCalibrationDataReceived(WheelsCalibrationData calibrationData) {};
-
-        virtual void presetFlagsReceived(PresetFlags presetFlags) {};
-
-        virtual void expressionPedalSensitivityReceived(int sensitivity) {};
-
-        virtual void noAnswerToCommand(int cmd) {};
-    };
-
-
-     class EditorListener
-     {
-     public:
-         
-         virtual ~EditorListener() {}
-
-         // TODO - change this to "status" and use "disconnected", "offline", "live", "firmware"
-         virtual void editorModeChanged(sysExSendingMode newEditorMode) {}
-    //         virtual void keyFunctionConfigurationChanged(int octaveNumber, int keyNumber, int noteOrCC, int midiChannel, LumatoneKeyType keyType, bool faderUpIsNull) {};
-    //         virtual void keyColourConfigurationChanged(int octaveNumber, int keyNumber, Colour keyColour) {};
-     };
-
-
-        class MidiListener
-        {
-        public:
-    
-            virtual ~MidiListener() {}
-    
-            virtual void handleMidiMessage(const MidiMessage& msg) = 0;
-        };
-}
diff --git a/Source/ColourEditComponent.cpp b/Source/ColourEditComponent.cpp
deleted file mode 100644
index 3054af2c..00000000
--- a/Source/ColourEditComponent.cpp
+++ /dev/null
@@ -1,420 +0,0 @@
-/*
-  ==============================================================================
-
-  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: 6.0.4
-
-  ------------------------------------------------------------------------------
-
-  The Projucer is part of the JUCE library.
-  Copyright (c) 2020 - Raw Material Software Limited.
-
-  ==============================================================================
-*/
-
-//[Headers] You can add your own extra header files here...
-#include "ViewConstants.h"
-#include "ViewComponents.h"
-//[/Headers]
-
-#include "ColourEditComponent.h"
-
-
-//[MiscUserDefs] You can add your own user definitions and misc code here...
-
-/*
-==============================================================================
-ColourComboBox class
-==============================================================================
-*/
-
-ColourComboBox::ColourComboBox(const String& componentName) : ComboBox(componentName)
-{
-}
-
-void ColourComboBox::setTextFieldToColourAsObject(Colour newColourAsObject, NotificationType notification)
-{
-	setText(newColourAsObject.toDisplayString(false));
-
-	// getLookAndFeel().setColour(juce::ComboBox::arrowColourId, newColourAsObject.contrasting(1.0)); Doesn't work XXX
-
-	// ToDo Add to box
-}
-
-String ColourComboBox::getColourAsStringFromText(colourComboboxOptions boxOptions)
-{
-	String colourAsString = getText();
-
-	// ToDo validation of colour value
-
-	if (boxOptions == colourComboboxOptions::AddColourToComboBox && !colourAsString.isEmpty())
-		addColourToBox(colourAsString);
-
-	return colourAsString;
-}
-
-int ColourComboBox::getColourAsNumberFromText(colourComboboxOptions boxOptions)
-{
-	String colourString = getColourAsStringFromText(boxOptions);
-
-	// ToDo validation of colour value
-
-	int colourAsNumber = colourString.getHexValue32();
-
-	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);
-}
-
-
-/*
-==============================================================================
-ColourComboLookAndFeel class
-==============================================================================
-*/
-
-void ColourComboLookAndFeel::drawPopupMenuItem (Graphics& g, const Rectangle<int>& area,
-                                        const bool isSeparator, const bool isActive,
-                                        const bool isHighlighted, const bool isTicked,
-                                        const bool hasSubMenu, const String& text,
-                                        const String& shortcutKeyText,
-                                        const Drawable* icon, const Colour* const textColourToUse)
-{
-    if (isSeparator)
-    {
-        LookAndFeel_V4::drawPopupMenuItem(
-            g, area, isSeparator, isActive, isHighlighted, isTicked, hasSubMenu, text, shortcutKeyText, icon, textColourToUse);
-    }
-    else
-    {
-         auto bgColour = findColour(TerpstraKeyEdit::backgroundColourId).overlaidWith(
-            Colour(text.getHexValue32())
-                .withAlpha(isHighlighted && isActive ? TERPSTRASINGLEKEYCOLOURALPHA : TERPSTRASINGLEKEYCOLOURUNSELECTEDMINIALPHA));
-        auto textColour = bgColour.contrasting(1.0);
-
-        auto r  = area.reduced (1);
-
-        g.setColour (bgColour);
-        g.fillRect (r);
-
-        g.setColour (textColour);
-
-        r.reduce (jmin (5, area.getWidth() / 20), 0);
-
-        auto font = getPopupMenuFont();
-
-        auto maxFontHeight = r.getHeight() / 1.3f;
-
-        if (font.getHeight() > maxFontHeight)
-            font.setHeight (maxFontHeight);
-
-        g.setFont (font);
-
-        auto iconArea = r.removeFromLeft (roundToInt (maxFontHeight)).toFloat();
-
-        if (icon != nullptr)
-        {
-            icon->drawWithin (g, iconArea, RectanglePlacement::centred | RectanglePlacement::onlyReduceInSize, 1.0f);
-            r.removeFromLeft (roundToInt (maxFontHeight * 0.5f));
-        }
-        else if (isTicked)
-        {
-            auto tick = getTickShape (1.0f);
-            g.fillPath (tick, tick.getTransformToScaleToFit (iconArea.reduced (iconArea.getWidth() / 5, 0).toFloat(), true));
-        }
-
-        if (hasSubMenu)
-        {
-            auto arrowH = 0.6f * getPopupMenuFont().getAscent();
-
-            auto x = static_cast<float> (r.removeFromRight ((int) arrowH).getX());
-            auto halfH = static_cast<float> (r.getCentreY());
-
-            Path path;
-            path.startNewSubPath (x, halfH - arrowH * 0.5f);
-            path.lineTo (x + arrowH * 0.6f, halfH);
-            path.lineTo (x, halfH + arrowH * 0.5f);
-
-            g.strokePath (path, PathStrokeType (2.0f));
-        }
-
-        r.removeFromRight (3);
-        g.drawFittedText (text, r, Justification::centredLeft, 1);
-
-        if (shortcutKeyText.isNotEmpty())
-        {
-            auto f2 = font;
-            f2.setHeight (f2.getHeight() * 0.75f);
-            f2.setHorizontalScale (0.95f);
-            g.setFont (f2);
-
-            g.drawText (shortcutKeyText, r, Justification::centredRight, true);
-        }
-    }
-}
-
-//[/MiscUserDefs]
-
-//==============================================================================
-ColourEditComponent::ColourEditComponent (Colour initialColour)
-    : Button("ColourEditComponent")
-{
-    //[Constructor_pre] You can add your own custom stuff here..
-    //[/Constructor_pre]
-
-    //[UserPreSize]
-    //[/UserPreSize]
-
-    //setSize (120, 32);
-
-
-    //[Constructor] You can add your own custom stuff here..
-
-    currentColour = initialColour;
-    currentColourAsString = currentColour.toString();
-
-    setButtonText("v");
-    //[/Constructor]
-}
-
-ColourEditComponent::~ColourEditComponent()
-{
-    //[Destructor_pre]. You can add your own custom destruction code here..
-    //[/Destructor_pre]
-
-    //[Destructor]. You can add your own custom destruction code here..
-    //[/Destructor]
-}
-
-
-//[MiscUserCode] You can add your own definitions of your custom methods or any other code here...
-
-void ColourEditComponent::paintButton(Graphics& g, bool shouldDrawButtonAsHighlighted, bool shouldDrawButtonAsDown)
-{
-    Colour backgroundColour = findColour(TextButton::ColourIds::buttonColourId);
-    Colour textColour       = backgroundColour.contrasting();
-
-    if (!isEnabled())
-    {
-        backgroundColour = backgroundColour.darker().withMultipliedSaturation(0.3f);
-        textColour = textColour.overlaidWith(Colours::darkgrey.withAlpha(0.6f));
-    }
-
-    if (shouldDrawButtonAsHighlighted)
-    {
-        backgroundColour = (isMouseButtonDown())
-            ? backgroundColour.darker(0.25f)
-            : backgroundColour.brighter(0.25f);
-    }
-
-    g.setColour(backgroundColour);
-    g.fillRoundedRectangle(getLocalBounds().toFloat(), getHeight() / 3.0f);
-
-    g.setFont(Font().withHeight(proportionOfHeight(0.75f)).withHorizontalScale(2.0f));
-    g.setColour(textColour);
-    g.drawFittedText(getButtonText(), getLocalBounds(), Justification::centred, 1);
-}
-
-void ColourEditComponent::setColour(String colourAsString)
-{
-	//jassert(colourCombo != nullptr);
-
-    currentColourAsString = colourAsString;
-    if (currentColourAsString.length() == 6)
-        currentColourAsString = "FF" + colourAsString;
-
-    currentColour = Colour::fromString(currentColourAsString);
-    Component::setColour(TextButton::ColourIds::buttonColourId, currentColour);
-    repaint();
-
-    // Notify parent that value has changed and can be sent to MIDI controller
-    sendChangeMessage();
-}
-
-String ColourEditComponent::getColourAsString()
-{
-    return currentColourAsString;
-}
-
-int ColourEditComponent::getColourAsNumber()
-{
-	return currentColourAsString.getHexValue32();
-}
-
-Colour ColourEditComponent::getColourAsObject()
-{
-    return currentColour;
-}
-
-void ColourEditComponent::colourChangedCallback(ColourSelectionBroadcaster* source, Colour newColour)
-{
-    setColour(newColour.toString());
-}
-
-
-//====================================================================================================
-
-ColourTextEditor::ColourTextEditor(String componentName, String initialString)
-    : TextEditor(componentName)
-{
-    setMultiLine(false);
-    setJustification(Justification::centredLeft);
-    setTooltip(translate("ColourHexValueEditorTool"));
-    setInputRestrictions(6, "0123456789ABCDEFabcdef");
-    addListener(this);
-
-    setText(initialString, NotificationType::dontSendNotification);
-    checkInputAndUpdate();
-}
-
-String ColourTextEditor::checkInputAndUpdate(bool sendSelectorListenerUpdate)
-{
-    String text = parseTextToColourString(getText().toLowerCase());
-    if (text.length() > 0)
-    {
-        // only accept RGB
-        if (text.length() > 6)
-            text = text.substring(text.length() - 6);
-
-        // restrict to lowercase display
-        setText(text, NotificationType::dontSendNotification);
-
-        if (sendSelectorListenerUpdate)
-        {
-            String opaque = "ff" + text;
-            lastBroadcastedColour = Colour(opaque.getHexValue32());
-            selectorListeners.call(&ColourSelectionListener::colourChangedCallback, this, lastBroadcastedColour);
-        }
-    }
-
-    return text;
-}
-
-void ColourTextEditor::resetToLastUpdated(bool sendSelectorListenerUpdate)
-{
-    NotificationType notification = (sendSelectorListenerUpdate) 
-        ? NotificationType::sendNotification 
-        : NotificationType::dontSendNotification;
-
-    setText(lastBroadcastedColour.toDisplayString(true).toLowerCase(), notification);
-}
-
-/** Called when the user changes the text in some way. */
-void ColourTextEditor::textEditorTextChanged(TextEditor&)
-{
-    // confirm changes
-    checkInputAndUpdate();
-}
-
-/** Called when the user presses the return key. */
-void ColourTextEditor::textEditorReturnKeyPressed(TextEditor&)
-{
-    // confirm changes
-    checkInputAndUpdate();
-}
-
-/** Called when the user presses the escape key. */
-void ColourTextEditor::textEditorEscapeKeyPressed(TextEditor&)
-{
-    // reset changes
-    resetToLastUpdated();
-}
-
-/** Called when the text editor loses focus. */
-void ColourTextEditor::textEditorFocusLost(TextEditor& editor)
-{
-    // confirm changes
-    checkInputAndUpdate();
-}
-
-Colour ColourTextEditor::getSelectedColour()
-{
-    String opaque = "ff" + parseTextToColourString(getText());
-    return Colour(opaque.getHexValue32());
-}
-
-void ColourTextEditor::colourChangedCallback(ColourSelectionBroadcaster* source, Colour newColour)
-{
-    // Safeguard
-    if (this != source)
-        setText(newColour.toString().substring(2), false);
-}
-
-Colour ColourTextEditor::getLastUpdatedColour() const
-{
-    return lastBroadcastedColour;
-}
-
-String ColourTextEditor::parseTextToColourString(String textIn)
-{
-    // Skip odd-numbered lengths and those less than 6 for RGB
-    if (textIn.length() % 2 == 1 || textIn.length() != 6)
-    {
-        return String();
-    }
-
-    return textIn;
-}
-
-
-
-//[/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="ColourEditComponent" componentName=""
-                 parentClasses="public Component, public ChangeListener, public ChangeBroadcaster"
-                 constructorParams="" variableInitialisers="" snapPixels="8" snapActive="1"
-                 snapShown="1" overlayOpacity="0.330" fixedSize="1" initialWidth="120"
-                 initialHeight="32">
-  <BACKGROUND backgroundColour="ffb8d0de"/>
-  <TEXTBUTTON name="btnColourPicker" id="fb8f62a75c5cd9ec" memberName="btnColourPicker"
-              virtualName="" explicitFocusOrder="0" pos="88 0 24 24" buttonText=".."
-              connectedEdges="0" needsCallback="1" radioGroupId="0"/>
-  <COMBOBOX name="colourCombo" id="86628debb1bafc04" memberName="colourCombo"
-            virtualName="ColourComboBox" explicitFocusOrder="0" pos="0 0 79 24"
-            editable="1" layout="33" items="" textWhenNonSelected="" textWhenNoItems="(no choices)"/>
-</JUCER_COMPONENT>
-
-END_JUCER_METADATA
-*/
-#endif
-
-
-//[EndFile] You can add extra defines here...
-//[/EndFile]
-
diff --git a/Source/ColourEditComponent.h b/Source/ColourEditComponent.h
deleted file mode 100644
index f84ba398..00000000
--- a/Source/ColourEditComponent.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
-  ==============================================================================
-
-  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: 6.0.4
-
-  ------------------------------------------------------------------------------
-
-  The Projucer is part of the JUCE library.
-  Copyright (c) 2020 - Raw Material Software Limited.
-
-  ==============================================================================
-*/
-
-#pragma once
-
-//[Headers]     -- You can add your own extra header files here --
-#include <JuceHeader.h>
-#include "ColourSelectionGroup.h"
-
-/*
-==============================================================================
-Combo box with colours - unused with new GUI design
-==============================================================================
-*/
-
-#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);
-	String getColourAsStringFromText(colourComboboxOptions boxOptions);
-	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)); }
-};
-
-/*
-==============================================================================
-Draw each item in ColourComboBox's drop-down list in "its" colour
-==============================================================================
-*/
-class ColourComboLookAndFeel : public LookAndFeel_V4
-{
-public:
-    void drawPopupMenuItem (Graphics&, const Rectangle<int>& area,
-                            bool isSeparator, bool isActive, bool isHighlighted, bool isTicked, bool hasSubMenu,
-                            const String& text, const String& shortcutKeyText,
-                            const Drawable* icon, const Colour* textColour) override;
-
-};
-
-
-//[/Headers]
-
-
-
-//==============================================================================
-/**
-                                                                    //[Comments]
-    An auto-generated component, created by the Projucer.
-
-    Describe your class and how it works here!
-                                                                    //[/Comments]
-*/
-class ColourEditComponent  : public Button,
-                             public ChangeBroadcaster,
-                             public ColourSelectionListener
-{
-public:
-    //==============================================================================
-    ColourEditComponent (Colour initialColour = Colour(0xff5c7cf2));
-    ~ColourEditComponent() override;
-
-    //==============================================================================
-    //[UserMethods]     -- You can add your own custom methods in this section.
-	//void changeListenerCallback(ChangeBroadcaster *source) override;
-
-	void setColour(String colourAsString);
-	String getColourAsString();
-	int getColourAsNumber();
-    Colour getColourAsObject();
-	//void addColourToBox(int newColourAsNumber);
-    //[/UserMethods]
-
-    //void paint (juce::Graphics& g) override;
-    //void resized() override;
-    //void buttonClicked (juce::Button* buttonThatWasClicked) override;
-    //void comboBoxChanged (juce::ComboBox* comboBoxThatHasChanged) override;
-
-    void paintButton(Graphics& g, bool shouldDrawButtonAsHighlighted, bool shouldDrawButtonAsDown) override;
-
-    //==============================================================================
-    // ColourSelectionListener implementation
-
-    void colourChangedCallback(ColourSelectionBroadcaster* source, Colour newColour) override;
-
-
-private:
-    //[UserVariables]   -- You can add your own custom variables in this section.
-    //std::unique_ptr<ColourComboLookAndFeel> colourComboLookAndFeel;
-
-    Colour currentColour = Colour(0xffd1d1d1);
-    String currentColourAsString = currentColour.toString();
-    float brightnessAdjust = 0.0f;
-
-    //[/UserVariables]
-
-    //==============================================================================
-    //std::unique_ptr<juce::TextButton> btnColourPicker;
-    //std::unique_ptr<ColourComboBox> colourCombo;
-
-
-    //==============================================================================
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ColourEditComponent)
-};
-
-//[EndFile] You can add extra defines here...
-
-/**
-
-    TextEditor container for parsing colour strings
-
-*/
-
-class ColourTextEditor :
-    public juce::TextEditor,
-    public ColourSelectionListener,
-    public ColourSelectionBroadcaster,
-    private juce::TextEditor::Listener
-{
-public:
-
-    ColourTextEditor(String componentName, String initialString);
-
-    String checkInputAndUpdate(bool sendSelectorListenerUpdate = true);
-
-    void resetToLastUpdated(bool sendSelectorListenerUpdate = true);
-
-    Colour getLastUpdatedColour() const;
-
-    // ColourSelectionBroadcaster Implementation
-    Colour getSelectedColour() override;
-
-    void deselectColour() override {};
-
-    // ColourSelectionListener Implementation
-    void colourChangedCallback(ColourSelectionBroadcaster* source, Colour newColour) override;
-
-    static String parseTextToColourString(String textIn);
-
-private:
-    // TextEditor::Listener Implementation
-    /** Called when the user changes the text in some way. */
-    void textEditorTextChanged(TextEditor&) override;
-
-    /** Called when the user presses the return key. */
-    void textEditorReturnKeyPressed(TextEditor&) override;
-
-    /** Called when the user presses the escape key. */
-    void textEditorEscapeKeyPressed(TextEditor&) override;
-
-    /** Called when the text editor loses focus. */
-    void textEditorFocusLost(TextEditor&) override;
-
-private:
-
-    Colour lastBroadcastedColour;
-};
-
-//[/EndFile]
-
diff --git a/Source/ColourSelectionPanels.h b/Source/ColourSelectionPanels.h
deleted file mode 100644
index 9ff0bafb..00000000
--- a/Source/ColourSelectionPanels.h
+++ /dev/null
@@ -1,598 +0,0 @@
-/*
-  ==============================================================================
-
-    ColourSelectionPanels.h
-    Created: 21 Dec 2020 9:48:08pm
-    Author:  Vincenzo
-
-  ==============================================================================
-*/
-
-#pragma once
-#include <JuceHeader.h>
-#include "ColourPaletteComponent.h"
-#include "LumatoneEditorLookAndFeel.h"
-
-//==============================================================================
-/*
-*   Panel that displays the palettes and allows users to select a swatch
-*/
-class ColourPalettesPanel : public Component
-{
-public:
-
-    ColourPalettesPanel(Array<LumatoneEditorColourPalette> palettesIn, ColourSelectionGroup* colourSelectionGroup = nullptr)
-        : selectionGroup(colourSelectionGroup)
-    {
-        addMouseListener(this, true);
-        setRepaintsOnMouseActivity(true);
-
-        newPalette.reset(new ColourPaletteComponent("EmptyPalette"));
-        newPaletteBtn.reset(new TextButton("NewButton", translate("NewPaletteTip")));
-        newPaletteBtn->setButtonText(translate("NewPalette"));
-        newPaletteBtn->getProperties().set(LumatoneEditorStyleIDs::textButtonHyperlinkFlag, 1);
-        newPaletteBtn->onClick = [&] { listeners.call(&ColourPalettesPanel::Listener::newPaletteRequested); };
-        
-    };
-
-    ~ColourPalettesPanel()
-    {
-        for (auto palette : allPalettes)
-            selectionGroup->removeSelector(palette);
-
-        paletteLabels.clear();
-        controlGroups.clear();
-        newPaletteBtn = nullptr;
-        newPalette = nullptr;
-    }
-
-    // Used to make this component resize itself depending on how many swatches there are
-    //void setViewUnits(int widthIn, int heightIn)
-    //{
-    //    viewableWidth = widthIn;
-    //    viewableHeight = heightIn;
-
-    //    setSize(viewableWidth, getHeightFromNumRows(numRows));
-    //}
-
-    int getHeightFromNumRows(int widthIn, int numRowsIn)
-    {
-        float rowHeight = widthIn * (itemHeightScalar + topMarginScalar + bottomMarginScalar);
-        auto height = roundToInt(numRowsIn * rowHeight);
-        return height;
-    }
-
-    void paint(Graphics& g) override 
-    {
-        //Draws rectangles around items and margins 
-        //for (auto item : dbgItems)
-        //{
-        //    g.setColour(Colours::red);
-        //    g.drawRect(item.currentBounds);
-
-        //    g.setColour(Colours::green);
-        //    g.drawRect(item.currentBounds.getX(), item.currentBounds.getBottom(), item.width, item.margin.bottom, 1.0f);
-
-        //    g.setColour(Colours::yellow);
-        //    g.drawRect(item.currentBounds.getX() - item.margin.left - 1, item.currentBounds.getY(), item.margin.left - 1, item.currentBounds.getHeight(), 1.0f);
-        //    g.drawRect(item.currentBounds.getRight() + 1, item.currentBounds.getY(), item.margin.right - 1, item.currentBounds.getHeight(), 1.0f);
-
-        //    g.setColour(Colours::violet);
-        //    g.drawRect(item.currentBounds.getX(), item.currentBounds.getY() - item.margin.top, item.width, item.margin.top);
-        //}
-    };
-
-    void resized() override
-    {
-        Rectangle<int> viewportBounds(getWidth(), viewableHeight);
-        FlexBox flexBox(FlexBox::Direction::row, FlexBox::Wrap::wrap, FlexBox::AlignContent::flexStart, FlexBox::AlignItems::center, FlexBox::JustifyContent::flexStart);
-
-        float itemWidth         = viewportBounds.proportionOfWidth(itemWidthScalar);
-        float itemHeight        = viewportBounds.proportionOfWidth(itemHeightScalar);
-        float topMargin         = viewportBounds.proportionOfWidth(topMarginScalar);
-        float bottomMargin      = viewportBounds.proportionOfWidth(bottomMarginScalar);
-        float horizontalMargin  = (viewportBounds.getWidth() - (3 * itemWidth)) * 0.143f;
-
-        for (auto palette : allPalettes)
-        {
-            FlexItem item(itemWidth, itemHeight, *palette);
-            item.margin = FlexItem::Margin(topMargin, horizontalMargin, bottomMargin, horizontalMargin);
-            flexBox.items.add(item);
-        }
-
-        flexBox.performLayout(viewportBounds);
-        
-        float bottomMarginControlHeight = roundToInt(viewportBounds.proportionOfWidth(btmMarginCtrlScalar));
-        float bottomMarginControlSpace  = (bottomMargin - bottomMarginControlHeight) * 0.5f;
-
-        float labelYItemOffset = itemHeight * 0.8f;
-        for (int i = 0; i < controlGroups.size(); i++)
-        {
-            FlexItem& item = flexBox.items.getReference(i + 1);
-            Rectangle<float> bottomMarginBounds(item.currentBounds.getX(), item.currentBounds.getBottom(), itemWidth, bottomMargin);
-            int fourthWidthItem = bottomMarginBounds.proportionOfWidth(0.25f);
-
-            Rectangle<float> labelBounds = item.currentBounds.withTrimmedTop(labelYItemOffset);
-            Point<float> controlsPosition;
-            if (paletteLabels[i]->getText().isNotEmpty())
-            {
-                auto label = paletteLabels[i];
-                label->setBounds(labelBounds.toNearestInt());
-                controlsPosition = bottomMarginBounds.getPosition().translated(0, bottomMarginControlSpace);
-            }
-            else
-            {
-                controlsPosition = labelBounds.getPosition();
-            }
-
-            auto group = controlGroups.getUnchecked(i);
-            group->getEditButton()->setSize(fourthWidthItem, bottomMarginControlHeight);
-            group->getEditButton()->setTopLeftPosition(controlsPosition.roundToInt().translated(bottomMarginBounds.proportionOfWidth(0.125f), 0));
-            group->getCloneButton()->setBounds(group->getEditButton()->getBounds().translated(fourthWidthItem, 0));
-            group->getTrashButton()->setBounds(group->getEditButton()->getBounds().translated(fourthWidthItem * 2.0f, 0));
-
-            auto hitBox = Rectangle<float>(item.currentBounds.getTopLeft().translated(-horizontalMargin, -topMargin), bottomMarginBounds.getBottomRight()).toNearestInt();
-            controlGroupHitBoxes.set(i, hitBox);
-        }
-
-        dbgItems = flexBox.items;
-
-        newPaletteBtn->setSize(itemWidth, bottomMarginControlHeight);
-        newPaletteBtn->setTopLeftPosition(newPalette->getX(), newPalette->getY() + labelYItemOffset);
-        newPaletteBtn->toFront(false);
-
-        needsResize = false;
-    }
-
-    void mouseMove(const MouseEvent& mouse) override
-    {
-        int newIndex = -1;
-        if (mouse.eventComponent->getProperties().contains("index"))
-        {
-            newIndex = mouse.eventComponent->getProperties()["index"];
-        }
-        else
-        {
-            for (int i = 0; i < controlGroups.size(); i++)
-            {
-                if (controlGroupHitBoxes[i].contains(mouse.getEventRelativeTo(this).position.roundToInt()))
-                {
-                    newIndex = i;
-                    break;
-                }
-            }
-        }
-
-        if (newIndex != lastPaletteMouseOver && lastPaletteMouseOver >= 0 && lastPaletteMouseOver < controlGroups.size())
-            setControlsVisibleForPalette(lastPaletteMouseOver, false);
-
-        if (newIndex >= 0 && newIndex < controlGroups.size())
-        {
-            setControlsVisibleForPalette(newIndex, true);
-            lastPaletteMouseOver = newIndex;
-        }
-    }
-
-    // Setup panels from scratch
-    void rebuildPanel(Array<LumatoneEditorColourPalette> palettesIn, int width = 0, bool resize = true)
-    {
-        for (auto group : controlGroups)
-            selectionGroup->removeSelector(group->getPaletteComponent());
-
-        removeAllChildren();
-        addAndMakeVisible(newPaletteBtn.get());
-        addAndMakeVisible(newPalette.get());
-
-        controlGroups.clear();
-        paletteLabels.clear();
-        
-        allPalettes = Array<ColourPaletteComponent*>(newPalette.get());
-
-        // Palettes with colour
-        for (int i = 0; i < palettesIn.size(); i++)
-        {
-            auto group = controlGroups.add(new PaletteControlGroup(palettesIn.getReference(i)));
-
-            auto paletteComponent = group->getPaletteComponent();
-            paletteComponent->getProperties().set("index", i);
-            addAndMakeVisible(paletteComponent);
-
-            allPalettes.add(paletteComponent);
-
-            if (selectionGroup)
-                selectionGroup->addSelector(paletteComponent);
-
-            group->getEditButton()->getProperties().set("index", i);
-            group->getEditButton()->onClick = [&, i, paletteComponent] { listeners.call(&ColourPalettesPanel::Listener::editPaletteRequested, i, paletteComponent->getSelectedSwatchNumber()); };
-            addChildComponent(group->getEditButton());
-
-            group->getCloneButton()->getProperties().set("index", i);
-            group->getCloneButton()->onClick = [&, i, paletteComponent] { listeners.call(&ColourPalettesPanel::Listener::clonePaletteRequested, i); };
-            addChildComponent(group->getCloneButton());
-
-            group->getTrashButton()->getProperties().set("index", i);
-            group->getTrashButton()->onClick = [&, group, i] { listeners.call(&ColourPalettesPanel::Listener::deletePaletteRequested, i); };
-            addChildComponent(group->getTrashButton());
-
-            String name = palettesIn[i].getName();
-            auto label = paletteLabels.add(new Label("Label_" + name, name));
-            label->setJustificationType(Justification::centred);
-            label->getProperties().set("index", i);
-            label->getProperties().set(LumatoneEditorStyleIDs::labelMaximumLineCount, 2);
-            addAndMakeVisible(label);
-
-            controlGroupHitBoxes.set(i, Rectangle<int>());
-        }
-
-        int rows = ceil((palettesIn.size() + 1) * 0.333333f);
-
-        int w = getWidth();
-
-        // Set height depending on how many rows
-        width = (width < 1) ? w : width;
-        viewableHeight = getHeightFromNumRows(width, rows);
-
-        if (resize)
-        {
-            needsResize = true;
-            setSize(width, viewableHeight);
-
-            // Force resize
-            if (needsResize)
-                resized();
-        }
-
-        numRows = rows;
-
-    }
-
-private:
-
-    void setControlsVisibleForPalette(int paletteIndex, bool areVisible)
-    {
-        auto group = controlGroups.getUnchecked(paletteIndex);
-        group->getEditButton()->setVisible(areVisible);
-        group->getCloneButton()->setVisible(areVisible);
-        group->getTrashButton()->setVisible(areVisible);
-    }
-
-private:
-
-    ColourSelectionGroup* selectionGroup;
-
-    std::unique_ptr<ColourPaletteComponent> newPalette;
-    std::unique_ptr<TextButton> newPaletteBtn;
-    OwnedArray<PaletteControlGroup> controlGroups;
-    Array<ColourPaletteComponent*> allPalettes;
-    OwnedArray<juce::Label> paletteLabels;
-
-    Array<FlexItem> dbgItems;
-
-    int numRows = 1;
-    int viewableHeight = 0;
-    bool needsResize = false;
-
-    Array<Rectangle<int>> controlGroupHitBoxes;
-    int lastPaletteMouseOver = -1;
-
-    const float itemWidthScalar         = 0.265f;
-    const float itemHeightScalar        = 0.24f;
-
-    const float topMarginScalar         = 0.04f;
-    const float horizontalMarginScalar  = 0.0367f;
-    const float bottomMarginScalar      = 0.06f;
-    const float btmMarginCtrlScalar     = 0.04f;
-
-    const float buttonWidthScalar       = 0.333333f;
-    const float buttonHeightScalar      = 0.166667f;
-
-    const float panelLeftMarginWidth    = 0.020833f;
-
-    //==============================================================================
-
-public:
-
-    class Listener
-    {
-    public:
-        virtual ~Listener() {}
-
-        virtual void editPaletteRequested(int paletteIndex, int selectedSwatchIndex) = 0;
-        virtual void clonePaletteRequested(int paletteIndex) = 0;
-        virtual void deletePaletteRequested(int paletteIndex) = 0;
-        virtual void newPaletteRequested() = 0;
-    };
-
-    void addListener(Listener* listenerIn) { listeners.add(listenerIn); }
-    void removeListener(Listener* listenerIn) { listeners.remove(listenerIn); }
-
-protected:
-
-    ListenerList<ColourPalettesPanel::Listener> listeners;
-};
-
-//==============================================================================
-/*
-*   Full RGB colour selector panel
-*/
-class CustomPickerPanel : public Component,
-    public ChangeListener,
-    public ColourSelectionBroadcaster,
-    public ColourSelectionListener
-{
-public:
-
-    CustomPickerPanel()
-    {
-        colourPicker.reset(new ColourSelector(
-            ColourSelector::ColourSelectorOptions::editableColour
-            + ColourSelector::ColourSelectorOptions::showColourAtTop
-            + ColourSelector::ColourSelectorOptions::showColourspace
-        ));
-
-        colourPicker->setName("ColourPicker");
-        addAndMakeVisible(*colourPicker);
-        colourPicker->addChangeListener(this);
-    }
-
-    ~CustomPickerPanel()
-    {
-        colourPicker = nullptr;
-    }
-
-    void paint(Graphics& g) override {};
-
-    void resized() override
-    {
-        colourPicker->setBounds(getLocalBounds());
-    }
-
-    void setCurrentColour(Colour colourIn)
-    {
-        colourPicker->setCurrentColour(colourIn, dontSendNotification);
-    }
-
-    void changeListenerCallback(ChangeBroadcaster* source) override
-    {
-        selectorListeners.call(&ColourSelectionListener::colourChangedCallback, this, colourPicker->getCurrentColour());
-    }
-
-    void colourChangedCallback(ColourSelectionBroadcaster* source, Colour newColour) override
-    {
-        if (this != source)
-            colourPicker->setCurrentColour(newColour, dontSendNotification);
-    }
-
-    //==============================================================================
-
-    Colour getSelectedColour() override
-    {
-        return colourPicker->getCurrentColour();
-    }
-
-    void deselectColour() override {};
-
-private:
-
-    std::unique_ptr<ColourSelector> colourPicker;
-};
-
-//==============================================================================
-/*
-*   Colour palette edtior panel
-*/
-class PaletteEditPanel : public Component,
-    public Button::Listener,
-    public Label::Listener,
-    public ChangeBroadcaster
-{
-public:
-
-    PaletteEditPanel(const LumatoneEditorColourPalette& paletteIn)
-        : colourPalette(paletteIn)
-    {
-        colourPicker.reset(new ColourSelector(
-            ColourSelector::ColourSelectorOptions::editableColour
-            + ColourSelector::ColourSelectorOptions::showColourAtTop
-            + ColourSelector::ColourSelectorOptions::showColourspace
-        ));
-        addAndMakeVisible(*colourPicker);
-
-        paletteControl.reset(new TenHexagonPalette());
-        paletteControl->setColourPalette(*colourPalette.getColours());
-        paletteControl->attachColourSelector(colourPicker.get());
-        addAndMakeVisible(*paletteControl);
-
-        editPaletteLabel.reset(new Label("EditPaletteLabel", translate("EditPalette")));
-        editPaletteLabel->setJustificationType(Justification::centred);
-        addAndMakeVisible(*editPaletteLabel);
-
-        paletteNameEditor.reset(new Label("PaletteNameEditor"));
-        paletteNameEditor->setJustificationType(Justification::centred);
-        paletteNameEditor->setEditable(true);
-        paletteNameEditor->addListener(this);
-        paletteNameEditor->setColour(Label::ColourIds::backgroundColourId, Colour());
-        paletteNameEditor->setText(colourPalette.getName(), dontSendNotification);
-        paletteNameEditor->getProperties().set(LumatoneEditorStyleIDs::labelMaximumLineCount, 3);
-        addAndMakeVisible(*paletteNameEditor);
-        labelTextChanged(paletteNameEditor.get()); // force update
-
-
-        saveButton.reset(new TextButton("SaveButton", translate("SavePaletteTip")));
-        saveButton->setButtonText("Save");
-        saveButton->addListener(this);
-        addAndMakeVisible(*saveButton);
-
-        cancelButton.reset(new TextButton("CancelButton", translate("CancelPaletteTip")));
-        cancelButton->setButtonText("Cancel");
-        cancelButton->addListener(this);
-        addAndMakeVisible(*cancelButton);
-    }
-
-    ~PaletteEditPanel()
-    {
-        paletteControl = nullptr;
-    }
-
-    void paint(Graphics& g) override
-    {
-        g.fillAll(Colours::black);
-    }
-
-    void resized() override
-    {
-        float leftWidth = getWidth() * leftColumnWidth;
-        float leftCenter = leftWidth * 0.5f;
-
-        resizeLabelWithHeight(editPaletteLabel.get(), proportionOfHeight(editPaletteHeight));
-        editPaletteLabel->setCentrePosition(leftCenter, roundToInt(editPaletteLabel->getHeight() * 0.5f + proportionOfHeight(editPaletteLabelY)));
-
-        float paletteWidth = proportionOfWidth(paletteWidthScalar);
-        float paletteHeight = proportionOfHeight(paletteHeightScalar);
-        paletteControl->setSize(paletteWidth, paletteHeight);
-        paletteControl->setCentrePosition(leftCenter, roundToInt(paletteHeight * 0.5f + proportionOfHeight(paletteY)));
-
-        saveButton->setSize(proportionOfWidth(buttonWidth), proportionOfHeight(buttonHeight));
-        saveButton->setCentrePosition(leftCenter, roundToInt(saveButton->getHeight() * 0.5f + proportionOfHeight(buttonY)));
-        cancelButton->setBounds(saveButton->getBounds().translated(0, saveButton->getHeight() * 1.125f));
-
-        colourPicker->setSize(proportionOfWidth(pickerWidth), proportionOfHeight(pickerHeight));
-        colourPicker->setTopLeftPosition(leftWidth, roundToInt((getHeight() - colourPicker->getHeight()) * 0.5f));
-
-        float leftMargin = colourPicker->getRight() * 0.03f * 0.5f;
-        paletteNameEditor->setBounds(Rectangle<int>(
-            Point<int>(roundToInt(leftMargin), paletteControl->getBottom()),
-            Point<int>(colourPicker->getX() - leftMargin, saveButton->getY())
-            ));
-        paletteNameEditor->getProperties().set(LumatoneEditorStyleIDs::fontHeightScalar, editPaletteLabel->getHeight() / (float)paletteNameEditor->getHeight());
-
-        //if (lookAndFeel)
-        //{
-        //    Font labelFont = (paletteUnnamed)
-        //        ? lookAndFeel->getAppFont(LumatoneEditorFont::UniviaProBold)
-        //        : lookAndFeel->getAppFont(LumatoneEditorFont::GothamNarrowMedium);
-
-        //    paletteNameEditor->setFont(labelFont);
-        //}
-
-    }
-
-    void lookAndFeelChanged() override
-    {
-        lookAndFeel = dynamic_cast<LumatoneEditorLookAndFeel*>(&getLookAndFeel());
-        if (lookAndFeel)
-        {
-        }
-    }
-
-    //==============================================================================
-
-    void buttonClicked(Button* btn) override
-    {
-        if (btn == saveButton.get())
-        {
-            saveRequested = true;
-        }
-
-        sendChangeMessage();
-    }
-
-    //==============================================================================
-
-    void labelTextChanged(Label* label) override
-    {
-        // Italics and font override here is a bit of a hack
-        if (label == paletteNameEditor.get())
-        {
-            bool nameIsEmpty = paletteNameEditor->getText() == "";
-
-            if (!nameIsEmpty)
-            {
-                paletteUnnamed = false;
-                colourPalette.setName(paletteNameEditor->getText());
-                paletteNameEditor->getProperties().remove(LumatoneEditorStyleIDs::fontOverrideTypefaceStyle);
-                paletteNameEditor->getProperties().set(LumatoneEditorStyleIDs::fontOverride, LumatoneEditorFont::GothamNarrowMedium);
-            }
-
-            else if (nameIsEmpty && !paletteUnnamed)
-            {
-                paletteUnnamed = true;
-            }
-
-            if (paletteUnnamed)
-            {
-                paletteNameEditor->setText("unnamed", NotificationType::dontSendNotification);
-                paletteNameEditor->getProperties().set(LumatoneEditorStyleIDs::fontOverrideTypefaceStyle, "Italic");
-                paletteNameEditor->getProperties().remove(LumatoneEditorStyleIDs::fontOverride);
-            }
-
-            //resized();
-        }
-    }
-
-    void editorShown(Label* label, TextEditor& editor) override
-    {
-        editor.setColour(TextEditor::ColourIds::backgroundColourId, Colours::black);
-        editor.setJustification(Justification::centred);
-        editor.setMultiLine(true);
-    }
-
-    //==============================================================================
-
-    Array<Colour> getCurrentPalette() const
-    {
-        return paletteControl->getColourPalette();
-    }
-
-    void setSelectedSwatch(int selectedSwatchNumber)
-    {
-        if (selectedSwatchNumber >= 0 && selectedSwatchNumber < paletteControl->getNumberOfSwatches())
-            paletteControl->setSelectedSwatchNumber(selectedSwatchNumber);
-    }
-
-    String getPaletteName()
-    {
-        return colourPalette.getName();
-    }
-
-    bool wasSaveRequested() const
-    {
-        return saveRequested;
-    }
-
-private:
-
-    LumatoneEditorColourPalette     colourPalette;
-
-    std::unique_ptr<Palette>        paletteControl;
-    std::unique_ptr<ColourSelector> colourPicker;
-
-    std::unique_ptr<Label>          editPaletteLabel;
-    std::unique_ptr<Label>          paletteNameEditor;
-    std::unique_ptr<TextButton>     saveButton;
-    std::unique_ptr<TextButton>     cancelButton;
-
-    LumatoneEditorLookAndFeel*      lookAndFeel = nullptr;
-
-    bool saveRequested = false;
-
-    bool paletteUnnamed = false;
-
-    // Drawing constants
-
-    const float leftColumnWidth     = 0.3677f;
-
-    const float editPaletteLabelY   = 0.1212f;
-    const float editPaletteHeight   = 0.0606f;
-
-    const float paletteY            = 0.26f;
-    const float paletteWidthScalar  = 0.25f;
-    const float paletteHeightScalar = 0.25f;
-
-    const float buttonY             = 0.6739f;
-    const float buttonWidth         = 0.2208f;
-    const float buttonHeight        = 0.0889f;
-
-    const float pickerWidth         = 0.6f;
-    const float pickerHeight        = 0.9f;
-};
diff --git a/Source/CurvesArea.cpp b/Source/CurvesArea.cpp
index 73b75183..ef16a155 100644
--- a/Source/CurvesArea.cpp
+++ b/Source/CurvesArea.cpp
@@ -18,9 +18,10 @@
 */
 
 //[Headers] You can add your own extra header files here...
+#include "LumatoneEditorLookAndFeel.h"
+
+#include "VelocityCurveDlgBase.h"
 #include "NoteOnOffVelocityCurveDialog.h"
-#include "ViewConstants.h"
-#include "Main.h"
 //[/Headers]
 
 #include "CurvesArea.h"
@@ -53,10 +54,11 @@ void CurvesArea::CurvesTabComponent::resized()
 //[/MiscUserDefs]
 
 //==============================================================================
-CurvesArea::CurvesArea ()
+CurvesArea::CurvesArea (const LumatoneEditorState& stateIn)
+    : LumatoneEditorState("CurvesArea", stateIn)
 {
     //[Constructor_pre] You can add your own custom stuff here..
-	showDeveloperMode = TerpstraSysExApplication::getApp().getPropertiesFile()->getBoolValue("DeveloperMode", false);
+	// showDeveloperMode = TerpstraSysExApplication::getApp().getPropertiesFile()->getBoolValue("DeveloperMode", false);
     //[/Constructor_pre]
 
     setName ("CurvesArea");
@@ -74,7 +76,7 @@ CurvesArea::CurvesArea ()
     curvesTab.reset (new CurvesTabComponent (juce::TabbedButtonBar::TabsAtTop));
     addAndMakeVisible (curvesTab.get());
     curvesTab->setTabBarDepth (30);
-    curvesTab->addTab (TRANS("Note Velocity"), juce::Colours::lightgrey, new NoteOnOffVelocityCurveDialog(), true);
+    curvesTab->addTab (TRANS("Note Velocity"), juce::Colours::lightgrey, new NoteOnOffVelocityCurveDialog(*this), true);
     curvesTab->setCurrentTabIndex (0);
 
     curvesTab->setBounds (8, 40, 464, 200);
@@ -88,9 +90,12 @@ CurvesArea::CurvesArea ()
 
 
     //[UserPreSize]
-    setDeveloperMode(showDeveloperMode);
+    setDeveloperMode(getInDeveloperMode());
+
+    getEditorLookAndFeel().setColour(VelocityCurveBeam::beamColourId, Colour(0x66ff5e00));
+    getEditorLookAndFeel().setColour(VelocityCurveBeam::outlineColourId, Colour(0xffd7d9da));
 
-    labelWindowTitle->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::UniviaProBold));
+    labelWindowTitle->setFont(getAppFonts().getFont(LumatoneEditorFont::UniviaProBold));
     labelWindowTitle->setColour(Label::backgroundColourId, Colour());
 
     curvesTab->setColour(TabbedComponent::ColourIds::outlineColourId, Colour());
@@ -176,9 +181,9 @@ void CurvesArea::buttonClicked (juce::Button* buttonThatWasClicked)
         //[UserButtonCode_btnDeveloperMode] -- add your button handler code here..
 		if (btnDeveloperMode->getToggleState())
 		{
-			curvesTab->addTab(TRANS("CC Fader"), juce::Colours::lightgrey, new FaderVelocityCurveDialog(), true);
-			curvesTab->addTab(TRANS("Aftertouch"), juce::Colours::lightgrey, new AftertouchVelocityCurveDialog(), true);
-			curvesTab->addTab(TRANS("Lumatouch"), juce::Colours::lightgrey, new LumatouchVelocityCurveDialog(), true);
+			curvesTab->addTab(TRANS("CC Fader"), juce::Colours::lightgrey, new FaderVelocityCurveDialog(*this), true);
+			curvesTab->addTab(TRANS("Aftertouch"), juce::Colours::lightgrey, new AftertouchVelocityCurveDialog(*this), true);
+			curvesTab->addTab(TRANS("Lumatouch"), juce::Colours::lightgrey, new LumatouchVelocityCurveDialog(*this), true);
 		}
 		else
 		{
@@ -194,7 +199,15 @@ void CurvesArea::buttonClicked (juce::Button* buttonThatWasClicked)
     //[/UserbuttonClicked_Post]
 }
 
+void CurvesArea::handleStatePropertyChange(juce::ValueTree stateIn, const juce::Identifier& property)
+{
+    LumatoneEditorState::handleStatePropertyChange(stateIn, property);
 
+    if (property == LumatoneEditorProperty::DeveloperModeOn)
+    {
+        setDeveloperMode(getInDeveloperMode());
+    }
+}
 
 //[MiscUserCode] You can add your own definitions of your custom methods or any other code here...
 
@@ -215,8 +228,8 @@ void CurvesArea::sendConfigToController()
 
 void CurvesArea::setDeveloperMode(bool devModeOn)
 {
-    showDeveloperMode = devModeOn;
-    btnDeveloperMode->setVisible(showDeveloperMode);
+    // showDeveloperMode = devModeOn;
+    btnDeveloperMode->setVisible(devModeOn);
     repaint();
 }
 
@@ -260,4 +273,3 @@ END_JUCER_METADATA
 
 //[EndFile] You can add extra defines here...
 //[/EndFile]
-
diff --git a/Source/CurvesArea.h b/Source/CurvesArea.h
index 4043ea8c..7f2412de 100644
--- a/Source/CurvesArea.h
+++ b/Source/CurvesArea.h
@@ -22,9 +22,7 @@
 //[Headers]     -- You can add your own extra header files here --
 #include <JuceHeader.h>
 
-#include "./data/lumatone_layout.h"
-
-#include "LumatoneEditorStyleCommon.h"
+#include "LumatoneEditorState.h"
 //[/Headers]
 
 
@@ -38,11 +36,12 @@
                                                                     //[/Comments]
 */
 class CurvesArea  : public juce::Component,
+                    public LumatoneEditorState,
                     public juce::Button::Listener
 {
 public:
     //==============================================================================
-    CurvesArea ();
+    CurvesArea (const LumatoneEditorState& stateIn);
     ~CurvesArea() override;
 
     //==============================================================================
@@ -75,11 +74,13 @@ class CurvesArea  : public juce::Component,
     void buttonClicked (juce::Button* buttonThatWasClicked) override;
 
 
+private:
+    void handleStatePropertyChange(juce::ValueTree stateIn, const juce::Identifier& property) override;
 
 private:
     //[UserVariables]   -- You can add your own custom variables in this section.
 
-	bool showDeveloperMode = false;
+	// bool showDeveloperMode = false;
 
     //==============================================================================
     // Size and position constants
diff --git a/Source/DeviceActivityMonitor.cpp b/Source/DeviceActivityMonitor.cpp
deleted file mode 100644
index c7d09497..00000000
--- a/Source/DeviceActivityMonitor.cpp
+++ /dev/null
@@ -1,597 +0,0 @@
-/*
-  ==============================================================================
-
-    DeviceActivityMonitor.cpp
-    Created: 11 Feb 2021 9:15:43pm
-    Author:  Vincenzo
-
-  ==============================================================================
-*/
-
-#include "DeviceActivityMonitor.h"
-#include "Main.h"
-
-
-DeviceActivityMonitor::DeviceActivityMonitor(TerpstraMidiDriver& midiDriverIn)
-    : midiDriver(midiDriverIn), readQueueSize(0)
-{
-    detectDevicesIfDisconnected = TerpstraSysExApplication::getApp().getPropertiesFile()->getBoolValue("DetectDeviceIfDisconnected", true);
-    checkConnectionOnInactivity = TerpstraSysExApplication::getApp().getPropertiesFile()->getBoolValue("CheckConnectionIfInactive", true);
-    responseTimeoutMs = TerpstraSysExApplication::getApp().getPropertiesFile()->getIntValue("DetectDevicesTimeout", responseTimeoutMs);
-
-//    midiDriver.addListener(this);
-    reset(readBlockSize);
-    midiDriver.addMessageCollector(this);
-
-    // avoid resizing during communication
-    ensureStorageAllocated(2000);
-    testResponseDeviceIndices.resize(2000);
-}
-
-DeviceActivityMonitor::~DeviceActivityMonitor()
-{
-    removeAllChangeListeners();
-    midiDriver.removeMessageCollector(this);
-}
-
-void DeviceActivityMonitor::setDetectDeviceIfDisconnected(bool doDetection)
-{
-    detectDevicesIfDisconnected = doDetection;
-    TerpstraSysExApplication::getApp().getPropertiesFile()->setValue("DetectDeviceIfDisconnected", detectDevicesIfDisconnected);
-
-    if (!detectDevicesIfDisconnected)
-    {
-        deviceConnectionMode = DetectConnectionMode::noDeviceActivity;
-        midiDriver.closeTestingDevices();
-    }
-    else
-    {
-        startTimer(detectRoutineTimeoutMs);
-    }
-}
-
-void DeviceActivityMonitor::setCheckForInactivity(bool monitorActivity)
-{
-    checkConnectionOnInactivity = monitorActivity;
-    TerpstraSysExApplication::getApp().getPropertiesFile()->setValue("CheckConnectionIfInactive", checkConnectionOnInactivity);
-    
-    if (checkConnectionOnInactivity && isConnectionEstablished())
-    {
-        startTimer(inactivityTimeoutMs);
-    }
-}
-
-void DeviceActivityMonitor::pingAllDevices()
-{
-    deviceDetectInProgress = true;
-
-    outputDevices = midiDriver.getMidiOutputList();
-
-    outputPingIds.clear();
-
-    waitingForTestResponse = true;
-
-    int maxDevices = jmin(outputDevices.size(), 128);
-    for (int i = 0; i < maxDevices; i++)
-    {
-        unsigned int id = (unsigned int)i + 1;
-        midiDriver.ping(id, i);
-        outputPingIds.add(id);
-    }
-
-    startTimer(responseTimeoutMs);
-}
-
-bool DeviceActivityMonitor::testLastConnectedDevice()
-{
-    String inputId = TerpstraSysExApplication::getApp().getPropertiesFile()->getValue("LastInputDeviceId");
-    if (inputId.length() <= 0)
-        return false;
-
-    int inputIndex = midiDriver.getIndexOfInputDevice(inputId);
-    if (inputIndex >= 0)
-    {
-        String outputId = TerpstraSysExApplication::getApp().getPropertiesFile()->getValue("LastOutputDeviceId");
-        if (outputId.length() <= 0)
-            return false;
-        
-        int outputIndex = midiDriver.getIndexOfOutputDevice(outputId);
-        if (outputIndex >= 0)
-        {
-            deviceDetectInProgress = true;
-            waitingForTestResponse = true;
-
-            DBG("Testing last connected device");
-            midiDriver.setMidiInput(inputIndex);
-            midiDriver.setMidiOutput(outputIndex);
-            midiDriver.sendGetSerialIdentityRequest();
-            return true;
-        }
-    }
-
-    return false;
-}
-
-void DeviceActivityMonitor::startIndividualDetection()
-{
-    jassert(outputPingIds.size() == 0);
-    
-    testOutputIndex = -1;
-    outputDevices = midiDriver.getMidiOutputList();
-    inputDevices = midiDriver.getMidiInputList();
-
-    if (outputDevices.size() > 0 && inputDevices.size() > 0)
-    {
-        deviceDetectInProgress = true;
-        testNextOutput();
-    }
-    else
-    {
-        DBG("No input and output MIDI device combination could be made.");
-        deviceDetectInProgress = false;
-        startTimer(detectRoutineTimeoutMs);
-    }
-}
-
-void DeviceActivityMonitor::testNextOutput()
-{
-    testOutputIndex++;
-
-    if (testOutputIndex >= 0 && testOutputIndex < outputDevices.size()) 
-    {
-        DBG("Testing " + outputDevices[testOutputIndex].name);
-        if (sendCalibratePitchModOff)
-            midiDriver.sendCalibratePitchModWheel(false, testOutputIndex);
-        else
-            midiDriver.sendGetSerialIdentityRequest(testOutputIndex);
-        
-        waitingForTestResponse = true;
-        startTimer(responseTimeoutMs);
-    }
-    // failed
-    else
-    {
-        startTimer(10);
-    }
-}
-
-void DeviceActivityMonitor::initializeDeviceDetection()
-{
-    // Belongs somewhere else?
-    if (!midiDriver.hasDevicesDefined())
-    {
-        confirmedInputIndex = -1;
-        confirmedOutputIndex = -1;
-    }
-
-    if (detectDevicesIfDisconnected)
-    {
-        deviceConnectionMode = DetectConnectionMode::lookingForDevice;
-        deviceDetectInProgress = false; // Don't start until first test response is sent
-        startTimer(10);
-    }
-}
-
-void DeviceActivityMonitor::intializeConnectionLossDetection()
-{
-    if (checkConnectionOnInactivity)
-    {
-        deviceConnectionMode = DetectConnectionMode::waitingForInactivity;
-        waitingForTestResponse = false;
-        startTimer(inactivityTimeoutMs);
-    }
-}
-
-void DeviceActivityMonitor::stopDeviceDetection()
-{
-    deviceConnectionMode = DetectConnectionMode::noDeviceActivity;
-    deviceDetectInProgress = false;
-}
-
-void DeviceActivityMonitor::stopMonitoringDevice()
-{
-    stopTimer();
-    waitingForTestResponse = false;
-    deviceConnectionMode = DetectConnectionMode::noDeviceMonitoring;
-}
-
-bool DeviceActivityMonitor::initializeConnectionTest()
-{    
-    TerpstraSysExApplication::getApp().getLumatoneController()->testCurrentDeviceConnection();
-    waitingForTestResponse = true;
-    startTimer(inactivityTimeoutMs);
-    return true;
-}
-
-
-void DeviceActivityMonitor::onSerialIdentityResponse(const MidiMessage& msg, int deviceIndexResponded)
-{
-    waitingForTestResponse = false;
-
-    switch (deviceConnectionMode)
-    {
-    case DetectConnectionMode::lookingForDevice:
-        if (midiDriver.hasDevicesDefined())
-        {
-            confirmedOutputIndex = midiDriver.getMidiOutputIndex();
-            confirmedInputIndex = midiDriver.getMidiInputIndex();
-        }
-        else
-        {
-            confirmedOutputIndex = testOutputIndex;
-            confirmedInputIndex = deviceIndexResponded;
-        }
-
-        break;
-
-    case DetectConnectionMode::waitingForInactivity:
-        startTimer(inactivityTimeoutMs);
-        break;
-
-    default:
-        // TODO review
-        break;
-    }
-}
-
-void DeviceActivityMonitor::onFailedPing(const MidiMessage& msg)
-{
-    unsigned int pingId = -1;
-    midiDriver.unpackPingResponse(msg, pingId);
-    if (pingId >= 0 && pingId < outputDevices.size())
-        outputDevices.remove(outputPingIds.indexOf(pingId));
-}
-
-void DeviceActivityMonitor::onPingResponse(const MidiMessage& msg, int deviceIndexResponded)
-{
-    waitingForTestResponse = false;
-
-    if (deviceConnectionMode == DetectConnectionMode::lookingForDevice && outputPingIds.size() > 0)
-    {
-        unsigned int pingId = 0;
-        auto errorCode = midiDriver.unpackPingResponse(msg, pingId);
-
-        if (errorCode != FirmwareSupport::Error::noError)
-        {
-            if (errorCode == FirmwareSupport::Error::messageIsAnEcho)
-                return;
-            
-            DBG("WARNING: Ping response error in auto connection routine detected");
-            jassertfalse;
-            return;
-        }
-
-        if (pingId > 0)
-        {
-            confirmedOutputIndex = pingId - 1;
-            confirmedInputIndex = deviceIndexResponded;
-            // startTimer(10);
-        }
-    }
-
-    else if (deviceConnectionMode == DetectConnectionMode::waitingForInactivity)
-    {
-        onTestResponseReceived();
-    }
-}
-
-void DeviceActivityMonitor::onTestResponseReceived()
-{
-    waitingForTestResponse = false;
-    
-    if (sendCalibratePitchModOff)
-    {
-        sendCalibratePitchModOff = false;
-        checkDetectionStatus();
-        return;
-    }
-
-    if (deviceConnectionMode == DetectConnectionMode::lookingForDevice)
-    {
-        onSuccessfulDetection();
-    }
-
-    else if (deviceConnectionMode == DetectConnectionMode::waitingForInactivity)
-    {
-        startTimer(inactivityTimeoutMs);
-    }
-}
-
-void DeviceActivityMonitor::checkDetectionStatus()
-{
-    // Successful
-    if (isConnectionEstablished())
-    {
-        onTestResponseReceived();
-    }
-    else
-    {
-        if (deviceDetectInProgress)
-        {
-            // Failed last-device test
-            if (midiDriver.hasDevicesDefined())
-            {
-                DBG("Unable to connect to last device.");
-                waitingForTestResponse = false;
-                midiDriver.closeMidiInput();
-                midiDriver.closeMidiOutput();
-                pingAllDevices();
-            }
-
-            // Failed ping routine
-            else if (outputPingIds.size() > 0)
-            {
-                waitingForTestResponse = false;
-                outputPingIds.clear();
-                startIndividualDetection();
-            }
-
-            // Ongoing GetSerial routine
-            else if (testOutputIndex >= 0 && testOutputIndex < outputDevices.size())
-            {
-                testNextOutput();
-            }
-            
-            // Set timeout for next attempt
-            else
-            {
-                DBG("Detect device timeout.");
-                deviceDetectInProgress = false;
-                waitingForTestResponse = false;
-                startTimer(detectRoutineTimeoutMs);
-            }
-        }
-
-        // Start detection
-        else
-        {
-            midiDriver.refreshDeviceLists();
-            midiDriver.openAvailableDevicesForTesting();
-            deviceConnectionMode = DetectConnectionMode::lookingForDevice;
-
-            // If there's no last-connected-device, skip to pinging
-            //if (!testLastConnectedDevice())
-            //{
-                pingAllDevices();
-            //}
-        }
-    }
-}
-
-void DeviceActivityMonitor::timerCallback()
-{
-    stopTimer();
-
-    MidiBuffer readBuffer;
-    removeNextBlockOfMessages(readBuffer, readBlockSize);
-    
-    handleMessageQueue(readBuffer, testResponseDeviceIndices);
-    auto size = readQueueSize.load();
-    readQueueSize.store(jlimit(0, 999999, size - readBlockSize));
-
-    switch (deviceConnectionMode)
-    {
-    case DetectConnectionMode::noDeviceActivity:
-    case DetectConnectionMode::lookingForDevice:
-        if (detectDevicesIfDisconnected)
-        {
-            checkDetectionStatus();
-            break;
-        }
-
-        stopDeviceDetection();
-        break;
-
-    case DetectConnectionMode::noDeviceMonitoring:
-    case DetectConnectionMode::waitingForInactivity:
-        jassert(isConnectionEstablished() && midiDriver.hasDevicesDefined());
-        if (!checkConnectionOnInactivity)
-        {
-            stopMonitoringDevice();
-            break;
-        }
-
-        if (!waitingForTestResponse)
-        {
-            if (sentQueueSize > 0)
-            {
-                startTimer(inactivityTimeoutMs);
-                break;
-            }
-
-            if (deviceConnectionMode == DetectConnectionMode::noDeviceMonitoring)
-                deviceConnectionMode = DetectConnectionMode::waitingForInactivity;
-
-            initializeConnectionTest();
-        }
-        else
-        {
-            DBG("waiting for test response...");
-        }
-
-        break;
-
-    default:
-        jassertfalse;
-    }
-}
-
-void DeviceActivityMonitor::handleResponse(int inputDeviceIndex, const MidiMessage& msg)
-{
-    if (msg.isSysEx())
-    {
-        auto sysExData = msg.getSysExData();
-        auto cmd = sysExData[CMD_ID];
-
-        if (cmd == PERIPHERAL_CALBRATION_DATA && !isConnectionEstablished())
-        {
-            sendCalibratePitchModOff = true;
-            // startTimer(100);
-            return;
-        }
-
-        if (waitingForTestResponse) switch (sysExData[MSG_STATUS])
-        {
-            // Skip echos, or mark as a failed ping
-            case TEST_ECHO:
-            {
-                switch (cmd)
-                {
-                case LUMA_PING:
-                {
-                    DBG("Ignoring Ping Echo");
-                    onFailedPing(msg);
-                    break;
-                }
-                case GET_SERIAL_IDENTITY:
-                    break;
-
-                case GET_FIRMWARE_REVISION:
-                    DBG("Ignoring Firmware Echo");
-                    // onTestResponseReceived();
-                    break;
-
-                default:
-                    return;
-                }
-                break;
-            }
-
-            case TerpstraMIDIAnswerReturnCode::ACK:
-            {
-                switch (cmd)
-                {
-                case GET_SERIAL_IDENTITY:
-                    onSerialIdentityResponse(msg, inputDeviceIndex);
-                    break;
-
-                case CALIBRATE_PITCH_MOD_WHEEL:
-                    if (sysExData[PAYLOAD_INIT] != TEST_ECHO)
-                    {
-                        if (!isConnectionEstablished())
-                        {
-                            sendCalibratePitchModOff = true;
-                        }
-                    }
-                    break;
-
-                case GET_FIRMWARE_REVISION:
-                    break;
-
-                case LUMA_PING:
-                    onPingResponse(msg, inputDeviceIndex);
-                    break;
-
-                default:
-                    break;
-                }
-
-                waitingForTestResponse = false;
-                break;
-            }
-
-            // Consider a response from a different firmware state as successful
-            case TerpstraMIDIAnswerReturnCode::STATE:
-            {
-                // Find 'off' message if possible
-                //onTestResponseReceived();
-            }
-        }
-
-        // Edge case if we're disconnected but get a response
-        else if (!isConnectionEstablished())
-        {
-            confirmedInputIndex = midiDriver.getMidiInputIndex();
-            confirmedOutputIndex = midiDriver.getMidiOutputIndex();
-
-            // Maybe not best solution?
-            deviceConnectionMode = DetectConnectionMode::lookingForDevice;
-        }
-        else
-        {
-            startTimer(inactivityTimeoutMs);
-        }
-    }
-
-}
-
-void DeviceActivityMonitor::handleMessageQueue(const MidiBuffer& readBuffer, const Array<int, CriticalSection>& devices)
-{
-    int smpl = 0;
-    for (auto event : readBuffer)
-    {
-        auto msg = event.getMessage();
-        handleResponse(devices[smpl], msg);
-        smpl++;
-    }
-}
-
-//=========================================================================
-// TerpstraMidiDriver::Listener Implementation
-
-void DeviceActivityMonitor::midiMessageReceived(MidiInput* source, const MidiMessage& msg)
-{
-    if (!msg.isSysEx())
-        return;
-
-    int deviceIndex = (source == nullptr) ? -1
-                                          : midiDriver.getMidiInputList().indexOf(source->getDeviceInfo());
-
-    addMessageToQueue(msg);
-
-    auto size = readQueueSize.load();
-    testResponseDeviceIndices.set(size, deviceIndex);
-    readQueueSize.store(size + 1);
-}
-
-void DeviceActivityMonitor::noAnswerToMessage(MidiInput* expectedDevice, const MidiMessage& midiMessage)
-{
-    stopTimer();
-    
-    if (waitingForTestResponse && deviceConnectionMode < DetectConnectionMode::noDeviceMonitoring)
-    {
-        waitingForTestResponse = false;
-        auto sysExData = midiMessage.getSysExData();
-        if (sysExData[CMD_ID] == LUMA_PING && outputPingIds.size() > 0)
-        {
-            onFailedPing(midiMessage);
-        }
-        else
-        {
-            checkDetectionStatus();
-        }
-    }
-    
-    else if (isConnectionEstablished())
-    {
-        onDisconnection();
-    }
-}
-
-void DeviceActivityMonitor::onSuccessfulDetection()
-{
-    jassert(isConnectionEstablished());
-
-    deviceDetectInProgress = false;
-    outputPingIds.clear();
-
-    // LumatoneController will start this back up
-    deviceConnectionMode = DetectConnectionMode::noDeviceMonitoring;
-    
-    sendChangeMessage();
-}
-
-void DeviceActivityMonitor::onDisconnection()
-{
-    DBG("DISCONNECTION DETECTED");
-
-    confirmedInputIndex = -1;
-    confirmedOutputIndex = -1;
-
-    waitingForTestResponse = false;
-
-    // LumatoneController will start this back up
-    deviceConnectionMode = DetectConnectionMode::noDeviceActivity;
-    
-    sendChangeMessage();
-}
diff --git a/Source/FirmwareTransfer.cpp b/Source/FirmwareTransfer.cpp
index 7b287610..f290b307 100644
--- a/Source/FirmwareTransfer.cpp
+++ b/Source/FirmwareTransfer.cpp
@@ -9,7 +9,7 @@
 */
 
 #include "FirmwareTransfer.h"
-#include "Main.h"
+#include "./lumatone_editor_library/lumatone_midi_driver/firmware_types.h"
 
 #ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
@@ -57,10 +57,10 @@
 
 #define SOCKTIMEOUTMS 1000
 
-FirmwareTransfer::FirmwareTransfer(TerpstraMidiDriver& driverIn)
-	: juce::ThreadWithProgressWindow("Lumatone Firmware Update", true, false), midiDriver(driverIn)
+FirmwareTransfer::FirmwareTransfer()
+	: juce::ThreadWithProgressWindow("Lumatone Firmware Update", true, false)
 {
-	
+
 }
 
 FirmwareTransfer::~FirmwareTransfer()
@@ -77,13 +77,13 @@ bool FirmwareTransfer::checkFirmwareFileIntegrity(String filePathIn)
 	{
 		String filename = File(filePathIn).getFileNameWithoutExtension();
 		String versionNums = filename.fromLastOccurrenceOf("v", false, true);
-		auto version = FirmwareVersion::fromString(versionNums);
+		auto version = LumatoneFirmware::Version::fromString(versionNums);
 		if (filename.startsWith("Lumatone-v") && version.isValid())
 		{
 			isValid = true;
 		}
 	}
-	return isValid; 
+	return isValid;
 }
 
 bool FirmwareTransfer::requestFirmwareUpdate(String firmwareFilePath)
@@ -309,7 +309,7 @@ FirmwareTransfer::StatusCode FirmwareTransfer::performFirmwareUpdate()
 
     // Occasionally check if for thread exit request before session is initiated
     STOPBEFOREINIT
-    
+
     int returnCode = libssh2_init(0);
     if (returnCode != 0)
     {
@@ -318,7 +318,8 @@ FirmwareTransfer::StatusCode FirmwareTransfer::performFirmwareUpdate()
     }
 
 	// Make sure we release libssh2 before app is shutdown
-	TerpstraSysExApplication::getApp().setFirmwareUpdatePerformed(true);
+	//TerpstraSysExApplication::getApp().setFirmwareUpdatePerformed(true);
+	// TODO
 
 #if JUCE_WINDOWS
 
@@ -338,7 +339,7 @@ FirmwareTransfer::StatusCode FirmwareTransfer::performFirmwareUpdate()
 	sin.sin_family = AF_INET;
 	sin.sin_port = htons(22);
 	sin.sin_addr.s_addr = hostaddr;
-	
+
 	if (connect(sock, (struct sockaddr*)(&sin), sizeof(struct sockaddr_in)) != 0)
 	{
 		DBG("failed to connect!");
@@ -351,10 +352,10 @@ FirmwareTransfer::StatusCode FirmwareTransfer::performFirmwareUpdate()
 
 		return StatusCode::HostConnectErr;
 	}
-    
-    
+
+
 #else
-    
+
     int sockFlagsBefore = 0;
 
     // Find correct hostname for OS
@@ -363,7 +364,7 @@ FirmwareTransfer::StatusCode FirmwareTransfer::performFirmwareUpdate()
     {
         STOPBEFOREINIT
         returnCode = 0;
-        
+
         // Create socket and connect to port 22
         sock = socket(AF_INET, SOCK_STREAM, 0);
         if (sock < 0)
@@ -371,7 +372,7 @@ FirmwareTransfer::StatusCode FirmwareTransfer::performFirmwareUpdate()
             DBG("failed to create socket!");
             return StatusCode::StartupErr;
         }
-        
+
         if ((sockFlagsBefore = fcntl(sock, F_GETFL, 0) < 0))
         {
             DBG("bad socket flags received");
@@ -387,10 +388,10 @@ FirmwareTransfer::StatusCode FirmwareTransfer::performFirmwareUpdate()
             sin.sin_addr.s_addr = hostaddr;
 
             DBG("attempting to connect to host " + deviceHostName);
-            
+
             do {
                 STOPDURINGSETUP
-                
+
                 if (connect(sock, (struct sockaddr*)(&sin), sizeof(struct sockaddr_in)) < 0)
                 {
                     returnCode = errno;
@@ -401,7 +402,7 @@ FirmwareTransfer::StatusCode FirmwareTransfer::performFirmwareUpdate()
                         DBG("connection failed with error code: " + String(errno));
                         failedTries++;
                     }
-                
+
                     // Wait with specified timeout
                     else
                     {
@@ -419,7 +420,7 @@ FirmwareTransfer::StatusCode FirmwareTransfer::performFirmwareUpdate()
                                 .tv_sec = now.tv_sec,
                                 .tv_nsec = now.tv_nsec + SOCKTIMEOUTMS * 1000000l
                             };
-                            
+
                             do {
                                 // Keep checking how much time left
                                 if (clock_gettime(CLOCK_MONOTONIC, &now) < 0)
@@ -438,11 +439,11 @@ FirmwareTransfer::StatusCode FirmwareTransfer::performFirmwareUpdate()
                                 }
 
                                 STOPDURINGSETUP
-                                
+
                                 // Check connection status
                                 struct pollfd pfds[] = { { .fd = sock, .events = POLLOUT } };
                                 returnCode = poll(pfds, 1, msUntilDeadline);
-                                
+
                                 // Double-check there aren't other errors
                                 if (returnCode > 0)
                                 {
@@ -450,23 +451,23 @@ FirmwareTransfer::StatusCode FirmwareTransfer::performFirmwareUpdate()
                                     socklen_t len = sizeof(err);
                                     if (getsockopt(sock, SOL_SOCKET, SO_ERROR, &err, &len) == 0)
                                         errno = err;
-                                    
+
                                     if (err != 0)
                                     {
                                         returnCode = -1;
                                         DBG("connection failed with errno " + String(err));
                                     }
                                 }
-                                
+
                             } while (returnCode == -1 && errno == EINTR); // If poll was interrupted, try again
-                                
+
                             if (returnCode == 0)
                             {
                                 // Fail if timed out
                                 errno = ETIMEDOUT;
                                 returnCode = -1;
                             }
-                            
+
                             // Success
                             else if (returnCode > 0)
                                 returnCode = 0;
@@ -474,7 +475,7 @@ FirmwareTransfer::StatusCode FirmwareTransfer::performFirmwareUpdate()
                     }
                 }
             } while(0);
-            
+
             if (returnCode == 0)
             {
                 DBG("connected to " + deviceHostName);
@@ -485,18 +486,18 @@ FirmwareTransfer::StatusCode FirmwareTransfer::performFirmwareUpdate()
         {
             DBG("could not set to non-blocking for host connection");
         }
-        
+
         DBG("connection attempt failed");
 
         close(sock);
         failedTries++;
     }
-    
+
     if (failedTries == 2)
     {
         return StatusCode::HostConnectErr;
     }
-    
+
     if (fcntl(sock, F_SETFL, sockFlagsBefore) < 0)
     {
         DBG("could not reset sock flags");
@@ -513,9 +514,9 @@ FirmwareTransfer::StatusCode FirmwareTransfer::performFirmwareUpdate()
         DBG("failed to open file!");
         return StatusCode::StartupErr;
     }
-    
+
     stat(filePath, &fileinfo);
-    
+
     STOPDURINGSETUP
 
 	/* Create a session instance */
@@ -620,7 +621,7 @@ FirmwareTransfer::StatusCode FirmwareTransfer::performFirmwareUpdate()
 	DBG("Waiting for channel to close");
     while ((returnCode = libssh2_channel_wait_closed(channel)) == LIBSSH2_ERROR_EAGAIN && !threadShouldExit()) {};
     STOPDURINGEXEC
-    
+
     while ((returnCode = libssh2_channel_free(channel)) == LIBSSH2_ERROR_EAGAIN && !threadShouldExit()) {};
     STOPDURINGEXEC
 
@@ -643,7 +644,7 @@ FirmwareTransfer::StatusCode FirmwareTransfer::performFirmwareUpdate()
 		return shutdownSSHSession(session, sock, nullptr, StatusCode::ChannelErr);
 	}
 
-    
+
     DBG("Sending reboot command to Lumatone");
 	while ((returnCode = libssh2_channel_exec(channel, rebootCmd.getCharPointer())) == LIBSSH2_ERROR_EAGAIN
            && !threadShouldExit())
@@ -706,7 +707,7 @@ FirmwareTransfer::StatusCode FirmwareTransfer::performFirmwareUpdate()
 		DBG("Exit: " + String(exitcode) + "bytecount: " + String(bytecount));
 
     // Ignore kill-request for regular shutdown
-    
+
 	libssh2_channel_free(channel);
 
 	channel = NULL;
diff --git a/Source/FirmwareTransfer.h b/Source/FirmwareTransfer.h
index d09ebc77..eb89b8f9 100644
--- a/Source/FirmwareTransfer.h
+++ b/Source/FirmwareTransfer.h
@@ -1,16 +1,15 @@
 /*
-  ==============================================================================
+==============================================================================
 
     FirmwareTransfer.h
     Created: 11 Feb 2021 2:36:11am
     Author:  Vincenzo
 
-  ==============================================================================
+==============================================================================
 */
 
 #pragma once
-#include "TerpstraMidiDriver.h"
-
+#include <JuceHeader.h>
 #define UPDATETIMEOUT 5000
 
 class FirmwareTransfer : public juce::ThreadWithProgressWindow
@@ -28,7 +27,7 @@ class FirmwareTransfer : public juce::ThreadWithProgressWindow
         TransferBegin,              // File transfer started
         InstallBegin,               // Reboot request sent
         VerificationBegin,          // Sent GetFirmwareVersion sysex and waiting for answer
-        
+
         /* ERRORS */
         IntegrityErr    = -1,       // Firmware file integrity check is not successful
         StartupErr      = -2,       // Couldn't initialize libssh2 or open firmware file
@@ -42,18 +41,18 @@ class FirmwareTransfer : public juce::ThreadWithProgressWindow
 
 public:
 
-    FirmwareTransfer(TerpstraMidiDriver& driverIn);
+    FirmwareTransfer();
     ~FirmwareTransfer();
 
-    bool   requestFirmwareUpdate(String firmwareFilePath);
+    bool   requestFirmwareUpdate(juce::String firmwareFilePath);
     bool   requestFirmwareDownloadAndUpdate(); // TODO - probably better moved elsewhere
 
     bool   isFirmwareUpdateAvailable() { return true; /*TODO*/ }
 
     // TODO - member should be filled on instantiation
-    String getCurrentFirmwareVersion() { return currentFirmwareVersion; }
+    juce::String getCurrentFirmwareVersion() { return currentFirmwareVersion; }
 
-    static String getLatestFirmwareVersion() { return ""; /*TODO*/ }
+    static juce::String getLatestFirmwareVersion() { return ""; /*TODO*/ }
 
     bool isDownloadInProgress() const { return downloadRequested; }
     bool isTransferInProgress() const { return transferRequested; }
@@ -68,11 +67,11 @@ class FirmwareTransfer : public juce::ThreadWithProgressWindow
     void run() override;
 
     //=========================================================================
-    
+
 public:
 
     // TODO use error codes
-    static bool checkFirmwareFileIntegrity(String filePathIn);
+    static bool checkFirmwareFileIntegrity(juce::String filePathIn);
 
 
 public:
@@ -86,7 +85,7 @@ class FirmwareTransfer : public juce::ThreadWithProgressWindow
     {
     public:
         virtual ~ProcessListener() {}
-        virtual void firmwareTransferUpdate(FirmwareTransfer::StatusCode statusCode, String msg)=0;
+        virtual void firmwareTransferUpdate(FirmwareTransfer::StatusCode statusCode, juce::String msg)=0;
     };
 
     void addTransferListener(ProcessListener* listenerIn) { listeners.add(listenerIn); }
@@ -106,7 +105,7 @@ class FirmwareTransfer : public juce::ThreadWithProgressWindow
 
     // header only in .cpp
     //static int shutdownSSHSession(LIBSSH2_SESSION*, int, FILE*, int returnCode = 0);
-    //static int waitForSSHSocket(int, LIBSSH2_SESSION*); 
+    //static int waitForSSHSocket(int, LIBSSH2_SESSION*);
 
 private:
 
@@ -116,10 +115,9 @@ class FirmwareTransfer : public juce::ThreadWithProgressWindow
 
 private:
 
-    TerpstraMidiDriver& midiDriver;
-    String currentFirmwareVersion;
+    juce::String currentFirmwareVersion;
 
-    String selectedFileToTransfer;
+    juce::String selectedFileToTransfer;
 
     bool downloadRequested = false;
     bool transferRequested = false;
@@ -133,58 +131,58 @@ class FirmwareTransfer : public juce::ThreadWithProgressWindow
 
 public:
 
-    static String statusCodeToMessage(FirmwareTransfer::StatusCode statusCode)
+    static juce::String statusCodeToMessage(FirmwareTransfer::StatusCode statusCode)
     {
         switch (statusCode)
         {
         case FirmwareTransfer::StatusCode::Initialize:
-            return translate("Firmware update process initiated!");
+            return juce::translate("Firmware update process initiated!");
 
         case FirmwareTransfer::StatusCode::FileIntegrityCheck:
-            return translate("Checking integrity of firmware file...");
+            return juce::translate("Checking integrity of firmware file...");
 
         case FirmwareTransfer::StatusCode::SessionBegin:
-            return translate("Establishing connection to Lumatone...");
+            return juce::translate("Establishing connection to Lumatone...");
 
         case FirmwareTransfer::StatusCode::AuthBegin:
-            return translate("Providing credentials...");
+            return juce::translate("Providing credentials...");
 
         case FirmwareTransfer::StatusCode::TransferBegin:
-            return translate("Transferring firmware file...");
+            return juce::translate("Transferring firmware file...");
 
         case FirmwareTransfer::StatusCode::InstallBegin:
-            return translate("Rebooting device for installation");
+            return juce::translate("Rebooting device for installation");
 
         case FirmwareTransfer::StatusCode::VerificationBegin:
-            return translate("Installing update...");
+            return juce::translate("Installing update...");
 
         case FirmwareTransfer::StatusCode::IntegrityErr:
-            return translate("Error: Not a valid Lumatone firmware file");
+            return juce::translate("Error: Not a valid Lumatone firmware file");
 
         case FirmwareTransfer::StatusCode::StartupErr:
-            return translate("Error: Could not prepare device communication protool");
+            return juce::translate("Error: Could not prepare device communication protool");
 
         case FirmwareTransfer::StatusCode::HostConnectErr:
-            return translate("Error: Could not communicate with Lumatone"
-                             "\nPlease make sure you are connected over USB.");
+            return juce::translate("Error: Could not communicate with Lumatone"
+                                 "\nPlease make sure you are connected over USB.");
 
         case FirmwareTransfer::StatusCode::SessionEstErr:
-            return translate("Error: Could not verify connection with Lumatone");
+            return juce::translate("Error: Could not verify connection with Lumatone");
 
         case FirmwareTransfer::StatusCode::AuthErr:
-            return translate("Error: Authentication for Lumatone failed");
+            return juce::translate("Error: Authentication for Lumatone failed");
 
         case FirmwareTransfer::StatusCode::ChannelErr:
-            return translate("Error: Communication channel failure");
+            return juce::translate("Error: Communication channel failure");
 
         case FirmwareTransfer::StatusCode::ExecChnlErr:
-            return translate("Error: Could not request device reboot. Try rebooting your Lumatone.");
+            return juce::translate("Error: Could not request device reboot. Try rebooting your Lumatone.");
 
         case FirmwareTransfer::StatusCode::NoErr:
-            return translate("Please wait for your Lumatone to install the firmware.");
+            return juce::translate("Please wait for your Lumatone to install the firmware.");
 
         default:
-            return translate("Unspecified error.");
+            return juce::translate("Unspecified error.");
         }
     }
 
diff --git a/Source/GeneralOptionsDlg.cpp b/Source/GeneralOptionsDlg.cpp
index 06c45f15..acc47a40 100644
--- a/Source/GeneralOptionsDlg.cpp
+++ b/Source/GeneralOptionsDlg.cpp
@@ -18,7 +18,11 @@
 */
 
 //[Headers] You can add your own extra header files here...
-#include "Main.h"
+#include "LumatoneEditorLookAndFeel.h"
+
+#include "./lumatone_editor_library/device/lumatone_controller.h"
+
+#include "MainComponent.h"
 //[/Headers]
 
 #include "GeneralOptionsDlg.h"
@@ -28,7 +32,8 @@
 //[/MiscUserDefs]
 
 //==============================================================================
-GeneralOptionsDlg::GeneralOptionsDlg ()
+GeneralOptionsDlg::GeneralOptionsDlg (const LumatoneEditorState& stateIn)
+    : LumatoneEditorState("GeneralOptionsDialog", stateIn)
 {
     //[Constructor_pre] You can add your own custom stuff here..
     //[/Constructor_pre]
@@ -61,9 +66,9 @@ GeneralOptionsDlg::GeneralOptionsDlg ()
 
 
     //[UserPreSize]
-    labelGeneralSettingslTitle->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::UniviaProBold));
+    labelGeneralSettingslTitle->setFont(getAppFonts().getFont(LumatoneEditorFont::UniviaProBold));
 
-    TerpstraSysExApplication::getApp().getLumatoneController()->addFirmwareListener(this);
+    // getLumatoneController()->addFirmwareListener(this);
     //[/UserPreSize]
 
     setSize (188, 96);
@@ -76,7 +81,7 @@ GeneralOptionsDlg::GeneralOptionsDlg ()
 GeneralOptionsDlg::~GeneralOptionsDlg()
 {
     //[Destructor_pre]. You can add your own custom destruction code here..
-    TerpstraSysExApplication::getApp().getLumatoneController()->removeFirmwareListener(this);
+    // getLumatoneController()->removeFirmwareListener(this);
     //[/Destructor_pre]
 
     labelGeneralSettingslTitle = nullptr;
@@ -135,17 +140,17 @@ void GeneralOptionsDlg::buttonClicked (juce::Button* buttonThatWasClicked)
     if (buttonThatWasClicked == buttonAfterTouchActive.get())
     {
         //[UserButtonCode_buttonAfterTouchActive] -- add your button handler code here..
-		((MainContentComponent*)getParentComponent())->getMappingInEdit().afterTouchActive = buttonAfterTouchActive->getToggleState();
-		TerpstraSysExApplication::getApp().setHasChangesToSave(true);
-		TerpstraSysExApplication::getApp().getLumatoneController()->setAftertouchEnabled(buttonAfterTouchActive->getToggleState());
+		// ((MainContentComponent*)getParentComponent())->getMappingInEdit().afterTouchActive = buttonAfterTouchActive->getToggleState();
+		// TerpstraSysExApplication::getApp().setHasChangesToSave(true);
+        setAftertouchEnabled(buttonAfterTouchActive->getToggleState());
         //[/UserButtonCode_buttonAfterTouchActive]
     }
     else if (buttonThatWasClicked == buttonLightOnKeyStrokes.get())
     {
         //[UserButtonCode_buttonLightOnKeyStrokes] -- add your button handler code here..
-		((MainContentComponent*)getParentComponent())->getMappingInEdit().lightOnKeyStrokes = buttonLightOnKeyStrokes->getToggleState();
-		TerpstraSysExApplication::getApp().setHasChangesToSave(true);
-		TerpstraSysExApplication::getApp().getLumatoneController()->sendLightOnKeyStrokes(buttonLightOnKeyStrokes->getToggleState());
+		// ((MainContentComponent*)getParentComponent())->getMappingInEdit().lightOnKeyStrokes = buttonLightOnKeyStrokes->getToggleState();
+		// TerpstraSysExApplication::getApp().setHasChangesToSave(true);
+		setLightOnKeyStrokes(buttonLightOnKeyStrokes->getToggleState());
         //[/UserButtonCode_buttonLightOnKeyStrokes]
     }
 
@@ -158,22 +163,17 @@ void GeneralOptionsDlg::buttonClicked (juce::Button* buttonThatWasClicked)
 //[MiscUserCode] You can add your own definitions of your custom methods or any other code here...
 void GeneralOptionsDlg::lookAndFeelChanged()
 {
-    auto lookAndFeel = dynamic_cast<LumatoneEditorLookAndFeel*>(&getLookAndFeel());
-    if (lookAndFeel)
-    {
-        labelGeneralSettingslTitle->setColour(Label::ColourIds::textColourId, lookAndFeel->findColour(LumatoneEditorColourIDs::LabelBlue));
-    }
+    labelGeneralSettingslTitle->setColour(Label::ColourIds::textColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::LabelBlue));
 }
 
 void GeneralOptionsDlg::loadFromMapping()
 {
-	auto mappingInEdit = ((MainContentComponent*)getParentComponent())->getMappingInEdit();
-
-	buttonAfterTouchActive->setToggleState(mappingInEdit.afterTouchActive, juce::NotificationType::dontSendNotification);
-	buttonLightOnKeyStrokes->setToggleState(mappingInEdit.lightOnKeyStrokes, juce::NotificationType::dontSendNotification);
+	// auto mappingInEdit = ((MainContentComponent*)getParentComponent())->getMappingInEdit();
+	buttonAfterTouchActive->setToggleState(getAftertouchOn(), juce::NotificationType::dontSendNotification);
+	buttonLightOnKeyStrokes->setToggleState(getLightOnKeyStrokes(), juce::NotificationType::dontSendNotification);
 }
 
-void GeneralOptionsDlg::presetFlagsReceived(PresetFlags presetFlags)
+void GeneralOptionsDlg::presetFlagsReceived(LumatoneFirmware::PresetFlags presetFlags)
 {
     buttonAfterTouchActive->setToggleState(presetFlags.polyphonicAftertouch, dontSendNotification);
     buttonLightOnKeyStrokes->setToggleState(presetFlags.lightsOnKeystroke, dontSendNotification);
@@ -218,4 +218,3 @@ END_JUCER_METADATA
 
 //[EndFile] You can add extra defines here...
 //[/EndFile]
-
diff --git a/Source/GeneralOptionsDlg.h b/Source/GeneralOptionsDlg.h
index f8da88f6..16e4b7e8 100644
--- a/Source/GeneralOptionsDlg.h
+++ b/Source/GeneralOptionsDlg.h
@@ -22,7 +22,9 @@
 //[Headers]     -- You can add your own extra header files here --
 #include <JuceHeader.h>
 
-#include "LumatoneEditorStyleCommon.h"
+#include "./lumatone_editor_library/listeners/firmware_listener.h"
+
+#include "LumatoneEditorState.h"
 //[/Headers]
 
 
@@ -35,13 +37,14 @@
     Describe your class and how it works here!
                                                                     //[/Comments]
 */
-class GeneralOptionsDlg  : public Component,
+class GeneralOptionsDlg  : public juce::Component,
+                           public LumatoneEditorState,
                            public LumatoneEditor::FirmwareListener,
                            public juce::Button::Listener
 {
 public:
     //==============================================================================
-    GeneralOptionsDlg ();
+    GeneralOptionsDlg(const LumatoneEditorState& stateIn);
     ~GeneralOptionsDlg() override;
 
     //==============================================================================
@@ -53,7 +56,7 @@ class GeneralOptionsDlg  : public Component,
     void lookAndFeelChanged() override;
 
     // LumatoneEditor::FirmwareListener Implementation
-    void presetFlagsReceived(PresetFlags presetFlags) override;
+    void presetFlagsReceived(LumatoneFirmware::PresetFlags presetFlags) override;
 
     //[/UserMethods]
 
diff --git a/Source/GlobalSettingsArea.cpp b/Source/GlobalSettingsArea.cpp
index 69b24f04..28fac7cf 100644
--- a/Source/GlobalSettingsArea.cpp
+++ b/Source/GlobalSettingsArea.cpp
@@ -18,8 +18,11 @@
 */
 
 //[Headers] You can add your own extra header files here...
-#include "Main.h"
-#include "Settings/CalibrationDlg.h"
+#include "LumatoneEditorLookAndFeel.h"
+
+#include "./Settings/SettingsContainer.h"
+
+#include "./lumatone_editor_library/device/lumatone_controller.h"
 //[/Headers]
 
 #include "GlobalSettingsArea.h"
@@ -29,7 +32,8 @@
 //[/MiscUserDefs]
 
 //==============================================================================
-GlobalSettingsArea::GlobalSettingsArea ()
+GlobalSettingsArea::GlobalSettingsArea (const LumatoneEditorState& stateIn)
+    : LumatoneEditorState("GlobalSettingsArea", stateIn)
 {
     //[Constructor_pre] You can add your own custom stuff here..
     //[/Constructor_pre]
@@ -77,25 +81,23 @@ GlobalSettingsArea::GlobalSettingsArea ()
 
 
     //[UserPreSize]
-    activeMacroButtonColourEdit.reset(new ColourEditComponent());
+    activeMacroButtonColourEdit.reset(new ColourViewComponent());
     addAndMakeVisible(activeMacroButtonColourEdit.get());
     activeMacroButtonColourEdit->addChangeListener(this);
 
-    inactiveMacroButtonColourEdit.reset(new ColourEditComponent());
+    inactiveMacroButtonColourEdit.reset(new ColourViewComponent());
     addAndMakeVisible(inactiveMacroButtonColourEdit.get());
     inactiveMacroButtonColourEdit->addChangeListener(this);
 
-    lblDeveloperMode.reset(new Label("DeveloperModeLabel", "Developer Mode"));
+    lblDeveloperMode.reset(new juce::Label("DeveloperModeLabel", "Developer Mode"));
     addChildComponent(lblDeveloperMode.get());
-    setDeveloperMode(TerpstraSysExApplication::getApp().getPropertiesFile()->getBoolValue("DeveloperMode", false));
-
-
-    lblPresetButtonColours->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::UniviaProBold));
-    lblColourActiveMacroButton->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::GothamNarrowMedium));
-    lblPresetButtonColours->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::UniviaProBold));
+    setDeveloperMode(getInDeveloperMode());
 
+    lblPresetButtonColours->setFont(getAppFonts().getFont(LumatoneEditorFont::UniviaProBold));
+    lblColourActiveMacroButton->setFont(getAppFonts().getFont(LumatoneEditorFont::GothamNarrowMedium));
+    lblPresetButtonColours->setFont(getAppFonts().getFont(LumatoneEditorFont::UniviaProBold));
 
-    TerpstraSysExApplication::getApp().getLumatoneController()->addStatusListener(this);
+    addStatusListener(this);
 
     buttonCalibrate->setEnabled(false);
 
@@ -111,7 +113,7 @@ GlobalSettingsArea::GlobalSettingsArea ()
 
 
 	// Set values according to the properties files
-	restoreStateFromPropertiesFile(TerpstraSysExApplication::getApp().getPropertiesFile());
+	// restoreStateFromPropertiesFile(TerpstraSysExApplication::getApp().getPropertiesFile());
     //[/Constructor]
 }
 
@@ -158,7 +160,7 @@ void GlobalSettingsArea::resized()
     float colourEditHeight = proportionOfHeight(controlsHeight);
     float controlY = proportionOfHeight((1 - controlsHeight) / 2.0f);
     float colourButtonWidth = colourEditHeight * colourButtonAspect;
-    Font colourLabelsFont = TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::FranklinGothic, colourEditHeight * 1.1f);
+    Font colourLabelsFont = getAppFonts().getFont(LumatoneEditorFont::FranklinGothic, colourEditHeight * 1.1f);
 
     lblColourInactiveMacroButton->setFont(colourLabelsFont);
     resizeLabelWithHeight(lblColourInactiveMacroButton.get(), colourEditHeight);
@@ -210,10 +212,10 @@ void GlobalSettingsArea::buttonClicked (juce::Button* buttonThatWasClicked)
         launchOptions.dialogBackgroundColour = Colour();
 
 		auto settingsDialog = launchOptions.launchAsync();
-        settingsDialog->setLookAndFeel(&TerpstraSysExApplication::getApp().getLookAndFeel().compactWindowStyle);
+        settingsDialog->setLookAndFeel(static_cast<juce::LookAndFeel_V4*>(&getEditorLookAndFeel().compactWindowStyle));
         settingsDialog->centreWithSize(548, 240);
 
-        TerpstraSysExApplication::getApp().setOpenDialogWindow(settingsDialog);
+        // TerpstraSysExApplication::getApp().setOpenDialogWindow(settingsDialog);
 
         //[/UserButtonCode_buttonCalibrate]
     }
@@ -228,10 +230,10 @@ void GlobalSettingsArea::buttonClicked (juce::Button* buttonThatWasClicked)
 
 void GlobalSettingsArea::lookAndFeelChanged()
 {
-    lblPresetButtonColours->setColour(Label::ColourIds::textColourId, getLookAndFeel().findColour(LumatoneEditorColourIDs::LabelPink));
+    lblPresetButtonColours->setColour(Label::ColourIds::textColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::LabelPink));
 
-    lblColourActiveMacroButton->setColour(Label::ColourIds::textColourId, getLookAndFeel().findColour(LumatoneEditorColourIDs::DescriptionText));
-    lblColourInactiveMacroButton->setColour(Label::ColourIds::textColourId, getLookAndFeel().findColour(LumatoneEditorColourIDs::DescriptionText));
+    lblColourActiveMacroButton->setColour(Label::ColourIds::textColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::DescriptionText));
+    lblColourInactiveMacroButton->setColour(Label::ColourIds::textColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::DescriptionText));
 
     buttonCalibrate->setColour(TextButton::ColourIds::buttonColourId, Colour(0xff383b3d));
     buttonCalibrate->setColour(TextButton::ColourIds::textColourOffId, Colour(0xffffffff));
@@ -242,12 +244,12 @@ void GlobalSettingsArea::changeListenerCallback(ChangeBroadcaster *source)
 	if (source == inactiveMacroButtonColourEdit.get())
 	{
 		String inactiveMacroButtonColour = inactiveMacroButtonColourEdit->getColourAsString();
-		TerpstraSysExApplication::getApp().getLumatoneController()->sendMacroButtonInactiveColour(inactiveMacroButtonColour);
+		getLumatoneController()->sendMacroButtonInactiveColour(inactiveMacroButtonColour);
 	}
 	else if (source == activeMacroButtonColourEdit.get())
 	{
 		String activeMacroButtonColour = activeMacroButtonColourEdit->getColourAsString();
-		TerpstraSysExApplication::getApp().getLumatoneController()->sendMacroButtonActiveColour(activeMacroButtonColour);
+		getLumatoneController()->sendMacroButtonActiveColour(activeMacroButtonColour);
 	}
 }
 
@@ -284,15 +286,15 @@ void GlobalSettingsArea::setDeveloperMode(bool devModeOn)
     repaint();
 }
 
-void GlobalSettingsArea::connectionEstablished(int inputDevice, int outputDevice)
+void GlobalSettingsArea::connectionStateChanged(ConnectionState state)
 {
-    buttonCalibrate->setEnabled(true);
+    buttonCalibrate->setEnabled(state == ConnectionState::ONLINE);
 }
 
-void GlobalSettingsArea::connectionLost()
-{
-    buttonCalibrate->setEnabled(false);
-}
+// void GlobalSettingsArea::connectionFaile()
+// {
+//     buttonCalibrate->setEnabled(false);
+// }
 
 //[/MiscUserCode]
 
@@ -339,4 +341,3 @@ END_JUCER_METADATA
 
 //[EndFile] You can add extra defines here...
 //[/EndFile]
-
diff --git a/Source/GlobalSettingsArea.h b/Source/GlobalSettingsArea.h
index 3d285882..60334358 100644
--- a/Source/GlobalSettingsArea.h
+++ b/Source/GlobalSettingsArea.h
@@ -21,9 +21,12 @@
 
 //[Headers]     -- You can add your own extra header files here --
 #include <JuceHeader.h>
-#include "ColourEditComponent.h"
-#include "LumatoneController.h"
-#include "Settings/SettingsContainer.h"
+
+#include "./LumatoneEditorState.h"
+
+#include "./lumatone_editor_library/listeners/status_listener.h"
+#include "./lumatone_editor_library/palettes/colour_view_component.h"
+
 //[/Headers]
 
 
@@ -37,13 +40,14 @@
                                                                     //[/Comments]
 */
 class GlobalSettingsArea  : public juce::Component,
+                            public LumatoneEditorState,
                             public ChangeListener,
                             public LumatoneEditor::StatusListener,
                             public juce::Button::Listener
 {
 public:
     //==============================================================================
-    GlobalSettingsArea ();
+    GlobalSettingsArea (const LumatoneEditorState& stateIn);
     ~GlobalSettingsArea() override;
 
     //==============================================================================
@@ -60,8 +64,9 @@ class GlobalSettingsArea  : public juce::Component,
     void setDeveloperMode(bool devModeOn);
 
     // LumatoneEditor::StatusListener implementation
-    void connectionEstablished(int inputDevice, int outputDevice) override;
-    void connectionLost() override;
+    // void connectionEstablished(int inputDevice, int outputDevice) override;
+    void connectionStateChanged(ConnectionState newState) override;
+    // void connectionFailed() override;
 
     //[/UserMethods]
 
@@ -73,8 +78,8 @@ class GlobalSettingsArea  : public juce::Component,
 
 private:
     //[UserVariables]   -- You can add your own custom variables in this section.
-	std::unique_ptr<ColourEditComponent> inactiveMacroButtonColourEdit;
-	std::unique_ptr<ColourEditComponent> activeMacroButtonColourEdit;
+	std::unique_ptr<ColourViewComponent> inactiveMacroButtonColourEdit;
+	std::unique_ptr<ColourViewComponent> activeMacroButtonColourEdit;
 
     std::unique_ptr<Label> lblDeveloperMode;
 
@@ -109,4 +114,3 @@ class GlobalSettingsArea  : public juce::Component,
 
 //[EndFile] You can add extra defines here...
 //[/EndFile]
-
diff --git a/Source/HajuLib/HajuErrorVisualizer.cpp b/Source/HajuLib/HajuErrorVisualizer.cpp
deleted file mode 100644
index 9f38c4aa..00000000
--- a/Source/HajuLib/HajuErrorVisualizer.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-  ==============================================================================
-
-    HajuErrorVisualizer.cpp
-    Created: 19 Apr 2020 11:33:04am
-    Author:  hsstraub
-
-  ==============================================================================
-*/
-
-#include "HajuErrorVisualizer.h"
-
-HajuErrorVisualizer::HajuErrorVisualizer(LookAndFeel& lookAndFeelValue)
-: lookAndFeel(lookAndFeelValue)
-{
-}
-
-void HajuErrorVisualizer::setErrorLevel(ErrorLevel errorLevel, String toolTipText)
-{
-    lastErrorLevel = errorLevel;
-    currentText = toolTipText;
-}
-
-void HajuErrorVisualizer::setErrorLevel(
-    SettableTooltipClient& tooltipClient,
-    Component& component,
-    ErrorLevel errorLevel,
-    String toolTipText,
-    int bgColourId)
-{
-    setErrorLevel(errorLevel, toolTipText);
-    tooltipClient.setTooltip(toolTipText);
-    component.setColour(bgColourId, errorLevelColours[errorLevel]);
-    component.repaint();
-}
diff --git a/Source/HajuLib/HajuErrorVisualizer.h b/Source/HajuLib/HajuErrorVisualizer.h
deleted file mode 100644
index 7d33ea77..00000000
--- a/Source/HajuLib/HajuErrorVisualizer.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-  ==============================================================================
-
-    HajuErrorVisualizer.h
-    Created: 19 Apr 2020 11:33:04am
-    Author:  hsstraub
-
-  ==============================================================================
-*/
-
-#pragma once
-
-#include <JuceHeader.h>
-
-
-class HajuErrorVisualizer
-{
-    // Types
-public:
-    typedef enum
-    {
-        noError = 0,
-        warning = 1,
-        error = 2
-    } ErrorLevel;
-
-public:
-    HajuErrorVisualizer(LookAndFeel& lookAndFeelValue);
-
-    // Methods
-public:
-    void setErrorLevel(ErrorLevel errorLevel, String toolTipText);
-
-    void setErrorLevel(
-        SettableTooltipClient& tooltipClient,
-        Component& component,
-        ErrorLevel errorLevel,
-        String toolTipText,
-        int bgColourId);
-
-    void setErrorLevel(TextEditor& textEdit, ErrorLevel errorLevel, String toolTipText) {
-        return setErrorLevel(textEdit, textEdit, errorLevel, toolTipText, TextEditor::backgroundColourId);
-    }
-
-    void setErrorLevel(Label& label, ErrorLevel errorLevel, String toolTipText) {
-        return setErrorLevel(label, label, errorLevel, toolTipText, Label::textColourId);
-    }
-
-    // Attributes
-private:
-    LookAndFeel&  lookAndFeel;
-    ErrorLevel    lastErrorLevel;
-    String        currentText;
-    Array<Colour> errorLevelColours = { Colour(0xff84aea3), Colour(0xffc9c238), Colour(0xffd7002a) };
-};
\ No newline at end of file
diff --git a/Source/IsomorphicMassAssign.cpp b/Source/IsomorphicMassAssign.cpp
index 96e7a8e5..f38db156 100644
--- a/Source/IsomorphicMassAssign.cpp
+++ b/Source/IsomorphicMassAssign.cpp
@@ -18,9 +18,12 @@
 */
 
 //[Headers] You can add your own extra header files here...
-#include "ViewConstants.h"
-#include "Main.h"
-#include "MainComponent.h"
+#include "LumatoneEditorLookAndFeel.h"
+
+#include "./lumatone_editor_library/graphics/view_constants.h"
+#include "./lumatone_editor_library/device/lumatone_controller.h"
+#include "./lumatone_editor_library/palettes/colour_palette_component.h"
+
 //[/Headers]
 
 #include "IsomorphicMassAssign.h"
@@ -30,14 +33,15 @@
 //[/MiscUserDefs]
 
 //==============================================================================
-IsomorphicMassAssign::IsomorphicMassAssign ()
+IsomorphicMassAssign::IsomorphicMassAssign(const LumatoneEditorState& stateIn)
+    : LumatoneEditorState("IsomorphicMassAssign", stateIn)
 {
     //[Constructor_pre] You can add your own custom stuff here..
     periodSize = 0;
 
     labelMappingType.reset(new juce::Label("labelMappingType", translate("Type")));
     addAndMakeVisible(labelMappingType.get());
-    labelMappingType->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::GothamNarrowMedium));
+    labelMappingType->setFont(getAppFonts().getFont(LumatoneEditorFont::GothamNarrowMedium));
 
     labelMappingType->setBounds(20, 64, 88, 24);
 
@@ -92,7 +96,7 @@ IsomorphicMassAssign::IsomorphicMassAssign ()
     labelStartingPoint.reset(new juce::Label("labelStartingPoint", translate("StartingValue")));
     addAndMakeVisible(labelStartingPoint.get());
     labelStartingPoint->setTooltip(translate("StartingPointTooltip"));
-    labelStartingPoint->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::GothamNarrowMedium));
+    labelStartingPoint->setFont(getAppFonts().getFont(LumatoneEditorFont::GothamNarrowMedium));
 
     labelStartingPoint->setBounds(8, 344, 150, 24);
 
@@ -108,7 +112,7 @@ IsomorphicMassAssign::IsomorphicMassAssign ()
 
     labelPeriodSize.reset(new juce::Label("labelPeriodSize", TRANS("Period")));
     addAndMakeVisible(labelPeriodSize.get());
-    labelPeriodSize->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::GothamNarrowMedium));
+    labelPeriodSize->setFont(getAppFonts().getFont(LumatoneEditorFont::GothamNarrowMedium));
 
     labelPeriodSize->setBounds(16, 8, 168, 24);
 
@@ -133,7 +137,7 @@ IsomorphicMassAssign::IsomorphicMassAssign ()
 
     labelHorizontalSteps.reset(new juce::Label("labelHorizontalSteps", translate("HorizontalSteps")));
     addAndMakeVisible(labelHorizontalSteps.get());
-    labelHorizontalSteps->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::GothamNarrowMedium));
+    labelHorizontalSteps->setFont(getAppFonts().getFont(LumatoneEditorFont::GothamNarrowMedium));
 
     labelHorizontalSteps->setBounds(208, 344, 112, 24);
 
@@ -151,7 +155,7 @@ IsomorphicMassAssign::IsomorphicMassAssign ()
 
     labelRightUpwardSteps.reset(new juce::Label("labelRightUpwardSteps", translate("RightUpwardSteps")));
     addAndMakeVisible(labelRightUpwardSteps.get());
-    labelRightUpwardSteps->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::GothamNarrowMedium));
+    labelRightUpwardSteps->setFont(getAppFonts().getFont(LumatoneEditorFont::GothamNarrowMedium));
     labelRightUpwardSteps->setBounds(152, 296, 136, 24);
 
     editRightUpwardSteps.reset(new juce::TextEditor("editRightUpwardSteps"));
@@ -392,10 +396,10 @@ void IsomorphicMassAssign::paint (juce::Graphics& g)
     //[UserPaint] Add your own custom painting code here..
     g.fillAll(Colour(0xff2d3135));
 
-    g.setColour(getLookAndFeel().findColour(LumatoneEditorColourIDs::LightBackground));
+    g.setColour(getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::LightBackground));
     g.fillRect(instructionsBounds);
 
-    g.setColour(getLookAndFeel().findColour(LumatoneEditorColourIDs::InactiveText));
+    g.setColour(getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::InactiveText));
     g.setFont(instructionsFont);
     g.drawFittedText(translate("IsomorphicAssignDirections"), instructionsBounds, Justification::centred, 3, 1.0f);
 
@@ -542,7 +546,7 @@ void IsomorphicMassAssign::buttonClicked (juce::Button* buttonThatWasClicked)
 		{
 			scaleDesignWindow.reset(
                 new ScaleDesignWindow(scaleStructure, colourTable, findColour(ResizableWindow::backgroundColourId)));
-			scaleDesignWindow->setLookAndFeel(&TerpstraSysExApplication::getApp().getLookAndFeel());
+			// scaleDesignWindow->setLookAndFeel(getLookAndFeel());
 			scaleDesignWindow->addScaleDesignerListener(this);
 		}
 
@@ -606,10 +610,11 @@ void IsomorphicMassAssign::setSaveSend(int setSelection, int keySelection, int n
 {
 	// XXX This could be in a common base class for all assign edit components
 
-	auto mainComponent = dynamic_cast<MainContentComponent*>(getParentComponent()->getParentComponent()->getParentComponent());
+	// auto mainComponent = dynamic_cast<MainContentComponent*>(getParentComponent()->getParentComponent()->getParentComponent());
 
-    LumatoneKey keyData = *TerpstraSysExApplication::getApp().getMappingData()->readKey(setSelection, keySelection);
-    keyData.keyType = LumatoneKeyType::noteOnNoteOff;
+    // LumatoneKey keyData = *TerpstraSysExApplication::getApp().getMappingData()->readKey(setSelection, keySelection);
+    LumatoneKey keyData = getKey(setSelection, keySelection);
+    keyData.setKeyType(LumatoneKeyType::noteOnNoteOff);
 
 	// Save data
 	mappingLogic->indexToTerpstraKey(
@@ -618,7 +623,8 @@ void IsomorphicMassAssign::setSaveSend(int setSelection, int keySelection, int n
 		);
 
 	// Send to device
-	TerpstraSysExApplication::getApp().getLumatoneController()->sendKeyParam(setSelection + 1, keySelection, keyData);
+    setKey(keyData, setSelection + 1, noteIndex);
+	// getLumatoneController()->sendKeyParam(setSelection + 1, keySelection, keyData);
 }
 
 // Fill a line in current octave board. Starting point is assumed to have been set
@@ -680,7 +686,7 @@ void IsomorphicMassAssign::mappingLogicChanged(MappingLogicBase* mappingLogicTha
 		LumatoneKey keyData = mappingLogicThatChanged->indexToTerpstraKey(i);
 		jassert(!keyData.isEmpty());
 
-        String keyLabel = String(i) + ": Key_" + String(keyData.noteNumber) + ", Chan_" + String(keyData.channelNumber);
+        String keyLabel = String(i) + ": Key_" + String(keyData.getMidiNumber()) + ", Chan_" + String(keyData.getMidiChannel());
         startingPointBox->addItem(keyLabel, i + 1);
 
         if (keyLabel == previousStartingLabel)
@@ -736,12 +742,12 @@ void IsomorphicMassAssign::colourChangedCallback(ColourSelectionBroadcaster* sou
 bool IsomorphicMassAssign::performMouseDown(int setSelection, int keySelection)
 {
 	bool mappingChanged = false;
-	jassert(setSelection >= 0 && setSelection < MAXNUMBOARDS && keySelection >= 0 && keySelection < TerpstraSysExApplication::getApp().getOctaveBoardSize());
+	jassert(setSelection >= 0 && setSelection < MAXNUMBOARDS && keySelection >= 0 && keySelection < getOctaveBoardSize());
 
 	int startNoteIndex = this->startingPointBox->getSelectedItemIndex();
 	if (this->mappingLogic != nullptr && startNoteIndex >= 0)
 	{
-	    auto mainComponent = dynamic_cast<MainContentComponent*>(getParentComponent()->getParentComponent()->getParentComponent());
+	    // auto mainComponent = dynamic_cast<MainContentComponent*>(getParentComponent()->getParentComponent()->getParentComponent());
 
 		int horizStepSize = editHorizontalSteps->getText().getIntValue();
 		int rUpwStepSize = editRightUpwardSteps->getText().getIntValue();
@@ -749,7 +755,7 @@ bool IsomorphicMassAssign::performMouseDown(int setSelection, int keySelection)
         Point<int>startPos = boardGeometry.coordinatesForKey(setSelection, keySelection); // Get the coordinates of the clicked key.
 
         for (int boardIx = 0; boardIx < MAXNUMBOARDS; boardIx++) { // For each board
-            for (int keyIx = 0; keyIx < TerpstraSysExApplication::getApp().getOctaveBoardSize(); keyIx++) { // For each key on that board
+            for (int keyIx = 0; keyIx < getOctaveBoardSize(); keyIx++) { // For each key on that board
                 Point<int> keyPos = boardGeometry.coordinatesForKey(boardIx, keyIx); // Get the coordinates of the key to assign.
                 Point<int> keyOffset = keyPos - startPos; // Get the offset of the key to assign, relative to where the user clicked.
                 setSaveSend(
diff --git a/Source/IsomorphicMassAssign.h b/Source/IsomorphicMassAssign.h
index b79e3df7..81487298 100644
--- a/Source/IsomorphicMassAssign.h
+++ b/Source/IsomorphicMassAssign.h
@@ -21,13 +21,18 @@
 
 //[Headers]     -- You can add your own extra header files here --
 #include <JuceHeader.h>
+
 #include "MappingLogic.h"
 #include "IncrMidiNotesMapping.h"
 #include "KBMMappingDlg.h"
-#include "lumatone_geometry.h"
+
 #include "ScaleStructureController/ScaleStructureComponent.h"
 #include "ScaleStructureController/ScaleDesignWindow.h"
-#include "LumatoneEditorStyleCommon.h"
+
+#include "./lumatone_editor_library/mapping/lumatone_geometry.h"
+#include "./lumatone_editor_library/palettes/colour_selection_broadcaster.h"
+
+#include "LumatoneEditorState.h"
 //[/Headers]
 
 
@@ -40,7 +45,8 @@
     Describe your class and how it works here!
                                                                     //[/Comments]
 */
-class IsomorphicMassAssign  : public Component,
+class IsomorphicMassAssign  : public juce::Component,
+							  public LumatoneEditorState,
                               public MappingLogicBase::Listener,
                               public ScaleStructureComponent::Listener,
                               public ColourSelectionListener,
@@ -49,7 +55,7 @@ class IsomorphicMassAssign  : public Component,
 {
 public:
     //==============================================================================
-    IsomorphicMassAssign ();
+    IsomorphicMassAssign (const LumatoneEditorState& stateIn);
     ~IsomorphicMassAssign() override;
 
     //==============================================================================
@@ -106,7 +112,7 @@ class IsomorphicMassAssign  : public Component,
 
 	MappingLogicBase*			mappingLogic;
 	int							periodSize;
-	LumatoneGeometry		boardGeometry;
+	LumatoneGeometry			boardGeometry;
 	ScaleStructure				scaleStructure;
 
 	// Style helpers
diff --git a/Source/KBMForOneChannel.cpp b/Source/KBMForOneChannel.cpp
index 79f47e19..922c5b20 100644
--- a/Source/KBMForOneChannel.cpp
+++ b/Source/KBMForOneChannel.cpp
@@ -29,7 +29,8 @@
 
 //==============================================================================
 KBMForOneChannel::KBMForOneChannel (int		subDlgIndex, KBMFilesMappingLogic&	mappingLogic, int& periodSizeReference)
-    : errorVisualizer(TerpstraSysExApplication::getApp().getLookAndFeel()), periodSize(periodSizeReference)
+    // : errorVisualizer(TerpstraSysExApplication::getApp().getLookAndFeel())
+    : periodSize(periodSizeReference)
 {
     //[Constructor_pre] You can add your own custom stuff here..
     this->subDlgIndex = subDlgIndex;
@@ -160,9 +161,9 @@ void KBMForOneChannel::buttonClicked (juce::Button* buttonThatWasClicked)
 		//	currentFile = chooser.getResult();
 		//	updateFieldsAndMappingLogic();
 		//}
-        
+
         // TODO: update this to Juce 6.1
-         
+
         //[/UserButtonCode_btnFileSelectMacro]
     }
 
@@ -231,38 +232,39 @@ void KBMForOneChannel::updateFieldsAndMappingLogic()
         kbmMappingStructure.fromStringArray(stringArray);
 
         // Tooltip: either the file name with full path or an error message
-        String errorMsg = kbmMappingStructure.getErrorMessage();
-        if (!errorMsg.isEmpty())
-        {
-            errorVisualizer.setErrorLevel(
-                *textMappingFile.get(),
-                HajuErrorVisualizer::ErrorLevel::error,
-                errorMsg);
-        }
-        else
-        {
-            // Warning if the kbm file's scale size doesn't match the global periodSize
-            if (kbmMappingStructure.periodSize != this->periodSize)
-                errorVisualizer.setErrorLevel(
-                    *textMappingFile.get(),
-                    HajuErrorVisualizer::ErrorLevel::warning,
-                    "Scale size of KBM file does not match");
-            else
-                errorVisualizer.setErrorLevel(
-                    *textMappingFile.get(),
-                    HajuErrorVisualizer::ErrorLevel::noError,
-                    currentFile.getFullPathName());
-        }
+    //     String errorMsg = kbmMappingStructure.getErrorMessage();
+    //     if (!errorMsg.isEmpty())
+    //     {
+    //         errorVisualizer.setErrorLevel(
+    //             *textMappingFile.get(),
+    //             HajuErrorVisualizer::ErrorLevel::error,
+    //             errorMsg);
+    //     }
+    //     else
+    //     {
+    //         // Warning if the kbm file's scale size doesn't match the global periodSize
+    //         if (kbmMappingStructure.periodSize != this->periodSize)
+    //             errorVisualizer.setErrorLevel(
+    //                 *textMappingFile.get(),
+    //                 HajuErrorVisualizer::ErrorLevel::warning,
+    //                 "Scale size of KBM file does not match");
+    //         else
+    //             errorVisualizer.setErrorLevel(
+    //                 *textMappingFile.get(),
+    //                 HajuErrorVisualizer::ErrorLevel::noError,
+    //                 currentFile.getFullPathName());
+    //     }
+    // }
+	// else
+	// {
+	// 	kbmMappingStructure = KBMMappingDataStructure();
+
+    //     errorVisualizer.setErrorLevel(
+    //         *textMappingFile.get(),
+    //         midiChannel > 0 ? HajuErrorVisualizer::ErrorLevel::warning : HajuErrorVisualizer::ErrorLevel::noError,
+    //         "File not found");
+	// }
     }
-	else
-	{
-		kbmMappingStructure = KBMMappingDataStructure();
-
-        errorVisualizer.setErrorLevel(
-            *textMappingFile.get(),
-            midiChannel > 0 ? HajuErrorVisualizer::ErrorLevel::warning : HajuErrorVisualizer::ErrorLevel::noError,
-            "File not found");
-	}
 
     // Enable or disable file fields
     if ( midiChannel > 0 )
@@ -319,4 +321,3 @@ END_JUCER_METADATA
 
 //[EndFile] You can add extra defines here...
 //[/EndFile]
-
diff --git a/Source/KBMForOneChannel.h b/Source/KBMForOneChannel.h
index d0cbe588..f821ec5a 100644
--- a/Source/KBMForOneChannel.h
+++ b/Source/KBMForOneChannel.h
@@ -22,7 +22,7 @@
 //[Headers]     -- You can add your own extra header files here --
 #include <JuceHeader.h>
 
-#include "HajuLib/HajuErrorVisualizer.h"
+// #include "HajuLib/HajuErrorVisualizer.h"
 #include "MappingLogic.h"
 //[/Headers]
 
@@ -36,14 +36,14 @@
     Describe your class and how it works here!
                                                                     //[/Comments]
 */
-class KBMForOneChannel  : public Component,
-                          public TextEditor::Listener,
+class KBMForOneChannel  : public juce::Component,
+                          public juce::TextEditor::Listener,
                           public juce::ComboBox::Listener,
                           public juce::Button::Listener
 {
 public:
     //==============================================================================
-    KBMForOneChannel (int		subDlgIndex, KBMFilesMappingLogic&	mappingLogic, int& periodSizeReference);
+    KBMForOneChannel (int subDlgIndex, KBMFilesMappingLogic& mappingLogic, int& periodSizeReference);
     ~KBMForOneChannel() override;
 
     //==============================================================================
@@ -70,7 +70,7 @@ class KBMForOneChannel  : public Component,
 	File	currentFile;
 	KBMMappingDataStructure kbmMappingStructure;
     KBMFilesMappingLogic*	pMappingLogic;
-    HajuErrorVisualizer     errorVisualizer;
+    // HajuErrorVisualizer     errorVisualizer;
    	int&    periodSize;
 
     FlexBox flexBox;
diff --git a/Source/KBMMappingDlg.cpp b/Source/KBMMappingDlg.cpp
index 0dadd416..98ce8663 100644
--- a/Source/KBMMappingDlg.cpp
+++ b/Source/KBMMappingDlg.cpp
@@ -18,7 +18,7 @@
 */
 
 //[Headers] You can add your own extra header files here...
-#include "ViewConstants.h"
+#include "./lumatone_editor_library/graphics/view_constants.h"
 //[/Headers]
 
 #include "KBMMappingDlg.h"
@@ -146,7 +146,7 @@ void KBMMappingDlg::resized()
     int labelHeight = round(height * 0.2f);
     int lblChannelWidth = round(width * 0.2f);
     int lblFileWidth = round(width * 0.3f);
-    
+
     lblChannel->setBounds(0, 0, lblChannelWidth, labelHeight);
     lblMappingFile->setBounds(lblChannel->getRight(), 0, lblFileWidth, labelHeight);
     lblChannel2->setBounds(lblMappingFile->getRight(), 0, lblChannelWidth, labelHeight);
@@ -251,4 +251,3 @@ END_JUCER_METADATA
 
 //[EndFile] You can add extra defines here...
 //[/EndFile]
-
diff --git a/Source/KBMMappingDlg.h b/Source/KBMMappingDlg.h
index 1580eeb1..87135e1c 100644
--- a/Source/KBMMappingDlg.h
+++ b/Source/KBMMappingDlg.h
@@ -35,7 +35,7 @@
     Describe your class and how it works here!
                                                                     //[/Comments]
 */
-class KBMMappingDlg  : public Component
+class KBMMappingDlg  : public juce::Component
 {
 public:
     //==============================================================================
diff --git a/Source/KeyEditComponent.cpp b/Source/KeyEditComponent.cpp
new file mode 100644
index 00000000..5719a9db
--- /dev/null
+++ b/Source/KeyEditComponent.cpp
@@ -0,0 +1,313 @@
+/*
+  ==============================================================================
+
+    key_edit_component.cpp
+    Created: 16 Jun 2014 7:20:34pm
+    Author:  hsstraub
+
+  ==============================================================================
+*/
+
+#include "KeyEditComponent.h"
+#include "LumatoneEditorState.h"
+
+#include "LumatoneEditorLookAndFeel.h"
+
+/*
+==============================================================================
+LumatoneKeyEdit class
+==============================================================================
+*/
+
+LumatoneKeyEdit::LumatoneKeyEdit(const LumatoneEditorState& stateIn, int boardIndex, int keyIndex)
+	: isSelected(false), state(stateIn), board_idx(boardIndex), key_idx(keyIndex), keyColour(juce::Colour()), keyType(LumatoneKeyType::noteOnNoteOff)
+{
+	midiNoteLabel = new juce::Label("midiNoteLabel", "0");
+	addAndMakeVisible(midiNoteLabel);
+	midiNoteLabel->setJustificationType(juce::Justification::centredRight);
+	midiNoteLabel->setFont(state.getAppFonts().getFont(LumatoneEditorFont::GothamNarrowBold));
+
+
+	midiChannelLabel = new juce::Label("midiChannelLabel", "0");
+	addAndMakeVisible(midiChannelLabel);
+	midiChannelLabel->setFont(state.getAppFonts().getFont(LumatoneEditorFont::GothamNarrowMedium));
+	midiChannelLabel->setJustificationType(juce::Justification::centredRight);
+
+	addMouseListener(this, true);
+}
+
+LumatoneKeyEdit::~LumatoneKeyEdit()
+{
+	listeners.clear();
+	deleteAllChildren();
+}
+
+int LumatoneKeyEdit::getBoardIndex() const
+{
+	return board_idx;
+}
+
+int LumatoneKeyEdit::getKeyIndex() const
+{
+	return key_idx;
+}
+
+
+LumatoneKey LumatoneKeyEdit::getValue() const
+{
+	LumatoneKey newValue;
+	newValue.setNoteOrCC(midiNoteLabel->getText().getIntValue());
+	newValue.setChannelNumber(midiChannelLabel->getText().getIntValue());
+	newValue.setColour(keyColour);
+	newValue.setKeyType(keyType);
+    newValue.setDefaultCCFader(ccFaderDefault);
+	return newValue;
+}
+
+void LumatoneKeyEdit::setValue(const LumatoneKey& newValue)
+{
+	auto newKeyType = newValue.getType();
+    if (newKeyType == LumatoneKeyType::disabled || newKeyType == LumatoneKeyType::disabledDefault)
+    {
+		// TODO move this behavior elsewhere
+        //newValue.keyType = LumatoneKeyType::disabled;
+
+		newKeyType = LumatoneKeyType::disabled;
+        midiNoteLabel->setText("x", juce::NotificationType::sendNotification);
+        midiChannelLabel->setText("x", juce::NotificationType::sendNotification);
+    }
+    else
+    {
+        midiNoteLabel->setText(juce::String(newValue.getMidiNumber()), juce::NotificationType::sendNotification);
+        midiChannelLabel->setText(juce::String(newValue.getMidiChannel()), juce::NotificationType::sendNotification);
+    }
+
+	keyColour = newValue.getColour();
+	keyType = newKeyType;
+    ccFaderDefault = newValue.isCCFaderDefault();
+
+	juce::String newTooltip = juce::translate("KeyType") + " ";
+	switch (keyType)
+	{
+	case LumatoneKeyType::noteOnNoteOff:
+		newTooltip += juce::translate("NoteOnOff");
+		break;
+	case LumatoneKeyType::continuousController:
+		newTooltip += juce::translate("ContinuousController");
+        newTooltip += juce::newLine;
+        if (ccFaderDefault)
+            newTooltip += "CC Default (0->127)";
+        else
+            newTooltip += "CC Inverted (127->0)";
+		break;
+	case LumatoneKeyType::lumaTouch:
+		newTooltip += juce::translate("Lumatouch");
+		break;
+	case LumatoneKeyType::disabled:
+		newTooltip += juce::translate("Disabled");
+		break;
+	default:
+		//jassertfalse;
+		newTooltip += juce::translate("Unknown");
+		break;
+	}
+
+	newTooltip += juce::newLine;
+	newTooltip += juce::translate("KeyColour") + " " + keyColour.toDisplayString(false);
+
+	setTooltip(newTooltip);
+	midiNoteLabel->setTooltip(newTooltip);
+	midiChannelLabel->setTooltip(newTooltip);
+
+	repaint();
+}
+
+void LumatoneKeyEdit::setIsSelected(bool newValue)
+{
+	if (this->isSelected != newValue)
+	{
+		this->isSelected = newValue;
+		repaint();
+	}
+}
+
+void LumatoneKeyEdit::paint(juce::Graphics& g)
+{
+	LumatoneKey currentValue = getValue();
+
+	// Selected or not: color and thickness of the line
+	float lineWidth = TERPSTRASINGLEKEYFLDLINEWIDTH;
+	juce::Colour lineColour = findColour(selectedKeyOutlineId);
+	
+	// Color: empty or the parametrized color
+	juce::Colour bgColour = currentValue.getColour().withAlpha(1.0f);
+	juce::Colour textColour = bgColour.contrasting(0.7f);
+
+	if (bgColour.getPerceivedBrightness() < 0.5)
+	{
+		textColour = textColour.brighter();
+	}
+
+    midiChannelLabel->setColour(juce::Label::textColourId, textColour);
+    midiNoteLabel->setColour(juce::Label::textColourId, textColour);
+
+    // Look depending on Key type
+    if (currentValue.hasType(LumatoneKeyType::continuousController))
+	{
+		// Key type is continuous controller. Set colour gradient.
+        float w = this->getWidth();
+        float h = this->getHeight();
+		juce::Colour inside, outside;
+        if (currentValue.isCCFaderDefault())
+        {
+            outside = bgColour.darker();
+            inside = bgColour.brighter();
+        }
+        else
+        {
+            outside = bgColour.brighter();
+            inside = bgColour.darker();
+        }
+		g.setGradientFill(
+			juce::ColourGradient(inside, w * 0.5f, h * 0.5f, outside, w * 0.5f, 0.0f, true));
+	}
+	else
+	{
+		// Key type is note on/note off. Just plain colour.
+		g.setColour(bgColour);
+	}
+
+	g.fillPath(hexPath);
+
+	if (isSelected)
+	{
+		// Shrink bounds slightly
+		juce::Path hexOutline = juce::Path(hexPath);
+		juce::Rectangle<int> hexBounds = getLocalBounds().reduced(1);
+		hexOutline.scaleToFit(hexBounds.getX(), hexBounds.getY(), hexBounds.getWidth(), hexBounds.getHeight(), true);
+
+		// Draw line
+		g.setColour(lineColour);
+		g.strokePath(hexOutline, juce::PathStrokeType(lineWidth));
+	}
+
+//	if (currentValue.keyType == LumatoneKeyType::disabled)
+//	{
+//		float w = this->getWidth();
+//		float h = this->getHeight();
+//		float xProportion = 0.25f;
+//		// Draw X on key
+//		g.setColour(bgColour.contrasting(0.5f));
+//		g.drawLine(w * xProportion, h * xProportion, w * (1-xProportion), h * (1-xProportion), 2);
+//		g.drawLine(w * (1 - xProportion), h * xProportion, w * xProportion, h * (1 - xProportion), 2);
+//	}
+
+//    if (currentValue.keyType == LumatoneKeyType::disabled)
+//    {
+//        TerpstraSysExApplication::getApp().getLookAndFeel().getLabelFont(*midiNoteLabel);
+//        g.setColour(textColour);
+//        g.setFont(midiChannelLabel->getFont());
+//        g.drawText("x", midiChannelLabel->getBounds(), midiChannelLabel->getJustificationType());
+//        g.drawText("x", midiNoteLabel->getBounds(), midiChannelLabel->getJustificationType());
+//    }
+
+	// Something parametrized or not?
+	if (currentValue.isEmpty())
+	{
+		midiChannelLabel->setAlpha(0.3f);
+		midiNoteLabel->setAlpha(0.3f);
+	}
+	else
+	{
+		midiChannelLabel->setAlpha(1.0f);
+		midiNoteLabel->setAlpha(1.0f);
+	}
+}
+
+void LumatoneKeyEdit::resized()
+{
+	juce::Point<int> centre = getLocalBounds().getCentre();
+	float radius = keySize * 0.5f;
+
+	// Draw hexagon
+	hexPath.clear();
+	hexPath.addPolygon(centre.toFloat(), 6, radius, TERPSTRASINGLEKEYROTATIONANGLE);
+	//Rectangle<float> hexBounds = hexPath.getBounds().reduced(1, 1);
+
+	float lblSize = radius * TERPSTRASINGLEKEYLABELSIZE;
+	float lblOffset = radius * 0.375f;
+
+	midiChannelLabel->setSize(radius, lblSize);
+	midiChannelLabel->setCentrePosition(centre.translated(-lblOffset, -(radius * channelLabelRadiusScalar)));
+
+	midiNoteLabel->setSize(radius, lblSize);
+	midiNoteLabel->setCentrePosition(centre.translated(0, lblOffset));
+}
+
+void LumatoneKeyEdit::setKeySize(float keySizeIn)
+{
+	keySize = keySizeIn;
+	setSize(keySize, keySize);
+}
+
+void LumatoneKeyEdit::mouseDown(const juce::MouseEvent& e)
+{
+	DBG("key clicked!");
+	auto value = getValue();
+	listeners.call(&LumatoneKeyEditListener::keyClickedCallback, e, board_idx, key_idx, value);
+}
+
+juce::String LumatoneKeyEdit::toString() const
+{
+	juce::StringArray tokens;
+	tokens.add("Board " + juce::String(board_idx));
+	tokens.add("Key " + juce::String(key_idx));
+	tokens.add("Note " + midiNoteLabel->getText());
+	tokens.add("Ch " + midiChannelLabel->getText());
+	tokens.add("Type " + juce::String(keyType));
+	tokens.add("Col " + keyColour.toString());
+	tokens.add("Size " + juce::String(keySize));
+	return tokens.joinIntoString(" | ");
+}
+
+void LumatoneKeyEdit::addKeyEditListener(LumatoneKeyEditListener* listenerIn)
+{
+	listeners.add(listenerIn);
+}
+
+void LumatoneKeyEdit::removeKeyEditListener(LumatoneKeyEditListener* listenerIn)
+{
+	listeners.remove(listenerIn);
+}
+
+
+/*
+==============================================================================
+LumatoneKeyPtr struct
+==============================================================================
+*/
+
+LumatoneKeyPtr::LumatoneKeyPtr(int boardIndex, int keyIndex, LumatoneKey* keyPtr)
+	: board_idx(boardIndex), key_idx(keyIndex), key(keyPtr) {}
+
+bool LumatoneKeyPtr::isValid() const
+{
+	//if (key_idx >= 0 && key_idx < getOctaveBoardSize() && board_idx >= 0)
+	//	return true;
+	return false;
+}
+
+bool LumatoneKeyPtr::isNull() const
+{
+	return key == nullptr;
+}
+
+
+LumatoneBoardSet::LumatoneBoardSet(int boardIndex)
+	: board_idx(boardIndex)
+{
+	//for (int i = 0; i < getOctaveBoardSize(); i++)
+	//{
+	//	keys[i].reset(new LumatoneKeyEdit(boardIndex, i));
+	//}
+}
diff --git a/Source/KeyEditComponent.h b/Source/KeyEditComponent.h
new file mode 100644
index 00000000..cb53231a
--- /dev/null
+++ b/Source/KeyEditComponent.h
@@ -0,0 +1,119 @@
+/*
+  ==============================================================================
+
+    key_edit_component.h
+    Created: 16 Jun 2014 7:20:34pm
+    Author:  hsstraub
+
+  ==============================================================================
+*/
+
+#ifndef LUMATONE_VIEW_COMPONENTS_H
+#define LUMATONE_VIEW_COMPONENTS_H
+
+#include <JuceHeader.h>
+
+#include "./lumatone_editor_library/data/lumatone_layout.h"
+#include "./lumatone_editor_library/graphics/view_constants.h"
+
+class LumatoneEditorState;
+
+class LumatoneKeyEditListener
+{
+public:
+	virtual ~LumatoneKeyEditListener() {}
+
+	virtual void keyClickedCallback(const juce::MouseEvent& e, int boardIndex, int keyIndex, LumatoneKey keyValue) = 0;
+};
+
+/*
+==============================================================================
+Display of the data of one key
+==============================================================================
+*/
+class LumatoneKeyEdit : public juce::Component, public juce::SettableTooltipClient
+{
+public:
+	LumatoneKeyEdit(const LumatoneEditorState& state, int boardIndex, int keyIndex);
+	~LumatoneKeyEdit();
+
+	int getBoardIndex() const;
+	int getKeyIndex() const;
+
+	LumatoneKey getValue() const;
+	void setValue(const LumatoneKey& newValue);
+
+	void setIsSelected(bool newValue);
+
+	void paint(juce::Graphics& g);
+	void resized();
+
+	void setKeySize(float keySizeIn);
+
+	enum ColourIds
+	{
+		backgroundColourId = 0x2000100,
+		outlineColourId = 0x2000101,
+		selectedKeyOutlineId = 0x2000102
+	};
+
+	void mouseDown(const juce::MouseEvent& e) override;
+
+	juce::String toString() const;
+
+public:
+
+	void addKeyEditListener(LumatoneKeyEditListener* listenerIn);
+	void removeKeyEditListener(LumatoneKeyEditListener* listenerIn);
+
+protected:
+
+	juce::ListenerList<LumatoneKeyEditListener> listeners;
+
+private:
+	bool isSelected;
+
+	const LumatoneEditorState& state;
+
+	int board_idx = -1;
+	int key_idx = -1;
+
+	juce::Path    hexPath;
+	juce::Label*	midiNoteLabel;
+	juce::Label*  midiChannelLabel;
+
+	juce::Colour			keyColour;
+	LumatoneKeyType			keyType;
+    bool                    ccFaderDefault;
+
+	float					keySize;
+
+	const float				channelLabelRadiusScalar = 0.4347826f;
+};
+
+
+struct LumatoneKeyPtr
+{
+	int board_idx = -1;
+	int key_idx = -1;
+	LumatoneKey* key = nullptr;
+
+	LumatoneKeyPtr() {}
+	LumatoneKeyPtr(int boardIndex, int keyIndex, LumatoneKey* keyPtr = nullptr);
+
+	bool isValid() const;
+
+	bool isNull() const;
+};
+
+using LumatoneKeySelection = juce::Array<LumatoneKeyPtr>;
+
+struct LumatoneBoardSet
+{
+	int board_idx = -1;
+	std::unique_ptr<LumatoneKeyEdit> keys[56];
+
+	LumatoneBoardSet(int boardIndex);
+};
+
+#endif LUMATONE_VIEW_COMPONENTS_H
diff --git a/Source/LumatoneController.cpp b/Source/LumatoneController.cpp
deleted file mode 100644
index 66936fd1..00000000
--- a/Source/LumatoneController.cpp
+++ /dev/null
@@ -1,1350 +0,0 @@
-/*
-  ==============================================================================
-
-    LumatoneCommandManager.cpp
-    Created: 17 Apr 2021 10:17:31pm
-    Author:  Vincenzo
-
-  ==============================================================================
-*/
-
-#include "LumatoneController.h"
-#include "Main.h"
-
-
-LumatoneController::LumatoneController()
-    : midiDriver(getNumBoards())
-    , errorVisualizer(TerpstraSysExApplication::getApp().getLookAndFeel())
-    , readQueueSize(0)
-    , keyUpdater(midiDriver)
-{
-    reset(bufferReadSize);
-    midiDriver.addMessageCollector(this);
-
-    deviceMonitor = std::make_unique<DeviceActivityMonitor>(midiDriver);
-    deviceMonitor->addChangeListener(this);
-}
-
-LumatoneController::~LumatoneController()
-{
-    midiDriver.removeMessageCollector(this);
-}
-
-void LumatoneController::setSysExSendingMode(sysExSendingMode newMode)
-{
-    // Might be worth it to provide further context of commands, such as which ones are mutable or not
-    // And use an automated system for determining whether or not to send a message in live or offline mode
-
-    if (newMode != editingMode)
-    {
-        editingMode = newMode;
-        if (editingMode == sysExSendingMode::offlineEditor)
-        {
-            midiDriver.clearMIDIMessageBuffer();	// ToDo remove only SysEx messages (leave NoteOn/NoteOff)?
-            stopTimer();
-        }
-    }
-
-    editorListeners.call(&LumatoneEditor::EditorListener::editorModeChanged, newMode);
-    midiDriver.restrictToRequestMessages(editingMode == sysExSendingMode::offlineEditor);
-}
-
-// Takes a generic firmware version and parses it into a recognized firmware version
-void LumatoneController::setFirmwareVersion(FirmwareVersion firmwareVersionIn)
-{
-    firmwareVersion = firmwareVersionIn;
-    setFirmwareVersion(firmwareSupport.getLumatoneFirmwareVersion(firmwareVersion), false);
-}
-
-// Takes a recognized firmware version
-void LumatoneController::setFirmwareVersion(LumatoneFirmwareVersion lumatoneVersion, bool parseVersion)
-{
-    determinedVersion = lumatoneVersion;
-    octaveSize = firmwareSupport.getOctaveSize(determinedVersion);
-
-    if (parseVersion)
-        firmwareVersion = FirmwareVersion::fromDeterminedVersion(determinedVersion);
-
-    firmwareListeners.call(&LumatoneEditor::FirmwareListener::firmwareRevisionReceived, firmwareVersion);
-
-    // Set connection process as complete
-    if (!currentDevicePairConfirmed)
-    {
-        onConnectionConfirm(editingMode != sysExSendingMode::firmwareUpdate);
-    }
-}
-
-void LumatoneController::setMidiInput(int deviceIndex)
-{
-    midiDriver.setMidiInput(deviceIndex);
-    if (deviceIndex >= 0)
-        testCurrentDeviceConnection();
-}
-
-void LumatoneController::setMidiOutput(int deviceIndex)
-{
-    midiDriver.setMidiOutput(deviceIndex);
-    if (deviceIndex >= 0)
-        testCurrentDeviceConnection();
-}
-
-void LumatoneController::detectAndConnectToLumatone()
-{
-    deviceMonitor->setDetectDeviceIfDisconnected(true);
-}
-
-void LumatoneController::stopAutoConnection()
-{
-    deviceMonitor->setDetectDeviceIfDisconnected(false);
-}
-
-void LumatoneController::refreshAvailableMidiDevices()
-{
-    if (midiDriver.refreshDeviceLists() && midiDriver.testIsIncomplete())
-        midiDriver.openAvailableDevicesForTesting();
-}
-
-bool LumatoneController::requestFirmwareUpdate(File firmwareFile, FirmwareTransfer::ProcessListener* listenerIn)
-{
-    if (firmwareTransfer == nullptr)
-    {
-        incomingVersion = FirmwareVersion(0, 0, 0);
-        firmwareTransfer.reset(new FirmwareTransfer(midiDriver));
-        firmwareTransfer->addTransferListener(this);
-        firmwareTransfer->addListener(this);
-
-        if (listenerIn != nullptr)
-        {
-            firmwareTransfer->addTransferListener(listenerIn);
-        }
-
-        return firmwareTransfer->requestFirmwareUpdate(firmwareFile.getFullPathName());
-    }
-    else
-        jassertfalse;
-
-    return false;
-}
-
-LumatoneKey* LumatoneController::getKey(int boardIndex, int keyIndex)
-{
-    return &(TerpstraSysExApplication::getApp().getMappingData()->getBoard(boardIndex)->theKeys[keyIndex]);
-}
-
-LumatoneBoard* LumatoneController::getBoard(int boardIndex)
-{
-    return TerpstraSysExApplication::getApp().getMappingData()->getBoard(boardIndex);
-}
-
-int LumatoneController::getNumBoards() const
-{
-    return MAXNUMBOARDS;
-}
-
-int LumatoneController::getOctaveBoardSize() const
-{
-    return octaveSize;
-}
-
-bool LumatoneController::isKeyCoordValid(LumatoneKeyCoord coord) const
-{
-    return coord.boardIndex >= 0
-        && coord.boardIndex < getNumBoards()
-        && coord.keyIndex >= coord.keyIndex
-        && coord.keyIndex < getOctaveBoardSize();
-}
-
-bool LumatoneController::getInvertExpression() const
-{
-    return TerpstraSysExApplication::getApp().getMappingData()->invertExpression;
-}
-
-bool LumatoneController::getInvertSustain() const
-{
-    return TerpstraSysExApplication::getApp().getMappingData()->invertSustain;
-}
-
-juce::uint8 LumatoneController::getExpressionSensitivity() const
-{
-    return TerpstraSysExApplication::getApp().getMappingData()->expressionControllerSensivity;
-}
-
-/*
-==============================================================================
-Combined (hi-level) commands
-*/
-
-
-void LumatoneController::sendAllParamsOfBoard(int boardIndex, LumatoneBoard boardData, bool bufferMessages)
-{
-    for (int keyIndex = 0; keyIndex < octaveSize; keyIndex++)
-    {
-        auto key = &boardData.theKeys[keyIndex];
-        sendKeyParam(boardIndex, keyIndex, *key, bufferMessages);
-    }
-}
-
-void LumatoneController::sendCompleteMapping(LumatoneLayout mappingData, bool bufferMessages)
-{
-    for (int boardIndex = 1; boardIndex <= getNumBoards(); boardIndex++)
-        sendAllParamsOfBoard(boardIndex, *mappingData.getBoard(boardIndex - 1), bufferMessages);
-}
-
-void LumatoneController::sendGetMappingOfBoardRequest(int boardIndex)
-{
-    getRedLEDConfig(boardIndex);
-    getGreenLEDConfig(boardIndex);
-    getBlueLEDConfig(boardIndex);
-    getChannelConfig(boardIndex);
-    getNoteConfig(boardIndex);
-    getKeyTypeConfig(boardIndex);
-    getFaderTypeConfig(boardIndex);
-}
-
-void LumatoneController::sendGetCompleteMappingRequest()
-{
-    for (int boardIndex = 1; boardIndex <= getNumBoards(); boardIndex++)
-        sendGetMappingOfBoardRequest(boardIndex);
-}
-
-void LumatoneController::resetVelocityConfig(LumatoneConfigTable::TableType velocityCurveType)
-{
-    switch (velocityCurveType)
-    {
-    case LumatoneConfigTable::TableType::velocityInterval:
-        resetVelocityConfig();
-        break;
-    case LumatoneConfigTable::TableType::fader:
-        resetFaderConfig();
-        break;
-    case LumatoneConfigTable::TableType::afterTouch:
-        resetAftertouchConfig();
-        break;
-    case LumatoneConfigTable::TableType::lumaTouch:
-        resetLumatouchConfig();
-        break;
-    default:
-        jassert(false);
-        break;
-    }
-}
-
-unsigned int LumatoneController::sendTestMessageToDevice(int deviceIndex, unsigned int pingId)
-{
-    if (!midiDriver.testIsIncomplete())
-    {
-        midiDriver.openAvailableDevicesForTesting();
-    }
-
-    int value = (pingId < 0)
-        ? deviceIndex
-        : pingId &= 0xFFFFFFF;
-
-    if (determinedVersion >= LumatoneFirmwareVersion::VERSION_1_0_9)
-    {
-        midiDriver.ping(value, deviceIndex);
-    }
-    else
-    {
-        midiDriver.sendGetSerialIdentityRequest(deviceIndex);
-    }
-
-    lastTestDeviceSent = deviceIndex;
-    waitingForTestResponse = true;
-
-    return value;
-}
-
-void LumatoneController::testCurrentDeviceConnection()
-{
-    // On confirmed connection send connection listener message
-    if (midiDriver.hasDevicesDefined())
-    {
-        waitingForTestResponse = true;
-
-        if (determinedVersion >= LumatoneFirmwareVersion::VERSION_1_0_9)
-        {
-            pingLumatone(0xf);
-        }
-
-        else
-        {
-            sendGetSerialIdentityRequest();
-        }
-    }
-    else
-    {
-        currentDevicePairConfirmed = false;
-    }
-}
-
-void LumatoneController::sendKeyParam(int boardIndex, int keyIndex, LumatoneKey keyData, bool bufferMessages)
-// Send parametrization of one key to the device
-{
-    // Default CC polarity = 1, Inverted CC polarity = 0
-    sendKeyConfig(boardIndex, keyIndex, keyData.noteNumber, keyData.channelNumber, keyData.keyType, keyData.ccFaderDefault, bufferMessages);
-    sendKeyColourConfig(boardIndex, keyIndex, keyData.colour, bufferMessages);
-}
-
-// Send configuration of a certain look up table
-void LumatoneController::sendTableConfig(LumatoneConfigTable::TableType velocityCurveType, const uint8* table)
-{
-    switch (velocityCurveType)
-    {
-    case LumatoneConfigTable::TableType::fader:
-        setFaderConfig(table);
-        break;
-
-    case LumatoneConfigTable::TableType::afterTouch:
-        setAftertouchConfig(table);
-        break;
-
-    case LumatoneConfigTable::TableType::lumaTouch:
-        setLumatouchConfig(table);
-        break;
-
-    default:
-        sendVelocityConfig(table);
-    }
-}
-
-//=============================================================================
-// Mid-level firmware functions
-
-// Send note, channel, cc, and fader polarity data
-void LumatoneController::sendKeyConfig(int boardIndex, int keyIndex, int noteOrCCNum, int channel, int keyType, bool faderUpIsNull, bool bufferMessages)
-{
-    if (bufferMessages)
-        keyUpdater.sendKeyConfig(boardIndex, keyIndex, noteOrCCNum, channel, keyType & 0x3, faderUpIsNull);
-    else
-        midiDriver.sendKeyFunctionParameters(boardIndex, keyIndex, noteOrCCNum, channel, keyType & 0x3, faderUpIsNull);
-
-    auto key = getKey(boardIndex - 1, keyIndex);
-    *key = LumatoneKey((LumatoneKeyType)keyType, channel - 1, noteOrCCNum, key->colour, faderUpIsNull);
-}
-
-void LumatoneController::sendKeyColourConfig(int boardIndex, int keyIndex, Colour colour, bool bufferMessages)
-{
-    if (bufferMessages)
-        keyUpdater.sendKeyColourConfig(boardIndex, keyIndex, colour);
-    else
-    {
-        if (determinedVersion >= LumatoneFirmwareVersion::VERSION_1_0_11)
-            midiDriver.sendKeyLightParameters(boardIndex, keyIndex, colour.getRed(), colour.getGreen(), colour.getBlue());
-        else
-            midiDriver.sendKeyLightParameters_Version_1_0_0(boardIndex, keyIndex, colour.getRed() / 2, colour.getGreen() / 2, colour.getBlue() / 2);
-    }
-
-    getKey(boardIndex - 1, keyIndex)->colour = colour;
-}
-
-
-// Send expression pedal sensivity
-void LumatoneController::sendExpressionPedalSensivity(unsigned char value)
-{
-    midiDriver.sendExpressionPedalSensivity(value);
-}
-
-// Send parametrization of foot controller
-void LumatoneController::sendInvertFootController(bool value)
-{
-    midiDriver.sendInvertFootController(value);
-}
-
-// Colour for macro button in active state
-void LumatoneController::sendMacroButtonActiveColour(String colourAsString)
-{
-    auto c = Colour::fromString(colourAsString);
-    if (determinedVersion >= LumatoneFirmwareVersion::VERSION_1_0_11)
-        midiDriver.sendMacroButtonActiveColour(c.getRed(), c.getGreen(), c.getBlue());
-    else
-        midiDriver.sendMacroButtonActiveColour_Version_1_0_0(c.getRed(), c.getGreen(), c.getBlue());
-}
-
-// Colour for macro button in inactive state
-void LumatoneController::sendMacroButtonInactiveColour(String colourAsString)
-{
-    auto c = Colour::fromString(colourAsString);
-    if (determinedVersion >= LumatoneFirmwareVersion::VERSION_1_0_11)
-        midiDriver.sendMacroButtonInactiveColour(c.getRed(), c.getGreen(), c.getBlue());
-    else
-        midiDriver.sendMacroButtonInactiveColour_Version_1_0_0(c.getRed(), c.getGreen(), c.getBlue());
-}
-
-// Send parametrization of light on keystrokes
-void LumatoneController::sendLightOnKeyStrokes(bool value)
-{
-    midiDriver.sendLightOnKeyStrokes(value);
-}
-
-// Send a value for a velocity lookup table
-void LumatoneController::sendVelocityConfig(const uint8 velocityTable[])
-{
-    midiDriver.sendVelocityConfig(velocityTable);
-}
-
-// Save velocity config to EEPROM
-void LumatoneController::saveVelocityConfig()
-{
-    midiDriver.saveVelocityConfig();
-}
-
-void LumatoneController::resetVelocityConfig()
-{
-    midiDriver.resetVelocityConfig();
-}
-
-void LumatoneController::setFaderConfig(const uint8 faderTable[])
-{
-    midiDriver.sendFaderConfig(faderTable);
-}
-
-void LumatoneController::resetFaderConfig()
-{
-    midiDriver.resetFaderConfig();
-}
-
-void LumatoneController::setAftertouchEnabled(bool value)
-{
-    midiDriver.sendAfterTouchActivation(value);
-}
-
-void LumatoneController::startCalibrateAftertouch()
-{
-    midiDriver.sendCalibrateAfterTouch();
-}
-
-void LumatoneController::setAftertouchConfig(const uint8 aftertouchTable[])
-{
-    midiDriver.sendAftertouchConfig(aftertouchTable);
-}
-
-void LumatoneController::resetAftertouchConfig()
-{
-    midiDriver.resetAftertouchConfig();
-}
-
-void LumatoneController::setVelocityIntervalConfig(const int velocityIntervalTable[])
-{
-    midiDriver.sendVelocityIntervalConfig(velocityIntervalTable);
-}
-
-void LumatoneController::getRedLEDConfig(int boardIndex)
-{
-    midiDriver.sendRedLEDConfigRequest(boardIndex);
-}
-
-void LumatoneController::getGreenLEDConfig(int boardIndex)
-{
-    midiDriver.sendGreenLEDConfigRequest(boardIndex);
-}
-
-void LumatoneController::getBlueLEDConfig(int boardIndex)
-{
-    midiDriver.sendBlueLEDConfigRequest(boardIndex);
-}
-
-void LumatoneController::getChannelConfig(int boardIndex)
-{
-    midiDriver.sendChannelConfigRequest(boardIndex);
-}
-
-void LumatoneController::getNoteConfig(int boardIndex)
-{
-    midiDriver.sendNoteConfigRequest(boardIndex);
-}
-
-void LumatoneController::getKeyTypeConfig(int boardIndex)
-{
-    midiDriver.sendKeyTypeConfigRequest(boardIndex);
-}
-
-void LumatoneController::sendVelocityConfigRequest()
-{
-    midiDriver.sendVelocityConfigRequest();
-}
-
-void LumatoneController::sendFaderConfigRequest()
-{
-    midiDriver.sendFaderConfigRequest();
-}
-
-void LumatoneController::sendAftertouchConfigRequest()
-{
-    midiDriver.sendAftertouchConfigRequest();
-}
-
-void LumatoneController::sendVelocityIntervalConfigRequest()
-{
-    midiDriver.sendVelocityIntervalConfigRequest();
-}
-
-void LumatoneController::getFaderTypeConfig(int boardIndex)
-{
-    midiDriver.sendFaderTypeConfigRequest(boardIndex);
-}
-
-// This command is used to read back the serial identification number of the keyboard.
-void LumatoneController::sendGetSerialIdentityRequest()
-{
-    midiDriver.sendGetSerialIdentityRequest();
-}
-
-void LumatoneController::startCalibrateKeys()
-{
-    midiDriver.sendCalibrateKeys();
-}
-
-void LumatoneController::setCalibratePitchModWheel(bool startCalibration)
-{
-    midiDriver.sendCalibratePitchModWheel(startCalibration);
-}
-
-void LumatoneController::setLumatouchConfig(const uint8 lumatouchTable[])
-{
-    midiDriver.setLumatouchConfig(lumatouchTable);
-}
-
-void LumatoneController::resetLumatouchConfig()
-{
-    midiDriver.resetLumatouchConfig();
-}
-
-void LumatoneController::getLumatouchConfig()
-{
-    midiDriver.sendLumatouchConfigRequest();
-}
-
-// This command is used to read back the current Lumatone firmware revision.
-void LumatoneController::sendGetFirmwareRevisionRequest()
-{
-    midiDriver.sendGetFirmwareRevisionRequest();
-}
-
-// Send a value for the Lumatone to echo back; used for auto device connection and monitoring
-int LumatoneController::pingLumatone(uint8 pingId)
-{
-    return midiDriver.ping(pingId);
-}
-
-// Set MIDI Channels of peripheral controllers, pitch & mod wheels, expression & sustain pedals
-void LumatoneController::setPeripheralChannels(int pitchWheelChannel, int modWheelChannel, int expressionChannel, int sustainChannel)
-{
-    if (firmwareSupport.versionAcknowledgesCommand(determinedVersion, SET_PERIPHERAL_CHANNELS))
-        midiDriver.setPeripheralChannels(pitchWheelChannel, modWheelChannel, expressionChannel, sustainChannel);
-}
-
-void LumatoneController::setPeripheralChannels(PeripheralChannelSettings channelSettings)
-{
-    setPeripheralChannels(channelSettings.pitchWheel, channelSettings.modWheel, channelSettings.expressionPedal, channelSettings.sustainPedal);
-}
-
-// Get MIDI Channels of peripheral controllers, pitch & mod wheels, expression & sustain pedals
-void LumatoneController::getPeripheralChannels()
-{
-    if (firmwareSupport.versionAcknowledgesCommand(determinedVersion, GET_PERIPHERAL_CHANNELS))
-        midiDriver.getPeripheralChannels();
-}
-
-void LumatoneController::invertSustainPedal(bool setInverted)
-{
-    if (firmwareSupport.versionAcknowledgesCommand(determinedVersion, INVERT_SUSTAIN_PEDAL))
-        midiDriver.sendInvertSustainPedal(setInverted);
-}
-
-void LumatoneController::resetPresetsToFactoryDefault()
-{
-    if (firmwareSupport.versionAcknowledgesCommand(determinedVersion, RESET_DEFAULT_PRESETS))
-    {
-        for (int i = 0; i < 10; i++)
-            midiDriver.sendResetDefaultPresetsRequest(i);
-    }
-}
-
-void LumatoneController::resetPresetToFactoryDefault(int presetIndex)
-{
-    midiDriver.sendResetDefaultPresetsRequest(presetIndex);
-}
-
-// Get interaction flags of current preset
-void LumatoneController::getPresetFlags()
-{
-    if (firmwareSupport.versionAcknowledgesCommand(determinedVersion, GET_PRESET_FLAGS))
-        midiDriver.sendGetPresetFlagsReset();
-}
-
-// Get sensitivity setting of expression pedal
-void LumatoneController::getExpressionPedalSensitivity()
-{
-    if (firmwareSupport.versionAcknowledgesCommand(determinedVersion, GET_EXPRESSION_PEDAL_SENSITIVIY))
-        midiDriver.sendGetExpressionPedalSensitivity();
-}
-
-//=============================================================================
-// Communication and broadcasting
-
-void LumatoneController::midiMessageReceived(MidiInput* source, const MidiMessage& midiMessage)
-{
-    if (midiMessage.isSysEx()) switch (editingMode)
-    {
-        case sysExSendingMode::firmwareUpdate:
-        {
-            // Handle firmware update confirmation responses
-            auto sysExData = midiMessage.getSysExData();
-            if (sysExData[CMD_ID] == GET_FIRMWARE_REVISION)
-            {
-                midiDriver.unpackGetFirmwareRevisionResponse(midiMessage, incomingVersion.major, incomingVersion.minor, incomingVersion.revision);
-                if (incomingVersion.isValid())
-                {
-                    startTimer(UPDATETIMEOUT);
-                }
-            }
-
-            break;
-        }
-
-        default:
-        {
-            addMessageToQueue(midiMessage);
-            readQueueSize.store(readQueueSize.load() + 1);
-
-            if (!bufferReadRequested)
-            {
-                bufferReadRequested = true;
-                startTimer(bufferReadTimeoutMs);
-            }
-            break;
-        }
-    }
-    else
-    {
-        // do something with regular midi messages
-    }
-}
-
-void LumatoneController::midiMessageSent(MidiOutput* target, const MidiMessage& midiMessage) { }
-
-void LumatoneController::midiSendQueueSize(int queueSize)
-{
-    sendQueueSize = queueSize;
-}
-
-void LumatoneController::generalLogMessage(String textMessage, HajuErrorVisualizer::ErrorLevel errorLevel) { }
-
-void LumatoneController::noAnswerToMessage(MidiInput* expectedDevice, const MidiMessage& midiMessage)
-{
-    if (midiMessage.isSysEx())
-    {
-    //    callAfterDelay(bufferReadTimeoutMs, [&]() { firmwareListeners.call(&LumatoneEditor::FirmwareListener::noAnswerToCommand, midiMessage.getSysExData()[CMD_ID]); });
-
-        if (!currentDevicePairConfirmed)
-        {
-            statusListeners.call(&LumatoneEditor::StatusListener::connectionFailed);
-        }
-    }
-}
-
-FirmwareSupport::Error LumatoneController::handleOctaveConfigResponse(
-    const MidiMessage& midiMessage,
-    std::function<FirmwareSupport::Error(const MidiMessage&, int&, uint8, int*)> unpackFunction,
-    std::function<void(int,void*)> callbackFunctionIfNoError)
-{
-    int boardId = -1;
-    int channelData[56];
-
-    auto errorCode = unpackFunction(midiMessage, boardId, octaveSize, channelData);
-    if (errorCode == FirmwareSupport::Error::noError)
-    {
-        callbackFunctionIfNoError(boardId, channelData);
-    }
-
-    return errorCode;
-}
-
-FirmwareSupport::Error LumatoneController::handleTableConfigResponse(
-    const MidiMessage& midiMessage,
-    std::function<FirmwareSupport::Error(const MidiMessage&, int*)> unpackFunction,
-    std::function<void(void*)> callbackFunctionIfNoError)
-{
-    int veloctiyData[128];
-    auto errorCode = unpackFunction(midiMessage, veloctiyData);
-    if (errorCode == FirmwareSupport::Error::noError)
-        callbackFunctionIfNoError(veloctiyData);
-
-    return errorCode;
-}
-
-FirmwareSupport::Error LumatoneController::handleLEDConfigResponse(const MidiMessage& midiMessage)
-{
-    int boardId = -1;
-    int colourData[56];
-
-    int cmd = firmwareSupport.getCommandNumber(midiMessage);
-    FirmwareSupport::Error errorCode;
-
-    // Use correct unpacking function
-    if (determinedVersion < LumatoneFirmwareVersion::VERSION_1_0_11)
-    {
-        errorCode = midiDriver.unpackGetLEDConfigResponse_Version_1_0_0(midiMessage, boardId, octaveSize, colourData);
-    }
-    else
-    {
-        errorCode = midiDriver.unpackGetLEDConfigResponse(midiMessage, boardId, colourData);
-    }
-
-    if (errorCode == FirmwareSupport::Error::noError)
-    {
-        int colorCode = cmd - GET_RED_LED_CONFIG;
-        firmwareListeners.call(&LumatoneEditor::FirmwareListener::octaveColourConfigReceived, boardId, colorCode, colourData);
-    }
-
-    return errorCode;
-}
-
-FirmwareSupport::Error LumatoneController::handleChannelConfigResponse(const MidiMessage& midiMessage)
-{
-    auto unpack = [&](const MidiMessage& msg, int& boardId, uint8 numKeys, int* data) {
-        auto errorCode = midiDriver.unpackGetChannelConfigResponse(msg, boardId, numKeys, data);
-        if (errorCode == FirmwareSupport::Error::noError)
-            for (int i = 0; i < numKeys; i++)
-                data[i]++; // MIDI Channels are 1-based
-        return errorCode;
-    };
-    auto callback = [&](int boardId, void* data) { firmwareListeners.call(&LumatoneEditor::FirmwareListener::octaveChannelConfigReceived, boardId, (int*)data); };
-    return handleOctaveConfigResponse(midiMessage, unpack, callback);
-}
-
-FirmwareSupport::Error LumatoneController::handleNoteConfigResponse(const MidiMessage& midiMessage)
-{
-    auto unpack = [&](const MidiMessage& msg, int& boardId, uint8 numKeys, int* data) {
-        return midiDriver.unpackGetNoteConfigResponse(msg, boardId, numKeys, data);
-    };
-    auto callback = [&](int boardId, void* data) { firmwareListeners.call(&LumatoneEditor::FirmwareListener::octaveNoteConfigReceived, boardId, (int*)data); };
-    return handleOctaveConfigResponse(midiMessage, unpack, callback);
-}
-
-FirmwareSupport::Error LumatoneController::handleKeyTypeConfigResponse(const MidiMessage& midiMessage)
-{
-    auto unpack = [&](const MidiMessage& msg, int& boardId, uint8 numKeys, int* data) {
-        return midiDriver.unpackGetTypeConfigResponse(msg, boardId, numKeys, data);
-    };
-    auto callback = [&](int boardId, void* data) { firmwareListeners.call(&LumatoneEditor::FirmwareListener::keyTypeConfigReceived, boardId, (int*)data); };
-    return handleOctaveConfigResponse(midiMessage, unpack, callback);
-}
-
-FirmwareSupport::Error LumatoneController::handleVelocityConfigResponse(const MidiMessage& midiMessage)
-{
-    auto unpack = [&](const MidiMessage& msg, int* data) {
-        return midiDriver.unpackGetVelocityConfigResponse(msg, data);
-    };
-    auto callback = [&](void* data) { firmwareListeners.call(&LumatoneEditor::FirmwareListener::velocityConfigReceived, (int*)data); };
-    return handleTableConfigResponse(midiMessage, unpack, callback);
-}
-
-FirmwareSupport::Error LumatoneController::handleAftertouchConfigResponse(const MidiMessage& midiMessage)
-{
-    auto unpack = [&](const MidiMessage& msg, int* data) {
-        return midiDriver.unpackGetAftertouchConfigResponse(msg, data);
-    };
-    auto callback = [&](void* data) { firmwareListeners.call(&LumatoneEditor::FirmwareListener::aftertouchConfigReceived, (int*)data); };
-    return handleTableConfigResponse(midiMessage, unpack, callback);
-}
-
-FirmwareSupport::Error LumatoneController::handleVelocityIntervalConfigResponse(const MidiMessage& midiMessage)
-{
-    auto unpack = [&](const MidiMessage& msg, int* data) {
-        return midiDriver.unpackGetVelocityIntervalConfigResponse(msg, data);
-    };
-    auto callback = [&](void* data) { firmwareListeners.call(&LumatoneEditor::FirmwareListener::velocityIntervalConfigReceived, (int*)data); };
-    return handleTableConfigResponse(midiMessage, unpack, callback);
-}
-
-FirmwareSupport::Error LumatoneController::handleFaderConfigResponse(const MidiMessage& midiMessage)
-{
-    auto unpack = [&](const MidiMessage& msg, int* data) {
-        return midiDriver.unpackGetFaderConfigResponse(msg, data);
-    };
-    auto callback = [&](void* data) { firmwareListeners.call(&LumatoneEditor::FirmwareListener::faderConfigReceived, (int*)data); };
-    return handleTableConfigResponse(midiMessage, unpack, callback);
-}
-
-FirmwareSupport::Error LumatoneController::handleFaderTypeConfigResponse(const MidiMessage& midiMessage)
-{
-    auto unpack = [&](const MidiMessage& msg, int& boardId, uint8 numKeys, int* data) {
-        return midiDriver.unpackGetTypeConfigResponse(msg, boardId, numKeys, data);
-    };
-    auto callback = [&](int boardId, void* data) { firmwareListeners.call(&LumatoneEditor::FirmwareListener::faderTypeConfigReceived, boardId, (int*)data); };
-    return handleOctaveConfigResponse(midiMessage, unpack, callback);
-}
-
-FirmwareSupport::Error LumatoneController::handleSerialIdentityResponse(const MidiMessage& midiMessage)
-{
-    int serialBytes[6];
-    auto errorCode = midiDriver.unpackGetSerialIdentityResponse(midiMessage, serialBytes);
-    if (errorCode != FirmwareSupport::Error::noError)
-        return errorCode;
-
-    connectedSerialNumber = firmwareSupport.serialIdentityToString(serialBytes);
-    DBG("Device serial is: " + connectedSerialNumber);
-
-    firmwareListeners.call(&LumatoneEditor::FirmwareListener::serialIdentityReceived, lastTestDeviceResponded, serialBytes);
-
-    // Get Firmware Version
-    if (connectedSerialNumber == SERIAL_55_KEYS)
-        setFirmwareVersion(LumatoneFirmwareVersion::VERSION_55_KEYS);
-
-    if (midiDriver.hasDevicesDefined() && !currentDevicePairConfirmed)
-        confirmAutoConnection();
-
-    return errorCode;
-}
-
-FirmwareSupport::Error LumatoneController::handleFirmwareRevisionResponse(const MidiMessage& midiMessage)
-{
-    int major, minor, revision;
-    auto errorCode = midiDriver.unpackGetFirmwareRevisionResponse(midiMessage, major, minor, revision);
-    if (errorCode == FirmwareSupport::Error::noError)
-    {
-        auto version = FirmwareVersion(major, minor, revision);
-        DBG("Firmware version is: " + version.toString());
-        // Listener call handled here
-        setFirmwareVersion(version);
-    }
-
-    return errorCode;
-}
-
-FirmwareSupport::Error LumatoneController::handleLumatouchConfigResponse(const MidiMessage& midiMessage)
-{
-    auto unpack = [&](const MidiMessage& msg, int* data) {
-        return midiDriver.unpackGetLumatouchConfigResponse(msg, data);
-    };
-    auto callback = [&](void* data) { firmwareListeners.call(&LumatoneEditor::FirmwareListener::lumatouchConfigReceived, (int*)data); };
-    return handleTableConfigResponse(midiMessage, unpack, callback);
-}
-
-FirmwareSupport::Error LumatoneController::handlePingResponse(const MidiMessage& midiMessage)
-{
-    unsigned int value = 0;
-    auto errorCode = midiDriver.unpackPingResponse(midiMessage, value);
-
-    if (errorCode != FirmwareSupport::Error::noError)
-        return errorCode;
-
-    firmwareListeners.call(&LumatoneEditor::FirmwareListener::pingResponseReceived, lastTestDeviceResponded, value);
-
-    return errorCode;
-}
-
-FirmwareSupport::Error LumatoneController::handleGetPeripheralChannelResponse(const MidiMessage& midiMessage)
-{
-    auto channelSettings = PeripheralChannelSettings();
-    auto errorCode = midiDriver.unpackGetPeripheralChannelsResponse(midiMessage,
-        channelSettings.pitchWheel,
-        channelSettings.modWheel,
-        channelSettings.expressionPedal,
-        channelSettings.sustainPedal
-    );
-
-    firmwareListeners.call(&LumatoneEditor::FirmwareListener::peripheralMidiChannelsReceived, channelSettings);
-
-    return errorCode;
-}
-
-FirmwareSupport::Error LumatoneController::handleGetPresetFlagsResponse(const MidiMessage& midiMessage)
-{
-    auto presetFlags = PresetFlags();
-    auto errorCode = midiDriver.unpackGetPresetFlagsResponse(midiMessage,
-        presetFlags.expressionPedalInverted,
-        presetFlags.lightsOnKeystroke,
-        presetFlags.polyphonicAftertouch,
-        presetFlags.sustainPedalInverted
-    );
-
-    firmwareListeners.call(&LumatoneEditor::FirmwareListener::presetFlagsReceived, presetFlags);
-
-    return errorCode;
-}
-
-FirmwareSupport::Error LumatoneController::handleGetExpressionPedalSensitivityResponse(const MidiMessage& midiMessage)
-{
-    int sensitivity = 127;
-    auto errorCode = midiDriver.unpackGetExpressionPedalSensitivityResponse(midiMessage, sensitivity);
-
-    firmwareListeners.call(&LumatoneEditor::FirmwareListener::expressionPedalSensitivityReceived, sensitivity);
-
-    return errorCode;
-}
-
-FirmwareSupport::Error LumatoneController::handlePeripheralCalibrationData(const MidiMessage& midiMessage)
-{
-    int mode = -1;
-    auto errorCode = midiDriver.unpackPeripheralCalibrationMode(midiMessage, mode);
-
-    if (errorCode != FirmwareSupport::Error::noError)
-        return errorCode;
-
-    switch (mode)
-    {
-    case PeripheralCalibrationDataMode::ExpressionPedal:
-        errorCode = handleExpressionPedalCalibrationData(midiMessage);
-        break;
-    case PeripheralCalibrationDataMode::PitchAndModWheels:
-        errorCode = handleWheelsCalibrationData(midiMessage);
-        break;
-    default:
-        errorCode = FirmwareSupport::Error::messageIsNotResponseToCommand;
-    }
-
-    if (errorCode != FirmwareSupport::Error::noError)
-        return errorCode;
-
-    return errorCode;
-}
-
-FirmwareSupport::Error LumatoneController::handleExpressionPedalCalibrationData(const MidiMessage& midiMessage)
-{
-    int minBound = 0;
-    int maxBound = 0;
-    bool isValid = false;
-
-    auto errorCode = midiDriver.unpackExpressionPedalCalibrationPayload(midiMessage, minBound, maxBound, isValid);
-
-    firmwareListeners.call(&LumatoneEditor::FirmwareListener::pedalCalibrationDataReceived, minBound, maxBound, isValid);
-
-    return errorCode;
-}
-
-FirmwareSupport::Error LumatoneController::handleWheelsCalibrationData(const MidiMessage& midiMessage)
-{
-    WheelsCalibrationData calibrationData;
-    auto errorCode = midiDriver.unpackWheelsCalibrationPayload(midiMessage,
-        calibrationData.centerPitch,
-        calibrationData.minPitch,
-        calibrationData.maxPitch,
-        calibrationData.minMod,
-        calibrationData.maxMod
-    );
-
-    firmwareListeners.call(&LumatoneEditor::FirmwareListener::wheelsCalibrationDataReceived, calibrationData);
-    return errorCode;
-}
-
-void LumatoneController::handleMidiDriverError(FirmwareSupport::Error errorToHandle, int commandReceived)
-{
-    switch (errorToHandle)
-    {
-    case FirmwareSupport::Error::noError:
-    case FirmwareSupport::Error::messageIsAnEcho:
-    case FirmwareSupport::Error::commandNotImplemented:
-        return;
-
-    case FirmwareSupport::Error::messageHasInvalidStatusByte:
-        return;
-
-    default:
-        DBG("ERROR from command " + String::toHexString(commandReceived) + ": " + firmwareSupport.errorToString(errorToHandle));
-    }
-
-    jassertfalse;
-}
-
-void LumatoneController::firmwareTransferUpdate(FirmwareTransfer::StatusCode statusCode, String msg)
-{
-    switch (statusCode)
-    {
-    case FirmwareTransfer::StatusCode::SessionBegin:
-        midiDriver.clearMIDIMessageBuffer();
-        deviceMonitor->stopMonitoringDevice();
-        waitingForTestResponse = false; // In case connection test was in progress
-        break;
-
-    case FirmwareTransfer::StatusCode::InstallBegin:
-        editingMode = sysExSendingMode::firmwareUpdate;
-        midiDriver.closeMidiInput();
-        midiDriver.closeMidiOutput();
-        startTimer(UPDATETIMEOUT);
-        break;
-
-    default:
-        if (statusCode < FirmwareTransfer::StatusCode::NoErr)
-        {
-            // Update failed
-            deviceMonitor->intializeConnectionLossDetection();
-            juce::Timer::callAfterDelay(20, [&] { firmwareTransfer->signalThreadShouldExit(); });
-        }
-        break;
-    }
-}
-
-FirmwareSupport::Error LumatoneController::getBufferErrorCode(const uint8* sysExData)
-{
-    switch (sysExData[MSG_STATUS])
-    {
-    case TerpstraMIDIAnswerReturnCode::NACK:  // Not recognized
-        errorVisualizer.setErrorLevel(
-            HajuErrorVisualizer::ErrorLevel::error,
-            "Not Recognized");
-        return FirmwareSupport::Error::unknownCommand;
-        break;
-
-    case TerpstraMIDIAnswerReturnCode::ACK:  // Acknowledged, OK
-        errorVisualizer.setErrorLevel(
-            HajuErrorVisualizer::ErrorLevel::noError,
-            "Ack");
-        break;
-
-    case TerpstraMIDIAnswerReturnCode::BUSY: // Controller busy
-        errorVisualizer.setErrorLevel(
-            HajuErrorVisualizer::ErrorLevel::warning,
-            "Busy");
-        return FirmwareSupport::Error::deviceIsBusy;
-        break;
-
-    case TerpstraMIDIAnswerReturnCode::ERROR:    // Error
-        errorVisualizer.setErrorLevel(
-            HajuErrorVisualizer::ErrorLevel::error,
-            "Error from device");
-        return FirmwareSupport::Error::externalError;
-        break;
-
-    case TEST_ECHO:
-        return FirmwareSupport::Error::messageIsAnEcho;
-        break;
-
-    default:
-        errorVisualizer.setErrorLevel(
-            HajuErrorVisualizer::ErrorLevel::noError,
-            "");
-        break;
-    }
-
-    return FirmwareSupport::Error::noError;
-}
-
-FirmwareSupport::Error LumatoneController::handleBufferCommand(const MidiMessage& midiMessage)
-{
-    auto sysExData = midiMessage.getSysExData();
-    unsigned int cmd = sysExData[CMD_ID];
-
-    switch (cmd)
-    {
-    case GET_RED_LED_CONFIG:
-        return handleLEDConfigResponse(midiMessage);
-
-    case GET_GREEN_LED_CONFIG:
-        return handleLEDConfigResponse(midiMessage);
-
-    case GET_BLUE_LED_CONFIG:
-        return handleLEDConfigResponse(midiMessage);
-
-    case GET_CHANNEL_CONFIG:
-        return handleChannelConfigResponse(midiMessage);
-
-    case GET_NOTE_CONFIG:
-        return handleNoteConfigResponse(midiMessage);
-
-    case GET_KEYTYPE_CONFIG:
-        return handleKeyTypeConfigResponse(midiMessage);
-
-        // TODO
-
-    case GET_VELOCITY_CONFIG:
-        return handleVelocityConfigResponse(midiMessage);
-
-    case GET_FADER_TYPE_CONFIGURATION:
-        return handleFaderTypeConfigResponse(midiMessage);
-
-    case GET_SERIAL_IDENTITY:
-        return handleSerialIdentityResponse(midiMessage);
-
-    case CALIBRATE_PITCH_MOD_WHEEL:
-        firmwareListeners.call(&LumatoneEditor::FirmwareListener::calibratePitchModWheelAnswer, (TerpstraMIDIAnswerReturnCode)sysExData[MSG_STATUS]);
-        return FirmwareSupport::Error::noError;
-
-    case GET_LUMATOUCH_CONFIG:
-        return handleLumatouchConfigResponse(midiMessage);
-
-    case GET_FIRMWARE_REVISION:
-        return handleFirmwareRevisionResponse(midiMessage);
-
-    case LUMA_PING:
-        return handlePingResponse(midiMessage);
-
-    case GET_PERIPHERAL_CHANNELS:
-        return handleGetPeripheralChannelResponse(midiMessage);
-
-    case PERIPHERAL_CALBRATION_DATA:
-        return handlePeripheralCalibrationData(midiMessage);
-
-    case GET_PRESET_FLAGS:
-        return handleGetPresetFlagsResponse(midiMessage);
-
-    case GET_EXPRESSION_PEDAL_SENSITIVIY:
-        return handleGetExpressionPedalSensitivityResponse(midiMessage);
-
-    case SET_VELOCITY_CONFIG:
-        DBG("Send layout complete.");
-        // loadRandomMapping(1000, 1); // uncomment for test sequence
-        return FirmwareSupport::Error::noError;
-
-    default:
-        jassert(sysExData[MSG_STATUS] == TerpstraMIDIAnswerReturnCode::ACK);
-        if (midiMessage.getRawDataSize() <= 8)
-        {
-            // Simple confirmation
-            return FirmwareSupport::Error::noError;
-        }
-        else
-        {
-            // Returned data
-            DBG("WARNING: UNIMPLEMENTED RESPONSE HANDLING CMD " + String(sysExData[CMD_ID]));
-            return FirmwareSupport::Error::commandNotImplemented;
-        }
-    }
-
-    return FirmwareSupport::Error::unknownCommand;
-}
-
-void LumatoneController::timerCallback()
-{
-    stopTimer();
-
-    switch (editingMode)
-    {
-    case sysExSendingMode::liveEditor:
-    case sysExSendingMode::offlineEditor:
-    {
-        MidiBuffer readBuffer;
-        removeNextBlockOfMessages(readBuffer, bufferReadSize);
-        for (auto event : readBuffer)
-        {
-            auto midiMessage = event.getMessage();
-            DBG("READ: " + midiMessage.getDescription());
-            if (midiMessage.isSysEx())
-            {
-                auto sysExData = midiMessage.getSysExData();
-                auto cmd = sysExData[CMD_ID];
-
-                auto errorCode = getBufferErrorCode(sysExData);
-                handleMidiDriverError(errorCode, cmd);
-
-                if (sysExData[MSG_STATUS] == 1)
-                {
-                    errorCode = handleBufferCommand(midiMessage);
-                    handleMidiDriverError(errorCode, cmd);
-                }
-            }
-
-            // Ignore non-sysex messages
-        }
-
-        auto bufferSize = jlimit(0, 999999, readQueueSize.load() - bufferReadSize);
-        readQueueSize.store(bufferSize);
-
-        if (bufferSize != 0)
-            startTimer(bufferReadTimeoutMs);
-
-        break;
-    }
-
-    case sysExSendingMode::firmwareUpdate:
-    {
-        if (firmwareTransfer == nullptr)
-        {
-            AlertWindow::showMessageBoxAsync(
-                AlertWindow::AlertIconType::WarningIcon,
-                "Firmware update not confirmed",
-                "Your Lumatone appears to still be updating, or may have been disconnected. "
-                "Make sure Lumatone is powered on and connected, and the when Lumatone is ready it will connect successfully.",
-                "Ok", nullptr);
-
-            onDisconnection();
-            break;
-        }
-
-        firmwareTransfer->incrementProgress();
-
-        if (waitingForTestResponse)
-        {
-            if (midiDriver.hasDevicesDefined() && incomingVersion.isValid())
-            {
-                waitingForTestResponse = true;
-                onFirmwareUpdateReceived();
-            }
-
-            // THIS IS A KLUDGE! Something kills DeviceActivityMonitor's timer after device comes back online and I'm not yet sure why - vsicurella
-            else if (!deviceMonitor->isTimerRunning())
-            {
-                 deviceMonitor->initializeDeviceDetection();
-            }
-            else
-            {
-                sendGetFirmwareRevisionRequest();
-            }
-        }
-
-        // Reset connection and start polling with GetFirmwareRevision
-        else if (!incomingVersion.isValid())
-        {
-            waitingForTestResponse = true;
-            midiDriver.closeMidiInput();
-            midiDriver.closeMidiOutput();
-            deviceMonitor->initializeDeviceDetection();
-        }
-
-        startTimer(UPDATETIMEOUT);
-        break;
-    }
-
-    default:
-        jassertfalse;
-    }
-
-    bufferReadRequested = false;
-}
-
-void LumatoneController::exitSignalSent()
-{
-    firmwareTransfer = nullptr;
-}
-
-void LumatoneController::changeListenerCallback(ChangeBroadcaster* source)
-{
-    if (source == deviceMonitor.get())
-    {
-        int newInput = deviceMonitor->getConfirmedInputIndex();
-        int newOutput = deviceMonitor->getConfirmedOutputIndex();
-
-        if (newInput >= 0 && newOutput >= 0)
-        {
-            currentDevicePairConfirmed = false;
-            midiDriver.setMidiInput(newInput);
-            midiDriver.setMidiOutput(newOutput);
-
-            // if (editingMode == sysExSendingMode::firmwareUpdate)
-            // {
-                confirmAutoConnection();
-                return;
-            // }
-
-            // if (connectedSerialNumber.isEmpty())
-            //     sendGetSerialIdentityRequest();
-
-            // return;
-        }
-
-        if (currentDevicePairConfirmed)
-        {
-            // This should not get triggered if we are already disconnected
-            jassert(midiDriver.hasDevicesDefined());
-            onDisconnection();
-        }
-        else
-        {
-            // Something went wrong, but just try to continue connecting
-            DBG("Connection was tripped");
-            // Kludge - device monitor should be able to do this on it's own
-            if (deviceMonitor->willDetectDeviceIfDisconnected())
-                deviceMonitor->initializeDeviceDetection();
-        }
-    }
-}
-
-void LumatoneController::confirmAutoConnection()
-{
-    if (midiDriver.hasDevicesDefined() && !currentDevicePairConfirmed)
-    {
-        if (connectedSerialNumber.isEmpty())
-        {
-            sendGetSerialIdentityRequest();
-        }
-        else
-        {
-            sendGetFirmwareRevisionRequest();
-        }
-    }
-}
-
-void LumatoneController::onConnectionConfirm(bool sendChangeSignal)
-{
-    currentDevicePairConfirmed = true;
-    TerpstraSysExApplication::getApp().getPropertiesFile()->setValue("LastInputDeviceId", midiDriver.getLastMidiInputInfo().identifier);
-    TerpstraSysExApplication::getApp().getPropertiesFile()->setValue("LastOutputDeviceId", midiDriver.getLastMidiOutputInfo().identifier);
-
-    deviceMonitor->intializeConnectionLossDetection();
-
-    if (sendChangeSignal)
-        statusListeners.call(&LumatoneEditor::StatusListener::connectionEstablished, midiDriver.getMidiInputIndex(), midiDriver.getMidiOutputIndex());
-}
-
-void LumatoneController::onDisconnection()
-{
-    midiDriver.closeMidiInput();
-    midiDriver.closeMidiOutput();
-    midiDriver.clearMIDIMessageBuffer();
-
-    waitingForTestResponse = false;
-    currentDevicePairConfirmed = false;
-    lastTestDeviceResponded = -1;
-    lastTestDeviceSent = -1;
-    connectedSerialNumber = String();
-
-    editingMode = sysExSendingMode::offlineEditor;
-
-    statusListeners.call(&LumatoneEditor::StatusListener::connectionLost);
-
-    deviceMonitor->initializeDeviceDetection();
-}
-
-void LumatoneController::onFirmwareUpdateReceived()
-{
-    jassert(firmwareTransfer != nullptr && editingMode == sysExSendingMode::firmwareUpdate);
-
-    if (firmwareTransfer != nullptr)
-    {
-        firmwareTransfer->setProgress(1.0);
-        auto possibleUpdate = firmwareSupport.getLumatoneFirmwareVersion(incomingVersion);
-        DBG("Waiting for update, received: " + incomingVersion.toString());
-        if (possibleUpdate <= determinedVersion)
-        {
-            DBG("Error: Firmware update appears to have failed");
-        }
-        else
-        {
-            DBG("Confirmed update to firmware version " + incomingVersion.toString());
-        }
-
-        firmwareVersion = incomingVersion;
-        determinedVersion = possibleUpdate;
-
-        editingMode = sysExSendingMode::liveEditor;
-        currentDevicePairConfirmed = true;
-        firmwareListeners.call(&LumatoneEditor::FirmwareListener::firmwareRevisionReceived, firmwareVersion);
-        firmwareTransfer->signalThreadShouldExit();
-
-        deviceMonitor->intializeConnectionLossDetection();
-    }
-}
-
-void LumatoneController::loadRandomMapping(int testTimeoutMs,  int maxIterations, int i)
-{
-    auto dir = File::getSpecialLocation(File::SpecialLocationType::userDocumentsDirectory).getChildFile("Lumatone Editor").getChildFile("Mappings");
-    auto mappings = dir.findChildFiles(File::TypesOfFileToFind::findFiles, true);
-    auto numfiles = mappings.size();
-    auto r = Random();
-
-    auto fileIndex = r.nextInt(numfiles-1);
-    auto file = mappings[fileIndex];
-
-    if (file.exists() && file.hasFileExtension(".ltn"))
-    {
-        DBG("Found " + String(numfiles) + " files, loading " + file.getFileName());
-        MessageManager::callAsync([file]() { TerpstraSysExApplication::getApp().setCurrentFile(file); });
-    }
-
-//    if (i < maxIterations)
-//        Timer::callAfterDelay(testTimeoutMs, [&]() { loadRandomMapping(testTimeoutMs, maxIterations, i + 1); });
-//    else
-//        DBG("Finished random mappings test.");
-}
diff --git a/Source/LumatoneController.h b/Source/LumatoneController.h
deleted file mode 100644
index 6bdc4988..00000000
--- a/Source/LumatoneController.h
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
-  ==============================================================================
-
-    LumatoneCommandManager.h
-    Created: 17 Apr 2021 10:17:31pm
-    Author:  Vincenzo
-
-  ==============================================================================
-*/
-
-#pragma once
-
-#include "ApplicationListeners.h"
-#include "./data/lumatone_layout.h"
-#include "TerpstraMidiDriver.h"
-#include "DeviceActivityMonitor.h"
-#include "FirmwareTransfer.h"
-#include "key_update_buffer.h"
-
-//==============================================================================
-// Helper class for parsing and comparing (todo) firmware versions
-
-
-
-class LumatoneController :  private TerpstraMidiDriver::Collector,
-                            protected FirmwareTransfer::ProcessListener, // Firmware transfer updates
-                            private juce::Thread::Listener,              // Firmware thread exited
-                            private juce::Timer,
-                            private juce::ChangeListener
-{
-
-public:
-
-    LumatoneController();
-    ~LumatoneController();
-
-    //============================================================================
-    // Methods to configure firmware communication parameters
-
-    sysExSendingMode getEditorMode() const { return editingMode; }
-    void setSysExSendingMode(sysExSendingMode newMode);
-
-    FirmwareVersion getFirmwareVersion() const { return firmwareVersion; }
-
-    LumatoneFirmwareVersion getLumatoneVersion() const { return determinedVersion; }
-
-    const FirmwareSupport& getFirmwareSupport() const { return firmwareSupport; }
-
-    void refreshAvailableMidiDevices();
-
-    Array<MidiDeviceInfo> getMidiInputList() { return midiDriver.getMidiInputList(); }
-    Array<MidiDeviceInfo> getMidiOutputList() { return midiDriver.getMidiOutputList(); }
-
-    int getMidiInputIndex() const { return midiDriver.getMidiInputIndex(); }
-    int getMidiOutputIndex() const { return midiDriver.getMidiOutputIndex(); }
-
-    void setMidiInput(int deviceIndex);
-    void setMidiOutput(int deviceIndex);
-
-    bool isConnected() const { return midiDriver.hasDevicesDefined() && currentDevicePairConfirmed; }
-
-    bool requestFirmwareUpdate(File firmwareFile, FirmwareTransfer::ProcessListener* listenerIn = nullptr);
-
-    // Auto-connection and monitoring
-
-    void detectAndConnectToLumatone();
-    void stopAutoConnection();
-
-    bool isDetectingLumatone() const { return deviceMonitor->willDetectDeviceIfDisconnected() && !deviceMonitor->isConnectionEstablished(); }
-    void setDeviceDetectionTimeout(int responseTimeoutMs) { deviceMonitor->setResponseTimeoutMs(responseTimeoutMs); }
-
-    bool willCheckConnectionWhenInactvie() const { return deviceMonitor->willCheckForInactivity(); }
-    void checkConnectionWhenInactive(bool checkWhenInactive) { deviceMonitor->setCheckForInactivity(checkWhenInactive); }
-
-public:
-    // LumatoneLayout intermediaries
-
-    LumatoneKey* getKey(int boardIndex, int keyIndex);
-    LumatoneBoard* getBoard(int boardIndex);
-
-    int getNumBoards() const;
-    int getOctaveBoardSize() const;
-    bool isKeyCoordValid(LumatoneKeyCoord coord) const;
-
-    bool getInvertExpression() const;
-    bool getInvertSustain() const;
-    juce::uint8 getExpressionSensitivity() const;
-
-
-public:
-
-    //============================================================================
-    // Combined (hi-level) commands
-
-    // Send all parametrizations of one sub board
-    void sendAllParamsOfBoard(int boardIndex, LumatoneBoard boardData, bool bufferMessages=false);
-
-    // Send and save a complete key mapping
-    void sendCompleteMapping(LumatoneLayout mappingData, bool bufferMessages=false);
-
-    // Send request to receive the current mapping of one sub board on the controller
-    void sendGetMappingOfBoardRequest(int boardIndex);
-
-    // Send request to receive the complete current mapping on the controller
-    void sendGetCompleteMappingRequest();
-
-    // Send parametrization of one key to the device
-    void sendKeyParam(int boardIndex, int keyIndex, LumatoneKey keyData, bool bufferMessages = false);
-
-    // Send configuration of a certain look up table
-    void sendTableConfig(LumatoneConfigTable::TableType velocityCurveType, const uint8* table);
-
-    // Reset configuration of a certain look up table to factory settings
-    void resetVelocityConfig(LumatoneConfigTable::TableType velocityCurveType);
-
-    // Ping a device cached in the device list, will primarily use GetSerialIdentity, or Ping if determined version happens to be >= 1.0.9
-    unsigned int sendTestMessageToDevice(int deviceIndex, unsigned int pingId);
-
-    // Sends a generic test message to the current device pair to see if we get an expected response
-    void testCurrentDeviceConnection();
-
-    //============================================================================
-    // Single (mid-level) commands
-
-    // Send note, channel, cc, and fader polarity data
-    void sendKeyConfig(int boardIndex, int keyIndex, int noteOrCCNum, int channel, int keyType, bool faderUpIsNull = true, bool bufferMessages = false);
-
-    void sendKeyColourConfig(int boardIndex, int keyIndex, Colour colour, bool bufferMessages = false);
-
-    // Send expression pedal sensivity
-    void sendExpressionPedalSensivity(unsigned char value);
-
-    // Send parametrization of foot controller
-    void sendInvertFootController(bool value);
-
-    // Colour for macro button in active state
-    void sendMacroButtonActiveColour(String colourAsString);
-
-    // Colour for macro button in inactive state
-    void sendMacroButtonInactiveColour(String colourAsString);
-
-    // Send parametrization of light on keystrokes
-    void sendLightOnKeyStrokes(bool value);
-
-    // Send a value for a velocity lookup table
-    void sendVelocityConfig(const uint8 velocityTable[]);
-
-    // Save velocity config to EEPROM
-    void saveVelocityConfig();
-
-    void resetVelocityConfig();
-
-    void setFaderConfig(const uint8 faderTable[]);
-
-    void resetFaderConfig();
-
-    void setAftertouchEnabled(bool isEnabled);
-
-    void startCalibrateAftertouch();
-
-    void setAftertouchConfig(const uint8 aftertouchTable[]);
-
-    void resetAftertouchConfig();
-
-    void setCalibratePitchModWheel(bool startCalibration);
-
-    void setVelocityIntervalConfig(const int velocityIntervalTable[]);
-
-    void getRedLEDConfig(int boardIndex);
-
-    void getGreenLEDConfig(int boardIndex);
-
-    void getBlueLEDConfig(int boardIndex);
-
-    void getChannelConfig(int boardIndex);
-
-    void getNoteConfig(int boardIndex);
-
-    void getKeyTypeConfig(int boardIndex);
-
-    void sendVelocityConfigRequest();
-
-    // CMD 1Eh: Read back the current fader look up table of the keyboard.
-    void sendFaderConfigRequest();
-
-    // CMD 1Fh: Read back the current aftertouch look up table of the keyboard.
-    void sendAftertouchConfigRequest();
-
-    void sendVelocityIntervalConfigRequest();
-
-    // CMD 22h: Read back the fader type of all keys on the targeted board.
-	void getFaderTypeConfig(int boardIndex);
-
-    // This command is used to read back the serial identification number of the keyboard.
-    void sendGetSerialIdentityRequest();
-
-    void startCalibrateKeys();
-
-    void setLumatouchConfig(const uint8 lumatouchTable[]);
-
-    void resetLumatouchConfig();
-
-    void getLumatouchConfig();
-
-    // This command is used to read back the current Lumatone firmware revision.
-    void sendGetFirmwareRevisionRequest();
-
-    // Send a value from 0-127 for the Lumatone to echo back, returns actual value sent (in case of 7-bit masking); used for auto device connection and monitoring
-    int pingLumatone(uint8 pingId);
-
-    // Set MIDI Channels of peripheral controllers, pitch & mod wheels, expression & sustain pedals
-    void setPeripheralChannels(int pitchWheelChannel, int modWheelChannel, int expressionChannel, int sustainChannel);
-    void setPeripheralChannels(PeripheralChannelSettings channelSettings);
-
-    // Get MIDI Channels of peripheral controllers, pitch & mod wheels, expression & sustain pedals
-    void getPeripheralChannels();
-
-    // Invert the polarity of the sustain pedal
-    void invertSustainPedal(bool setInverted);
-
-    // Reset preset mappings to factory mappings
-    void resetPresetsToFactoryDefault();
-    void resetPresetToFactoryDefault(int presetIndex);
-
-    // Get interaction flags of current preset
-    void getPresetFlags();
-
-    // Get sensitivity setting of expression pedal
-    void getExpressionPedalSensitivity();
-
-    //============================================================================
-    // FirmwareTransfer::Listener
-
-    void firmwareTransferUpdate(FirmwareTransfer::StatusCode statusCode, String msg) override;
-
-    void exitSignalSent() override;
-
-    //============================================================================
-    // juce::Timer implementation
-
-    void timerCallback() override;
-
-    // Buffer read helpers
-    FirmwareSupport::Error getBufferErrorCode(const uint8* sysExData);
-    FirmwareSupport::Error handleBufferCommand(const MidiMessage& midiMessage);
-
-    //============================================================================
-    // juce::ChangeListener implementation
-
-    void changeListenerCallback(ChangeBroadcaster* source) override;
-
-
-    //============================================================================
-    // Test functions
-
-    void loadRandomMapping(int testTimeoutMs, int maxIterations, int i = 0);
-
-private:
-
-    // Takes a generic firmware version and parses it into a recognized firmware version
-    void setFirmwareVersion(FirmwareVersion firmwareVersionIn);
-
-    // Takes a recognized firmware version
-    void setFirmwareVersion(LumatoneFirmwareVersion lumatoneVersion, bool parseVersion = true);
-
-protected:
-    //============================================================================
-    // Implementation of TerpstraMidiDriver::Listener
-
-    virtual void midiMessageReceived(MidiInput* source, const MidiMessage& midiMessage) override;
-    virtual void midiMessageSent(MidiOutput* target, const MidiMessage& midiMessage) override;
-    virtual void midiSendQueueSize(int queueSize) override;
-    virtual void generalLogMessage(String textMessage, HajuErrorVisualizer::ErrorLevel errorLevel) override;
-    virtual void noAnswerToMessage(MidiInput* expectedDevice, const MidiMessage& midiMessage) override;
-
-private:
-
-    void confirmAutoConnection();
-    void onConnectionConfirm(bool sendChangeSignal);
-    void onDisconnection();
-    void onFirmwareUpdateReceived();
-
-
-private:
-    ListenerList<LumatoneEditor::StatusListener> statusListeners;
-public:
-    void    addStatusListener(LumatoneEditor::StatusListener* listenerIn) { statusListeners.add(listenerIn); }
-    void removeStatusListener(LumatoneEditor::StatusListener* listenerIn) { statusListeners.remove(listenerIn); }
-
-private:
-    ListenerList<LumatoneEditor::FirmwareListener> firmwareListeners;
-public:
-    void    addFirmwareListener(LumatoneEditor::FirmwareListener* listenerIn) { firmwareListeners.add(listenerIn); }
-    void removeFirmwareListener(LumatoneEditor::FirmwareListener* listenerIn) { firmwareListeners.remove(listenerIn); }
-
-private:
-     ListenerList<LumatoneEditor::EditorListener> editorListeners;
-public:
-     void    addEditorListener(LumatoneEditor::EditorListener* listenerIn) { editorListeners.add(listenerIn); }
-     void removeEditorListener(LumatoneEditor::EditorListener* listenerIn) { editorListeners.remove(listenerIn); }
-
-//private:
-//    ListenerList<MidiListener> midiListeners;
-//public:
-//    void    addMidiListener(MidiListener* listenerIn) { midiListeners.add(listenerIn); }
-//    void removeMidiListener(MidiListener* listenerIn) { midiListeners.remove(listenerIn); }
-
-private:
-    //============================================================================
-    // Lower-level message unpacking and handling
-
-    FirmwareSupport::Error handleOctaveConfigResponse(
-        const MidiMessage& midiMessage,
-        std::function <FirmwareSupport::Error(const MidiMessage&, int&, uint8, int*)> unpackFunction,
-        std::function <void(int,void*)> callbackFunctionIfNoError = {}
-    );
-
-    FirmwareSupport::Error handleTableConfigResponse(
-        const MidiMessage& midiMessage,
-        std::function<FirmwareSupport::Error(const MidiMessage&, int*)> unpackFunction,
-        std::function <void(void*)> callbackFunctionIfNoError = {}
-    );
-
-    FirmwareSupport::Error handleLEDConfigResponse(const MidiMessage& midiMessage);
-
-    FirmwareSupport::Error handleChannelConfigResponse(const MidiMessage& midiMessage);
-
-    FirmwareSupport::Error handleNoteConfigResponse(const MidiMessage& midiMessage);
-
-    FirmwareSupport::Error handleKeyTypeConfigResponse(const MidiMessage& midiMessage);
-
-    FirmwareSupport::Error handleVelocityConfigResponse(const MidiMessage& midiMessage);
-
-    FirmwareSupport::Error handleAftertouchConfigResponse(const MidiMessage& midiMessage);
-
-    FirmwareSupport::Error handleVelocityIntervalConfigResponse(const MidiMessage& midiMessage);
-
-    FirmwareSupport::Error handleFaderConfigResponse(const MidiMessage& midiMessage);
-
-    FirmwareSupport::Error handleFaderTypeConfigResponse(const MidiMessage& midiMessage);
-
-    FirmwareSupport::Error handleSerialIdentityResponse(const MidiMessage& midiMessage);
-
-    FirmwareSupport::Error handleFirmwareRevisionResponse(const MidiMessage& midiMessage);
-
-    FirmwareSupport::Error handleLumatouchConfigResponse(const MidiMessage& midiMessage);
-
-    FirmwareSupport::Error handlePingResponse(const MidiMessage& midiMessage);
-
-    FirmwareSupport::Error handlePeripheralCalibrationData(const MidiMessage& midiMessage);
-    FirmwareSupport::Error handleExpressionPedalCalibrationData(const MidiMessage& midiMessage);
-    FirmwareSupport::Error handleWheelsCalibrationData(const MidiMessage& midiMessage);
-
-    FirmwareSupport::Error handleGetPeripheralChannelResponse(const MidiMessage& midiMessage);
-
-    FirmwareSupport::Error handleGetPresetFlagsResponse(const MidiMessage& midiMessage);
-
-    FirmwareSupport::Error handleGetExpressionPedalSensitivityResponse(const MidiMessage& midiMessage);
-
-    void handleMidiDriverError(FirmwareSupport::Error errorToHandle, int commandReceived = -1);
-
-private:
-
-    CriticalSection             criticalSection;
-
-    FirmwareSupport             firmwareSupport;
-
-    String                      connectedSerialNumber;
-    LumatoneFirmwareVersion     determinedVersion = LumatoneFirmwareVersion::NO_VERSION;
-    FirmwareVersion             firmwareVersion = { 0, 0, 0 };
-    FirmwareVersion             incomingVersion = { 0, 0, 0 };
-    int                         octaveSize = 56;
-
-    HajuErrorVisualizer         errorVisualizer;
-    TerpstraMidiDriver          midiDriver;
-
-    LumatoneKeyUpdateBuffer     keyUpdater;
-
-    std::unique_ptr<DeviceActivityMonitor>  deviceMonitor;
-
-    std::unique_ptr<FirmwareTransfer>       firmwareTransfer;
-
-//    MidiBuffer                  responseQueue;
-//    int                         readSample = 0;
-//    int                         sampleNum = 0;
-    const int                   bufferReadTimeoutMs = 30;
-    const int                   bufferReadSize = 16;
-    bool                        bufferReadRequested = false;
-
-    std::atomic<int>            readQueueSize;
-    int                         sendQueueSize = 0;
-
-    int                         lastTestDeviceSent = -1;
-    int                         lastTestDeviceResponded = -1;
-    bool                        waitingForTestResponse = false;
-    bool                        currentDevicePairConfirmed = false;
-
-    sysExSendingMode editingMode = sysExSendingMode::offlineEditor;
-};
diff --git a/Source/LumatoneEditorFontLibrary.h b/Source/LumatoneEditorFontLibrary.h
new file mode 100644
index 00000000..4c3b2e07
--- /dev/null
+++ b/Source/LumatoneEditorFontLibrary.h
@@ -0,0 +1,99 @@
+/*
+  ==============================================================================
+
+    LumatoneEditorFontLibrary.h
+    Created: 12 Feb 2021 10:52:11pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#ifndef LUMATONE_EDITOR_FONT_LIBRARY_H
+#define LUMATONE_EDITOR_FONT_LIBRARY_H
+
+#include <JuceHeader.h>
+
+typedef enum
+{
+    UniviaPro = 0,
+    UniviaProBold,
+    FranklinGothic,
+    GothamNarrowMedium,
+    GothamNarrowBold,
+    GothamNarrowItalic,
+    GothamNarrowLight
+
+} LumatoneEditorFont;
+
+struct LumatoneEditorFontLibrary
+{
+    LumatoneEditorFontLibrary()
+    {
+        // Setup default fallback fonts
+
+        // In place of...
+        // UniviaPro
+        fonts.add(Font("Tahoma", 12.0f, Font::plain));
+
+        // UniviaProBold
+        fonts.add(Font("Tahoma", 12.0f, Font::bold));
+
+        // FranklinGothic
+        fonts.add(Font("Arial", 12.0f, Font::plain));
+
+        // GothamNarrowMedium
+        fonts.add(Font("Trebuchet MS", 12.0f, Font::plain));
+
+        // GothamNarrowMediumBold
+        fonts.add(Font("Trebuchet MS", 12.0f, Font::bold));
+
+        // GothamNarrowMediumItalic
+        fonts.add(Font("Trebuchet MS", 12.0f, Font::italic));
+
+        // GothamNarrowMediumLight
+        fonts.add(Font("Trebuchet MS", 12.0f, Font::plain));
+
+#if USE_LICENSED_FONTS
+
+        fonts.set(LumatoneEditorFont::UniviaPro,
+              Font(Typeface::createSystemTypefaceFor(BinaryData::UniviaProRegular_ttf, BinaryData::UniviaProRegular_ttfSize))
+        );
+
+        fonts.set(LumatoneEditorFont::UniviaProBold,
+              Font(Typeface::createSystemTypefaceFor(BinaryData::UniviaProBold_ttf, BinaryData::UniviaProBold_ttfSize))
+        );
+
+        fonts.set(LumatoneEditorFont::FranklinGothic,
+              Font(Typeface::createSystemTypefaceFor(BinaryData::framd_ttf, BinaryData::framd_ttfSize))
+        );
+
+        fonts.set(LumatoneEditorFont::GothamNarrowMedium,
+              Font(Typeface::createSystemTypefaceFor(BinaryData::GothamNarrowMedium_otf, BinaryData::GothamNarrowMedium_otfSize))
+        );
+
+        fonts.set(LumatoneEditorFont::GothamNarrowBold,
+              Font(Typeface::createSystemTypefaceFor(BinaryData::GothamNarrowBold_otf, BinaryData::GothamNarrowBold_otfSize))
+        );
+
+        fonts.set(LumatoneEditorFont::GothamNarrowItalic,
+              Font(Typeface::createSystemTypefaceFor(BinaryData::GothamNarrowLightItalic_otf, BinaryData::GothamNarrowLightItalic_otfSize))
+        );
+
+        fonts.set(LumatoneEditorFont::GothamNarrowLight,
+              Font(Typeface::createSystemTypefaceFor(BinaryData::GothamNarrowLight_otf, BinaryData::GothamNarrowLight_otfSize))
+        );
+
+#endif
+    }
+
+    juce::Font getFont(LumatoneEditorFont fontId, float heightIn = 12.0f) const
+    {
+        return fonts[fontId].withHeight(heightIn);
+    }
+
+private:
+    typedef juce::Array<juce::Font> Library;
+    LumatoneEditorFontLibrary::Library fonts;
+};
+
+#endif // LUMATONE_EDITOR_FONT_LIBRARY_H
diff --git a/Source/LumatoneEditorFonts.h b/Source/LumatoneEditorFonts.h
index d0a0caa7..ce213082 100644
--- a/Source/LumatoneEditorFonts.h
+++ b/Source/LumatoneEditorFonts.h
@@ -1,7 +1,7 @@
 /*
   ==============================================================================
 
-    LumatoneEditorFonts.h
+    LumatoneEditorFontLibrary.h
     Created: 12 Feb 2021 10:52:11pm
     Author:  Vincenzo
 
@@ -10,85 +10,3 @@
 
 #pragma once
 #include <JuceHeader.h>
-
-typedef enum
-{
-    UniviaPro = 0,
-    UniviaProBold,
-    FranklinGothic,
-    GothamNarrowMedium,
-    GothamNarrowBold,
-    GothamNarrowItalic,
-    GothamNarrowLight
-    
-} LumatoneEditorFont;
-
-struct LumatoneEditorFonts
-{
-    typedef Array<Font> Library;
-    LumatoneEditorFonts::Library fonts;
-
-    LumatoneEditorFonts()
-    {
-        // Setup default fallback fonts
-
-        // In place of...
-        // UniviaPro
-        fonts.add(Font("Tahoma", 12.0f, Font::plain));
-
-        // UniviaProBold
-        fonts.add(Font("Tahoma", 12.0f, Font::bold));
-
-        // FranklinGothic
-        fonts.add(Font("Arial", 12.0f, Font::plain));
-
-        // GothamNarrowMedium
-        fonts.add(Font("Trebuchet MS", 12.0f, Font::plain));
-
-        // GothamNarrowMediumBold
-        fonts.add(Font("Trebuchet MS", 12.0f, Font::bold));
-
-        // GothamNarrowMediumItalic
-        fonts.add(Font("Trebuchet MS", 12.0f, Font::italic));
-
-        // GothamNarrowMediumLight
-        fonts.add(Font("Trebuchet MS", 12.0f, Font::plain));
-
-#if USE_LICENSED_FONTS
-        
-        fonts.set(LumatoneEditorFont::UniviaPro,
-              Font(Typeface::createSystemTypefaceFor(BinaryData::UniviaProRegular_ttf, BinaryData::UniviaProRegular_ttfSize))
-        );
-
-        fonts.set(LumatoneEditorFont::UniviaProBold,
-              Font(Typeface::createSystemTypefaceFor(BinaryData::UniviaProBold_ttf, BinaryData::UniviaProBold_ttfSize))
-        );
-
-        fonts.set(LumatoneEditorFont::FranklinGothic,
-              Font(Typeface::createSystemTypefaceFor(BinaryData::framd_ttf, BinaryData::framd_ttfSize))
-        );
-
-        fonts.set(LumatoneEditorFont::GothamNarrowMedium,
-              Font(Typeface::createSystemTypefaceFor(BinaryData::GothamNarrowMedium_otf, BinaryData::GothamNarrowMedium_otfSize))
-        );
-
-        fonts.set(LumatoneEditorFont::GothamNarrowBold,
-              Font(Typeface::createSystemTypefaceFor(BinaryData::GothamNarrowBold_otf, BinaryData::GothamNarrowBold_otfSize))
-        );
-
-        fonts.set(LumatoneEditorFont::GothamNarrowItalic,
-              Font(Typeface::createSystemTypefaceFor(BinaryData::GothamNarrowLightItalic_otf, BinaryData::GothamNarrowLightItalic_otfSize))
-        );
-        
-        fonts.set(LumatoneEditorFont::GothamNarrowLight,
-              Font(Typeface::createSystemTypefaceFor(BinaryData::GothamNarrowLight_otf, BinaryData::GothamNarrowLight_otfSize))
-        );
-        
-#endif
-    }
-
-    Font getFont(LumatoneEditorFont fontId, float heightIn)
-    {
-        return fonts[fontId].withHeight(heightIn);
-    }
-};
diff --git a/Source/LumatoneEditorLookAndFeel.h b/Source/LumatoneEditorLookAndFeel.h
index 1a39dd81..2fcc537f 100644
--- a/Source/LumatoneEditorLookAndFeel.h
+++ b/Source/LumatoneEditorLookAndFeel.h
@@ -16,16 +16,15 @@
 #pragma once
 
 #include "LumatoneEditorStyleCommon.h"
-#include "LumatoneEditorFonts.h"
+#include "LumatoneEditorFontLibrary.h"
 
 class LumatoneEditorLookAndFeel : public LookAndFeel_V4
 {
 public:
 
-    LumatoneEditorLookAndFeel(
-        LumatoneEditorFonts::Library appFontsIn,
-        bool doImageCache = false
-    ) : appFonts(appFontsIn), compactWindowStyle(this)
+    LumatoneEditorLookAndFeel(const LumatoneEditorFontLibrary& appFontsIn, bool doImageCache = false)
+        : appFonts(appFontsIn)
+        , compactWindowStyle(this)
     {
         setupDefaultColours();
 
@@ -37,19 +36,19 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
 
     }
 
-    LumatoneEditorLookAndFeel(const LumatoneEditorLookAndFeel& lafCopy)
-        : appFonts(lafCopy.appFonts),
-          saveIconPath(lafCopy.saveIconPath),
-          arrowUpIconPath(lafCopy.arrowUpIconPath),
-          arrowDownIconPath(lafCopy.arrowDownIconPath),
-          compactWindowStyle(this)
+    // LumatoneEditorLookAndFeel(const LumatoneEditorLookAndFeel& lafCopy)
+    //     : appFonts(lafCopy.appFonts),
+    //       saveIconPath(lafCopy.saveIconPath),
+    //       arrowUpIconPath(lafCopy.arrowUpIconPath),
+    //       arrowDownIconPath(lafCopy.arrowDownIconPath),
+    //       compactWindowStyle(this)
+    // {
+    //     setupDefaultColours();
+    // }
+
+    Font getAppFont(LumatoneEditorFont fontIdIn, float heightIn=12.0f) const
     {
-        setupDefaultColours();
-    }
-
-    Font getAppFont(LumatoneEditorFont fontIdIn)
-    {
-        return appFonts[fontIdIn];
+        return appFonts.getFont(fontIdIn, heightIn);
     }
 
 public:
@@ -68,7 +67,7 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
         g.fillAll(findColour(LumatoneEditorColourIDs::MediumBackground));
 
         const float fontHeight = h * 0.5f;
-        const Font font = appFonts[LumatoneEditorFont::UniviaProBold].withHeight(fontHeight);
+        const Font font = getAppFont(LumatoneEditorFont::UniviaProBold, fontHeight);
         g.setFont(font);
 
         const float margin = (h - fontHeight) * 0.5f;
@@ -146,7 +145,7 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
             g.fillAll(parent->findColour(LumatoneEditorColourIDs::DarkBackground));
 
             g.setColour(parent->findColour(LumatoneEditorColourIDs::DescriptionText));
-            g.setFont(parent->appFonts[LumatoneEditorFont::GothamNarrowMedium].withHeight(h * 0.75f));
+            g.setFont(parent->getAppFont(LumatoneEditorFont::GothamNarrowMedium, h * 0.75f));
             g.drawFittedText(window.getName(), 0, 0, w, h, Justification::centred, 1, 1.0f);
         }
 
@@ -229,8 +228,7 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
         if (properties.contains(LumatoneEditorStyleIDs::fontOverride))
         {
             int overrideIndex = properties[LumatoneEditorStyleIDs::fontOverride];
-            if (overrideIndex >= 0 && overrideIndex < appFonts.size())
-                font = appFonts[overrideIndex].withHeight(l.getHeight());
+            font = getAppFont((LumatoneEditorFont) overrideIndex).withHeight(l.getHeight());
         }
 
         if (properties.contains(LumatoneEditorStyleIDs::fontOverrideTypefaceStyle))
@@ -456,14 +454,13 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
             ? buttonHeight
             : buttonHeight / 1.75f;
 
-        Font font = appFonts[LumatoneEditorFont::GothamNarrowMedium].withHeight(fontHeight);
+        Font font = getAppFont(LumatoneEditorFont::GothamNarrowMedium, fontHeight);
 
         NamedValueSet& properties = btn.getProperties();
         if (properties.contains(LumatoneEditorStyleIDs::fontOverride))
         {
             int overrideIndex = properties[LumatoneEditorStyleIDs::fontOverride];
-            if (overrideIndex >= 0 && overrideIndex < appFonts.size())
-                font = appFonts[overrideIndex].withHeight(btn.getHeight() * CONTROLBOXFONTHEIGHTSCALAR);
+            font = getAppFont((LumatoneEditorFont)overrideIndex, btn.getHeight() * CONTROLBOXFONTHEIGHTSCALAR);
         }
 
         if (properties.contains(LumatoneEditorStyleIDs::fontOverrideTypefaceStyle))
@@ -500,7 +497,7 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
         if (ticked)
         {
             g.setColour(tickColour);
-            g.setFont(appFonts[LumatoneEditorFont::GothamNarrowBold].withHeight(h).withHorizontalScale(1.333333f));
+            g.setFont(getAppFont(LumatoneEditorFont::GothamNarrowBold, h).withHorizontalScale(1.333333f));
             g.drawFittedText("X", x, y, w, h, Justification::centred, 1, 1.0f);
         }
     }
@@ -515,7 +512,7 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
 #else
         float fontScalar = 1.125f;
 #endif
-        g.setFont(appFonts[LumatoneEditorFont::GothamNarrowMedium].withHeight(btn.getHeight() * fontScalar));
+        g.setFont(getAppFont(LumatoneEditorFont::GothamNarrowMedium, btn.getHeight() * fontScalar));
 
         Colour textColour = btn.findColour(ToggleButton::ColourIds::textColourId);
 
@@ -642,7 +639,7 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
             Label* label = new Label(sld.getName() + "_ValueLabel");
             label->setText(String(sld.getValue()), dontSendNotification);
             label->setJustificationType(Justification::centred);
-            label->setFont(appFonts[LumatoneEditorFont::GothamNarrowMedium]);
+            // label->setFont(getAppFont(LumatoneEditorFont::GothamNarrowMedium));
 
             Colour textColour = (sld.isEnabled())
                 ? findColour(LumatoneEditorColourIDs::DescriptionText)
@@ -663,7 +660,7 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
             Label* label = new Label(sld.getName() + "_ValueLabel");
             label->setText(String(sld.getValue()), dontSendNotification);
             label->setJustificationType(Justification::centred);
-            label->setFont(appFonts[LumatoneEditorFont::GothamNarrowMedium]);
+            label->setFont(getAppFont(LumatoneEditorFont::GothamNarrowMedium));
 
             if (sld.getProperties().contains(LumatoneEditorStyleIDs::fontHeightScalar))
                 label->getProperties().set(LumatoneEditorStyleIDs::fontHeightScalar, sld.getProperties()[LumatoneEditorStyleIDs::fontHeightScalar]);
@@ -780,21 +777,20 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
         if (buttonW > 0)
         {
             g.setColour(textColour);
-            g.setFont(appFonts[LumatoneEditorFont::GothamNarrowLight].withHeight(buttonH * 0.5f).withHorizontalScale(2.0f));
+            g.setFont(getAppFont(LumatoneEditorFont::GothamNarrowLight, buttonH * 0.5f).withHorizontalScale(2.0f));
             g.drawFittedText("v", realButtonX, 0, box.getHeight(), box.getHeight(), Justification::centred, 1);
         }
     }
 
     Font getComboBoxFont(ComboBox& box) override
     {
-        Font font = appFonts[LumatoneEditorFont::GothamNarrowMedium].withHeight(box.getHeight() * CONTROLBOXFONTHEIGHTSCALAR);
+        Font font = getAppFont(LumatoneEditorFont::GothamNarrowMedium, box.getHeight() * CONTROLBOXFONTHEIGHTSCALAR);
 
         NamedValueSet& properties = box.getProperties();
         if (properties.contains(LumatoneEditorStyleIDs::fontOverride))
         {
             int overrideIndex = properties[LumatoneEditorStyleIDs::fontOverride];
-            if (overrideIndex >= 0 && overrideIndex < appFonts.size())
-                font = appFonts[overrideIndex].withHeight(box.getHeight() * CONTROLBOXFONTHEIGHTSCALAR);
+            font = getAppFont((LumatoneEditorFont)overrideIndex, box.getHeight() * CONTROLBOXFONTHEIGHTSCALAR);
         }
 
         if (properties.contains(LumatoneEditorStyleIDs::fontOverrideTypefaceStyle))
@@ -972,7 +968,7 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
 
     Font getPopupMenuFont() override
     {
-        return appFonts[LumatoneEditorFont::UniviaProBold];
+        return getAppFont(LumatoneEditorFont::UniviaProBold);
     }
 
     int getMenuWindowFlags() override
@@ -1008,7 +1004,7 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
         }
 
         g.setColour(findColour(LumatoneEditorColourIDs::ActiveText));
-        g.setFont(getAppFont(LumatoneEditorFont::GothamNarrowMedium));
+        g.setFont(appFonts.getFont(LumatoneEditorFont::GothamNarrowMedium));
         g.drawFittedText(itemText, 0, 0, w, h, Justification::centred, 1);
 
     }
@@ -1047,7 +1043,7 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
 
     Font getTabButtonFont(TabBarButton& tbb, float height) override
     {
-        return appFonts[LumatoneEditorFont::GothamNarrowMedium].withHeight(height).withHorizontalScale(1.05f);
+        return getAppFont(LumatoneEditorFont::GothamNarrowMedium, height).withHorizontalScale(1.05f);
     }
 
     void drawTabButtonText(TabBarButton& tbb, Graphics& g, bool isMouseOver, bool isMouseDown) override
@@ -1254,7 +1250,7 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
         LumatoneAssets::LoadAssets(LumatoneAssets::ID::LumatoneGraphic);
         LumatoneAssets::LoadAssets(LumatoneAssets::ID::KeyShape);
         LumatoneAssets::LoadAssets(LumatoneAssets::ID::KeyShadow);
-            
+
         ImageCache::addImageToCache(ImageCache::getFromMemory(BinaryData::TrashCanIcon2x_png, BinaryData::TrashCanIcon2x_pngSize), (juce::int64)LumatoneAssets::ID::TrashCanIcon);
     }
 
@@ -1319,7 +1315,7 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
 
 private:
 
-    LumatoneEditorFonts::Library appFonts;
+    const LumatoneEditorFontLibrary& appFonts;
 
     Path saveIconPath;
     Path arrowUpIconPath;
diff --git a/Source/LumatoneEditorState.cpp b/Source/LumatoneEditorState.cpp
new file mode 100644
index 00000000..aee4b950
--- /dev/null
+++ b/Source/LumatoneEditorState.cpp
@@ -0,0 +1,319 @@
+/*
+==============================================================================
+
+    LumatoneEditorState.cpp
+    Created: 29 Dec 2023 5:39pm
+    Author:  Vincenzo
+
+==============================================================================
+*/
+
+#include "LumatoneEditorState.h"
+
+#include "./LumatoneEditorLookAndFeel.h"
+#include "./KeyEditComponent.h"
+
+#include "./lumatone_editor_library/device/lumatone_controller.h"
+
+juce::Array<juce::Identifier> GetLumatoneEditorProperty()
+{
+    juce::Array<juce::Identifier> properties;
+    properties.add(LumatoneEditorProperty::HasChangesToSave);
+    properties.add(LumatoneEditorProperty::HasChangesToSend);
+    properties.add(LumatoneEditorProperty::InCalibrationMode);
+    properties.add(LumatoneEditorProperty::FirmwareUpdatePerformed);
+    properties.add(LumatoneEditorProperty::ColourPalettes);
+    properties.add(LumatoneEditorProperty::RecentFiles);
+    properties.add(LumatoneEditorProperty::UserDocumentsDirectory);
+    properties.add(LumatoneEditorProperty::UserMappingsDirectory);
+    properties.add(LumatoneEditorProperty::UserPalettesDirectory);
+    properties.add(LumatoneEditorProperty::DeveloperModeOn);
+    properties.add(LumatoneEditorProperty::EditorMode);
+    return properties;
+}
+
+
+LumatoneEditorState::LumatoneEditorState(juce::String name, LumatoneFirmwareDriver& driverIn, juce::UndoManager *undoManagerIn)
+    : LumatoneApplicationState("LumatoneEditor", driverIn, juce::ValueTree(), undoManagerIn)
+{
+    appFonts = std::make_shared<LumatoneEditorFontLibrary>();
+    lookAndFeel = std::make_shared<LumatoneEditorLookAndFeel>(*appFonts, true);
+
+    juce::PropertiesFile::Options options;
+    options.applicationName = "LumatoneSetup";
+    options.filenameSuffix = "settings";
+    options.osxLibrarySubFolder = "Application Support";
+#if JUCE_LINUX
+    options.folderName = "~/.config/LumatoneSetup";
+#else
+    options.folderName = "LumatoneSetup";
+#endif
+
+    propertiesFile = std::make_shared<juce::PropertiesFile>(options);
+    jassert(propertiesFile != nullptr);
+}
+
+LumatoneEditorState::LumatoneEditorState(juce::String name, const LumatoneEditorState &stateIn)
+    : LumatoneApplicationState(name, stateIn)
+    , appFonts(stateIn.appFonts)
+    , lookAndFeel(stateIn.lookAndFeel)
+    , propertiesFile(stateIn.propertiesFile)
+{
+}
+
+LumatoneEditorState::~LumatoneEditorState()
+{
+}
+
+juce::var LumatoneEditorState::getProperty(juce::Identifier propertyId) const
+{
+    return propertiesFile->getValue(propertyId.toString());
+}
+
+juce::RecentlyOpenedFilesList LumatoneEditorState::getRecentFiles() const
+{
+    juce::RecentlyOpenedFilesList recentFiles;
+	recentFiles.restoreFromString(propertiesFile->getValue("RecentFiles"));
+	recentFiles.removeNonExistentFiles();
+    return recentFiles;
+}
+
+juce::File LumatoneEditorState::getUserDocumentsDirectory() const
+{
+    juce::String possibleDirectory = propertiesFile->getValue("UserDocumentsDirectory");
+    juce::File directory;
+
+    if (juce::File::isAbsolutePath(possibleDirectory))
+    {
+        directory = juce::File(possibleDirectory);
+    }
+    if (!directory.exists() || directory.existsAsFile())
+    {
+        directory = File::getSpecialLocation(File::userDocumentsDirectory).getChildFile("Lumatone Editor");
+
+        // User pref?
+        directory.createDirectory();
+    }
+    return directory;
+}
+
+juce::File LumatoneEditorState::getUserMappingsDirectory() const
+{
+    juce::File parentFolder = getUserDocumentsDirectory();
+
+    juce::String possibleDirectory = propertiesFile->getValue("UserMappingsDirectory");
+    juce::File directory;
+
+    if (juce::File::isAbsolutePath(possibleDirectory))
+    {
+        directory = juce::File(possibleDirectory);
+    }
+    if (!directory.exists() || parentFolder.isDirectory())
+    {
+        directory = parentFolder.getChildFile("Mappings");
+
+        // User pref?
+        directory.createDirectory();
+    }
+    return directory;
+}
+
+juce::File LumatoneEditorState::getUserPalettesDirectory() const
+{
+    juce::File parentFolder = getUserDocumentsDirectory();
+
+    juce::String possibleDirectory = propertiesFile->getValue("UserPalettesDirectory");
+    juce::File directory;
+
+    if (juce::File::isAbsolutePath(possibleDirectory))
+    {
+        directory = juce::File(possibleDirectory);
+    }
+    if (!directory.exists() || parentFolder.isDirectory())
+    {
+        directory = parentFolder.getChildFile("Palettes");
+
+        // User pref?
+        directory.createDirectory();
+    }
+    return directory;
+}
+
+void LumatoneEditorState::setHasChangesToSave(bool hasChangesToSaveIn)
+{
+    hasChangesToSave = hasChangesToSaveIn;
+    state.setPropertyExcludingListener(this, LumatoneEditorProperty::HasChangesToSave, hasChangesToSave, nullptr);
+}
+
+void LumatoneEditorState::setCalibrationMode(bool calibrationModeOn)
+{
+    calibrationModeOn = calibrationModeOn;
+    getLumatoneController()->setCalibratePitchModWheel(calibrationModeOn);
+    // writeBoolProperty(LumatoneEditorProperty::InCalibrationMode, calibrationModeOn, nullptr);
+    state.setPropertyExcludingListener(this, LumatoneEditorProperty::InCalibrationMode, calibrationModeOn, nullptr);
+}
+
+void LumatoneEditorState::setDeveloperMode(bool developerModeOn)
+{
+    inDeveloperMode = developerModeOn;
+    // writeBoolProperty(LumatoneEditorProperty::DeveloperModeOn, inDeveloperMode, undoManager);
+    state.setPropertyExcludingListener(this, LumatoneEditorProperty::DeveloperModeOn, inDeveloperMode, undoManager);
+}
+
+bool LumatoneEditorState::sendSysExToDevice() const
+{
+    return LumatoneApplicationState::sendSysExToDevice() && editorMode == EditorMode::ONLINE;
+}
+
+juce::ValueTree LumatoneEditorState::loadStateProperties(juce::ValueTree stateIn)
+{
+    juce::ValueTree newState = (stateIn.hasType(LumatoneEditorProperty::StateTree))
+                             ? stateIn
+                             : juce::ValueTree(LumatoneEditorProperty::StateTree);
+
+    // TODO load editor properties
+
+    // DBG("LumatoneApplicationState::loadStateProperties:\n" + newState.toXmlString());
+    for (auto property : getLumatoneApplicationProperties())
+    {
+        if (newState.hasProperty(property))
+            handleStatePropertyChange(newState, property);
+    }
+
+    LumatoneState::loadStateProperties(newState);
+
+    return newState;
+}
+
+void LumatoneEditorState::handleStatePropertyChange(juce::ValueTree stateIn, const juce::Identifier &property)
+{
+    if (property == LumatoneEditorProperty::HasChangesToSave)
+    {
+        hasChangesToSave = (bool)stateIn[property];
+    }
+    else if (property == LumatoneEditorProperty::HasChangesToSend)
+    {
+        hasChangesToSend = (bool)stateIn[property];
+    }
+    else if (property == LumatoneEditorProperty::InCalibrationMode)
+    {
+        inCalibrationMode =  (bool)stateIn[property];
+    }
+    else if (property == LumatoneEditorProperty::FirmwareUpdatePerformed)
+    {
+        firmwareUpdateWasPerformed = (bool)stateIn[property];
+    }
+    else if (property == LumatoneEditorProperty::ColourPalettes)
+    {
+
+    }
+    else if (property == LumatoneEditorProperty::RecentFiles)
+    {
+
+    }
+    else if (property == LumatoneEditorProperty::UserDocumentsDirectory)
+    {
+
+    }
+    else if (property == LumatoneEditorProperty::UserMappingsDirectory)
+    {
+
+    }
+    else if (property == LumatoneEditorProperty::UserPalettesDirectory)
+    {
+
+    }
+    else if (property == LumatoneEditorProperty::DeveloperModeOn)
+    {
+
+    }
+    else if (property == LumatoneEditorProperty::EditorMode)
+    {
+
+    }
+    else
+    {
+        LumatoneApplicationState::handleStatePropertyChange(stateIn, property);
+    }
+}
+
+void LumatoneEditorState::setColourPalettes(const juce::Array<LumatoneEditorColourPalette> &palettesIn)
+{
+    colourPalettes = palettesIn;
+}
+
+void LumatoneEditorState::addPalette(const LumatoneEditorColourPalette &newPalette)
+{
+    colourPalettes.add(newPalette);
+}
+
+bool LumatoneEditorState::deletePaletteFile(juce::File pathToPalette)
+{
+	bool success = false;
+
+	if (pathToPalette.existsAsFile())
+	{
+		success = pathToPalette.deleteFile();
+	}
+
+	return success;
+}
+
+// Open a SysEx mapping from the file specified in currentFile
+bool LumatoneEditorState::openFromCurrentFile()
+{
+    if (getCurrentFile().getFullPathName().isEmpty())
+    {
+        // Replace with blank file
+		LumatoneLayout defaultLayout;
+        setCompleteConfig(defaultLayout);
+        return true;
+    }
+
+    if (getCurrentFile().existsAsFile())
+	{
+		// XXX StringArray format: platform-independent?
+		juce::StringArray stringArray;
+		getCurrentFile().readLines(stringArray);
+		LumatoneLayout keyMapping(stringArray);
+
+		// ((MainContentComponent*)(mainWindow->getContentComponent()))->setData(keyMapping);
+
+        // TODO FIX
+		// Window title
+		// updateMainTitle();
+
+		// Send configuration to controller, if connected
+		// controller->sendCurrentCompleteConfig();
+
+        setCompleteConfig(keyMapping);
+		// Mark file as unchanged
+		setHasChangesToSave(false);
+
+		// Clear undo history
+		// undoManager.clearUndoHistory();
+
+		// Add file to recent files list
+		recentFiles.addFile(currentFile);
+
+		return true;
+	}
+
+	// Show error message
+	AlertWindow::showMessageBoxAsync(AlertWindow::AlertIconType::WarningIcon, "Open File Error", "The file " + getCurrentFile().getFullPathName() + " could not be opened.");
+
+	// XXX Update Window title in any case? Make file name empty/make data empty in case of error?
+	return false;
+}
+
+bool LumatoneEditorState::setCurrentFile(File fileToOpen)
+{
+    currentFile = fileToOpen;
+    return openFromCurrentFile();
+}
+
+void LumatoneEditorState::setEditMode(EditorMode editMode)
+{
+    editorMode = editMode;
+    state.setPropertyExcludingListener(this, LumatoneEditorProperty::EditorMode, (int)editorMode, nullptr);
+}
diff --git a/Source/LumatoneEditorState.h b/Source/LumatoneEditorState.h
new file mode 100644
index 00000000..de9db332
--- /dev/null
+++ b/Source/LumatoneEditorState.h
@@ -0,0 +1,143 @@
+/*
+  ==============================================================================
+
+    LumatoneEditorState.h
+    Created: 29 Dec 2023 5:39pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#ifndef LUMATONE_EDITOR_STATE_H
+#define LUMATONE_EDITOR_STATE_H
+
+#include "./lumatone_editor_library/data/application_state.h"
+#include "./lumatone_editor_library/palettes/colour_palette_file.h"
+
+#define CHOOSE_FILE_NOOP [](bool) -> void {}
+
+struct LumatoneEditorFontLibrary;
+class LumatoneEditorLookAndFeel;
+class LumatoneController;
+class LumatoneEditorColourPalette;
+
+class TerpstraSysExApplication;
+
+namespace LumatoneEditorProperty
+{
+    static const juce::Identifier StateTree = juce::Identifier("LumatoneEditorState");
+
+    static const juce::Identifier HasChangesToSave = juce::Identifier("HasChangesToSave");
+    static const juce::Identifier HasChangesToSend = juce::Identifier("HasChangesToSend");
+
+    static const juce::Identifier InCalibrationMode = juce::Identifier("InCalibrationMode");
+    static const juce::Identifier FirmwareUpdatePerformed = juce::Identifier("FirmwareUpdatePerformed");
+
+    static const juce::Identifier ColourPalettes = juce::Identifier("ColourPalettes");
+
+    static const juce::Identifier RecentFiles = juce::Identifier("RecentFiles");
+
+    static const juce::Identifier AutoConnectDevice = juce::Identifier("AutoConnectDevice");
+    static const juce::Identifier CheckDeviceActivity = juce::Identifier("CheckDeviceActivity");
+
+    static const juce::Identifier UserDocumentsDirectory = juce::Identifier("UserDocumentsDirectory");
+    static const juce::Identifier UserMappingsDirectory = juce::Identifier("UserMappingsDirectory");
+    static const juce::Identifier UserPalettesDirectory = juce::Identifier("UserPalettesDirectory");
+
+    static const juce::Identifier DeveloperModeOn = juce::Identifier("DeveloperModeOn");
+
+    static const juce::Identifier MainWindowState = juce::Identifier("MainWindowState");
+    static const juce::Identifier EditorMode = juce::Identifier("EditorMode");
+}
+
+enum class EditorMode
+{
+    OFFLINE,
+    ONLINE
+};
+
+static juce::Array<juce::Identifier> GetLumatoneEditorProperties();
+
+class LumatoneEditorState : public LumatoneApplicationState
+{
+public:
+
+    LumatoneEditorState(juce::String name,  LumatoneFirmwareDriver& driverIn, juce::UndoManager* undoManagerIn);
+    LumatoneEditorState(juce::String name, const LumatoneEditorState& stateIn);
+
+    ~LumatoneEditorState() override;
+
+    const juce::String getApplicationName() const { return ProjectInfo::projectName; }
+	const juce::String getApplicationVersion() const { return ProjectInfo::versionString; }
+
+    bool getHasChangesToSave() const { return hasChangesToSave; }
+    bool getInCalibrationMode() const { return inCalibrationMode; }
+    bool firmwareUpdateCompleted() const { return firmwareUpdateWasPerformed; }
+    bool getInDeveloperMode() const { return inDeveloperMode; }
+
+    EditorMode getEditorMode() const { return editorMode; }
+
+    LumatoneEditorLookAndFeel& getEditorLookAndFeel() { return *lookAndFeel; }
+
+    const juce::Array<LumatoneEditorColourPalette>& getColourPalettes() { return colourPalettes; }
+
+    const LumatoneEditorFontLibrary& getAppFonts() const { return *appFonts; }
+
+    juce::var getProperty(juce::Identifier propertyId) const;
+
+    // juce::PropertiesFile& getPropertiesFile() { return *propertiesFile; }
+    juce::File getCurrentFile() const { return currentFile; }
+
+    juce::RecentlyOpenedFilesList getRecentFiles() const;
+    juce::File getUserDocumentsDirectory() const;
+    juce::File getUserMappingsDirectory() const;
+    juce::File getUserPalettesDirectory() const;
+
+    // RecentlyOpenedFilesList& getRecentFileList() { return *recentFiles; }
+	// Font getAppFont(LumatoneEditorFont fontIdIn, float height = 12.0f) { return appFonts.getFont(fontIdIn, height); }
+
+public:
+
+    bool sendSysExToDevice() const override;
+
+protected:
+    juce::ValueTree loadStateProperties(juce::ValueTree stateIn) override;
+    void handleStatePropertyChange(juce::ValueTree stateIn, const juce::Identifier& property) override;
+
+// Only main app should access these
+private:
+    void setColourPalettes(const juce::Array<LumatoneEditorColourPalette>& palettesIn);
+    void addPalette(const LumatoneEditorColourPalette& newPalette);
+	bool deletePaletteFile(juce::File pathToPalette);
+
+	bool openFromCurrentFile();
+    bool setCurrentFile(juce::File fileToOpen);
+
+    void setEditMode(EditorMode editMode);
+
+    void setHasChangesToSave(bool hasChangesToSave);
+    void setCalibrationMode(bool calibrationModeOn);
+    void setDeveloperMode(bool developerModeOn);
+
+private:
+    bool hasChangesToSave = false;
+    bool hasChangesToSend = false;
+	bool inCalibrationMode = false;
+    bool inDeveloperMode = false;
+	bool firmwareUpdateWasPerformed = false;
+
+    EditorMode editorMode = EditorMode::OFFLINE;
+
+    std::shared_ptr<LumatoneEditorFontLibrary>      appFonts;
+	std::shared_ptr<LumatoneEditorLookAndFeel>      lookAndFeel;
+	juce::Array<LumatoneEditorColourPalette>        colourPalettes;
+
+	juce::File                      currentFile;
+	juce::RecentlyOpenedFilesList	recentFiles;
+
+    std::shared_ptr<juce::PropertiesFile>   propertiesFile;
+
+    friend class TerpstraSysExApplication;
+};
+
+#endif LUMATONE_EDITOR_STATE_H
diff --git a/Source/LumatoneEditorStyleCommon.h b/Source/LumatoneEditorStyleCommon.h
index 8a92a09e..bdefd270 100644
--- a/Source/LumatoneEditorStyleCommon.h
+++ b/Source/LumatoneEditorStyleCommon.h
@@ -12,7 +12,7 @@
 
 #pragma once
 #include <JuceHeader.h>
-#include "lumatone_assets.h"
+#include "./lumatone_editor_library/graphics/lumatone_assets.h"
 
 //==================================================================
 //
diff --git a/Source/LumatoneFirmwareDefinitions.h b/Source/LumatoneFirmwareDefinitions.h
deleted file mode 100644
index 0c354797..00000000
--- a/Source/LumatoneFirmwareDefinitions.h
+++ /dev/null
@@ -1,575 +0,0 @@
-/*
-  ==============================================================================
-
-    LumatoneFirmwareDefinitions.h
-    Created: 17 Apr 2021 10:19:39pm
-    Author:  Vincenzo
-
-  ==============================================================================
-*/
-
-#pragma once
-#include <JuceHeader.h>
-
-/*
-==============================================================================
-System exclusive board definitions
-==============================================================================
-*/
-
-#define BOARD_SERVER 0x0
-#define BOARD_OCT_1  0x1
-#define BOARD_OCT_2  0x2
-#define BOARD_OCT_3  0x3
-#define BOARD_OCT_4  0x4
-#define BOARD_OCT_5  0x5
-
-/*
-==============================================================================
-System exclusive command structure
-==============================================================================
-*/
-
-#define MANUFACTURER_ID_0 0x00
-#define MANUFACTURER_ID_1 0x21
-#define MANUFACTURER_ID_2 0x50
-
-#define MANU_0       0x0
-#define MANU_1       0x1
-#define MANU_2       0x2
-#define BOARD_IND    0x3
-#define CMD_ID       0x4
-#define MSG_STATUS   0x5
-#define CALIB_MODE   0x5
-#define PAYLOAD_INIT 0x6
-
-#define ECHO_FLAG    0x5  // Used to differentiate test responses from MIDI feedback
-#define TEST_ECHO    0x7F // Should not be returned by Lumatone firmware
-
-#define SERIAL_55_KEYS "00 00 00 00 00 00"
-
-/*
-==============================================================================
-System exclusive command bytes
-==============================================================================
-*/
-
-// Start support at 55-keys firmware version, Developmental versions
-#define CHANGE_KEY_NOTE 0x00
-#define SET_KEY_COLOUR 0x01
-
-#define SAVE_PROGRAM 0x02
-
-#define SET_FOOT_CONTROLLER_SENSITIVITY 0x03
-#define INVERT_FOOT_CONTROLLER 0x04
-
-#define MACROBUTTON_COLOUR_ON 0x05
-#define MACROBUTTON_COLOUR_OFF 0x06
-
-#define SET_LIGHT_ON_KEYSTROKES 0x07
-
-#define SET_VELOCITY_CONFIG 0x08
-#define SAVE_VELOCITY_CONFIG 0x09
-#define RESET_VELOCITY_CONFIG 0x0A
-
-#define SET_FADER_CONFIG 0x0B
-#define SAVE_FADER_CONFIG 0x0C
-#define RESET_FADER_CONFIG 0x0D
-
-#define SET_AFTERTOUCH_FLAG 0x0E
-#define CALIBRATE_AFTERTOUCH 0x0F
-#define SET_AFTERTOUCH_CONFIG 0x10
-#define SAVE_AFTERTOUCH_CONFIG 0x11
-#define RESET_AFTERTOUCH_CONFIG 0x12
-
-#define GET_RED_LED_CONFIG 0x13
-#define GET_GREEN_LED_CONFIG 0x14
-#define GET_BLUE_LED_CONFIG 0x15
-#define GET_CHANNEL_CONFIG 0x16
-#define GET_NOTE_CONFIG 0x17
-#define GET_KEYTYPE_CONFIG 0x18
-
-#define GET_MAX_THRESHOLD 0x19
-#define GET_MIN_THRESHOLD 0x1A
-#define GET_AFTERTOUCH_MAX 0x1B
-#define GET_KEY_VALIDITY 0x1C
-
-#define GET_VELOCITY_CONFIG 0x1D
-#define GET_FADER_CONFIG 0x1E
-#define GET_AFTERTOUCH_CONFIG 0x1F
-
-// Firmware Version 1.0.3
-#define SET_VELOCITY_INTERVALS 0x20
-#define GET_VELOCITY_INTERVALS 0x21
-
-// Firmware Version 1.0.4
-#define GET_FADER_TYPE_CONFIGURATION 0x22
-
-// Start 56-keys, Firmware Version 1.0.5
-#define GET_SERIAL_IDENTITY 0x23
-// 0x23 will acknowledge in 55-keys but will not return serial number
-
-#define CALIBRATE_KEYS 0x24
-
-#define DEMO_MODE 0x25
-
-// Firmware Version 1.0.6
-#define CALIBRATE_PITCH_MOD_WHEEL 0x26
-#define SET_MOD_WHEEL_SENSITIVITY 0x27
-#define SET_PITCH_WHEEL_SENSITIVITY 0x28
-
-// Firmware Version 1.0.7, Start shipping backers and batches
-#define SET_KEY_MAX_THRESHOLD 0x29
-#define SET_KEY_MIN_THRESHOLD 0x2A
-#define SET_KEY_FADER_SENSITIVITY 0x2B
-#define SET_KEY_AFTERTOUCH_SENSITIVITY 0x2C
-
-#define SET_LUMATOUCH_CONFIG 0x2D
-#define SAVE_LUMATOUCH_CONFIG 0x2E
-#define RESET_LUMATOUCH_CONFIG 0x2F
-#define GET_LUMATOUCH_CONFIG 0x30
-
-// Firmware Version 1.0.8
-#define GET_FIRMWARE_REVISION 0x31
-
-// Firmware Version 1.0.9
-#define SET_CC_ACTIVE_THRESHOLD 0x32
-#define LUMA_PING 0x33
-
-// Firmware Version 1.0.10
-#define RESET_BOARD_THRESHOLDS 0x34
-#define SET_KEY_SAMPLING 0x35
-
-// Firmware Version 1.0.11
-#define RESET_WHEELS_THRESHOLD 0x36
-#define SET_PITCH_WHEEL_CENTER_THRESHOLD 0x37
-#define CALLIBRATE_EXPRESSION_PEDAL 0x38
-#define RESET_EXPRESSION_PEDAL_BOUNDS 0x39
-
-// Firmware Version 1.0.12 / 1.1.0
-#define GET_BOARD_THRESHOLD_VALUES 0x3A
-#define GET_BOARD_SENSITIVITY_VALUES 0x3B
-
-#define SET_PERIPHERAL_CHANNELS 0x3C
-#define GET_PERIPHERAL_CHANNELS 0x3D
-#define PERIPHERAL_CALBRATION_DATA 0x3E
-
-#define SET_AFTERTOUCH_TRIGGER_DELAY 0x3F
-#define GET_AFTERTOUCH_TRIGGER_DELAY 0x40
-
-#define SET_LUMATOUCH_NOTE_OFF_DELAY 0x41
-#define GET_LUMATOUCH_NOTE_OFF_DELAY 0x42
-#define SET_EXPRESSION_PEDAL_THRESHOLD 0x43
-#define GET_EXPRESSION_PEDAL_THRESHOLD 0x44
-#define INVERT_SUSTAIN_PEDAL 0x45
-#define RESET_DEFAULT_PRESETS 0x46
-#define GET_PRESET_FLAGS 0x47
-#define GET_EXPRESSION_PEDAL_SENSITIVIY 0x48
-
-#define GET_MACRO_LIGHT_INTENSITY 0x49
-#define RESET_MACRO_LIGHT_INTENSITY 0x4A
-
-#define RESET_BOARD_KEYS 0x4B
-#define RESET_AFTERTOUCH_TRIGGER_DELAY 0x4C
-
-#define RESET_LUMATOUCH_NOTE_OFF_DELAY 0x4D
-#define GET_PITCH_AND_MOD_BOUNDS 0x4E
-#define GET_EXPRESSION_PEDAL_BOUNDS 0x4F
-
-typedef enum
-{
-	NACK    = 0x00, // Not recognized
-	ACK     = 0x01, // Acknowledged, OK
-	BUSY    = 0x02, // Controller busy
-	ERROR   = 0x03, // Error
-	STATE   = 0x04, // Not in MIDI state
-} TerpstraMIDIAnswerReturnCode;
-
-typedef enum
-{
-    disabledDefault      = 0,
-	noteOnNoteOff        = 1,
-	continuousController = 2,
-	lumaTouch            = 3,
-	disabled             = 4
-} LumatoneKeyType;
-
-typedef enum
-{
-	ExpressionPedal = 0,
-	PitchAndModWheels
-} PeripheralCalibrationDataMode;
-
-enum class LumatoneFirmwareVersion
-{
-	NO_VERSION      = 0,  // Used for instantiation
-	VERSION_55_KEYS = 0,  // Used when GetSerialIdentity returns 00000000
-	UNKNOWN_VERSION = 0,  // Used when no other version applies
-	VERSION_1_0_3 = 0x10,
-	VERSION_1_0_4,
-	VERSION_1_0_5,
-	VERSION_1_0_6,
-	VERSION_1_0_7,
-	VERSION_1_0_8,
-	VERSION_1_0_9,
-	VERSION_1_0_10,
-	VERSION_1_0_11,
-	VERSION_1_0_12,
-    VERSION_1_1_0 = VERSION_1_0_12,
-    VERSION_1_2_0,
-	LAST_VERSION = VERSION_1_2_0,
-	FUTURE_VERSION = 0xFFFF  // Used when version is nonnegative and below 9.9.999
-} ;
-
-struct FirmwareVersion
-{
-	int major = 0;
-	int minor = 0;
-	int revision = 0;
-
-	FirmwareVersion(int majorVersion, int minorVersion, int revisionNumber)
-		: major(majorVersion), minor(minorVersion), revision(revisionNumber) {}
-
-	bool isValid() { return major > 0 || minor > 0 || revision > 0; }
-
-	String toString() const { return String(major) + "." + String(minor) + "." + String(revision); }
-
-	String toDisplayString() const
-	{
-		String str = String(major) + "." + String(minor);
-		if (revision > 0)
-			str += ("." + String(revision));
-
-		return str;
-	}
-
-	//============================================================================
-
-	static FirmwareVersion fromString(String firmwareVersion)
-	{
-		FirmwareVersion version(0, 0, 0);
-
-		String afterFirstDecimal = firmwareVersion.fromFirstOccurrenceOf(".", false, true);
-
-		// Just check if it contains at least two decimals
-		if (firmwareVersion.contains(".") && afterFirstDecimal.contains("."))
-		{
-			String majorNum = firmwareVersion.upToFirstOccurrenceOf(".", false, true);
-
-			String minorNum = afterFirstDecimal.upToFirstOccurrenceOf(".", false, true);
-
-			if (minorNum == afterFirstDecimal)
-			{
-				// This means there was only one decimal, don't try to parse
-				return version;
-			}
-
-			String revisionNum = firmwareVersion.fromLastOccurrenceOf(".", false, true);
-			if (revisionNum != revisionNum.upToFirstOccurrenceOf(".", false, true))
-			{
-				// This means there's an additional decimal, don't try to parse
-				return version;
-			}
-
-			version.major = majorNum.getIntValue();
-			version.minor = majorNum.getIntValue();
-			version.revision = majorNum.getIntValue();
-		}
-
-		return version;
-	}
-
-	static FirmwareVersion fromDeterminedVersion(LumatoneFirmwareVersion versionIn)
-	{
-		int versionIndex = (int)versionIn;
-		if (versionIn >= LumatoneFirmwareVersion::VERSION_1_0_3)
-		{
-			// Return special definition for future version
-			if (versionIn > LumatoneFirmwareVersion::LAST_VERSION)
-				return FirmwareVersion(0, 0, (int)LumatoneFirmwareVersion::FUTURE_VERSION);
-			else
-				return FirmwareVersion(1, 0, versionIndex - (int)LumatoneFirmwareVersion::VERSION_1_0_3);
-		}
-		// Return special definition for 55-keys version
-		else if (versionIn == LumatoneFirmwareVersion::VERSION_55_KEYS)
-			return FirmwareVersion(0, 0, 55);
-
-		return FirmwareVersion(0, 0, 0);
-	}
-};
-
-struct FirmwareSupport
-{
-	enum class Error
-	{
-		noError = 0,
-		noMidiOutputSet,
-		deviceIsBusy,
-		messageTooShort,
-		messageTooLong,
-        messageIsAnEcho,
-		messageHasIncorrectManufacturerId,
-		messageHasInvalidBoardIndex,
-		messageHasInvalidStatusByte,
-		messageIsNotResponseToCommand,
-		messageIsNotSysEx,
-		unknownCommand,
-		externalError,
-        commandNotImplemented
-	};
-
-	String errorToString(Error err)
-	{
-		switch (err)
-		{
-		case Error::noError:
-			return "No error";
-		case Error::noMidiOutputSet:
-			return "No Midi output set";
-		case Error::deviceIsBusy:
-			return "Device is busy";
-		case Error::messageTooShort:
-            return "Message too short";
-		case Error::messageTooLong:
-            return "Message too long";
-        case Error::messageIsAnEcho:
-            return "Message is an echo";
-		case Error::messageHasIncorrectManufacturerId:
-			return "Incorrect manufacturer ID";
-		case Error::messageHasInvalidBoardIndex:
-			return "Invalid board index";
-		case Error::messageHasInvalidStatusByte:
-			return "Message has invalid status byte";
-		case Error::messageIsNotResponseToCommand:
-			return "Message is not a response to the command";
-		case Error::messageIsNotSysEx:
-			return "Message is not a valid SysEx message.";
-		case Error::unknownCommand:
-			return "Unknown command / Not Acknowledged";
-		case Error::externalError:
-			return "Error from device";
-        case Error::commandNotImplemented:
-            return "Command handling not implemented";
-		default:
-			return "Undefined error..";
-		}
-	}
-
-	LumatoneFirmwareVersion getLumatoneFirmwareVersion(FirmwareVersion versionIn)
-	{
-		if (!(versionIn.major | versionIn.minor | versionIn.revision))
-			return LumatoneFirmwareVersion::VERSION_55_KEYS;
-
-		else if ((versionIn.major < 0) | (versionIn.minor < 0) | (versionIn.revision < 0))
-			return LumatoneFirmwareVersion::UNKNOWN_VERSION;
-
-        // MAJOR: 1
-		else if (versionIn.major == 1)
-		{
-            // MINOR: 0
-			if (versionIn.minor == 0)
-			{
-				if (versionIn.revision < 3)
-					return LumatoneFirmwareVersion::VERSION_55_KEYS;
-
-                // Computing is probably not the best thing to do but edge cases are extremely unlikely here
-				else if (versionIn.revision - 3 > (int)LumatoneFirmwareVersion::LAST_VERSION - (int)LumatoneFirmwareVersion::VERSION_1_0_3)
-					return LumatoneFirmwareVersion::FUTURE_VERSION;
-
-				else if (versionIn.revision >= 3)
-					return (LumatoneFirmwareVersion)((int)LumatoneFirmwareVersion::VERSION_1_0_3 + (versionIn.revision - 3));
-			}
-
-            // MINOR: 1
-            else if (versionIn.minor == 1)
-            {
-                if (versionIn.revision == 0)
-                    return LumatoneFirmwareVersion::VERSION_1_1_0;
-            }
-
-            else if (versionIn.minor == 2)
-            {
-                if (versionIn.revision == 0)
-                    return LumatoneFirmwareVersion::VERSION_1_2_0;
-            }
-
-            return LumatoneFirmwareVersion::FUTURE_VERSION;
-		}
-
-        // Unsure if this is needed, or if returning FUTURE_VERSION without a condition is better
-		else if (versionIn.major < 9 && versionIn.minor < 9 && versionIn.revision < 999)
-			return LumatoneFirmwareVersion::FUTURE_VERSION;
-
-		return LumatoneFirmwareVersion::UNKNOWN_VERSION;
-	}
-
-	// TODO use map instead
-	// Returns the lowest version that will return ACK for a given command
-	LumatoneFirmwareVersion getLowestVersionAcknowledged(unsigned int CMD)
-	{
-		if (CMD < CHANGE_KEY_NOTE) // 0x00
-			return LumatoneFirmwareVersion::UNKNOWN_VERSION;
-
-		else if (CMD <= GET_SERIAL_IDENTITY) // 0x23
-			return LumatoneFirmwareVersion::NO_VERSION;
-
-		else if (CMD <= DEMO_MODE) // 0x25
-			return LumatoneFirmwareVersion::VERSION_1_0_5;
-
-		else if (CMD <= CALIBRATE_PITCH_MOD_WHEEL) // 0x26
-			return LumatoneFirmwareVersion::VERSION_1_0_6;
-
-		else if (CMD <= SET_KEY_MAX_THRESHOLD) // 0x29
-			return LumatoneFirmwareVersion::VERSION_1_0_7;
-
-		else if (CMD <= GET_FIRMWARE_REVISION) // 0x31
-			return LumatoneFirmwareVersion::VERSION_1_0_8;
-
-		else if (CMD <= LUMA_PING) // 0x33
-			return LumatoneFirmwareVersion::VERSION_1_0_9;
-
-		else if (CMD <= SET_KEY_SAMPLING) // 0x35
-			return LumatoneFirmwareVersion::VERSION_1_0_10;
-
-		else if (CMD <= RESET_EXPRESSION_PEDAL_BOUNDS) // 0x39
-			return LumatoneFirmwareVersion::VERSION_1_0_11;
-
-		else if (CMD <= GET_EXPRESSION_PEDAL_BOUNDS) // 0x4F
-			return LumatoneFirmwareVersion::VERSION_1_1_0;
-
-		else
-			return LumatoneFirmwareVersion::FUTURE_VERSION;
-	}
-
-	bool versionAcknowledgesCommand(LumatoneFirmwareVersion VERSION, unsigned int CMD)
-	{
-		return getLowestVersionAcknowledged(CMD) <= VERSION;
-	}
-
-	bool versionAcknowledgesCommand(FirmwareVersion versionIn, unsigned int CMD)
-	{
-		auto VERSION = getLumatoneFirmwareVersion(versionIn);
-		return versionAcknowledgesCommand(VERSION, CMD);
-	}
-
-	// Should always be 56 in production
-	int getOctaveSize(LumatoneFirmwareVersion VERSION)
-	{
-		if (VERSION >= LumatoneFirmwareVersion::VERSION_1_0_3)
-			return 56;
-		else
-			return 55;
-	}
-
-	int getCommandNumber(const MidiMessage& msg)
-	{
-		return msg.getSysExData()[CMD_ID];
-	}
-
-    String serialIdentityToString(int* serialBytes)
-    {
-        return String::toHexString(serialBytes, 6);
-    }
-
-};
-
-typedef enum
-{
-	PitchWheel = 0,
-	ModWheel,
-	Expression,
-	Sustain
-} PeripheralChannel;
-
-struct PeripheralChannelSettings
-{
-	int pitchWheel = 1;
-	int modWheel = 1;
-	int expressionPedal = 1;
-	int sustainPedal = 1;
-
-	void setChannel(PeripheralChannel controlId, int channelIn)
-	{
-		if (channelIn < 1)
-			channelIn = 1;
-
-		if (channelIn > 16)
-			channelIn = 16;
-
-		switch (controlId)
-		{
-		case PeripheralChannel::PitchWheel:
-			pitchWheel = channelIn;
-			break;
-
-		case PeripheralChannel::ModWheel:
-			modWheel = channelIn;
-			break;
-
-		case PeripheralChannel::Expression:
-			expressionPedal = channelIn;
-			break;
-
-		case PeripheralChannel::Sustain:
-			sustainPedal = channelIn;
-			break;
-		}
-	}
-
-	int getChannel(PeripheralChannel controlId)
-	{
-		switch (controlId)
-		{
-		case PeripheralChannel::PitchWheel:
-			return pitchWheel;
-
-		case PeripheralChannel::ModWheel:
-			return modWheel;
-
-		case PeripheralChannel::Expression:
-			return expressionPedal;
-
-		case PeripheralChannel::Sustain:
-			return sustainPedal;
-		}
-
-		return 0;
-	}
-};
-
-#define ADCSCALAR 2.44140625e-4;
-
-struct WheelsCalibrationData
-{
-	int centerPitch = 0;
-	int minPitch = 0;
-	int maxPitch = 0;
-
-	int minMod = 0;
-	int maxMod = 0;
-
-	float getCentrePitchNorm() const { return centerPitch * ADCSCALAR; }
-	float getMinPitchNorm() const { return minPitch * ADCSCALAR; }
-	float getMaxPitchNorm() const { return maxPitch * ADCSCALAR; }
-	float getMinModNorm() const { return minMod * ADCSCALAR; }
-	float getMaxModNorm() const { return maxMod * ADCSCALAR; }
-
-	String toString() const
-	{
-		String str;
-		str += ("Center Pitch: " + String(centerPitch) + newLine);
-		str += ("   Min Pitch: " + String(minPitch) + newLine);
-		str += ("   Max Pitch: " + String(maxPitch) + newLine);
-		str += ("     Min Mod: " + String(minMod) + newLine);
-		str += ("     Max Mod: " + String(maxMod) + newLine);
-		return str;
-	}
-};
-
-struct PresetFlags
-{
-	bool expressionPedalInverted = false;
-	bool lightsOnKeystroke = false;
-	bool polyphonicAftertouch = false;
-	bool sustainPedalInverted = false;
-};
diff --git a/Source/LumatoneMenu.cpp b/Source/LumatoneMenu.cpp
index 85173e40..13f22221 100644
--- a/Source/LumatoneMenu.cpp
+++ b/Source/LumatoneMenu.cpp
@@ -9,16 +9,16 @@
 */
 
 #include "LumatoneMenu.h"
-#include "Main.h"
+#include "./LumatoneEditorState.h"
 
 namespace Lumatone {
 	namespace Menu {
 
-		MainMenuModel::MainMenuModel(ApplicationCommandManager* commandManager)
+		MainMenuModel::MainMenuModel(const LumatoneEditorState& state, ApplicationCommandManager* commandManager)
+			: LumatoneEditorState("MainMenu", state)
 		{
 			theManager = commandManager;
 			setApplicationCommandManagerToWatch(commandManager);
-
 		}
 
 		StringArray MainMenuModel::getMenuBarNames()
@@ -37,7 +37,7 @@ namespace Lumatone {
 			menu.addSeparator();
 
 			PopupMenu recentFilesMenu;
-			TerpstraSysExApplication::getApp().getRecentFileList().createPopupMenuItems(recentFilesMenu, recentFilesBaseID, true, true);
+			getRecentFiles().createPopupMenuItems(recentFilesMenu, recentFilesBaseID, true, true);
 			menu.addSubMenu("Recent Files", recentFilesMenu);
 
 #if ! JUCE_MAC
@@ -81,7 +81,7 @@ namespace Lumatone {
 			if (menuItemID >= recentFilesBaseID && menuItemID < recentFilesBaseID + 100)
 			{
 				// open a file from the "recent files" menu
-				TerpstraSysExApplication::getApp().openRecentFile(menuItemID - recentFilesBaseID);
+				// TerpstraSysExApplication::getApp().openRecentFile(menuItemID - recentFilesBaseID);
 			}
 		}
 
diff --git a/Source/LumatoneMenu.h b/Source/LumatoneMenu.h
index c51796c2..ab6f117c 100644
--- a/Source/LumatoneMenu.h
+++ b/Source/LumatoneMenu.h
@@ -12,6 +12,7 @@
 
 #include <JuceHeader.h>
 
+#include "LumatoneEditorState.h"
 
 namespace Lumatone {
 	namespace Menu {
@@ -37,10 +38,11 @@ namespace Lumatone {
 			aboutSysEx = 0x200400
 		};
 
-		class MainMenuModel : public MenuBarModel
+		class MainMenuModel : public juce::MenuBarModel
+							, public LumatoneEditorState
 		{
 		public:
-			MainMenuModel(ApplicationCommandManager* commandManager);
+			MainMenuModel(const LumatoneEditorState& stateIn, ApplicationCommandManager* commandManager);
 
 			virtual StringArray getMenuBarNames();
 			PopupMenu getMenuForIndex(int topLevelMenuIndex, const String& menuName);
diff --git a/Source/Main.cpp b/Source/Main.cpp
index d6ec47b6..825dd402 100644
--- a/Source/Main.cpp
+++ b/Source/Main.cpp
@@ -10,6 +10,19 @@
 */
 
 #include "Main.h"
+
+#include "MainWindow.h"
+#include "MainComponent.h"
+
+#include "FirmwareTransfer.h"
+
+#include "LumatoneEditorLookAndFeel.h"
+
+#include "./lumatone_editor_library/device/lumatone_controller.h"
+#include "./lumatone_editor_library/device/activity_monitor.h"
+#include "./lumatone_editor_library/graphics/view_constants.h"
+#include "./lumatone_editor_library/palettes/colour_palette_file.h"
+
 #include "GeneralOptionsDlg.h"
 #include "VelocityCurveDlgBase.h"
 #include "NoteOnOffVelocityCurveDialog.h"
@@ -24,83 +37,24 @@ MainContentComponent* TerpstraSysExApplication::getMainContentComponent() const
 }
 
 TerpstraSysExApplication::TerpstraSysExApplication()
-	: lookAndFeel(appFonts.fonts, true), tooltipWindow(), hasChangesToSave(false)
+	: firmwareDriver(LumatoneFirmwareDriver::HostMode::Driver)
+	, state("LumatoneEditor", firmwareDriver, &undoManager)
 {
-	PropertiesFile::Options options;
-	options.applicationName = "LumatoneSetup";
-	options.filenameSuffix = "settings";
-	options.osxLibrarySubFolder = "Application Support";
-#if JUCE_LINUX
-	options.folderName = "~/.config/LumatoneSetup";
-#else
-	options.folderName = "LumatoneSetup";
-#endif
-	propertiesFile = new PropertiesFile(options);
-	jassert(propertiesFile != nullptr);
-
-	lumatoneController = std::make_unique<LumatoneController>();
+	activityMonitor.reset(new DeviceActivityMonitor(&firmwareDriver, state));
 
 	// Localisation
 	String localisation = getLocalisation(SystemStats::getDisplayLanguage());
 	LocalisedStrings::setCurrentMappings(new LocalisedStrings(localisation, false));
 	LocalisedStrings::getCurrentMappings()->setFallback(new LocalisedStrings(BinaryData::engb_txt, false));
 
-	// Colour scheme
-	//lookAndFeel.setColourScheme(lookAndFeel.getDarkColourScheme());
-
-	//lookAndFeel.setColour(juce::ComboBox::arrowColourId, Colour(0xfff7990d));
-	//lookAndFeel.setColour(juce::ToggleButton::tickColourId, Colour(0xfff7990d));
-
-	lookAndFeel.setColour(TerpstraKeyEdit::backgroundColourId, lookAndFeel.findColour(juce::ResizableWindow::backgroundColourId));
-	lookAndFeel.setColour(TerpstraKeyEdit::outlineColourId, Colour(0xffd7d9da));
-	lookAndFeel.setColour(TerpstraKeyEdit::selectedKeyOutlineId, Colour(0xfff7990d));
-
-	lookAndFeel.setColour(VelocityCurveBeam::beamColourId, Colour(0x66ff5e00));
-	lookAndFeel.setColour(VelocityCurveBeam::outlineColourId, Colour(0xffd7d9da));
-
-	// Recent files list
-	recentFiles.restoreFromString(propertiesFile->getValue("RecentFiles"));
-	recentFiles.removeNonExistentFiles();
-
-	// Save/Load location preferences or default fallback values
-
-	String possibleDirectory = propertiesFile->getValue("UserDocumentsDirectory");
-	if (File::isAbsolutePath(possibleDirectory))
-	{
-		userDocumentsDirectory = File(possibleDirectory);
-	}
-	if (!userDocumentsDirectory.exists() || userDocumentsDirectory.existsAsFile())
-	{
-		userDocumentsDirectory = File::getSpecialLocation(File::userDocumentsDirectory).getChildFile("Lumatone Editor");
-		userDocumentsDirectory.createDirectory();
-	}
-
-	possibleDirectory = propertiesFile->getValue("UserMappingsDirectory");
-	if (File::isAbsolutePath(possibleDirectory))
-	{
-		userMappingsDirectory = File(possibleDirectory);
-	}
-	if (!userMappingsDirectory.exists() || userMappingsDirectory.existsAsFile())
-	{
-		userMappingsDirectory = userDocumentsDirectory.getChildFile("Mappings");
-		userMappingsDirectory.createDirectory();
-	}
-
-	possibleDirectory = propertiesFile->getValue("UserPalettesDirectory");
-	if (File::isAbsolutePath(possibleDirectory))
-	{
-		userPalettesDirectory = File(possibleDirectory);
-	}
-	if (!userPalettesDirectory.exists() || userPalettesDirectory.existsAsFile())
-	{
-		userPalettesDirectory = userDocumentsDirectory.getChildFile("Palettes");
-		userPalettesDirectory.createDirectory();
-	}
-
-	reloadColourPalettes();
-
-	// State of main window will be read from properties file when main window is created
+	 reloadColourPalettes();
 }
+//
+//LumatoneFirmwareDriver& TerpstraSysExApplication::initializeDriver()
+//{
+//	firmwareDriver = new LumatoneFirmwareDriver(LumatoneFirmwareDriver::HostMode::Driver);
+//	return *firmwareDriver;
+//}
 
 //==============================================================================
 void TerpstraSysExApplication::initialise(const String& commandLine)
@@ -119,42 +73,32 @@ void TerpstraSysExApplication::initialise(const String& commandLine)
 			// Try to open a config file
 			if (File::isAbsolutePath(commandLineParameter))
 			{
-				currentFile = File(commandLineParameter);
+				state.currentFile = File(commandLineParameter);
 			}
 			else
 			{
 				// If file name is with quotes, try removing the quotes
 				if (commandLine.startsWithChar('"') && commandLine.endsWithChar('"'))
-					currentFile = File(commandLine.substring(1, commandLine.length() - 1));
+					state.currentFile = File(commandLine.substring(1, commandLine.length() - 1));
+					//state.setCurrentFile(commandLine.substring(1, commandLine.length()-1));
 			}
 
-			if (currentFile.existsAsFile())
+			if (state.getCurrentFile().existsAsFile())
 				break;	// There can only be one file, and the file name is supposed to be the last parameter
 		}
 	}
 
 	commandManager.reset(new ApplicationCommandManager());
 	commandManager->registerAllCommandsForTarget(this);
-    menuModel.reset(new Lumatone::Menu::MainMenuModel(commandManager.get()));
 
 	boundsConstrainer = std::make_unique<ComponentBoundsConstrainer>();
 
-	mainWindow.reset(new MainWindow(boundsConstrainer.get()));
-	mainWindow->addKeyListener(commandManager->getKeyMappings());
-	mainWindow->restoreStateFromPropertiesFile(propertiesFile);
+	mainWindow.reset(new MainWindow(state, commandManager.get()));
+	mainWindow->restoreStateFromPropertiesFile(state.propertiesFile.get());
 
-#if JUCE_MAC
-	MenuBarModel::setMacMainMenu(menuModel.get());
-#else
-	mainWindow->setMenuBar(menuModel.get());
-	mainWindow->getMenuBarComponent()->getProperties().set(LumatoneEditorStyleIDs::popupMenuBackgroundColour,
-		lookAndFeel.findColour(LumatoneEditorColourIDs::MenuBarBackground).toString()
-	);
 
-#endif
-
-	if (currentFile.existsAsFile())
-		openFromCurrentFile();
+	if (state.getCurrentFile().existsAsFile())
+		state.openFromCurrentFile();
 }
 
 void TerpstraSysExApplication::shutdown()
@@ -162,36 +106,31 @@ void TerpstraSysExApplication::shutdown()
 	// Add your application's shutdown code here..
 
 	// Save documents directories (Future: provide option to change them and save after changed by user)
-	propertiesFile->setValue("UserDocumentsDirectory", userDocumentsDirectory.getFullPathName());
-	propertiesFile->setValue("UserMappingsDirectory", userMappingsDirectory.getFullPathName());
-	propertiesFile->setValue("UserPalettesDirectory", userPalettesDirectory.getFullPathName());
+	state.propertiesFile->setValue("UserDocumentsDirectory", state.getUserDocumentsDirectory().getFullPathName());
+	state.propertiesFile->setValue("UserMappingsDirectory", state.getUserMappingsDirectory().getFullPathName());
+	state.propertiesFile->setValue("UserPalettesDirectory", state.getUserPalettesDirectory().getFullPathName());
 
 	// Save recent files list
-	recentFiles.removeNonExistentFiles();
-	jassert(propertiesFile != nullptr);
-	propertiesFile->setValue("RecentFiles", recentFiles.toString());
+	state.recentFiles.removeNonExistentFiles();
+	jassert(state.propertiesFile != nullptr);
+	state.propertiesFile->setValue("RecentFiles", state.recentFiles.toString());
 
 	// Save state of main window
-	mainWindow->saveStateToPropertiesFile(propertiesFile);
+	mainWindow->saveStateToPropertiesFile(state.propertiesFile.get());
 
-	propertiesFile->saveIfNeeded();
-	delete propertiesFile;
-	propertiesFile = nullptr;
+	state.propertiesFile->saveIfNeeded();
+	state.propertiesFile = nullptr;
 
 	LocalisedStrings::setCurrentMappings(nullptr);
 
-#if JUCE_MAC
-    MenuBarModel::setMacMainMenu(nullptr);
-#else
-	mainWindow->setMenuBarComponent(nullptr);
-#endif
-    menuModel = nullptr;
-
-    mainWindow = nullptr; // (deletes our window)
+    mainWindow = nullptr;
 
-	if (firmwareUpdateWasPerformed)
+	if (state.firmwareUpdateCompleted())
 		FirmwareTransfer::exitLibSsh2();
 
+	activityMonitor = nullptr;
+	//delete firmwareDriver;
+
 //	commandManager = nullptr;
 }
 
@@ -202,7 +141,7 @@ void TerpstraSysExApplication::systemRequestedQuit()
 	// request and let the app carry on running, or call quit() to allow the app to close.
 
 	// If there are changes: ask for save
-	if (hasChangesToSave)
+	if (state.getHasChangesToSave())
 	{
 		AlertWindow::showYesNoCancelBox(
 			AlertWindow::AlertIconType::QuestionIcon,
@@ -242,21 +181,6 @@ void TerpstraSysExApplication::anotherInstanceStarted(const String& commandLine)
 	// the other instance's command-line arguments were.
 }
 
-void TerpstraSysExApplication::reloadColourPalettes()
-{
-	auto foundPaletteFiles = userPalettesDirectory.findChildFiles(File::TypesOfFileToFind::findFiles, true, '*' + String(PALETTEFILEEXTENSION));
-
-	colourPalettes.clear();
-
-	auto paletteSorter = LumatoneEditorPaletteSorter();
-	for (auto file : foundPaletteFiles)
-	{
-		LumatoneEditorColourPalette palette = LumatoneEditorColourPalette::loadFromFile(file);
-		colourPalettes.addSorted(paletteSorter, palette);
-	}
-
-}
-
 bool TerpstraSysExApplication::saveColourPalette(LumatoneEditorColourPalette& palette, File pathToFile)
 {
 	bool success = false;
@@ -286,7 +210,7 @@ bool TerpstraSysExApplication::saveColourPalette(LumatoneEditorColourPalette& pa
 			if (palette.getName().isNotEmpty())
                 fileName = palette.getName();
 
-            pathToFile = userPalettesDirectory.getChildFile(fileName);
+            pathToFile = state.getUserPalettesDirectory().getChildFile(fileName);
 
 			// Make sure filename is unique since saving happens automatically
             // Sorry programmers, we're using cardinal numbers here, and the original is implicitly #1 ;)
@@ -294,7 +218,7 @@ bool TerpstraSysExApplication::saveColourPalette(LumatoneEditorColourPalette& pa
 			while (pathToFile.withFileExtension(PALETTEFILEEXTENSION).existsAsFile() && nameId < 999999)
 			{
                 auto fileNameToSave = fileName + "_" + String(++nameId);
-                pathToFile = userPalettesDirectory.getChildFile(fileNameToSave);
+                pathToFile = state.getUserPalettesDirectory().getChildFile(fileNameToSave);
 			}
 		}
 
@@ -303,22 +227,27 @@ bool TerpstraSysExApplication::saveColourPalette(LumatoneEditorColourPalette& pa
 		// TODO error handling?
 	}
 
-	if (success)
-		reloadColourPalettes();
+	// if (success)
+		// reloadColourPalettes();
 
 	return success;
 }
 
-bool TerpstraSysExApplication::deletePaletteFile(File pathToPalette)
+void TerpstraSysExApplication::reloadColourPalettes()
 {
-	bool success = false;
+    auto directory = state.getUserPalettesDirectory();
+	auto foundPaletteFiles = directory.findChildFiles(juce::File::TypesOfFileToFind::findFiles, true, '*' + juce::String(PALETTEFILEEXTENSION));
+
+	juce::Array<LumatoneEditorColourPalette> newPalettes;
 
-	if (pathToPalette.existsAsFile())
+	auto paletteSorter = LumatoneEditorPaletteSorter();
+	for (auto file : foundPaletteFiles)
 	{
-		success = pathToPalette.deleteFile();
+		LumatoneEditorColourPalette palette = LumatoneEditorColourPalette::loadFromFile(file);
+		newPalettes.addSorted(paletteSorter, palette);
 	}
 
-	return success;
+	state.setColourPalettes(newPalettes);
 }
 
 void TerpstraSysExApplication::getAllCommands(Array <CommandID>& commands)
@@ -487,13 +416,12 @@ bool TerpstraSysExApplication::perform(const InvocationInfo& info)
 
 bool TerpstraSysExApplication::openSysExMapping()
 {
-	fileChooser = std::make_unique<FileChooser>("Open a Lumatone key mapping", recentFiles.getFile(0).getParentDirectory(), "*.ltn;*.tsx");
+	fileChooser = std::make_unique<FileChooser>("Open a Lumatone key mapping", state.recentFiles.getFile(0).getParentDirectory(), "*.ltn;*.tsx");
 	fileChooser->launchAsync(FileBrowserComponent::FileChooserFlags::canSelectFiles | FileBrowserComponent::FileChooserFlags::openMode,
 		[&](const FileChooser& chooser)
 		{
-			currentFile = chooser.getResult();
-			// if (currentFile.)
-			openFromCurrentFile();
+			state.currentFile = chooser.getResult();
+			state.openFromCurrentFile();
 		});
 
 	return true;
@@ -501,7 +429,7 @@ bool TerpstraSysExApplication::openSysExMapping()
 
 bool TerpstraSysExApplication::saveSysExMapping(std::function<void(bool success)> saveFileCallback)
 {
-	if (currentFile.getFileName().isEmpty())
+	if (state.getCurrentFile().getFileName().isEmpty())
 		return saveSysExMappingAs(saveFileCallback);
 	else
 		return saveCurrentFile(saveFileCallback);
@@ -510,11 +438,11 @@ bool TerpstraSysExApplication::saveSysExMapping(std::function<void(bool success)
 
 bool TerpstraSysExApplication::saveSysExMappingAs(std::function<void(bool)> saveFileCallback)
 {
-	fileChooser = std::make_unique<FileChooser>("Lumatone Key Mapping Files", recentFiles.getFile(0).getParentDirectory(), "*.ltn");
+	fileChooser = std::make_unique<FileChooser>("Lumatone Key Mapping Files", state.recentFiles.getFile(0).getParentDirectory(), "*.ltn");
 	fileChooser->launchAsync(FileBrowserComponent::FileChooserFlags::saveMode | FileBrowserComponent::FileChooserFlags::warnAboutOverwriting,
 		[this, saveFileCallback](const FileChooser& chooser)
 		{
-			currentFile = chooser.getResult();
+			state.currentFile = chooser.getResult();
 			bool saved = saveCurrentFile();
 			if (saved)
 			{
@@ -530,25 +458,58 @@ bool TerpstraSysExApplication::saveSysExMappingAs(std::function<void(bool)> save
 
 bool TerpstraSysExApplication::resetSysExMapping()
 {
-	// Clear file
-	currentFile = File();
+    // Clear file
+    state.setCurrentFile(juce::File());
 
 	// Clear all edit fields
-	((MainContentComponent*)(mainWindow->getContentComponent()))->deleteAll();
+	// ((MainContentComponent*)(mainWindow->getContentComponent()))->deleteAll();
 
-	setHasChangesToSave(false);
+	//state.setHasChangesToSave(false);
 
 	// Clear undoable actions
 	// ToDo (?)
-	undoManager.clearUndoHistory();
+	// undoManager.clearUndoHistory();
 
 
 	// Window title
-	updateMainTitle();
+	// updateMainTitle();
 
 	return true;
 }
 
+
+// Saves the current mapping to file, specified in state.getCurrentFile().
+bool TerpstraSysExApplication::saveCurrentFile(std::function<void(bool success)> saveFileCallback)
+{
+	if (state.getCurrentFile().existsAsFile())
+		state.getCurrentFile().deleteFile();
+	bool retc = state.getCurrentFile().create();
+	// XXX error handling
+
+    bool appendSuccess = true;
+	StringArray stringArray = state.getMappingData()->toStringArray();
+	for (int i = 0; i < stringArray.size(); i++)
+		appendSuccess = appendSuccess && state.getCurrentFile().appendText(stringArray[i] + "\n");
+
+	state.setHasChangesToSave(!appendSuccess);
+    saveFileCallback(appendSuccess);
+
+	// ToDo undo history?
+
+	// Add file to recent files list - or put it on top of the list
+	state.recentFiles.addFile(state.currentFile);
+
+	return retc;
+}
+
+// open a file from the "recent files" menu
+bool TerpstraSysExApplication::openRecentFile(int recentFileIndex)
+{
+	jassert(recentFileIndex >= 0 && recentFileIndex < state.recentFiles.getNumFiles());
+	state.currentFile = state.recentFiles.getFile(recentFileIndex);
+	return state.openFromCurrentFile();
+}
+
 bool TerpstraSysExApplication::deleteSubBoardData()
 {
 	return performUndoableAction(((MainContentComponent*)(mainWindow->getContentComponent()))->createDeleteCurrentSectionAction());
@@ -595,7 +556,7 @@ bool TerpstraSysExApplication::performUndoableAction(UndoableAction* editAction,
 
 		if (undoManager.perform(editAction))	// UndoManager will check for nullptr and also for disposing of the object
 		{
-			setHasChangesToSave(true);
+			// setHasChangesToSave(true);
 			((MainContentComponent*)(mainWindow->getContentComponent()))->refreshAllFields();
 			return true;
 		}
@@ -608,8 +569,8 @@ bool TerpstraSysExApplication::undo()
 {
 	if (undoManager.undo())
 	{
-		setHasChangesToSave(true);
-		((MainContentComponent*)(mainWindow->getContentComponent()))->refreshAllFields();
+		// setHasChangesToSave(true);
+		// ((MainContentComponent*)(mainWindow->getContentComponent()))->refreshAllFields();
 		return true;
 	}
 	else
@@ -620,227 +581,132 @@ bool TerpstraSysExApplication::redo()
 {
 	if (undoManager.redo())
 	{
-		setHasChangesToSave(true);
-		((MainContentComponent*)(mainWindow->getContentComponent()))->refreshAllFields();
+		// setHasChangesToSave(true);
+		// ((MainContentComponent*)(mainWindow->getContentComponent()))->refreshAllFields();
 		return true;
 	}
 	else
 		return false;
 }
 
-LumatoneColourModel* TerpstraSysExApplication::getColourModel()
-{
-	return &colourModel;
-}
+// LumatoneColourModel* TerpstraSysExApplication::getColourModel()
+// {
+// 	return &colourModel;
+// }
 
 bool TerpstraSysExApplication::toggleDeveloperMode()
 {
-	bool newMode = !propertiesFile->getBoolValue("DeveloperMode");
-	propertiesFile->setValue("DeveloperMode", newMode);
-	return ((MainContentComponent*)(mainWindow->getContentComponent()))->setDeveloperMode(newMode);
-}
-
-void TerpstraSysExApplication::setEditMode(sysExSendingMode editMode)
-{
-    lumatoneController->setSysExSendingMode(editMode);
-}
-
-bool TerpstraSysExApplication::generalOptionsDialog()
-{
-	GeneralOptionsDlg* optionsWindow = new GeneralOptionsDlg();
-	optionsWindow->setLookAndFeel(&lookAndFeel);
-
-	DialogWindow::LaunchOptions launchOptions;
-	launchOptions.content.setOwned(optionsWindow);
-	launchOptions.content->setSize(480, 240);
-
-	launchOptions.dialogTitle = "General options";
-	launchOptions.dialogBackgroundColour = lookAndFeel.findColour(juce::ResizableWindow::backgroundColourId);
-	launchOptions.escapeKeyTriggersCloseButton = true;
-	launchOptions.useNativeTitleBar = false;
-	launchOptions.resizable = true;
-
-	DialogWindow* dw = launchOptions.launchAsync();
-	dw->centreWithSize(480, 240);
-
-	return true;
-}
-
-bool TerpstraSysExApplication::noteOnOffVelocityCurveDialog()
-{
-	NoteOnOffVelocityCurveDialog* velocityCurveWindow = new NoteOnOffVelocityCurveDialog();
-	velocityCurveWindow->setLookAndFeel(&lookAndFeel);
-
-	int dlgWidth = propertiesFile->getIntValue("VelocityCurveWindowWidth", 648);
-	int dlgHeight = propertiesFile->getIntValue("VelocityCurveWindowHeight", 424);
-
-	DialogWindow::LaunchOptions launchOptions;
-	launchOptions.content.setOwned(velocityCurveWindow);
-	launchOptions.content->setSize(dlgWidth, dlgHeight);
-
-	launchOptions.dialogTitle = "Note on/off velocity curve";
-	launchOptions.dialogBackgroundColour = lookAndFeel.findColour(ResizableWindow::backgroundColourId);
-	launchOptions.escapeKeyTriggersCloseButton = true;
-	launchOptions.useNativeTitleBar = false;
-	launchOptions.resizable = true;
-
-	DialogWindow* dw = launchOptions.launchAsync();
-	dw->centreWithSize(dlgWidth, dlgHeight);
-
-	return true;
-}
-
-bool TerpstraSysExApplication::faderVelocityCurveDialog()
-{
-	VelocityCurveDlgBase* velocityCurveWindow = new VelocityCurveDlgBase(LumatoneConfigTable::TableType::fader);
-	velocityCurveWindow->setLookAndFeel(&lookAndFeel);
-
-	int dlgWidth = propertiesFile->getIntValue("FaderVelocityCurveWindowWidth", 648);
-	int dlgHeight = propertiesFile->getIntValue("FaderVelocityCurveWindowHeight", 424);
-
-	DialogWindow::LaunchOptions launchOptions;
-	launchOptions.content.setOwned(velocityCurveWindow);
-	launchOptions.content->setSize(dlgWidth, dlgHeight);
-
-	launchOptions.dialogTitle = "Fader velocity curve";
-	launchOptions.dialogBackgroundColour = lookAndFeel.findColour(ResizableWindow::backgroundColourId);
-	launchOptions.escapeKeyTriggersCloseButton = true;
-	launchOptions.useNativeTitleBar = false;
-	launchOptions.resizable = true;
-
-	DialogWindow* dw = launchOptions.launchAsync();
-	dw->centreWithSize(dlgWidth, dlgHeight);
-
-	return true;
+	state.setDeveloperMode(!state.getInDeveloperMode());
+	return state.getInDeveloperMode();
+	// bool newMode = !propertiesFile->getBoolValue("DeveloperMode");
+	// propertiesFile->setValue("DeveloperMode", newMode);
+	// return ((MainContentComponent*)(mainWindow->getContentComponent()))->state.setDeveloperMode(newMode);
 }
 
-bool TerpstraSysExApplication::aftertouchVelocityCurveDialog()
-{
-	VelocityCurveDlgBase* velocityCurveWindow = new VelocityCurveDlgBase(LumatoneConfigTable::TableType::afterTouch);
-	velocityCurveWindow->setLookAndFeel(&lookAndFeel);
-
-	int dlgWidth = propertiesFile->getIntValue("AftertouchVelocityCurveWindowWidth", 768);
-	int dlgHeight = propertiesFile->getIntValue("AftertouchVelocityCurveWindowHeight", 424);
+// void TerpstraSysExApplication::state.setEditMode(EditorMode editMode)
+// {
+// 	state.setEditMode(editMode);
+//     // lumatoneController->setSysExSendingMode(editMode);
+// }
 
-	DialogWindow::LaunchOptions launchOptions;
-	launchOptions.content.setOwned(velocityCurveWindow);
-	launchOptions.content->setSize(dlgWidth, dlgHeight);
+// bool TerpstraSysExApplication::generalOptionsDialog()
+// {
+// 	GeneralOptionsDlg* optionsWindow = new GeneralOptionsDlg();
+// 	optionsWindow->setLookAndFeel(&lookAndFeel);
 
-	launchOptions.dialogTitle = "Aftertouch parameters";
-	launchOptions.dialogBackgroundColour = lookAndFeel.findColour(ResizableWindow::backgroundColourId);
-	launchOptions.escapeKeyTriggersCloseButton = true;
-	launchOptions.useNativeTitleBar = false;
-	launchOptions.resizable = true;
-
-	DialogWindow* dw = launchOptions.launchAsync();
-	dw->centreWithSize(dlgWidth, dlgHeight);
-
-	return true;
-}
+// 	DialogWindow::LaunchOptions launchOptions;
+// 	launchOptions.content.setOwned(optionsWindow);
+// 	launchOptions.content->setSize(480, 240);
 
-// open a file from the "recent files" menu
-bool TerpstraSysExApplication::openRecentFile(int recentFileIndex)
-{
-	jassert(recentFileIndex >= 0 && recentFileIndex < recentFiles.getNumFiles());
-	currentFile = recentFiles.getFile(recentFileIndex);
-	return openFromCurrentFile();
-}
+// 	launchOptions.dialogTitle = "General options";
+// 	launchOptions.dialogBackgroundColour = lookAndFeel.findColour(juce::ResizableWindow::backgroundColourId);
+// 	launchOptions.escapeKeyTriggersCloseButton = true;
+// 	launchOptions.useNativeTitleBar = false;
+// 	launchOptions.resizable = true;
 
-// Open a SysEx mapping from the file specified in currentFile
-bool TerpstraSysExApplication::openFromCurrentFile()
-{
-	if (currentFile.existsAsFile())
-	{
-		// XXX StringArray format: platform-independent?
-		StringArray stringArray;
-		currentFile.readLines(stringArray);
-		LumatoneLayout keyMapping;
-		keyMapping.fromStringArray(stringArray);
+// 	DialogWindow* dw = launchOptions.launchAsync();
+// 	dw->centreWithSize(480, 240);
 
-		((MainContentComponent*)(mainWindow->getContentComponent()))->setData(keyMapping);
+// 	return true;
+// }
 
-		// Window title
-		updateMainTitle();
+// bool TerpstraSysExApplication::noteOnOffVelocityCurveDialog()
+// {
+// 	NoteOnOffVelocityCurveDialog* velocityCurveWindow = new NoteOnOffVelocityCurveDialog();
+// 	velocityCurveWindow->setLookAndFeel(&lookAndFeel);
 
-		// Send configuration to controller, if connected
-		sendCurrentConfigurationToDevice();
+// 	int dlgWidth = propertiesFile->getIntValue("VelocityCurveWindowWidth", 648);
+// 	int dlgHeight = propertiesFile->getIntValue("VelocityCurveWindowHeight", 424);
 
-		// Mark file as unchanged
-		setHasChangesToSave(false);
+// 	DialogWindow::LaunchOptions launchOptions;
+// 	launchOptions.content.setOwned(velocityCurveWindow);
+// 	launchOptions.content->setSize(dlgWidth, dlgHeight);
 
-		// Clear undo history
-		undoManager.clearUndoHistory();
+// 	launchOptions.dialogTitle = "Note on/off velocity curve";
+// 	launchOptions.dialogBackgroundColour = lookAndFeel.findColour(ResizableWindow::backgroundColourId);
+// 	launchOptions.escapeKeyTriggersCloseButton = true;
+// 	launchOptions.useNativeTitleBar = false;
+// 	launchOptions.resizable = true;
 
-		// Add file to recent files list
-		recentFiles.addFile(currentFile);
+// 	DialogWindow* dw = launchOptions.launchAsync();
+// 	dw->centreWithSize(dlgWidth, dlgHeight);
 
-		return true;
-	}
-	else
-	{
-		// Show error message
-		AlertWindow::showMessageBoxAsync(AlertWindow::AlertIconType::WarningIcon, "Open File Error", "The file " + currentFile.getFullPathName() + " could not be opened.");
+// 	return true;
+// }
 
-		// XXX Update Window title in any case? Make file name empty/make data empty in case of error?
-		return false;
-	}
-}
+// bool TerpstraSysExApplication::faderVelocityCurveDialog()
+// {
+// 	VelocityCurveDlgBase* velocityCurveWindow = new VelocityCurveDlgBase(LumatoneConfigTable::TableType::fader);
+// 	velocityCurveWindow->setLookAndFeel(&lookAndFeel);
 
-bool TerpstraSysExApplication::setCurrentFile(File fileToOpen)
-{
-    currentFile = fileToOpen;
-    return openFromCurrentFile();
-}
+// 	int dlgWidth = propertiesFile->getIntValue("FaderVelocityCurveWindowWidth", 648);
+// 	int dlgHeight = propertiesFile->getIntValue("FaderVelocityCurveWindowHeight", 424);
 
-// Saves the current mapping to file, specified in currentFile.
-bool TerpstraSysExApplication::saveCurrentFile(std::function<void(bool success)> saveFileCallback)
-{
-	if (currentFile.existsAsFile())
-		currentFile.deleteFile();
-	bool retc = currentFile.create();
-	// XXX error handling
+// 	DialogWindow::LaunchOptions launchOptions;
+// 	launchOptions.content.setOwned(velocityCurveWindow);
+// 	launchOptions.content->setSize(dlgWidth, dlgHeight);
 
-	LumatoneLayout keyMapping;
-	((MainContentComponent*)(mainWindow->getContentComponent()))->getData(keyMapping);
+// 	launchOptions.dialogTitle = "Fader velocity curve";
+// 	launchOptions.dialogBackgroundColour = lookAndFeel.findColour(ResizableWindow::backgroundColourId);
+// 	launchOptions.escapeKeyTriggersCloseButton = true;
+// 	launchOptions.useNativeTitleBar = false;
+// 	launchOptions.resizable = true;
 
-    bool appendSuccess = true;
-	StringArray stringArray = keyMapping.toStringArray();
-	for (int i = 0; i < stringArray.size(); i++)
-		appendSuccess = appendSuccess && currentFile.appendText(stringArray[i] + "\n");
+// 	DialogWindow* dw = launchOptions.launchAsync();
+// 	dw->centreWithSize(dlgWidth, dlgHeight);
 
-	setHasChangesToSave(!appendSuccess);
-    saveFileCallback(appendSuccess);
+// 	return true;
+// }
 
-	// ToDo undo history?
+// bool TerpstraSysExApplication::aftertouchVelocityCurveDialog()
+// {
+// 	VelocityCurveDlgBase* velocityCurveWindow = new VelocityCurveDlgBase(LumatoneConfigTable::TableType::afterTouch);
+// 	velocityCurveWindow->setLookAndFeel(&lookAndFeel);
 
-	// Add file to recent files list - or put it on top of the list
-	recentFiles.addFile(currentFile);
+// 	int dlgWidth = propertiesFile->getIntValue("AftertouchVelocityCurveWindowWidth", 768);
+// 	int dlgHeight = propertiesFile->getIntValue("AftertouchVelocityCurveWindowHeight", 424);
 
-	return retc;
-}
+// 	DialogWindow::LaunchOptions launchOptions;
+// 	launchOptions.content.setOwned(velocityCurveWindow);
+// 	launchOptions.content->setSize(dlgWidth, dlgHeight);
 
-void TerpstraSysExApplication::sendCurrentConfigurationToDevice()
-{
-	// MIDI channel, MIDI note, colour and key type config for all keys
-	getLumatoneController()->sendCompleteMapping(mappingData);
+// 	launchOptions.dialogTitle = "Aftertouch parameters";
+// 	launchOptions.dialogBackgroundColour = lookAndFeel.findColour(ResizableWindow::backgroundColourId);
+// 	launchOptions.escapeKeyTriggersCloseButton = true;
+// 	launchOptions.useNativeTitleBar = false;
+// 	launchOptions.resizable = true;
 
-	// General options
-	getLumatoneController()->setAftertouchEnabled(mappingData.afterTouchActive);
-	getLumatoneController()->sendLightOnKeyStrokes(mappingData.lightOnKeyStrokes);
-	getLumatoneController()->sendInvertFootController(mappingData.invertExpression);
-	getLumatoneController()->sendExpressionPedalSensivity(mappingData.expressionControllerSensivity);
-    getLumatoneController()->invertSustainPedal(mappingData.invertSustain);
+// 	DialogWindow* dw = launchOptions.launchAsync();
+// 	dw->centreWithSize(dlgWidth, dlgHeight);
 
-	// Velocity curve config
-	getLumatoneController()->setVelocityIntervalConfig(mappingData.table);
+// 	return true;
+// }
 
-	((MainContentComponent*)(mainWindow->getContentComponent()))->getCurvesArea()->sendConfigToController();
-}
 
 void TerpstraSysExApplication::requestConfigurationFromDevice()
 {
 	// if editing operations were done that have not been saved, give the possibility to save them
-	if (hasChangesToSave)
+	if (state.getHasChangesToSave())
 	{
 		AlertWindow::showYesNoCancelBox(
 			AlertWindow::AlertIconType::QuestionIcon,
@@ -853,7 +719,7 @@ void TerpstraSysExApplication::requestConfigurationFromDevice()
 				{
 					// "Cancel". Do not receive config, go offline
 					DBG("Layout import cancelled");
-                    setEditMode(sysExSendingMode::offlineEditor);
+                    state.setEditMode(EditorMode::OFFLINE);
 					return;
 				}
 				else if (retc == 1)
@@ -871,7 +737,7 @@ void TerpstraSysExApplication::requestConfigurationFromDevice()
 				{
 					// retc == 2: "No" -> no saving, overwrite
 					DBG("Overwriting current edits");
-					setHasChangesToSave(false);
+					// setHasChangesToSave(false);
 					requestConfigurationFromDevice();
 				}
 			})
@@ -880,42 +746,42 @@ void TerpstraSysExApplication::requestConfigurationFromDevice()
 		return;
 	}
 
-	TerpstraSysExApplication::getApp().resetSysExMapping();
+	resetSysExMapping();
 
 	// Request MIDI channel, MIDI note, colour and key type config for all keys
-	getLumatoneController()->sendGetCompleteMappingRequest();
+	state.getLumatoneController()->sendGetCompleteMappingRequest();
 
 	// General options
-	getLumatoneController()->getPresetFlags();
-	getLumatoneController()->getExpressionPedalSensitivity();
+	state.getLumatoneController()->requestPresetFlags();
+	state.getLumatoneController()->requestExpressionPedalSensitivity();
 
 	// Velocity curve config
-	getLumatoneController()->sendVelocityIntervalConfigRequest();
-	getLumatoneController()->sendVelocityConfigRequest();
-	getLumatoneController()->sendFaderConfigRequest();
-	getLumatoneController()->sendAftertouchConfigRequest();
-
+	state.getLumatoneController()->sendVelocityIntervalConfigRequest();
+	state.getLumatoneController()->sendVelocityConfigRequest();
+	state.getLumatoneController()->sendFaderConfigRequest();
+	state.getLumatoneController()->sendAftertouchConfigRequest();
 }
 
 void TerpstraSysExApplication::updateMainTitle()
 {
 	String windowTitle("Lumatone Editor");
-	if (!currentFile.getFileName().isEmpty())
-		windowTitle << " - " << currentFile.getFileName();
-	if (hasChangesToSave)
+
+	if (!state.getCurrentFile().getFileName().isEmpty())
+		windowTitle << " - " << state.getCurrentFile().getFileName();
+	if (state.getHasChangesToSave())
 		windowTitle << "*";
 	mainWindow->setName(windowTitle);
 }
 
-void TerpstraSysExApplication::setHasChangesToSave(bool value)
-{
-	if (value != hasChangesToSave)
-	{
-		hasChangesToSave = value;
-		updateMainTitle();
-	}
-}
-
+// void TerpstraSysExApplication::setHasChangesToSave(bool value)
+// {
+	// if (value != hasCh)
+	// {
+		// hasChangesToSave = value;
+		// updateMainTitle();
+	// }
+// }
+//
 //https://forum.juce.com/t/closing-dialog-windows-on-shutdown/27326/6
 void TerpstraSysExApplication::setOpenDialogWindow(DialogWindow* dialogWindowIn)
 {
@@ -952,10 +818,10 @@ bool TerpstraSysExApplication::aboutTerpstraSysEx()
 	DialogWindow::LaunchOptions options;
 	auto textDisplay = new TextEditor();
 	//textDisplay->setLookAndFeel(&lookAndFeel);
-	lookAndFeel.setupTextEditor(*textDisplay);
+	state.getEditorLookAndFeel().setupTextEditor(*textDisplay);
 	textDisplay->setMultiLine(true, true);
 	textDisplay->setText(m, dontSendNotification);
-	textDisplay->setFont(lookAndFeel.getAppFont(LumatoneEditorFont::FranklinGothic));
+	textDisplay->setFont(state.getAppFonts().getFont(LumatoneEditorFont::FranklinGothic));
 	textDisplay->setReadOnly(true);
 	textDisplay->setCaretVisible(false);
 	options.content.setOwned(textDisplay);
@@ -966,7 +832,7 @@ bool TerpstraSysExApplication::aboutTerpstraSysEx()
 	//resizeLabelWithHeight(label, roundToInt(area.getHeight() * 0.24f));
 
 	options.dialogTitle = "About Lumatone Editor";
-	options.dialogBackgroundColour = lookAndFeel.findColour(LumatoneEditorColourIDs::DarkBackground);
+	options.dialogBackgroundColour = state.getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::DarkBackground);
 
 	options.escapeKeyTriggersCloseButton = true;
 	options.useNativeTitleBar = false;
diff --git a/Source/Main.h b/Source/Main.h
index 45e7236b..569420bf 100644
--- a/Source/Main.h
+++ b/Source/Main.h
@@ -11,27 +11,29 @@
 #pragma once
 
 #include <JuceHeader.h>
-#include "LumatoneMenu.h"
-#include "MainWindow.h"
-#include "LumatoneController.h"
 
-#include "ViewConstants.h"
-#include "LumatoneEditorFonts.h"
-#include "ColourPaletteDataStructure.h"
-#include "LocalisationMap.h"
-#include "FirmwareTransfer.h"
+#include "./lumatone_editor_library/lumatone_midi_driver/lumatone_midi_driver.h"
+
+#include "./LumatoneEditorState.h"
 
-#include "./color/colour_model.h"
+#include "LocalisationMap.h"
 
 #define CHOOSE_FILE_NOOP [](bool) -> void {}
 
+class LumatoneController;
+class MainWindow;
+class MainContentComponent;
+class DeviceActivityMonitor;
+
 //==============================================================================
-class TerpstraSysExApplication : public JUCEApplication
+class TerpstraSysExApplication 	: public JUCEApplication
 {
 public:
 	//==============================================================================
 	TerpstraSysExApplication();
 
+	//LumatoneFirmwareDriver& initializeDriver();
+
 	const String getApplicationName() override		{ return ProjectInfo::projectName; }
 	const String getApplicationVersion() override   { return ProjectInfo::versionString; }
 	bool moreThanOneInstanceAllowed() override      { return true; }
@@ -41,128 +43,74 @@ class TerpstraSysExApplication : public JUCEApplication
 	void systemRequestedQuit() override;
 	void anotherInstanceStarted(const String& commandLine) override;
 
-	static TerpstraSysExApplication& getApp()
-	{
-		TerpstraSysExApplication* const app = dynamic_cast<TerpstraSysExApplication*> (JUCEApplication::getInstance());
-		jassert(app != nullptr);
-		return *app;
-	}
-
-	PropertiesFile* getPropertiesFile() { return propertiesFile; }
-	LumatoneEditorLookAndFeel& getLookAndFeel() { return lookAndFeel; }
-	ComponentBoundsConstrainer* getBoundsConstrainer() { return boundsConstrainer.get(); };
-	RecentlyOpenedFilesList& getRecentFileList() { return recentFiles; }
-	LumatoneController* getLumatoneController() { return lumatoneController.get(); }
-	Array<LumatoneEditorColourPalette>& getColourPalettes() { return colourPalettes; }
-	Font getAppFont(LumatoneEditorFont fontIdIn, float height = 12.0f) { return appFonts.getFont(fontIdIn, height); }
-	int getOctaveBoardSize() const { return lumatoneController->getOctaveBoardSize(); }
-    int getNumBoards() const { return lumatoneController->getNumBoards(); }
-
-	LumatoneFirmwareVersion getLumatoneVersion() const { return lumatoneController->getLumatoneVersion(); }
-	FirmwareVersion getFirmwareVersion() const { return lumatoneController->getFirmwareVersion(); }
-	String getFirmwareVersionStr() const { return lumatoneController->getFirmwareVersion().toDisplayString(); }
-
-	void setFirmwareUpdatePerformed(bool updateWasRun) { firmwareUpdateWasPerformed = true; }
-
-	void reloadColourPalettes();
-	bool saveColourPalette(LumatoneEditorColourPalette& palette, File pathToPalette=File());
-	bool deletePaletteFile(File pathToPalette);
+	// static TerpstraSysExApplication& getApp()
+	// {
+	// 	TerpstraSysExApplication* const app = dynamic_cast<TerpstraSysExApplication*> (JUCEApplication::getInstance());
+	// 	jassert(app != nullptr);
+	// 	return *app;
+	// }
 
 	// Menu functionality
-	Lumatone::Menu::MainMenuModel* getMainMenu() { return menuModel.get(); }
+	//Lumatone::Menu::MainMenuModel* getMainMenu() { return menuModel.get(); }
 	void getAllCommands(Array <CommandID>& commands) override;
 	void getCommandInfo(CommandID commandID, ApplicationCommandInfo& result) override;
 	bool perform(const InvocationInfo& info) override;
 
-
 	bool openSysExMapping();
 	bool saveSysExMapping(std::function<void(bool success)> saveFileCallback = CHOOSE_FILE_NOOP);
 	bool saveSysExMappingAs(std::function<void(bool success)> saveFileCallback = CHOOSE_FILE_NOOP);
 	bool resetSysExMapping();
 
+	bool saveCurrentFile(std::function<void(bool success)> saveFileCallback = CHOOSE_FILE_NOOP);
+    bool openRecentFile(int recentFileIndex);
+
+	bool saveColourPalette(LumatoneEditorColourPalette& palette, juce::File pathToPalette=juce::File());
+	void reloadColourPalettes();
+
 	bool deleteSubBoardData();
 	bool copySubBoardData();
 	bool pasteSubBoardData();
     bool pasteModifiedSubBoardData(CommandID commandID);
     bool canPasteSubBoardData() const;
 
-    void setEditMode(sysExSendingMode editMode);
-
-	void setCalibrationMode(bool calibrationStarted) { inCalibrationMode = calibrationStarted; }
-	bool getInCalibrationMode() const { return inCalibrationMode; }
-
 	bool performUndoableAction(UndoableAction* editAction, bool newTransaction=true);
 	bool undo();
 	bool redo();
 
-	LumatoneLayout* getMappingData() { return &mappingData; }
-	LumatoneColourModel* getColourModel();
-
 	bool toggleDeveloperMode();
 
-	bool generalOptionsDialog();
-	bool noteOnOffVelocityCurveDialog();
-	bool faderVelocityCurveDialog();
-	bool aftertouchVelocityCurveDialog();
-
-	bool openRecentFile(int recentFileIndex);
-	bool openFromCurrentFile();
-    bool setCurrentFile(File fileToOpen);
-	bool saveCurrentFile(std::function<void(bool success)> saveFileCallback = CHOOSE_FILE_NOOP);
+	// bool generalOptionsDialog();
+	// bool noteOnOffVelocityCurveDialog();
+	// bool faderVelocityCurveDialog();
+	// bool aftertouchVelocityCurveDialog();
 
-	void sendCurrentConfigurationToDevice();
+	// void sendCurrentConfigurationToDevice();
 	void requestConfigurationFromDevice();
 
 	void updateMainTitle();
 
-	bool getHasChangesToSave() const { return hasChangesToSave; }
-	void setHasChangesToSave(bool value);
-
-	void setOpenDialogWindow(DialogWindow* dialogWindowIn);
+	void setOpenDialogWindow(juce::DialogWindow* dialogWindowIn);
 
 	bool aboutTerpstraSysEx();
 
-
 	MainContentComponent* getMainContentComponent() const;
 
 private:
-	std::unique_ptr<MainWindow> mainWindow;
-
-	std::unique_ptr<ComponentBoundsConstrainer> boundsConstrainer;
-
-	std::unique_ptr<ApplicationCommandManager> commandManager;
-	std::unique_ptr<Lumatone::Menu::MainMenuModel> menuModel;
-	TooltipWindow				tooltipWindow;
-	bool						hasChangesToSave;
-
-	bool						inCalibrationMode = false;
-
-	juce::UndoManager undoManager;
+	LumatoneFirmwareDriver	firmwareDriver;
+	juce::UndoManager 		undoManager;
 
-	LumatoneEditorFonts			appFonts;
-	LumatoneEditorLookAndFeel	lookAndFeel;
+	LumatoneEditorState		state;
 
-	LumatoneColourModel			colourModel;
+	std::unique_ptr<DeviceActivityMonitor> activityMonitor;
 
-	PropertiesFile*				propertiesFile;
-	File						currentFile;
-	RecentlyOpenedFilesList		recentFiles;
-
-	File						userDocumentsDirectory;
-	File						userMappingsDirectory;
-	File						userPalettesDirectory;
-
-	LumatoneLayout mappingData;
-
-	Array<LumatoneEditorColourPalette> colourPalettes;
-
-	// Make sure an open dialog window is deleted on shutdown
+	std::unique_ptr<ApplicationCommandManager> commandManager;
+	
+	std::unique_ptr<MainWindow> mainWindow;
 	std::unique_ptr<DialogWindow> dialogWindow;
 
-	// Communication with Lumatone
-	std::unique_ptr<LumatoneController> lumatoneController;
+	std::unique_ptr<juce::ComponentBoundsConstrainer> boundsConstrainer;
 
-	std::unique_ptr<juce::FileChooser> fileChooser;
 
-	bool firmwareUpdateWasPerformed = false; // Allows us to deinitialize libssh2 a single time
+	juce::TooltipWindow		tooltipWindow;
+	std::unique_ptr<juce::FileChooser> fileChooser;
 };
diff --git a/Source/MainComponent.cpp b/Source/MainComponent.cpp
index 7425e375..09381d4f 100644
--- a/Source/MainComponent.cpp
+++ b/Source/MainComponent.cpp
@@ -9,56 +9,72 @@
 */
 
 #include "MainComponent.h"
-#include "ViewConstants.h"
-#include "Main.h"
 
-#include "./actions/edit_actions.h"
+#include "LumatoneEditorLookAndFeel.h"
+
+#include "LumatoneMenu.h"
+
+#include "MidiEditArea.h"
+#include "NoteEditArea.h"
+#include "IsomorphicMassAssign.h"
+
+#include "GeneralOptionsDlg.h"
+#include "CurvesArea.h"
+#include "GlobalSettingsArea.h"
+#include "PedalSensitivityDlg.h"
+
+#include "./lumatone_editor_library/palettes/colour_palette_window.h"
+#include "./lumatone_editor_library/palettes/colour_edit_textbox.h"
+#include "./lumatone_editor_library/ui/keyboard_component.h"
+#include "./lumatone_editor_library/graphics/view_constants.h"
+
+#include "./lumatone_editor_library/actions/edit_actions.h"
 
 
 //==============================================================================
-MainContentComponent::MainContentComponent(LumatoneLayout& mappingDataIn)
-	: mappingData(mappingDataIn)
-	, copiedSubBoardData()
+MainContentComponent::MainContentComponent(const LumatoneEditorState& stateIn)
+	: LumatoneEditorState("MainComponent", stateIn)
+	, copiedSubBoardData(std::make_unique<LumatoneBoard>())
 {
 	setName("MainContentComponent");
 
 	// Midi input + output
-	midiEditArea.reset(new MidiEditArea(TerpstraSysExApplication::getApp().getLookAndFeel()));
+	midiEditArea.reset(new MidiEditArea(stateIn));
 	addAndMakeVisible(midiEditArea.get());
 
 	// All keys overview
-	allKeysOverview.reset(new AllKeysOverview());
+	allKeysOverview.reset(new LumatoneKeyboardComponent(*this));
 	addAndMakeVisible(allKeysOverview.get());
 
 	// Edit function area
-	noteEditArea.reset(new NoteEditArea());
+	noteEditArea.reset(new NoteEditArea(stateIn));
 	addAndMakeVisible(noteEditArea.get());
 	noteEditArea->getOctaveBoardSelectorTab()->addChangeListener(this);
-	noteEditArea->getColourEditComponent()->addListener(this); // Open up ColourPaletteWindow
+	noteEditArea->getColourViewComponent()->addListener(this); // Open up ColourPaletteWindow
 
-	generalOptionsArea.reset(new GeneralOptionsDlg());
+	generalOptionsArea.reset(new GeneralOptionsDlg(stateIn));
 	addAndMakeVisible(generalOptionsArea.get());
 
-	pedalSensitivityDlg.reset(new PedalSensitivityDlg());
+	pedalSensitivityDlg.reset(new PedalSensitivityDlg(stateIn));
 	addAndMakeVisible(pedalSensitivityDlg.get());
 
-	curvesArea.reset(new CurvesArea());
+	curvesArea.reset(new CurvesArea(stateIn));
 	addAndMakeVisible(curvesArea.get());
 
-	globalSettingsArea.reset(new GlobalSettingsArea());
+	globalSettingsArea.reset(new GlobalSettingsArea(stateIn));
 	addAndMakeVisible(globalSettingsArea.get());
 	globalSettingsArea->listenToColourEditButtons(this);
 
-	TerpstraSysExApplication::getApp().getLumatoneController()->addFirmwareListener(this);
+	// getLumatoneController()->addFirmwareListener(this);
 
 	//lblAppName.reset(new Label("lblAppName", TerpstraSysExApplication::getApp().getApplicationName()));
 	lblAppName.reset(new Label("lblAppName", "lumatone editor"));
-	lblAppName->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::FranklinGothic));
+	lblAppName->setFont(getAppFonts().getFont(LumatoneEditorFont::FranklinGothic));
 	lblAppName->setColour(Label::ColourIds::textColourId, Colour(0xff777777));
 	addAndMakeVisible(lblAppName.get());
 
-	lblAppVersion.reset(new Label("lblAppVersion", "v" + TerpstraSysExApplication::getApp().getApplicationVersion()));
-	lblAppVersion->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::FranklinGothic));
+	lblAppVersion.reset(new Label("lblAppVersion", "v" + getApplicationVersion()));
+	lblAppVersion->setFont(getAppFonts().getFont(LumatoneEditorFont::FranklinGothic));
 	lblAppVersion->setColour(Label::ColourIds::textColourId, Colour(0xff777777));
 	addAndMakeVisible(lblAppVersion.get());
 
@@ -106,7 +122,7 @@ void MainContentComponent::saveStateToPropertiesFile(PropertiesFile* propertiesF
 // Set the current mapping to be edited to the value passed in parameter
 void MainContentComponent::setData(LumatoneLayout& newData, bool withRefresh)
 {
-	mappingData = newData;
+	*mappingData = newData;
 
 	noteEditArea->onSetData(newData);
 
@@ -125,16 +141,21 @@ void MainContentComponent::deleteAll(bool withRefresh)
 // Copy the edited mapping to the variable passed as parameter
 void MainContentComponent::getData(LumatoneLayout& newData)
 {
-	newData = mappingData;
+	newData = *getMappingData();
+}
+
+TabbedButtonBar *MainContentComponent::getOctaveBoardSelectorTab()
+{
+	return  noteEditArea->getOctaveBoardSelectorTab();
 }
 
 UndoableAction* MainContentComponent::createDeleteCurrentSectionAction()
 {
 	auto currentSetSelection = noteEditArea->getOctaveBoardSelectorTab()->getCurrentTabIndex();
-	if (currentSetSelection >= 0 && currentSetSelection < TerpstraSysExApplication::getApp().getOctaveBoardSize())
+	if (currentSetSelection >= 0 && currentSetSelection < getOctaveBoardSize())
 	{
         auto keySet = LumatoneBoard();
-        return new LumatoneEditAction::SectionEditAction(TerpstraSysExApplication::getApp().getLumatoneController(), currentSetSelection, keySet);
+        return new LumatoneEditAction::SectionEditAction(this, currentSetSelection, keySet);
 	}
 	else
 		return nullptr;
@@ -143,9 +164,9 @@ UndoableAction* MainContentComponent::createDeleteCurrentSectionAction()
 bool MainContentComponent::copyCurrentSubBoardData()
 {
 	auto currentSetSelection = noteEditArea->getOctaveBoardSelectorTab()->getCurrentTabIndex();
-	if (currentSetSelection >= 0 && currentSetSelection < TerpstraSysExApplication::getApp().getOctaveBoardSize())
+	if (currentSetSelection >= 0 && currentSetSelection < getOctaveBoardSize())
 	{
-		copiedSubBoardData = *mappingData.getBoard(currentSetSelection);
+		*copiedSubBoardData = getBoard(currentSetSelection);
 		return true;
 	}
 	else
@@ -155,10 +176,10 @@ bool MainContentComponent::copyCurrentSubBoardData()
 UndoableAction* MainContentComponent::createPasteCurrentSectionAction()
 {
 	auto currentSetSelection = noteEditArea->getOctaveBoardSelectorTab()->getCurrentTabIndex();
-	if (currentSetSelection >= 0 && currentSetSelection < TerpstraSysExApplication::getApp().getNumBoards()
-		&& !copiedSubBoardData.isEmpty())
+	if (currentSetSelection >= 0 && currentSetSelection < getNumBoards()
+		&& !copiedSubBoardData->isEmpty())
 	{
-		return new LumatoneEditAction::SectionEditAction(TerpstraSysExApplication::getApp().getLumatoneController(), currentSetSelection, copiedSubBoardData);
+		return new LumatoneEditAction::SectionEditAction(this, currentSetSelection, *copiedSubBoardData);
 	}
 	else
 		return nullptr;
@@ -167,43 +188,47 @@ UndoableAction* MainContentComponent::createPasteCurrentSectionAction()
 UndoableAction* MainContentComponent::createModifiedPasteCurrentSectionAction(CommandID commandID)
 {
     auto currentSetSelectionIndex = noteEditArea->getOctaveBoardSelectorTab()->getCurrentTabIndex();
-    if (currentSetSelectionIndex >= 0 && currentSetSelectionIndex < TerpstraSysExApplication::getApp().getNumBoards()
-        && !copiedSubBoardData.isEmpty())
+    if (currentSetSelectionIndex >= 0 && currentSetSelectionIndex < getNumBoards()
+        && !copiedSubBoardData->isEmpty())
     {
-        auto modifiedSubBoardData = copiedSubBoardData;
-        auto octaveSize = TerpstraSysExApplication::getApp().getOctaveBoardSize();
+        auto modifiedSubBoardData = *copiedSubBoardData;
+        auto octaveSize = getOctaveBoardSize();
 
         for (int i = 0; i < octaveSize; i++)
         {
-            auto currentSectionKey = mappingData.getBoard(currentSetSelectionIndex)->theKeys[i];
-            auto modifiedKey = modifiedSubBoardData.theKeys[i];
+            // LumatoneKey currentSectionKey = getKey(currentSetSelectionIndex, i);
+            // LumatoneKey modifiedKey = modifiedSubBoardData.getKey(i);
+            LumatoneKey modifiedKey = getKey(currentSetSelectionIndex, i);
 
             switch (commandID)
             {
             case Lumatone::Menu::commandIDs::pasteOctaveBoardNotes:
-                modifiedKey = currentSectionKey.withNoteOrCC(modifiedKey.noteNumber);
+                modifiedKey.setNoteOrCC(modifiedKey.getMidiNumber());
                 break;
 
             case Lumatone::Menu::commandIDs::pasteOctaveBoardChannels:
-                modifiedKey = currentSectionKey.withChannelNumber(modifiedKey.channelNumber);
+                modifiedKey.setChannelNumber(modifiedKey.getMidiChannel());
                 break;
 
             case Lumatone::Menu::commandIDs::pasteOctaveBoardColours:
-                modifiedKey = currentSectionKey.withColour(modifiedKey.colour);
+                modifiedKey.setColour(modifiedKey.getColour());
                 break;
 
             case Lumatone::Menu::commandIDs::pasteOctaveBoardTypes:
-                modifiedKey = currentSectionKey.withKeyType(modifiedKey.keyType).withInvertCCFader(modifiedKey.ccFaderDefault);
+                modifiedKey.setKeyType(modifiedKey.getType());
+				modifiedKey.setDefaultCCFader(modifiedKey.isCCFaderDefault());
                 break;
 
             default:
                 jassertfalse;
+				modifiedKey = modifiedSubBoardData.getKey(i);
+				break;
             }
 
-            modifiedSubBoardData.theKeys[i] = modifiedKey;
+            modifiedSubBoardData.setKey(modifiedKey, i);
         }
 
-        return new LumatoneEditAction::SectionEditAction(TerpstraSysExApplication::getApp().getLumatoneController(), currentSetSelectionIndex, modifiedSubBoardData);
+        return new LumatoneEditAction::SectionEditAction(this, currentSetSelectionIndex, modifiedSubBoardData);
     }
     else
         return nullptr;
@@ -211,38 +236,38 @@ UndoableAction* MainContentComponent::createModifiedPasteCurrentSectionAction(Co
 
 bool MainContentComponent::canPasteCopiedSubBoard() const
 {
-    return !copiedSubBoardData.isEmpty();
+    return !copiedSubBoardData->isEmpty();
 }
 
 bool MainContentComponent::setDeveloperMode(bool developerModeOn)
 {
 	curvesArea->setDeveloperMode(developerModeOn);
     globalSettingsArea->setDeveloperMode(developerModeOn);
-    allKeysOverview->showDeveloperMode(developerModeOn);
+    // allKeysOverview->showDeveloperMode(developerModeOn);
 	return true;
 }
 
 void MainContentComponent::octaveColourConfigReceived(int octaveIndex, uint8 rgbFlag, const int* colourData)
 {
-	for (int keyIndex = 0; keyIndex < TerpstraSysExApplication::getApp().getOctaveBoardSize(); keyIndex++)
+	for (int keyIndex = 0; keyIndex < getOctaveBoardSize(); keyIndex++)
 	{
-		LumatoneKey& keyData = mappingData.getBoard(octaveIndex - 1)->theKeys[keyIndex];
-		auto newValue = colourData[keyIndex];
-
-		if (rgbFlag == 0)
-		{
-			keyData.colour = Colour(newValue, keyData.colour.getGreen(), keyData.colour.getBlue());
-		}
-		else if (rgbFlag == 1)
-		{
-			keyData.colour = Colour(keyData.colour.getRed(), newValue, keyData.colour.getBlue());
-		}
-		else if (rgbFlag == 2)
-		{
-			keyData.colour = Colour(keyData.colour.getRed(), keyData.colour.getGreen(), newValue);
-		}
-		else
-			jassertfalse;
+		// LumatoneKey& keyData = getBoard(octaveIndex - 1)->theKeys[keyIndex];
+		// auto newValue = colourData[keyIndex];
+
+		// if (rgbFlag == 0)
+		// {
+		// 	keyData.colour = Colour(newValue, keyData.colour.getGreen(), keyData.colour.getBlue());
+		// }
+		// else if (rgbFlag == 1)
+		// {
+		// 	keyData.colour = Colour(keyData.colour.getRed(), newValue, keyData.colour.getBlue());
+		// }
+		// else if (rgbFlag == 2)
+		// {
+		// 	keyData.colour = Colour(keyData.colour.getRed(), keyData.colour.getGreen(), newValue);
+		// }
+		// else
+		// 	jassertfalse;
 	}
 
 	refreshKeyDataFields();
@@ -250,10 +275,10 @@ void MainContentComponent::octaveColourConfigReceived(int octaveIndex, uint8 rgb
 
 void MainContentComponent::octaveChannelConfigReceived(int octaveIndex, const int* channelData)
 {
-	for (int keyIndex = 0; keyIndex < TerpstraSysExApplication::getApp().getOctaveBoardSize(); keyIndex++)
+	for (int keyIndex = 0; keyIndex < getOctaveBoardSize(); keyIndex++)
 	{
 		// Check channel values?
-		mappingData.getBoard(octaveIndex - 1)->theKeys[keyIndex].channelNumber = channelData[keyIndex];
+		// getBoard(octaveIndex - 1)->theKeys[keyIndex].channelNumber = channelData[keyIndex];
 	}
 
 	refreshKeyDataFields();
@@ -261,10 +286,10 @@ void MainContentComponent::octaveChannelConfigReceived(int octaveIndex, const in
 
 void MainContentComponent::octaveNoteConfigReceived(int octaveIndex, const int* noteData)
 {
-	for (int keyIndex = 0; keyIndex < TerpstraSysExApplication::getApp().getOctaveBoardSize(); keyIndex++)
+	for (int keyIndex = 0; keyIndex < getOctaveBoardSize(); keyIndex++)
 	{
 		// Check note values?
-		mappingData.getBoard(octaveIndex - 1)->theKeys[keyIndex].noteNumber = noteData[keyIndex];
+		// getBoard(octaveIndex - 1)->theKeys[keyIndex].noteNumber = noteData[keyIndex];
 	}
 
 	refreshKeyDataFields();
@@ -272,10 +297,10 @@ void MainContentComponent::octaveNoteConfigReceived(int octaveIndex, const int*
 
 void MainContentComponent::keyTypeConfigReceived(int octaveIndex, const int* keyTypeData)
 {
-	for (int keyIndex = 0; keyIndex < TerpstraSysExApplication::getApp().getOctaveBoardSize(); keyIndex++)
+	for (int keyIndex = 0; keyIndex < getOctaveBoardSize(); keyIndex++)
 	{
 		// Check type values?
-		mappingData.getBoard(octaveIndex - 1)->theKeys[keyIndex].keyType = LumatoneKeyType(keyTypeData[keyIndex]);
+		// getBoard(octaveIndex - 1)->theKeys[keyIndex].keyType = LumatoneKeyType(keyTypeData[keyIndex]);
 	}
 
 	refreshKeyDataFields();
@@ -283,48 +308,48 @@ void MainContentComponent::keyTypeConfigReceived(int octaveIndex, const int* key
 
 void MainContentComponent::velocityConfigReceived(const int* velocityData)
 {
-	mappingData.velocityTable.editStrategy = LumatoneConfigTable::DrawMode::freeDrawing;
-	for (int i = 0; i < 128; i++)
-		mappingData.velocityTable.velocityValues[i] = velocityData[127 - i]; // Reversed
+	// mappingData.velocityTable.editStrategy = LumatoneConfigTable::DrawMode::freeDrawing;
+	// for (int i = 0; i < 128; i++)
+	// 	mappingData.velocityTable.velocityValues[i] = velocityData[127 - i]; // Reversed
 	curvesArea->loadFromMapping();
 }
 
 void MainContentComponent::aftertouchConfigReceived(const int* aftertouch)
 {
-	mappingData.afterTouchTable.editStrategy = LumatoneConfigTable::DrawMode::freeDrawing;
-	memmove(mappingData.afterTouchTable.velocityValues, aftertouch, sizeof(int) * 128);
+	// mappingData.afterTouchTable.editStrategy = LumatoneConfigTable::DrawMode::freeDrawing;
+	// memmove(mappingData.afterTouchTable.velocityValues, aftertouch, sizeof(int) * 128);
 	curvesArea->loadFromMapping();
 }
 
 void MainContentComponent::velocityIntervalConfigReceived(const int* velocityData)
 {
-	memmove(mappingData.table, velocityData, sizeof(int) * VELOCITYINTERVALTABLESIZE);
+	// memmove(mappingData.table, velocityData, sizeof(int) * VELOCITYINTERVALTABLESIZE);
 	curvesArea->loadFromMapping();
 }
 
 void MainContentComponent::faderConfigReceived(const int* faderData)
 {
-	mappingData.faderTable.editStrategy = LumatoneConfigTable::DrawMode::freeDrawing;
-	memmove(mappingData.faderTable.velocityValues, faderData, sizeof(int) * 128);
+	// mappingData.faderTable.editStrategy = LumatoneConfigTable::DrawMode::freeDrawing;
+	// memmove(mappingData.faderTable.velocityValues, faderData, sizeof(int) * 128);
 	curvesArea->loadFromMapping();
 }
 
 void MainContentComponent::faderTypeConfigReceived(int octaveIndex, const int* faderTypeData)
 {
-	for (int keyIndex = 0; keyIndex < TerpstraSysExApplication::getApp().getOctaveBoardSize(); keyIndex++)
+	for (int keyIndex = 0; keyIndex < getOctaveBoardSize(); keyIndex++)
 	{
-		mappingData.getBoard(octaveIndex - 1)->theKeys[keyIndex].ccFaderDefault = faderTypeData[keyIndex];
+		// getBoard(octaveIndex - 1)->theKeys[keyIndex].ccFaderDefault = faderTypeData[keyIndex];
 	}
 }
 
 void MainContentComponent::lumatouchConfigReceived(const int* lumatouchData)
 {
-	mappingData.lumaTouchTable.editStrategy = LumatoneConfigTable::DrawMode::freeDrawing;
-	memmove(mappingData.lumaTouchTable.velocityValues, lumatouchData, sizeof(int) * 128);
+	// mappingData.lumaTouchTable.editStrategy = LumatoneConfigTable::DrawMode::freeDrawing;
+	// memmove(mappingData.lumaTouchTable.velocityValues, lumatouchData, sizeof(int) * 128);
 	curvesArea->loadFromMapping();
 }
 
-void MainContentComponent::firmwareRevisionReceived(FirmwareVersion version)
+void MainContentComponent::firmwareRevisionReceived(LumatoneFirmware::Version version)
 {
 	// Make sure changes happen in proper order
 	noteEditArea->resetOctaveSize();
@@ -335,31 +360,34 @@ void MainContentComponent::changeListenerCallback(ChangeBroadcaster *source)
 {
 	if (source == noteEditArea->getOctaveBoardSelectorTab())
 	{
-		allKeysOverview->setCurrentSetSelection(noteEditArea->getOctaveBoardSelectorTab()->getCurrentTabIndex());
+		// allKeysOverview->setCurrentSetSelection(noteEditArea->getOctaveBoardSelectorTab()->getCurrentTabIndex());
 	}
 }
 
 void MainContentComponent::buttonClicked(Button* btn)
 {
-	ColourEditComponent* colourEdit = dynamic_cast<ColourEditComponent*>(btn);
+	ColourViewComponent* colourEdit = dynamic_cast<ColourViewComponent*>(btn);
 
 	if (colourEdit)
 	{
 		// May be better asynchronous on a timer
-		TerpstraSysExApplication::getApp().reloadColourPalettes();
+		// TerpstraSysExApplication::getApp().reloadColourPalettes();
 
-		ColourPaletteWindow* paletteWindow = new ColourPaletteWindow(TerpstraSysExApplication::getApp().getColourPalettes());
+		auto palettes = getColourPalettes();
+		ColourPaletteWindow* paletteWindow = new ColourPaletteWindow(palettes);
 		paletteWindow->setSize(proportionOfWidth(popupWidth), proportionOfHeight(popupHeight));
 
-        if (btn == noteEditArea->getColourEditComponent())
+        if (btn == noteEditArea->getColourViewComponent())
         {
-            colourEdit = noteEditArea->getColourEditComponent();
-            paletteWindow->listenToColourSelection(noteEditArea->getSingleNoteColourTextEditor());
+            colourEdit = noteEditArea->getColourViewComponent();
+
+			auto colourTextEditor = noteEditArea->getSingleNoteColourTextEditor();
+            paletteWindow->listenToColourSelection(static_cast<ColourSelectionListener*>(colourTextEditor));
 
             // Shouldn't be necessary when Isomorphic is moved from dev to public
             auto isomorphicPanel = noteEditArea->getIsomorphicMassAssignPanel();
             if (isomorphicPanel != nullptr)
-                paletteWindow->listenToColourSelection(isomorphicPanel);
+                paletteWindow->listenToColourSelection(static_cast<ColourSelectionListener*>(isomorphicPanel));
 
 			paletteWindow->addColourSelectorToGroup(noteEditArea.get());
 			paletteWindow->setCurrentColourSelector(noteEditArea->getSingleNoteColourTextEditor());
@@ -381,9 +409,9 @@ void MainContentComponent::buttonClicked(Button* btn)
 
 void MainContentComponent::paint (Graphics& g)
 {
-	g.fillAll(getLookAndFeel().findColour(LumatoneEditorColourIDs::MediumBackground));
-
-	g.setColour(getLookAndFeel().findColour(LumatoneEditorColourIDs::LightBackground));
+	g.fillAll(getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::MediumBackground));
+	
+	g.setColour(getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::LightBackground));
 	g.fillRect(controlsArea);
 }
 
@@ -406,7 +434,9 @@ void MainContentComponent::resized()
 
 	// All keys overview/virtual keyboard playing
 	int newKeysOverviewAreaHeight = jmax(controlsArea.getY() - midiAreaHeight, MINIMALTERPSTRAKEYSETAREAHEIGHT);
-	allKeysOverview->setBounds(0, midiAreaHeight, newWidth, newKeysOverviewAreaHeight);
+	int keyboardMarginTop = newKeysOverviewAreaHeight * 0.0625f;
+	int keyboardHeight = newKeysOverviewAreaHeight * 0.8f;
+	allKeysOverview->setBounds(0, midiAreaHeight + keyboardMarginTop, newWidth, keyboardHeight);
 
 	// Edit function/single key field area
 	noteEditArea->setSize(proportionOfWidth(assignWidth), proportionOfHeight(assignHeight));
@@ -432,7 +462,8 @@ void MainContentComponent::resized()
 void MainContentComponent::refreshKeyDataFields()
 {
 	noteEditArea->refreshKeyFields();
-	juce::Timer::callAfterDelay(1, [&]() { allKeysOverview->refreshMappingData(); });
+	// allKeysOverview->mappingUpdateCallback();
+	// juce::Timer::callAfterDelay(1, [&]() { allKeysOverview->refreshMappingData(); });
 }
 
 void MainContentComponent::refreshAllFields()
diff --git a/Source/MainComponent.h b/Source/MainComponent.h
index 03da6a36..66763fad 100644
--- a/Source/MainComponent.h
+++ b/Source/MainComponent.h
@@ -10,34 +10,35 @@
 
 #pragma once
 
-#include "AllKeysOverview.h"
-#include "ViewComponents.h"
-#include "./data/lumatone_layout.h"
-#include "LumatoneController.h"
-#include "MidiEditArea.h"
-#include "NoteEditArea.h"
-#include "GeneralOptionsDlg.h"
-#include "CurvesArea.h"
-#include "GlobalSettingsArea.h"
-#include "PedalSensitivityDlg.h"
-#include "LumatoneEditorLookAndFeel.h"
-#include "ColourPaletteWindow.h"
+#include "LumatoneEditorState.h"
 
+#include "./lumatone_editor_library/data/lumatone_layout.h"
+#include "./lumatone_editor_library/listeners/firmware_listener.h"
+#include "./lumatone_editor_library/lumatone_midi_driver/firmware_types.h"
 
+class LumatoneKeyboardComponent;
+
+class MidiEditArea;
+class NoteEditArea;
+class GeneralOptionsDlg;
+class CurvesArea;
+class GlobalSettingsArea;
+class PedalSensitivityDlg;
 
 //==============================================================================
 /*
     This component lives inside our window, and this is where you should put all
     your controls and content.
 */
-class MainContentComponent : public Component,
-							 public LumatoneEditor::FirmwareListener,
-							 public ChangeListener,
-							 public Button::Listener
+class MainContentComponent : public juce::Component
+						   , public LumatoneEditorState
+						   , public LumatoneEditor::FirmwareListener
+						   , public juce::ChangeListener
+						   , public juce::Button::Listener
 {
 public:
 	//==============================================================================
-	MainContentComponent(LumatoneLayout& mappingDataIn);
+	MainContentComponent(const LumatoneEditorState& stateIn);
 	~MainContentComponent();
 
 	void restoreStateFromPropertiesFile(PropertiesFile* propertiesFile);
@@ -48,28 +49,28 @@ class MainContentComponent : public Component,
 	void deleteAll(bool withRefresh = true);
 
 	void getData(LumatoneLayout& newData);
-	LumatoneLayout&	getMappingInEdit() { return this->mappingData; }
+	// LumatoneLayout&	getMappingInEdit() { return getMapping; }
 
-	TabbedButtonBar* getOctaveBoardSelectorTab() { return  noteEditArea->getOctaveBoardSelectorTab(); }
+	juce::TabbedButtonBar* getOctaveBoardSelectorTab();
 	CurvesArea* getCurvesArea() { return curvesArea.get(); }
 
 	// Board edit operations
-	UndoableAction* createDeleteCurrentSectionAction();
+	juce::UndoableAction* createDeleteCurrentSectionAction();
 	bool copyCurrentSubBoardData();
-	UndoableAction* createPasteCurrentSectionAction();
-    UndoableAction* createModifiedPasteCurrentSectionAction(CommandID commandID);
+	juce::UndoableAction* createPasteCurrentSectionAction();
+    juce::UndoableAction* createModifiedPasteCurrentSectionAction(CommandID commandID);
     bool canPasteCopiedSubBoard() const;
 
 	bool setDeveloperMode(bool developerModeOn);
 
 	// Implementation of ChangeListener
-	void changeListenerCallback(ChangeBroadcaster *source) override;
+	void changeListenerCallback(juce::ChangeBroadcaster *source) override;
 
 	// Implementation of Button::Listener
-	void buttonClicked(Button* btn) override;
+	void buttonClicked(juce::Button* btn) override;
 
 	// GUI implementation
-    void paint (Graphics&) override;
+    void paint (juce::Graphics&) override;
     void resized() override;
 
 	void refreshKeyDataFields();
@@ -97,7 +98,7 @@ class MainContentComponent : public Component,
 
 	void lumatouchConfigReceived(const int* lumatouchData) override;
 
-	void firmwareRevisionReceived(FirmwareVersion version) override;
+	void firmwareRevisionReceived(LumatoneFirmware::Version version) override;
 
 private:
     //==============================================================================
@@ -107,38 +108,29 @@ class MainContentComponent : public Component,
 	// GUI components
 
 	// Midi devices and connection state
-	std::unique_ptr<MidiEditArea>		midiEditArea;
+	std::unique_ptr<MidiEditArea>			midiEditArea;
 
 	// Sets of 55/56 keys
-	std::unique_ptr<AllKeysOverview> allKeysOverview;
+	std::unique_ptr<LumatoneKeyboardComponent> 	allKeysOverview;
 
 	// Edit fields for setting key and button parameters, and edits for single keys
-	std::unique_ptr<NoteEditArea>	noteEditArea;
-
-	std::unique_ptr<GeneralOptionsDlg>	generalOptionsArea;
-
-	std::unique_ptr<CurvesArea> curvesArea;
-
-	std::unique_ptr<GlobalSettingsArea> globalSettingsArea;
-
-	std::unique_ptr<PedalSensitivityDlg> pedalSensitivityDlg;
+	std::unique_ptr<NoteEditArea>			noteEditArea;
+	std::unique_ptr<GeneralOptionsDlg>		generalOptionsArea;
+	std::unique_ptr<CurvesArea> 			curvesArea;
+	std::unique_ptr<GlobalSettingsArea> 	globalSettingsArea;
+	std::unique_ptr<PedalSensitivityDlg> 	pedalSensitivityDlg;
 
 	// Version signature in bottom left of window
-	std::unique_ptr<Label> lblAppName;
-
-	std::unique_ptr<Label> lblAppVersion;
-
-	//==============================================================================
-	// Data
-	LumatoneLayout&		mappingData;
+	std::unique_ptr<juce::Label> 					lblAppName;
+	std::unique_ptr<juce::Label> 					lblAppVersion;
 
 	// Buffer for copy/paste of sub board data
-	LumatoneBoard		copiedSubBoardData;
+	std::unique_ptr<LumatoneBoard>			copiedSubBoardData;
 
 	//==============================================================================
 	// Position and Size helpers
 
-    Rectangle<int> controlsArea;
+    juce::Rectangle<int> controlsArea;
 
     const float headerHeight                = 0.0776f;
 
@@ -165,8 +157,8 @@ class MainContentComponent : public Component,
     const float settingsAreaY               = 0.546875f;
     const float settingsAreaHeight          = 0.148148f;
 
-    const Rectangle<float> generalSettingsBounds = { settingsColumnX, settingsAreaY, 0.17f, settingsAreaHeight };
-    const Rectangle<float>   pedalSettingsBounds = { 0.777778f,       settingsAreaY, 0.18f, settingsAreaHeight };
-    const Rectangle<float>      curvesAreaBounds = { settingsColumnX, 0.7174f,       0.3626f, 0.21f };
+    const juce::Rectangle<float> generalSettingsBounds = { settingsColumnX, settingsAreaY, 0.17f, settingsAreaHeight };
+    const juce::Rectangle<float>   pedalSettingsBounds = { 0.777778f,       settingsAreaY, 0.18f, settingsAreaHeight };
+    const juce::Rectangle<float>      curvesAreaBounds = { settingsColumnX, 0.7174f,       0.3626f, 0.21f };
 
 };
diff --git a/Source/MainWindow.cpp b/Source/MainWindow.cpp
index 0c235b1d..40e913d3 100644
--- a/Source/MainWindow.cpp
+++ b/Source/MainWindow.cpp
@@ -8,33 +8,69 @@
 */
 
 #include "MainWindow.h"
-#include "Main.h"
+#include "MainComponent.h"
 
-MainWindow::MainWindow(ComponentBoundsConstrainer* constrainerIn) : DocumentWindow("Lumatone Editor",
-    TerpstraSysExApplication::getApp().getLookAndFeel().findColour(LumatoneEditorColourIDs::MediumBackground),
-    DocumentWindow::minimiseButton + DocumentWindow::closeButton),
-    constrainer(constrainerIn)
-{
-    setContentOwned(new MainContentComponent(*TerpstraSysExApplication::getApp().getMappingData()), true);
+#include "LumatoneEditorLookAndFeel.h"
+#include "./lumatone_editor_library/palettes/colour_palette_file.h"
+
+#include "./lumatone_editor_library/graphics/view_constants.h"
 
+MainWindow::MainWindow(const LumatoneEditorState& stateIn, juce::ApplicationCommandManager* cmdMgr)
+    : juce::DocumentWindow("Lumatone Editor", juce::Colours::black, juce::DocumentWindow::minimiseButton + juce::DocumentWindow::closeButton)
+    , LumatoneEditorState("MainWindow", stateIn)
+    , commandManager(cmdMgr)
+{
+    // setContentOwned(new MainContentComponent(*TerpstraSysExApplication::getApp().getMappingData()), true);
+    setContentOwned(new MainContentComponent(stateIn), true);
     setResizable(true, true);
 #if JUCE_ANDROID
     setFullScreen(true);
 #else
+
+    setLookAndFeel(&getEditorLookAndFeel());
+
+    menuModel = std::make_unique<Lumatone::Menu::MainMenuModel>(*this, commandManager);
+
+#if JUCE_MAC
+    MenuBarModel::setMacMainMenu(menuModel.get());
+#else
+    setMenuBar(menuModel.get());
+    getMenuBarComponent()->getProperties().set(
+        LumatoneEditorStyleIDs::popupMenuBackgroundColour,
+        getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::MenuBarBackground).toString()
+    );
+#endif
+
     // Window aspect ratio
+    constrainer.reset(new juce::ComponentBoundsConstrainer());
+    
     constrainer->setFixedAspectRatio(DEFAULTMAINWINDOWASPECT);
     constrainer->setMinimumSize(800, juce::roundToInt(800 / DEFAULTMAINWINDOWASPECT));
+    constrainer->setMaximumHeight(1000);
+    setConstrainer(constrainer.get());
 
-    setConstrainer(constrainer);
+    addKeyListener(commandManager->getKeyMappings());
     updateBounds();
+
     startTimer(2000);
 #endif
 
-    setLookAndFeel(&TerpstraSysExApplication::getApp().getLookAndFeel());
+    // setLookAndFeel(stateIn.getEditorLookAndFeel());
+    // setLookAndFeel(&TerpstraSysExApplication::getApp().getLookAndFeel());
 }
 
 MainWindow::~MainWindow()
 {
+    removeKeyListener(commandManager->getKeyMappings());
+
+#if JUCE_MAC
+    MenuBarModel::setMacMainMenu(nullptr);
+#else
+    setMenuBarComponent(nullptr);
+#endif
+
+    menuModel = nullptr;
+
     stopTimer();
     setConstrainer(nullptr);
 }
@@ -75,13 +111,13 @@ bool MainWindow::isOutOfHorizontalBounds() const
 void MainWindow::saveStateToPropertiesFile(PropertiesFile* propertiesFile)
 {
     // Save state of main window
-    propertiesFile->setValue("MainWindowState", getWindowStateAsString());
+    propertiesFile->setValue(LumatoneEditorProperty::MainWindowState, getWindowStateAsString());
     ((MainContentComponent*)(getContentComponent()))->saveStateToPropertiesFile(propertiesFile);
 }
 
 void MainWindow::restoreStateFromPropertiesFile(PropertiesFile* propertiesFile)
 {
-    bool useSavedState = restoreWindowStateFromString(propertiesFile->getValue("MainWindowState"));
+    bool useSavedState = restoreWindowStateFromString(getProperty(LumatoneEditorProperty::MainWindowState));
 
     fixWindowPositionAndSize(!useSavedState);
 
diff --git a/Source/MainWindow.h b/Source/MainWindow.h
index 35fe7e52..29fcc440 100644
--- a/Source/MainWindow.h
+++ b/Source/MainWindow.h
@@ -8,23 +8,29 @@
 */
 
 #pragma once
-#include "MainComponent.h"
+#include <JuceHeader.h>
+
+#include "LumatoneMenu.h"
+#include "LumatoneEditorState.h"
+//class LumatoneEditorState;
 
 //==============================================================================
 /*
 This class implements the desktop window that contains an instance of
 our MainContentComponent class.
 */
-class MainWindow : public DocumentWindow, public Timer
+class MainWindow : public juce::DocumentWindow
+                 , public LumatoneEditorState
+                 , public juce::Timer
 {
 public:
-    MainWindow(ComponentBoundsConstrainer* constrainerIn);
+    MainWindow(const LumatoneEditorState& stateIn, juce::ApplicationCommandManager* cmdMgr);
 
     virtual ~MainWindow();
-    
+
     void closeButtonPressed() override;
 
-    BorderSize<int> getBorderThickness() override;
+    juce::BorderSize<int> getBorderThickness() override;
 
     /* Note: Be careful if you override any DocumentWindow methods - the base
     class uses a lot of them, so by overriding you might break its functionality.
@@ -45,18 +51,19 @@ class MainWindow : public DocumentWindow, public Timer
     void saveStateToPropertiesFile(PropertiesFile* propertiesFile);
 
     void restoreStateFromPropertiesFile(PropertiesFile* propertiesFile);
-    
+
     // Checks size of current display and updates constraint
     void updateBounds();
 
     void fixWindowPositionAndSize(bool setToDefault=false);
-    
+
     void timerCallback() override;
 
 private:
+    juce::ApplicationCommandManager* commandManager;
+    std::unique_ptr<Lumatone::Menu::MainMenuModel> menuModel;
+    std::unique_ptr<ComponentBoundsConstrainer> constrainer;
 
-    ComponentBoundsConstrainer* constrainer;
-    
     int maxWindowWidth = 0;
     int maxWindowHeight = 0;
 
diff --git a/Source/MappingLogic.cpp b/Source/MappingLogic.cpp
index 61468f44..42353410 100644
--- a/Source/MappingLogic.cpp
+++ b/Source/MappingLogic.cpp
@@ -61,12 +61,12 @@ juce::Colour MappingLogicBase::indexToColour(int inx) const
 
 void MappingLogicBase::indexToTerpstraKey(int inx, LumatoneKey& keyData) const
 {
-    keyData.keyType = LumatoneKeyType::noteOnNoteOff;
-	keyData.channelNumber = indexToMIDIChannel(inx);
-	keyData.noteNumber = indexToMIDINote(inx);
+    keyData.setKeyType(LumatoneKeyType::noteOnNoteOff);
+	keyData.setChannelNumber(indexToMIDIChannel(inx));
+	keyData.setNoteOrCC(indexToMIDINote(inx));
 
 	if (this->assignColours)
-        keyData.colour = indexToColour(inx);
+        keyData.setColour(indexToColour(inx));
 }
 
 LumatoneKey MappingLogicBase::indexToTerpstraKey(int inx) const
@@ -163,17 +163,17 @@ int IncrMidiNotesMappingLogic::terpstraKeyToIndex(LumatoneKey keyData) const
 	if (this->isSingleChannel())
 	{
 	    // notes start at 0 and go until periodSize-1
-		if (keyData.channelNumber != this->channelInCaseOfSingleChannel || keyData.noteNumber >= this->periodSize )
+		if (!keyData.hasMidiChannel(this->channelInCaseOfSingleChannel) || !keyData.hasMidiNumber(this->periodSize))
 			return -1;
 
-		return keyData.noteNumber;
+		return keyData.getMidiNumber();
 	}
 	else
 	{
-		if (keyData.noteNumber >= this->periodSize)
+		if (keyData.getMidiNumber() >= this->periodSize)
 			return -1;
 
-		return (keyData.channelNumber - 1) * this->periodSize + keyData.noteNumber;
+		return (keyData.getMidiChannel() - 1) * this->periodSize + keyData.getMidiNumber();
 	}
 }
 
@@ -247,8 +247,8 @@ int KBMFilesMappingLogic::getStartOfMap() const
     }
 
     LumatoneKey keyData;
-    keyData.channelNumber = channelMappingData[subTableIndex].channelNumber;
-    keyData.noteNumber = channelMappingData[subTableIndex].mapping.noteNrWhereMappingStarts;
+    keyData.setChannelNumber(channelMappingData[subTableIndex].channelNumber);
+    keyData.setNoteOrCC(channelMappingData[subTableIndex].mapping.noteNrWhereMappingStarts);
 
     return terpstraKeyToIndex(keyData);
 }
@@ -307,7 +307,7 @@ int KBMFilesMappingLogic::terpstraKeyToIndex(LumatoneKey keyData) const
 	int inx;
     for ( inx = 0; inx < globalMappingSize(); inx++)
     {
-        if ( mappingTable[inx].channelNumber == keyData.channelNumber && mappingTable[inx].noteNumber == keyData.noteNumber )
+        if (keyData.hasMidiChannel(mappingTable[inx].channelNumber) && keyData.hasMidiNumber(mappingTable[inx].noteNumber))
             break;
     }
 
diff --git a/Source/MappingLogic.h b/Source/MappingLogic.h
index 9a2eac0d..28cc387e 100644
--- a/Source/MappingLogic.h
+++ b/Source/MappingLogic.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "./data/lumatone_layout.h"
+#include "./lumatone_editor_library/data/lumatone_layout.h"
 #include "KBMMappingDataStructure.h"
 #include "ScaleStructureController/ScaleStructure.h"
 
diff --git a/Source/MidiEditArea.cpp b/Source/MidiEditArea.cpp
index e3286ba1..d78294c3 100644
--- a/Source/MidiEditArea.cpp
+++ b/Source/MidiEditArea.cpp
@@ -18,62 +18,60 @@
 */
 
 //[Headers] You can add your own extra header files here...
-#include "ViewConstants.h"
-#include "Main.h"
+#include "MidiEditArea.h"
+#include "LumatoneEditorLookAndFeel.h"
+#include "./lumatone_editor_library/device/lumatone_controller.h"
+#include "./lumatone_editor_library/graphics/view_constants.h"
 //[/Headers]
 
-#include "MidiEditArea.h"
 
 
 //[MiscUserDefs] You can add your own user definitions and misc code here...
 
-// Index in edit mode tab coincides with sysExSendingMode. In case that changes in the future, modify this here.
-sysExSendingMode editModeTabIndexToMidiSysExSendingMode(int tabIndex) { return static_cast<sysExSendingMode>(tabIndex); }
-
 //[/MiscUserDefs]
 
 //==============================================================================
-MidiEditArea::MidiEditArea (LumatoneEditorLookAndFeel& lookAndFeelIn)
-    : lookAndFeel(lookAndFeelIn)
+MidiEditArea::MidiEditArea (const LumatoneEditorState& stateIn)
+    : LumatoneEditorState("MidiEditArea", stateIn)
 {
     //[Constructor_pre] You can add your own custom stuff here..
 	setName("MidiEditArea");
 
-	lumatoneLabel.reset(new Label("LumatoneLabel", "lumatone"));
-	lumatoneLabel->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::UniviaProBold));
-	lumatoneLabel->setColour(Label::ColourIds::textColourId, lookAndFeel.findColour(LumatoneEditorColourIDs::LabelPink));
+	lumatoneLabel.reset(new juce::Label("LumatoneLabel", "lumatone"));
+	lumatoneLabel->setFont(getAppFonts().getFont(LumatoneEditorFont::UniviaProBold));
+	lumatoneLabel->setColour(juce::Label::ColourIds::textColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::LabelPink));
 	lumatoneLabel->setJustificationType(Justification::centred);
 	addAndMakeVisible(lumatoneLabel.get());
 
-	liveEditorBtn.reset(new TextButton("LiveEditorButton"));
-	lookAndFeel.setupRadioTextButton(*liveEditorBtn, 10, true);
+	liveEditorBtn.reset(new juce::TextButton("LiveEditorButton"));
+	getEditorLookAndFeel().setupRadioTextButton(*liveEditorBtn, 10, true);
 	liveEditorBtn->setButtonText(translate("LiveEditor"));
-	liveEditorBtn->setConnectedEdges(Button::ConnectedOnRight);
+	liveEditorBtn->setConnectedEdges(juce::Button::ConnectedOnRight);
 	liveEditorBtn->getProperties().set(LumatoneEditorStyleIDs::fontOverride, LumatoneEditorFont::UniviaProBold);
 	liveEditorBtn->getProperties().set(LumatoneEditorStyleIDs::fontHeightScalar, editModeFontScalar);
 	addChildComponent(liveEditorBtn.get());
 	liveEditorBtn->addListener(this);
 
-	offlineEditorBtn.reset(new TextButton("OfflineEditorButton"));
-	lookAndFeel.setupRadioTextButton(*offlineEditorBtn, 10, false);
+	offlineEditorBtn.reset(new juce::TextButton("OfflineEditorButton"));
+	getEditorLookAndFeel().setupRadioTextButton(*offlineEditorBtn, 10, false);
 	offlineEditorBtn->setButtonText(translate("OfflineEditor"));
-	offlineEditorBtn->setConnectedEdges(Button::ConnectedOnLeft);
+	offlineEditorBtn->setConnectedEdges(juce::Button::ConnectedOnLeft);
 	offlineEditorBtn->getProperties().set(LumatoneEditorStyleIDs::fontOverride, LumatoneEditorFont::UniviaProBold);
 	offlineEditorBtn->getProperties().set(LumatoneEditorStyleIDs::fontHeightScalar, editModeFontScalar);
 	addChildComponent(offlineEditorBtn.get());
 	offlineEditorBtn->addListener(this);
 
-	pleaseConnectLabel.reset(new Label("PleaseConnectLabel", translate("PleaseConnect")));
-	pleaseConnectLabel->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::UniviaProBold));
-	pleaseConnectLabel->setColour(Label::ColourIds::textColourId, lookAndFeel.findColour(LumatoneEditorColourIDs::ActiveText));
+	pleaseConnectLabel.reset(new juce::Label("PleaseConnectLabel", translate("PleaseConnect")));
+	pleaseConnectLabel->setFont(getAppFonts().getFont(LumatoneEditorFont::UniviaProBold));
+	pleaseConnectLabel->setColour(juce::Label::ColourIds::textColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::ActiveText));
 	addAndMakeVisible(*pleaseConnectLabel);
 
-	offlineMsgLabel.reset(new Label("DirectionsLabel", translate("OfflineMessage")));
-	offlineMsgLabel->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::FranklinGothic));
-	offlineMsgLabel->setColour(Label::ColourIds::textColourId, lookAndFeel.findColour(LumatoneEditorColourIDs::DescriptionText));
+	offlineMsgLabel.reset(new juce::Label("DirectionsLabel", translate("OfflineMessage")));
+	offlineMsgLabel->setFont(getAppFonts().getFont(LumatoneEditorFont::FranklinGothic));
+	offlineMsgLabel->setColour(juce::Label::ColourIds::textColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::DescriptionText));
 	addAndMakeVisible(*offlineMsgLabel);
 
-	logomark.reset(new Component());
+	logomark.reset(new juce::Component());
 	addAndMakeVisible(logomark.get());
 
 	logomarkPath = createLogomark();
@@ -134,19 +132,19 @@ MidiEditArea::MidiEditArea (LumatoneEditorLookAndFeel& lookAndFeelIn)
 
     //[UserPreSize]
 	cbMidiInput->getProperties().set(LumatoneEditorStyleIDs::popupMenuTargetWidth, 1);
-	cbMidiInput->getProperties().set(LumatoneEditorStyleIDs::popupMenuBackgroundColour, lookAndFeel.findColour(ComboBox::ColourIds::backgroundColourId).toString());
+	cbMidiInput->getProperties().set(LumatoneEditorStyleIDs::popupMenuBackgroundColour, getEditorLookAndFeel().findColour(ComboBox::ColourIds::backgroundColourId).toString());
 	cbMidiInput->setVisible(false);
 
 	cbMidiOutput->getProperties().set(LumatoneEditorStyleIDs::popupMenuTargetWidth, 1);
-	cbMidiOutput->getProperties().set(LumatoneEditorStyleIDs::popupMenuBackgroundColour, lookAndFeel.findColour(ComboBox::ColourIds::backgroundColourId).toString());
+	cbMidiOutput->getProperties().set(LumatoneEditorStyleIDs::popupMenuBackgroundColour, getEditorLookAndFeel().findColour(ComboBox::ColourIds::backgroundColourId).toString());
 	cbMidiOutput->setVisible(false);
 
-	lblConnectionState->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::UniviaProBold));
-	lblConnectionState->setColour(Label::ColourIds::textColourId, connectedColours[isConnected]);
+	lblConnectionState->setFont(getAppFonts().getFont(LumatoneEditorFont::UniviaProBold));
+	lblConnectionState->setColour(juce::Label::ColourIds::textColourId, connectedColours[isConnected()]);
     lblConnectionState->getProperties().set(LumatoneEditorStyleIDs::labelMaximumLineCount, 2);
 
-	lblEditMode->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::UniviaProBold));
-	lblEditMode->setColour(Label::ColourIds::textColourId, lookAndFeel.findColour(LumatoneEditorColourIDs::LabelPink));
+	lblEditMode->setFont(getAppFonts().getFont(LumatoneEditorFont::UniviaProBold));
+	lblEditMode->setColour(juce::Label::ColourIds::textColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::LabelPink));
 
 	offlineEditorBtn->setClickingTogglesState(true);
 	offlineEditorBtn->setRadioGroupId(10, dontSendNotification);
@@ -158,25 +156,25 @@ MidiEditArea::MidiEditArea (LumatoneEditorLookAndFeel& lookAndFeelIn)
 
 	btnAutoConnect->setClickingTogglesState(true);
 
-	ioAreaFlexBox.alignContent = FlexBox::AlignContent::center;
-	ioAreaFlexBox.alignItems = FlexBox::AlignItems::center;
-	ioAreaFlexBox.justifyContent = FlexBox::JustifyContent::spaceBetween;
+	ioAreaFlexBox.alignContent = juce::FlexBox::AlignContent::center;
+	ioAreaFlexBox.alignItems = juce::FlexBox::AlignItems::center;
+	ioAreaFlexBox.justifyContent = juce::FlexBox::JustifyContent::spaceBetween;
     //[/UserPreSize]
 
     setSize (1024, 48);
 
 
     //[Constructor] You can add your own custom stuff here..
-	TerpstraSysExApplication::getApp().getLumatoneController()->addStatusListener(this);
-    TerpstraSysExApplication::getApp().getLumatoneController()->addEditorListener(this);
-	auto inputs = TerpstraSysExApplication::getApp().getLumatoneController()->getMidiInputList();
-	auto outputs = TerpstraSysExApplication::getApp().getLumatoneController()->getMidiOutputList();
+	// getLumatoneController()->addStatusListener(this);
+    // getLumatoneController()->addEditorListener(this);
+	// auto inputs = getLumatoneController()->getMidiInputList();
+	// auto outputs = getLumatoneController()->getMidiOutputList();
 	refreshInputMenuAndSetSelected(0, dontSendNotification);
 	refreshOutputMenuAndSetSelected(0, dontSendNotification);
 	setConnectivity(false);
 
-    btnAutoConnect->setToggleState(TerpstraSysExApplication::getApp().getLumatoneController()->isDetectingLumatone(), sendNotificationSync);
-	
+    // btnAutoConnect->setToggleState(getLumatoneController()->isDetectingLumatone(), sendNotificationSync);
+
     //[/Constructor]
 }
 
@@ -199,10 +197,15 @@ MidiEditArea::~MidiEditArea()
 
     //[Destructor]. You can add your own custom destruction code here..
 	//deviceMonitor.stopThread(100);
-	TerpstraSysExApplication::getApp().getLumatoneController()->removeStatusListener(this);
+	// getLumatoneController()->removeStatusListener(this);
     //[/Destructor]
 }
 
+bool MidiEditArea::isConnected() const
+{
+	return getConnectionState() == ConnectionState::ONLINE;
+}
+
 //==============================================================================
 void MidiEditArea::paint (juce::Graphics& g)
 {
@@ -212,21 +215,21 @@ void MidiEditArea::paint (juce::Graphics& g)
     g.fillAll (juce::Colour (0xffbad0de));
 
     //[UserPaint] Add your own custom painting code here..
-	g.fillAll(lookAndFeel.findColour(LumatoneEditorColourIDs::LightBackground));
+	g.fillAll(getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::LightBackground));
 
 	// Dark background for title and logomark
-	g.setColour(lookAndFeel.findColour(LumatoneEditorColourIDs::DarkBackground));
+	g.setColour(getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::DarkBackground));
 	g.fillRect(lumatoneLabelBounds);
 	g.fillRect(connectivityArea);
 
 	// Rounded rect for device boxes
-	if (!isConnected)
+	if (!isConnected())
 	{
-		g.setColour(lookAndFeel.findColour(LumatoneEditorColourIDs::LightBackground));
+		g.setColour(getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::LightBackground));
 		g.fillRoundedRectangle(ioBounds, roundToInt(getHeight() * controlBoundsCornerRadius));
 	}
 
-	g.setColour(connectedColours[(int)(isConnected && liveEditorBtn->getToggleState())]);
+	g.setColour(connectedColours[(int)(isConnected() && liveEditorBtn->getToggleState())]);
 	drawPathToFillBounds(g, logomarkPath, logomarkBounds);
     //[/UserPaint]
 }
@@ -254,7 +257,7 @@ void MidiEditArea::resized()
 	logomarkBounds.setSize(logomarkSize, logomarkSize);
 	logomarkBounds.setCentre(ioBounds.getRight() + roundToInt((getWidth() - ioBounds.getRight()) * 0.5f), roundToInt(h * 0.5f));
 
-	if (isConnected)
+	if (isConnected())
 	{
 		int lblHeight = roundToInt(h * editModeHeight);
 		resizeLabelWithHeight(lblEditMode.get(), lblHeight);
@@ -337,7 +340,7 @@ void MidiEditArea::comboBoxChanged (juce::ComboBox* comboBoxThatHasChanged)
     {
         //[UserComboBoxCode_cbMidiInput] -- add your combo box handling code here..
 		if (cbMidiInput->getSelectedItemIndex() >= 0)
-			TerpstraSysExApplication::getApp().getLumatoneController()->setMidiInput(cbMidiInput->getSelectedItemIndex());
+			getLumatoneController()->setMidiInput(cbMidiInput->getSelectedItemIndex());
 
 		if (cbMidiInput->getSelectedItemIndex() < 0 || cbMidiOutput->getSelectedItemIndex() < 0)
 		{
@@ -349,7 +352,7 @@ void MidiEditArea::comboBoxChanged (juce::ComboBox* comboBoxThatHasChanged)
 		}
 		else
 		{
-			jassert(!isConnected);
+			jassert(!isConnected());
 			lblConnectionState->setText("Connecting...", NotificationType::dontSendNotification);
 		}
         //[/UserComboBoxCode_cbMidiInput]
@@ -358,7 +361,7 @@ void MidiEditArea::comboBoxChanged (juce::ComboBox* comboBoxThatHasChanged)
     {
         //[UserComboBoxCode_cbMidiOutput] -- add your combo box handling code here..
 		if (cbMidiOutput->getSelectedItemIndex() >= 0)
-			TerpstraSysExApplication::getApp().getLumatoneController()->setMidiOutput(cbMidiOutput->getSelectedItemIndex());
+			getLumatoneController()->setMidiOutput(cbMidiOutput->getSelectedItemIndex());
 
 		if (cbMidiInput->getSelectedItemIndex() < 0 || cbMidiOutput->getSelectedItemIndex() < 0)
 		{
@@ -370,8 +373,8 @@ void MidiEditArea::comboBoxChanged (juce::ComboBox* comboBoxThatHasChanged)
 		}
 		else
 		{
-			jassert(!isConnected);
-			lblConnectionState->setText("Connecting...", NotificationType::dontSendNotification);
+			jassert(!isConnected());
+			lblConnectionState->setText("Connecting...", juce::NotificationType::dontSendNotification);
 		}
         //[/UserComboBoxCode_cbMidiOutput]
     }
@@ -394,7 +397,7 @@ void MidiEditArea::buttonClicked (juce::Button* buttonThatWasClicked)
 
         if (btnAutoConnect->getToggleState())
 		{
-			TerpstraSysExApplication::getApp().getLumatoneController()->detectAndConnectToLumatone();
+			// getLumatoneController()->detectAndConnectToLumatone();
 			lblConnectionState->setText(translate("Searching for Lumatone..."), dontSendNotification);
 			//errorVisualizer.setErrorLevel(
 			//	*lblConnectionState.get(),
@@ -403,7 +406,7 @@ void MidiEditArea::buttonClicked (juce::Button* buttonThatWasClicked)
 		}
 		else
 		{
-			TerpstraSysExApplication::getApp().getLumatoneController()->stopAutoConnection();
+			// getLumatoneController()->stopAutoConnection();
 			lblConnectionState->setText(translate("Disconnected"), dontSendNotification);
 			startTimer(deviceRefreshTimeoutMs);
 		}
@@ -415,9 +418,8 @@ void MidiEditArea::buttonClicked (juce::Button* buttonThatWasClicked)
     //[UserbuttonClicked_Post]
 	else if (buttonThatWasClicked == liveEditorBtn.get())
 	{
-		auto sysExSendingMode = editModeTabIndexToMidiSysExSendingMode((int)!liveEditorBtn->getToggleState());
-
-		TerpstraSysExApplication::getApp().setEditMode(sysExSendingMode);
+		// auto sysExSendingMode = editModeTabIndexToMidiSysExSendingMode((int)!liveEditorBtn->getToggleState());
+		// TerpstraSysExApplication::getApp().setEditMode(sysExSendingMode);
 	}
     //[/UserbuttonClicked_Post]
 }
@@ -429,8 +431,8 @@ void MidiEditArea::buttonClicked (juce::Button* buttonThatWasClicked)
 void MidiEditArea::lookAndFeelChanged()
 {
 	connectedColours.clear();
-	connectedColours.add(getLookAndFeel().findColour(LumatoneEditorColourIDs::DisconnectedRed));
-	connectedColours.add(getLookAndFeel().findColour(LumatoneEditorColourIDs::ConnectedGreen));
+	connectedColours.add(getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::DisconnectedRed));
+	connectedColours.add(getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::ConnectedGreen));
 }
 
 void MidiEditArea::setConnectivity(bool isConnectedIn, String connectionStatus)
@@ -447,10 +449,9 @@ void MidiEditArea::setConnectivity(bool isConnectedIn, String connectionStatus)
 	liveEditorBtn->setVisible(isConnectedIn);
 	offlineEditorBtn->setVisible(isConnectedIn);
 
-	isConnected = isConnectedIn;
-	btnAutoConnect->setEnabled(!isConnected);
+	btnAutoConnect->setEnabled(!isConnectedIn);
 
-	if (isConnected)
+	if (isConnectedIn)
 	{
 		if (liveEditorBtn->getToggleState())
 		{
@@ -466,7 +467,7 @@ void MidiEditArea::setConnectivity(bool isConnectedIn, String connectionStatus)
 		}
 	}
 	else
-	{	
+	{
 		if (btnAutoConnect->getToggleState())
 		{
 			if (connectionStatus.isEmpty())
@@ -482,7 +483,7 @@ void MidiEditArea::setConnectivity(bool isConnectedIn, String connectionStatus)
 		}
 	}
 
-	lblConnectionState->setColour(Label::ColourIds::textColourId, connectedColours[isConnectedIn]);
+	lblConnectionState->setColour(juce::Label::ColourIds::textColourId, connectedColours[isConnectedIn]);
 
 	resized();
 	repaint();
@@ -495,56 +496,58 @@ void MidiEditArea::connectionFailed()
     //    *lblConnectionState.get(),
     //    HajuErrorVisualizer::ErrorLevel::error,
     //    "No answer...");
-	TerpstraSysExApplication::getApp().getLumatoneController()->setMidiInput(-1);
-	TerpstraSysExApplication::getApp().getLumatoneController()->setMidiOutput(-1);
+	// getLumatoneController()->setMidiInput(-1);
+	// getLumatoneController()->setMidiOutput(-1);
 }
-
-void MidiEditArea::connectionEstablished(int inputDevice, int outputDevice)
+void MidiEditArea::connectionStateChanged(ConnectionState state)
 {
-    if (inputDevice >= 0 && outputDevice >= 0)
-    {
-		refreshInputMenuAndSetSelected(inputDevice + 1, dontSendNotification);
-		refreshOutputMenuAndSetSelected(outputDevice + 1, dontSendNotification);
-        setConnectivity(true);
+	if (state == ConnectionState::ONLINE)
+	{
+		// if (inputDevice >= 0 && outputDevice >= 0)
+		// {
+		// 	refreshInputMenuAndSetSelected(inputDevice + 1, dontSendNotification);
+		// 	refreshOutputMenuAndSetSelected(outputDevice + 1, dontSendNotification);
+		// 	setConnectivity(true);
+
+		// 	onOpenConnectionToDevice();
+		// }
+		// else
+		// {
+		// 	jassertfalse;
+		// }
+	}
+	else if (state == ConnectionState::DISCONNECTED)
+	{
+		// Lost should only happen after connection is established
+		// jassert(isConnected);
 
-		onOpenConnectionToDevice();
-    }
-    else
-    {
-		jassertfalse;
-    }
+		// if (!btnAutoConnect->getToggleState())
+		// 	startTimer(deviceRefreshTimeoutMs);
+
+		// else
+		// {
+		// 	refreshInputMenuAndSetSelected(0, NotificationType::dontSendNotification);
+		// 	refreshOutputMenuAndSetSelected(0, NotificationType::sendNotificationAsync);
+		// }
 
+		// setConnectivity(false);
+	}
 	//deviceMonitor.intializeConnectionLossDetection();
 }
 
-void MidiEditArea::connectionLost()
+void MidiEditArea::editorModeChanged(EditorMode editModeIn)
 {
-	// Lost should only happen after connection is established
-	jassert(isConnected);
-
-	if (!btnAutoConnect->getToggleState())
-		startTimer(deviceRefreshTimeoutMs);
+	// editorMode = editModeIn;
 
-	else
+    switch (editModeIn)
     {
-        refreshInputMenuAndSetSelected(0, NotificationType::dontSendNotification);
-        refreshOutputMenuAndSetSelected(0, NotificationType::sendNotificationAsync);
-    }
-    
-    setConnectivity(false);
-}
-
-void MidiEditArea::editorModeChanged(sysExSendingMode editMode)
-{
-    switch (editMode)
-    {
-    case sysExSendingMode::liveEditor:
+    case EditorMode::ONLINE:
         liveEditorBtn->setToggleState(true, NotificationType::dontSendNotification);
-        if (TerpstraSysExApplication::getApp().getHasChangesToSave())
+        if (getHasChangesToSave())
             onOpenConnectionToDevice(translate("Switch to Live Mode with unsaved changes"));
         break;
 
-    case sysExSendingMode::offlineEditor:
+    case EditorMode::OFFLINE:
         offlineEditorBtn->setToggleState(true, NotificationType::dontSendNotification);
         lblConnectionState->setText(translate("Offline"), NotificationType::dontSendNotification);
         //errorVisualizer.setErrorLevel(
@@ -558,7 +561,7 @@ void MidiEditArea::editorModeChanged(sysExSendingMode editMode)
         break;
     }
 
-    lblConnectionState->setColour(Label::ColourIds::textColourId, connectedColours[(int)liveEditorBtn->getToggleState()]);
+    lblConnectionState->setColour(juce::Label::ColourIds::textColourId, connectedColours[(int)liveEditorBtn->getToggleState()]);
     repaint();
 }
 
@@ -575,7 +578,7 @@ void MidiEditArea::onOpenConnectionToDevice(String dialogTitle)
         DBG("Bad connection loop detected");
         return;
     }
-    
+
     isWaitingForUserChoice = true;
 
 	auto alertOptions = MessageBoxOptions().withTitle(dialogTitle)
@@ -585,20 +588,22 @@ void MidiEditArea::onOpenConnectionToDevice(String dialogTitle)
                                            .withButton("Send Editor Layout")
                                            .withButton("Keep Editing Offline")
                                            .withButton("Import From Lumatone");
-	
+
 	AlertWindow::showAsync(alertOptions, [&](int retc)
 		{
             isWaitingForUserChoice = false;
 
 			if (retc == 0) // Import
 			{
-				TerpstraSysExApplication::getApp().requestConfigurationFromDevice();
+				getLumatoneController()->sendGetCompleteMappingRequest();
+				// TerpstraSysExApplication::getApp().requestConfigurationFromDevice();
 				liveEditorBtn->setToggleState(true, NotificationType::sendNotification);
 				lblConnectionState->setText("Connected", NotificationType::dontSendNotification);
 			}
 			else if (retc == 1) // Send
 			{
-				TerpstraSysExApplication::getApp().sendCurrentConfigurationToDevice();
+				getLumatoneController()->sendCompleteMapping(*getMappingData(), true, false);
+				// TerpstraSysExApplication::getApp().sendCurrentConfigurationToDevice();
 				liveEditorBtn->setToggleState(true, NotificationType::sendNotification);
 				lblConnectionState->setText("Connected", NotificationType::dontSendNotification);
 			}
@@ -614,7 +619,7 @@ void MidiEditArea::refreshInputMenuAndSetSelected(int inputDeviceIndex, juce::No
 {
 	cbMidiInput->clear(NotificationType::dontSendNotification);
 	int i = 1;
-	for (auto device : TerpstraSysExApplication::getApp().getLumatoneController()->getMidiInputList())
+	for (auto device : getLumatoneController()->getMidiInputList())
 		cbMidiInput->addItem(device.name, i++);
 
 	if (inputDeviceIndex >= 0)
@@ -625,7 +630,7 @@ void MidiEditArea::refreshOutputMenuAndSetSelected(int outputDeviceIndex, juce::
 {
 	cbMidiOutput->clear(NotificationType::dontSendNotification);
 	int i = 1;
-	for (auto device : TerpstraSysExApplication::getApp().getLumatoneController()->getMidiOutputList())
+	for (auto device : getLumatoneController()->getMidiOutputList())
 		cbMidiOutput->addItem(device.name, i++);
 
 	if (outputDeviceIndex >= 0)
@@ -634,21 +639,21 @@ void MidiEditArea::refreshOutputMenuAndSetSelected(int outputDeviceIndex, juce::
 
 void MidiEditArea::timerCallback()
 {
-	if (isConnected)
+	if (isConnected())
 	{
 		stopTimer();
 	}
 	else
 	{
-		TerpstraSysExApplication::getApp().getLumatoneController()->refreshAvailableMidiDevices();
+		// getLumatoneController()->refreshAvailableMidiDevices();
 
 		refreshInputMenuAndSetSelected(
-			TerpstraSysExApplication::getApp().getLumatoneController()->getMidiInputIndex() + 1,
+			getLumatoneController()->getMidiInputIndex() + 1,
 			juce::NotificationType::dontSendNotification
 		);
 
 		refreshOutputMenuAndSetSelected(
-			TerpstraSysExApplication::getApp().getLumatoneController()->getMidiOutputIndex() + 1,
+			getLumatoneController()->getMidiOutputIndex() + 1,
 			juce::NotificationType::dontSendNotification
 		);
 	}
@@ -702,4 +707,3 @@ END_JUCER_METADATA
 
 //[EndFile] You can add extra defines here...
 //[/EndFile]
-
diff --git a/Source/MidiEditArea.h b/Source/MidiEditArea.h
index 0c486335..02748199 100644
--- a/Source/MidiEditArea.h
+++ b/Source/MidiEditArea.h
@@ -21,9 +21,12 @@
 
 //[Headers]     -- You can add your own extra header files here --
 #include <JuceHeader.h>
-#include "HajuLib/HajuErrorVisualizer.h"
-#include "ApplicationListeners.h"
-#include "LumatoneEditorLookAndFeel.h"
+
+#include "LumatoneEditorState.h"
+
+#include "./lumatone_editor_library/listeners/status_listener.h"
+#include "./lumatone_editor_library/listeners/editor_listener.h"
+
 //[/Headers]
 
 
@@ -36,7 +39,8 @@
     Describe your class and how it works here!
                                                                     //[/Comments]
 */
-class MidiEditArea  : public Component,
+class MidiEditArea  : public juce::Component,
+                      public LumatoneEditorState,
                       public LumatoneEditor::StatusListener,
                       public LumatoneEditor::EditorListener,
                       public juce::ComboBox::Listener,
@@ -45,9 +49,11 @@ class MidiEditArea  : public Component,
 {
 public:
     //==============================================================================
-    MidiEditArea (LumatoneEditorLookAndFeel& lookAndFeelIn);
+    MidiEditArea (const LumatoneEditorState& stateIn);
     ~MidiEditArea() override;
 
+    bool isConnected() const;
+
     //==============================================================================
     //[UserMethods]     -- You can add your own custom methods in this section.
     void lookAndFeelChanged() override;
@@ -59,18 +65,16 @@ class MidiEditArea  : public Component,
 
 	// Implementation of LumatoneEditor::StatusListener
     void connectionFailed() override;
-    void connectionEstablished(int inputDevice, int outputDevice) override;
-    void connectionLost() override;
+    void connectionStateChanged(ConnectionState state) override;
 
     // Implementation of LumatoneEditor::EditorListener
-    void editorModeChanged(sysExSendingMode editMode) override;
-
+    void editorModeChanged(EditorMode editModeIn);
 
     void timerCallback() override;
 
 private:
 
-    void setConnectivity(bool isConnected, String connectionStatus=String());
+    void setConnectivity(bool isConnected, juce::String connectionStatus=String());
 
 public:
     //[/UserMethods]
@@ -84,29 +88,20 @@ class MidiEditArea  : public Component,
 
 private:
     //[UserVariables]   -- You can add your own custom variables in this section.
-	// Indices of the editModeSelector tab
-	enum midiEditMode
-	{
-		liveEditor = 0,
-		offlineEditor = 1
-	};
-
-    bool                        isConnected = false;
+    // bool                        isConnected = false;
     bool                        isWaitingForConnectionTest = false;
     bool                        isWaitingForUserChoice = false;
 
-    LumatoneEditorLookAndFeel&  lookAndFeel;
-
-    std::unique_ptr<Label>      lumatoneLabel;
+    std::unique_ptr<juce::Label>      lumatoneLabel;
 
-    std::unique_ptr<TextButton> liveEditorBtn;
-    std::unique_ptr<TextButton> offlineEditorBtn;
+    std::unique_ptr<juce::TextButton> liveEditorBtn;
+    std::unique_ptr<juce::TextButton> offlineEditorBtn;
 
-    std::unique_ptr<Label>      pleaseConnectLabel;
-    std::unique_ptr<Label>      offlineMsgLabel;
+    std::unique_ptr<juce::Label>      pleaseConnectLabel;
+    std::unique_ptr<juce::Label>      offlineMsgLabel;
 
-    std::unique_ptr<Component>  logomark;
-    Path                        logomarkPath;
+    std::unique_ptr<juce::Component>  logomark;
+    juce::Path                        logomarkPath;
 
     const int                   deviceRefreshTimeoutMs = 500;
 
@@ -115,14 +110,14 @@ class MidiEditArea  : public Component,
 
     //std::unique_ptr<AlertWindow>     alert;
 
-    FlexBox          ioAreaFlexBox;
+    juce::FlexBox          ioAreaFlexBox;
 
-    Rectangle<int>   lumatoneLabelBounds;
-    Rectangle<float> connectivityArea;
-    Rectangle<float> logomarkBounds;
-    Rectangle<float> ioBounds;
+    juce::Rectangle<int>   lumatoneLabelBounds;
+    juce::Rectangle<float> connectivityArea;
+    juce::Rectangle<float> logomarkBounds;
+    juce::Rectangle<float> ioBounds;
 
-    Array<Colour> connectedColours = { Colour(0xffd7002a), Colour(0xff84aea3) };
+    juce::Array<juce::Colour> connectedColours = { juce::Colour(0xffd7002a), juce::Colour(0xff84aea3) };
 
     //==============================================================================
     // Position & Size constants
diff --git a/Source/NoteEditArea.cpp b/Source/NoteEditArea.cpp
index 993168d9..1da8863a 100644
--- a/Source/NoteEditArea.cpp
+++ b/Source/NoteEditArea.cpp
@@ -18,8 +18,16 @@
 */
 
 //[Headers] You can add your own extra header files here...
-#include "ViewConstants.h"
-#include "Main.h"
+#include "IsomorphicMassAssign.h"
+#include "SingleNoteAssign.h"
+#include "LumatoneEditorLookAndFeel.h"
+#include "KeyEditComponent.h"
+
+#include "./lumatone_editor_library/device/lumatone_controller.h"
+#include "./lumatone_editor_library/graphics/view_constants.h"
+
+#include "MainComponent.h"
+#include "./lumatone_editor_library/palettes/colour_view_component.h"
 //[/Headers]
 
 #include "NoteEditArea.h"
@@ -30,18 +38,19 @@
 //[/MiscUserDefs]
 
 //==============================================================================
-NoteEditArea::NoteEditArea ()
-    : currentSingleKeySelection(-1)
+NoteEditArea::NoteEditArea (const LumatoneEditorState& stateIn)
+    : LumatoneEditorState("NoteEditArea", stateIn)
+	, currentSingleKeySelection(-1)
 {
     //[Constructor_pre] You can add your own custom stuff here..
-    showIsomorphicMassAssign = TerpstraSysExApplication::getApp().getPropertiesFile()->getBoolValue("IsomorphicMassAssign", false);
+    // showIsomorphicMassAssign = TerpstraSysExApplication::getApp().getPropertiesFile()->getBoolValue("IsomorphicMassAssign", false);
     //[/Constructor_pre]
 
     setName ("NoteEditArea");
     editFunctionsTab.reset (new juce::TabbedComponent (juce::TabbedButtonBar::TabsAtTop));
     addAndMakeVisible (editFunctionsTab.get());
     editFunctionsTab->setTabBarDepth (30);
-    editFunctionsTab->addTab (TRANS("Manual Assign"), juce::Colours::lightgrey, new SingleNoteAssign(), true);
+    editFunctionsTab->addTab (TRANS("Manual Assign"), juce::Colours::lightgrey, new SingleNoteAssign(stateIn), true);
     editFunctionsTab->setCurrentTabIndex (0);
 
     editFunctionsTab->setBounds (8, 48, 320, 422);
@@ -66,10 +75,10 @@ NoteEditArea::NoteEditArea ()
 	editFunctionsTab->setColour(TabbedComponent::ColourIds::outlineColourId, Colour());
 	editFunctionsTab->setColour(TabbedComponent::ColourIds::backgroundColourId, Colour());
 
-	labelWindowTitle->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::UniviaProBold));
+	labelWindowTitle->setFont(getAppFonts().getFont(LumatoneEditorFont::UniviaProBold));
 
 	if (showIsomorphicMassAssign)
-		editFunctionsTab->addTab(TRANS("Isomorphic Assign"), juce::Colours::lightgrey, new IsomorphicMassAssign(), true);
+		editFunctionsTab->addTab(TRANS("Isomorphic Assign"), juce::Colours::lightgrey, new IsomorphicMassAssign(*this), true);
 
 	// Selector for octave boards
 	octaveBoardSelectorTab.reset(new TabbedButtonBar(TabbedButtonBar::Orientation::TabsAtTop));
@@ -95,6 +104,10 @@ NoteEditArea::NoteEditArea ()
     //[Constructor] You can add your own custom stuff here..
 	*/
 
+	getEditorLookAndFeel().setColour(LumatoneKeyEdit::backgroundColourId, findColour(juce::ResizableWindow::backgroundColourId));
+	getEditorLookAndFeel().setColour(LumatoneKeyEdit::outlineColourId, Colour(0xffd7d9da));
+	getEditorLookAndFeel().setColour(LumatoneKeyEdit::selectedKeyOutlineId, Colour(0xfff7990d));
+
 	// First octaveboard selection, selection on first key: see MainComponent (Has to be done after change listener has been established)
 
 	auto singleNoteAssign = dynamic_cast<SingleNoteAssign*>(editFunctionsTab->getTabContentComponent(0));
@@ -103,6 +116,8 @@ NoteEditArea::NoteEditArea ()
 		addColourSelectionListener(singleNoteAssign);
 	}
 
+	addEditorListener(this);
+
     //[/Constructor]
 }
 
@@ -111,6 +126,8 @@ NoteEditArea::~NoteEditArea()
     //[Destructor_pre]. You can add your own custom destruction code here..
     //[/Destructor_pre]
 
+	removeEditorListener(this);
+
     editFunctionsTab = nullptr;
     labelWindowTitle = nullptr;
 
@@ -119,7 +136,7 @@ NoteEditArea::~NoteEditArea()
 
 	octaveBoardSelectorTab = nullptr;
 
-	for (int i = 0; i < TerpstraSysExApplication::getApp().getOctaveBoardSize(); i++)
+	for (int i = 0; i < getOctaveBoardSize(); i++)
 	{
 		terpstraKeyFields[i] = nullptr;
 	}
@@ -193,7 +210,7 @@ void NoteEditArea::resized()
 	);
 
 	Array<Point<float>> keyCentres = lumatoneGeometry.getHexagonCentres(boardGeometry);
-	jassert(keyCentres.size() == TerpstraSysExApplication::getApp().getOctaveBoardSize());
+	jassert(keyCentres.size() == getOctaveBoardSize());
 
 	float keySize = lumatoneGeometry.getKeySize();
 
@@ -206,7 +223,7 @@ void NoteEditArea::resized()
 		terpstraKeyFields[keyIndex]->setCentrePosition(centre.roundToInt());
 	}
 
-	jassert(TerpstraSysExApplication::getApp().getOctaveBoardSize() == keyIndex);
+	jassert(getOctaveBoardSize() == keyIndex);
 
     //[/UserResized]
 }
@@ -215,7 +232,7 @@ void NoteEditArea::mouseDown (const juce::MouseEvent& e)
 {
     //[UserCode_mouseDown] -- Add your code here...
 	// Selection of single key fields
-	for (int keyIndex = 0; keyIndex < TerpstraSysExApplication::getApp().getOctaveBoardSize(); keyIndex++)
+	for (int keyIndex = 0; keyIndex < getOctaveBoardSize(); keyIndex++)
 	{
 		if (e.eventComponent == terpstraKeyFields[keyIndex].get() || e.eventComponent->getParentComponent() == terpstraKeyFields[keyIndex].get())
 		{
@@ -225,7 +242,7 @@ void NoteEditArea::mouseDown (const juce::MouseEvent& e)
 			// Grab key colour - may be replaced with eyedropper tool
 			if (e.mods.isAltDown())
 			{
-				auto colour = terpstraKeyFields[keyIndex]->colour;
+				auto colour = terpstraKeyFields[keyIndex]->getValue().getColour();
 				selectorListeners.call(&ColourSelectionListener::colourChangedCallback, this, colour);
 			}
 			// Standard assign action
@@ -233,7 +250,7 @@ void NoteEditArea::mouseDown (const juce::MouseEvent& e)
 			{
 				// Perform the edit, according to edit mode. Including sending to device
 				auto setSelection = octaveBoardSelectorTab->getCurrentTabIndex();
-				jassert(setSelection >= 0 && setSelection < MAXNUMBOARDS&& keyIndex >= 0 && keyIndex < TerpstraSysExApplication::getApp().getOctaveBoardSize());
+				jassert(setSelection >= 0 && setSelection < MAXNUMBOARDS&& keyIndex >= 0 && keyIndex < getOctaveBoardSize());
 
 				int editMode = editFunctionsTab->getCurrentTabIndex();
 				switch (editMode)
@@ -241,7 +258,7 @@ void NoteEditArea::mouseDown (const juce::MouseEvent& e)
 				case noteEditMode::SingleNoteAssignMode:
 				{
 					auto editAction = dynamic_cast<SingleNoteAssign*>(editFunctionsTab->getTabContentComponent(noteEditMode::SingleNoteAssignMode))->createEditAction(setSelection, keyIndex);
-					TerpstraSysExApplication::getApp().performUndoableAction(editAction);
+					performAction(editAction);
 					break;
 				}
 				case noteEditMode::IsomorphicMassAssignMode:
@@ -249,7 +266,7 @@ void NoteEditArea::mouseDown (const juce::MouseEvent& e)
 					bool mappingChanged = dynamic_cast<IsomorphicMassAssign*>(editFunctionsTab->getTabContentComponent(editMode))->performMouseDown(setSelection, keyIndex);
 					if (mappingChanged)
 					{
-						TerpstraSysExApplication::getApp().setHasChangesToSave(true);
+						// TerpstraSysExApplication::getApp().setHasChangesToSave(true);
 
 						// Refresh key fields (all may be affected)
 						((MainContentComponent*)getParentComponent())->refreshKeyDataFields();
@@ -309,7 +326,7 @@ void NoteEditArea::changeListenerCallback(ChangeBroadcaster *source)
 		auto setSelection = octaveBoardSelectorTab->getCurrentTabIndex();
 		jassert(setSelection >= 0 && setSelection < MAXNUMBOARDS);
 
-		setKeyFieldValues(*TerpstraSysExApplication::getApp().getMappingData()->getBoard(setSelection));
+		setKeyFieldValues(getBoard(setSelection));
 	}
 }
 
@@ -322,29 +339,34 @@ void NoteEditArea::onSetData(LumatoneLayout& newData)
 
 void NoteEditArea::setKeyFieldValues(const LumatoneBoard& keySet)
 {
-	for (int i = 0; i < TerpstraSysExApplication::getApp().getOctaveBoardSize(); i++)
-		terpstraKeyFields[i]->setValue(keySet.theKeys[i]);
+	for (int i = 0; i < getOctaveBoardSize(); i++)
+		terpstraKeyFields[i]->setValue(keySet.getKey(i));
 }
 
-ColourEditComponent* NoteEditArea::getColourEditComponent()
+ColourViewComponent* NoteEditArea::getColourViewComponent()
 {
-	return dynamic_cast<SingleNoteAssign*>(editFunctionsTab->getTabContentComponent(noteEditMode::SingleNoteAssignMode))->getColourEditComponent();
+	return dynamic_cast<SingleNoteAssign*>(editFunctionsTab->getTabContentComponent(noteEditMode::SingleNoteAssignMode))->getColourViewComponent();
 }
 
 ColourTextEditor* NoteEditArea::getSingleNoteColourTextEditor()
 {
-	return dynamic_cast<SingleNoteAssign*>(editFunctionsTab->getTabContentComponent(noteEditMode::SingleNoteAssignMode))->getColourTextEditor();;
+	return dynamic_cast<SingleNoteAssign*>(editFunctionsTab->getTabContentComponent(noteEditMode::SingleNoteAssignMode))->getColourTextEditor();
+}
+
+IsomorphicMassAssign *NoteEditArea::getIsomorphicMassAssignPanel()
+{
+	return dynamic_cast<IsomorphicMassAssign*>(editFunctionsTab->getTabContentComponent(1));
 }
 
 void NoteEditArea::changeSingleKeySelection(int newSelection)
 {
 	// Unselect previous key
-	if (currentSingleKeySelection >= 0 && currentSingleKeySelection < TerpstraSysExApplication::getApp().getOctaveBoardSize())
+	if (currentSingleKeySelection >= 0 && currentSingleKeySelection < getOctaveBoardSize())
 		terpstraKeyFields[currentSingleKeySelection]->setIsSelected(false);
 
 	// Select new key
 	currentSingleKeySelection = newSelection;
-	if (currentSingleKeySelection >= 0 && currentSingleKeySelection < TerpstraSysExApplication::getApp().getOctaveBoardSize())
+	if (currentSingleKeySelection >= 0 && currentSingleKeySelection < getOctaveBoardSize())
 		terpstraKeyFields[currentSingleKeySelection]->setIsSelected(true);
 }
 
@@ -352,12 +374,12 @@ void NoteEditArea::refreshKeyFields()
 {
 	auto setSelection = octaveBoardSelectorTab->getCurrentTabIndex();
 	jassert(setSelection >= 0 && setSelection < MAXNUMBOARDS);
-	setKeyFieldValues(*TerpstraSysExApplication::getApp().getLumatoneController()->getBoard(setSelection));
+	setKeyFieldValues(getBoard(setSelection));
 }
 
 void NoteEditArea::resetOctaveSize(bool refreshAndResize)
 {
-	int boardSize = TerpstraSysExApplication::getApp().getOctaveBoardSize();
+	int boardSize = getOctaveBoardSize();
 
 	jassert(boardSize == 55 || boardSize == 56);
 
@@ -372,7 +394,7 @@ void NoteEditArea::resetOctaveSize(bool refreshAndResize)
 
 		for (int i = 0; i < boardSize; i++)
 		{
-			terpstraKeyFields[i].reset(new TerpstraKeyEdit(boardIndex, i));
+			terpstraKeyFields[i].reset(new LumatoneKeyEdit(*this, boardIndex, i));
 			addAndMakeVisible(terpstraKeyFields[i].get());
 			terpstraKeyFields[i]->addMouseListener(this, true);
 		}
@@ -389,20 +411,40 @@ void NoteEditArea::resetOctaveSize(bool refreshAndResize)
 
 Colour NoteEditArea::getSelectedColour()
 {
-	if (currentSingleKeySelection >= 0 && currentSingleKeySelection < TerpstraSysExApplication::getApp().getOctaveBoardSize())
+	if (currentSingleKeySelection >= 0 && currentSingleKeySelection < getOctaveBoardSize())
 	{
-		return terpstraKeyFields[currentSingleKeySelection]->colour;
+		return terpstraKeyFields[currentSingleKeySelection]->getValue().getColour();
 	}
 
 	auto singleNoteAssign = dynamic_cast<SingleNoteAssign*>(editFunctionsTab->getTabContentComponent(SingleNoteAssignMode));
 	if (singleNoteAssign != nullptr)
 	{
-		return singleNoteAssign->getColourEditComponent()->getColourAsObject();
+		return singleNoteAssign->getColourViewComponent()->getColourAsObject();
 	}
 
 	return Colour();
 }
 
+void NoteEditArea::completeMappingLoaded(LumatoneLayout mappingData)
+{
+	refreshKeyFields();
+}
+
+void NoteEditArea::boardChanged(LumatoneBoard boardData)
+{
+	refreshKeyFields();
+}
+
+void NoteEditArea::keyChanged(int boardIndex, int keyIndex, LumatoneKey lumatoneKey)
+{
+	refreshKeyFields();
+}
+
+void NoteEditArea::selectionChanged(juce::Array<MappedLumatoneKey> selection)
+{
+	refreshKeyFields();
+}
+
 //[/MiscUserCode]
 
 
diff --git a/Source/NoteEditArea.h b/Source/NoteEditArea.h
index 63b31a03..9c1be419 100644
--- a/Source/NoteEditArea.h
+++ b/Source/NoteEditArea.h
@@ -22,18 +22,17 @@
 //[Headers]     -- You can add your own extra header files here --
 #include <JuceHeader.h>
 
-#include "ViewComponents.h"
-#include "./data/lumatone_layout.h"
-#include "ColourEditComponent.h"
+#include "LumatoneEditorState.h"
 
-#include "lumatone_geometry.h"
-#include "lumatone_tiling.h"
+#include "./lumatone_editor_library/mapping/lumatone_tiling.h"
+#include "./lumatone_editor_library/palettes/colour_selection_broadcaster.h"
+#include "./lumatone_editor_library/listeners/editor_listener.h"
 
-#include "LumatoneEditorStyleCommon.h"
-
-#include "SingleNoteAssign.h"
-#include "IsomorphicMassAssign.h"
+class ColourViewComponent;
+class ColourTextEditor;
+class IsomorphicMassAssign;
 
+class LumatoneKeyEdit;
 //[/Headers]
 
 
@@ -46,13 +45,15 @@
     Describe your class and how it works here!
                                                                     //[/Comments]
 */
-class NoteEditArea  : public Component,
-                      public ChangeListener,
+class NoteEditArea  : public juce::Component,
+                      public LumatoneEditorState,
+                      public juce::ChangeListener,
+                      public LumatoneEditor::EditorListener,
                       public ColourSelectionBroadcaster
 {
 public:
     //==============================================================================
-    NoteEditArea ();
+    NoteEditArea(const LumatoneEditorState& stateIn);
     ~NoteEditArea() override;
 
     //==============================================================================
@@ -69,13 +70,13 @@ class NoteEditArea  : public Component,
 	// Fill key fields with values from a certain octaveboard subset
 	void setKeyFieldValues(const LumatoneBoard& keySet);
 
-	TabbedButtonBar* getOctaveBoardSelectorTab() { return octaveBoardSelectorTab.get(); }
+	juce::TabbedButtonBar* getOctaveBoardSelectorTab() { return octaveBoardSelectorTab.get(); }
 
-    ColourEditComponent* getColourEditComponent();
+    ColourViewComponent* getColourViewComponent();
 
     ColourTextEditor* getSingleNoteColourTextEditor();
 
-    IsomorphicMassAssign* getIsomorphicMassAssignPanel() { return dynamic_cast<IsomorphicMassAssign*>(editFunctionsTab->getTabContentComponent(1)); }
+    IsomorphicMassAssign* getIsomorphicMassAssignPanel();
 
 	void changeSingleKeySelection(int newSelection);
 
@@ -89,9 +90,16 @@ class NoteEditArea  : public Component,
     void resetOctaveSize(bool refreshAndResize=true);
 
     // ColourSelectionBroadcaster Implementation
-    Colour getSelectedColour() override;
+    juce::Colour getSelectedColour() override;
     void deselectColour() override {};
 
+
+    void completeMappingLoaded(LumatoneLayout mappingData) override;
+    void boardChanged(LumatoneBoard boardData) override;
+    void keyChanged(int boardIndex, int keyIndex, LumatoneKey lumatoneKey) override;
+    void selectionChanged(juce::Array<MappedLumatoneKey> selection) override;
+
+
     //[/UserMethods]
 
     void paint (juce::Graphics& g) override;
@@ -112,19 +120,19 @@ class NoteEditArea  : public Component,
 	bool showIsomorphicMassAssign = false;
 
 	// Selector for octave boards
-	std::unique_ptr<TabbedButtonBar> octaveBoardSelectorTab;
+	std::unique_ptr<juce::TabbedButtonBar> octaveBoardSelectorTab;
 
 	// Editing single keys (of the selected 56-key set)
-	std::unique_ptr<TerpstraKeyEdit>	terpstraKeyFields[56];
+	std::unique_ptr<LumatoneKeyEdit>	terpstraKeyFields[56];
 
-    int					currentSingleKeySelection;
+    int	currentSingleKeySelection;
 
     // Key edit positioning
     LumatoneTiling lumatoneGeometry;
 
     //===========================================================================
     // Style Helpers
-    Colour backgroundColour = Colours::darkgrey;
+    juce::Colour backgroundColour = Colours::darkgrey;
 
     Rectangle<float> octaveTabsArea;
     Rectangle<float> contentBackground;
diff --git a/Source/NoteOnOffVelocityCurveDialog.cpp b/Source/NoteOnOffVelocityCurveDialog.cpp
index 61f055e1..61d5ecc3 100644
--- a/Source/NoteOnOffVelocityCurveDialog.cpp
+++ b/Source/NoteOnOffVelocityCurveDialog.cpp
@@ -9,11 +9,9 @@
 */
 
 #include "NoteOnOffVelocityCurveDialog.h"
-#include "TerpstraMidiDriver.h"
-#include "Main.h"
 
 //==============================================================================
-NoteOnOffVelocityCurveDialog::NoteOnOffVelocityCurveDialog()
-    : VelocityCurveDlgBase(LumatoneConfigTable::TableType::velocityInterval)
+NoteOnOffVelocityCurveDialog::NoteOnOffVelocityCurveDialog(const LumatoneEditorState& stateIn)
+    : VelocityCurveDlgBase(stateIn, LumatoneConfigTable::TableType::velocityInterval)
 {
 }
diff --git a/Source/NoteOnOffVelocityCurveDialog.h b/Source/NoteOnOffVelocityCurveDialog.h
index b5c6b786..9dc3a2f2 100644
--- a/Source/NoteOnOffVelocityCurveDialog.h
+++ b/Source/NoteOnOffVelocityCurveDialog.h
@@ -12,29 +12,31 @@
 
 #include "VelocityCurveDlgBase.h"
 
+class LumatoneEditorState;
+
 // Note on/on velocity curve dialog. Horizontal axis stands for ticks
 class NoteOnOffVelocityCurveDialog : public VelocityCurveDlgBase {
 public:
-    NoteOnOffVelocityCurveDialog();
+    NoteOnOffVelocityCurveDialog(const LumatoneEditorState& stateIn);
 };
 
 class FaderVelocityCurveDialog : public VelocityCurveDlgBase {
 public:
-    FaderVelocityCurveDialog() : VelocityCurveDlgBase(LumatoneConfigTable::TableType::fader)
+    FaderVelocityCurveDialog(const LumatoneEditorState& stateIn) : VelocityCurveDlgBase(stateIn, LumatoneConfigTable::TableType::fader)
     {
     }
 };
 
 class AftertouchVelocityCurveDialog : public VelocityCurveDlgBase {
 public:
-    AftertouchVelocityCurveDialog() : VelocityCurveDlgBase(LumatoneConfigTable::TableType::afterTouch)
+    AftertouchVelocityCurveDialog(const LumatoneEditorState& stateIn) : VelocityCurveDlgBase(stateIn, LumatoneConfigTable::TableType::afterTouch)
     {
     }
 };
 
 class LumatouchVelocityCurveDialog : public VelocityCurveDlgBase {
 public:
-    LumatouchVelocityCurveDialog() : VelocityCurveDlgBase(LumatoneConfigTable::TableType::lumaTouch)
+    LumatouchVelocityCurveDialog(const LumatoneEditorState& stateIn) : VelocityCurveDlgBase(stateIn, LumatoneConfigTable::TableType::lumaTouch)
     {
     }
 };
diff --git a/Source/PedalSensitivityDlg.cpp b/Source/PedalSensitivityDlg.cpp
index 4172f793..1e4d2fb2 100644
--- a/Source/PedalSensitivityDlg.cpp
+++ b/Source/PedalSensitivityDlg.cpp
@@ -18,8 +18,10 @@
 */
 
 //[Headers] You can add your own extra header files here...
-#include "Main.h"
-#include "./actions/edit_actions.h"
+#include "./lumatone_editor_library/device/lumatone_controller.h"
+
+#include "LumatoneEditorStyleCommon.h"
+#include "LumatoneEditorFontLibrary.h"
 //[/Headers]
 
 #include "PedalSensitivityDlg.h"
@@ -29,7 +31,8 @@
 //[/MiscUserDefs]
 
 //==============================================================================
-PedalSensitivityDlg::PedalSensitivityDlg ()
+PedalSensitivityDlg::PedalSensitivityDlg (const LumatoneEditorState& stateIn)
+    : LumatoneEditorState("PedalSensitivityDialog", stateIn)
 {
     //[Constructor_pre] You can add your own custom stuff here..
     //[/Constructor_pre]
@@ -94,11 +97,12 @@ PedalSensitivityDlg::PedalSensitivityDlg ()
 
 
     //[UserPreSize]
-    lblExpression->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::UniviaProBold));
-    lblSustain->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::UniviaProBold));
-    labelExprContrSensitivity->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::GothamNarrowMedium));
+    lblExpression->setFont(getAppFonts().getFont(LumatoneEditorFont::UniviaProBold));
+    lblSustain->setFont(getAppFonts().getFont(LumatoneEditorFont::UniviaProBold));
+    labelExprContrSensitivity->setFont(getAppFonts().getFont(LumatoneEditorFont::GothamNarrowMedium));
     labelExprContrSensitivity->setJustificationType(Justification::centred);
-    TerpstraSysExApplication::getApp().getLumatoneController()->addFirmwareListener(this);
+
+    // getLumatoneController()->addFirmwareListener(this);
     //[/UserPreSize]
 
     setSize (134, 96);
@@ -190,18 +194,13 @@ void PedalSensitivityDlg::buttonClicked (juce::Button* buttonThatWasClicked)
     if (buttonThatWasClicked == btnInvertExpression.get())
     {
         //[UserButtonCode_btnInvertExpression] -- add your button handler code here..
-		TerpstraSysExApplication::getApp().performUndoableAction(new LumatoneEditAction::InvertFootControllerEditAction(
-             TerpstraSysExApplication::getApp().getLumatoneController(),
-             btnInvertExpression->getToggleState()
-             ));
+        setInvertExpression(btnInvertExpression->getToggleState());
         //[/UserButtonCode_btnInvertExpression]
     }
     else if (buttonThatWasClicked == btnInvertSustain.get())
     {
         //[UserButtonCode_btnInvertSustain] -- add your button handler code here..
-        TerpstraSysExApplication::getApp().performUndoableAction(new LumatoneEditAction::InvertSustainEditAction(
-            TerpstraSysExApplication::getApp().getLumatoneController(),
-            btnInvertSustain->getToggleState()));
+        setInvertSustain(btnInvertSustain->getToggleState());
         //[/UserButtonCode_btnInvertSustain]
     }
 
@@ -231,10 +230,7 @@ void PedalSensitivityDlg::sliderValueChanged (juce::Slider* sliderThatWasMoved)
             sldExprCtrlSensitivity->setValue(newSensitvity);
         }
 
-        ((MainContentComponent*)getParentComponent())->getMappingInEdit().expressionControllerSensivity = newSensitvity;
-        TerpstraSysExApplication::getApp().setHasChangesToSave(true);
-        TerpstraSysExApplication::getApp().getLumatoneController()->sendExpressionPedalSensivity(newSensitvity);
-
+        setExpressionSensitivity(newSensitvity);
         //[/UserSliderCode_sldExprCtrlSensitivity]
     }
 
@@ -248,29 +244,28 @@ void PedalSensitivityDlg::sliderValueChanged (juce::Slider* sliderThatWasMoved)
 
 void PedalSensitivityDlg::lookAndFeelChanged()
 {
-    auto newLookAndFeel = dynamic_cast<LumatoneEditorLookAndFeel*>(&getLookAndFeel());
-    if (newLookAndFeel)
-    {
-        lblExpression->setColour(Label::ColourIds::textColourId, newLookAndFeel->findColour(LumatoneEditorColourIDs::LabelBlue));
-        lblSustain->setColour(Label::ColourIds::textColourId, newLookAndFeel->findColour(LumatoneEditorColourIDs::LabelBlue));
-        labelExprContrSensitivity->setColour(Label::ColourIds::textColourId, newLookAndFeel->findColour(LumatoneEditorColourIDs::DescriptionText));
-    }
+    juce::Component::lookAndFeelChanged();
+//     auto newLookAndFeel = dynamic_cast<LumatoneEditorLookAndFeel*>(&getLookAndFeel());
+//     if (newLookAndFeel)
+//     {
+//         lblExpression->setColour(Label::ColourIds::textColourId, newLookAndFeel->findColour(LumatoneEditorColourIDs::LabelBlue));
+//         lblSustain->setColour(Label::ColourIds::textColourId, newLookAndFeel->findColour(LumatoneEditorColourIDs::LabelBlue));
+//         labelExprContrSensitivity->setColour(Label::ColourIds::textColourId, newLookAndFeel->findColour(LumatoneEditorColourIDs::DescriptionText));
+//     }
 }
 
 void PedalSensitivityDlg::loadFromMapping()
 {
-	auto mappingInEdit = ((MainContentComponent*)getParentComponent())->getMappingInEdit();
+	// auto mappingInEdit = ((MainContentComponent*)getParentComponent())->getMappingInEdit();
 
-	btnInvertExpression->setToggleState(mappingInEdit.invertExpression, juce::NotificationType::dontSendNotification);
-    btnInvertSustain->setToggleState(mappingInEdit.invertSustain, juce::NotificationType::dontSendNotification);
-	sldExprCtrlSensitivity->setValue(mappingInEdit.expressionControllerSensivity, juce::NotificationType::dontSendNotification);
+	btnInvertExpression->setToggleState(getInvertExpression(), juce::NotificationType::dontSendNotification);
+    btnInvertSustain->setToggleState(getInvertSustain(), juce::NotificationType::dontSendNotification);
+	sldExprCtrlSensitivity->setValue(getExpressionSensitivity(), juce::NotificationType::dontSendNotification);
 }
 
-void PedalSensitivityDlg::firmwareRevisionReceived(FirmwareVersion version)
+void PedalSensitivityDlg::firmwareRevisionReceived(LumatoneFirmware::Version version)
 {
-    FirmwareSupport firmwareSupport;
-
-    if (firmwareSupport.versionAcknowledgesCommand(version, INVERT_SUSTAIN_PEDAL))
+    if (getFirmwareSupport().versionAcknowledgesCommand(version, INVERT_SUSTAIN_PEDAL))
     {
         btnInvertSustain->setEnabled(true);
         btnInvertSustain->setTooltip("");
@@ -282,7 +277,7 @@ void PedalSensitivityDlg::firmwareRevisionReceived(FirmwareVersion version)
     }
 }
 
-void PedalSensitivityDlg::presetFlagsReceived(PresetFlags presetFlags)
+void PedalSensitivityDlg::presetFlagsReceived(LumatoneFirmware::PresetFlags presetFlags)
 {
     btnInvertExpression->setToggleState(presetFlags.expressionPedalInverted, dontSendNotification);
     btnInvertSustain->setToggleState(presetFlags.sustainPedalInverted, dontSendNotification);
diff --git a/Source/PedalSensitivityDlg.h b/Source/PedalSensitivityDlg.h
index 1adf63a1..d8302cab 100644
--- a/Source/PedalSensitivityDlg.h
+++ b/Source/PedalSensitivityDlg.h
@@ -22,7 +22,9 @@
 //[Headers]     -- You can add your own extra header files here --
 #include <JuceHeader.h>
 
-#include "LumatoneEditorStyleCommon.h"
+#include "LumatoneEditorState.h"
+
+#include "./lumatone_editor_library/listeners/firmware_listener.h"
 //[/Headers]
 
 
@@ -36,13 +38,14 @@
                                                                     //[/Comments]
 */
 class PedalSensitivityDlg  : public juce::Component,
+                             public LumatoneEditorState,
                              public LumatoneEditor::FirmwareListener,
                              public juce::Button::Listener,
                              public juce::Slider::Listener
 {
 public:
     //==============================================================================
-    PedalSensitivityDlg ();
+    PedalSensitivityDlg (const LumatoneEditorState& stateIn);
     ~PedalSensitivityDlg() override;
 
     //==============================================================================
@@ -53,8 +56,8 @@ class PedalSensitivityDlg  : public juce::Component,
 	void lookAndFeelChanged() override;
 
     // LumatoneEditor::FirmwareListener implementation
-    void firmwareRevisionReceived(FirmwareVersion version) override;
-    void presetFlagsReceived(PresetFlags presetFlags) override;
+    void firmwareRevisionReceived(LumatoneFirmware::Version version) override;
+    void presetFlagsReceived(LumatoneFirmware::PresetFlags presetFlags) override;
     void expressionPedalSensitivityReceived(int sensitivity) override;
 
     //[/UserMethods]
@@ -90,4 +93,3 @@ class PedalSensitivityDlg  : public juce::Component,
 
 //[EndFile] You can add extra defines here...
 //[/EndFile]
-
diff --git a/Source/Settings/CalibrationDlg.cpp b/Source/Settings/CalibrationDlg.cpp
index 31ba2297..a059e31e 100644
--- a/Source/Settings/CalibrationDlg.cpp
+++ b/Source/Settings/CalibrationDlg.cpp
@@ -18,8 +18,12 @@
 */
 
 //[Headers] You can add your own extra header files here...
-#include "../ViewConstants.h"
-#include "../Main.h"
+#include "WheelsCalibrationComponent.h"
+
+#include "../LumatoneEditorLookAndFeel.h"
+
+#include "../lumatone_editor_library/graphics/view_constants.h"
+#include "../lumatone_editor_library/device/lumatone_controller.h"
 //[/Headers]
 
 #include "CalibrationDlg.h"
@@ -29,10 +33,11 @@
 //[/MiscUserDefs]
 
 //==============================================================================
-CalibrationDlg::CalibrationDlg ()
+CalibrationDlg::CalibrationDlg (const LumatoneEditorState& stateIn)
+	: LumatoneEditorState("CalibrationDialog", stateIn)
 {
     //[Constructor_pre] You can add your own custom stuff here..
-	instructionsFont = TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::FranklinGothic);
+	instructionsFont = getAppFonts().getFont(LumatoneEditorFont::FranklinGothic);
     //[/Constructor_pre]
 
     btnStart.reset (new juce::TextButton ("btnStart"));
@@ -64,7 +69,7 @@ CalibrationDlg::CalibrationDlg ()
 
 	calibrationSelectorTab->addChangeListener(this);
 
-	TerpstraSysExApplication::getApp().getLumatoneController()->addFirmwareListener(this);
+	// getLumatoneController()->addFirmwareListener(this);
 
     //[/UserPreSize]
 
@@ -81,7 +86,7 @@ CalibrationDlg::CalibrationDlg ()
 CalibrationDlg::~CalibrationDlg()
 {
     //[Destructor_pre]. You can add your own custom destruction code here..
-	TerpstraSysExApplication::getApp().getLumatoneController()->removeFirmwareListener(this);
+	// getLumatoneController()->removeFirmwareListener(this);
     //[/Destructor_pre]
 
     btnStart = nullptr;
@@ -173,15 +178,15 @@ void CalibrationDlg::buttonClicked (juce::Button* buttonThatWasClicked)
 		switch (tabSelection)
 		{
 		case calibrateKeys:
-			TerpstraSysExApplication::getApp().getLumatoneController()->startCalibrateKeys();
+			getLumatoneController()->startCalibrateKeys();
 			break;
 
 		case calibrateAftertouch:
-			TerpstraSysExApplication::getApp().getLumatoneController()->startCalibrateAftertouch();
+			getLumatoneController()->startCalibrateAftertouch();
 			break;
 
 		case calibrateModulationWheel:
-			TerpstraSysExApplication::getApp().getLumatoneController()->setCalibratePitchModWheel(true);
+			getLumatoneController()->setCalibratePitchModWheel(true);
             startCalibration = true;
 			break;
 
@@ -206,7 +211,7 @@ void CalibrationDlg::buttonClicked (juce::Button* buttonThatWasClicked)
 			jassertfalse;
 			break;
 		case calibrateModulationWheel:
-			TerpstraSysExApplication::getApp().getLumatoneController()->setCalibratePitchModWheel(false);
+			getLumatoneController()->setCalibratePitchModWheel(false);
             startCalibration = false;
 			break;
 		default:
@@ -224,12 +229,8 @@ void CalibrationDlg::buttonClicked (juce::Button* buttonThatWasClicked)
 void CalibrationDlg::lookAndFeelChanged()
 {
     //[UserCode_lookAndFeelChanged] -- Add your code here...
-	auto lookAndFeel = dynamic_cast<LumatoneEditorLookAndFeel*>(&getLookAndFeel());
-	if (lookAndFeel)
-	{
-		setColour(ResizableWindow::ColourIds::backgroundColourId, lookAndFeel->findColour(LumatoneEditorColourIDs::LightBackground));
-		setColour(DocumentWindow::ColourIds::textColourId, lookAndFeel->findColour(LumatoneEditorColourIDs::InactiveText));
-	}
+	setColour(ResizableWindow::ColourIds::backgroundColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::LightBackground));
+	setColour(DocumentWindow::ColourIds::textColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::InactiveText));
     //[/UserCode_lookAndFeelChanged]
 }
 
@@ -274,7 +275,7 @@ void CalibrationDlg::changeListenerCallback(ChangeBroadcaster *source)
 			setupWheelCalibrationLayout();
 			updateWheelCalibrationStatus();
 			break;
-                
+
 		default:
 			jassertfalse;
 			break;
@@ -285,8 +286,7 @@ void CalibrationDlg::changeListenerCallback(ChangeBroadcaster *source)
 
 void CalibrationDlg::setupWheelCalibrationLayout()
 {
-	FirmwareSupport support;
-	if (support.versionAcknowledgesCommand(TerpstraSysExApplication::getApp().getFirmwareVersion(), PERIPHERAL_CALBRATION_DATA))
+	if (getFirmwareSupport().versionAcknowledgesCommand(getFirmwareVersion(), PERIPHERAL_CALBRATION_DATA))
 	{
 		wheelsCalibrationComponent.reset(new WheelsCalibrationComponent());
 		addAndMakeVisible(wheelsCalibrationComponent.get());
@@ -297,25 +297,21 @@ void CalibrationDlg::setupWheelCalibrationLayout()
 
 void CalibrationDlg::updateWheelCalibrationStatus()
 {
-	bool inCalibration = TerpstraSysExApplication::getApp().getInCalibrationMode();
-	btnStart->setEnabled(!inCalibration);
-	btnStop->setEnabled(inCalibration);
+	btnStart->setEnabled(!getInCalibrationMode());
+	btnStop->setEnabled(getInCalibrationMode());
 }
 
-void CalibrationDlg::calibratePitchModWheelAnswer(TerpstraMIDIAnswerReturnCode code)
+void CalibrationDlg::calibratePitchModWheelAnswer(LumatoneFirmware::ReturnCode code)
 {
-    if (code == TerpstraMIDIAnswerReturnCode::ACK)
+    if (code == LumatoneFirmware::ReturnCode::ACK)
     {
-        if (startCalibration)
-            TerpstraSysExApplication::getApp().setCalibrationMode(true);
-        else
-            TerpstraSysExApplication::getApp().setCalibrationMode(false);
+		getLumatoneController()->setCalibratePitchModWheel(startCalibration);
         updateWheelCalibrationStatus();
         startCalibration = false;
     }
 }
 
-void CalibrationDlg::wheelsCalibrationDataReceived(WheelsCalibrationData calibrationData)
+void CalibrationDlg::wheelsCalibrationDataReceived(LumatoneFirmware::WheelsCalibrationData calibrationData)
 {
 	if (wheelsCalibrationComponent != nullptr)
 	{
@@ -361,4 +357,3 @@ END_JUCER_METADATA
 
 //[EndFile] You can add extra defines here...
 //[/EndFile]
-
diff --git a/Source/Settings/CalibrationDlg.h b/Source/Settings/CalibrationDlg.h
index cc8c0c4d..9510a5af 100644
--- a/Source/Settings/CalibrationDlg.h
+++ b/Source/Settings/CalibrationDlg.h
@@ -20,8 +20,13 @@
 #pragma once
 
 //[Headers]     -- You can add your own extra header files here --
-#include "../LumatoneController.h"
-#include "WheelsCalibrationComponent.h"
+
+#include "../LumatoneEditorState.h"
+#include "../lumatone_editor_library/lumatone_midi_driver/firmware_types.h"
+#include "../lumatone_editor_library/listeners/firmware_listener.h"
+
+class WheelsCalibrationComponent;
+
 //[/Headers]
 
 
@@ -35,13 +40,14 @@
                                                                     //[/Comments]
 */
 class CalibrationDlg  : public juce::Component,
+                        public LumatoneEditorState,
                         public ChangeListener,
                         public LumatoneEditor::FirmwareListener,
                         public juce::Button::Listener
 {
 public:
     //==============================================================================
-    CalibrationDlg ();
+    CalibrationDlg (const LumatoneEditorState& stateIn);
     ~CalibrationDlg() override;
 
     //==============================================================================
@@ -56,9 +62,9 @@ class CalibrationDlg  : public juce::Component,
     //==============================================================================
     // LumatoneEditor::FirmwareListener Implementation
 
-    void calibratePitchModWheelAnswer(TerpstraMIDIAnswerReturnCode code) override;
-    
-    void wheelsCalibrationDataReceived(WheelsCalibrationData calibrationData) override;
+    void calibratePitchModWheelAnswer(LumatoneFirmware::ReturnCode code) override;
+
+    void wheelsCalibrationDataReceived(LumatoneFirmware::WheelsCalibrationData calibrationData) override;
 
 
     //[/UserMethods]
@@ -79,16 +85,16 @@ class CalibrationDlg  : public juce::Component,
 		calibrateModulationWheel
 	};
 
-	std::unique_ptr<TabbedButtonBar> calibrationSelectorTab;
+	std::unique_ptr<juce::TabbedButtonBar> calibrationSelectorTab;
     std::unique_ptr<WheelsCalibrationComponent> wheelsCalibrationComponent;
-    
+
     bool startCalibration = false;
 
-	String instructionText;
+	juce::String instructionText;
 
 	// Style Helpers
-	Rectangle<int> instructionsBounds;
-    Font instructionsFont;
+	juce::Rectangle<int> instructionsBounds;
+    juce::Font instructionsFont;
 	const float fontHeightInBounds = 0.125f;
 	const int generalRim = 12;
 
@@ -107,4 +113,3 @@ class CalibrationDlg  : public juce::Component,
 
 //[EndFile] You can add extra defines here...
 //[/EndFile]
-
diff --git a/Source/Settings/FirmwareDlg.cpp b/Source/Settings/FirmwareDlg.cpp
index ba284f2e..c0a16430 100644
--- a/Source/Settings/FirmwareDlg.cpp
+++ b/Source/Settings/FirmwareDlg.cpp
@@ -9,17 +9,22 @@
 */
 
 #include "FirmwareDlg.h"
-#include "../Main.h"
 
-FirmwareDlg::FirmwareDlg()
+#include "../LumatoneEditorLookAndFeel.h"
+#include "../LumatoneEditorFontLibrary.h"
+
+#include "../lumatone_editor_library/device/lumatone_controller.h"
+
+FirmwareDlg::FirmwareDlg(const LumatoneEditorState& stateIn)
+    : LumatoneEditorState("FirmwareDlg", stateIn)
 {
     //checkUpdateBtn.reset(new TextButton("checkUpdateBtn"));
     //checkUpdateBtn->setButtonText("Check For Updates");
     //checkUpdateBtn->addListener(this);
     //addAndMakeVisible(checkUpdateBtn.get());
 
-    auto properties = TerpstraSysExApplication::getApp().getPropertiesFile();
-    File lastFirmwareLocation = properties->getValue("LastFirmwareBinPath", properties->getValue("UserDocumentsLocation", File::getSpecialLocation(File::SpecialLocationType::userDocumentsDirectory).getFullPathName()));
+    // auto properties = TerpstraSysExApplication::getApp().getPropertiesFile();
+    // File lastFirmwareLocation = properties->getValue("LastFirmwareBinPath", properties->getValue("UserDocumentsLocation", File::getSpecialLocation(File::SpecialLocationType::userDocumentsDirectory).getFullPathName()));
 
     String openFileType =
 #if JUCE_DEBUG
@@ -28,9 +33,9 @@ FirmwareDlg::FirmwareDlg()
         "*.tgz"
 #endif
         ;
-    fileBrowser.reset(new PathBrowserComponent("Lumatone Firmware Update", openFileType, lastFirmwareLocation));
-    fileBrowser->getEditor()->setColour(TextEditor::ColourIds::backgroundColourId, TerpstraSysExApplication::getApp().getLookAndFeel().findColour(LumatoneEditorColourIDs::ControlBoxBackground));
-    fileBrowser->getEditor()->setColour(TextEditor::ColourIds::textColourId, TerpstraSysExApplication::getApp().getLookAndFeel().findColour(LumatoneEditorColourIDs::DescriptionText));
+    fileBrowser.reset(new PathBrowserComponent("Lumatone Firmware Update", openFileType));
+    fileBrowser->getEditor()->setColour(TextEditor::ColourIds::backgroundColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::ControlBoxBackground));
+    fileBrowser->getEditor()->setColour(TextEditor::ColourIds::textColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::DescriptionText));
     fileBrowser->getEditor()->getProperties().set(LumatoneEditorStyleIDs::connectedEdgeFlags, Button::ConnectedEdgeFlags::ConnectedOnRight);
     fileBrowser->addListener(this);
     addAndMakeVisible(fileBrowser.get());
@@ -44,8 +49,8 @@ FirmwareDlg::FirmwareDlg()
     infoBox->setMouseClickGrabsKeyboardFocus(false);
     infoBox->setReadOnly(true);
     infoBox->setMultiLine(true);
-    infoBox->setColour(TextEditor::ColourIds::backgroundColourId, TerpstraSysExApplication::getApp().getLookAndFeel().findColour(LumatoneEditorColourIDs::ControlBoxBackground));
-    infoBox->setColour(TextEditor::ColourIds::textColourId, TerpstraSysExApplication::getApp().getLookAndFeel().findColour(LumatoneEditorColourIDs::DescriptionText));
+    infoBox->setColour(TextEditor::ColourIds::backgroundColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::ControlBoxBackground));
+    infoBox->setColour(TextEditor::ColourIds::textColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::DescriptionText));
     infoBox->setColour(ScrollBar::ColourIds::thumbColourId, Colour(0xff2d3135));
     infoBox->getProperties().set(LumatoneEditorStyleIDs::connectedEdgeFlags, 15);
     addAndMakeVisible(infoBox.get());
@@ -54,7 +59,7 @@ FirmwareDlg::FirmwareDlg()
     addAndMakeVisible(firmwareStatusLabel.get());
     updateFirmwareVersionLabel();
 
-    TerpstraSysExApplication::getApp().getLumatoneController()->addFirmwareListener(this);
+    // getLumatoneController()->addFirmwareListener(this);
 
     postMessage(translate("Select a firmware file and then click \"Begin Update\""));
 
@@ -66,7 +71,7 @@ FirmwareDlg::FirmwareDlg()
 
 FirmwareDlg::~FirmwareDlg()
 {
-    TerpstraSysExApplication::getApp().getLumatoneController()->removeFirmwareListener(this);
+    // getLumatoneController()->removeFirmwareListener(this);
 }
 
 void FirmwareDlg::paint(Graphics& g)
@@ -86,7 +91,7 @@ void FirmwareDlg::resized()
     firmwareStatusLabel->setBounds(margin, fileBrowser->getBottom() + margin, getWidth() - doubleMargin, buttonHeight / 2);
 
     infoBox->setBounds(getLocalBounds().withTop(firmwareStatusLabel->getBottom()).reduced(margin));
-    infoBox->applyFontToAllText(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::FranklinGothic));
+    infoBox->applyFontToAllText(getAppFonts().getFont(LumatoneEditorFont::FranklinGothic));
 }
 
 void FirmwareDlg::buttonClicked(Button* btn)
@@ -97,7 +102,7 @@ void FirmwareDlg::buttonClicked(Button* btn)
     //}
     if (btn == doUpdateBtn.get())
     {
-        if (TerpstraSysExApplication::getApp().getLumatoneController()->getMidiInputIndex() < 0 || TerpstraSysExApplication::getApp().getLumatoneController()->getMidiOutputIndex() < 0)
+        if (getMidiInputIndex() < 0 || getMidiOutputIndex() < 0)
         {
             AlertWindow::showMessageBoxAsync(AlertWindow::AlertIconType::NoIcon, "Not connected", "Please connect the Lumatone via USB before performing a firmware update.", "Ok", this);
             return;
@@ -107,8 +112,8 @@ void FirmwareDlg::buttonClicked(Button* btn)
 
         if (firmwareFileSelected.existsAsFile())
         {
-            TerpstraSysExApplication::getApp().getPropertiesFile()->setValue("LastFirmwareBinPath", firmwareFileSelected.getParentDirectory().getFullPathName());
-            TerpstraSysExApplication::getApp().getLumatoneController()->requestFirmwareUpdate(firmwareFileSelected, this);
+            // TerpstraSysExApplication::getApp().getPropertiesFile()->setValue("LastFirmwareBinPath", firmwareFileSelected.getParentDirectory().getFullPathName());
+            // getLumatoneController()->requestFirmwareUpdate(firmwareFileSelected, this);
         }
         else
         {
@@ -121,7 +126,8 @@ void FirmwareDlg::buttonClicked(Button* btn)
 // TODO: use LumatoneFirmwareVersion
 void FirmwareDlg::updateFirmwareVersionLabel()
 {
-    String firmwareVersion = TerpstraSysExApplication::getApp().getFirmwareVersionStr();
+    // juce::String firmwareVersion = TerpstraSysExApplication::getApp().getFirmwareVersionStr();
+    juce::String firmwareVersion = getFirmwareVersion().toString();
     if (firmwareVersion != "0.0.0")
     {
         firmwareStatusLabel->setText("Current firmware version is: " + firmwareVersion, dontSendNotification);
@@ -159,13 +165,13 @@ void FirmwareDlg::timerCallback()
     }
 }
 
-void FirmwareDlg::firmwareRevisionReceived(FirmwareVersion version)
+void FirmwareDlg::firmwareRevisionReceived(LumatoneFirmware::Version version)
 {
      updateFirmwareVersionLabel();
      postMessage("Firmware update complete! Lumatone is now running firmware version " + version.toDisplayString());
 }
 
-void FirmwareDlg::postMessage(String msg) 
+void FirmwareDlg::postMessage(String msg)
 {
     msgLog += msg + '\n';
     infoNeedsUpdate = true;
diff --git a/Source/Settings/FirmwareDlg.h b/Source/Settings/FirmwareDlg.h
index 64993aab..34de2e7f 100644
--- a/Source/Settings/FirmwareDlg.h
+++ b/Source/Settings/FirmwareDlg.h
@@ -9,46 +9,49 @@
 */
 
 #pragma once
+
+#include "../LumatoneEditorState.h"
 #include "../FileBrowserComponent.h"
 #include "../FirmwareTransfer.h"
-#include "../LumatoneController.h"
 
+#include "../lumatone_editor_library/listeners/firmware_listener.h"
 
-class FirmwareDlg : public Component, 
-    protected Button::Listener, 
-    protected PathBrowserComponent::Listener,
-    protected FirmwareTransfer::ProcessListener,
-    protected LumatoneEditor::FirmwareListener,
-    private Timer
+class FirmwareDlg : public Component
+                  , public LumatoneEditorState
+                  , protected Button::Listener
+                  , protected PathBrowserComponent::Listener
+                  , protected FirmwareTransfer::ProcessListener
+                  , protected LumatoneEditor::FirmwareListener
+                  , private Timer
 {
 public:
 
-    FirmwareDlg();
+    FirmwareDlg(const LumatoneEditorState& stateIn);
     ~FirmwareDlg();
 
-    void paint(Graphics& g) override;
+    void paint(juce::Graphics& g) override;
 
     void resized() override;
 
-    void buttonClicked(Button* btn) override;
+    void buttonClicked(juce::Button* btn) override;
 
     void updateFirmwareVersionLabel();
 
-    void postMessage(String msgForLog);
-    
+    void postMessage(juce::String msgForLog);
+
     //=========================================================================
     // PathBrowserComponent::Listener Implementation
-    void fileChanged(PathBrowserComponent* source, File) override;
+    void fileChanged(PathBrowserComponent* source, juce::File) override;
 
     //=========================================================================
     // FirmwareTransfer::Listener Implementation
-    void firmwareTransferUpdate(FirmwareTransfer::StatusCode statusCode, String msg) override;
+    void firmwareTransferUpdate(FirmwareTransfer::StatusCode statusCode, juce::String msg) override;
 
     //=========================================================================
     // LumatoneEditor::FirmwareListener implementation
 
-    void firmwareRevisionReceived(FirmwareVersion version) override;
-    
+    void firmwareRevisionReceived(LumatoneFirmware::Version version) override;
+
     //=========================================================================
     // juce::Timer Implementation
     void timerCallback() override;
@@ -58,16 +61,16 @@ class FirmwareDlg : public Component,
     bool updateIsAvailable = false;
     bool firmwareUpdateInProgress = false;
 
-    File firmwareFileSelected;
+    juce::File firmwareFileSelected;
 
     //std::unique_ptr<TextButton> checkUpdateBtn;
     std::unique_ptr<PathBrowserComponent> fileBrowser;
-    std::unique_ptr<TextButton> doUpdateBtn;
-    std::unique_ptr<TextEditor> infoBox;
-    
-    std::unique_ptr<Label> firmwareStatusLabel;
+    std::unique_ptr<juce::TextButton> doUpdateBtn;
+    std::unique_ptr<juce::TextEditor> infoBox;
+
+    std::unique_ptr<juce::Label> firmwareStatusLabel;
 
-    String msgLog;
+    juce::String msgLog;
     bool infoNeedsUpdate = false;
     const int infoUpdateTimeoutMs = 100;
 
diff --git a/Source/Settings/MidiSettingsDlg.cpp b/Source/Settings/MidiSettingsDlg.cpp
index ddd01c71..fc4d389a 100644
--- a/Source/Settings/MidiSettingsDlg.cpp
+++ b/Source/Settings/MidiSettingsDlg.cpp
@@ -9,16 +9,21 @@
 */
 
 #include "MidiSettingsDlg.h"
-#include "../Main.h"
 
-MidiSettingsDlg::MidiSettingsDlg()
+#include "../LumatoneEditorFontLibrary.h"
+
+#include "../lumatone_editor_library/device/lumatone_controller.h"
+
+
+MidiSettingsDlg::MidiSettingsDlg(const LumatoneEditorState& stateIn)
+    : LumatoneEditorState("MidiSettingsDlg", stateIn)
 {
     setMidiChannelHeader.reset(new Label("SetMidiChannelHeader", "Set Controller MIDI Channel"));
     setMidiChannelHeader->setJustificationType(Justification::centred);
-    setMidiChannelHeader->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::UniviaPro));
+    setMidiChannelHeader->setFont(getAppFonts().getFont(LumatoneEditorFont::UniviaPro));
     addAndMakeVisible(setMidiChannelHeader.get());
 
-    controlLabelFont = TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::GothamNarrowMedium);
+    controlLabelFont = getAppFonts().getFont(LumatoneEditorFont::GothamNarrowMedium);
 
     for (auto controlName : ControlNames)
     {
@@ -44,16 +49,16 @@ MidiSettingsDlg::MidiSettingsDlg()
     flexBox.justifyContent = FlexBox::JustifyContent::flexStart;
     flexBox.alignContent = FlexBox::AlignContent::flexStart;
 
-    TerpstraSysExApplication::getApp().getLumatoneController()->addFirmwareListener(this);
+    // getLumatoneController()->addFirmwareListener(this);
 
-    setSupportedControls(TerpstraSysExApplication::getApp().getFirmwareVersion());
+    setSupportedControls(getFirmwareVersion());
 }
 
 MidiSettingsDlg::~MidiSettingsDlg()
 {
     // Not good when app closes with this window open...
-    TerpstraSysExApplication::getApp().getLumatoneController()->removeFirmwareListener(this);
-    
+    // getLumatoneController()->removeFirmwareListener(this);
+
     setMidiChannelHeader = nullptr;
     setMidiChannelLabels.clear();
     setMidiChannelSliders.clear();
@@ -102,7 +107,7 @@ void MidiSettingsDlg::resized()
         flexRow.items.add(sldItem);
 
         auto rowItem = FlexItem(getWidth(), rowHeight);
-        rowItem.associatedFlexBox = &flexRow; 
+        rowItem.associatedFlexBox = &flexRow;
         rowItem.margin = FlexItem::Margin(0, 0, margin, 0);
 
         flexBox.items.add(rowItem);
@@ -119,12 +124,12 @@ void MidiSettingsDlg::sliderValueChanged(Slider* sld)
 
     if (controlIndex >= 0 && controlIndex < ControlNames.size())
     {
-        channelSettings.setChannel((PeripheralChannel)controlIndex, sld->getValue());
+        channelSettings.setChannel((LumatoneFirmware::PeripheralChannel)controlIndex, sld->getValue());
         sendChannelSettings();
     }
 }
 
-void MidiSettingsDlg::setSupportedControls(FirmwareVersion version)
+void MidiSettingsDlg::setSupportedControls(LumatoneFirmware::Version version)
 {
     bool setChannelsEnabled = false;
 
@@ -132,7 +137,7 @@ void MidiSettingsDlg::setSupportedControls(FirmwareVersion version)
     if (support.versionAcknowledgesCommand(version, SET_PERIPHERAL_CHANNELS))
     {
         setChannelsEnabled = true;
-        TerpstraSysExApplication::getApp().getLumatoneController()->getPeripheralChannels();
+        getLumatoneController()->getPeripheralChannels();
     }
 
     for (int i = 0; i < ControlNames.size(); i++)
@@ -146,31 +151,31 @@ void MidiSettingsDlg::setSupportedControls(FirmwareVersion version)
     }
 }
 
-void MidiSettingsDlg::updateChannelSettings(PeripheralChannelSettings channelSettingsIn)
+void MidiSettingsDlg::updateChannelSettings(LumatoneFirmware::PeripheralChannelSettings channelSettingsIn)
 {
     channelSettings = channelSettingsIn;
 
     for (int i = 0; i < ControlNames.size(); i++)
     {
-        auto channel = channelSettings.getChannel((PeripheralChannel)i);
+        auto channel = channelSettings.getChannel((LumatoneFirmware::PeripheralChannel)i);
         setMidiChannelSliders[i]->setValue(channel, dontSendNotification);
     }
 }
 
 void MidiSettingsDlg::sendChannelSettings()
 {
-    TerpstraSysExApplication::getApp().getLumatoneController()->setPeripheralChannels(channelSettings);
+    getLumatoneController()->setPeripheralChannels(channelSettings);
 }
 
 //=========================================================================
 // LumatoneEditor::FirmwareListener implementation
 
-void MidiSettingsDlg::firmwareRevisionReceived(FirmwareVersion version)
+void MidiSettingsDlg::firmwareRevisionReceived(LumatoneFirmware::Version version)
 {
     setSupportedControls(version);
 }
 
-void MidiSettingsDlg::peripheralMidiChannelsReceived(PeripheralChannelSettings channelSettings)
+void MidiSettingsDlg::peripheralMidiChannelsReceived(LumatoneFirmware::PeripheralChannelSettings channelSettings)
 {
     updateChannelSettings(channelSettings);
 }
diff --git a/Source/Settings/MidiSettingsDlg.h b/Source/Settings/MidiSettingsDlg.h
index 4f847afe..45601381 100644
--- a/Source/Settings/MidiSettingsDlg.h
+++ b/Source/Settings/MidiSettingsDlg.h
@@ -10,42 +10,46 @@
 
 #pragma once
 
-#include "../LumatoneController.h"
+#include "../LumatoneEditorState.h"
 
-class MidiSettingsDlg : public Component,
-    protected Slider::Listener,
-    protected LumatoneEditor::FirmwareListener
+#include "../lumatone_editor_library/listeners/firmware_listener.h"
+#include "../lumatone_editor_library/lumatone_midi_driver/firmware_types.h"
+
+class MidiSettingsDlg : public Component
+                      , public LumatoneEditorState
+                      , protected Slider::Listener
+                      , protected LumatoneEditor::FirmwareListener
 {
 public:
 
-    MidiSettingsDlg();
+    MidiSettingsDlg(const LumatoneEditorState& stateIn);
     ~MidiSettingsDlg();
 
-    void paint(Graphics & g) override;
+    void paint(juce::Graphics & g) override;
 
     void resized() override;
 
-    void sliderValueChanged(Slider* sld) override;
+    void sliderValueChanged(juce::Slider* sld) override;
 
-    void setSupportedControls(FirmwareVersion version);
+    void setSupportedControls(LumatoneFirmware::Version version);
 
-    void updateChannelSettings(PeripheralChannelSettings channelSettings);
+    void updateChannelSettings(LumatoneFirmware::PeripheralChannelSettings channelSettings);
 
     void sendChannelSettings();
 
     //=========================================================================
     // LumatoneEditor::FirmwareListener implementation
 
-    void firmwareRevisionReceived(FirmwareVersion version) override;
+    void firmwareRevisionReceived(LumatoneFirmware::Version version) override;
 
-    void peripheralMidiChannelsReceived(PeripheralChannelSettings channelSettings) override;
+    void peripheralMidiChannelsReceived(LumatoneFirmware::PeripheralChannelSettings channelSettings) override;
 
 
 
 private:
     //=========================================================================
 
-    const StringArray ControlNames = 
+    const juce::StringArray ControlNames =
     {
         "Pitch Wheel",
         "Mod Wheel",
@@ -55,21 +59,21 @@ class MidiSettingsDlg : public Component,
 
 private:
 
-    std::unique_ptr<Label>      setMidiChannelHeader;
+    std::unique_ptr<juce::Label>    setMidiChannelHeader;
+
+    juce::OwnedArray<juce::Slider>  setMidiChannelSliders;
+    juce::OwnedArray<juce::Label>   setMidiChannelLabels;
+
+    LumatoneFirmware:: PeripheralChannelSettings channelSettings;
 
-    OwnedArray<Slider>          setMidiChannelSliders;
-    OwnedArray<Label>           setMidiChannelLabels;
-    
-    PeripheralChannelSettings   channelSettings;
-        
-    FlexBox flexBox;
-    Array<FlexBox> flexRows;
+    juce::FlexBox flexBox;
+    juce::Array<juce::FlexBox> flexRows;
 
     // Style helpers
     const int margin = 12;
     const int buttonHeight = 30;
     const float fontHeightInBounds = 0.08f;
 
-    String longestControlName;
-    Font controlLabelFont;
-};
\ No newline at end of file
+    juce::String longestControlName;
+    juce::Font controlLabelFont;
+};
diff --git a/Source/Settings/PresetSettingsDlg.cpp b/Source/Settings/PresetSettingsDlg.cpp
index 7af2e3f5..2254e0ef 100644
--- a/Source/Settings/PresetSettingsDlg.cpp
+++ b/Source/Settings/PresetSettingsDlg.cpp
@@ -9,20 +9,20 @@
 */
 
 #include "PresetSettingsDlg.h"
-#include "../Main.h"
+#include "../lumatone_editor_library/device/lumatone_controller.h"
 
-PresetSettingsDlg::PresetSettingsDlg()
+PresetSettingsDlg::PresetSettingsDlg(const LumatoneEditorState& stateIn)
+    : LumatoneEditorState("PresetSettingsDlg", stateIn)
 {
     resetPresetsBtn.reset(new TextButton(
-        translate("Reset Presets To Factory Default"),
-        translate("Clear the mapping presets stored on the device and replace with factory mappings.")
+        juce::translate("Reset Presets To Factory Default"),
+        juce::translate("Clear the mapping presets stored on the device and replace with factory mappings.")
     ));
     addAndMakeVisible(resetPresetsBtn.get());
     resetPresetsBtn->addListener(this);
 
-    TerpstraSysExApplication::getApp().getLumatoneController()->addFirmwareListener(this);
-
-    setSupportedControls(TerpstraSysExApplication::getApp().getFirmwareVersion());
+    // getLumatoneController()->addFirmwareListener(this);
+    setSupportedControls(getFirmwareVersion());
 
     flexBox.justifyContent = FlexBox::JustifyContent::flexStart;
     flexBox.alignContent = FlexBox::AlignContent::flexStart;
@@ -30,7 +30,7 @@ PresetSettingsDlg::PresetSettingsDlg()
 
 PresetSettingsDlg::~PresetSettingsDlg()
 {
-    TerpstraSysExApplication::getApp().getLumatoneController()->removeFirmwareListener(this);
+    // getLumatoneController()->removeFirmwareListener(this);
     resetPresetsBtn = nullptr;
 }
 
@@ -41,13 +41,13 @@ void PresetSettingsDlg::paint(Graphics& g)
 
 void PresetSettingsDlg::resized()
 {
-    Font btnFont = getLookAndFeel().getTextButtonFont(*resetPresetsBtn.get(), buttonHeight);
+    juce::Font btnFont = getLookAndFeel().getTextButtonFont(*resetPresetsBtn.get(), buttonHeight);
 
     int btnWidth = btnFont.getStringWidth(resetPresetsBtn->getButtonText()) * 1.2f;
 
     flexBox.items.clear();
 
-    FlexItem btnItem = FlexItem().withWidth(btnWidth).withHeight(buttonHeight);
+    juce::FlexItem btnItem = juce::FlexItem().withWidth(btnWidth).withHeight(buttonHeight);
     btnItem.associatedComponent = resetPresetsBtn.get();
     flexBox.items.add(btnItem);
 
@@ -58,27 +58,26 @@ void PresetSettingsDlg::buttonClicked(Button* btn)
 {
     if (btn == resetPresetsBtn.get())
     {
-        TerpstraSysExApplication::getApp().getLumatoneController()->resetPresetsToFactoryDefault();
+        getLumatoneController()->resetPresetsToFactoryDefault();
     }
 }
 
-void PresetSettingsDlg::firmwareRevisionReceived(FirmwareVersion version)
+void PresetSettingsDlg::firmwareRevisionReceived(LumatoneFirmware::Version version)
 {
     setSupportedControls(version);
 }
 
-void PresetSettingsDlg::setSupportedControls(FirmwareVersion version)
+void PresetSettingsDlg::setSupportedControls(LumatoneFirmware::Version version)
 {
-    FirmwareSupport support;
-    if (support.versionAcknowledgesCommand(version, RESET_DEFAULT_PRESETS))
+    if (getFirmwareSupport().versionAcknowledgesCommand(version, RESET_DEFAULT_PRESETS))
     {
         resetPresetsBtn->setEnabled(true);
-        resetPresetsBtn->setTooltip(translate("Clear the mapping presets stored on the device and replace with factory mappings."));
+        resetPresetsBtn->setTooltip(juce::translate("Clear the mapping presets stored on the device and replace with factory mappings."));
     }
     else
     {
         resetPresetsBtn->setEnabled(false);
-        resetPresetsBtn->setTooltip(translate("This feature is not supported by your Lumatone firmware version."));
+        resetPresetsBtn->setTooltip(juce::translate("This feature is not supported by your Lumatone firmware version."));
         // TODO: better approach for changing tooltips
     }
-}
\ No newline at end of file
+}
diff --git a/Source/Settings/PresetSettingsDlg.h b/Source/Settings/PresetSettingsDlg.h
index fd65d2e9..df5cc346 100644
--- a/Source/Settings/PresetSettingsDlg.h
+++ b/Source/Settings/PresetSettingsDlg.h
@@ -9,38 +9,44 @@
 */
 
 #pragma once
-#include "../LumatoneController.h"
+#include <JuceHeader.h>
 
-class PresetSettingsDlg : public Component,
-    protected Button::Listener,
-    protected LumatoneEditor::FirmwareListener
+#include "../LumatoneEditorState.h"
+
+#include "../lumatone_editor_library/listeners/firmware_listener.h"
+#include "../lumatone_editor_library/lumatone_midi_driver/firmware_types.h"
+
+class PresetSettingsDlg : public Component
+                        , LumatoneEditorState
+                        , protected Button::Listener
+                        , protected LumatoneEditor::FirmwareListener
 
 {
 public:
 
-    PresetSettingsDlg();
+    PresetSettingsDlg(const LumatoneEditorState& stateIn);
     ~PresetSettingsDlg();
 
-    void paint(Graphics& g) override;
+    void paint(juce::Graphics& g) override;
 
     void resized() override;
 
-    void buttonClicked(Button* btn) override;
+    void buttonClicked(juce::Button* btn) override;
 
-    void setSupportedControls(FirmwareVersion version);
+    void setSupportedControls(LumatoneFirmware::Version version);
 
     //=========================================================================
     // LumatoneEditor::FirmwareListener implementation
 
-    void firmwareRevisionReceived(FirmwareVersion version) override;
+    void firmwareRevisionReceived(LumatoneFirmware::Version version) override;
 
 
 private:
 
-    std::unique_ptr<TextButton> resetPresetsBtn;
+    std::unique_ptr<juce::TextButton> resetPresetsBtn;
     FlexBox flexBox;
 
     // Style helpers
     int margin = 12;
     int buttonHeight = 30;
-};
\ No newline at end of file
+};
diff --git a/Source/Settings/SettingsContainer.cpp b/Source/Settings/SettingsContainer.cpp
index 76acbe1c..7d88b5f0 100644
--- a/Source/Settings/SettingsContainer.cpp
+++ b/Source/Settings/SettingsContainer.cpp
@@ -9,12 +9,18 @@
 */
 
 #include "SettingsContainer.h"
-#include "../Main.h"
 
-void SettingsCategoryModel::paintListBoxItem(int rowNumber, Graphics& g, int width, int height, bool rowIsSelected)
+#include "../LumatoneEditorLookAndFeel.h"
+
+#include "CalibrationDlg.h"
+#include "FirmwareDlg.h"
+#include "PresetSettingsDlg.h"
+#include "MidiSettingsDlg.h"
+
+void SettingsCategoryModel::paintListBoxItem(int rowNumber, juce::Graphics& g, int width, int height, bool rowIsSelected)
 {
-    Colour backgroundColour = (rowIsSelected) ? Colours::teal : Colour();
-    Rectangle<int> rowBounds(0, 0, width, height);
+    juce::Colour backgroundColour = (rowIsSelected) ? Colours::teal : juce::Colour();
+    juce::Rectangle<int> rowBounds(0, 0, width, height);
 
     if (rowIsSelected)
     {
@@ -23,8 +29,9 @@ void SettingsCategoryModel::paintListBoxItem(int rowNumber, Graphics& g, int wid
     }
 
     g.setColour(Colours::white);
-    g.setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::GothamNarrowMedium, height));
-    g.drawFittedText(categories[rowNumber], rowBounds.withLeft(8), Justification::left, 1, 1.0f);
+    // TODO
+    // g.setFont(getAppFonts().getFont(LumatoneEditorFont::GothamNarrowMedium, height));
+    g.drawFittedText(categories[rowNumber], rowBounds.withLeft(8), juce::Justification::left, 1, 1.0f);
 }
 
 //=========================================================================
@@ -32,20 +39,20 @@ void SettingsCategoryModel::paintListBoxItem(int rowNumber, Graphics& g, int wid
 SettingsContainer::SettingsContainer()
     : Component("SettingsContainer"),
       model({
-        translate("Calibrate"), 
+        translate("Calibrate"),
         translate("Firmware"),
         translate("MIDI"),
         translate("Presets")
       })
-{ 
-    categoryList.reset(new ListBox("CategoryList"));
+{
+    categoryList.reset(new juce::ListBox("CategoryList"));
     categoryList->setModel(&model);
 
     addAndMakeVisible(categoryList.get());
     model.addChangeListener(this);
 
-    auto lastPanelIndex = TerpstraSysExApplication::getApp().getPropertiesFile()->getIntValue("LastSettingsPanel", 0);
-    categoryList->selectRow(lastPanelIndex);
+    // auto lastPanelIndex = TerpstraSysExApplication::getApp().getPropertiesFile()->getIntValue("LastSettingsPanel", 0);
+    // categoryList->selectRow(lastPanelIndex);
 }
 
 SettingsContainer::~SettingsContainer()
@@ -63,7 +70,7 @@ void SettingsContainer::paint(Graphics& g)
 void SettingsContainer::resized()
 {
     categoryList->setBounds(getLocalBounds().withRight(proportionOfWidth(0.2)));
-    
+
     if (settingsPanel.get())
     {
         settingsPanel->setBounds(getLocalBounds().withLeft(categoryList->getRight()).reduced(0.033333f));
@@ -72,8 +79,8 @@ void SettingsContainer::resized()
 
 void SettingsContainer::lookAndFeelChanged()
 {
-    setColour(ResizableWindow::ColourIds::backgroundColourId, getLookAndFeel().findColour(LumatoneEditorColourIDs::LightBackground));
-    categoryList->setColour(ListBox::ColourIds::backgroundColourId, getLookAndFeel().findColour(LumatoneEditorColourIDs::MediumBackground));
+    //setColour(juce::ResizableWindow::ColourIds::backgroundColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::LightBackground));
+    //categoryList->setColour(juce::ListBox::ColourIds::backgroundColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::MediumBackground));
 }
 void SettingsContainer::changeListenerCallback(ChangeBroadcaster* source)
 {
@@ -83,29 +90,30 @@ void SettingsContainer::changeListenerCallback(ChangeBroadcaster* source)
 
 void SettingsContainer::showPanel(int editorSettingCategory)
 {
-    Component* newPanel = nullptr;
-    switch (editorSettingCategory)
-    {
-    case LumatoneEditorSettingCategories::Calibration:
-        newPanel = new CalibrationDlg();
-        break;
-
-    case LumatoneEditorSettingCategories::Firmware:
-        newPanel = new FirmwareDlg();
-        break;
-
-    case LumatoneEditorSettingCategories::Midi:
-        newPanel = new MidiSettingsDlg();
-        break;
-
-    case LumatoneEditorSettingCategories::Presets:
-        newPanel = new PresetSettingsDlg();
-        break;
-    }
+    // TODO
+   juce:: Component* newPanel = nullptr;
+    // switch (editorSettingCategory)
+    // {
+    // case LumatoneEditorSettingCategories::Calibration:
+    //     newPanel = new CalibrationDlg();
+    //     break;
+
+    // case LumatoneEditorSettingCategories::Firmware:
+    //     newPanel = new FirmwareDlg();
+    //     break;
+
+    // case LumatoneEditorSettingCategories::Midi:
+    //     newPanel = new MidiSettingsDlg();
+    //     break;
+
+    // case LumatoneEditorSettingCategories::Presets:
+    //     newPanel = new PresetSettingsDlg();
+    //     break;
+    // }
 
     if (newPanel)
     {
-        TerpstraSysExApplication::getApp().getPropertiesFile()->setValue("LastSettingsPanel", editorSettingCategory);
+        // TerpstraSysExApplication::getApp().getPropertiesFile()->setValue("LastSettingsPanel", editorSettingCategory);
 
         removeChildComponent(settingsPanel.get());
         settingsPanel = nullptr;
diff --git a/Source/Settings/SettingsContainer.h b/Source/Settings/SettingsContainer.h
index 9cef9815..9568563d 100644
--- a/Source/Settings/SettingsContainer.h
+++ b/Source/Settings/SettingsContainer.h
@@ -9,11 +9,7 @@
 */
 
 #pragma once
-#include "../LumatoneEditorLookAndFeel.h"
-#include "CalibrationDlg.h"
-#include "FirmwareDlg.h"
-#include "PresetSettingsDlg.h"
-#include "MidiSettingsDlg.h"
+#include <JuceHeader.h>
 
 typedef enum {
     Calibration = 0,
@@ -39,13 +35,13 @@ class SettingsCategoryModel : public ListBoxModel, public ChangeBroadcaster
     void paintListBoxItem(int rowNumber, Graphics& g, int width, int height, bool rowIsSelected) override;
 
     void selectedRowsChanged(int lastRowSelected) override { sendChangeMessage(); }
-    
-    
+
+
 
     //=========================================================================
 private:
     Array<String> categories;
-    
+
 };
 
 class SettingsContainer : public Component, protected ChangeListener
@@ -66,7 +62,7 @@ class SettingsContainer : public Component, protected ChangeListener
     void changeListenerCallback(ChangeBroadcaster* source) override;
 
     //=========================================================================
-    
+
     void showPanel(int editorSettingCategory);
 
 private:
diff --git a/Source/Settings/WheelsCalibrationComponent.h b/Source/Settings/WheelsCalibrationComponent.h
index dc3e5e67..278bdf36 100644
--- a/Source/Settings/WheelsCalibrationComponent.h
+++ b/Source/Settings/WheelsCalibrationComponent.h
@@ -10,8 +10,7 @@
 
 #pragma once
 
-#include <JuceHeader.h>
-#include "../LumatoneFirmwareDefinitions.h"
+#include "../lumatone_editor_library/lumatone_midi_driver/firmware_types.h"
 
 //==============================================================================
 /*
@@ -24,7 +23,7 @@ class WheelsCalibrationComponent  : public juce::Component
     {
         float defaultMinPoint = (0.5f - 0.15) / ADCSCALAR;
         float defaultMaxPoint = (0.5f + 0.15) / ADCSCALAR;
-        auto initCalibration = WheelsCalibrationData();
+        auto initCalibration = LumatoneFirmware::WheelsCalibrationData();
         initCalibration.minPitch = defaultMinPoint;
         initCalibration.maxPitch = defaultMaxPoint;
         initCalibration.minMod = defaultMinPoint;
@@ -68,7 +67,7 @@ class WheelsCalibrationComponent  : public juce::Component
     }
 
     // TODO: improve this
-    void updateCalibrationData(WheelsCalibrationData calibrationDataIn, bool redraw = true)
+    void updateCalibrationData(LumatoneFirmware::WheelsCalibrationData calibrationDataIn, bool redraw = true)
     {
         calibrationData = calibrationDataIn;
 
@@ -115,7 +114,7 @@ class WheelsCalibrationComponent  : public juce::Component
 
 private:
 
-    WheelsCalibrationData calibrationData;
+    LumatoneFirmware::WheelsCalibrationData calibrationData;
 
     Rectangle<float> wheelBounds;
     Path pitchPath;
diff --git a/Source/SingleNoteAssign.cpp b/Source/SingleNoteAssign.cpp
index 0f9c256f..b5203dd6 100644
--- a/Source/SingleNoteAssign.cpp
+++ b/Source/SingleNoteAssign.cpp
@@ -18,8 +18,11 @@
 */
 
 //[Headers] You can add your own extra header files here...
-#include "Main.h"
-#include "./actions/edit_actions.h"
+#include "./lumatone_editor_library/actions/edit_actions.h"
+#include "./lumatone_editor_library/palettes/colour_view_component.h"
+#include "./lumatone_editor_library/palettes/colour_edit_textbox.h"
+
+#include "LumatoneEditorLookAndFeel.h"
 //[/Headers]
 
 #include "SingleNoteAssign.h"
@@ -29,7 +32,8 @@
 //[/MiscUserDefs]
 
 //==============================================================================
-SingleNoteAssign::SingleNoteAssign ()
+SingleNoteAssign::SingleNoteAssign (const LumatoneEditorState& stateIn)
+    : LumatoneEditorState("SingleNoteAssign", stateIn)
 {
     //[Constructor_pre] You can add your own custom stuff here..
     //[/Constructor_pre]
@@ -101,7 +105,7 @@ SingleNoteAssign::SingleNoteAssign ()
 
     noteInput->setBounds (120, 128, 112, 24);
 
-    colourSubwindow.reset (new ColourEditComponent());
+    colourSubwindow.reset (new ColourViewComponent());
     addAndMakeVisible (colourSubwindow.get());
     colourSubwindow->setName ("colourSubwindow");
 
@@ -169,7 +173,7 @@ SingleNoteAssign::SingleNoteAssign ()
     setChannelToggleButton->setColour(ToggleButton::ColourIds::textColourId, toggleTextColour);
     channelInput->getProperties().set(LumatoneEditorStyleIDs::fontHeightScalar, controlBoxFontHeightScalar);
 
-    autoIncrementLabel->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::GothamNarrowMedium));
+    autoIncrementLabel->setFont(getAppFonts().getFont(LumatoneEditorFont::GothamNarrowMedium));
     autoIncrementLabel->getProperties().set(LumatoneEditorStyleIDs::fontHeightScalar, controlBoxFontHeightScalar);
 
     noteAutoIncrButton->setButtonText(translate("NotesPerClick"));
@@ -178,8 +182,8 @@ SingleNoteAssign::SingleNoteAssign ()
     channelAutoIncrButton->setColour(ToggleButton::ColourIds::textColourId, toggleTextColour);
     channelAutoIncrNoteInput->getProperties().set(LumatoneEditorStyleIDs::fontHeightScalar, controlBoxFontHeightScalar);
 
-    instructionsFont = TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::FranklinGothic);
-    parametersFont = TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::GothamNarrowMedium);
+    instructionsFont = getAppFonts().getFont(LumatoneEditorFont::FranklinGothic);
+    parametersFont = getAppFonts().getFont(LumatoneEditorFont::GothamNarrowMedium);
 
     // TODO: load last active colour?
     colourTextEditor->addColourSelectionListener(this);
@@ -250,13 +254,13 @@ void SingleNoteAssign::paint (juce::Graphics& g)
     Path topBack = getConnectedRoundedRectPath(instructionsAreaBounds.toFloat(), roundedCornerSize, Button::ConnectedEdgeFlags::ConnectedOnBottom);
     Path bottomBack = getConnectedRoundedRectPath(bottomPart, roundedCornerSize, Button::ConnectedEdgeFlags::ConnectedOnTop);
 
-    g.setColour(getLookAndFeel().findColour(LumatoneEditorColourIDs::LightBackground));
+    g.setColour(getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::LightBackground));
     g.fillPath(topBack);
 
     g.setColour(Colour(0xff2d3135));
     g.fillPath(bottomBack);
 
-    g.setColour(getLookAndFeel().findColour(LumatoneEditorColourIDs::InactiveText));
+    g.setColour(getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::InactiveText));
     g.setFont(instructionsFont);
     g.drawFittedText(translate("ManualAssignDirections"), instructionsBounds, Justification::centred, 2, 1.0f);
 
@@ -427,7 +431,7 @@ void SingleNoteAssign::resized()
     }
 
     // Style adjustments
-    colourTextEditor->applyFontToAllText(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::GothamNarrowMedium, controlHScaled * CONTROLBOXFONTHEIGHTSCALAR), true);
+    colourTextEditor->applyFontToAllText(getAppFonts().getFont(LumatoneEditorFont::GothamNarrowMedium, controlHScaled * CONTROLBOXFONTHEIGHTSCALAR), true);
 
     noteInput->setTextBoxStyle(Slider::TextEntryBoxPosition::TextBoxLeft, false, roundToInt(noteInput->getWidth() * incDecButtonTextBoxWidthScalar), noteInput->getHeight());
 
@@ -576,13 +580,13 @@ void SingleNoteAssign::colourChangedCallback(ColourSelectionBroadcaster* source,
 
 /// <summary>Called from parent when one of the keys is clicked</summary>
 /// <returns>Pointer to undoable action to be passed to the undo manager. The latter has to be done in calling function.</returns>
-UndoableAction* SingleNoteAssign::createEditAction(int setSelection, int keySelection)
+LumatoneAction* SingleNoteAssign::createEditAction(int setSelection, int keySelection)
 {
 	int newNote = noteInput->getValue();
 	int newChannel = channelInput->getValue();
 
 	auto editAction = new LumatoneEditAction::SingleNoteAssignAction(
-        TerpstraSysExApplication::getApp().getLumatoneController(),
+        this,
 		setSelection, keySelection,
 		keyTypeToggleButton->getToggleState(), setChannelToggleButton->getToggleState(),
 		setNoteToggleButton->getToggleState(), setColourToggleButton->getToggleState(),
@@ -666,15 +670,14 @@ void SingleNoteAssign::redrawCCFlipBtn()
     arrowInvertedPath.applyTransform(transform);
     faderInvertedPath.applyTransform(transform);
 
-    auto lookAndFeel = &TerpstraSysExApplication::getApp().getLookAndFeel();
-    auto background = lookAndFeel->findColour(TextButton::ColourIds::buttonColourId);
+    auto background = getLookAndFeel().findColour(TextButton::ColourIds::buttonColourId);
     g.setColour(background);
     g.fillRoundedRectangle(ccFaderIsDefault->getLocalBounds().toFloat(), 5.0f);
     gi.setColour(background);
     gi.fillRoundedRectangle(ccFaderIsDefault->getLocalBounds().toFloat(), 5.0f);
 
     auto arrowStroke = PathStrokeType(PHI, PathStrokeType::JointStyle::curved);
-    auto colour = lookAndFeel->findColour(LumatoneEditorColourIDs::ActiveText).brighter(0.1);
+    auto colour = getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::ActiveText).brighter(0.1);
     g.setColour(colour);
     g.strokePath(arrowPath, arrowStroke);
     g.fillPath(faderPath);
@@ -737,8 +740,8 @@ BEGIN_JUCER_METADATA
           textBoxEditable="1" textBoxWidth="56" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <GENERICCOMPONENT name="colourSubwindow" id="e66042f7ac61358f" memberName="colourSubwindow"
-                    virtualName="ColourEditComponent" explicitFocusOrder="0" pos="120 96 56 24"
-                    class="ColourEditComponent" params=""/>
+                    virtualName="ColourViewComponent" explicitFocusOrder="0" pos="120 96 56 24"
+                    class="ColourViewComponent" params=""/>
   <LABEL name="autoIncrementLabel" id="5657d893807891e2" memberName="autoIncrementLabel"
          virtualName="" explicitFocusOrder="0" pos="8 204 111 24" edTextCol="ff000000"
          edBkgCol="0" labelText="Auto-Increment" editableSingleClick="0"
diff --git a/Source/SingleNoteAssign.h b/Source/SingleNoteAssign.h
index 715f9e11..804efd36 100644
--- a/Source/SingleNoteAssign.h
+++ b/Source/SingleNoteAssign.h
@@ -21,9 +21,14 @@
 
 //[Headers]     -- You can add your own extra header files here --
 #include <JuceHeader.h>
-#include "./data/lumatone_layout.h"
-#include "ColourEditComponent.h"
-#include "LumatoneEditorLookAndFeel.h"
+
+#include "./lumatone_editor_library/palettes/colour_selection_broadcaster.h"
+
+#include "LumatoneEditorState.h"
+
+class ColourViewComponent;
+class ColourTextEditor;
+class LumatoneAction;
 //[/Headers]
 
 
@@ -36,7 +41,8 @@
     Describe your class and how it works here!
                                                                     //[/Comments]
 */
-class SingleNoteAssign  : public Component,
+class SingleNoteAssign  : public juce::Component,
+                          public LumatoneEditorState,
                           public ColourSelectionListener,
                           public TextEditor::Listener,
                           public juce::Button::Listener,
@@ -45,20 +51,20 @@ class SingleNoteAssign  : public Component,
 {
 public:
     //==============================================================================
-    SingleNoteAssign();
+    SingleNoteAssign(const LumatoneEditorState& stateIn);
     ~SingleNoteAssign() override;
 
     //==============================================================================
     //[UserMethods]     -- You can add your own custom methods in this section.
-	UndoableAction* createEditAction(int setSelection, int keySelection);
+	LumatoneAction* createEditAction(int setSelection, int keySelection);
 	void onSetData(LumatoneLayout& newData);
 
-	void restoreStateFromPropertiesFile(PropertiesFile* propertiesFile);
-	void saveStateToPropertiesFile(PropertiesFile* propertiesFile);
+	void restoreStateFromPropertiesFile(juce::PropertiesFile* propertiesFile);
+	void saveStateToPropertiesFile(juce::PropertiesFile* propertiesFile);
 
     void lookAndFeelChanged() override;
 
-    ColourEditComponent* getColourEditComponent() { return colourSubwindow.get(); }
+    ColourViewComponent* getColourViewComponent() { return colourSubwindow.get(); }
     ColourTextEditor* getColourTextEditor() { return colourTextEditor.get(); }
 
     void colourChangedCallback(ColourSelectionBroadcaster* source, Colour newColour) override;
@@ -84,11 +90,11 @@ class SingleNoteAssign  : public Component,
     float controlsX;
     float separatorY;
 
-    Font instructionsFont;
-    Font parametersFont;
+    juce::Font instructionsFont;
+    juce::Font parametersFont;
 
-    Array<FlexBox> flexRows;
-    Array<Rectangle<int>> flexBounds; // Primarily for debugging
+    juce::Array<juce::FlexBox> flexRows;
+    juce::Array<juce::Rectangle<int>> flexBounds; // Primarily for debugging
     enum SingleNoteFlexRows
     {
         keyType = 0,
@@ -115,11 +121,11 @@ class SingleNoteAssign  : public Component,
 
     const float separatorThicknessScalar = 0.005f;
 
-    const Colour toggleTextColour = Colour(0xffcbcbcb);
+    const juce::Colour toggleTextColour = juce::Colour(0xffcbcbcb);
 
     std::unique_ptr<juce::ImageButton> ccFaderIsDefault;
-    Path faderDownArrow;
-    Path faderUpArrow;
+    juce::Path faderDownArrow;
+    juce::Path faderUpArrow;
     //[/UserVariables]
 
     //==============================================================================
@@ -131,7 +137,7 @@ class SingleNoteAssign  : public Component,
     std::unique_ptr<juce::ToggleButton> keyTypeToggleButton;
     std::unique_ptr<juce::ComboBox> keyTypeCombo;
     std::unique_ptr<juce::Slider> noteInput;
-    std::unique_ptr<ColourEditComponent> colourSubwindow;
+    std::unique_ptr<ColourViewComponent> colourSubwindow;
     std::unique_ptr<juce::Label> autoIncrementLabel;
     std::unique_ptr<ColourTextEditor> colourTextEditor;
     std::unique_ptr<juce::Slider> channelInput;
diff --git a/Source/TerpstraMidiDriver.cpp b/Source/TerpstraMidiDriver.cpp
deleted file mode 100644
index 08d398ca..00000000
--- a/Source/TerpstraMidiDriver.cpp
+++ /dev/null
@@ -1,1560 +0,0 @@
-/*
-  ==============================================================================
-
-    TerpstraMidiDriver.cpp
-    Created: 20 Feb 2015 8:04:02pm
-    Author:  hsstraub
-
-  ==============================================================================
-*/
-
-#include "TerpstraMidiDriver.h"
-#include "Main.h"
-
-// There are different race-condition issues between macOS and Windows.
-// This Driver may need to be redesigned, but for now this define is
-// used for including a MessageManagerLock on Windows & Linux, but not on macOS.
-
-#define MIDI_DRIVER_USE_LOCK JUCE_WINDOWS //|| JUCE_LINUX
-
-TerpstraMidiDriver::TerpstraMidiDriver(int numBoardsIn)
-    : HajuMidiDriver()
-    , numBoards(numBoardsIn)
-{
-}
-
-TerpstraMidiDriver::~TerpstraMidiDriver()
-{
-    collectors.clear();
-}
-
-//============================================================================
-// TerpstaMidiDriver::Collector helpers
-
-void TerpstraMidiDriver::addMessageCollector(Collector* collectorToAdd)
-{
-    collectors.addIfNotAlreadyThere(collectorToAdd);
-}
-
-void TerpstraMidiDriver::removeMessageCollector(Collector* collectorToRemove)
-{
-    collectors.removeFirstMatchingValue(collectorToRemove);
-}
-
-void TerpstraMidiDriver::notifyMessageReceived(MidiInput* source, const MidiMessage& midiMessage)
-{
-#if MIDI_DRIVER_USE_LOCK
-    const MessageManagerLock lock;
-#endif
-    MessageManager::callAsync([this, source, midiMessage]{
-        for (auto collector : collectors) collector->midiMessageReceived(source, midiMessage);
-    });
-}
-
-void TerpstraMidiDriver::notifyMessageSent(MidiOutput* target, const MidiMessage& midiMessage)
-{
-    // Currently unused
-// #if MIDI_DRIVER_USE_LOCK
-//     const MessageManagerLock lock;
-// #endif
-
-//     MessageManager::callAsync([this, target, midiMessage]{
-//         for (auto collector : collectors) collector->midiMessageSent(target, midiMessage);
-//     });
-}
-
-void TerpstraMidiDriver::notifySendQueueSize()
-{
-    auto size = messageBuffer.size();
-    for (auto collector : collectors) collector->midiSendQueueSize(size);
-}
-
-void TerpstraMidiDriver::notifyLogMessage(String textMessage, HajuErrorVisualizer::ErrorLevel errorLevel)
-{
-    for (auto collector : collectors) collector->generalLogMessage(textMessage, errorLevel);
-}
-
-void TerpstraMidiDriver::notifyNoAnswerToMessage(MidiInput* expectedDevice, const MidiMessage& midiMessage)
-{
-    MessageManager::callAsync([this, expectedDevice, midiMessage]{
-        for (auto collector : collectors) collector->noAnswerToMessage(expectedDevice, midiMessage);
-    });
-}
-
-/*
-==============================================================================
-Single (mid-level) commands, firmware specific
-*/
-
-// CMD 00h: Send a single key's functionctional configuration
-void TerpstraMidiDriver::sendKeyFunctionParameters(uint8 boardIndex, uint8 keyIndex, uint8 noteOrCCNum, uint8 midiChannel, uint8 keyType, bool faderUpIsNull)
-{
-    // boardIndex is expected 1-based
-    jassert(boardIndex > 0 && boardIndex <= numBoards);
-    //jassert(midiChannel > 0 && midiChannel <= 16);
-    midiChannel = (midiChannel - 1) & 0xF;
-    uint8 typeByte = (faderUpIsNull << 4) | keyType;
-    sendSysEx(boardIndex, CHANGE_KEY_NOTE, keyIndex, noteOrCCNum, midiChannel, typeByte);
-}
-
-// CMD 01h: Send a single key's LED channel intensities
-void TerpstraMidiDriver::sendKeyLightParameters(uint8 boardIndex, uint8 keyIndex, uint8 red, uint8 green, uint8 blue)
-{
-    MidiMessage msg = createExtendedKeyColourSysEx(boardIndex, SET_KEY_COLOUR, keyIndex, red, green, blue);
-
-    sendMessageWithAcknowledge(msg);
-}
-
-// CMD 01h: Send a single key's LED channel intensities, three pairs of 4-bit values for each channel
-void TerpstraMidiDriver::sendKeyLightParameters(uint8 boardIndex, uint8 keyIndex, uint8 redUpper, uint8 redLower, uint8 greenUpper, uint8 greenLower, uint8 blueUpper, uint8 blueLower)
-{
-    // boardIndex is expected 1-based
-    jassert(boardIndex > 0 && boardIndex <= numBoards);
-
-    if (redUpper   > 0xf) redUpper   &= 0xf;
-    if (redLower   > 0xf) redLower   &= 0xf;
-    if (greenUpper > 0xf) greenUpper &= 0xf;
-    if (greenLower > 0xf) greenLower &= 0xf;
-    if (blueUpper  > 0xf) blueUpper  &= 0xf;
-    if (blueLower  > 0xf) blueLower  &= 0xf;
-
-    MidiMessage msg = createExtendedKeyColourSysEx(boardIndex, SET_KEY_COLOUR, keyIndex, redUpper, redLower, greenUpper, greenLower, blueUpper, blueLower);
-}
-
-// CMD 01h: Send a single key's LED channel intensities (pre-version 1.0.11)
-void TerpstraMidiDriver::sendKeyLightParameters_Version_1_0_0(uint8 boardIndex, uint8 keyIndex, uint8 red, uint8 green, uint8 blue)
-{
-    // boardIndex is expected 1-based
-    jassert(boardIndex > 0 && boardIndex <= numBoards);
-
-    // clip if exceed 0x7f
-    if (red > 0x7f) red &= 0x7f;
-    if (green > 0x7f) green &= 0x7f;
-    if (blue > 0x7f) blue &= 0x7f;
-
-    sendSysEx(boardIndex, SET_KEY_COLOUR, keyIndex, red, green, blue);
-}
-
-// CMD 02h: Save current configuration to specified preset index
-void TerpstraMidiDriver::saveProgram(uint8 presetNumber)
-{
-    jassert(presetNumber >= 0 && presetNumber < 10);
-    sendSysEx(0, SAVE_PROGRAM, presetNumber, '\0', '\0', '\0');
-}
-
-// CMD 03h: Send expression pedal sensivity
-void TerpstraMidiDriver::sendExpressionPedalSensivity(uint8 value)
-{
-	jassert(value <= 0x7f);
-
-	sendSysEx(0, SET_FOOT_CONTROLLER_SENSITIVITY, value, '\0', '\0', '\0');
-}
-
-// CMD 04h: Send parametrization of foot controller
-void TerpstraMidiDriver::sendInvertFootController(bool value)
-{
-    sendSysExToggle(0, INVERT_FOOT_CONTROLLER, value);
-}
-
-// CMD 05h: Colour for macro button in active state, each value should be in range of 0x0-0xF and represents the upper and lower four bytes of each channel intensity
-void TerpstraMidiDriver::sendMacroButtonActiveColour(uint8 red, uint8 green, uint8 blue)
-{
-    MidiMessage msg = createExtendedMacroColourSysEx(MACROBUTTON_COLOUR_ON, red, green, blue);
-    sendMessageWithAcknowledge(msg);
-}
-
-// CMD 05h: Colour for macro button in active state, 3 pairs for 4-bit values for each LED channel
-void TerpstraMidiDriver::sendMacroButtonActiveColour(uint8 redUpper, uint8 redLower, uint8 greenUpper, uint8 greenLower, uint8 blueUpper, uint8 blueLower)
-{
-    MidiMessage msg = createExtendedMacroColourSysEx(MACROBUTTON_COLOUR_ON, redUpper, redLower, greenUpper, greenLower, blueUpper, blueLower);
-    sendMessageWithAcknowledge(msg);
-}
-
-// CMD 05h: Colour for macro button in active state, each value should be in range of 0x00-0x7F (pre-version 1.0.11)
-void TerpstraMidiDriver::sendMacroButtonActiveColour_Version_1_0_0(uint8 red, uint8 green, uint8 blue)
-{
-    if (red   > 0x7f) red   &= 0x7f;
-    if (green > 0x7f) green &= 0x7f;
-    if (blue  > 0x7f) blue  &= 0x7f;
-
-	sendSysEx(0, MACROBUTTON_COLOUR_ON, red, green, blue, '\0');
-}
-
-// CMD 06h: Colour for macro button in inactive state, each value should be in range of 0x0-0xF and represents the upper and lower four bytes of each channel intensity
-void TerpstraMidiDriver::sendMacroButtonInactiveColour(int red, int green, int blue)
-{
-    MidiMessage msg = createExtendedMacroColourSysEx(MACROBUTTON_COLOUR_OFF, red, green, blue);
-    sendMessageWithAcknowledge(msg);
-}
-
-// CMD 05h: Colour for macro button in active state, 3 pairs for 4-bit values for each LED channel
-void TerpstraMidiDriver::sendMacroButtonInactiveColour(uint8 redUpper, uint8 redLower, uint8 greenUpper, uint8 greenLower, uint8 blueUpper, uint8 blueLower)
-{
-    MidiMessage msg = createExtendedMacroColourSysEx(MACROBUTTON_COLOUR_OFF, redUpper, redLower, greenUpper, greenLower, blueUpper, blueLower);
-    sendMessageWithAcknowledge(msg);
-}
-
-// CMD 06h: Colour for macro button in inactive state, each value should be in range of 0x00-0x7F (pre-version 1.0.11)
-void TerpstraMidiDriver::sendMacroButtonInactiveColour_Version_1_0_0(uint8 red, uint8 green, uint8 blue)
-{
-    if (red   > 0x7f) red   &= 0x7f;
-    if (green > 0x7f) green &= 0x7f;
-    if (blue  > 0x7f) blue  &= 0x7f;
-
-	sendSysEx(0, MACROBUTTON_COLOUR_OFF, red, green, blue, '\0');
-}
-
-// CMD 07h: Send parametrization of light on keystrokes
-void TerpstraMidiDriver::sendLightOnKeyStrokes(bool value)
-{
-    sendSysExToggle(0, SET_LIGHT_ON_KEYSTROKES, value);
-}
-
-// CMD 08h: Send a value for a velocity lookup table
-void TerpstraMidiDriver::sendVelocityConfig(const uint8 velocityTable[])
-{
-    // Values are in reverse order (shortest ticks count is the highest velocity)
-    uint8 reversedTable[128];
-    for (uint8 x = 0; x < 128; x++)
-    {
-        reversedTable[x] = velocityTable[127 - x] & 0x7f;
-    }
-
-    auto msg = createTableSysEx(0, SET_VELOCITY_CONFIG, 128, reversedTable);
-    sendMessageWithAcknowledge(msg);
-}
-
-// CMD 09h: Save velocity config to EEPROM
-void TerpstraMidiDriver::saveVelocityConfig()
-{
-    sendSysExRequest(0, SAVE_VELOCITY_CONFIG);
-}
-
-// CMD 0Ah: Reset velocity config to value from EEPROM
-void TerpstraMidiDriver::resetVelocityConfig()
-{
-    sendSysExRequest(0, RESET_VELOCITY_CONFIG);
-}
-
-// CMD 0Bh: Adjust the internal fader look-up table (128 7-bit values)
-void TerpstraMidiDriver::sendFaderConfig(const uint8 faderTable[])
-{
-    MidiMessage msg = createTableSysEx(0, SET_FADER_CONFIG, 128, faderTable);
-    sendMessageWithAcknowledge(msg);
-}
-
-// CMD 0Ch: **DEPRECATED** Save the changes made to the fader look-up table
-void TerpstraMidiDriver::saveFaderConfiguration()
-{
-    sendSysExRequest(0, SAVE_FADER_CONFIG);
-}
-
-// CMD 0Dh: Reset the fader lookup table back to its factory fader settings.
-void TerpstraMidiDriver::resetFaderConfig()
-{
-    sendSysExRequest(0, RESET_FADER_CONFIG);
-}
-
-// CMD 0Eh: Enable or disable aftertouch functionality
-void TerpstraMidiDriver::sendAfterTouchActivation(bool value)
-{
-    sendSysExToggle(0, SET_AFTERTOUCH_FLAG, value);
-}
-
-// CMD 0Fh: Initiate aftertouch calibration routine
-void TerpstraMidiDriver::sendCalibrateAfterTouch()
-{
-    sendSysExRequest(0, CALIBRATE_AFTERTOUCH);
-}
-
-// CMD 10h: Adjust the internal aftertouch look-up table (size of 128)
-void TerpstraMidiDriver::sendAftertouchConfig(const uint8 aftertouchTable[])
-{
-    MidiMessage msg = createTableSysEx(0, SET_AFTERTOUCH_CONFIG, 128, aftertouchTable);
-    sendMessageWithAcknowledge(msg);
-}
-
-// CMD 11h: **DEPRECATED** Save the changes made to the aftertouch look-up table
-void TerpstraMidiDriver::saveAftertouchConfig()
-{
-    sendSysExRequest(0, SAVE_AFTERTOUCH_CONFIG);
-}
-
-// CMD 12h: Reset the aftertouch lookup table back to its factory aftertouch settings.
-void TerpstraMidiDriver::resetAftertouchConfig()
-{
-    sendSysExRequest(0, RESET_AFTERTOUCH_CONFIG);
-}
-
-// CMD 13h: Read back the current red intensity of all the keys of the target board.
-void TerpstraMidiDriver::sendRedLEDConfigRequest(uint8 boardIndex)
-{
-    sendSysExRequest(boardIndex, GET_RED_LED_CONFIG);
-}
-
-// CMD 14h: Read back the current green intensity of all the keys of the target board.
-void TerpstraMidiDriver::sendGreenLEDConfigRequest(uint8 boardIndex)
-{
-    sendSysExRequest(boardIndex, GET_GREEN_LED_CONFIG);
-}
-
-// CMD 15h: Read back the current blue intensity of all the keys of the target board.
-void TerpstraMidiDriver::sendBlueLEDConfigRequest(uint8 boardIndex)
-{
-    sendSysExRequest(boardIndex, GET_BLUE_LED_CONFIG);
-}
-
-// CMD 16h: Read back the current channel configuration of all the keys of the target board.
-void TerpstraMidiDriver::sendChannelConfigRequest(uint8 boardIndex)
-{
-    sendSysExRequest(boardIndex, GET_CHANNEL_CONFIG);
-}
-
-// CMD 17h: Read back the current note configuration of all the keys of the target board.
-void TerpstraMidiDriver::sendNoteConfigRequest(uint8 boardIndex)
-{
-    sendSysExRequest(boardIndex, GET_NOTE_CONFIG);
-}
-
-// CMD 18h: Read back the current key type configuration of all the keys of the target board.
-void TerpstraMidiDriver::sendKeyTypeConfigRequest(uint8 boardIndex)
-{
-    sendSysExRequest(boardIndex, GET_KEYTYPE_CONFIG);
-}
-
-// CMD 19h: Read back the maximum threshold of all the keys of the target board.
-void TerpstraMidiDriver::sendMaxFaderThresholdRequest(uint8 boardIndex)
-{
-    sendSysExRequest(0, GET_MAX_THRESHOLD);
-}
-
-// CMD 1Ah: Read back the maximum threshold of all the keys of the target board
-void TerpstraMidiDriver::sendMinFaderThresholdRequest(uint8 boardIndex)
-{
-    sendSysExRequest(0, GET_MIN_THRESHOLD);
-}
-
-// CMD 1Bh: Read back the aftertouch maximum threshold of all the keys of the target board
-void TerpstraMidiDriver::sendMaxAftertouchThresholdRequest(uint8 boardIndex)
-{
-    sendSysExRequest(0, GET_AFTERTOUCH_MAX);
-}
-
-// CMD 1Ch: Get back flag whether or not each key of target board meets minimum threshold
-void TerpstraMidiDriver::sendKeyValidityParametersRequest(uint8 boardIndex)
-{
-    sendSysExRequest(boardIndex, GET_KEY_VALIDITY);
-}
-
-// CMD 1Dh: Read back the current velocity look up table of the keyboard.
-void TerpstraMidiDriver::sendVelocityConfigRequest()
-{
-    sendSysExRequest(0, GET_VELOCITY_CONFIG);
-}
-
-// CMD 1Eh: Read back the current fader look up table of the keyboard.
-void TerpstraMidiDriver::sendFaderConfigRequest()
-{
-    sendSysExRequest(0, GET_FADER_CONFIG);
-}
-
-// CMD 1Fh: Read back the current aftertouch look up table of the keyboard.
-void TerpstraMidiDriver::sendAftertouchConfigRequest()
-{
-    sendSysExRequest(0, GET_AFTERTOUCH_CONFIG);
-}
-
-// CMD 20h: Set the velocity interval table, 127 12-bit values
-void TerpstraMidiDriver::sendVelocityIntervalConfig(const int velocityIntervalTable[])
-{
-    const int payloadSize = 254;
-    uint8 formattedTable[payloadSize];
-
-    // Interval table contains 127 values!
-	for (uint8 i = 0; i < VELOCITYINTERVALTABLESIZE; i++)
-    {
-        formattedTable[2*i]     = (velocityIntervalTable[i] >> 6) & 0x3f;
-        formattedTable[1 + 2*i] = velocityIntervalTable[i] & 0x3f;
-    }
-
-	MidiMessage msg = createTableSysEx(0, SET_VELOCITY_INTERVALS, payloadSize, formattedTable);
-	sendMessageWithAcknowledge(msg);
-}
-
-// CMD 21h: Sead back the velocity interval table
-void TerpstraMidiDriver::sendVelocityIntervalConfigRequest()
-{
-    sendSysExRequest(0, GET_VELOCITY_INTERVALS);
-}
-
-// CMD 22h: Read back the fader type of all keys on the targeted board.
-void TerpstraMidiDriver::sendFaderTypeConfigRequest(uint8 boardIndex)
-{
-    sendSysExRequest(boardIndex, GET_FADER_TYPE_CONFIGURATION);
-}
-
-// CMD 23h: This command is used to read back the serial identification number of the keyboard.
-void TerpstraMidiDriver::sendGetSerialIdentityRequest(int sendToTestDevice)
-{
-    if (sendToTestDevice < 0)
-        sendSysEx(0, GET_SERIAL_IDENTITY, TEST_ECHO, '\0', '\0', '\0');
-    else if (sendToTestDevice < midiOutputs.size())
-        sendTestMessageNow(sendToTestDevice, createTerpstraSysEx(0, GET_SERIAL_IDENTITY, TEST_ECHO, '\0', '\0', '\0'));
-}
-
-// CMD 24h: Initiate the key calibration routine; each pair of macro buttons
-// on each octave must be pressed to return to normal state
-void TerpstraMidiDriver::sendCalibrateKeys()
-{
-    sendSysExRequest(0, CALIBRATE_KEYS);
-}
-
-// CMD 25h: Pass in true to enter Demo Mode, or false to exit
-void TerpstraMidiDriver::startDemoMode(bool turnOn)
-{
-    sendSysExToggle(0, DEMO_MODE, turnOn);
-}
-
-// CMD 26h: Initiate the pitch and mod wheel calibration routine, pass in false to stop
-void TerpstraMidiDriver::sendCalibratePitchModWheel(bool startCalibration, int testOutputIndex)
-{
-    if (testOutputIndex < 0)
-        sendSysExToggle(0, CALIBRATE_PITCH_MOD_WHEEL, startCalibration);
-    else
-        sendTestMessageNow(testOutputIndex, createTerpstraSysEx(0, CALIBRATE_PITCH_MOD_WHEEL, startCalibration, TEST_ECHO, '\0', '\0'));
-}
-
-// CMD 27h: Set the sensitivity value of the mod wheel, 0x01 to 0x07f
-void TerpstraMidiDriver::setModWheelSensitivity(uint8 sensitivity)
-{
-    if (sensitivity > 0x7f) sensitivity &= 0x7f;  // Restrict to upper bound
-    if (sensitivity < 0x01) sensitivity  = 0x01;  // Restrict to lower bound
-
-    sendSysEx(0, SET_MOD_WHEEL_SENSITIVITY, sensitivity, '\0', '\0', '\0');
-}
-
-// CMD 28h: Set the sensitivity value of the pitch bend wheel between 0x01 and 0x3FFF
-void TerpstraMidiDriver::setPitchBendSensitivity(int sensitivity)
-{
-    if (sensitivity > 0x3fff) sensitivity &= 0x3fff; // Restrict to upper bound
-    if (sensitivity < 0x0001) sensitivity  = 0x0001;  // Restrict to lower bound
-
-    sendSysEx(0, SET_PITCH_WHEEL_SENSITIVITY, sensitivity >> 7, sensitivity & 0x7f, '\0',  '\0');
-}
-
-// CMD 29h: Set abs. distance from max value to trigger CA-004 submodule key events, ranging from 0x00 to 0xFE
-void TerpstraMidiDriver::setKeyMaximumThreshold(uint8 boardIndex, uint8 maxThreshold, uint8 aftertouchMax)
-{
-    if (maxThreshold  > 0xfe) maxThreshold  &= 0xfe;
-    if (aftertouchMax > 0xfe) aftertouchMax &= 0xfe;
-    sendSysEx(boardIndex, SET_KEY_MAX_THRESHOLD, maxThreshold >> 4, maxThreshold & 0xf, aftertouchMax >> 4, aftertouchMax & 0xf);
-}
-
-// CMD 2Ah: Set abs. distance from min value to trigger CA-004 submodule key events, ranging from 0x00 to 0xFE
-void TerpstraMidiDriver::setKeyMinimumThreshold(uint8 boardIndex, uint8 minThresholdHigh, uint8 minThresholdLow)
-{
-    if (minThresholdHigh > 0xfe) minThresholdHigh &= 0xfe;
-    if (minThresholdLow  > 0xfe) minThresholdLow  &= 0xfe;
-    sendSysEx(boardIndex, SET_KEY_MIN_THRESHOLD, minThresholdHigh >> 4, minThresholdHigh & 0xf, minThresholdLow >> 4, minThresholdLow & 0xf);
-}
-
-// CMD 2Bh: Set the sensitivity for CC events, ranging from 0x00 to 0xFE
-void TerpstraMidiDriver::setFaderKeySensitivity(uint8 boardIndex, uint8 sensitivity)
-{
-    if (sensitivity > 0xfe) sensitivity &= 0xfe;
-    sendSysEx(boardIndex, SET_KEY_FADER_SENSITIVITY, sensitivity >> 4, sensitivity & 0xf, '\0', '\0');
-}
-
-// CMD 2Ch: Set the target board sensitivity for aftertouch events, ranging from 0x00 to 0xFE
-void TerpstraMidiDriver::setAftertouchKeySensitivity(uint8 boardIndex, uint8 sensitivity)
-{
-    if (sensitivity > 0xfe) sensitivity &= 0xfe;
-    sendSysEx(boardIndex, SET_KEY_AFTERTOUCH_SENSITIVITY, sensitivity >> 4, sensitivity & 0xf, '\0', '\0');
-}
-
-// CMD 2Dh: Adjust the Lumatouch table, a 128 byte array with value of 127 being a key fully pressed
-void TerpstraMidiDriver::setLumatouchConfig(const uint8 lumatouchTable[])
-{
-    MidiMessage msg = createTableSysEx(0, SET_LUMATOUCH_CONFIG, 128, lumatouchTable);
-    sendMessageWithAcknowledge(msg);
-}
-
-// CMD 2Eh: **DEPRECATED** Save Lumatouch table changes
-void TerpstraMidiDriver::saveLumatoneConfig()
-{
-    sendSysExRequest(0, SAVE_LUMATOUCH_CONFIG);
-}
-
-// CMD 2Fh: Reset the Lumatouch table back to factory settings
-void TerpstraMidiDriver::resetLumatouchConfig()
-{
-    sendSysExRequest(0, RESET_LUMATOUCH_CONFIG);
-}
-
-// CMD 30h: Read back the Lumatouch table
-void TerpstraMidiDriver::sendLumatouchConfigRequest()
-{
-    sendSysExRequest(0, GET_LUMATOUCH_CONFIG);
-}
-
-// CMD 31h: This command is used to read back the current Lumatone firmware revision.
-void TerpstraMidiDriver::sendGetFirmwareRevisionRequest(int sendToTestDevice)
-{
-    if (sendToTestDevice < 0)
-        sendSysExRequest(0, GET_FIRMWARE_REVISION);
-    else if (sendToTestDevice < midiInputs.size())
-        sendTestMessageNow(sendToTestDevice, createTerpstraSysEx(0, GET_FIRMWARE_REVISION, TEST_ECHO, '\0', '\0', '\0'));
-}
-
-// CMD 32h: Set the thresold from key's min value to trigger CA - 004 submodule CC events, ranging from 0x00 to 0xFE
-void TerpstraMidiDriver::setCCActiveThreshold(uint8 boardIndex, uint8 sensitivity)
-{
-    if (sensitivity > 0xfe) sensitivity &= 0xfe;
-    sendSysEx(boardIndex, SET_CC_ACTIVE_THRESHOLD, sensitivity >> 4, sensitivity & 0xf, '\0', '\0');
-}
-
-// CMD 33h: Echo the payload, 0x00-0x7f, for use in connection monitoring
-// the first 7-bit value is reserved for echo differentiation
-void TerpstraMidiDriver::ping(uint8 value1, uint8 value2, uint8 value3, int sendToTestDevice)
-{
-    if (value1 > 0x7f) value1 &= 0x7f;
-    if (value2 > 0x7f) value2 &= 0x7f;
-    if (value3 > 0x7f) value3 &= 0x7f;
-
-    if (sendToTestDevice < 0)
-        sendSysEx(0, LUMA_PING, TEST_ECHO, value1, value2, value3);
-    else if (sendToTestDevice < midiOutputs.size())
-    {
-        sendTestMessageNow(sendToTestDevice, createTerpstraSysEx(0, LUMA_PING, TEST_ECHO, value1, value2, value3));
-    }
-}
-
-// CMD 33h: Echo the payload, 0x00-0x7f, for use in connection monitoring
-unsigned int TerpstraMidiDriver::ping(unsigned int value, int sendToTestDevice)
-{
-    value &= 0xFFFFFFF; // Limit 28-bits
-    ping((value >> 14) & 0x7f, (value >> 7) & 0x7f, value & 0x7f, sendToTestDevice);
-    return value;
-}
-
-// CMD 34h: Reset the thresholds for events and sensitivity for CC & aftertouch on the target board
-void TerpstraMidiDriver::resetBoardThresholds(uint8 boardIndex)
-{
-    sendSysExRequest(boardIndex, RESET_BOARD_THRESHOLDS);
-}
-
-// CMD 35h: Enable/disable key sampling over SSH for the target key and board
-void TerpstraMidiDriver::setKeySampling(uint8 boardIndex, uint8 keyIndex, bool turnSamplingOn)
-{
-    sendSysExToggle(boardIndex, SET_KEY_SAMPLING, turnSamplingOn);
-}
-
-// CMD 36h: Set thresholds for the pitch and modulation wheel to factory settings
-void TerpstraMidiDriver::resetWheelsThresholds()
-{
-    sendSysExRequest(0, RESET_WHEELS_THRESHOLD);
-}
-
-// CMD 37h: Set the bounds from the calibrated zero adc value of the pitch wheel, 0x00 to 0x7f
-void TerpstraMidiDriver::setPitchWheelZeroThreshold(uint8 threshold)
-{
-    if (threshold > 0x7f) threshold &= 0x7f;
-    sendSysEx(0, SET_PITCH_WHEEL_CENTER_THRESHOLD, threshold, '\0', '\0', '\0');
-}
-
-// CMD 38h: Pass in true to initiate the expression pedal calibration routine, or false to stop
-void TerpstraMidiDriver::calibrateExpressionPedal(bool startCalibration)
-{
-    sendSysExToggle(0, CALLIBRATE_EXPRESSION_PEDAL, startCalibration);
-}
-
-// CMD 39h: Reset expression pedal minimum and maximum bounds to factory settings
-void TerpstraMidiDriver::resetExpressionPedalBounds()
-{
-    sendSysExRequest(0, RESET_EXPRESSION_PEDAL_BOUNDS);
-}
-
-// CMD 3Ah: Retrieve the threshold values of target board
-void TerpstraMidiDriver::getBoardThresholdValues(uint8 boardIndex)
-{
-    sendSysExRequest(boardIndex, GET_BOARD_THRESHOLD_VALUES);
-}
-
-// CMD 3Bh: Retrieve the sensitivity values of target board
-void TerpstraMidiDriver::getBoardSensitivityValues(uint8 boardIndex)
-{
-    sendSysExRequest(boardIndex, GET_BOARD_SENSITIVITY_VALUES);
-}
-
-// CMD 3Ch: Set the MIDI channels for peripheral controllers
-void TerpstraMidiDriver::setPeripheralChannels(uint8 pitchWheelChannel, uint8 modWheelChannel, uint8 expressionChannel, uint8 sustainChannel)
-{
-    pitchWheelChannel -= 1;
-    modWheelChannel -= 1;
-    expressionChannel -= 1;
-    sustainChannel -= 1;
-
-    // For now set default channel to 1
-    if (pitchWheelChannel > 0xf) pitchWheelChannel &= 0x00;
-    if (modWheelChannel   > 0xf) modWheelChannel   &= 0x00;
-    if (expressionChannel > 0xf) expressionChannel &= 0x00;
-    if (sustainChannel    > 0xf) sustainChannel    &= 0x00;
-
-    sendSysEx(0, SET_PERIPHERAL_CHANNELS, pitchWheelChannel, modWheelChannel, expressionChannel, sustainChannel);
-}
-
-// CMD 3Dh: Retrieve the MIDI channels for peripheral controllers
-void TerpstraMidiDriver::getPeripheralChannels()
-{
-    sendSysExRequest(0, GET_PERIPHERAL_CHANNELS);
-}
-
-// CMD 3Fh: Set the 8-bit aftertouch trigger delay value, the time between a note on event and the initialization of aftertouch events
-void TerpstraMidiDriver::setAfterTouchTriggerDelay(uint8 boardIndex, uint8 aftertouchTriggerValue)
-{
-    setAfterTouchTriggerDelay(boardIndex, aftertouchTriggerValue >> 4, aftertouchTriggerValue & 0xf);
-}
-
-// CMD 3Fh: Set the 8-bit aftertouch trigger delay value, the time between a note on event and the initialization of aftertouch events
-void TerpstraMidiDriver::setAfterTouchTriggerDelay(uint8 boardIndex, uint8 triggerValueUpperNibble, uint8 triggerValueLowerNibble)
-{
-    sendSysEx(boardIndex, SET_AFTERTOUCH_TRIGGER_DELAY, triggerValueUpperNibble, triggerValueLowerNibble, '\0', '\0');
-}
-
-// CMD 40h: Retrieve the aftertouch trigger delay of the given board
-void TerpstraMidiDriver::sendGetAftertouchTriggerDelayRequest(uint8 boardIndex)
-{
-    sendSysExRequest(boardIndex, GET_AFTERTOUCH_TRIGGER_DELAY);
-}
-
-// CMD 41h: Set the Lumatouch note-off delay value, an 11-bit integer representing the amount of 1.1ms ticks before
-// sending a note-off event after a Lumatone-configured key is released.
-void TerpstraMidiDriver::setLumatouchNoteOffDelay(uint8 boardIndex, int delayValue)
-{
-    setLumatouchNoteOffDelay(boardIndex,
-        (delayValue >> 8) & 0xf,
-        (delayValue >> 4) & 0xf,
-        delayValue & 0xf
-    );
-}
-
-void TerpstraMidiDriver::setLumatouchNoteOffDelay(uint8 boardIndex, uint8 valueBits8_11, uint8 valueBits4_7, uint8 valueBits0_3)
-{
-    sendSysEx(boardIndex, SET_LUMATOUCH_NOTE_OFF_DELAY, valueBits8_11, valueBits4_7, valueBits0_3, '\0');
-}
-
-// CMD 42h: Retrieve the note-off delay value of the given board
-void TerpstraMidiDriver::sendGetLumatouchNoteOffDelayRequest(uint8 boardIndex)
-{
-    sendSysExRequest(boardIndex, GET_LUMATOUCH_NOTE_OFF_DELAY);
-}
-
-// CMD 43h: Set expression pedal ADC threshold value, a 12-bit integer
-void TerpstraMidiDriver::setExpressionPedalADCThreshold(int thresholdValue)
-{
-    setExpressionPedalADCThreshold(
-        (thresholdValue >> 8) & 0xf,
-        (thresholdValue >> 4) & 0xf,
-        thresholdValue & 0xf
-    );
-}
-
-// CMD 43h: Set expression pedal ADC threshold value with 3 4-bit integers representing a 12-bit integer
-void TerpstraMidiDriver::setExpressionPedalADCThreshold(uint8 valueBits8_12, uint8 valueBits4_7, uint8 valueBits0_3)
-{
-    sendSysEx(0, SET_EXPRESSION_PEDAL_THRESHOLD, valueBits8_12, valueBits4_7, valueBits0_3, '\0');
-}
-
-// CMD 44h: Get the current expression pedal ADC threshold value
-void TerpstraMidiDriver::sendGetExpressionPedalADCThresholdRequest()
-{
-    sendSysExRequest(0, GET_EXPRESSION_PEDAL_THRESHOLD);
-}
-
-// CMD 45h: Configure the on/off settings of the sustain pedal
-void TerpstraMidiDriver::sendInvertSustainPedal(bool setInverted)
-{
-    sendSysExToggle(0, INVERT_SUSTAIN_PEDAL, setInverted);
-}
-
-// CMD 46h: Replace current presets with factory presets
-void TerpstraMidiDriver::sendResetDefaultPresetsRequest(int presetIndex)
-{
-    presetIndex %= 10;
-    sendSysEx(0, RESET_DEFAULT_PRESETS, presetIndex, '\0', '\0', '\0');
-}
-
-// CMD 47h: Read back the currently configured preset flags of expression & sustain inversion,
-// plus light-on-keystroke and polyphonic aftertouch
-void TerpstraMidiDriver::sendGetPresetFlagsReset()
-{
-    sendSysExRequest(0, GET_PRESET_FLAGS);
-}
-
-// For CMD 48h response: get expression pedal sensitivity
-void TerpstraMidiDriver::sendGetExpressionPedalSensitivity()
-{
-    sendSysExRequest(0, GET_EXPRESSION_PEDAL_SENSITIVIY);
-}
-
-/*
-==============================================================================
-Low-level SysEx calls
-*/
-
-void TerpstraMidiDriver::fillManufacturerId(unsigned char* data) const
-{
-    data[0] = MANUFACTURER_ID_0;
-    data[1] = MANUFACTURER_ID_1;
-    data[2] = MANUFACTURER_ID_2;
-}
-
-MidiMessage TerpstraMidiDriver::createTerpstraSysEx(uint8 boardIndex, uint8 cmd, uint8 data1, uint8 data2, uint8 data3, uint8 data4) const
-{
-    unsigned char sysExData[9];
-    fillManufacturerId(sysExData);
-    sysExData[3] = boardIndex;
-    sysExData[4] = cmd;
-    sysExData[5] = data1;
-    sysExData[6] = data2;
-    sysExData[7] = data3;
-    sysExData[8] = data4;
-
-    MidiMessage msg = MidiMessage::createSysExMessage(sysExData, 9);
-    return msg;
-}
-
-// Create a SysEx message to send 8-bit color precision
-MidiMessage TerpstraMidiDriver::createExtendedKeyColourSysEx(uint8 boardIndex, uint8 cmd, uint8 keyIndex, uint8 redUpper, uint8 redLower, uint8 greenUpper, uint8 greenLower, uint8 blueUpper, uint8 blueLower) const
-{
-    unsigned char sysExData[12];
-    fillManufacturerId(sysExData);
-    sysExData[3] = boardIndex;
-    sysExData[4] = cmd;
-    sysExData[5] = keyIndex;
-    sysExData[6] = redUpper;
-    sysExData[7] = redLower;
-    sysExData[8] = greenUpper;
-    sysExData[9] = greenLower;
-    sysExData[10] = blueUpper;
-    sysExData[11] = blueLower;
-
-    MidiMessage msg = MidiMessage::createSysExMessage(sysExData, 12);
-    return msg;
-}
-MidiMessage TerpstraMidiDriver::createExtendedKeyColourSysEx(uint8 boardIndex, uint8 cmd, uint8 keyIndex, int red, int green, int blue) const
-{
-    return createExtendedKeyColourSysEx(boardIndex, cmd, keyIndex, red >> 4, red & 0xf, green >> 4, green & 0xf, blue >> 4, blue & 0xf);
-}
-
-MidiMessage TerpstraMidiDriver::createExtendedMacroColourSysEx(uint8 cmd, uint8 redUpper, uint8 redLower, uint8 greenUpper, uint8 greenLower, uint8 blueUpper, uint8 blueLower) const
-{
-    unsigned char sysExData[11];
-    fillManufacturerId(sysExData);
-    sysExData[3] = 0;
-    sysExData[4] = cmd;
-    sysExData[5] = redUpper;
-    sysExData[6] = redLower;
-    sysExData[7] = greenUpper;
-    sysExData[8] = greenLower;
-    sysExData[9] = blueUpper;
-    sysExData[10] = blueLower;
-
-    MidiMessage msg = MidiMessage::createSysExMessage(sysExData, 11);
-    return msg;
-}
-
-MidiMessage TerpstraMidiDriver::createExtendedMacroColourSysEx(uint8 cmd, int red, int green, int blue) const
-{
-    return createExtendedMacroColourSysEx(cmd, red >> 4, red & 0xf, green >> 4, green & 0xf, blue >> 4, blue & 0xf);
-}
-
-MidiMessage TerpstraMidiDriver::createTableSysEx(uint8 boardIndex, uint8 cmd, uint8 tableSize, const uint8 table[])
-{
-    size_t msgSize = tableSize + 5;
-    Array<unsigned char> dataArray;
-    dataArray.resize(msgSize);
-
-    auto sysExData = dataArray.getRawDataPointer();
-    fillManufacturerId(sysExData);
-
-    sysExData[3] = '\0';
-    sysExData[4] = cmd;
-
-    memmove(&sysExData[5], table, sizeof(uint8) * tableSize);
-
-#if JUCE_DEBUG
-    for (int i = 0; i < tableSize; i++)
-        jassert(table[i] <= 0x7f);
-#endif
-
-    auto msg = MidiMessage::createSysExMessage(sysExData, msgSize);
-    return msg;
-}
-
-void TerpstraMidiDriver::sendSysEx(uint8 boardIndex, uint8 cmd, uint8 data1, uint8 data2, uint8 data3, uint8 data4, bool overrideEditMode)
-{
-    if (midiInput != nullptr)
-    {
-        jassert(boardIndex < 0x6 && data1 <= 0x7f && data2 <= 0x7f && data3 <= 0x7f && data4 <= 0x7f);
-        MidiMessage msg = createTerpstraSysEx(boardIndex, cmd, data1, data2, data3, data4);
-        sendMessageWithAcknowledge(msg);
-    }
-}
-
-// Send a SysEx message without parameters
-void TerpstraMidiDriver::sendSysExRequest(uint8 boardIndex, uint8 cmd)
-{
-    unsigned char sysExData[9];
-    fillManufacturerId(sysExData);
-    sysExData[3] = boardIndex;
-    sysExData[4] = cmd;
-    sysExData[5] = '\0';
-    sysExData[6] = '\0';
-    sysExData[7] = '\0';
-    sysExData[8] = '\0';
-    auto msg = MidiMessage::createSysExMessage(sysExData, 9);
-    sendMessageWithAcknowledge(msg);
-}
-
-void TerpstraMidiDriver::sendSysExToggle(uint8 boardIndex, uint8 cmd, bool turnStateOn)
-{
-    unsigned char sysExData[9];
-    fillManufacturerId(sysExData);
-    sysExData[3] = boardIndex;
-    sysExData[4] = cmd;
-    sysExData[5] = turnStateOn;
-    sysExData[6] = '\0';
-    sysExData[7] = '\0';
-    sysExData[8] = '\0';
-    auto msg = MidiMessage::createSysExMessage(sysExData, 9);
-    sendMessageWithAcknowledge(msg);
-}
-
-// Checks if message is a valid Lumatone firmware response and is expected length, then runs supplied unpacking function or returns an error code
-FirmwareSupport::Error TerpstraMidiDriver::unpackIfValid(const MidiMessage& response, size_t numBytes, std::function<FirmwareSupport::Error(const uint8*)> unpackFunction)
-{
-    auto status = messageIsValidLumatoneResponse(response);
-    if (status != FirmwareSupport::Error::noError)
-        return status;
-
-    status = responseIsExpectedLength(response, numBytes);
-    if (status != FirmwareSupport::Error::noError)
-        return status;
-
-    return unpackFunction(&response.getSysExData()[PAYLOAD_INIT]);
-}
-
-// Generic unpacking of octave data from a SysEx message
-FirmwareSupport::Error TerpstraMidiDriver::unpackOctaveConfig(const MidiMessage& msg, int& boardId, size_t numBytes, int* keyData, std::function<FirmwareSupport::Error(const MidiMessage&, size_t, int*)> nBitUnpackFunction)
-{
-    auto status = nBitUnpackFunction(msg, numBytes, keyData);
-    if (status != FirmwareSupport::Error::noError)
-        return status;
-
-    boardId = msg.getSysExData()[BOARD_IND];
-    return status;
-}
-
-// Generic unpacking of 7-bit data from a SysEx message
-FirmwareSupport::Error TerpstraMidiDriver::unpack7BitData(const MidiMessage& msg, size_t numBytes, int* unpackedData)
-{
-    auto unpack = [&](const uint8* payload) {
-        for (int i = 0; i < numBytes; i++)
-            unpackedData[i] = payload[i];
-        return FirmwareSupport::Error::noError;
-    };
-
-    return unpackIfValid(msg, numBytes, unpack);
-}
-
-// Unpacking of octave-based 7-bit key configuration data
-FirmwareSupport::Error TerpstraMidiDriver::unpack7BitOctaveData(const MidiMessage& msg, int& boardId, uint8 numKeys, int* keyData)
-{
-    return unpackOctaveConfig(msg, boardId, numKeys, keyData, [&](const MidiMessage&, uint8, int*) {
-        return unpack7BitData(msg, numKeys, keyData);
-    });
-}
-
-// Generic unpacking of 8-bit data from a SysEx message
-FirmwareSupport::Error TerpstraMidiDriver::unpack8BitData(const MidiMessage& msg, size_t numBytes, int* unpackedData)
-{
-    auto unpack = [&](const uint8* payload) {
-        auto numValues = numBytes / 2;
-        for (int i = 0; i < numValues; i++)
-            unpackedData[i] = (payload[(i * 2)] << 4) | (payload[(i * 2) + 1]);
-        return FirmwareSupport::Error::noError;
-    };
-
-    return unpackIfValid(msg, numBytes, unpack);
-}
-
-// Unpacking of octave-based 8-bit data
-FirmwareSupport::Error TerpstraMidiDriver::unpack8BitOctaveData(const MidiMessage& msg, int& boardId, uint8 numKeys, int* keyData)
-{
-    return unpackOctaveConfig(msg, boardId, numKeys, keyData, [&](const MidiMessage&, size_t, int*) {
-        return unpack8BitData(msg, numKeys * 2, keyData);
-    });
-}
-
-// Generic unpacking of 12-bit data from a SysEx message, when packed with two 7-bit values
-FirmwareSupport::Error TerpstraMidiDriver::unpack12BitDataFrom7Bit(const MidiMessage& msg, size_t numBytes, int* unpackedData)
-{
-    auto unpack = [&](const uint8* payload) {
-        auto numValues = numBytes / 2;
-        for (int i = 0; i < numValues; i++)
-            unpackedData[i] = (payload[i * 2] << 6) | (payload[(i * 2) + 1]);
-        return FirmwareSupport::Error::noError;
-    };
-
-    return unpackIfValid(msg, numBytes, unpack);
-}
-
-// Generic unpacking of 12-bit data from a SysEx message, when packed with three 4-bit values
-FirmwareSupport::Error TerpstraMidiDriver::unpack12BitDataFrom4Bit(const MidiMessage& msg, size_t numBytes, int* unpackedData)
-{
-    auto unpack = [&](const uint8* payload) {
-        auto numValues = numBytes / 3;
-        for (int i = 0; i < numValues; i++)
-        {
-            int start = i * 3;
-            unpackedData[i] = (payload[start] << 8) | (payload[start + 1] << 4) | (payload[start + 2]);
-        }
-        return FirmwareSupport::Error::noError;
-    };
-
-    return unpackIfValid(msg, numBytes, unpack);
-}
-bool TerpstraMidiDriver::messageIsResponseToMessage(const MidiMessage& answer, const MidiMessage& originalMessage)
-{
-    // Only for SysEx messages
-    if (answer.isSysEx() != originalMessage.isSysEx())
-        return false;
-
-    auto answerSysExData = answer.getSysExData();
-    auto originalSysExData = originalMessage.getSysExData();
-
-    // Manufacturer Id, board index, command coincide?
-    if (answerSysExData[0] != originalSysExData[0] ||
-        answerSysExData[1] != originalSysExData[1] ||
-        answerSysExData[2] != originalSysExData[2] ||
-        answerSysExData[3] != originalSysExData[3] ||
-        answerSysExData[4] != originalSysExData[4])
-    {
-        return false;
-    }
-    else
-    {
-        return true;
-    }
-}
-
-FirmwareSupport::Error TerpstraMidiDriver::messageIsValidLumatoneResponse(const MidiMessage& midiMessage)
-{
-    if (!midiMessage.isSysEx())
-        return FirmwareSupport::Error::messageIsNotSysEx;
-
-    auto sysExData = midiMessage.getSysExData();
-
-    if (midiMessage.getSysExDataSize() < PAYLOAD_INIT)
-        return FirmwareSupport::Error::messageTooShort;
-
-    if (!(sysExData[MANU_0] == MANUFACTURER_ID_0) &&
-        !(sysExData[MANU_1] == MANUFACTURER_ID_1) &&
-        !(sysExData[MANU_2] == MANUFACTURER_ID_2))
-        return FirmwareSupport::Error::messageHasIncorrectManufacturerId;
-
-    if (sysExData[BOARD_IND] > BOARD_OCT_5)
-        return FirmwareSupport::Error::messageHasInvalidBoardIndex;
-
-    if (sysExData[MSG_STATUS] > TerpstraMIDIAnswerReturnCode::ERROR)
-        return FirmwareSupport::Error::messageHasInvalidStatusByte;
-
-    return FirmwareSupport::Error::noError;
-}
-
-FirmwareSupport::Error TerpstraMidiDriver::responseIsExpectedLength(const MidiMessage& midiMessage, size_t numPayloadBytes)
-{
-    auto size = midiMessage.getSysExDataSize();
-    auto expected = numPayloadBytes + PAYLOAD_INIT;
-
-    if (size == expected)
-        return FirmwareSupport::Error::noError;
-
-    else if (size < expected)
-        return FirmwareSupport::Error::messageTooShort;
-
-    else
-        return FirmwareSupport::Error::messageTooLong;
-}
-
-// For CMD 13h response: unpacks 8-bit key data for red LED intensity. 112 bytes, lower and upper nibbles for 56 values
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetLEDConfigResponse(const MidiMessage& response, int& boardId, int* keyData)
-{
-    // TODO: Maybe should define keys per octave somewhere
-    return unpack8BitOctaveData(response, boardId, 56, keyData);
-}
-
-// For CMD 13h response: unpacks key data for red LED intensity. 55 or 56 bytes, each value must be multiplied by 5
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetLEDConfigResponse_Version_1_0_0(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData)
-{
-    // Custom unpacking function for intensity multiplication
-    auto unpackFunction = [&](const uint8* payload) {
-        for (int i = 0; i < numKeys; i++)
-            keyData[i] = ((int)payload[i] * 5) & 0xff;
-        return FirmwareSupport::Error::noError;
-    };
-
-    return unpackOctaveConfig(response, boardId, numKeys, keyData, [&](const MidiMessage&, uint8, int*) {
-        return unpackIfValid(response, numKeys, unpackFunction);
-    });
-}
-
-// For CMD 16h response: unpacks channel data for note configuration. 55 or 56 bytes
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetChannelConfigResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData)
-{
-    return unpack7BitOctaveData(response, boardId, numKeys, keyData);
-}
-
-// For CMD 17h response: unpacks 7-bit key data for note configuration. 55 or 56 bytes
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetNoteConfigResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData)
-{
-    return unpack7BitOctaveData(response, boardId, numKeys, keyData);
-}
-
-// For CMD 18h response: unpacks 7-bit key type data for key configuration. 55 or 56 bytes
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetTypeConfigResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData)
-{
-    return unpack7BitOctaveData(response, boardId, numKeys, keyData);
-}
-
-// For CMD 19h response: unpacks 8-bit key data for maximums of adc threshold. 55 or 56 bytes
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetKeyMaxThresholdsResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData)
-{
-    return unpack8BitData(response, numKeys, keyData);
-}
-
-// For CMD 1Ah response: unpacks 8-bit key data for minimums of adc threshold. 55 or 56 bytes
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetKeyMinThresholdsResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData)
-{
-    return unpack8BitOctaveData(response, boardId, numKeys, keyData);
-}
-
-// For CMD 1Bh response: unpacks 8-bit key data for maximums of adc threshold for aftertouch triggering. 55 or 56 bytes
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetAftertouchMaxThresholdsResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData)
-{
-    return unpack8BitOctaveData(response, boardId, numKeys, keyData);
-}
-
-// For CMD 1Ch response: unpacks boolean key validity data for board, whether or not each key meets threshold specs
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetKeyValidityResponse(const MidiMessage& response, int& boardId, uint8 numKeys, bool* keyValidityData)
-{
-    // TODO: perhaps define boolean unpacking, or combine with 7-bit somehow
-
-    // Custom unpacking function for boolean array
-    auto unpackFunction = [&](const uint8* payload) {
-        for (int i = 0; i < numKeys; i++)
-            keyValidityData[i] = (bool)payload[i];
-        return FirmwareSupport::Error::noError;
-    };
-
-    auto status = unpackIfValid(response, numKeys, unpackFunction);
-    if (status != FirmwareSupport::Error::noError)
-        return status;
-
-    boardId = response.getSysExData()[BOARD_IND];
-    return status;
-}
-
-// For CMD 1Dh response: unpacks 7-bit velocity configuration of keyboard, 128 bytes
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetVelocityConfigResponse(const MidiMessage& response, int* velocityData)
-{
-    return unpack7BitData(response, 128, velocityData);
-}
-
-// For CMD 1Eh response: unpacks 7-bit fader configuration of keyboard, 128 bytes
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetFaderConfigResponse(const MidiMessage& response, int* faderData)
-{
-    return unpack7BitData(response, 128, faderData);
-}
-
-// For CMD 1Fh response: unpacks 7-bit aftertouch configuration of keyboard, 128 bytes
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetAftertouchConfigResponse(const MidiMessage& response, int* aftertouchData)
-{
-    return unpack7BitData(response, 128, aftertouchData);
-}
-
-// For CMD 21h response: unpacks 12-bit velocity interval configuration of keyboard, 254 bytes encoding 127 values
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetVelocityIntervalConfigResponse(const MidiMessage& response, int* intervalData)
-{
-    return unpack12BitDataFrom7Bit(response, 254, intervalData);
-}
-
-// For CMD 22h response: unpacks 7-bit fader type configuration of board, 56 bytes
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetFaderConfigResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* faderData)
-{
-    return unpackOctaveConfig(response, boardId, numKeys, faderData, [&](const MidiMessage&, size_t, int*) {
-        return unpack7BitData(response, numKeys, faderData);
-    });
-}
-
-// For CMD 23h response: unpacks serial ID number of keyboard, 12 7-bit values encoding 6 bytes
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetSerialIdentityResponse(const MidiMessage& response, int* serialBytes)
-{
-    // Check for echo first
-    auto sysExData = response.getSysExData();
-    if (sysExData[MSG_STATUS] == TEST_ECHO)
-        return FirmwareSupport::Error::messageIsAnEcho;
-
-    auto errorCode = FirmwareSupport::Error::noError;
-
-    if (response.getSysExDataSize() == 18)
-        errorCode = unpack8BitData(response, 12, serialBytes);
-    else if (response.getSysExDataSize() < 18)
-    {
-        // Early firmware versions don't send serial payload
-        errorCode = messageIsValidLumatoneResponse(response);
-        if (errorCode == FirmwareSupport::Error::noError)
-        {
-            for (uint8 i = 0; i < 6; i++)
-                serialBytes[i] = 0;
-        }
-    }
-    else
-        errorCode = FirmwareSupport::Error::messageTooLong;
-
-    return errorCode;
-}
-
-// For CMD 30h response: unpacks 7-bit Lumatouch configuration of keyboard, 128 bytes
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetLumatouchConfigResponse(const MidiMessage& response, int* lumatouchData)
-{
-    return unpack7BitData(response, 128, lumatouchData);
-}
-
-// For CMD 31h response: unpacks firmware revision running on the keyboard
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetFirmwareRevisionResponse(const MidiMessage& response, int& majorVersion, int& minorVersion, int& revision)
-{
-    auto status = messageIsValidLumatoneResponse(response);
-    if (status != FirmwareSupport::Error::noError)
-        return status;
-
-    status = responseIsExpectedLength(response, 3);
-    if (status != FirmwareSupport::Error::noError)
-        return status;
-
-    auto payload = &response.getSysExData()[PAYLOAD_INIT];
-    majorVersion = payload[0];
-    minorVersion = payload[1];
-    revision     = payload[2];
-
-    return status;
-}
-
-// For CMD 33h response: echo payload
-FirmwareSupport::Error TerpstraMidiDriver::unpackPingResponse(const MidiMessage& response, int& value1, int& value2, int& value3, int& value4)
-{
-    auto status = messageIsValidLumatoneResponse(response);
-    if (status != FirmwareSupport::Error::noError)
-        return status;
-
-    status = responseIsExpectedLength(response, 4);
-    if (status != FirmwareSupport::Error::noError)
-        return status;
-
-    auto payload = &response.getSysExData()[PAYLOAD_INIT];
-    value1 = payload[0];
-    value2 = payload[1];
-    value3 = payload[2];
-    value4 = payload[3];
-
-    return status;
-}
-
-// For CMD 33h response: echo payload
-FirmwareSupport::Error TerpstraMidiDriver::unpackPingResponse(const MidiMessage& response, unsigned int& value)
-{
-    // Check for echo first
-    auto sysExData = response.getSysExData();
-    if (sysExData[MSG_STATUS] == TEST_ECHO)
-        return FirmwareSupport::Error::messageIsAnEcho;
-
-    auto status = messageIsValidLumatoneResponse(response);
-    if (status != FirmwareSupport::Error::noError)
-        return status;
-
-    status = responseIsExpectedLength(response, 4);
-    if (status != FirmwareSupport::Error::noError)
-        return status;
-
-    auto payload = &sysExData[PAYLOAD_INIT];
-    value = (payload[1] << 14) | (payload[2] << 7) | (payload[3]);
-
-    return status;
-}
-
-// For CMD 3Ah response: retrieve all 8-bit threshold values of a certain board
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetBoardThresholdValuesResponse(const MidiMessage& response, int& boardId, int& minHighThreshold, int& minLowThreshold, int& maxThreshold, int& aftertouchThreshold, int& ccThreshold)
-{
-    const short NUM_UNPACKED = 5;
-    int unpackedData[NUM_UNPACKED];
-    auto status = unpack8BitOctaveData(response, boardId, NUM_UNPACKED, unpackedData);
-    if (status != FirmwareSupport::Error::noError)
-        return status;
-
-    minHighThreshold     = unpackedData[0];
-    minLowThreshold      = unpackedData[1];
-    maxThreshold         = unpackedData[2];
-    aftertouchThreshold  = unpackedData[3];
-    ccThreshold          = unpackedData[4];
-
-    return status;
-}
-
-// For CMD 3Bh response: retrieve all threshold values of a certain board
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetBoardSensitivityValuesResponse(const MidiMessage& response, int& boardId, int& ccSensitivity, int& aftertouchSensitivity)
-{
-    const short NUM_UNPACKED = 2;
-    int unpackedData[NUM_UNPACKED];
-    auto status = unpack8BitOctaveData(response, boardId, NUM_UNPACKED, unpackedData);
-    if (status != FirmwareSupport::Error::noError)
-        return status;
-
-    ccSensitivity           = unpackedData[0];
-    aftertouchSensitivity   = unpackedData[1];
-
-    return status;
-}
-
-// For CMD 3Dh response: retrieve all threshold values of a certain board
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetPeripheralChannelsResponse(const MidiMessage& response, int& pitchWheelChannel, int& modWheelChannel, int& expressionChannel, int& sustainPedalChannel)
-{
-    const short NUM_UNPACKED = 4;
-    int unpackedData[NUM_UNPACKED];
-    auto status = unpack7BitData(response, NUM_UNPACKED, unpackedData);
-    if (status != FirmwareSupport::Error::noError)
-        return status;
-
-    pitchWheelChannel   = unpackedData[0] + 1;
-    modWheelChannel     = unpackedData[1] + 1;
-    expressionChannel   = unpackedData[2] + 1;
-    sustainPedalChannel = unpackedData[3] + 1;
-
-    return status;
-}
-
-// For CMD 3Eh response: read back the calibration mode of the message
-FirmwareSupport::Error TerpstraMidiDriver::unpackPeripheralCalibrationMode(const MidiMessage& response, int& calibrationMode)
-{
-    // Other errors will be caught in corresponding mode unpacking
-    int msgSize = response.getSysExDataSize();
-    int expectedSize = PAYLOAD_INIT + 15;
-
-    if (msgSize < expectedSize)
-        return FirmwareSupport::Error::messageTooShort;
-
-    else if (msgSize > expectedSize)
-        return FirmwareSupport::Error::messageTooLong;
-
-    auto sysExData = response.getSysExData();
-    calibrationMode = sysExData[CALIB_MODE];
-
-    return FirmwareSupport::Error::noError;
-}
-
-// For CMD 3Eh response: retrieve 12-bit expression pedal calibration status values in respective mode, automatically sent every 100ms
-FirmwareSupport::Error TerpstraMidiDriver::unpackExpressionPedalCalibrationPayload(const MidiMessage& response, int& minBound, int& maxBound, bool& valid)
-{
-    const short NUM_UNPACKED = 15; // Actually two + boolean, but this message always returns 15-byte payload
-    int unpackedData[NUM_UNPACKED];
-    auto status = unpack12BitDataFrom4Bit(response, 15, unpackedData);
-    if (status != FirmwareSupport::Error::noError)
-        return status;
-
-    minBound = unpackedData[0];
-    maxBound = unpackedData[1];
-    valid = response.getSysExData()[PAYLOAD_INIT + 3];
-
-    return status;
-}
-
-// For CMD 3Eh response: retrieve 12-bit pitch & mod wheel calibration status values in respective mode, automatically sent every 100ms
-FirmwareSupport::Error TerpstraMidiDriver::unpackWheelsCalibrationPayload(const MidiMessage& response, int& centerPitch, int& minPitch, int& maxPitch, int& minMod, int& maxMod)
-{
-    const short NUM_UNPACKED = 15;
-    int unpackedData[NUM_UNPACKED];
-    auto status = unpack12BitDataFrom4Bit(response, NUM_UNPACKED, unpackedData);
-    if (status != FirmwareSupport::Error::noError)
-        return status;
-
-    centerPitch = unpackedData[0];
-    minPitch    = unpackedData[1];
-    maxPitch    = unpackedData[2];
-    minMod      = unpackedData[3];
-    maxMod      = unpackedData[4];
-
-    return status;
-}
-
-// For CMD 40h response: retrieve aftertouch trigger delay of a certain board
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetAftertouchTriggerDelayResponse(const MidiMessage& response, int& boardId, int& triggerDelay)
-{
-    const short NUM_UNPACKED = 1;
-    int unpackedData[NUM_UNPACKED];
-    auto status = unpack8BitData(response, NUM_UNPACKED, unpackedData);
-    if (status != FirmwareSupport::Error::noError)
-        return status;
-
-    triggerDelay = unpackedData[0];
-    return status;
-}
-
-// For CMD 42h response: retrieve 12-bit Lumatouch note off delay of a certain board
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetLumatouchNoteOffDelayResponse(const MidiMessage& response, int& boardId, int& delay)
-{
-    auto status = messageIsValidLumatoneResponse(response);
-    if (status != FirmwareSupport::Error::noError)
-        return status;
-
-    status = responseIsExpectedLength(response, 3);
-    if (status != FirmwareSupport::Error::noError)
-        return status;
-
-    auto payload = &response.getSysExData()[PAYLOAD_INIT];
-
-    delay = (payload[0] << 8) | (payload[1] << 4) | payload[2];
-
-    return status;
-}
-
-// For CMD 44h response: retrieve 12-bit expression pedal adc threshold, a 12-bit value
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetExpressionPedalThresholdResponse(const MidiMessage& response, int& thresholdValue)
-{
-    auto status = messageIsValidLumatoneResponse(response);
-    if (status != FirmwareSupport::Error::noError)
-        return status;
-
-    status = responseIsExpectedLength(response, 3);
-    if (status != FirmwareSupport::Error::noError)
-        return status;
-
-    auto payload = &response.getSysExData()[PAYLOAD_INIT];
-
-    thresholdValue = (payload[0] << 8) | (payload[1] << 4) | payload[2];
-
-    return status;
-}
-
-// For CMD 47h response: retrieve preset flags
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetPresetFlagsResponse(const MidiMessage& response, bool& expressionInverted, bool& lightsOnKeystroke, bool& aftertouchOn, bool& sustainInverted)
-{
-    const short NUM_UNPACKED = 4;
-    int unpackedData[NUM_UNPACKED];
-    auto status = unpack7BitData(response, NUM_UNPACKED, unpackedData);
-    if (status != FirmwareSupport::Error::noError)
-        return status;
-
-    expressionInverted  = unpackedData[0];
-    lightsOnKeystroke   = unpackedData[1];
-    aftertouchOn        = unpackedData[2];
-    sustainInverted     = unpackedData[3];
-
-    return status;
-}
-
-// For CMD 48h response: get expression pedal sensitivity
-FirmwareSupport::Error TerpstraMidiDriver::unpackGetExpressionPedalSensitivityResponse(const MidiMessage& response, int& sensitivity)
-{
-    const short NUM_UNPACKED = 1;
-    int unpackedData[NUM_UNPACKED];
-    auto status = unpack7BitData(response, NUM_UNPACKED, unpackedData);
-    if (status != FirmwareSupport::Error::noError)
-        return status;
-
-    sensitivity = unpackedData[0];
-
-    return status;
-}
-
-
-
-void TerpstraMidiDriver::sendMessageWithAcknowledge(const MidiMessage& message)
-{
-    // Prevent certain messages from being sent
-    if (onlySendRequestMessages && message.isSysEx())
-    {
-        auto sysExData = message.getSysExData();
-        if (   sysExData[CMD_ID] == CHANGE_KEY_NOTE
-            || sysExData[CMD_ID] == SET_KEY_COLOUR
-            || sysExData[CMD_ID] == SET_VELOCITY_CONFIG
-            || sysExData[CMD_ID] == SET_FADER_CONFIG
-            || sysExData[CMD_ID] == SET_AFTERTOUCH_CONFIG
-            || sysExData[CMD_ID] == SET_VELOCITY_INTERVALS
-            || sysExData[CMD_ID] == SET_LUMATOUCH_CONFIG)
-        {
-            return;
-        }
-    }
-
-//    jassert(midiInput != nullptr);
-    if (midiInput == nullptr)
-    {
-        DBG("No MidiInput open to send message to.");
-//        sendMessageNow(message);
-
-	    // Notify listeners
-		// const MessageManagerLock mmLock;
-		// this->listeners.call(&Listener::midiMessageSent, message);
-//        notifyMessageSent(midiOutput, message);
-    }
-    else
-    {
-        // Add message to queue first. The oldest message in queue will be sent.
-		{
-			messageBuffer.add(message);
-			// const MessageManagerLock mmLock;
-			// this->listeners.call(&Listener::midiSendQueueSize, messageBuffer.size());
-            notifySendQueueSize();
-		}
-
-        // If there is no message waiting for acknowledge: send oldest message of queue
-       	if (!isTimerRunning() && !hasMsgWaitingForAck)
-        {
-            sendOldestMessageInQueue();
-        }
-    }
-}
-
-void TerpstraMidiDriver::sendOldestMessageInQueue()
-{
-    if (!messageBuffer.isEmpty())
-    {
-        jassert(!isTimerRunning());
-        jassert(!hasMsgWaitingForAck);
-
-        currentMsgWaitingForAck = messageBuffer[0];     // oldest element in buffer
-        hasMsgWaitingForAck = true;
-		messageBuffer.remove(0);                        // remove from buffer
-
-        // const MessageManagerLock mmLock;
-        // this->listeners.call(&Listener::midiSendQueueSize, messageBuffer.size());
-        notifySendQueueSize();
-
-        sendCurrentMessage();
-    }
-}
-
-void TerpstraMidiDriver::sendCurrentMessage()
-{
-    jassert(!isTimerRunning());
-    jassert(hasMsgWaitingForAck);
-
-#if JUCE_DEBUG
-    if (currentMsgWaitingForAck.isSysEx())
-    {
-        auto sysExData = currentMsgWaitingForAck.getSysExData();
-        for (int i = 0; i < currentMsgWaitingForAck.getSysExDataSize(); i++)
-            jassert(sysExData[i] <= 0x7f);
-    }
-#endif
-
-    sendMessageNow(currentMsgWaitingForAck);        // send it
-
-    // Notify listeners
-    DBG("SENT: " + currentMsgWaitingForAck.getDescription());
-    // const MessageManagerLock mmLock;
-    // this->listeners.call(&Listener::midiMessageSent, currentMsgWaitingForAck);
-    notifyMessageSent(midiOutput, currentMsgWaitingForAck);
-
-    timerType = waitForAnswer;
-    startTimer(receiveTimeoutInMilliseconds);       // Start waiting for answer
-}
-
-void TerpstraMidiDriver::handleIncomingMidiMessage(MidiInput* source, const MidiMessage& message)
-{
-#if JUCE_DEBUG
-    if (message.isSysEx())
-        DBG("RCVD: " + message.getDescription());
-#endif
-
-    //const MessageManagerLock mmLock;
-    //this->listeners.call(&Listener::midiMessageReceived, source, message);
-    notifyMessageReceived(source, message);
-
-    // Check whether received message is an answer to the previously sent one
-    if (hasMsgWaitingForAck && messageIsResponseToMessage(message, currentMsgWaitingForAck))
-    {
-        jassert(timerType == waitForAnswer);
-
-        // Answer has come, we can stop the timer
-        stopTimer();
-
-        // Check answer state (error yes/no)
-        auto answerState = message.getSysExData()[5];
-
-        // This would be nice but we can't be sure the state is demo mode
-//        if (answerState == TerpstraMIDIAnswerReturnCode::STATE)
-//        {
-//            // turn demo mode off
-//            startDemoMode(false);
-//        }
-
-        // if answer state is "busy": resend message after a little delay
-        if (answerState == TerpstraMIDIAnswerReturnCode::BUSY)
-        {
-            // Start delay timer, after which message will be sent again
-            timerType = delayWhileDeviceBusy;
-            startTimer(busyTimeDelayInMilliseconds);
-        }
-        else
-        {
-            // In case of error, NACK: ?
-            // For now: Remove from buffer in any case
-            hasMsgWaitingForAck = false;
-
-            // If there are more messages waiting in the queue: send the next one
-            sendOldestMessageInQueue();
-        }
-    }
-
-    // Other incoming messages are ignored
-}
-
-void TerpstraMidiDriver::timerCallback()
-{
-    stopTimer();
-
-    if (timerType == waitForAnswer)
-    {
-        // For now: Remove from buffer, try to send next one
-        hasMsgWaitingForAck = false;
-
-        // No answer came from MIDI input
-
-        DBG("DRIVER: NO ANSWER");
-        //const MessageManagerLock mmLock;
-        // listeners.call(&Listener::generalLogMessage, "No answer from device", HajuErrorVisualizer::ErrorLevel::error);
-        // listeners.call(&Listener::noAnswerToMessage, currentMsgWaitingForAck);
-        notifyLogMessage("No answer from device", HajuErrorVisualizer::ErrorLevel::error);
-        notifyNoAnswerToMessage(midiInput, currentMsgWaitingForAck);
-
-
-        sendOldestMessageInQueue();
-    }
-    else if (timerType == delayWhileDeviceBusy)
-    {
-        // Resend current message and start waiting for answer again
-        sendCurrentMessage();
-    }
-    else
-        jassertfalse;
-}
-
-void TerpstraMidiDriver::clearMIDIMessageBuffer()
-{
-    messageBuffer.clear();
-    hasMsgWaitingForAck = false;
-    stopTimer();
-    // this->listeners.call(&Listener::midiSendQueueSize, 0);
-    notifySendQueueSize();
-}
diff --git a/Source/TerpstraMidiDriver.h b/Source/TerpstraMidiDriver.h
deleted file mode 100644
index 19b068a0..00000000
--- a/Source/TerpstraMidiDriver.h
+++ /dev/null
@@ -1,513 +0,0 @@
-/*
-  ==============================================================================
-
-    TerpstraMidiDriver.h
-    Created: 20 Feb 2015 8:04:02pm
-    Author:  hsstraub
-
-  ==============================================================================
-*/
-
-#pragma once
-
-//[Headers]     -- You can add your own extra header files here --
-#include <JuceHeader.h>
-#include "HajuLib/HajuMidiDriver.h"
-#include "HajuLib/HajuErrorVisualizer.h"
-#include "LumatoneFirmwareDefinitions.h"
-//[/Headers]
-
-/*
-==============================================================================
-Connection to midi, sending SysEx parameters to keyboard
-==============================================================================
-*/
-class TerpstraMidiDriver : public HajuMidiDriver, public Timer
-{
-    // Types
-public:
-	// MidiMessageCollector version of previous TerpstraMidiDriver::Listener, as to keep the Midi thread lightweight
-	class Collector : protected MidiMessageCollector
-	{
-		MidiBuffer messagesSentQueue;
-
-	public:
-        virtual ~Collector() {}
-
-		virtual void midiMessageReceived(MidiInput* source, const MidiMessage& message) = 0;
-		virtual void midiMessageSent(MidiOutput* target, const MidiMessage& message) = 0;
-		virtual void midiSendQueueSize(int size) = 0;
-		virtual void generalLogMessage(String textMessage, HajuErrorVisualizer::ErrorLevel errorLevel) {}
-
-		// Realtime messages before a device is connected - not for heavy processing!
-		virtual void noAnswerToMessage(MidiInput* expectedDevice, const MidiMessage& message) = 0;
-//		virtual void testMessageReceived(int testInputIndex, const MidiMessage& midiMessage) {};
-    };
-
-private:
-	// Helper callbacks for notifying Collectors
-	void notifyMessageReceived(MidiInput* source, const MidiMessage& midiMessage);
-	void notifyMessageSent(MidiOutput* target, const MidiMessage& midiMessage);
-	void notifySendQueueSize();
-	void notifyLogMessage(String textMessage, HajuErrorVisualizer::ErrorLevel errorLevel);
-    void notifyNoAnswerToMessage(MidiInput* expectedDevice, const MidiMessage& midiMessage);
-//	void notifyTestMessageReceived(int testInputIndex, const MidiMessage& midiMessage);
-
-private:
-    typedef enum
-    {
-        waitForAnswer,
-        delayWhileDeviceBusy
-    } TimerType;
-
-public:
-	TerpstraMidiDriver(int numBoardsIn);
-	~TerpstraMidiDriver();
-
-//	void addListener(Listener* listenerToAdd);
-//	void removeListener(Listener* listenerToRemove);
-    void addMessageCollector(Collector* collectorToAdd);
-    void removeMessageCollector(Collector* collectorToRemove);
-
-	void restrictToRequestMessages(bool testMessagesOnly) { onlySendRequestMessages = testMessagesOnly; }
-
-	//============================================================================
-	// Single (mid-level) commands, firmware specific
-
-	// CMD 00h: Send a single key's functionctional configuration
-	void sendKeyFunctionParameters(uint8 boardIndex, uint8 keyIndex, uint8 noteOrCCNum, uint8 midiChannel, uint8 keyType, bool faderUpIsNull = true);
-
-	// CMD 01h: Send a single key's LED channel intensities, three 8-bit values
-	void sendKeyLightParameters(uint8 boardIndex, uint8 keyIndex, uint8 red, uint8 green, uint8 blue);
-	// CMD 01h: Send a single key's LED channel intensities, three pairs of 4-bit values for each channel
-	void sendKeyLightParameters(uint8 boardIndex, uint8 keyIndex, uint8 redUpper, uint8 redLower, uint8 greenUpper, uint8 greenLower, uint8 blueUpper, uint8 blueLower);
-	// CMD 01h: Send a single key's LED channel intensities, three 7-bit values
-	void sendKeyLightParameters_Version_1_0_0(uint8 boardIndex, uint8 keyIndex, uint8 red, uint8 green, uint8 blue);
-
-	// CMD 02h: Save current configuration to specified preset index
-	void saveProgram(uint8 presetNumber);
-
-	// CMD 03h: Send expression pedal sensivity
-	void sendExpressionPedalSensivity(uint8 value);
-
-	// CMD 04h: Send parametrization of foot controller
-	void sendInvertFootController(bool value);
-
-	// CMD 05h: Colour for macro button in active state, 3 8-bit values
-	void sendMacroButtonActiveColour(uint8 red, uint8 green, uint8 blue);
-	// CMD 05h: Colour for macro button in active state, 3 pairs for 4-bit values for each LED channel
-	void sendMacroButtonActiveColour(uint8 redUpper, uint8 redLower, uint8 greenUpper, uint8 greenLower, uint8 blueUpper, uint8 blueLower);
-	// CMD 05h: Colour for macro button in active state, 3 7-bit values
-	void sendMacroButtonActiveColour_Version_1_0_0(uint8 red, uint8 green, uint8 blue);
-
-	// CMD 06h: Colour for macro button in inactive state
-	void sendMacroButtonInactiveColour(int red, int green, int blue);
-	// CMD 05h: Colour for macro button in active state, 3 pairs for 4-bit values for each LED channel
-	void sendMacroButtonInactiveColour(uint8 redUpper, uint8 redLower, uint8 greenUpper, uint8 greenLower, uint8 blueUpper, uint8 blueLower);
-	// CMD 05h: Colour for macro button in active state, 3 7-bit values
-	void sendMacroButtonInactiveColour_Version_1_0_0(uint8 red, uint8 green, uint8 blue);
-
-	// CMD 07h: Send parametrization of light on keystrokes
-	void sendLightOnKeyStrokes(bool value);
-
-	// CMD 08h: Send a value for a velocity lookup table (128 7-bit values)
-	void sendVelocityConfig(const uint8 velocityTable[]);
-
-	// CMD 09h: Save velocity config to EEPROM
-	void saveVelocityConfig();
-
-	// CMD 0Ah: Reset velocity config to value from EEPROM
-	void resetVelocityConfig();
-
-	// CMD 0Bh: Adjust the internal fader look-up table (size of 128)
-	void sendFaderConfig(const uint8 faderTable[]);
-
-	// CMD 0Ch: **DEPRECATED** Save the changes made to the fader look-up table
-	void saveFaderConfiguration();
-
-	// CMD 0Dh: Reset the fader lookup table back to its factory fader settings.
-	void resetFaderConfig();
-
-	// CMD 0Eh: Enable or disable aftertouch functionality
-	void sendAfterTouchActivation(bool value);
-
-	// CMD 0Fh: Initiate aftertouch calibration routine
-	void sendCalibrateAfterTouch();
-
-	// CMD 10h: Adjust the internal aftertouch look-up table (size of 128)
-	void sendAftertouchConfig(const uint8 aftertouchTable[]);
-
-	// CMD 11h: **DEPRECATED** Save the changes made to the aftertouch look-up table
-	void saveAftertouchConfig();
-
-	// CMD 12h: Reset the aftertouch lookup table back to its factory aftertouch settings.
-	void resetAftertouchConfig();
-
-	// CMD 13h: Read back the current red intensity of all the keys of the target board.
-	void sendRedLEDConfigRequest(uint8 boardIndex);
-
-	// CMD 14h: Read back the current green intensity of all the keys of the target board.
-	void sendGreenLEDConfigRequest(uint8 boardIndex);
-
-	// CMD 15h: Read back the current blue intensity of all the keys of the target board.
-	void sendBlueLEDConfigRequest(uint8 boardIndex);
-
-	// CMD 16h: Read back the current channel configuration of all the keys of the target board.
-	void sendChannelConfigRequest(uint8 boardIndex);
-
-	// CMD 17h: Read back the current note configuration of all the keys of the target board.
-	void sendNoteConfigRequest(uint8 boardIndex);
-
-	// CMD 18h: Read back the current key type configuration of all the keys of the target board.
-	void sendKeyTypeConfigRequest(uint8 boardIndex);
-
-	// CMD 19h: Read back the maximum fader (note on) threshold of all the keys of the target board.
-	void sendMaxFaderThresholdRequest(uint8 boardIndex);
-
-	// CMD 1Ah: Read back the maximum fader (note on) threshold of all the keys of the target board
-	void sendMinFaderThresholdRequest(uint8 boardIndex);
-
-	// CMD 1Bh: Read back the aftertouch maximum threshold of all the keys of the target board
-	void sendMaxAftertouchThresholdRequest(uint8 boardIndex);
-
-	// CMD 1Ch: Get back flag whether or not each key of target board meets minimum threshold
-	void sendKeyValidityParametersRequest(uint8 boardIndex);
-
-	// CMD 1Dh: Read back the current velocity look up table of the keyboard.
-	void sendVelocityConfigRequest();
-
-	// CMD 1Eh: Read back the current fader look up table of the keyboard.
-	void sendFaderConfigRequest();
-
-	// CMD 1Fh: Read back the current aftertouch look up table of the keyboard.
-	void sendAftertouchConfigRequest();
-
-	// CMD 20h: Set the velocity interval table, 127 12-bit values (up to 0x7fff
-    void sendVelocityIntervalConfig(const int velocityIntervalTable[]);
-
-	// CMD 21h: Sead back the velocity interval table
-	void sendVelocityIntervalConfigRequest();
-
-	// CMD 22h: Read back the fader type of all keys on the targeted board.
-	void sendFaderTypeConfigRequest(uint8 boardIndex);
-
-	// CMD 23h: This command is used to read back the serial identification number of the keyboard.
-	void sendGetSerialIdentityRequest(int sendToTestDevice = -1);
-
-	// CMD 24h: Initiate the key calibration routine; each pair of macro buttons
-	// on each octave must be pressed to return to normal state
-	void sendCalibrateKeys();
-
-	// CMD 25h: Pass in true to enter Demo Mode, or false to exit
-	void startDemoMode(bool turnOn);
-
-	// CMD 26h: Initiate the pitch and mod wheel calibration routine, pass in false to stop
-	void sendCalibratePitchModWheel(bool startCalibration, int testOutputIndex = -1);
-
-	// CMD 27h: Set the sensitivity value of the mod wheel, 0x01 to 0x07f
-	void setModWheelSensitivity(uint8 sensitivity);
-
-	// CMD 28h: Set the sensitivity value of the pitch bend wheel between 0x01 and 0x3FFF
-	void setPitchBendSensitivity(int sensitivity);
-
-	// CMD 29h: Set abs. distance from max value to trigger CA-004 submodule key events, ranging from 0x00 to 0xFE
-	void setKeyMaximumThreshold(uint8 boardIndex, uint8 maxThreshold, uint8 aftertouchMax);
-
-	// CMD 2Ah: Set abs. distance from min value to trigger CA-004 submodule key events, ranging from 0x00 to 0xFE
-	void setKeyMinimumThreshold(uint8 boardIndex, uint8 minThresholdHigh, uint8 minThresholdLow);
-
-	// CMD 2Bh: Set the sensitivity for CC events, ranging from 0x00 to 0xFE
-	void setFaderKeySensitivity(uint8 boardIndex, uint8 sensitivity);
-
-	// CMD 2Ch: Set the target board sensitivity for aftertouch events, ranging from 0x00 to 0xFE
-	void setAftertouchKeySensitivity(uint8 boardIndex, uint8 sensitivity);
-
-	// CMD 2Dh: Adjust the Lumatouch table, 127 7-bit values, where 127 is a result of a fully pressed key
-	void setLumatouchConfig(const uint8 lumatouchTable[]);
-
-	// CMD 2Eh: **DEPRECATED** Save Lumatouch table changes
-	void saveLumatoneConfig();
-
-	// CMD 2Fh: Reset the Lumatouch table back to factory settings
-	void resetLumatouchConfig();
-
-	// CMD 30h: Read back the Lumatouch table
-	void sendLumatouchConfigRequest();
-
-	// CMD 31h: This command is used to read back the current Lumatone firmware revision.
-	// The firmware version format is in the form {Major}.{Minor}.{Revision}
-	// If the board has not been initialized, the Beaglebone will contain a firmware revision of 0.0.0 for the board
-	void sendGetFirmwareRevisionRequest(int sendToTestDevice = -1);
-
-	// CMD 32h: Set the thresold from key�s min value to trigger CA - 004 submodule CC events, ranging from 0x00 to 0xFE
-	void setCCActiveThreshold(uint8 boardIndex, uint8 sensitivity);
-
-	// CMD 33h: Echo the payload, 3 7-bit values, for use in connection monitoring
-    // the first 7-bit value is reserved for echo differentiation
-	void ping(uint8 value1, uint8 value2, uint8 value3, int sendToTestDevice = -1);
-	unsigned int ping(unsigned int value, int sendToTestDevice = -1);
-
-	// CMD 34h: Reset the thresholds for events and sensitivity for CC & aftertouch on the target board
-	void resetBoardThresholds(uint8 boardIndex);
-
-	// CMD 35h: Enable/disable key sampling over SSH for the target key and board
-	void setKeySampling(uint8 boardIndex, uint8 keyIndex, bool turnSamplingOn);
-
-	// CMD 36h: Set thresholds for the pitch and modulation wheel to factory settings
-	void resetWheelsThresholds();
-
-	// CMD 37h: Set the bounds from the calibrated zero adc value of the pitch wheel, 0x00 to 0x7f
-	void setPitchWheelZeroThreshold(uint8 threshold);
-
-	// CMD 38h: Pass in true to initiate the expression pedal calibration routine, or false to stop
-	void calibrateExpressionPedal(bool startCalibration);
-
-	// CMD 39h: Reset expression pedal minimum and maximum bounds to factory settings
-	void resetExpressionPedalBounds();
-
-	// CMD 3Ah: Retrieve the threshold values of target board
-	void getBoardThresholdValues(uint8 boardIndex);
-
-	// CMD 3Bh: Retrieve the sensitivity values of target board
-	void getBoardSensitivityValues(uint8 boardIndex);
-
-	// CMD 3Ch: Set the MIDI channels for peripheral controllers
-	void setPeripheralChannels(uint8 pitchWheelChannel, uint8 modWheelChannel, uint8 expressionChannel, uint8 sustainChannel);
-
-	// CMD 3Dh: Retrieve the MIDI channels for peripheral controllers
-	void getPeripheralChannels();
-
-	// CMD 3Eh: This command is only used for automatic responses containing calibration data every 100ms while in calibration mode
-	// Sending a SysEx message containing this command will result in a NACK response
-
-	// CMD 3Fh: Set the 8-bit aftertouch trigger delay value, the time between a note on event and the initialization of aftertouch events
-	void setAfterTouchTriggerDelay(uint8 boardIndex, uint8 aftertouchTriggerValue);
-	void setAfterTouchTriggerDelay(uint8 boardIndex, uint8 triggerValueUpperNibble, uint8 triggerValueLowerNibble);
-
-	// CMD 40h: Retrieve the aftertouch trigger delay of the given board
-	void sendGetAftertouchTriggerDelayRequest(uint8 boardIndex);
-
-	// CMD 41h: Set the Lumatouch note-off delay value, an 11-bit integer representing the amount of 1.1ms ticks before
-	// sending a note-off event after a Lumatone-configured key is released.
-	void setLumatouchNoteOffDelay(uint8 boardIndex, int delayValue);
-	void setLumatouchNoteOffDelay(uint8 boardIndex, uint8 valueBits8_11, uint8 valueBits4_7, uint8 valueBits0_3);
-
-	// CMD 42h: Retrieve the note-off delay value of the given board
-	void sendGetLumatouchNoteOffDelayRequest(uint8 boardIndex);
-
-	// CMD 43h: Set expression pedal ADC threshold value, a 12-bit integer
-	void setExpressionPedalADCThreshold(int thresholdValue);
-	// CMD 43h: Set expression pedal ADC threshold value with 3 4-bit integers representing a 12-bit integer
-	void setExpressionPedalADCThreshold(uint8 valueBits8_12, uint8 valueBits4_7, uint8 valueBits0_3);
-
-	// CMD 44h: Get the current expression pedal ADC threshold value
-	void sendGetExpressionPedalADCThresholdRequest();
-
-	// CMD 45h: Configure the on/off settings of the sustain pedal
-	void sendInvertSustainPedal(bool setInverted);
-
-	// CMD 46h: Replace a certain preset with the factory preset
-	void sendResetDefaultPresetsRequest(int presetIndex);
-
-	// CMD 47h: Read back the currently configured preset flags of expression & sustain inversion,
-	// plus light-on-keystroke and polyphonic aftertouch
-	void sendGetPresetFlagsReset();
-
-	// For CMD 48h response: get expression pedal sensitivity
-	void sendGetExpressionPedalSensitivity();
-
-	// TODO CMD 49h-4Eh
-
-	//============================================================================
-	// Implementation of bidirectional communication with acknowledge messages
-
-	// MIDI input callback: handle acknowledge messages
-	void handleIncomingMidiMessage(MidiInput* source, const MidiMessage& message) override;
-
-	// Handle timeout
-	void timerCallback() override;
-
-	// Clear MIDI message buffer
-	void clearMIDIMessageBuffer();
-
-	// Message is an answer to a sent message yes/no
-	static bool messageIsResponseToMessage(const MidiMessage& answer, const MidiMessage& originalMessage);
-
-	// Message is SysEx message with Lumatone Inc. manufacturer ID, valid board ID byte, and acknowledged status
-	FirmwareSupport::Error messageIsValidLumatoneResponse(const MidiMessage& midiMessage);
-
-	// Determines if response is too short, too long, or expected
-	FirmwareSupport::Error responseIsExpectedLength(const MidiMessage& midiMessage, size_t numPayloadBytes);
-
-	//============================================================================
-	// Specific commands for unpacking responses, returns error code
-
-	// For CMD 13h response: unpacks 8-bit key data for red LED intensity. 112 bytes, lower and upper nibbles for 56 values
-	FirmwareSupport::Error unpackGetLEDConfigResponse(const MidiMessage& response, int& boardId, int* keyData);
-
-	// For CMD 13h response: unpacks 7-bit key data for red LED intensity. 56 bytes, each value must be multiplied by 5
-	FirmwareSupport::Error unpackGetLEDConfigResponse_Version_1_0_0(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData);
-
-	// For CMD 16h response: unpacks 7-bit channel data for note configuration. 55 or 56 bytes
-	FirmwareSupport::Error unpackGetChannelConfigResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData);
-
-	// For CMD 17h response: unpacks 7-bit key data for note configuration. 55 or 56 bytes
-	FirmwareSupport::Error unpackGetNoteConfigResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData);
-
-	// For CMD 18h response: unpacks 7-bit key type data for key configuration. 55 or 56 bytes
-	FirmwareSupport::Error unpackGetTypeConfigResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData);
-
-	// For CMD 19h response: unpacks 8-bit key data for maximums of adc threshold. 55 or 56 bytes
-	FirmwareSupport::Error unpackGetKeyMaxThresholdsResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData);
-
-	// For CMD 1Ah response: unpacks 8-bit key data for minimums of adc threshold. 55 or 56 bytes
-	FirmwareSupport::Error unpackGetKeyMinThresholdsResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData);
-
-	// For CMD 1Bh response: unpacks 8-bit key data for maximums of adc threshold for aftertouch triggering. 55 or 56 bytes
-	FirmwareSupport::Error unpackGetAftertouchMaxThresholdsResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData);
-
-	// For CMD 1Ch response: unpacks boolean key validity data for board, whether or not each key meets threshold specs
-	FirmwareSupport::Error unpackGetKeyValidityResponse(const MidiMessage& response, int& boardId, uint8 numKeys, bool* keyValidityData);
-
-	// For CMD 1Dh response: unpacks 7-bit velocity configuration of keyboard, 128 bytes
-	FirmwareSupport::Error unpackGetVelocityConfigResponse(const MidiMessage& response, int* velocityData);
-
-	// For CMD 1Eh response: unpacks 7-bit fader configuration of keyboard, 128 bytes
-	FirmwareSupport::Error unpackGetFaderConfigResponse(const MidiMessage& response, int* faderData);
-
-	// For CMD 1Fh response: unpacks 7-bit aftertouch configuration of keyboard, 128 bytes
-	FirmwareSupport::Error unpackGetAftertouchConfigResponse(const MidiMessage& response, int* aftertouchData);
-
-	// For CMD 21h response: unpacks 12-bit velocity interval configuration of keyboard, 254 bytes encoding 127 values
-	FirmwareSupport::Error unpackGetVelocityIntervalConfigResponse(const MidiMessage& response, int* intervalData);
-
-	// For CMD 22h response: unpacks 7-bit fader type configuration of board, 56 bytes
-	FirmwareSupport::Error unpackGetFaderConfigResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* faderData);
-
-	// For CMD 23h response: unpacks serial ID number of keyboard, 12 7-bit values encoding 6 bytes
-	FirmwareSupport::Error unpackGetSerialIdentityResponse(const MidiMessage& response, int* serialBytes);
-
-	// For CMD 30h response: unpacks 7-bit Lumatouch configuration of keyboard, 128 bytes
-	FirmwareSupport::Error unpackGetLumatouchConfigResponse(const MidiMessage& response, int* lumatouchData);
-
-	// For CMD 31h response: unpacks firmware revision running on the keyboard
-	FirmwareSupport::Error unpackGetFirmwareRevisionResponse(const MidiMessage& response, int& majorVersion, int& minorVersion, int& revision);
-
-	// For CMD 33h response: echo payload
-	FirmwareSupport::Error unpackPingResponse(const MidiMessage& response, int& value1, int& value2, int& value3, int& value4);
-	FirmwareSupport::Error unpackPingResponse(const MidiMessage& response, unsigned int& value);
-
-	// For CMD 3Ah response: retrieve all 8-bit threshold values of a certain board
-	FirmwareSupport::Error unpackGetBoardThresholdValuesResponse(const MidiMessage& response, int& boardId, int& minHighThreshold, int& minLowThreshold, int& maxThreshold, int& aftertouchThreshold, int& ccThreshold);
-
-	// For CMD 3Bh response: retrieve all threshold values of a certain board
-	FirmwareSupport::Error unpackGetBoardSensitivityValuesResponse(const MidiMessage& response, int& boardId, int& ccSensitivity, int& aftertouchSensitivity);
-
-	// For CMD 3Dh response: retrieve MIDI channels of which peripherals are configured
-	FirmwareSupport::Error unpackGetPeripheralChannelsResponse(const MidiMessage& response, int& pitchWheelChannel, int& modWheelChannel, int& expressionChannel, int& sustainPedalChannel);
-
-	// For CMD 3Eh response: read back the calibration mode of the message
-	FirmwareSupport::Error unpackPeripheralCalibrationMode(const MidiMessage& response, int& calibrationMode);
-
-	// For CMD 3Eh response: retrieve 12-bit expression pedal calibration status values in respective mode, automatically sent every 100ms
-	FirmwareSupport::Error unpackExpressionPedalCalibrationPayload(const MidiMessage& response, int& minBound, int& maxBound, bool& valid);
-
-	// For CMD 3Eh response: retrieve 12-bit pitch & mod wheel calibration status values in respective mode, automatically sent every 100ms
-	FirmwareSupport::Error unpackWheelsCalibrationPayload(const MidiMessage& response, int& centerPitch, int& minPitch, int& maxPitch, int& minMod, int& maxMod);
-
-	// For CMD 40h response: retrieve 8-bit aftertouch trigger delay of a certain board
-	FirmwareSupport::Error unpackGetAftertouchTriggerDelayResponse(const MidiMessage& response, int& boardId, int& triggerDelay);
-
-	// For CMD 42h response: retrieve 12-bit Lumatouch note off delay of a certain board
-	FirmwareSupport::Error unpackGetLumatouchNoteOffDelayResponse(const MidiMessage& response, int& boardId, int& delay);
-
-	// For CMD 44h response: retrieve 12-bit expression pedal adc threshold
-	FirmwareSupport::Error unpackGetExpressionPedalThresholdResponse(const MidiMessage& response, int& thresholdValue);
-
-	// For CMD 47h response: retrieve preset flags
-	FirmwareSupport::Error unpackGetPresetFlagsResponse(const MidiMessage& response, bool& expressionInverted, bool& lightsOnKeystroke, bool& aftertouchOn, bool& sustainInverted);
-
-	// For CMD 48h response: get expression pedal sensitivity
-	FirmwareSupport::Error unpackGetExpressionPedalSensitivityResponse(const MidiMessage& response, int& sensitivity);
-
-private:
-	// Low-level SysEx message sending
-	void sendMessageWithAcknowledge(const MidiMessage& message);
-
-	// Send the oldest message in queue and start waiting for answer
-	void sendOldestMessageInQueue();
-
-	// Send the message marked as current and start waiting for answer
-    void sendCurrentMessage();
-
-	// Fill a buffer with 3-bytes representing the manufacturer's ID
-	void fillManufacturerId(unsigned char* data) const;
-
-	// Create a SysEx message with standardized length
-	MidiMessage createTerpstraSysEx(uint8 boardIndex, uint8 cmd, uint8 data1, uint8 data2, uint8 data3, uint8 data4) const;
-
-	// Create a SysEx message to send 8-bit colour precision to a Lumatone key
-	MidiMessage createExtendedKeyColourSysEx(uint8 boardIndex, uint8 cmd, uint8 keyIndex, uint8 redUpper, uint8 redLower, uint8 greenUpper, uint8 greenLower, uint8 blueUpper, uint8 blueLower) const;
-	MidiMessage createExtendedKeyColourSysEx(uint8 boardIndex, uint8 cmd, uint8 keyIndex, int red, int green, int blue) const;
-
-	// Create a SysEx message to send 8-bit colour precision to macro buttons
-	MidiMessage createExtendedMacroColourSysEx(uint8 cmd, uint8 redUpper, uint8 redLower, uint8 greenUpper, uint8 greenLower, uint8 blueUpper, uint8 blueLower) const;
-	MidiMessage createExtendedMacroColourSysEx(uint8 cmd, int red, int green, int blue) const;
-
-	// Create a SysEx message encoding a table with a defined size
-	MidiMessage createTableSysEx(uint8 boardIndex, uint8 cmd, uint8 tableSize, const uint8 table[]);
-
-    // Send a SysEx message with standardized length
-	void sendSysEx(uint8 boardIndex, uint8 cmd, uint8 data1, uint8 data2, uint8 data3, uint8 data4, bool overrideEditMode = false);
-
-	// Send a SysEx message without parameters
-	void sendSysExRequest(uint8 boardIndex, uint8 cmd);
-
-	// Send a SysEx message to toggle a state
-	void sendSysExToggle(uint8 boardIndex, uint8 cmd, bool turnStateOn);
-
-	// Checks if message is a valid Lumatone firmware response and is expected length, then runs supplied unpacking function or returns an error code
-	FirmwareSupport::Error unpackIfValid(const MidiMessage& response, size_t numBytes, std::function<FirmwareSupport::Error(const uint8*)> unpackFunction);
-
-	// Generic unpacking of octave data from a SysEx message
-	FirmwareSupport::Error unpackOctaveConfig(const MidiMessage& msg, int& boardId, size_t numBytes, int* keyData, std::function<FirmwareSupport::Error(const MidiMessage&, size_t, int*)> nBitUnpackFunction);
-
-	// Generic unpacking of 7-bit data from a SysEx message
-	FirmwareSupport::Error unpack7BitData(const MidiMessage& msg, size_t numBytes, int* unpackedData);
-
-	// Unpacking of octave-based 7-bit key configuration data
-	FirmwareSupport::Error unpack7BitOctaveData(const MidiMessage& msg, int& boardId, uint8 numKeys, int* keyData);
-
-	// Generic unpacking of 8-bit data from a SysEx message
-	FirmwareSupport::Error unpack8BitData(const MidiMessage& msg, size_t numBytes, int* unpackedData);
-
-	// Unpacking of octave-based 8-bit data
-	FirmwareSupport::Error unpack8BitOctaveData(const MidiMessage& msg, int& boardId, uint8 numKeys, int* keyData);
-
-	// Generic unpacking of 12-bit data from a SysEx message, when packed with two 7-bit values
-	FirmwareSupport::Error unpack12BitDataFrom7Bit(const MidiMessage& msg, size_t numBytes, int* unpackedData);
-
-	// Generic unpacking of 12-bit data from a SysEx message, when packed with three 4-bit values
-	FirmwareSupport::Error unpack12BitDataFrom4Bit(const MidiMessage& msg, size_t numBytes, int* unpackedData);
-
-	// Attributes
-protected:
-    // ListenerList<Listener> listeners;
-	Array<Collector*> collectors;
-
-private:
-
-	int numBoards = 0;
-
-    MidiMessage currentMsgWaitingForAck;    // std::optional would be the object of choice,once that is available...
-	bool hasMsgWaitingForAck = false;       // will be obsolete when std::optional is available
-
-	Array<MidiMessage, CriticalSection> messageBuffer;
-
-	// Used for device detection and "Offline" mode (no messages that mutate board data)
-	bool      onlySendRequestMessages = false;
-
-	const int receiveTimeoutInMilliseconds = 2000;
-	const int busyTimeDelayInMilliseconds = 500;
-	TimerType timerType;
-};
diff --git a/Source/VelocityCurveComponents.cpp b/Source/VelocityCurveComponents.cpp
index 452d2526..534282b2 100644
--- a/Source/VelocityCurveComponents.cpp
+++ b/Source/VelocityCurveComponents.cpp
@@ -9,7 +9,7 @@
 */
 
 #include "VelocityCurveComponents.h"
-#include "ViewConstants.h"
+#include "./lumatone_editor_library/graphics/view_constants.h"
 
 /*
 ==============================================================================
diff --git a/Source/VelocityCurveDlgBase.cpp b/Source/VelocityCurveDlgBase.cpp
index 5bee9c0e..114d42e1 100644
--- a/Source/VelocityCurveDlgBase.cpp
+++ b/Source/VelocityCurveDlgBase.cpp
@@ -18,7 +18,13 @@
 */
 
 //[Headers] You can add your own extra header files here...
-#include "Main.h"
+#include "./lumatone_editor_library/data/lumatone_layout.h"
+#include "./lumatone_editor_library/device/lumatone_controller.h"
+#include "./lumatone_editor_library/graphics/view_constants.h"
+
+#include "LumatoneEditorLookAndFeel.h"
+
+#include "MainComponent.h"
 //[/Headers]
 
 #include "VelocityCurveDlgBase.h"
@@ -28,10 +34,11 @@
 //[/MiscUserDefs]
 
 //==============================================================================
-VelocityCurveDlgBase::VelocityCurveDlgBase (LumatoneConfigTable::TableType typeValue)
-    : freeDrawingStrategy(velocityBeamTable),
-      linearDrawingStrategy(velocityBeamTable),
-      quadraticDrawingStrategy(velocityBeamTable)
+VelocityCurveDlgBase::VelocityCurveDlgBase (const LumatoneEditorState& stateIn, LumatoneConfigTable::TableType typeValue)
+    : LumatoneEditorState("LumatoneConfigTableBase", stateIn)
+	, freeDrawingStrategy(velocityBeamTable)
+    , linearDrawingStrategy(velocityBeamTable)
+    , quadraticDrawingStrategy(velocityBeamTable)
 {
     //[Constructor_pre] You can add your own custom stuff here..
 	velocityCurveType = typeValue;
@@ -200,7 +207,7 @@ void VelocityCurveDlgBase::comboBoxChanged (juce::ComboBox* comboBoxThatHasChang
 		auto configInEdit = getConfigInEdit();
 		if (configInEdit != nullptr)
 		{
-			configInEdit->editStrategy = static_cast<LumatoneConfigTable::DrawMode>(editModeIndex);
+			// configInEdit->editStrategy = static_cast<LumatoneConfigTable::DrawMode>(editModeIndex); // TODO FIX
 		}
 
 		// Set edit config according to current values of velocity table, of possible
@@ -208,7 +215,7 @@ void VelocityCurveDlgBase::comboBoxChanged (juce::ComboBox* comboBoxThatHasChang
 		if (currentDrawingStrategy != nullptr)
 			currentDrawingStrategy->setEditConfigFromVelocityTable();
 
-		TerpstraSysExApplication::getApp().setHasChangesToSave(true);
+		// TerpstraSysExApplication::getApp().setHasChangesToSave(true);
 
 		repaint();
         //[/UserComboBoxCode_cbEditMode]
@@ -221,19 +228,15 @@ void VelocityCurveDlgBase::comboBoxChanged (juce::ComboBox* comboBoxThatHasChang
 void VelocityCurveDlgBase::lookAndFeelChanged()
 {
     //[UserCode_lookAndFeelChanged] -- Add your code here...
-	auto lookAndFeel = dynamic_cast<LumatoneEditorLookAndFeel*>(&getLookAndFeel());
-	if (lookAndFeel)
-	{
-		beamColourGradient.clearColours();
-		beamColourGradient.addColour(0.0, lookAndFeel->findColour(LumatoneEditorColourIDs::CurveGradientMin));
-		beamColourGradient.addColour(1.0, lookAndFeel->findColour(LumatoneEditorColourIDs::CurveGradientMax));
+	beamColourGradient.clearColours();
+	beamColourGradient.addColour(0.0, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::CurveGradientMin));
+	beamColourGradient.addColour(1.0, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::CurveGradientMax));
 
-		backgroundColour = lookAndFeel->findColour(LumatoneEditorColourIDs::ControlBoxBackground);
-		gridColour = lookAndFeel->findColour(LumatoneEditorColourIDs::CurveGridColour);
+	backgroundColour = getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::ControlBoxBackground);
+	gridColour = getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::CurveGridColour);
 
-		cbEditMode->setColour(ComboBox::ColourIds::backgroundColourId, Colours::black);
-		cbEditMode->setColour(ComboBox::ColourIds::textColourId, Colours::white);
-	}
+	cbEditMode->setColour(ComboBox::ColourIds::backgroundColourId, Colours::black);
+	cbEditMode->setColour(ComboBox::ColourIds::textColourId, Colours::white);
 }
 
 void VelocityCurveDlgBase::loadFromMapping()
@@ -283,14 +286,16 @@ void VelocityCurveDlgBase::paintOverChildren(juce::Graphics& g)
 
 void VelocityCurveDlgBase::sendVelocityTableToController()
 {
-	unsigned char velocityValues[128];
+	int velocityValues[128];
+	LumatoneConfigTable table(LumatoneConfigTable::TableType::velocityInterval);
 
 	for (int x = 0; x < 128; x++)
 	{
-		velocityValues[x] = velocityBeamTable[x]->getValue();
+		//velocityValues[x] = velocityBeamTable[x]->getValue();
+		table.velocityValues[x] = velocityBeamTable[x]->getValue();
 	}
 
-	TerpstraSysExApplication::getApp().getLumatoneController()->sendTableConfig(velocityCurveType, velocityValues);
+	setConfigTable(velocityCurveType, table);
 }
 
 void VelocityCurveDlgBase::mouseMove(const MouseEvent &event)
@@ -342,8 +347,8 @@ void VelocityCurveDlgBase::mouseUp(const MouseEvent &event)
 		auto configInEdit = getConfigInEdit();
 		if (configInEdit != nullptr)
 		{
-			currentDrawingStrategy->exportEditConfig(configInEdit->velocityValues);
-			TerpstraSysExApplication::getApp().setHasChangesToSave(true);
+			// currentDrawingStrategy->exportEditConfig(configInEdit->velocityValues);
+			// TerpstraSysExApplication::getApp().setHasChangesToSave(true);
 			sendVelocityTableToController();
 		}
 	}
@@ -351,26 +356,26 @@ void VelocityCurveDlgBase::mouseUp(const MouseEvent &event)
 	repaint();
 }
 
-LumatoneLayout*	VelocityCurveDlgBase::getMappingInEdit()
-{
-	// Security at start of program
-	if (getParentComponent() == nullptr)
-		return nullptr;
-	if (getParentComponent()->getParentComponent() == nullptr)
-		return nullptr;
-	if (getParentComponent()->getParentComponent()->getParentComponent() == nullptr)
-		return nullptr;
+// LumatoneLayout*	VelocityCurveDlgBase::getMappingInEdit()
+// {
+// 	// Security at start of program
+// 	if (getParentComponent() == nullptr)
+// 		return nullptr;
+// 	if (getParentComponent()->getParentComponent() == nullptr)
+// 		return nullptr;
+// 	if (getParentComponent()->getParentComponent()->getParentComponent() == nullptr)
+// 		return nullptr;
 
-	return &(dynamic_cast<MainContentComponent*>(getParentComponent()->getParentComponent()->getParentComponent()))->getMappingInEdit();
-}
+// 	return &(dynamic_cast<MainContentComponent*>(getParentComponent()->getParentComponent()->getParentComponent()))->getMappingInEdit();
+// }
 
-LumatoneConfigTable* VelocityCurveDlgBase::getConfigInEdit()
+const LumatoneConfigTable* VelocityCurveDlgBase::getConfigInEdit() const
 {
-	auto mappingInEdit = getMappingInEdit();
-	if(mappingInEdit == nullptr)
-		return nullptr;
+	// auto mappingInEdit = getMappingInEdit();
+	// if(mappingInEdit == nullptr)
+		// return nullptr;
 
-	return mappingInEdit->getConfigTable(velocityCurveType);
+	return getMappingData()->getConfigTable(velocityCurveType);
 }
 
 VelocityCurveEditStrategyBase* VelocityCurveDlgBase::getCurrentDrawingStrategy()
diff --git a/Source/VelocityCurveDlgBase.h b/Source/VelocityCurveDlgBase.h
index a814ad85..218dec9a 100644
--- a/Source/VelocityCurveDlgBase.h
+++ b/Source/VelocityCurveDlgBase.h
@@ -24,7 +24,11 @@
 
 #include "VelocityCurveComponents.h"
 #include "VelocityCurveEditStrategy.h"
-#include "./data/lumatone_layout.h"
+
+#include "LumatoneEditorState.h"
+
+class LumatoneLayout;
+class LumatoneConfigTable;
 
 //[/Headers]
 
@@ -39,11 +43,12 @@ Describe your class and how it works here!
                                                                     //[/Comments]
 */
 class VelocityCurveDlgBase  : public Component,
+                              public LumatoneEditorState,
                               public juce::ComboBox::Listener
 {
 public:
     //==============================================================================
-    VelocityCurveDlgBase (LumatoneConfigTable::TableType typeValue);
+    VelocityCurveDlgBase (const LumatoneEditorState& stateIn, LumatoneConfigTable::TableType typeValue);
     ~VelocityCurveDlgBase() override;
 
     //==============================================================================
@@ -54,16 +59,16 @@ class VelocityCurveDlgBase  : public Component,
 
 	virtual void sendVelocityTableToController();
 
-	void mouseMove(const MouseEvent &event);
-	void mouseDown(const MouseEvent &event);
-	void mouseDrag(const MouseEvent &event);
-	void mouseUp(const MouseEvent &event);
+	void mouseMove(const juce::MouseEvent &event);
+	void mouseDown(const juce::MouseEvent &event);
+	void mouseDrag(const juce::MouseEvent &event);
+	void mouseUp(const juce::MouseEvent &event);
 
 protected:
 	virtual float beamWidth(int xPos) { return getWidth() / 128.0f; }
 
-	LumatoneLayout*	getMappingInEdit();
-	LumatoneConfigTable* getConfigInEdit();
+	// LumatoneLayout*	getMappingInEdit();
+	const LumatoneConfigTable* getConfigInEdit() const;
 	VelocityCurveEditStrategyBase* getCurrentDrawingStrategy();
 
 public:
@@ -81,8 +86,8 @@ class VelocityCurveDlgBase  : public Component,
     //[UserVariables]   -- You can add your own custom variables in this section.
 	LumatoneConfigTable::TableType velocityCurveType;
 	//Path beamTableFrame;
-    Path beamTableContour;
-    Path beamTableGrid;
+    juce::Path beamTableContour;
+    juce::Path beamTableGrid;
 	std::unique_ptr<VelocityCurveBeam> velocityBeamTable[128];
 
 	VelocityCurveFreeDrawingStrategy freeDrawingStrategy;
@@ -91,9 +96,9 @@ class VelocityCurveDlgBase  : public Component,
 
 	std::map<LumatoneConfigTable::DrawMode, VelocityCurveEditStrategyBase*> drawingStrategies;
 
-    ColourGradient beamColourGradient;
-    Colour backgroundColour;
-    Colour gridColour;
+    juce::ColourGradient beamColourGradient;
+    juce::Colour backgroundColour;
+    juce::Colour gridColour;
 
 protected:
     //[/UserVariables]
diff --git a/Source/VelocityCurveEditStrategy.cpp b/Source/VelocityCurveEditStrategy.cpp
index 0d28c9f3..59b50d95 100644
--- a/Source/VelocityCurveEditStrategy.cpp
+++ b/Source/VelocityCurveEditStrategy.cpp
@@ -36,7 +36,7 @@ VelocityCurveFreeDrawingStrategy::VelocityCurveFreeDrawingStrategy(
 {
 }
 
-bool VelocityCurveFreeDrawingStrategy::setEditConfig(int velocityTableValues[])
+bool VelocityCurveFreeDrawingStrategy::setEditConfig(const int velocityTableValues[])
 {
 	for (int x = 0; x < 128; x++)
 		velocityBeamTable[x]->setValue(velocityTableValues[x]);
@@ -145,7 +145,7 @@ VelocityCurveSegmentEditStrategyBase::VelocityCurveSegmentEditStrategyBase(
 	fixPointBeamHeights[127] = 127;
 }
 
-bool VelocityCurveSegmentEditStrategyBase::setEditConfig(int velocityTableValues[])
+bool VelocityCurveSegmentEditStrategyBase::setEditConfig(const int velocityTableValues[])
 {
 	for (int x = 0; x < 128; x++)
 		fixPointBeamHeights[x] = velocityTableValues[x];
diff --git a/Source/VelocityCurveEditStrategy.h b/Source/VelocityCurveEditStrategy.h
index 10bdbc1d..c5cda008 100644
--- a/Source/VelocityCurveEditStrategy.h
+++ b/Source/VelocityCurveEditStrategy.h
@@ -27,7 +27,7 @@ class VelocityCurveEditStrategyBase
 	virtual ~VelocityCurveEditStrategyBase() {}
 
 	// Set value table (e. g. from LMT file)
-	virtual bool setEditConfig(int velocityTableValues[]) = 0;
+	virtual bool setEditConfig(const int velocityTableValues[]) = 0;
 	// Export value table (for saving in LMT file)
 	virtual bool exportEditConfig(int velocityTableValues[]) = 0;
 	// Takes a given velocity table and tries to extract edit parameters. Returns whether it was successful.
@@ -62,7 +62,7 @@ class VelocityCurveFreeDrawingStrategy : public VelocityCurveEditStrategyBase
 public:
 	VelocityCurveFreeDrawingStrategy(/*Path& beamTableFrameRef,*/ std::unique_ptr<VelocityCurveBeam>* velocityBeamTablePtr);
 
-	bool setEditConfig(int velocityTableValues[]) override;
+	bool setEditConfig(const int velocityTableValues[]) override;
 	bool exportEditConfig(int velocityTableValues[]) override;
 
 	void paint(Graphics& g, LookAndFeel& lookAndFeel) override;
@@ -87,7 +87,7 @@ class VelocityCurveSegmentEditStrategyBase : public VelocityCurveEditStrategyBas
 	VelocityCurveSegmentEditStrategyBase(/*Path& beamTableFrameRef, */std::unique_ptr<VelocityCurveBeam>* velocityBeamTablePtr);
 	virtual ~VelocityCurveSegmentEditStrategyBase() {}
 
-	bool setEditConfig(int velocityTableValues[]) override;
+	bool setEditConfig(const int velocityTableValues[]) override;
 	bool exportEditConfig(int velocityTableValues[]) override;
 
 	String getDescriptionText() override { return "Click with the mouse in the graphics to draw the velocity curve. Right-click to delete a segment point."; }
@@ -155,4 +155,3 @@ class VelocityCurveQuadraticDrawingStrategy : public VelocityCurveSegmentEditStr
 protected:
 	Path createCurveToDraw() override;
 };
-
diff --git a/Source/ViewComponents.cpp b/Source/ViewComponents.cpp
deleted file mode 100644
index 9b643083..00000000
--- a/Source/ViewComponents.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
-  ==============================================================================
-
-    ViewComponents.cpp
-    Created: 16 Jun 2014 7:20:34pm
-    Author:  hsstraub
-
-  ==============================================================================
-*/
-
-#include "ViewComponents.h"
-#include "Main.h"
-
-/*
-==============================================================================
-TerpstraKeyEdit class
-==============================================================================
-*/
-
-TerpstraKeyEdit::TerpstraKeyEdit(int boardIndex, int keyIndex, LumatoneKey keyData)
-	: MappedLumatoneKey(keyData, boardIndex, keyIndex)
-	, isSelected(false)
-{
-	midiNoteLabel = new Label("midiNoteLabel", "0");
-	addAndMakeVisible(midiNoteLabel);
-	midiNoteLabel->setJustificationType(Justification::centredRight);
-	midiNoteLabel->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::GothamNarrowBold));
-
-	midiChannelLabel = new Label("midiChannelLabel", "0");
-	addAndMakeVisible(midiChannelLabel);
-	midiChannelLabel->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::GothamNarrowMedium));
-	midiChannelLabel->setJustificationType(Justification::centredRight);
-}
-
-TerpstraKeyEdit::~TerpstraKeyEdit()
-{
-	deleteAllChildren();
-}
-
-void TerpstraKeyEdit::setValue(const LumatoneKey& newValue)
-{
-	keyType = newValue.keyType;
-
-    if (newValue.keyType == LumatoneKeyType::disabled || newValue.keyType == LumatoneKeyType::disabledDefault)
-    {
-        keyType = LumatoneKeyType::disabled;
-        midiNoteLabel->setText("x", juce::NotificationType::sendNotification);
-        midiChannelLabel->setText("x", juce::NotificationType::sendNotification);
-    }
-    else
-    {
-        midiNoteLabel->setText(String(newValue.noteNumber), juce::NotificationType::sendNotification);
-        midiChannelLabel->setText(String(newValue.channelNumber), juce::NotificationType::sendNotification);
-    }
-	colour = newValue.colour;
-    ccFaderDefault = newValue.ccFaderDefault;
-
-	String newTooltip = translate("KeyType") + " ";
-	switch (keyType)
-	{
-	case LumatoneKeyType::noteOnNoteOff:
-		newTooltip += translate("NoteOnOff");
-		break;
-	case LumatoneKeyType::continuousController:
-		newTooltip += translate("ContinuousController");
-        newTooltip += newLine;
-        if (ccFaderDefault)
-            newTooltip += "CC Default (0->127)";
-        else
-            newTooltip += "CC Inverted (127->0)";
-		break;
-	case LumatoneKeyType::lumaTouch:
-		newTooltip += translate("Lumatouch");
-		break;
-	case LumatoneKeyType::disabled:
-		newTooltip += translate("Disabled");
-		break;
-	default:
-		jassertfalse;
-		newTooltip += translate("Unknown");
-		break;
-	}
-
-	newTooltip += newLine;
-	newTooltip += translate("KeyColour") + " " + colour.toDisplayString(false);
-
-	setTooltip(newTooltip);
-	midiNoteLabel->setTooltip(newTooltip);
-	midiChannelLabel->setTooltip(newTooltip);
-
-	repaint();
-}
-
-void TerpstraKeyEdit::setIsSelected(bool newValue)
-{
-	if (this->isSelected != newValue)
-	{
-		this->isSelected = newValue;
-		repaint();
-	}
-}
-
-void TerpstraKeyEdit::paint(Graphics& g)
-{
-	// Selected or not: color and thickness of the line
-	float lineWidth = TERPSTRASINGLEKEYFLDLINEWIDTH;
-	Colour lineColor = findColour(selectedKeyOutlineId);
-
-	// Color: empty or the parametrized color
-	Colour bgColour = findColour(backgroundColourId).overlaidWith(colour.withAlpha(TERPSTRASINGLEKEYCOLOURALPHA));
-    Colour textColour = bgColour.contrasting(0.7f);
-
-	if (bgColour.getPerceivedBrightness() < 0.5)
-	{
-		textColour = textColour.brighter();
-	}
-
-    midiChannelLabel->setColour(juce::Label::textColourId, textColour);
-    midiNoteLabel->setColour(juce::Label::textColourId, textColour);
-
-    // Look depending on Key type
-    if (keyType == LumatoneKeyType::continuousController)
-	{
-		// Key type is continuous controller. Set colour gradient.
-        float w = this->getWidth();
-        float h = this->getHeight();
-        Colour inside, outside;
-        if (ccFaderDefault)
-        {
-            outside = bgColour.darker();
-            inside = bgColour.brighter();
-        }
-        else
-        {
-            outside = bgColour.brighter();
-            inside = bgColour.darker();
-        }
-		g.setGradientFill(
-			ColourGradient(inside, w * 0.5f, h * 0.5f, outside, w * 0.5f, 0.0f, true));
-	}
-	else
-	{
-		// Key type is note on/note off. Just plain colour.
-		g.setColour(bgColour);
-	}
-
-	g.fillPath(hexPath);
-
-	if (isSelected)
-	{
-		// Shrink bounds slightly
-		Path hexOutline = Path(hexPath);
-		Rectangle<int> hexBounds = getLocalBounds().reduced(1);
-		hexOutline.scaleToFit(hexBounds.getX(), hexBounds.getY(), hexBounds.getWidth(), hexBounds.getHeight(), true);
-
-		// Draw line
-		g.setColour(lineColor);
-		g.strokePath(hexOutline, PathStrokeType(lineWidth));
-	}
-
-//	if (currentValue.keyType == LumatoneKeyType::disabled)
-//	{
-//		float w = this->getWidth();
-//		float h = this->getHeight();
-//		float xProportion = 0.25f;
-//		// Draw X on key
-//		g.setColour(bgColour.contrasting(0.5f));
-//		g.drawLine(w * xProportion, h * xProportion, w * (1-xProportion), h * (1-xProportion), 2);
-//		g.drawLine(w * (1 - xProportion), h * xProportion, w * xProportion, h * (1 - xProportion), 2);
-//	}
-
-//    if (currentValue.keyType == LumatoneKeyType::disabled)
-//    {
-//        TerpstraSysExApplication::getApp().getLookAndFeel().getLabelFont(*midiNoteLabel);
-//        g.setColour(textColour);
-//        g.setFont(midiChannelLabel->getFont());
-//        g.drawText("x", midiChannelLabel->getBounds(), midiChannelLabel->getJustificationType());
-//        g.drawText("x", midiNoteLabel->getBounds(), midiChannelLabel->getJustificationType());
-//    }
-
-	// Something parametrized or not?
-	if (isEmpty())
-	{
-		midiChannelLabel->setAlpha(0.3f);
-		midiNoteLabel->setAlpha(0.3f);
-	}
-	else
-	{
-		midiChannelLabel->setAlpha(1.0f);
-		midiNoteLabel->setAlpha(1.0f);
-	}
-}
-
-void TerpstraKeyEdit::resized()
-{
-	Point<int> centre = getLocalBounds().getCentre();
-	float radius = keySize * 0.5f;
-
-	// Draw hexagon
-	hexPath.clear();
-	hexPath.addPolygon(centre.toFloat(), 6, radius, TERPSTRASINGLEKEYROTATIONANGLE);
-	//Rectangle<float> hexBounds = hexPath.getBounds().reduced(1, 1);
-
-	float lblSize = radius * TERPSTRASINGLEKEYLABELSIZE;
-	float lblOffset = radius * 0.375f;
-
-	midiChannelLabel->setSize(radius, lblSize);
-	midiChannelLabel->setCentrePosition(centre.translated(-lblOffset, -(radius * channelLabelRadiusScalar)));
-
-	midiNoteLabel->setSize(radius, lblSize);
-	midiNoteLabel->setCentrePosition(centre.translated(0, lblOffset));
-}
-
-void TerpstraKeyEdit::setKeySize(float keySizeIn)
-{
-	keySize = keySizeIn;
-	setSize(keySize, keySize);
-}
diff --git a/Source/ViewComponents.h b/Source/ViewComponents.h
deleted file mode 100644
index 0e29e862..00000000
--- a/Source/ViewComponents.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-  ==============================================================================
-
-    ViewComponents.h
-    Created: 16 Jun 2014 7:20:34pm
-    Author:  hsstraub
-
-  ==============================================================================
-*/
-
-#pragma once
-#include <JuceHeader.h>
-
-#include "./data/lumatone_key.h"
-#include "ViewConstants.h"
-
-
-/*
-==============================================================================
-Display of the data of one key
-==============================================================================
-*/
-class TerpstraKeyEdit : public MappedLumatoneKey, public Component, public SettableTooltipClient
-{
-public:
-	TerpstraKeyEdit(int boardIndex, int keyIndex, LumatoneKey keyData=LumatoneKey());
-	~TerpstraKeyEdit();
-
-	void setValue(const LumatoneKey& newValue);
-
-	void setIsSelected(bool newValue);
-
-	void paint(Graphics& g);
-	void resized();
-
-	void setKeySize(float keySizeIn);
-
-	enum ColourIds
-	{
-		backgroundColourId = 0x2000100,
-		outlineColourId = 0x2000101,
-		selectedKeyOutlineId = 0x2000102
-	};
-
-private:
-	bool isSelected;
-
-    Path    hexPath;
-	Label*	midiNoteLabel;
-	Label*  midiChannelLabel;
-
-	float					keySize;
-
-	const float				channelLabelRadiusScalar = 0.4347826f;
-};
diff --git a/Source/color/adjust_layout_colour.cpp b/Source/color/adjust_layout_colour.cpp
deleted file mode 100644
index 50544c5e..00000000
--- a/Source/color/adjust_layout_colour.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-#include "adjust_layout_colour.h"
-#include "../Main.h"
-
-AdjustLayoutColour::AdjustLayoutColour()
-    : hexMap(*TerpstraSysExApplication::getApp().getMappingData())
-{
-    endAction();
-}
-
-AdjustLayoutColour::~AdjustLayoutColour()
-{
-}
-
-void AdjustLayoutColour::replaceColour(juce::Colour oldColour, juce::Colour newColour, bool sendUpdate)
-{
-    auto keyCoords = layoutBeforeAdjust.getKeysWithColour(oldColour);
-    juce::Array<MappedLumatoneKey> keyUpdates;
-
-    for (auto coord : keyCoords)
-    {
-        auto key = &currentLayout.getBoard(coord.boardIndex)->theKeys[coord.keyIndex];
-        keyUpdates.add(MappedLumatoneKey(key->withColour(newColour), coord));
-    }
-
-    if (sendUpdate)
-        sendSelectionUpdate(keyUpdates);
-}
-
-void AdjustLayoutColour::rotateHue(float change, bool sendUpdate)
-{
-    auto coords = currentLayout.getAllKeyCoords();
-    rotateHue(change, coords, false);
-    if (sendUpdate)
-        sendMappingUpdate(currentLayout);
-}
-
-void AdjustLayoutColour::rotateHue(float change, const juce::Array<LumatoneKeyCoord>& selection, bool sendUpdate)
-{
-    if (currentAction != AdjustLayoutColour::Type::ROTATEHUE)
-    {
-        beginAction(AdjustLayoutColour::Type::ROTATEHUE);
-        currentLayout = *TerpstraSysExApplication::getApp().getMappingData();
-    }
-
-    juce::Array<MappedLumatoneKey> updateKeys;
-    for (auto coord : selection)
-    {
-        auto key = &currentLayout.getBoard(coord.boardIndex)->theKeys[coord.keyIndex];
-        auto colour = (&layoutBeforeAdjust.getBoard(coord.boardIndex)->theKeys[coord.keyIndex])->colour;
-        if (colour.isTransparent() 
-            || (colour.getRed() == colour.getGreen() && colour.getRed() == colour.getBlue())
-            )
-            continue;
-
-        auto rotated = colour.withRotatedHue(change);
-        key->colour = rotated;
-        updateKeys.add(MappedLumatoneKey(*key, coord));
-    }
-
-    if (sendUpdate)
-        sendSelectionUpdate(updateKeys);
-}
-
-void AdjustLayoutColour::multiplyBrightness(float change, bool sendUpdate)
-{
-    auto coords = currentLayout.getAllKeyCoords();
-    multiplyBrightness(change, coords, false);
-    if (sendUpdate)
-        sendMappingUpdate(currentLayout);
-}
-
-void AdjustLayoutColour::multiplyBrightness(float change, const juce::Array<LumatoneKeyCoord>& selection, bool sendUpdate)
-{
-    if (currentAction != AdjustLayoutColour::Type::ADJUSTBRIGHTNESS)
-    {
-        beginAction(AdjustLayoutColour::Type::ADJUSTBRIGHTNESS);
-        currentLayout = *TerpstraSysExApplication::getApp().getMappingData();
-    }
-
-    juce::Array<MappedLumatoneKey> updateKeys;
-    for (auto coord : selection)
-    {
-        auto key = &currentLayout.getBoard(coord.boardIndex)->theKeys[coord.keyIndex];
-        auto colour = (&layoutBeforeAdjust.getBoard(coord.boardIndex)->theKeys[coord.keyIndex])->colour;
-        if (colour.isTransparent())
-            continue;
-
-        auto adjusted = colour.withMultipliedBrightness(change);
-        key->colour = adjusted;
-        updateKeys.add(MappedLumatoneKey(*key, coord));
-    }
-
-    if (sendUpdate)
-        sendSelectionUpdate(updateKeys);
-}
-
-void AdjustLayoutColour::setGradient(SetGradientOptions options)
-{
-    float originColumn = 0;
-    float originRow = 0;
-
-    float furthestColumn = 0;
-    float furthestRow = 0;
-
-    juce::Array<int> presentColumns;
-    juce::Array<int> presentRows;
-
-    juce::Array<Hex::Point> updateHexCoords;
-    for (auto coord : options.selection)
-    {
-        auto hex = hexMap.keyCoordsToHex(coord);
-        updateHexCoords.add(hex);
-
-        if (hex.q < originColumn)
-            originColumn = hex.q;
-        if (hex.r < originRow)
-            originRow = hex.r;
-
-        if (hex.q > furthestColumn)
-            furthestColumn = hex.q;
-        if (hex.r > furthestRow)
-            furthestRow = hex.r;
-
-        presentColumns.addIfNotAlreadyThere(hex.q);
-        presentRows.addIfNotAlreadyThere(hex.r);
-    }
-
-    presentColumns.sort();
-    presentRows.sort();
-
-    auto selectionOrigin = Hex::Point(originColumn, originRow);
-    auto furthestPoint = Hex::Point(furthestColumn, furthestRow);
-    int selectionDistance = furthestPoint.distanceTo(selectionOrigin);
-
-    auto boardOrigin = Hex::Point(0, 0);
-    int maxBoardDistance = 35;
-
-    juce::Array<MappedLumatoneKey> keyUpdates;
-
-    float maxGradientDistance = 1.0f;
-    if (options.selectionOrigin)
-    {
-        if (options.fillRelative)
-            maxGradientDistance = presentColumns.size();
-        else
-            maxGradientDistance = selectionDistance;
-    }
-    else
-    {
-        maxGradientDistance = maxBoardDistance;
-    }
-
-    float keyGradientDistance = 0.0f;
-    for (int i = 0; i < options.selection.size(); i++)
-    {
-        auto mappedKey = options.selection[i];
-        auto hex = updateHexCoords[i];
-
-        if (options.selectionOrigin)
-            {
-                if (options.fillRelative)
-                {
-                    keyGradientDistance = hex.q - presentColumns[0];
-                }
-                else
-                {
-                    keyGradientDistance = hex.distanceTo(selectionOrigin);
-                }
-            }
-        else
-        {
-            keyGradientDistance = hex.distanceTo(boardOrigin);
-        }
-
-        float t = (maxGradientDistance == 0.0f) ? 0.0f : keyGradientDistance / maxGradientDistance;
-        auto colour = options.gradient.getColourAtPosition(t);
-        auto key = &currentLayout.getBoard(mappedKey.boardIndex)->theKeys[mappedKey.keyIndex];
-        key->colour = colour;
-        
-        keyUpdates.add(MappedLumatoneKey(*key, mappedKey.boardIndex, mappedKey.keyIndex));
-    }
-
-    sendSelectionUpdate(keyUpdates);
-}
-
-void AdjustLayoutColour::beginAction(AdjustLayoutColour::Type type)
-{
-    if (type == AdjustLayoutColour::Type::NONE)
-        return endAction();
-
-    if (currentAction != type)
-    {
-        if (currentAction == AdjustLayoutColour::Type::NONE)
-        {
-            layoutBeforeAdjust = *TerpstraSysExApplication::getApp().getMappingData();
-        }
-    }
-    
-    currentAction = type;
-}
-
-void AdjustLayoutColour::endAction()
-{
-    layoutBeforeAdjust = *TerpstraSysExApplication::getApp().getMappingData();
-    currentLayout = layoutBeforeAdjust;
-    currentAction = AdjustLayoutColour::Type::NONE;
-}
-
-void AdjustLayoutColour::commitChanges()
-{
-    endAction();
-}
-void AdjustLayoutColour::resetChanges()
-{
-    TerpstraSysExApplication::getApp().getLumatoneController()->sendCompleteMapping(layoutBeforeAdjust);
-    endAction();
-}
-
-void AdjustLayoutColour::sendSelectionUpdate(const juce::Array<MappedLumatoneKey>& keyUpdates)
-{
-    auto updateAction = new LumatoneEditAction::MultiKeyAssignAction(TerpstraSysExApplication::getApp().getLumatoneController(), keyUpdates);
-    
-    TerpstraSysExApplication::getApp().performUndoableAction(updateAction);
-}
-
-void AdjustLayoutColour::sendMappingUpdate(const LumatoneLayout& updatedLayout)
-{
-    for (int i = 0; i < TerpstraSysExApplication::getApp().getNumBoards(); i++)
-        TerpstraSysExApplication::getApp().performUndoableAction(new LumatoneEditAction::SectionEditAction(TerpstraSysExApplication::getApp().getLumatoneController(), i, *updatedLayout.readBoard(i)), i == 0);
-}
diff --git a/Source/color/adjust_layout_colour.h b/Source/color/adjust_layout_colour.h
deleted file mode 100644
index f0c8fc65..00000000
--- a/Source/color/adjust_layout_colour.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#pragma once
-
-#include "../LumatoneController.h"
-#include "../actions/edit_actions.h"
-#include "../hex/lumatone_hex_map.h"
-
-class AdjustLayoutColour
-{
-
-public:
-    enum class Type
-    {
-        NONE,
-        FINDREPLACE,
-        ROTATEHUE,
-        ADJUSTBRIGHTNESS,
-        SETGRADIENT
-    };
-
-    struct SetGradientOptions
-    {
-        const juce::Array<LumatoneKeyCoord>& selection;
-        juce::ColourGradient gradient;
-        bool selectionOrigin = true;
-        bool fillRelative = true;
-        int numColumns = 1;
-        int numRows = 1;
-
-        SetGradientOptions(const juce::Array<LumatoneKeyCoord>& selectionIn, juce::ColourGradient gradientIn, bool selectionOriginIn = true, bool fillRelativeIn=true, int numColumnsIn = 1, int numRowsIn = 1)
-            : selection(selectionIn)
-            , gradient(gradientIn)
-            , selectionOrigin(selectionOriginIn)
-            , fillRelative(fillRelativeIn)
-            , numColumns(numColumnsIn)
-            , numRows(numRowsIn) {}
-    };
-
-public:
-
-    AdjustLayoutColour();
-    ~AdjustLayoutColour();
-
-    void replaceColour(juce::Colour oldColour, juce::Colour newColour, bool sendUpdate=true);
-
-    void rotateHue(float change, bool sendUpdate=true);
-    void rotateHue(float change, const juce::Array<LumatoneKeyCoord>& selection, bool sendUpdate=true);
-
-    void multiplyBrightness(float change, bool sendUpdate=true);
-    void multiplyBrightness(float change, const juce::Array<LumatoneKeyCoord>& selection, bool sendUpdate=true);
-    
-    void setGradient(SetGradientOptions options);
-    
-    void commitChanges();
-    void resetChanges();
-
-private:
-
-    void beginAction(AdjustLayoutColour::Type type);
-    void endAction();
-
-private:
-
-    void sendSelectionUpdate(const juce::Array<MappedLumatoneKey>& keyUpdates);
-    void sendMappingUpdate(const LumatoneLayout& updatedLayout);
-
-private:
-
-    LumatoneHexMap hexMap;
-
-    LumatoneLayout layoutBeforeAdjust;
-    LumatoneLayout currentLayout;
-
-    AdjustLayoutColour::Type currentAction;
-};
diff --git a/Source/data/lumatone_board.cpp b/Source/data/lumatone_board.cpp
deleted file mode 100644
index f9f6b010..00000000
--- a/Source/data/lumatone_board.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-  ==============================================================================
-
-    lumatone_board.cpp
-    Created: 6 Aug 2023 2:16:27pm
-    Author:  Vincenzo
-
-  ==============================================================================
-*/
-
-#include "lumatone_board.h"
-
-/*
-==============================================================================
-TerpstraKeys class
-==============================================================================
-*/
-
-LumatoneBoard::LumatoneBoard(LumatoneKeyType newKeyType, int numKeysIn, int boardIndex)
-    : numKeys(numKeysIn)
-    , board_idx(boardIndex)
-{
-    for (int i = 0; i < numKeys; i++)
-        theKeys[i] = LumatoneKey(newKeyType);
-
-    //key_idx = 0;
-}
-
-LumatoneBoard::LumatoneBoard(const LumatoneBoard& copyBoard)
-{
-    operator=(copyBoard);
-}
-
-void LumatoneBoard::operator=(const LumatoneBoard& copyBoard)
-{
-    numKeys = copyBoard.numKeys;
-    board_idx = copyBoard.board_idx;
-
-    for (int i = 0; i < numKeys; i++)
-        theKeys[i] = LumatoneKey(copyBoard.theKeys[i]);
-}
-
-bool LumatoneBoard::isEmpty() const
-{
-    LumatoneKey emptyKeyData = LumatoneKey();
-
-    for (int i = 0; i < numKeys; i++) 
-        if (theKeys[i] != emptyKeyData) 
-            return false;
-
-    return true;
-}
-
-int LumatoneBoard::getNumKeys() const
-{
-    return numKeys;
-}
-
-juce::Array<juce::Colour> LumatoneBoard::getBoardColours() const
-{
-    juce::Array<juce::Colour> boardColours;
-
-    for (int i = 0; i < numKeys; i++)
-    {
-        if (!boardColours.contains(theKeys[i].colour))
-            boardColours.add(theKeys[i].colour);
-    }
-
-    return boardColours;
-}
-
-juce::Array<LumatoneKeyCoord> LumatoneBoard::getKeysWithColour(const juce::Colour& c) const
-{
-    juce::Array<LumatoneKeyCoord> keyCoords;
-
-    for (int i = 0; i < numKeys; i++)
-    {
-        if (theKeys[i].colour == c)
-            keyCoords.add(LumatoneKeyCoord(board_idx, i));
-    }
-
-    return keyCoords;
-}
diff --git a/Source/data/lumatone_board.h b/Source/data/lumatone_board.h
deleted file mode 100644
index ed58153c..00000000
--- a/Source/data/lumatone_board.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-  ==============================================================================
-
-    lumatone_board.h
-    Created: 6 Aug 2023 2:16:27pm
-    Author:  Vincenzo
-
-  ==============================================================================
-*/
-
-#pragma once
-#include "../lumatone_editor_common.h"
-#include "lumatone_key.h"
-
-#define MAXBOARDSIZE 56
-
-// Subset of 56 or 55) keys
-class LumatoneBoard
-{
-public:
-    LumatoneKey        theKeys[MAXBOARDSIZE];
-    int                board_idx;
-
-    LumatoneBoard(LumatoneKeyType newKeyType = LumatoneKeyType::disabled, int numKeysIn=MAXBOARDSIZE, int boardIndex = 0);
-    LumatoneBoard(const LumatoneBoard& copyBoard);
-
-    void operator=(const LumatoneBoard& copyBoard);
-
-    bool isEmpty() const;
-
-    int getNumKeys() const;
-
-    juce::Array<juce::Colour> getBoardColours() const;
-    juce::Array<LumatoneKeyCoord> getKeysWithColour(const juce::Colour& c) const;
-
-private:
-
-    int numKeys;
-
-};
diff --git a/Source/data/lumatone_key.cpp b/Source/data/lumatone_key.cpp
deleted file mode 100644
index 8cc1d3ba..00000000
--- a/Source/data/lumatone_key.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-  ==============================================================================
-
-    lumatone_key.cpp
-    Created: 6 Aug 2023 2:16:18pm
-    Author:  Vincenzo
-
-  ==============================================================================
-*/
-
-#include "lumatone_key.h"
-
-bool LumatoneKey::configIsEqual(const LumatoneKey& compare) const
-{
-    return keyType == compare.keyType 
-        && channelNumber == compare.channelNumber
-        && noteNumber == compare.noteNumber
-        && ccFaderDefault == compare.ccFaderDefault;
-}
-
-bool LumatoneKey::colourIsEqual(const LumatoneKey& compare) const
-{
-    return colour == compare.colour;
-}
diff --git a/Source/data/lumatone_key.h b/Source/data/lumatone_key.h
deleted file mode 100644
index 7fe9cc32..00000000
--- a/Source/data/lumatone_key.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-  ==============================================================================
-
-    lumatone_key.h
-    Created: 6 Aug 2023 2:16:18pm
-    Author:  Vincenzo
-
-  ==============================================================================
-*/
-
-#pragma once
-
-#include "../lumatone_editor_common.h"
-#include "../LumatoneFirmwareDefinitions.h"
-
-// Mapping of one key
-class LumatoneKey
-{
-public:
-    LumatoneKey(LumatoneKeyType newKeyType = LumatoneKeyType::disabled) { noteNumber = 0; channelNumber = 1; colour = juce::Colour(); keyType = newKeyType; ccFaderDefault = true; };
-    LumatoneKey(LumatoneKeyType newKeyType, int newChannelNumber, int newNoteNumber, juce::Colour newColour, bool invertCCFader = false)
-    {
-        keyType = newKeyType; channelNumber = newChannelNumber; noteNumber = newNoteNumber; colour = newColour; ccFaderDefault = invertCCFader;
-    }
-    bool isEmpty() const { return channelNumber == 0; }
-
-    bool configIsEqual(const LumatoneKey& compare) const;
-    bool colourIsEqual(const LumatoneKey& compare) const;
-
-    bool operator==(const LumatoneKey& compare) const { return configIsEqual(compare) && colourIsEqual(compare); }
-    bool operator!=(const LumatoneKey& compare) const { return !(*this == compare); }
-
-    // Chainable setters
-    LumatoneKey withKeyType(LumatoneKeyType type) const { return LumatoneKey(type, channelNumber, noteNumber, colour, ccFaderDefault); }
-    LumatoneKey withColour(juce::Colour newColour) const { return LumatoneKey(keyType, channelNumber, noteNumber, newColour, ccFaderDefault); }
-    LumatoneKey withNoteOrCC(int noteOrCC) const { return LumatoneKey(keyType, channelNumber, noteOrCC, colour, ccFaderDefault); }
-    LumatoneKey withChannelNumber(int channel) const { return LumatoneKey(keyType, channel, noteNumber, colour, ccFaderDefault); }
-    LumatoneKey withInvertCCFader(bool invertCCFader) const { return LumatoneKey(keyType, channelNumber, noteNumber, colour, invertCCFader); }
-
-public:
-    int                noteNumber;
-    int                channelNumber;
-    juce::Colour       colour;
-    bool               ccFaderDefault;
-    LumatoneKeyType    keyType;
-};
-
-class MappedLumatoneKey : public LumatoneKey
-{
-public:
-    MappedLumatoneKey()
-        : LumatoneKey()
-        , boardIndex(-1)
-        , keyIndex(-1)
-        { }
-
-    MappedLumatoneKey(LumatoneKey key, int boardIndexIn, int keyIndexIn)
-        : LumatoneKey(key)
-		, boardIndex(boardIndexIn)
-        , keyIndex(keyIndexIn)
-        { }
-
-	MappedLumatoneKey(LumatoneKey key, LumatoneKeyCoord coord)
-		: MappedLumatoneKey(key, coord.boardIndex, coord.keyIndex) {}
-
-    LumatoneKeyCoord getKeyCoord() const { return LumatoneKeyCoord(boardIndex, keyIndex); }
-
-public:
-
-    int boardIndex = -1;
-    int keyIndex = -1;
-};
diff --git a/Source/data/lumatone_layout.h b/Source/data/lumatone_layout.h
deleted file mode 100644
index ed60c357..00000000
--- a/Source/data/lumatone_layout.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-==============================================================================
-
-LumatoneDataStructures.h
-Created: XXX
-Author:  hsstraub
-
-==============================================================================
-*/
-
-#pragma once
-#include "./lumatone_board.h"
-
-// Velocity curve config
-class LumatoneConfigTable
-{
-public:
-
-	typedef enum
-	{
-		none = -1,
-		freeDrawing = 0,
-		linearSegments = 1,
-		quadraticCurves = 2
-	} DrawMode;
-
-	typedef enum
-	{
-		velocityInterval = 1,
-		fader = 2,
-		afterTouch = 3,
-		lumaTouch = 4
-		// ToDo modulation wheel
-	} TableType;
-
-public:
-	LumatoneConfigTable();
-	// Default value for the given curve type
-	LumatoneConfigTable(TableType tableType);
-	LumatoneConfigTable(const juce::String& configString);
-
-	juce::String toConfigString();
-
-public:
-	DrawMode editStrategy;
-
-	// Velocity curve values. Meaning varies depending on editStrategy
-	int velocityValues[128];
-};
-
-/*
-==============================================================================
-A complete key mapping
-==============================================================================
-*/
-#define MAXNUMBOARDS 5
-
-// Number of entries in the velocity interval table
-#define VELOCITYINTERVALTABLESIZE 127
-
-class LumatoneLayout
-{
-private:
-	LumatoneBoard boards[MAXNUMBOARDS];
-
-public:
-	LumatoneLayout(int numBoards=5, int octaveBoardSize=56, bool initializeWithNotes=false);
-
-	void clearVelocityIntervalTable();
-	void clearAll(bool initializeWithNoteKeyType=false);
-    bool isEmpty() const;
-
-	void fromStringArray(const juce::StringArray& stringArray);
-	juce::StringArray toStringArray();
-
-	int getNumBoards() const { return numBoards; }
-	int getOctaveBoardSize() const { return octaveBoardSize; }
-
-	LumatoneConfigTable* getConfigTable(LumatoneConfigTable::TableType tableType);
-
-	juce::Array<juce::Colour> getLayoutColours() const;
-    juce::Array<LumatoneKeyCoord> getKeysWithColour(const juce::Colour& c) const;
-
-	// Key configuration
-	const LumatoneBoard* readBoard(int index) const;
-	LumatoneBoard* getBoard(int index);
-
-	const LumatoneKey* readKey(int boardIndex, int keyIndex) const;
-
-public:
-
-	juce::Array<LumatoneKeyCoord> getAllKeyCoords() const;
-
-public:
-
-	int numBoards = 0;
-	int octaveBoardSize = 0;
-
-	// General options
-	bool afterTouchActive;
-	bool lightOnKeyStrokes;
-	bool invertExpression;
-	bool invertSustain;
-	int expressionControllerSensivity;
-
-	// Velocity curves
-	int table[VELOCITYINTERVALTABLESIZE];
-
-	LumatoneConfigTable	velocityTable;
-	LumatoneConfigTable faderTable;
-	LumatoneConfigTable afterTouchTable;
-	LumatoneConfigTable lumaTouchTable;
-};
diff --git a/Source/hex/lumatone_hex_map.cpp b/Source/hex/lumatone_hex_map.cpp
deleted file mode 100644
index 2fb00bbf..00000000
--- a/Source/hex/lumatone_hex_map.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-  ==============================================================================
-
-    lumatone_hex_map.cpp
-    Created: 31 Jul 2023 1:39:39am
-    Author:  Vincenzo
-
-  ==============================================================================
-*/
-
-#include "lumatone_hex_map.h"
-
-LumatoneHexMap::LumatoneHexMap(const LumatoneLayout& layoutIn, Hex::Point originPointIn, int originBoardIndexIn, int originKeyIndexIn)
-    : layout(layoutIn)
-    , originPoint(originPointIn)
-    , originBoardIndex(originBoardIndexIn)
-    , originKeyIndex(originKeyIndexIn)
-{
-    map.reset(new juce::HashMap<juce::String, MappedKey>(280));
-    renderMap();
-}
-
-LumatoneHexMap::~LumatoneHexMap()
-{
-    map = nullptr;
-}
-
-LumatoneKeyCoord LumatoneHexMap::hexToKeyCoords(Hex::Point point) const
-{
-    auto key = point.toString();
-    return (*map)[key].key;
-}
-
-Hex::Point LumatoneHexMap::keyCoordsToHex(int boardIndex, int keyIndex) const
-{
-    return boards[boardIndex].keys[keyIndex].point;
-}
-
-Hex::Point LumatoneHexMap::keyCoordsToHex(const LumatoneKeyCoord& keyCoord) const
-{
-    return keyCoordsToHex(keyCoord.boardIndex, keyCoord.keyIndex);
-}
-
-Hex::Point LumatoneHexMap::addBoardIndex(Hex::Point point, int numIndexes)
-{
-    return Hex::Point(point.q + numIndexes * 7, point.r - numIndexes * 5);
-}
-
-void LumatoneHexMap::renderMap()
-{
-    map->clear();
-    //boards.clear();
-
-    for (int i = 0; i < layout.getNumBoards(); i++)
-        //boards.add(MapBoard(layout.getOctaveBoardSize()));
-        boards[i] = MapBoard(layout.getOctaveBoardSize());
-
-    // use lumatoneGeometry.getVerticalOriginLineIndexForRow to find zeroth key from origin
-
-    int originRowIndex = 0;
-    int lineToZeroDiff = 0;
-
-    for (int row = 0; row < lumatoneGeometry.horizontalLineCount(); row++)
-    {
-        if (originKeyIndex < lumatoneGeometry.getLastIndexForRow(row))
-        {
-            originRowIndex = row;
-            lineToZeroDiff = originKeyIndex - lumatoneGeometry.getVerticalOriginLineIndexForRow(row);
-            break;
-        }
-    }
-    
-    Hex::Point zeroKeyPoint = addBoardIndex(
-                                Hex::Point(originPoint.q + lineToZeroDiff, originPoint.r - originRowIndex),
-                                -originBoardIndex);
-
-    int lineIndex = 0;
-    int keyIndex = 0;
-    int rowKeyIndex = 0;
-
-    for (int row = 0; row < lumatoneGeometry.horizontalLineCount(); row++)
-    {
-        Hex::Point rowPoint = zeroKeyPoint;
-
-        switch (row)
-        {
-        case 0:
-            rowPoint = zeroKeyPoint;
-            break;
-
-        case 2:
-        case 4:
-        case 6:
-        case 8:
-            rowPoint = zeroKeyPoint + Hex::Point(-row, row * 2);
-            break;
-
-        case 1:
-        case 3:
-        case 5:
-        case 7:
-            rowPoint = zeroKeyPoint + Hex::Point(-row - 1, row * 2 + 1);
-            break;
-
-        case 9:
-            rowPoint = zeroKeyPoint + Hex::Point(-1, 10);
-            break;
-
-        case 10:
-            rowPoint = zeroKeyPoint + Hex::Point(-1, 10);
-            break;
-        }
-
-        int rowLastKey = lumatoneGeometry.getLastIndexForRow(lineIndex);
-        while (keyIndex <= rowLastKey)
-        {
-            for (int boardIndex = 0; boardIndex < layout.getNumBoards(); boardIndex++)
-            {
-                auto hexCoord = addBoardIndex(rowPoint + Hex::Point(rowKeyIndex, 0), boardIndex);
-
-                LumatoneKeyCoord keyCoord(boardIndex, keyIndex);
-
-                MappedKey mappedKey = { keyCoord, hexCoord };
-                //boards.getReference(boardIndex).keys[keyIndex] = mappedKey;
-                boards[boardIndex].keys[keyIndex] = mappedKey;
-
-                auto hexHash = hexCoord.toString();
-                map->set(hexHash, mappedKey);
-            }
-            keyIndex++;
-            rowKeyIndex++;
-        }
-
-        lineIndex++;
-        rowKeyIndex = 0;
-    }
-}
diff --git a/Source/key_update_buffer.cpp b/Source/key_update_buffer.cpp
deleted file mode 100644
index c8ed8907..00000000
--- a/Source/key_update_buffer.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-#include "key_update_buffer.h"
-#include "Main.h"
-
-LumatoneKeyUpdateBuffer::LumatoneKeyUpdateBuffer(TerpstraMidiDriver& driverIn)
-    : midiDriver(driverIn)
-{
-    keysToUpdate.remapTable(280);
-}
-
-LumatoneKeyUpdateBuffer::~LumatoneKeyUpdateBuffer()
-{
-    
-}
-
-int LumatoneKeyUpdateBuffer::getKeyNum(int boardIndex, int keyIndex) const
-{
-    return boardIndex * TerpstraSysExApplication::getApp().getOctaveBoardSize() + keyIndex;
-}
-
-LumatoneKeyCoord LumatoneKeyUpdateBuffer::getKeyCoord(int keyNum) const
-{
-    return LumatoneKeyCoord(keyNum / TerpstraSysExApplication::getApp().getOctaveBoardSize(), 
-                            keyNum % TerpstraSysExApplication::getApp().getOctaveBoardSize());
-}
-
-void LumatoneKeyUpdateBuffer::sendKeyConfig(int boardId, int keyIndex, const LumatoneKey& noteDataConfig, bool signalEditorListeners)
-{
-    updateKeyConfig(boardId - 1, keyIndex, noteDataConfig);
-}
-
-void LumatoneKeyUpdateBuffer::sendKeyConfig(int boardIndex, int keyIndex, int noteOrCCNum, int channel, int keyType, bool faderUpIsNull)
-{
-    auto config = LumatoneKey(LumatoneKeyType(keyType), channel, noteOrCCNum, juce::Colour(), faderUpIsNull);
-    updateKeyConfig(boardIndex, keyIndex, config);
-}
-
-void LumatoneKeyUpdateBuffer::sendKeyColourConfig(int boardId, int keyIndex, juce::Colour colour, bool signalEditorListeners)
-{
-    updateKeyColour(boardId - 1, keyIndex, colour);
-}
-
-void LumatoneKeyUpdateBuffer::updateKeyConfig(int boardIndex, int keyIndex, const LumatoneKey& config)
-{
-    lock.enter();
-    // while (!lock.tryEnter()) {}
-
-    auto keyNum = getKeyNum(boardIndex, keyIndex);
-    MappedLumatoneKey currentUpdateData = keysToUpdate[keyNum];
-
-    auto currentKey = TerpstraSysExApplication::getApp().getMappingData()->readKey(boardIndex, keyIndex);
-    preUpdateLayout.getBoard(boardIndex)->theKeys[keyIndex] = *currentKey;
-
-    if (*currentKey == config)
-    {
-        keysToUpdate.set(keyNum, MappedLumatoneKey());
-    }
-    else if (currentUpdateData.boardIndex < 0 || currentUpdateData.keyIndex < 0)
-    {
-        keysToUpdate.set(keyNum, MappedLumatoneKey(config.withColour(currentKey->colour), boardIndex, keyIndex));
-    }
-    else if (!currentUpdateData.configIsEqual(config))
-    {
-        keysToUpdate.set(keyNum, MappedLumatoneKey(config.withColour(currentUpdateData.colour), boardIndex, keyIndex));
-    }
-
-    lock.exit();
-    startTimer(updateMs);
-}
-
-void LumatoneKeyUpdateBuffer::updateKeyColour(int boardIndex, int keyIndex, juce::Colour colour)
-{
-    lock.enter();
-    // while (!lock.tryEnter()) {}
-
-    auto keyNum = getKeyNum(boardIndex, keyIndex);
-    MappedLumatoneKey currentUpdateData = keysToUpdate[keyNum];
-    auto currentKey = TerpstraSysExApplication::getApp().getMappingData()->readKey(boardIndex, keyIndex);
-    preUpdateLayout.getBoard(boardIndex)->theKeys[keyIndex] = *currentKey;
-    
-    if (currentKey->colour == colour && currentKey->configIsEqual(currentUpdateData))
-    {
-        keysToUpdate.set(keyNum, MappedLumatoneKey());
-    }
-    else if (currentUpdateData.boardIndex < 0 || currentUpdateData.keyIndex < 0)
-    {
-        keysToUpdate.set(keyNum, MappedLumatoneKey(currentKey->withColour(colour), boardIndex, keyIndex));
-    }
-    else if (currentUpdateData.colour != colour)
-    {
-        keysToUpdate.set(keyNum, MappedLumatoneKey(currentUpdateData.withColour(colour), boardIndex, keyIndex));
-    }
-
-    lock.exit();
-    startTimer(updateMs);
-}
-
-void LumatoneKeyUpdateBuffer::timerCallback()
-{
-    stopTimer();
-
-    if (! lock.tryEnter())
-        return;
-
-    int keyNum = 0;
-    for (int board = 0; board < TerpstraSysExApplication::getApp().getNumBoards(); board++)
-    {
-        int boardId = board + 1;
-        for (int keyIndex = 0; keyIndex < TerpstraSysExApplication::getApp().getOctaveBoardSize(); keyIndex++)
-        {
-            auto keyUpdate = keysToUpdate[keyNum];
-            if (keyUpdate.boardIndex >= 0 && keyUpdate.keyIndex >= 0)
-            {
-                // auto currentKey = getKey(board, keyIndex);
-                auto currentKey = preUpdateLayout.getBoard(board)->theKeys[keyIndex];
-                if (!currentKey.configIsEqual(keyUpdate))
-                    midiDriver.sendKeyFunctionParameters(boardId, keyIndex, keyUpdate.noteNumber, keyUpdate.channelNumber, keyUpdate.keyType, keyUpdate.ccFaderDefault);
-                
-                if (!currentKey.colourIsEqual(keyUpdate))
-                {
-                    auto colour = keyUpdate.colour;
-                    if (TerpstraSysExApplication::getApp().getLumatoneVersion() >= LumatoneFirmwareVersion::VERSION_1_0_11)
-                        midiDriver.sendKeyLightParameters(boardId, keyIndex, colour.getRed(), colour.getGreen(), colour.getBlue());
-                    else
-                        midiDriver.sendKeyLightParameters_Version_1_0_0(boardId, keyIndex, colour.getRed() * 0.5f, colour.getGreen() * 0.5f, colour.getBlue() * 0.5f);
-                }
-            }
-
-            keysToUpdate.set(keyNum, MappedLumatoneKey());
-            keyNum++;
-        }
-    }
-
-    lock.exit();
-}
diff --git a/Source/actions/edit_actions.cpp b/Source/lumatone_editor_library/actions/edit_actions.cpp
similarity index 63%
rename from Source/actions/edit_actions.cpp
rename to Source/lumatone_editor_library/actions/edit_actions.cpp
index 192267cd..6deafed6 100644
--- a/Source/actions/edit_actions.cpp
+++ b/Source/lumatone_editor_library/actions/edit_actions.cpp
@@ -9,12 +9,14 @@
 */
 #include "edit_actions.h"
 
+#include "../data/application_state.h"
+
 using namespace LumatoneEditAction;
 
 // ==============================================================================
 // Implementation of SingleNoteAssignAction
 SingleNoteAssignAction::SingleNoteAssignAction(
-    LumatoneController* controller,
+    LumatoneApplicationState* stateIn,
     int boardIndexIn,
     int keyIndexIn,
     bool setKeyType,
@@ -27,20 +29,20 @@ SingleNoteAssignAction::SingleNoteAssignAction(
     int newNoteNumber,
     juce::Colour newColour,
     bool newCCFaderIsDefault)
-    : LumatoneAction(controller)
+    : LumatoneAction(stateIn, "SingleNoteAssign")
     , boardId(boardIndexIn + 1), keyIndex(keyIndexIn)
     , setKeyType(setKeyType), setChannel(setChannel), setNote(setNote), setColour(setColour), setCCFaderPolarity(setCCPolarity)
     , newData(newKeyType, newChannelNumber, newNoteNumber, newColour, newCCFaderIsDefault)
 {
-    previousData = *controller->getKey(boardIndexIn, keyIndexIn);
+    previousData = state->getKey(boardIndexIn, keyIndexIn);
 }
 
 SingleNoteAssignAction::SingleNoteAssignAction(
-    LumatoneController* controller,
+    LumatoneApplicationState* stateIn,
     int boardIndex,
     int keyIndex,
-    juce::Colour newColour )
-    : SingleNoteAssignAction(controller,
+    juce::Colour newColour)
+    : SingleNoteAssignAction(state,
                             boardIndex, keyIndex,
                             false, false, false, true, false,
                             LumatoneKeyType::disabledDefault, 0, 0, newColour, false) {}
@@ -60,23 +62,23 @@ bool SingleNoteAssignAction::perform()
 
             if (setKeyType)
             {
-                resultKey.keyType = newData.keyType;
+                resultKey.setKeyType(newData.getType());
             }
             if (setChannel)
             {
-                resultKey.channelNumber = newData.channelNumber;
+                resultKey.setChannelNumber(newData.getMidiChannel());
             }
             if (setNote)
             {
-                resultKey.noteNumber = newData.noteNumber;
+                resultKey.setNoteOrCC(newData.getMidiNumber());
             }
             if (setColour)
             {
-                resultKey.colour = newData.colour;
+                resultKey.setColour(newData.getColour());
             }
             if (setCCFaderPolarity)
             {
-                resultKey.ccFaderDefault = newData.ccFaderDefault;
+                resultKey.setDefaultCCFader(newData.isCCFaderDefault());
             }
 
             newData = resultKey;
@@ -85,15 +87,11 @@ bool SingleNoteAssignAction::perform()
 
             if (onlyColor)
             {
-                controller->sendKeyColourConfig(boardId, keyIndex, newData.colour);
+                state->setKeyColour(newData.getColour(), boardId, keyIndex);
             }
             else
             {
-                // Send to device
-                controller->sendKeyParam(
-                    boardId,
-                    keyIndex,
-                    newData);
+                state->setKey(newData, boardId, keyIndex);
             }
 
             // Notfy that there are changes: in calling function
@@ -123,32 +121,33 @@ bool SingleNoteAssignAction::undo()
 
             if (setKeyType)
             {
-                resultKey.keyType = previousData.keyType;
+                resultKey.setKeyType(previousData.getType());
             }
             if (setChannel)
             {
-                resultKey.channelNumber = previousData.channelNumber;
+                resultKey.setChannelNumber(previousData.getMidiChannel());
             }
             if (setNote)
             {
-                resultKey.noteNumber = previousData.noteNumber;
+                resultKey.setNoteOrCC(previousData.getMidiNumber());
             }
             if (setColour)
             {
-                resultKey.colour = previousData.colour;
+                resultKey.setColour(previousData.getColour());
             }
             if (setCCFaderPolarity)
             {
-                resultKey.ccFaderDefault = previousData.ccFaderDefault;
+                resultKey.setDefaultCCFader(previousData.isCCFaderDefault());
             }
 
             previousData = resultKey;
 
             // Send to device
-            controller->sendKeyParam(
+            state->setKey(
+                previousData,
                 boardId,
-                keyIndex,
-                previousData);
+                keyIndex
+                );
 
             // Notify that there are changes: in calling function
         }
@@ -170,12 +169,13 @@ bool SingleNoteAssignAction::undo()
 // ==============================================================================
 // Implementation of SectionEditAction
 
-SectionEditAction::SectionEditAction(LumatoneController* controller, int boardIndexIn, const LumatoneBoard& newSectionValue)
-    : LumatoneAction(controller)
+SectionEditAction::SectionEditAction(LumatoneApplicationState* stateIn, int boardIndexIn, const LumatoneBoard& newSectionValue, bool bufferKeyUpdates)
+    : LumatoneAction(stateIn, "SectionEdit")
     , boardId(boardIndexIn + 1)
     , newData(newSectionValue)
+    , useKeyBuffer(bufferKeyUpdates)
 {
-    previousData = *controller->getBoard(boardIndexIn);
+    previousData = state->getBoard(boardIndexIn);
 }
 
 bool SectionEditAction::isValid() const
@@ -185,10 +185,11 @@ bool SectionEditAction::isValid() const
 
 bool SectionEditAction::perform()
 {
-    if (boardId > 0 && boardId <= controller->getNumBoards())
+    if (boardId > 0 && boardId <= state->getNumBoards())
     {
         // Send to device
-        controller->sendAllParamsOfBoard(boardId, newData);
+        state->setBoard(newData, boardId);
+        //state->sendAllParamsOfBoard(boardId, &newData, true, useKeyBuffer);
 
         // Notify that there are changes: in calling function
         return true;
@@ -205,7 +206,8 @@ bool SectionEditAction::undo()
     if (boardId >= 0 && boardId <= numOctaveBoards)
     {
         // Send to device
-        controller->sendAllParamsOfBoard(boardId, previousData);
+        state->setBoard(previousData, boardId);
+        //state->sendAllParamsOfBoard(boardId, &previousData, true, useKeyBuffer);
 
         // Notify that there are changes: in calling function
         return true;
@@ -219,18 +221,21 @@ bool SectionEditAction::undo()
 }
 
 
-MultiKeyAssignAction::MultiKeyAssignAction(LumatoneController* controller, const juce::Array<MappedLumatoneKey>& updatedKeys)
-    : LumatoneAction(controller)
+MultiKeyAssignAction::MultiKeyAssignAction(LumatoneApplicationState* stateIn, const juce::Array<MappedLumatoneKey>& updatedKeys, bool setConfigIn, bool setColourIn, bool bufferKeyUpdates)
+    : LumatoneAction(stateIn, "MultiKeyAssign")
+    , useKeyBuffer(bufferKeyUpdates)
+    , setConfig(setConfigIn)
+    , setColours(setColourIn)
 {
     for (auto updatedKey : updatedKeys)
     {
         auto coord = updatedKey.getKeyCoord();
-        if (controller->isKeyCoordValid(coord))
+        if (state->getMappingData()->isKeyCoordValid(coord))
         {
             newData.add(updatedKey);
 
-            auto key = controller->getKey(coord.boardIndex, coord.keyIndex);
-            previousKeys.add(MappedLumatoneKey(*key, coord));
+            auto key = state->getKey(coord.boardIndex, coord.keyIndex);
+            previousKeys.add(MappedLumatoneKey(key, coord));
         }
     }
 }
@@ -242,21 +247,11 @@ bool MultiKeyAssignAction::isValid() const
 
 void MultiKeyAssignAction::applyMappedKeyData(const juce::Array<MappedLumatoneKey>& newKeys, const juce::Array<MappedLumatoneKey>& oldKeys)
 {
-    for (int i = 0; i < newKeys.size(); i++)
-    {
-        MappedLumatoneKey oldKey = oldKeys[i];
-        MappedLumatoneKey newKey = newKeys[i];
-
-        if (!oldKey.configIsEqual(newKey))
-        {
-            controller->sendKeyConfig(newKey.boardIndex + 1, newKey.keyIndex, newKey.noteNumber, newKey.channelNumber, newKey.keyType, newKey.ccFaderDefault);
-        }
+    if (setConfig)
+        state->sendSelectionParam(newKeys, false, useKeyBuffer);
 
-        if (!oldKey.colourIsEqual(newKey))
-        {
-            controller->sendKeyColourConfig(newKey.boardIndex + 1, newKey.keyIndex, newKey.colour);
-        }
-    }
+    if (setColours)
+        state->sendSelectionColours(newKeys, true, useKeyBuffer);
 }
 
 bool MultiKeyAssignAction::perform()
@@ -274,62 +269,62 @@ bool MultiKeyAssignAction::undo()
 // ==============================================================================
 // Implementation of InvertFootControllerEditAction
 
-InvertFootControllerEditAction::InvertFootControllerEditAction(LumatoneController* controller, bool newValue)
-    : LumatoneAction(controller), newData(newValue)
+InvertFootControllerEditAction::InvertFootControllerEditAction(LumatoneApplicationState* stateIn, bool newValue)
+    : LumatoneAction(stateIn, "InvertFootControllerEdit"), newData(newValue)
 {
-    previousData = controller->getInvertExpression();
+    previousData = state->getInvertExpression();
 }
 
 bool InvertFootControllerEditAction::perform()
 {
-    controller->invertSustainPedal(newData);
+    state->setInvertSustain(newData);
     return true;
 }
 
 bool InvertFootControllerEditAction::undo()
 {
-    controller->invertSustainPedal(previousData);
+    state->setInvertSustain(previousData);
     return true;
 }
 
 // ==============================================================================
 // Implementation of ExprPedalSensivityEditAction
 
-ExprPedalSensivityEditAction::ExprPedalSensivityEditAction(LumatoneController* controller, int newValue)
-    : LumatoneAction(controller), newData(newValue)
+ExprPedalSensivityEditAction::ExprPedalSensivityEditAction(LumatoneApplicationState* stateIn, int newValue)
+    : LumatoneAction(stateIn, "ExprPedlSensitivity"), newData(newValue)
 {
-    previousData = controller->getExpressionSensitivity();
+    previousData = state->getExpressionSensitivity();
 }
 
 bool ExprPedalSensivityEditAction::perform()
 {
-    controller->sendExpressionPedalSensivity(newData);
+    state->setExpressionSensitivity(newData);
     return true;
 }
 
 bool ExprPedalSensivityEditAction::undo()
 {
-    controller->sendExpressionPedalSensivity(previousData);
+    state->setExpressionSensitivity(previousData);
     return true;
 }
 
 // ==============================================================================
 // Implementation of InvertSustainEditAction
 
-InvertSustainEditAction::InvertSustainEditAction(LumatoneController* controller, bool newValue)
-    : LumatoneAction(controller), newData(newValue)
+InvertSustainEditAction::InvertSustainEditAction(LumatoneApplicationState* stateIn, bool newValue)
+    : LumatoneAction(stateIn, "InvertSustainEdit"), newData(newValue)
 {
-    previousData = controller->getInvertSustain();
+    previousData = state->getInvertSustain();
 }
 
 bool InvertSustainEditAction::perform()
 {
-    controller->invertSustainPedal(newData);
+    state->setInvertSustain(newData);
     return true;
 }
 
 bool InvertSustainEditAction::undo()
 {
-    controller->invertSustainPedal(previousData);
+    state->setInvertSustain(previousData);
     return true;
 }
diff --git a/Source/actions/edit_actions.h b/Source/lumatone_editor_library/actions/edit_actions.h
similarity index 75%
rename from Source/actions/edit_actions.h
rename to Source/lumatone_editor_library/actions/edit_actions.h
index 05e39872..b41effa5 100644
--- a/Source/actions/edit_actions.h
+++ b/Source/lumatone_editor_library/actions/edit_actions.h
@@ -10,6 +10,7 @@
 
 #pragma once
 #include "./lumatone_action.h"
+#include "../data/lumatone_layout.h"
 
 namespace LumatoneEditAction {
 
@@ -17,22 +18,22 @@ namespace LumatoneEditAction {
     {
     public:
         SingleNoteAssignAction(
-            LumatoneController* controller,
+            LumatoneApplicationState* state,
             int boardIndexIn,
             int keyIndexIn,
             bool setKeyType,
-            bool setChannel,
+            bool setChannel, 
             bool setNote,
             bool setColour,
             bool ccFaderDefault,
             LumatoneKeyType newKeyType = LumatoneKeyType::noteOnNoteOff,
-            int newChannelNumber = 0,
+            int newChannelNumber = 0, 
             int newNoteNumber = 0,
             juce::Colour newColour = juce::Colour(),
             bool newCCFaderDefault = true);
 
         SingleNoteAssignAction(const SingleNoteAssignAction& second)
-            : LumatoneAction(second.controller)
+            : LumatoneAction(second.state, "SingleNoteAssign")
             , boardId(second.boardId)
             , keyIndex(second.keyIndex)
             , setKeyType(second.setKeyType)
@@ -45,7 +46,7 @@ namespace LumatoneEditAction {
         {}
 
         SingleNoteAssignAction(
-            LumatoneController* controller,
+            LumatoneApplicationState* state,
             int boardId,
             int keyIndex,
             juce::Colour newColour
@@ -55,7 +56,7 @@ namespace LumatoneEditAction {
 
         bool perform() override;
         bool undo() override;
-
+        
         int getSizeInUnits() override { return sizeof(SingleNoteAssignAction); }
 
     private:
@@ -75,13 +76,14 @@ namespace LumatoneEditAction {
     class SectionEditAction : public LumatoneAction
     {
     public:
-        SectionEditAction(LumatoneController* controller, int boardIndexIn, const LumatoneBoard& newSectionValue);
+        SectionEditAction(LumatoneApplicationState* state, int boardIndexIn, const LumatoneBoard& newSectionValue, bool bufferKeyUpdates=false);
 
         SectionEditAction(const SectionEditAction& second)
-            : LumatoneAction(second.controller)
+            : LumatoneAction(second.state, "SectionEditAction")
             , boardId(second.boardId)
             , previousData(second.previousData)
             , newData(second.newData)
+            , useKeyBuffer(second.useKeyBuffer)
         {}
 
         bool isValid() const;
@@ -95,16 +97,21 @@ namespace LumatoneEditAction {
 
         LumatoneBoard previousData;
         LumatoneBoard newData;
+
+        bool useKeyBuffer;
     };
 
     class MultiKeyAssignAction : public LumatoneAction
     {
     public:
-        MultiKeyAssignAction(LumatoneController* controller, const juce::Array<MappedLumatoneKey>& updatedKeys);
+        MultiKeyAssignAction(LumatoneApplicationState* state, const juce::Array<MappedLumatoneKey>& updatedKeys, bool setConfig=true, bool setColour=true, bool bufferKeyUpdates=false);
         MultiKeyAssignAction(const MultiKeyAssignAction& copy)
-            : LumatoneAction(copy.controller)
+            : LumatoneAction(copy.state, "MultiKeyAssign")
 			, previousKeys(copy.previousKeys)
             , newData(copy.newData)
+            , setConfig(copy.setConfig)
+            , setColours(copy.setColours)
+            , useKeyBuffer(copy.useKeyBuffer)
         {}
 
         bool isValid() const;
@@ -118,6 +125,10 @@ namespace LumatoneEditAction {
 		void applyMappedKeyData(const juce::Array<MappedLumatoneKey>& newKeys, const juce::Array<MappedLumatoneKey>& oldKeys);
 
 	private:
+        bool setConfig = true;
+        bool setColours = true;
+        bool useKeyBuffer = false;
+
 		juce::Array<MappedLumatoneKey> previousKeys;
 		juce::Array<MappedLumatoneKey> newData;
     };
@@ -125,10 +136,10 @@ namespace LumatoneEditAction {
     class InvertFootControllerEditAction : public LumatoneAction
     {
     public:
-        InvertFootControllerEditAction(LumatoneController* controller, bool newValue);
+        InvertFootControllerEditAction(LumatoneApplicationState* state, bool newValue);
 
         InvertFootControllerEditAction(const InvertFootControllerEditAction& second)
-            : LumatoneAction(second.controller)
+            : LumatoneAction(second.state, "InvertFootControllerEdit")
             , previousData(second.previousData)
             , newData(second.newData)
         {}
@@ -145,10 +156,10 @@ namespace LumatoneEditAction {
     class ExprPedalSensivityEditAction : public LumatoneAction
     {
     public:
-        ExprPedalSensivityEditAction(LumatoneController* controller, int newValue);
+        ExprPedalSensivityEditAction(LumatoneApplicationState* state, int newValue);
 
         ExprPedalSensivityEditAction(const ExprPedalSensivityEditAction& second)
-            : LumatoneAction(second.controller)
+            : LumatoneAction(second.state, "ExprPedalSensitivityEdit")
             , previousData(second.previousData)
             , newData(second.newData)
         {}
@@ -165,14 +176,14 @@ namespace LumatoneEditAction {
     class InvertSustainEditAction : public LumatoneAction
     {
     public:
-        InvertSustainEditAction(LumatoneController* controller, bool newValue);
-
+        InvertSustainEditAction(LumatoneApplicationState* state, bool newValue);
+        
         InvertSustainEditAction(const InvertSustainEditAction& second)
-            : LumatoneAction(second.controller)
+            : LumatoneAction(second.state, "InvertSustainEdit")
             , previousData(second.previousData)
             , newData(second.newData)
         {}
-
+        
         bool perform() override;
         bool undo() override;
         int getSizeInUnits() override { return sizeof(InvertSustainEditAction); }
diff --git a/Source/lumatone_editor_library/actions/lumatone_action.cpp b/Source/lumatone_editor_library/actions/lumatone_action.cpp
new file mode 100644
index 00000000..d3b21819
--- /dev/null
+++ b/Source/lumatone_editor_library/actions/lumatone_action.cpp
@@ -0,0 +1,14 @@
+#include "lumatone_action.h"
+#include "../data/application_state.h"
+
+
+LumatoneAction::LumatoneAction(LumatoneApplicationState* stateIn, juce::String nameIn)
+    : state(stateIn)
+    , name(nameIn)
+{
+    if (state)
+    {
+        octaveBoardSize = state->getOctaveBoardSize();
+        numOctaveBoards = state->getNumBoards();
+    }
+}
diff --git a/Source/actions/lumatone_action.h b/Source/lumatone_editor_library/actions/lumatone_action.h
similarity index 58%
rename from Source/actions/lumatone_action.h
rename to Source/lumatone_editor_library/actions/lumatone_action.h
index 02d19e91..21a94302 100644
--- a/Source/actions/lumatone_action.h
+++ b/Source/lumatone_editor_library/actions/lumatone_action.h
@@ -9,30 +9,29 @@
 */
 
 #pragma once
-#include "../LumatoneController.h"
+
+#include <JuceHeader.h>
+
+class LumatoneApplicationState;
 
 class LumatoneAction : public juce::UndoableAction
 {
 public:
 
-    LumatoneAction(LumatoneController* controllerIn)
-    {
-        if (controllerIn)
-        {
-            controller = controllerIn;
-            octaveBoardSize = controller->getOctaveBoardSize();
-            numOctaveBoards = controller->getNumBoards();
-        }
-    }
+    LumatoneAction(LumatoneApplicationState* controllerIn, juce::String nameIn);
 
     virtual bool perform() = 0;
     virtual bool undo() = 0;
 
     int getSizeInUnits() override = 0;
 
+    juce::String getName() const { return name; }
+
 protected:
 
-    LumatoneController* controller = nullptr;
+    juce::String name;
+
+    LumatoneApplicationState* state = nullptr;
 
     int octaveBoardSize = 56;
     int numOctaveBoards = 5;
diff --git a/Source/lumatone_editor_library/assets/colours/model.json b/Source/lumatone_editor_library/assets/colours/model.json
new file mode 100644
index 00000000..c8707c95
--- /dev/null
+++ b/Source/lumatone_editor_library/assets/colours/model.json
@@ -0,0 +1 @@
+{"raw":[[[[24,31,50],[24,31,56],[23,33,74],[23,35,93],[24,37,126],[25,40,171],[25,43,196],[24,45,216],[18,45,235],[12,50,248],[8,57,249],[10,63,250],[8,68,250],[8,70,250],[7,77,250],[6,83,251],[6,86,251]],[[26,38,54],[25,39,59],[26,39,79],[26,42,107],[25,44,139],[26,46,171],[25,47,193],[23,47,215],[16,48,237],[13,53,250],[9,61,249],[8,65,250],[8,69,250],[6,74,253],[7,79,252],[5,86,250],[7,90,252]],[[31,62,66],[29,62,73],[29,62,100],[29,62,125],[28,63,153],[27,64,188],[25,63,205],[21,62,221],[15,61,242],[12,62,250],[9,68,250],[8,73,251],[7,77,251],[7,82,251],[7,87,252],[7,92,251],[7,96,252]],[[32,90,76],[34,91,82],[32,87,113],[28,85,139],[29,87,170],[27,84,198],[23,82,217],[17,81,234],[14,81,248],[11,80,249],[8,78,250],[9,81,250],[7,85,250],[7,89,251],[8,95,252],[6,98,251],[7,105,252]],[[32,125,84],[31,125,89],[29,122,123],[26,121,151],[22,122,183],[19,118,211],[16,117,223],[13,116,239],[10,113,250],[9,111,251],[8,111,252],[7,109,251],[7,111,252],[9,108,252],[9,109,252],[8,113,252],[7,116,253]],[[26,158,89],[24,155,97],[19,154,129],[16,154,157],[13,153,188],[12,150,214],[9,148,229],[9,147,244],[9,144,250],[9,143,252],[8,141,253],[7,142,253],[7,140,252],[7,141,253],[7,142,253],[7,140,254],[7,145,255]],[[21,175,92],[21,174,101],[16,172,131],[12,172,157],[11,170,187],[11,168,213],[9,167,229],[9,166,244],[8,164,251],[7,161,251],[6,161,253],[7,161,253],[7,159,253],[6,158,253],[6,159,254],[5,159,253],[8,163,255]],[[21,193,95],[20,191,103],[15,192,133],[13,191,158],[9,190,185],[8,189,214],[10,188,228],[10,188,243],[8,186,251],[7,183,253],[7,183,253],[7,182,255],[8,183,255],[7,182,254],[8,182,254],[8,184,253],[7,189,255]],[[19,211,99],[19,210,105],[16,209,134],[12,210,156],[10,209,185],[8,209,212],[9,208,227],[8,207,242],[8,207,250],[8,206,253],[6,206,253],[7,204,254],[8,205,254],[8,205,254],[7,204,254],[7,204,253],[7,212,255]],[[16,222,99],[16,224,108],[18,223,135],[14,224,157],[8,223,183],[7,224,212],[6,223,226],[7,223,242],[9,222,252],[8,223,253],[7,223,255],[7,222,254],[7,222,254],[7,222,253],[6,222,254],[8,222,254],[8,227,254]],[[12,235,103],[14,235,108],[14,235,133],[12,235,157],[10,237,182],[8,236,206],[8,237,224],[7,236,238],[7,236,252],[7,238,253],[7,237,254],[6,239,255],[8,238,254],[6,239,255],[7,240,255],[7,241,255],[8,246,255]],[[12,242,104],[13,242,109],[13,243,133],[14,242,155],[10,244,181],[8,244,206],[7,245,222],[8,245,237],[7,246,250],[6,246,252],[8,247,255],[7,246,254],[6,248,254],[7,248,253],[7,248,254],[7,250,255],[7,253,254]],[[12,248,106],[11,248,112],[11,249,134],[14,248,155],[11,251,180],[8,251,205],[8,251,222],[7,251,236],[7,252,250],[7,252,252],[7,252,255],[7,253,254],[6,253,253],[7,253,253],[7,253,254],[8,254,254],[8,254,253]],[[13,252,109],[11,253,113],[11,253,136],[14,252,158],[10,253,180],[8,253,205],[8,254,219],[7,254,236],[7,253,248],[7,253,250],[7,253,255],[7,254,254],[7,253,254],[8,254,253],[7,254,254],[7,254,254],[8,254,254]],[[11,253,110],[10,253,115],[10,253,135],[12,253,156],[11,254,178],[9,254,205],[7,254,216],[8,254,233],[7,254,247],[8,253,250],[6,253,254],[7,253,253],[7,254,254],[7,253,253],[7,253,254],[8,254,253],[7,254,254]],[[10,253,113],[10,253,117],[8,254,137],[10,254,154],[12,253,176],[10,254,201],[7,254,214],[7,254,230],[7,254,246],[7,253,249],[7,254,253],[7,253,254],[7,254,253],[8,253,253],[7,254,253],[8,254,253],[8,254,253]],[[10,254,115],[9,254,119],[7,254,138],[8,254,154],[11,254,175],[11,255,202],[11,255,217],[7,255,228],[7,254,245],[7,255,249],[9,254,253],[9,254,253],[7,254,252],[8,255,253],[7,254,253],[8,255,253],[8,255,253]]],[[[35,31,54],[35,32,60],[32,35,79],[30,36,97],[29,37,126],[29,40,171],[29,43,198],[28,44,219],[24,45,240],[19,50,250],[15,57,250],[13,62,251],[13,65,251],[12,69,251],[11,75,252],[10,81,251],[11,87,252]],[[37,41,60],[37,41,64],[35,41,87],[34,42,111],[30,44,140],[30,47,180],[29,47,194],[28,46,216],[22,49,246],[19,54,251],[15,59,251],[14,64,251],[13,70,251],[11,74,251],[12,78,251],[11,85,253],[10,89,252]],[[43,64,69],[42,64,75],[38,63,105],[35,63,128],[33,64,158],[32,64,192],[29,63,208],[27,61,223],[21,61,249],[18,61,251],[14,67,252],[13,73,252],[12,76,251],[12,81,252],[11,84,252],[9,90,251],[9,96,252]],[[44,92,78],[43,92,83],[41,89,116],[36,87,140],[34,86,170],[31,85,203],[26,84,218],[24,83,237],[20,82,251],[18,80,252],[14,78,250],[14,80,250],[12,85,252],[12,89,251],[9,92,252],[9,98,252],[9,104,252]],[[42,124,85],[39,124,93],[38,123,123],[34,122,152],[30,119,183],[27,116,211],[23,115,225],[20,113,239],[18,113,250],[16,111,251],[13,109,252],[12,105,252],[11,105,254],[11,106,252],[10,107,253],[9,111,253],[10,114,253]],[[37,156,89],[35,156,97],[30,155,129],[25,154,155],[22,153,187],[20,150,214],[20,147,229],[19,147,244],[18,144,250],[15,142,250],[12,140,253],[11,137,254],[9,137,253],[10,140,253],[8,139,252],[10,139,253],[8,140,255]],[[32,173,91],[30,172,99],[26,171,129],[22,171,157],[20,168,185],[19,166,213],[18,166,229],[17,164,244],[16,162,250],[14,162,251],[13,159,252],[10,159,253],[8,161,253],[8,157,253],[9,158,253],[7,159,254],[7,161,255]],[[28,191,95],[30,191,103],[25,190,132],[22,189,156],[18,189,185],[17,189,214],[17,188,228],[15,186,243],[13,185,252],[14,183,253],[10,184,253],[8,183,255],[8,181,254],[8,181,254],[8,182,254],[6,181,254],[8,188,255]],[[28,210,98],[26,211,105],[24,210,134],[21,210,156],[17,209,183],[16,208,210],[15,206,226],[12,207,242],[11,206,251],[10,205,253],[9,205,254],[8,205,253],[9,204,255],[7,202,254],[8,203,254],[8,205,255],[8,211,255]],[[26,222,100],[24,222,106],[26,223,134],[24,224,155],[18,222,182],[12,222,209],[11,222,225],[10,222,241],[9,222,252],[10,222,254],[8,222,254],[9,222,254],[7,222,254],[8,222,253],[8,223,254],[7,224,255],[8,231,255]],[[22,237,104],[22,237,109],[24,235,134],[23,236,158],[18,236,180],[14,236,208],[9,236,224],[9,237,239],[8,236,251],[8,237,254],[7,238,253],[7,238,254],[7,240,254],[8,239,253],[6,240,255],[7,241,255],[8,246,255]],[[23,244,104],[21,244,110],[23,244,134],[24,244,158],[20,245,181],[11,245,207],[10,245,223],[8,246,239],[8,247,251],[8,240,252],[7,246,255],[9,247,255],[6,247,254],[8,248,254],[7,249,255],[8,250,255],[7,253,254]],[[21,249,106],[20,249,113],[19,249,133],[23,248,156],[18,250,180],[13,250,206],[10,250,221],[7,251,237],[7,252,250],[7,253,252],[7,253,253],[7,253,254],[7,254,253],[7,253,254],[7,253,253],[7,254,254],[7,254,253]],[[20,253,109],[18,252,113],[16,251,132],[20,252,154],[18,252,179],[13,253,204],[10,253,218],[8,254,234],[7,253,248],[7,253,251],[7,254,254],[7,254,253],[7,254,254],[8,254,253],[8,254,254],[8,254,255],[9,255,254]],[[17,252,111],[17,252,115],[14,253,134],[17,253,154],[17,253,178],[13,253,202],[9,254,216],[8,254,231],[7,254,248],[7,254,250],[7,254,254],[7,253,254],[7,253,253],[7,254,253],[7,253,254],[7,254,253],[7,254,253]],[[17,253,113],[15,253,118],[13,253,135],[16,253,154],[19,254,176],[12,254,199],[10,255,214],[9,254,231],[8,254,246],[8,254,249],[8,253,253],[8,254,254],[8,254,253],[8,254,253],[7,254,253],[7,254,253],[8,254,253]],[[15,254,114],[15,254,118],[13,254,136],[12,254,154],[16,254,174],[14,255,200],[10,255,213],[8,254,225],[7,254,244],[8,254,250],[8,254,253],[8,254,253],[7,254,252],[8,254,253],[8,254,253],[8,254,253],[8,255,253]]],[[[52,34,60],[50,34,64],[49,36,89],[47,38,114],[43,38,139],[39,39,173],[37,42,200],[35,43,221],[31,45,245],[29,51,251],[27,58,251],[26,62,250],[25,66,251],[23,70,251],[21,75,251],[20,80,253],[19,85,252]],[[56,43,64],[56,44,71],[54,44,98],[50,44,121],[46,44,148],[39,45,177],[37,45,199],[35,46,224],[31,49,250],[28,54,252],[25,60,251],[24,65,250],[23,69,251],[21,74,252],[21,79,252],[18,84,253],[17,88,253]],[[66,66,74],[65,65,78],[58,65,110],[53,64,132],[46,64,161],[38,64,191],[36,62,208],[33,60,226],[30,59,247],[28,61,251],[26,67,251],[25,72,252],[23,76,252],[22,82,252],[21,85,252],[19,91,252],[17,96,252]],[[67,92,79],[67,91,85],[59,88,119],[55,86,142],[46,86,173],[38,84,201],[36,80,219],[33,80,236],[30,79,251],[28,78,252],[28,78,251],[23,80,252],[22,84,252],[21,87,253],[20,91,252],[18,97,253],[16,100,253]],[[64,124,85],[63,124,93],[58,123,125],[52,120,152],[44,119,183],[36,116,211],[34,114,226],[32,113,240],[30,110,251],[27,108,251],[25,107,252],[24,105,253],[22,107,254],[20,106,254],[19,107,253],[18,109,254],[15,112,253]],[[59,154,88],[59,155,97],[53,152,129],[47,152,154],[39,149,185],[33,148,213],[33,146,228],[32,145,242],[29,143,250],[28,143,251],[25,142,253],[23,141,255],[22,141,253],[21,137,253],[18,138,254],[17,138,254],[16,140,254]],[[56,171,91],[55,172,100],[51,171,130],[44,170,156],[37,169,185],[33,166,213],[32,164,227],[31,165,245],[29,162,251],[27,159,252],[24,159,253],[22,159,254],[21,157,254],[18,155,254],[16,155,254],[15,155,254],[13,159,255]],[[49,191,94],[49,191,102],[44,190,134],[38,190,155],[33,189,184],[31,187,214],[30,186,229],[27,185,242],[26,183,251],[25,183,253],[22,183,254],[20,184,254],[21,181,254],[17,181,254],[14,179,254],[14,181,255],[12,185,255]],[[42,210,96],[41,210,103],[39,208,133],[35,209,154],[30,210,184],[28,209,212],[26,207,227],[26,206,242],[24,205,251],[23,204,253],[19,204,254],[18,204,254],[17,204,254],[16,203,255],[13,204,255],[12,207,254],[11,213,255]],[[37,223,101],[35,223,107],[35,221,133],[33,221,155],[30,222,183],[25,223,210],[24,221,226],[24,222,241],[21,222,251],[19,222,253],[16,221,255],[15,219,254],[13,221,254],[12,222,255],[11,222,254],[11,224,254],[11,229,255]],[[33,236,104],[32,237,108],[33,236,134],[32,234,154],[30,236,180],[25,236,208],[21,236,223],[19,236,238],[16,236,252],[16,236,253],[13,237,255],[11,238,254],[10,237,254],[10,239,253],[9,238,255],[9,240,255],[9,246,255]],[[32,243,104],[31,243,110],[31,243,132],[32,244,156],[29,244,180],[24,244,208],[20,244,221],[16,244,236],[14,245,251],[13,245,251],[12,245,255],[9,247,254],[8,248,254],[10,247,254],[8,248,254],[8,251,255],[10,253,255]],[[32,250,107],[29,249,112],[30,250,133],[30,248,156],[28,251,179],[24,250,206],[21,250,221],[14,251,238],[12,251,250],[11,252,251],[10,251,255],[9,252,253],[9,253,253],[8,251,254],[8,252,254],[7,253,253],[7,253,254]],[[28,253,109],[28,252,112],[28,252,134],[30,252,154],[29,253,178],[24,253,204],[20,253,219],[13,253,233],[11,252,249],[9,252,251],[9,253,254],[9,254,254],[7,253,254],[8,253,253],[8,253,255],[9,253,255],[9,255,254]],[[28,252,111],[29,253,115],[26,254,136],[28,252,156],[27,254,179],[23,253,202],[19,253,215],[14,254,230],[10,254,247],[8,254,250],[7,254,254],[6,254,254],[8,254,253],[8,254,253],[7,254,254],[8,254,254],[7,254,254]],[[27,253,112],[25,253,117],[24,254,138],[24,253,155],[27,253,179],[22,253,200],[18,254,214],[13,255,229],[10,254,245],[7,254,249],[8,254,253],[6,254,254],[7,253,253],[8,254,253],[7,254,254],[8,254,254],[8,254,254]],[[25,254,114],[24,253,118],[22,254,137],[22,254,154],[25,254,177],[24,255,201],[21,255,213],[14,255,227],[10,255,242],[8,254,249],[8,254,251],[7,254,253],[7,254,254],[9,255,253],[8,254,252],[7,254,253],[9,254,253]]],[[[74,35,63],[70,36,70],[69,38,99],[66,40,122],[60,40,150],[59,40,186],[52,42,205],[44,42,224],[40,43,245],[39,48,250],[37,55,250],[36,60,251],[35,66,251],[35,70,252],[33,75,252],[31,81,253],[29,86,253]],[[80,45,68],[80,45,74],[73,45,104],[70,46,129],[63,45,157],[58,45,183],[52,46,204],[43,45,226],[42,49,249],[40,55,251],[38,60,251],[36,65,251],[35,69,252],[35,74,251],[33,78,252],[31,84,253],[29,88,252]],[[84,66,75],[86,68,81],[79,66,116],[75,66,138],[68,64,168],[59,64,199],[50,62,212],[43,60,234],[41,58,250],[39,62,252],[37,69,251],[35,73,251],[35,77,252],[33,80,252],[31,82,254],[29,89,252],[29,94,252]],[[88,90,78],[89,91,87],[83,90,120],[75,88,148],[67,87,176],[57,84,204],[51,81,223],[43,81,235],[41,78,250],[39,77,251],[37,77,251],[34,80,252],[34,84,252],[31,88,253],[31,92,252],[28,97,254],[27,104,253]],[[86,124,84],[86,122,92],[80,122,124],[76,121,152],[65,117,183],[55,114,210],[47,113,223],[44,112,239],[40,111,250],[38,109,251],[35,108,253],[35,105,253],[34,106,252],[31,105,253],[29,104,252],[28,109,253],[27,112,254]],[[82,154,87],[80,154,94],[77,152,128],[71,149,154],[64,146,183],[52,146,213],[45,145,226],[44,145,244],[42,142,251],[39,141,252],[37,139,254],[34,138,253],[33,137,254],[30,138,254],[29,139,255],[26,137,254],[26,140,255]],[[77,171,89],[77,170,97],[74,169,131],[69,169,154],[62,168,185],[50,164,212],[45,164,228],[43,163,243],[40,161,251],[36,160,252],[35,158,254],[33,158,254],[31,157,255],[30,155,254],[26,155,254],[25,155,254],[26,160,255]],[[72,189,93],[71,191,100],[67,189,131],[63,189,154],[56,188,184],[45,187,213],[42,186,228],[40,186,244],[38,184,252],[39,183,252],[34,183,255],[33,181,255],[28,179,255],[30,180,255],[25,180,254],[23,180,255],[26,187,255]],[[63,208,96],[62,209,103],[58,208,132],[54,208,154],[46,208,183],[40,208,211],[37,206,226],[37,205,242],[35,205,251],[33,205,253],[30,203,255],[30,203,255],[27,204,254],[26,203,255],[24,203,255],[22,202,254],[22,210,255]],[[54,221,99],[54,222,106],[53,221,133],[48,222,156],[42,222,181],[35,223,209],[34,222,224],[32,222,240],[32,221,252],[31,220,252],[28,220,255],[26,220,254],[23,220,254],[21,221,254],[20,220,255],[18,221,254],[22,230,255]],[[45,234,102],[43,235,109],[45,234,133],[44,236,155],[38,236,180],[36,236,207],[33,237,223],[29,237,238],[28,235,252],[26,237,254],[23,236,255],[21,237,255],[21,238,254],[19,238,255],[16,238,255],[17,239,255],[19,245,255]],[[40,243,104],[40,242,109],[39,242,132],[42,244,155],[39,245,180],[34,244,207],[31,245,223],[28,245,238],[24,246,251],[24,245,253],[21,245,255],[19,245,254],[18,247,253],[16,247,255],[14,246,253],[12,248,254],[19,253,255]],[[40,249,105],[39,249,111],[39,251,135],[41,250,156],[39,250,179],[35,251,206],[30,251,221],[24,251,237],[23,251,250],[21,251,253],[18,251,254],[16,251,254],[17,251,253],[13,252,254],[11,252,254],[11,253,255],[20,255,255]],[[37,252,107],[38,252,113],[36,253,135],[37,254,157],[38,253,181],[33,253,205],[29,254,220],[24,254,234],[19,253,248],[16,253,251],[14,253,254],[15,253,254],[12,253,253],[11,253,254],[11,253,254],[11,253,254],[18,255,254]],[[38,253,112],[38,254,118],[34,252,136],[34,253,156],[36,253,177],[32,253,200],[28,254,215],[24,253,230],[17,253,245],[15,253,250],[13,253,253],[12,253,255],[10,253,253],[9,254,253],[11,254,254],[10,254,254],[20,255,254]],[[34,253,113],[34,253,117],[32,253,136],[32,253,154],[34,253,177],[31,254,201],[29,254,216],[23,254,229],[16,255,245],[11,254,249],[10,253,253],[10,254,254],[9,254,254],[8,254,253],[9,254,253],[9,253,254],[16,254,253]],[[33,254,115],[32,254,117],[31,253,138],[31,254,154],[35,254,178],[32,255,202],[28,254,215],[25,254,229],[18,255,243],[13,255,250],[10,254,253],[9,254,253],[9,254,253],[9,254,252],[8,254,252],[9,255,253],[18,255,252]]],[[[120,34,65],[120,36,73],[108,39,108],[107,41,137],[98,42,163],[93,43,198],[88,42,214],[79,41,233],[69,44,247],[57,48,252],[56,56,251],[58,62,252],[56,65,252],[54,70,251],[53,74,252],[53,82,254],[50,88,253]],[[126,42,70],[116,41,71],[106,43,105],[103,46,136],[98,46,165],[93,46,198],[87,45,216],[78,44,233],[69,48,250],[59,54,251],[58,60,252],[57,64,251],[55,69,253],[53,72,251],[52,79,253],[51,84,252],[50,90,253]],[[124,66,75],[123,66,83],[116,66,118],[111,65,146],[102,64,175],[92,63,204],[87,60,218],[82,58,234],[69,56,249],[58,60,252],[57,67,252],[55,72,253],[54,75,252],[54,81,252],[52,85,253],[49,90,253],[50,95,252]],[[123,91,80],[123,90,87],[118,89,120],[113,87,150],[107,87,183],[99,84,209],[91,82,222],[82,80,242],[66,76,250],[58,77,251],[56,77,252],[56,80,253],[54,84,253],[54,88,253],[52,92,253],[50,98,253],[49,102,253]],[[121,121,85],[120,121,90],[117,120,124],[114,119,152],[106,117,184],[97,115,212],[89,114,226],[79,111,241],[65,108,251],[60,107,251],[56,103,252],[53,102,252],[51,103,253],[49,103,254],[48,103,252],[45,107,253],[48,113,254]],[[116,151,86],[116,150,93],[112,149,129],[106,149,153],[101,147,183],[93,145,212],[87,143,227],[76,143,243],[61,140,250],[58,140,253],[55,137,253],[55,137,255],[52,137,254],[50,136,254],[51,136,255],[47,137,255],[45,141,255]],[[111,167,88],[111,167,96],[107,167,129],[104,167,154],[98,166,184],[89,164,212],[82,162,229],[71,161,244],[59,159,251],[58,159,252],[55,156,254],[53,156,254],[50,156,253],[50,154,254],[48,154,255],[46,155,255],[47,156,255]],[[106,187,91],[104,186,98],[101,187,129],[97,185,153],[93,185,182],[86,185,211],[78,184,227],[70,182,242],[58,183,251],[56,182,252],[53,180,254],[52,180,255],[50,180,254],[48,178,255],[47,180,255],[46,179,255],[46,182,255]],[[96,205,94],[93,205,101],[92,206,130],[89,206,154],[84,206,181],[76,205,209],[71,205,225],[62,205,241],[55,204,252],[52,204,254],[51,202,255],[48,202,255],[48,202,255],[47,204,255],[42,202,255],[44,203,255],[46,209,255]],[[88,220,98],[87,220,104],[84,219,129],[84,220,154],[77,221,181],[67,221,209],[67,220,224],[56,221,240],[51,221,252],[49,221,254],[47,222,255],[46,221,255],[45,221,255],[44,221,255],[42,221,254],[41,221,255],[43,227,255]],[[77,233,100],[79,233,106],[75,234,130],[74,234,154],[68,234,180],[61,234,206],[58,235,223],[49,235,239],[48,236,252],[46,236,252],[43,237,255],[42,236,255],[41,237,255],[40,237,255],[39,238,255],[40,240,255],[43,245,255]],[[70,241,102],[71,241,108],[68,241,133],[70,242,155],[60,243,182],[55,245,207],[49,244,221],[47,244,236],[43,244,251],[42,246,253],[39,246,255],[39,246,255],[39,246,255],[37,247,254],[36,248,255],[38,251,255],[43,254,255]],[[64,248,104],[66,247,110],[60,248,132],[62,248,155],[55,248,180],[53,250,204],[48,249,219],[43,250,235],[41,251,250],[40,252,252],[39,253,255],[40,253,254],[37,253,254],[35,252,254],[35,252,254],[37,254,255],[39,255,255]],[[57,253,107],[57,252,111],[54,253,135],[57,252,155],[55,253,181],[50,254,204],[46,253,219],[42,254,234],[38,253,250],[36,253,251],[35,253,255],[35,253,254],[33,253,254],[32,254,254],[33,254,254],[33,255,253],[40,255,254]],[[56,253,109],[55,253,116],[50,253,135],[53,253,156],[52,253,181],[48,254,202],[47,254,218],[42,254,232],[37,253,248],[34,254,251],[33,254,255],[32,253,253],[28,253,253],[29,254,253],[26,254,254],[33,255,254],[42,255,254]],[[50,253,112],[50,253,117],[48,253,136],[45,254,154],[50,253,178],[47,254,199],[44,254,215],[39,254,231],[35,254,247],[29,254,249],[27,254,254],[27,254,254],[27,254,253],[26,254,253],[27,255,254],[35,255,254],[42,255,253]],[[47,253,114],[48,254,118],[46,254,140],[46,253,154],[50,254,181],[45,254,201],[43,254,217],[41,255,231],[35,254,246],[30,254,249],[26,254,253],[24,255,253],[24,254,254],[22,254,253],[24,255,253],[33,255,253],[40,255,253]]],[[[164,25,64],[165,27,72],[160,32,115],[150,36,143],[145,38,177],[136,39,207],[129,41,220],[123,41,236],[112,45,248],[99,50,251],[86,56,251],[79,59,251],[76,64,253],[76,69,252],[74,72,252],[73,78,253],[73,85,254]],[[166,35,68],[164,36,75],[159,40,116],[149,43,144],[143,44,175],[136,44,206],[128,44,223],[121,45,239],[110,49,248],[99,54,251],[86,58,252],[78,63,252],[76,67,252],[76,72,252],[74,77,253],[72,82,253],[73,87,253]],[[164,62,73],[164,62,80],[156,62,118],[150,62,148],[144,61,181],[136,60,210],[129,59,223],[121,57,239],[109,58,251],[100,62,251],[87,67,252],[79,72,252],[77,74,253],[75,78,254],[73,83,253],[73,89,253],[72,94,253]],[[161,86,76],[159,87,85],[153,85,119],[149,84,148],[144,83,182],[133,82,210],[127,79,224],[121,79,239],[108,77,250],[99,74,251],[85,75,252],[78,79,253],[76,83,252],[75,86,253],[73,90,254],[72,97,253],[72,100,254]],[[155,118,81],[153,117,88],[151,115,124],[148,117,150],[141,113,183],[134,113,211],[128,109,226],[121,109,241],[110,108,251],[96,105,252],[78,101,252],[76,103,254],[74,101,253],[73,100,254],[73,104,255],[70,109,254],[71,113,254]],[[148,147,83],[148,147,91],[145,145,125],[143,144,149],[138,143,181],[131,141,210],[125,140,227],[118,139,242],[106,138,250],[94,135,254],[78,135,254],[75,134,255],[74,135,254],[71,133,255],[71,132,254],[69,134,255],[71,138,255]],[[146,162,84],[145,161,92],[142,161,125],[138,161,151],[134,162,180],[126,161,210],[121,160,226],[115,158,242],[105,158,251],[94,156,253],[77,155,255],[74,154,255],[72,156,255],[72,156,255],[70,154,255],[68,153,255],[71,158,255]],[[139,183,89],[136,183,95],[135,183,125],[133,184,153],[129,184,179],[121,183,209],[116,182,226],[109,182,243],[102,180,252],[89,181,254],[75,178,255],[73,178,255],[71,178,255],[70,178,255],[68,178,255],[68,177,255],[73,187,255]],[[129,202,93],[129,202,99],[126,203,127],[124,203,152],[120,203,179],[115,204,208],[109,202,223],[105,204,240],[95,203,252],[83,203,254],[72,202,255],[71,202,255],[69,202,255],[68,201,254],[66,202,255],[66,203,255],[70,213,255]],[[122,218,95],[121,216,101],[120,218,129],[117,217,151],[113,219,179],[109,218,206],[106,218,222],[97,219,238],[88,219,251],[76,219,255],[70,219,255],[68,220,255],[67,220,255],[66,219,255],[66,219,255],[64,221,255],[69,227,255]],[[112,230,97],[113,230,103],[109,231,129],[108,232,152],[106,231,178],[99,232,204],[95,234,221],[91,234,237],[80,233,251],[69,235,254],[66,234,255],[64,236,255],[64,236,255],[63,236,255],[63,237,255],[62,239,255],[65,245,255]],[[107,240,100],[107,240,105],[105,239,130],[100,240,151],[100,241,179],[90,242,204],[88,242,220],[83,244,236],[72,243,252],[63,244,253],[63,245,255],[62,246,255],[61,247,255],[59,247,254],[60,247,255],[62,249,255],[66,253,255]],[[102,247,103],[102,247,109],[99,247,131],[94,247,153],[92,248,179],[86,248,203],[84,249,218],[76,250,236],[70,251,250],[61,251,253],[62,251,255],[60,252,255],[59,251,255],[58,253,254],[58,253,255],[62,253,255],[64,255,255]],[[96,253,106],[94,253,111],[91,252,134],[89,253,154],[88,253,178],[80,253,202],[78,253,217],[68,253,235],[62,252,249],[59,253,251],[58,253,255],[56,253,255],[56,254,255],[55,254,254],[55,253,255],[58,255,254],[64,255,255]],[[87,253,107],[87,252,113],[85,253,136],[81,253,154],[81,253,177],[75,254,202],[72,254,217],[66,253,232],[58,254,248],[55,253,250],[55,253,254],[53,253,254],[53,254,254],[52,254,255],[53,254,255],[58,255,255],[66,255,255]],[[80,253,111],[80,253,117],[78,253,138],[73,253,154],[74,254,180],[70,254,200],[65,254,215],[62,254,233],[56,254,247],[51,254,249],[49,254,253],[51,254,254],[51,254,253],[49,254,254],[49,254,255],[57,255,254],[60,255,253]],[[75,254,113],[74,254,116],[72,254,138],[69,255,154],[68,254,180],[63,255,201],[63,254,216],[61,254,232],[55,254,247],[51,254,249],[49,254,253],[49,254,255],[49,255,253],[46,254,253],[49,255,253],[57,255,253],[62,255,253]]],[[[190,18,62],[187,20,72],[182,26,115],[174,31,145],[167,34,177],[160,36,208],[155,36,224],[146,39,240],[137,45,248],[128,50,250],[115,56,253],[107,61,253],[96,64,254],[91,68,252],[89,72,252],[87,78,252],[88,83,255]],[[184,30,65],[184,31,74],[179,34,114],[172,38,142],[166,39,177],[159,39,208],[153,42,222],[147,44,240],[135,49,249],[127,54,251],[114,60,252],[102,63,253],[94,67,251],[89,71,253],[89,76,253],[86,81,253],[86,86,255]],[[181,59,69],[180,60,78],[177,58,115],[173,57,147],[152,52,162],[144,53,196],[150,54,220],[146,54,238],[136,58,250],[126,63,251],[117,67,252],[102,72,252],[93,74,252],[88,77,253],[88,82,253],[87,90,254],[86,92,254]],[[179,83,73],[179,82,82],[174,82,117],[172,81,148],[166,82,180],[158,80,209],[152,78,225],[146,77,242],[136,75,250],[123,73,251],[110,75,253],[102,79,253],[92,82,252],[89,87,254],[88,91,254],[87,96,254],[87,100,254]],[[175,114,80],[174,114,86],[170,113,121],[168,113,147],[164,113,181],[156,110,212],[149,109,226],[146,108,242],[135,107,251],[127,104,253],[112,101,253],[101,101,254],[91,101,254],[87,102,253],[88,104,255],[86,108,254],[85,112,254]],[[165,141,79],[167,143,89],[165,142,122],[162,142,149],[157,142,180],[153,140,209],[148,140,227],[143,139,243],[134,138,252],[123,137,252],[109,135,255],[98,132,255],[90,134,254],[87,134,254],[87,134,255],[86,134,255],[88,141,255]],[[163,160,84],[162,160,91],[160,159,124],[157,158,151],[155,159,179],[150,159,210],[146,157,226],[138,156,243],[130,155,251],[118,155,254],[104,152,255],[96,154,255],[86,153,255],[87,155,255],[84,153,255],[83,153,255],[88,160,255]],[[159,178,87],[159,178,93],[155,179,123],[152,180,150],[149,179,178],[144,180,206],[139,179,224],[137,179,242],[123,178,252],[116,178,254],[101,178,255],[89,176,255],[85,178,255],[85,178,255],[84,179,255],[83,176,255],[86,183,255]],[[149,200,91],[149,199,96],[145,199,123],[144,200,148],[143,200,178],[137,201,206],[132,201,222],[127,200,239],[119,200,252],[111,201,255],[97,202,255],[86,201,255],[84,202,255],[83,203,255],[81,201,255],[81,201,255],[83,208,255]],[[141,215,92],[141,215,100],[139,215,126],[137,215,148],[134,216,177],[130,217,205],[125,216,221],[120,217,237],[112,218,253],[104,219,253],[92,219,255],[83,219,255],[80,219,255],[80,219,255],[80,220,255],[78,220,255],[83,229,255]],[[131,229,96],[133,229,102],[129,229,125],[128,230,149],[125,230,175],[121,231,202],[118,231,218],[115,232,235],[105,233,251],[98,234,254],[85,235,255],[79,235,255],[77,235,255],[77,237,255],[76,236,255],[76,236,255],[80,244,255]],[[126,238,98],[125,238,103],[124,238,129],[121,239,150],[119,240,176],[116,241,203],[114,240,219],[108,242,236],[100,243,251],[93,243,253],[81,244,255],[78,246,255],[78,246,255],[76,246,255],[75,247,255],[77,250,255],[82,252,255]],[[121,246,101],[120,245,107],[118,245,130],[116,246,150],[116,248,178],[108,247,201],[106,247,218],[102,249,234],[93,249,251],[87,251,253],[77,252,255],[75,252,255],[75,252,255],[73,253,255],[72,253,255],[75,253,255],[80,255,255]],[[114,251,103],[114,250,108],[110,250,131],[109,252,149],[109,252,176],[106,253,203],[98,253,216],[95,253,233],[90,253,249],[81,253,253],[72,253,255],[71,253,254],[71,254,255],[70,254,255],[71,254,254],[73,255,254],[78,255,255]],[[110,253,105],[111,253,112],[109,253,134],[107,253,154],[105,254,177],[98,254,202],[96,254,216],[92,254,231],[82,254,248],[75,254,250],[69,253,254],[68,254,254],[69,254,254],[68,254,254],[68,254,254],[71,255,254],[78,255,255]],[[103,253,111],[104,253,115],[99,253,136],[98,253,156],[99,254,179],[94,254,201],[89,254,215],[85,255,231],[75,254,246],[68,254,249],[66,254,253],[65,254,255],[65,254,254],[66,254,254],[65,255,254],[73,254,254],[79,255,254]],[[99,253,112],[98,253,118],[95,254,139],[93,253,155],[93,254,179],[88,254,202],[85,255,216],[83,254,233],[72,255,247],[66,254,250],[65,254,253],[64,254,255],[63,254,253],[65,254,254],[65,254,253],[71,255,254],[71,255,253]]],[[[205,23,61],[198,19,64],[199,23,107],[199,26,142],[194,27,177],[187,31,207],[182,34,225],[177,38,237],[168,44,248],[160,48,250],[148,56,252],[140,61,252],[130,65,252],[127,68,253],[118,73,253],[108,78,254],[108,83,254]],[[207,29,64],[205,30,73],[203,30,112],[200,31,144],[195,34,178],[187,36,207],[184,38,226],[177,43,240],[167,47,248],[159,53,251],[148,58,251],[138,63,252],[132,69,253],[125,72,252],[115,77,253],[107,81,254],[107,85,253]],[[200,51,67],[202,52,76],[202,51,111],[198,51,144],[192,53,178],[186,52,208],[180,51,222],[176,53,241],[169,57,250],[157,61,252],[147,67,252],[138,71,253],[131,75,253],[121,79,253],[117,84,252],[107,88,254],[105,91,254]],[[197,76,70],[198,76,79],[199,76,114],[196,76,143],[192,78,181],[185,76,209],[181,74,225],[174,75,240],[166,73,249],[158,73,250],[145,77,253],[138,80,253],[128,83,253],[122,87,253],[116,89,254],[107,94,253],[105,99,253]],[[196,109,74],[196,108,84],[193,107,116],[191,107,144],[188,107,177],[184,108,210],[178,107,225],[173,105,242],[165,104,251],[156,103,253],[145,101,255],[137,101,254],[128,98,254],[120,98,255],[113,103,254],[105,107,255],[105,111,254]],[[189,137,78],[187,137,87],[187,138,119],[185,137,146],[182,137,176],[176,136,206],[173,137,223],[168,136,241],[160,135,251],[153,134,254],[143,134,255],[133,131,255],[125,131,255],[116,130,255],[109,130,255],[103,130,255],[105,132,255]],[[184,153,81],[184,154,88],[183,154,118],[181,156,145],[177,156,174],[173,156,206],[170,155,224],[166,152,239],[158,152,252],[151,151,255],[140,152,255],[132,151,255],[124,150,255],[115,150,255],[109,151,255],[102,150,255],[106,158,255]],[[177,175,84],[178,174,91],[175,175,120],[173,176,146],[174,175,175],[169,176,205],[167,177,221],[162,176,240],[155,176,251],[145,176,255],[139,175,255],[129,175,255],[121,174,255],[115,175,255],[105,174,255],[101,175,255],[102,181,255]],[[171,194,87],[171,194,93],[170,195,120],[168,196,144],[165,197,175],[162,197,201],[159,198,220],[154,198,236],[147,198,253],[141,199,255],[127,193,255],[118,188,255],[112,196,255],[108,198,255],[101,198,255],[100,200,255],[103,209,255]],[[165,210,89],[165,210,95],[164,212,122],[161,213,146],[159,213,175],[156,214,201],[154,214,219],[149,214,234],[141,215,251],[135,217,254],[128,217,255],[120,218,255],[114,219,255],[104,219,255],[99,219,255],[99,221,255],[103,230,255]],[[155,226,93],[156,227,98],[154,227,124],[153,228,145],[153,229,174],[147,230,201],[146,231,218],[141,232,235],[137,232,250],[134,233,253],[123,233,255],[114,234,255],[106,234,255],[97,234,255],[95,235,255],[96,238,255],[98,243,255]],[[150,235,95],[151,236,102],[148,236,125],[146,237,147],[144,237,173],[142,238,202],[140,240,217],[138,240,233],[132,242,251],[126,242,254],[117,242,255],[111,245,255],[101,245,255],[96,245,255],[95,245,255],[96,249,255],[100,254,255]],[[146,244,99],[145,244,104],[143,244,128],[140,244,148],[140,245,174],[139,245,202],[137,247,216],[132,248,233],[129,249,250],[122,248,253],[113,251,255],[107,251,255],[95,252,255],[95,252,254],[93,253,255],[96,253,255],[96,254,255]],[[140,249,101],[140,248,107],[138,250,130],[138,250,150],[135,252,175],[134,252,202],[133,253,216],[129,253,232],[121,253,249],[117,253,253],[107,254,255],[101,254,255],[94,254,255],[90,253,255],[90,255,254],[91,254,255],[96,255,255]],[[133,254,104],[136,253,110],[134,254,132],[132,254,150],[129,253,174],[128,254,201],[126,254,215],[124,254,230],[115,254,247],[110,254,251],[100,254,255],[95,254,255],[89,254,255],[86,254,254],[87,253,255],[90,255,255],[96,254,255]],[[128,253,106],[128,254,112],[127,254,134],[127,253,154],[122,254,176],[123,254,202],[123,255,214],[115,255,231],[111,254,247],[106,254,250],[97,254,254],[91,254,254],[85,254,255],[85,253,254],[85,253,254],[91,254,254],[96,255,254]],[[123,254,109],[125,253,117],[123,253,135],[123,254,154],[119,254,176],[120,254,201],[115,254,214],[114,254,229],[107,254,247],[101,255,250],[92,255,254],[87,254,255],[83,254,253],[82,254,254],[85,254,253],[88,254,254],[93,255,254]]],[[[217,23,62],[220,24,72],[218,23,104],[218,24,136],[215,24,173],[212,27,204],[208,30,220],[204,34,240],[196,40,248],[190,46,249],[181,53,252],[174,57,253],[167,62,252],[162,66,253],[155,71,253],[151,77,254],[142,81,253]],[[218,28,62],[221,28,70],[220,29,104],[218,29,138],[215,30,174],[213,33,205],[210,35,221],[203,38,239],[195,44,247],[190,50,249],[180,57,252],[175,62,253],[169,65,253],[162,71,253],[156,75,254],[148,81,255],[143,85,254]],[[217,45,64],[217,44,71],[219,44,106],[216,45,138],[215,45,174],[211,47,205],[209,47,222],[203,48,239],[195,55,248],[188,59,251],[179,65,252],[173,68,253],[168,72,253],[163,78,254],[153,82,254],[149,88,255],[144,93,255]],[[218,67,66],[217,67,74],[219,67,108],[217,68,139],[214,67,173],[209,68,206],[206,69,223],[200,68,238],[193,68,249],[187,68,251],[180,74,253],[173,77,254],[167,81,254],[161,85,254],[156,89,255],[148,93,255],[141,98,255]],[[215,100,70],[215,100,78],[215,100,111],[214,100,138],[210,99,172],[207,101,206],[205,99,223],[200,100,240],[193,99,250],[186,99,252],[178,98,254],[170,96,254],[165,95,255],[159,98,255],[155,102,255],[144,106,255],[140,111,255]],[[211,129,73],[210,130,82],[209,130,114],[207,130,140],[206,131,170],[203,132,203],[198,133,222],[197,131,239],[189,131,252],[184,131,253],[177,129,255],[171,128,255],[166,130,255],[158,128,255],[152,128,255],[142,127,255],[141,135,255]],[[206,148,78],[206,148,83],[205,148,115],[203,149,141],[201,149,171],[200,151,203],[196,150,221],[193,150,238],[188,151,252],[180,149,254],[174,150,255],[169,150,255],[163,149,255],[158,147,255],[153,148,255],[144,147,255],[145,157,255]],[[199,168,80],[199,170,88],[199,170,116],[200,171,141],[197,172,172],[192,172,200],[190,173,220],[186,172,235],[184,171,251],[180,173,253],[174,171,255],[165,171,255],[161,170,255],[154,172,255],[148,173,255],[139,172,255],[139,177,255]],[[191,191,84],[191,191,90],[191,191,117],[190,193,142],[189,192,171],[189,193,199],[187,193,216],[183,194,235],[181,194,252],[174,194,255],[168,195,255],[162,196,255],[158,195,255],[152,194,255],[144,196,255],[138,198,255],[137,204,255]],[[187,207,85],[188,206,93],[187,207,117],[187,207,142],[186,208,170],[183,210,199],[182,209,215],[177,209,231],[173,212,251],[167,209,254],[161,212,255],[158,213,255],[156,214,255],[150,216,255],[142,216,255],[135,218,255],[136,225,255]],[[181,222,90],[181,222,94],[179,223,120],[178,224,142],[176,225,170],[175,226,199],[173,227,215],[171,228,230],[168,228,249],[166,230,254],[160,230,255],[154,231,255],[149,232,255],[142,232,255],[137,234,255],[130,237,255],[131,243,255]],[[176,232,93],[176,233,97],[176,234,123],[175,234,142],[173,235,171],[172,236,199],[170,236,213],[168,237,230],[164,237,249],[161,240,254],[155,241,255],[150,242,255],[146,244,255],[139,243,255],[134,246,255],[129,248,255],[138,254,255]],[[170,239,96],[171,240,101],[170,241,124],[170,242,145],[170,243,172],[168,244,199],[166,243,215],[163,245,231],[159,246,248],[156,248,253],[151,250,255],[148,250,255],[142,251,255],[135,251,255],[130,252,255],[123,254,255],[134,255,255]],[[167,247,98],[167,248,103],[165,248,126],[164,248,146],[163,249,171],[163,249,200],[163,250,215],[161,251,230],[155,252,247],[152,253,252],[146,253,255],[143,254,255],[138,253,255],[130,255,255],[123,254,255],[124,255,255],[132,255,255]],[[163,252,100],[165,252,106],[163,252,128],[164,252,149],[161,253,172],[159,253,200],[159,253,215],[147,251,223],[144,252,242],[142,254,252],[139,254,255],[135,255,255],[130,255,255],[125,254,254],[123,254,255],[126,255,255],[134,255,255]],[[158,253,105],[158,253,109],[156,253,130],[155,253,148],[154,253,172],[153,253,198],[151,254,213],[150,254,228],[147,254,246],[144,253,251],[140,254,255],[132,255,255],[124,254,255],[121,255,255],[119,255,255],[125,255,255],[134,255,255]],[[152,253,107],[153,253,112],[153,253,132],[153,253,149],[150,254,174],[148,254,198],[148,254,215],[148,254,229],[141,254,246],[140,254,251],[135,255,255],[131,255,255],[125,255,254],[117,255,254],[119,255,253],[130,255,255],[139,255,254]]],[[[228,24,57],[226,23,65],[231,24,98],[230,24,130],[229,24,167],[227,25,201],[225,28,220],[222,31,237],[217,37,247],[213,42,249],[205,50,251],[201,55,253],[195,60,253],[191,65,252],[185,70,254],[182,76,254],[177,82,255]],[[229,28,58],[228,28,67],[230,29,98],[230,29,129],[231,30,168],[227,30,200],[224,32,217],[222,35,236],[216,40,249],[211,47,250],[205,54,251],[202,60,253],[198,63,253],[193,67,253],[185,72,254],[181,78,254],[176,83,255]],[[232,40,60],[232,40,69],[232,41,102],[231,40,132],[230,40,169],[227,42,202],[225,43,220],[223,46,238],[220,51,248],[213,56,251],[205,61,252],[200,66,252],[195,70,253],[191,76,254],[187,81,254],[181,87,254],[177,91,254]],[[231,60,62],[231,60,70],[229,61,103],[228,60,131],[228,61,167],[225,61,200],[222,62,218],[221,61,237],[218,63,250],[212,67,252],[205,71,253],[201,75,253],[195,80,254],[191,84,254],[186,88,254],[183,94,255],[178,99,255]],[[227,91,66],[228,92,74],[227,92,105],[227,93,133],[227,93,168],[225,94,203],[222,94,218],[220,95,238],[215,96,251],[210,95,252],[204,94,254],[201,94,254],[192,95,254],[189,97,254],[186,102,254],[179,105,254],[178,111,255]],[[224,123,69],[224,122,78],[224,123,109],[224,125,135],[222,125,166],[221,125,199],[219,128,220],[216,128,237],[211,128,251],[206,128,253],[202,127,255],[197,126,255],[192,126,255],[188,128,255],[185,126,255],[179,127,255],[175,129,255]],[[220,141,73],[221,142,81],[222,142,110],[222,143,137],[220,144,168],[218,145,201],[215,144,217],[213,145,235],[209,146,253],[205,146,253],[199,146,255],[195,146,255],[191,146,255],[188,146,255],[183,145,255],[179,146,255],[180,153,255]],[[216,163,77],[216,163,82],[214,163,111],[214,165,136],[214,165,167],[213,167,196],[211,168,215],[209,169,233],[205,169,251],[201,169,254],[197,170,255],[193,169,255],[190,169,255],[186,170,255],[182,170,255],[177,171,255],[174,177,255]],[[210,185,81],[209,186,86],[210,186,113],[209,187,138],[207,188,166],[207,190,195],[205,191,213],[204,190,232],[200,191,251],[198,191,255],[194,192,255],[192,192,255],[189,193,255],[183,193,255],[182,194,255],[174,198,255],[175,204,255]],[[205,202,83],[205,203,89],[203,202,114],[203,203,138],[202,205,166],[204,206,199],[203,207,211],[201,208,230],[198,209,251],[196,209,254],[190,211,255],[187,210,255],[184,210,255],[181,213,255],[177,213,255],[169,214,255],[173,225,255]],[[198,219,86],[200,220,92],[199,219,116],[199,221,137],[198,222,167],[196,222,196],[196,223,212],[195,224,228],[193,225,249],[189,227,253],[186,227,255],[184,229,255],[180,229,255],[176,230,255],[171,231,255],[170,235,255],[170,245,255]],[[196,229,87],[196,228,94],[194,229,118],[195,230,139],[193,231,168],[193,232,195],[192,232,213],[192,233,227],[188,235,247],[187,236,254],[184,238,255],[179,239,255],[178,239,255],[173,242,255],[170,243,255],[166,247,255],[169,254,255]],[[192,237,91],[192,237,98],[193,239,121],[192,239,141],[191,240,168],[190,241,196],[189,242,212],[189,243,230],[186,243,247],[184,245,253],[181,247,255],[176,247,255],[170,247,255],[169,250,255],[167,251,255],[164,253,255],[168,255,255]],[[188,245,95],[190,244,100],[190,246,123],[186,245,142],[189,246,167],[188,247,195],[188,248,213],[187,250,228],[183,250,246],[180,252,253],[177,254,255],[172,253,255],[171,253,255],[165,254,255],[161,254,255],[162,255,255],[167,255,255]],[[189,251,98],[187,250,104],[185,249,124],[185,251,144],[186,252,169],[183,253,195],[183,253,213],[182,253,228],[180,254,247],[178,254,252],[171,254,255],[168,254,255],[167,254,255],[162,255,255],[159,255,255],[163,255,255],[166,255,255]],[[181,253,103],[182,253,106],[181,253,128],[179,253,146],[180,253,170],[177,254,195],[177,254,211],[178,254,228],[174,254,243],[173,254,251],[170,254,255],[165,255,255],[161,254,255],[158,255,255],[157,254,255],[163,255,255],[166,255,255]],[[178,253,105],[177,254,111],[177,253,129],[177,253,148],[175,254,173],[175,254,196],[174,254,211],[173,254,228],[174,254,246],[168,254,250],[165,254,255],[162,255,255],[160,255,255],[155,255,255],[155,255,255],[159,255,255],[168,255,255]]],[[[233,22,52],[235,22,59],[239,23,91],[239,24,120],[240,23,158],[239,24,192],[240,24,213],[239,27,231],[234,33,248],[231,37,249],[228,46,252],[225,51,251],[222,56,251],[219,61,252],[216,66,254],[211,74,253],[207,78,255]],[[237,27,53],[236,27,60],[241,27,92],[242,27,119],[242,28,157],[241,28,194],[240,29,214],[239,31,231],[236,37,249],[233,42,250],[228,49,251],[225,55,252],[221,60,252],[221,65,254],[217,69,252],[212,75,254],[200,75,254]],[[236,36,53],[239,37,62],[243,38,96],[243,38,122],[243,38,160],[240,38,194],[241,38,213],[239,41,233],[235,46,249],[231,51,249],[228,59,252],[227,63,252],[222,68,253],[218,72,252],[216,77,253],[212,83,254],[209,89,255]],[[239,51,58],[239,52,65],[242,52,96],[242,51,123],[240,52,159],[241,52,196],[240,53,215],[239,54,233],[235,57,248],[232,62,251],[226,67,253],[224,71,253],[220,75,253],[218,81,254],[215,84,253],[211,91,254],[209,95,255]],[[239,79,61],[240,81,69],[240,82,99],[241,82,126],[241,82,160],[240,84,194],[239,83,214],[236,86,233],[233,87,250],[229,87,252],[225,87,253],[223,88,254],[221,89,254],[218,94,255],[215,98,254],[210,103,254],[208,108,255]],[[238,114,64],[237,113,74],[237,114,103],[238,115,128],[239,117,159],[237,117,194],[235,117,213],[233,119,231],[233,121,250],[228,119,252],[224,120,254],[221,121,255],[220,121,255],[216,121,255],[214,122,255],[207,123,255],[210,130,255]],[[235,132,68],[235,131,75],[235,132,103],[235,134,129],[235,135,160],[235,137,193],[233,138,212],[232,138,231],[228,138,250],[226,140,254],[226,140,255],[222,141,255],[217,141,255],[215,140,255],[212,142,255],[208,142,255],[211,151,255]],[[231,154,71],[230,154,77],[231,156,105],[232,158,129],[230,158,161],[229,160,191],[231,161,212],[228,162,231],[226,164,249],[223,164,253],[221,165,255],[219,166,255],[217,166,255],[214,166,255],[211,166,255],[207,167,255],[210,175,255]],[[226,179,75],[226,179,82],[227,180,107],[226,180,131],[226,181,162],[226,183,192],[226,185,209],[224,185,229],[221,186,248],[220,188,254],[217,189,255],[215,190,255],[212,191,255],[209,191,255],[207,192,255],[206,192,255],[208,204,255]],[[222,197,78],[222,197,84],[222,198,109],[221,198,131],[222,200,161],[220,200,192],[220,202,208],[219,204,226],[216,205,246],[214,205,254],[215,207,255],[214,207,255],[212,208,255],[209,209,255],[207,210,255],[203,214,255],[205,221,255]],[[215,216,83],[216,215,89],[217,217,112],[217,217,133],[217,219,163],[216,220,193],[218,219,210],[217,221,224],[216,223,247],[212,224,254],[212,224,255],[210,225,255],[209,227,255],[206,229,255],[204,229,255],[196,227,255],[202,239,255]],[[213,226,85],[212,226,90],[213,227,113],[215,228,136],[215,228,162],[215,228,192],[216,230,210],[217,231,226],[215,233,247],[212,235,254],[209,236,255],[209,237,255],[206,237,255],[204,238,255],[201,240,255],[200,244,255],[202,250,255]],[[210,234,86],[210,233,92],[211,234,116],[213,235,138],[214,237,164],[212,238,192],[213,238,209],[213,239,227],[211,242,245],[209,244,253],[209,245,255],[206,246,255],[204,247,255],[203,248,255],[199,249,255],[200,253,255],[201,255,255]],[[208,241,90],[208,241,94],[209,242,117],[208,243,139],[208,244,165],[211,245,193],[208,245,209],[209,246,228],[209,248,244],[206,249,252],[203,251,255],[203,251,255],[200,252,255],[200,253,255],[196,254,255],[196,255,255],[201,255,255]],[[206,247,92],[205,247,98],[205,248,120],[208,249,141],[208,251,168],[206,251,193],[205,252,211],[207,252,227],[204,253,244],[203,253,253],[199,253,255],[197,254,255],[196,254,255],[195,254,255],[193,254,255],[194,255,255],[198,255,255]],[[204,253,98],[204,253,102],[204,253,126],[205,253,144],[203,253,167],[202,253,193],[201,253,208],[202,254,226],[201,254,243],[198,254,251],[198,254,255],[196,254,255],[194,254,255],[191,255,255],[191,255,255],[195,255,255],[196,255,255]],[[201,252,100],[201,253,106],[202,253,126],[201,253,145],[199,253,167],[199,254,195],[199,254,210],[201,253,228],[199,254,244],[196,254,249],[195,254,255],[194,255,255],[191,254,255],[190,255,255],[191,255,255],[195,255,255],[200,255,255]]],[[[237,22,48],[238,21,53],[244,22,87],[245,23,113],[245,23,149],[244,23,188],[245,24,206],[241,24,224],[243,30,246],[242,35,250],[239,42,250],[237,49,251],[236,53,251],[233,59,252],[231,64,253],[228,71,253],[226,78,254]],[[240,26,49],[241,26,55],[244,27,87],[245,27,114],[245,26,147],[244,27,186],[245,28,207],[245,29,227],[244,33,248],[242,39,250],[240,47,250],[237,52,251],[235,56,251],[232,61,252],[231,66,253],[225,73,253],[225,79,254]],[[244,35,55],[244,35,60],[246,36,91],[246,36,115],[245,37,151],[247,37,189],[247,37,209],[244,38,229],[244,42,249],[241,48,250],[239,55,250],[237,60,251],[234,64,252],[233,69,254],[230,75,253],[227,80,253],[225,85,255]],[[244,47,56],[244,47,64],[247,47,92],[246,48,118],[247,48,153],[248,48,190],[248,49,211],[246,51,230],[246,54,249],[242,58,249],[240,64,253],[238,68,253],[234,73,253],[231,78,252],[230,83,254],[228,88,255],[224,93,254]],[[246,74,55],[243,73,65],[244,74,94],[245,76,120],[245,76,153],[246,77,190],[245,78,210],[245,80,229],[244,81,249],[241,82,251],[238,81,252],[236,84,253],[234,87,253],[232,91,253],[228,95,253],[224,100,255],[225,107,254]],[[245,108,62],[246,107,70],[245,107,97],[245,107,123],[246,110,155],[246,110,190],[245,112,208],[244,113,228],[242,113,248],[239,115,252],[237,115,254],[235,116,254],[234,117,255],[231,117,255],[228,118,255],[225,118,255],[229,130,255]],[[244,126,64],[242,126,72],[243,126,99],[243,129,124],[242,128,156],[242,130,187],[243,130,208],[242,133,227],[236,130,246],[235,132,253],[233,134,255],[233,136,255],[231,135,255],[230,135,255],[227,138,255],[226,140,255],[227,148,255]],[[240,150,68],[240,149,76],[240,149,103],[240,152,125],[240,153,156],[239,154,188],[239,156,207],[239,157,227],[238,159,248],[236,160,254],[234,161,255],[231,159,255],[230,162,255],[228,164,255],[227,164,255],[222,165,255],[226,173,255]],[[235,173,73],[236,175,77],[235,175,104],[235,176,126],[235,176,157],[236,178,188],[236,179,206],[234,181,226],[234,183,246],[232,184,254],[232,186,255],[228,187,255],[228,188,255],[225,189,255],[223,189,255],[222,191,255],[224,202,255]],[[231,192,75],[231,192,81],[232,193,105],[231,193,127],[232,195,157],[230,195,188],[231,197,204],[230,199,224],[230,200,245],[228,203,253],[227,204,255],[225,205,255],[224,207,255],[223,207,255],[223,208,255],[220,210,255],[224,221,255]],[[226,211,79],[226,211,85],[227,212,108],[227,213,129],[228,215,160],[227,217,189],[228,218,209],[226,220,223],[225,220,244],[226,220,254],[224,222,255],[225,223,255],[224,226,255],[223,224,255],[220,226,255],[221,231,255],[222,238,255]],[[223,221,82],[223,222,87],[223,223,111],[223,223,130],[223,225,158],[223,227,188],[225,227,208],[226,227,226],[226,230,243],[224,231,252],[225,233,255],[223,234,255],[221,235,255],[220,237,255],[220,238,255],[219,243,255],[221,249,255]],[[219,230,83],[222,232,90],[221,231,112],[221,232,133],[222,234,161],[223,235,189],[223,236,207],[223,236,227],[225,239,243],[222,241,252],[222,243,255],[222,243,255],[222,245,255],[220,246,255],[218,247,255],[218,251,255],[218,254,255]],[[221,240,87],[220,239,92],[219,240,114],[221,241,136],[222,242,161],[221,242,190],[221,244,208],[224,245,226],[222,247,243],[223,248,253],[219,250,255],[218,251,255],[219,252,255],[216,252,255],[214,252,255],[216,255,255],[219,255,255]],[[219,246,90],[219,246,95],[220,246,119],[221,247,138],[221,248,164],[220,249,190],[221,250,208],[220,251,225],[219,252,242],[219,252,253],[217,253,255],[217,253,255],[214,253,255],[213,254,255],[212,254,255],[213,255,255],[217,255,255]],[[217,253,96],[218,252,99],[216,252,122],[218,252,140],[218,252,166],[217,253,192],[216,253,206],[216,253,225],[216,254,242],[214,253,250],[213,253,255],[213,255,255],[212,254,255],[209,254,255],[210,255,255],[213,255,255],[208,255,255]],[[213,252,97],[214,253,102],[214,253,123],[215,253,142],[215,253,167],[213,253,191],[214,254,208],[212,254,224],[215,254,242],[213,254,249],[212,254,254],[212,254,255],[209,254,255],[208,255,255],[210,255,255],[214,255,255],[216,255,255]]],[[[241,21,45],[241,20,51],[244,21,84],[247,22,108],[246,22,143],[246,23,177],[247,23,200],[246,22,221],[244,26,243],[246,32,249],[246,39,249],[247,44,251],[245,50,250],[243,54,252],[241,61,252],[240,67,253],[238,73,254]],[[243,26,47],[244,25,52],[246,26,83],[247,26,108],[247,26,143],[246,26,180],[247,27,200],[248,27,223],[246,30,244],[246,36,249],[245,42,250],[245,48,251],[245,53,251],[244,59,251],[242,64,251],[239,71,254],[239,77,252]],[[246,34,48],[246,34,55],[247,34,87],[248,35,111],[248,35,146],[249,35,181],[248,35,202],[248,36,224],[248,40,246],[248,44,249],[247,52,251],[247,58,251],[246,62,252],[244,67,252],[242,72,254],[240,78,253],[240,84,254]],[[248,45,52],[248,45,57],[249,45,90],[249,46,112],[249,46,147],[249,46,184],[248,47,204],[249,47,225],[249,50,244],[247,54,250],[246,61,251],[245,65,251],[246,70,252],[245,75,252],[242,81,253],[238,86,255],[238,91,255]],[[246,68,52],[247,68,60],[247,68,91],[248,69,116],[247,69,145],[248,71,183],[248,71,204],[248,71,224],[247,74,245],[247,76,250],[247,78,252],[246,80,253],[246,85,253],[244,89,254],[243,93,254],[239,97,255],[239,104,255]],[[249,99,59],[248,100,65],[249,100,94],[248,101,118],[249,103,149],[250,105,185],[249,107,204],[248,106,223],[248,109,247],[247,111,251],[246,111,254],[246,111,255],[244,112,255],[242,113,255],[240,114,255],[238,115,254],[241,125,255]],[[248,119,61],[248,119,70],[248,121,96],[248,122,119],[249,123,149],[249,125,184],[248,125,203],[248,127,224],[247,129,246],[247,130,252],[245,131,255],[244,131,254],[241,132,255],[240,133,255],[239,134,255],[238,136,255],[239,144,255]],[[246,144,63],[245,144,72],[247,146,98],[246,146,123],[247,148,153],[247,150,183],[247,150,203],[247,152,225],[246,154,246],[245,155,252],[242,156,255],[243,157,255],[241,158,255],[240,158,255],[239,158,255],[236,160,255],[238,170,255]],[[242,168,69],[242,169,74],[243,170,101],[245,171,123],[244,173,153],[244,174,186],[243,175,202],[243,177,221],[243,179,244],[242,182,254],[241,183,255],[240,184,255],[239,184,255],[238,187,255],[237,188,255],[234,190,255],[239,202,255]],[[240,188,72],[239,189,80],[240,190,103],[240,189,124],[240,191,154],[240,193,186],[240,194,203],[241,196,221],[241,199,243],[239,201,253],[238,202,255],[237,203,255],[236,205,255],[236,207,255],[234,207,255],[234,210,255],[237,220,255]],[[235,209,76],[235,208,83],[236,208,105],[236,210,126],[236,211,155],[236,213,186],[236,214,204],[236,215,221],[235,218,242],[235,219,252],[233,222,255],[233,222,255],[233,223,255],[231,225,255],[231,226,255],[233,231,255],[234,238,255]],[[232,219,81],[233,220,84],[233,220,108],[233,221,129],[233,223,157],[235,225,186],[234,225,204],[232,227,222],[233,229,242],[233,229,252],[234,231,255],[232,233,255],[232,234,255],[232,236,255],[232,236,255],[232,241,255],[234,249,255]],[[230,228,83],[230,229,88],[230,229,110],[230,230,131],[229,231,157],[231,232,187],[230,234,204],[232,234,226],[234,236,238],[232,239,253],[232,240,255],[231,241,255],[231,243,255],[230,244,255],[230,245,255],[232,250,255],[231,253,255]],[[228,238,84],[229,238,90],[228,238,113],[228,239,133],[230,240,158],[231,240,187],[231,242,205],[231,242,223],[233,245,241],[231,247,252],[231,249,255],[231,249,255],[229,250,255],[229,252,255],[227,252,255],[227,254,255],[229,255,255]],[[226,244,87],[225,244,91],[227,245,115],[227,245,134],[229,247,161],[229,248,187],[230,248,205],[229,249,224],[229,251,243],[229,252,251],[229,253,255],[229,253,255],[227,254,255],[226,254,255],[226,254,255],[225,254,255],[229,255,255]],[[225,251,92],[225,252,98],[225,252,119],[225,253,137],[226,252,162],[226,253,189],[228,253,204],[226,253,223],[226,253,241],[225,253,249],[224,254,254],[224,254,255],[219,254,255],[221,254,255],[223,255,255],[224,255,255],[229,255,255]],[[224,253,96],[224,252,101],[225,253,121],[225,253,141],[225,253,165],[224,254,189],[225,253,205],[225,253,224],[226,254,244],[225,254,249],[223,254,254],[225,254,255],[224,254,255],[221,254,255],[223,255,255],[226,255,255],[228,255,255]]],[[[243,20,45],[243,21,49],[246,20,78],[247,20,103],[247,22,136],[248,22,172],[248,21,193],[248,21,216],[247,23,238],[247,29,246],[247,36,249],[249,41,251],[248,47,250],[249,53,251],[248,58,252],[247,65,252],[248,71,252]],[[244,24,44],[244,25,48],[246,25,78],[248,25,104],[249,25,138],[248,27,173],[248,26,193],[249,26,218],[248,28,239],[247,32,248],[248,39,249],[248,45,251],[249,51,251],[249,55,251],[248,61,253],[247,68,252],[249,76,254]],[[247,33,47],[247,33,52],[249,33,81],[249,34,107],[249,35,140],[249,35,174],[248,35,197],[248,35,220],[248,37,240],[248,41,249],[247,49,249],[249,53,253],[249,60,251],[249,64,252],[249,70,252],[248,75,253],[248,81,253]],[[248,43,51],[249,43,55],[250,43,83],[250,44,109],[248,44,140],[250,44,177],[249,46,198],[248,45,221],[248,48,241],[247,50,249],[248,58,251],[249,63,251],[249,68,251],[248,72,252],[248,76,253],[246,83,253],[249,90,254]],[[249,62,52],[248,62,57],[249,62,86],[248,63,112],[247,64,142],[249,64,180],[249,65,197],[249,66,220],[249,70,243],[248,72,249],[248,74,251],[250,78,253],[250,81,253],[249,85,252],[248,90,253],[247,95,254],[249,102,255]],[[249,94,55],[248,94,61],[249,95,89],[249,96,112],[249,96,144],[249,98,178],[250,99,199],[249,100,221],[250,105,243],[250,104,251],[250,107,254],[249,107,254],[249,108,254],[248,109,253],[248,110,254],[249,113,255],[251,124,255]],[[250,113,58],[249,113,64],[249,115,92],[249,116,114],[249,117,144],[250,118,178],[250,119,199],[250,122,221],[250,125,242],[251,125,251],[250,128,255],[249,130,254],[250,129,255],[250,130,255],[248,131,255],[246,131,255],[250,142,255]],[[250,138,60],[250,138,67],[250,138,94],[250,139,117],[251,140,147],[250,144,178],[250,144,199],[251,145,220],[250,149,242],[251,151,252],[250,152,255],[250,153,255],[248,154,255],[247,157,255],[248,158,255],[247,158,255],[249,170,255]],[[248,163,64],[248,164,72],[249,165,97],[249,167,119],[249,167,148],[249,168,180],[248,170,199],[250,172,220],[249,175,241],[248,176,252],[249,180,255],[247,180,255],[247,181,255],[246,182,255],[245,184,255],[244,186,255],[248,196,255]],[[245,184,70],[246,184,75],[246,185,100],[247,186,120],[247,188,150],[248,190,182],[248,191,201],[247,193,218],[246,194,240],[246,195,252],[245,198,255],[246,200,255],[246,201,255],[245,203,255],[244,205,255],[244,208,255],[245,215,255]],[[241,203,74],[242,204,79],[243,205,102],[243,206,122],[244,208,151],[244,209,183],[244,211,201],[243,213,220],[245,216,241],[243,217,252],[243,220,255],[242,220,255],[242,221,255],[241,223,255],[241,224,255],[241,228,255],[245,237,255]],[[240,216,75],[239,216,81],[240,217,104],[241,219,125],[240,219,152],[242,221,183],[241,222,200],[241,223,220],[240,226,239],[240,227,252],[240,230,255],[240,230,255],[240,232,255],[240,233,255],[239,235,255],[241,239,255],[244,247,255]],[[238,226,80],[239,226,86],[238,227,107],[238,228,127],[240,229,156],[239,230,183],[238,231,200],[238,233,222],[237,236,237],[239,237,252],[240,239,255],[241,240,255],[239,242,255],[240,242,255],[240,244,255],[240,249,255],[242,253,255]],[[236,236,82],[236,234,87],[236,236,111],[236,237,130],[235,238,155],[235,239,183],[236,240,201],[239,241,223],[240,242,241],[240,245,251],[240,247,255],[238,248,255],[238,249,255],[234,248,255],[234,249,255],[238,252,255],[239,254,255]],[[234,242,85],[234,241,90],[233,243,113],[235,245,132],[235,245,157],[236,245,186],[238,247,203],[238,247,224],[240,248,243],[238,251,251],[239,253,255],[238,253,255],[237,253,255],[237,253,255],[238,253,255],[237,254,255],[237,255,255]],[[231,250,90],[233,250,95],[232,251,117],[233,251,135],[235,252,161],[235,253,187],[234,253,204],[235,253,221],[235,253,242],[236,253,249],[236,253,253],[236,253,255],[236,254,255],[235,254,255],[236,255,255],[237,255,255],[237,255,255]],[[230,254,92],[230,253,99],[232,253,120],[233,253,139],[233,253,162],[234,253,189],[234,253,204],[234,253,222],[235,253,242],[235,253,249],[233,253,253],[233,253,255],[235,254,255],[234,255,255],[234,254,255],[237,255,255],[239,255,255]]],[[[244,19,43],[244,20,49],[246,20,74],[247,20,99],[248,21,131],[248,22,165],[248,22,186],[248,21,210],[248,21,234],[248,26,246],[248,33,249],[248,37,250],[249,43,251],[249,50,250],[249,54,251],[250,61,252],[251,67,252]],[[245,24,43],[245,24,47],[246,24,74],[247,24,99],[248,25,132],[247,24,167],[248,25,188],[248,24,212],[249,25,235],[248,29,247],[249,36,249],[248,42,251],[249,48,251],[249,54,250],[250,57,251],[248,65,251],[250,70,253]],[[247,32,45],[248,32,50],[248,32,76],[248,33,102],[248,33,133],[248,33,168],[249,34,190],[250,34,212],[250,34,238],[250,38,248],[249,45,249],[249,51,251],[249,55,251],[249,61,251],[249,65,251],[250,72,252],[250,78,252]],[[248,40,47],[248,41,53],[250,42,78],[250,42,105],[249,43,133],[250,43,170],[249,43,193],[249,44,215],[249,45,239],[249,49,248],[248,54,251],[250,61,251],[249,65,251],[251,69,252],[250,73,251],[249,79,253],[251,87,252]],[[248,58,49],[249,57,55],[249,58,82],[249,59,108],[248,60,136],[249,60,172],[249,60,194],[250,60,217],[249,63,237],[248,65,248],[249,69,251],[249,74,253],[250,79,252],[249,82,252],[250,86,252],[249,92,253],[251,98,254]],[[249,87,53],[249,87,59],[249,88,86],[249,88,110],[250,92,140],[249,92,173],[250,93,194],[250,94,216],[249,97,239],[249,99,249],[249,101,253],[249,102,253],[250,103,254],[250,105,254],[250,105,253],[250,109,254],[253,118,255]],[[250,108,57],[249,108,61],[249,110,88],[249,109,111],[249,113,140],[250,114,173],[250,114,195],[250,114,215],[250,116,239],[251,120,251],[250,124,254],[250,123,254],[249,124,253],[251,127,255],[251,127,255],[251,129,255],[255,141,255]],[[250,131,58],[251,132,65],[250,134,91],[249,134,113],[250,137,143],[251,138,176],[250,141,193],[251,141,216],[251,144,240],[251,144,251],[250,149,255],[251,150,255],[250,151,255],[251,152,254],[252,151,255],[250,154,255],[253,166,255]],[[251,158,62],[251,158,67],[249,159,94],[250,161,115],[250,164,144],[250,166,176],[252,168,194],[251,169,216],[250,170,238],[251,171,251],[250,174,255],[251,175,255],[250,177,255],[252,180,255],[250,181,255],[251,183,255],[251,196,255]],[[249,179,67],[249,180,71],[250,180,97],[250,182,116],[249,183,148],[252,185,178],[251,185,196],[250,188,216],[250,189,237],[249,192,251],[250,194,255],[251,196,255],[250,198,255],[250,200,255],[250,202,255],[250,204,255],[251,214,255]],[[247,200,70],[248,201,76],[248,203,98],[249,203,118],[249,204,148],[249,206,180],[249,207,196],[250,209,216],[250,211,239],[249,214,251],[250,217,255],[249,217,255],[248,220,255],[249,221,255],[249,222,255],[249,226,255],[251,233,255]],[[246,213,73],[246,214,79],[243,211,98],[244,213,120],[245,216,148],[247,218,179],[248,219,197],[248,222,217],[248,224,237],[248,225,251],[248,228,255],[248,230,255],[247,231,255],[247,232,255],[247,234,255],[249,238,255],[249,243,255]],[[243,223,75],[244,224,82],[245,225,104],[246,226,124],[245,227,151],[244,227,178],[245,230,198],[246,230,217],[244,234,236],[246,235,251],[246,237,254],[247,239,255],[247,241,255],[247,242,255],[246,243,255],[248,248,255],[250,252,255]],[[243,231,79],[242,231,85],[243,233,106],[244,234,126],[243,236,152],[244,237,182],[245,238,200],[245,241,221],[243,243,242],[245,244,249],[247,247,255],[247,247,255],[248,248,255],[246,249,255],[247,251,255],[249,252,255],[248,254,255]],[[242,240,84],[242,241,90],[242,241,109],[242,243,130],[242,244,154],[242,244,182],[244,245,199],[242,247,221],[246,247,243],[246,250,249],[245,252,255],[248,253,255],[246,253,255],[244,253,255],[247,253,255],[246,254,255],[249,254,255]],[[240,249,88],[240,248,93],[240,250,113],[239,250,133],[240,251,159],[241,251,184],[242,253,200],[243,252,220],[244,253,242],[245,253,250],[244,253,255],[244,253,255],[244,254,255],[244,254,255],[245,254,255],[244,254,255],[246,255,255]],[[239,254,93],[237,253,96],[238,254,116],[238,254,133],[239,254,160],[241,253,187],[242,253,203],[243,253,221],[243,253,241],[244,253,249],[244,253,253],[243,254,255],[243,254,255],[242,254,255],[242,254,255],[243,255,255],[244,255,255]]],[[[244,18,42],[246,19,47],[247,20,71],[246,20,92],[247,20,124],[248,20,157],[247,20,178],[248,20,202],[249,20,226],[247,21,244],[250,28,249],[248,33,250],[250,39,250],[249,43,251],[249,50,251],[249,58,252],[249,62,252]],[[245,22,42],[245,23,47],[246,23,69],[247,24,93],[249,24,123],[247,24,158],[248,24,181],[248,24,203],[250,24,229],[249,26,243],[248,32,249],[248,38,249],[249,43,250],[250,49,250],[249,53,251],[250,61,251],[250,67,252]],[[246,30,44],[248,30,50],[248,30,70],[247,31,95],[250,31,126],[249,32,160],[249,32,183],[249,33,206],[250,33,231],[250,35,246],[249,40,249],[250,46,250],[250,51,250],[250,56,251],[250,60,251],[249,67,252],[252,76,254]],[[247,39,46],[249,39,51],[249,39,72],[249,39,97],[251,40,127],[249,41,162],[250,42,185],[250,42,208],[250,43,232],[250,45,246],[249,49,249],[250,54,251],[250,59,250],[249,64,251],[251,70,252],[250,75,252],[252,83,254]],[[249,53,48],[249,53,53],[249,53,78],[249,55,101],[250,55,130],[249,56,165],[250,57,187],[249,57,211],[250,59,235],[250,62,247],[250,64,250],[250,70,251],[249,74,251],[250,79,252],[250,82,252],[250,87,253],[251,94,253]],[[249,80,51],[249,79,56],[249,80,79],[249,81,103],[249,83,133],[249,86,166],[250,85,188],[250,87,208],[250,88,233],[250,92,247],[250,96,252],[250,94,252],[250,98,253],[249,96,253],[251,99,253],[250,104,253],[252,111,253]],[[250,99,51],[251,99,58],[249,102,81],[249,102,105],[250,103,135],[250,106,166],[251,108,189],[251,109,212],[251,108,234],[250,112,248],[250,114,252],[250,118,254],[250,120,253],[251,120,254],[250,120,254],[250,122,255],[255,132,255]],[[251,124,54],[251,125,61],[250,125,86],[250,128,108],[250,129,135],[251,131,170],[251,132,188],[251,135,210],[250,138,237],[251,139,249],[251,139,253],[251,140,255],[250,144,255],[252,146,254],[252,148,255],[252,150,255],[254,159,255]],[[250,152,58],[250,151,65],[250,152,89],[250,156,110],[250,158,139],[251,159,172],[251,160,190],[251,163,211],[252,165,234],[250,166,250],[251,170,254],[251,171,255],[251,172,255],[250,174,255],[251,175,254],[251,178,255],[255,192,255]],[[251,172,61],[251,173,66],[251,174,90],[251,174,112],[250,177,141],[252,180,171],[251,181,190],[251,183,210],[250,185,235],[251,188,249],[250,189,254],[251,191,255],[251,194,255],[251,196,255],[250,197,255],[252,201,255],[254,210,255]],[[250,195,66],[251,197,71],[250,196,94],[251,198,116],[251,199,142],[251,201,173],[251,202,192],[250,204,213],[251,207,233],[251,208,248],[251,212,255],[251,214,255],[251,217,255],[251,218,255],[250,219,255],[252,224,255],[252,231,255]],[[250,209,70],[250,208,74],[250,210,97],[251,210,117],[249,212,144],[251,214,177],[251,215,193],[250,217,214],[251,219,233],[251,221,249],[251,224,255],[251,226,255],[251,228,255],[252,229,255],[250,230,255],[252,235,255],[253,241,255]],[[249,219,73],[249,219,77],[249,220,100],[251,223,120],[251,223,148],[250,225,176],[251,225,193],[250,226,214],[250,228,235],[250,231,248],[251,233,255],[251,236,255],[251,237,255],[251,241,255],[251,241,255],[252,245,255],[252,250,255]],[[248,228,76],[249,228,81],[249,229,102],[250,231,124],[249,232,149],[249,233,177],[250,234,194],[250,236,213],[249,238,236],[249,240,248],[249,243,255],[250,244,255],[252,245,255],[251,248,255],[251,248,255],[253,251,255],[252,252,255]],[[247,237,79],[248,238,85],[248,237,105],[248,238,125],[249,240,150],[249,242,179],[249,243,196],[249,244,216],[248,246,238],[248,248,248],[250,249,253],[251,250,255],[252,251,255],[252,252,255],[252,253,255],[250,253,255],[250,253,255]],[[247,246,83],[247,247,90],[247,246,110],[247,248,129],[248,249,154],[248,250,181],[248,251,197],[249,253,219],[249,253,241],[250,252,252],[250,253,254],[252,253,255],[252,254,255],[252,253,255],[250,254,255],[251,254,255],[251,254,255]],[[245,251,87],[246,252,93],[245,252,114],[246,252,132],[246,253,156],[245,253,184],[246,253,198],[247,254,217],[249,253,240],[250,253,252],[249,253,254],[250,253,255],[250,254,255],[250,254,255],[250,254,255],[250,254,255],[250,254,255]]],[[[248,19,41],[247,20,46],[248,20,67],[247,20,90],[247,20,119],[247,19,153],[246,19,172],[248,19,197],[248,19,224],[248,19,240],[249,27,249],[248,32,249],[249,37,249],[249,42,250],[249,47,250],[249,54,251],[251,61,251]],[[247,22,42],[246,22,45],[247,22,67],[247,23,89],[246,23,118],[248,23,153],[247,23,175],[249,23,197],[249,24,224],[249,24,240],[248,30,250],[249,35,248],[249,40,250],[250,45,250],[250,51,251],[250,57,250],[250,66,252]],[[246,29,43],[246,29,47],[247,31,68],[247,30,90],[250,31,121],[249,31,155],[248,31,176],[249,31,201],[250,32,227],[248,33,242],[250,38,249],[250,43,251],[249,47,249],[251,52,250],[250,58,251],[250,65,251],[251,70,252]],[[248,37,43],[247,37,48],[248,38,68],[249,38,93],[250,40,123],[248,40,157],[250,40,180],[249,40,203],[250,42,228],[250,42,243],[249,47,248],[250,51,249],[250,57,251],[250,62,250],[250,66,252],[250,72,252],[250,79,252]],[[248,51,48],[248,50,52],[248,51,72],[250,51,96],[250,53,125],[249,54,160],[250,55,183],[250,56,206],[249,57,232],[250,58,244],[250,62,248],[250,66,250],[250,71,251],[250,75,252],[249,80,252],[249,85,252],[251,93,252]],[[249,75,49],[249,75,54],[249,75,74],[249,77,99],[249,78,129],[250,79,161],[251,80,182],[250,82,207],[250,84,232],[251,85,247],[250,88,250],[251,90,252],[251,91,252],[250,95,252],[251,97,253],[251,103,252],[253,113,254]],[[250,94,50],[250,94,53],[250,95,77],[249,96,101],[250,97,130],[251,101,163],[250,102,185],[250,105,209],[251,106,235],[252,106,247],[250,112,251],[251,113,253],[252,115,253],[252,116,253],[251,116,254],[251,117,255],[255,130,255]],[[251,121,53],[251,119,58],[250,121,80],[251,123,103],[250,125,131],[251,126,166],[251,128,185],[251,130,208],[252,133,233],[252,134,248],[251,138,251],[251,139,254],[251,141,254],[251,142,255],[252,145,254],[252,148,254],[255,162,255]],[[250,147,57],[251,148,60],[250,148,85],[250,150,107],[251,153,133],[251,154,168],[251,155,187],[252,158,207],[252,160,232],[252,162,248],[252,166,252],[252,167,254],[251,169,255],[251,170,254],[251,173,255],[253,178,255],[255,188,255]],[[250,169,59],[250,170,64],[251,171,88],[251,172,109],[250,173,137],[251,175,167],[252,177,187],[252,179,207],[252,181,231],[252,184,248],[251,188,253],[252,189,255],[252,190,255],[251,192,255],[252,194,255],[252,199,255],[255,211,255]],[[251,192,63],[250,192,70],[250,193,92],[250,196,112],[251,195,140],[251,198,169],[252,199,189],[252,201,210],[251,203,231],[252,205,247],[251,210,253],[251,212,255],[251,213,255],[252,216,255],[252,217,255],[254,223,255],[253,223,255]],[[250,205,66],[250,205,72],[251,207,95],[250,208,114],[250,209,141],[251,211,170],[251,213,188],[251,213,210],[251,216,230],[251,219,247],[251,221,254],[251,225,255],[251,226,255],[251,227,255],[251,228,255],[252,235,255],[253,240,255]],[[251,217,68],[250,217,74],[250,219,97],[250,219,116],[251,221,145],[251,222,173],[251,223,191],[251,225,211],[250,227,234],[251,230,248],[250,231,253],[250,234,255],[250,235,255],[251,237,255],[250,240,255],[252,244,255],[253,250,255]],[[250,226,72],[249,227,78],[251,227,99],[250,227,120],[250,229,146],[251,231,174],[251,231,191],[251,234,213],[252,235,235],[251,238,247],[250,240,253],[251,242,254],[252,244,255],[252,245,255],[251,247,255],[252,251,255],[253,252,255]],[[249,233,77],[250,233,81],[251,234,102],[250,235,122],[251,237,148],[251,239,176],[252,239,192],[252,242,213],[250,243,235],[250,246,247],[250,248,253],[251,249,255],[252,251,255],[252,252,255],[252,252,255],[252,252,255],[252,252,255]],[[250,244,82],[249,245,86],[250,245,108],[250,246,127],[250,247,151],[251,248,178],[250,248,193],[250,250,212],[249,252,239],[252,252,252],[250,252,253],[252,252,255],[252,252,255],[252,252,255],[250,252,255],[250,253,255],[251,253,255]],[[249,249,85],[249,250,89],[249,251,111],[250,251,130],[250,252,154],[249,253,179],[249,253,195],[249,252,215],[251,252,240],[250,253,250],[250,252,254],[250,252,255],[250,252,255],[250,254,255],[250,253,255],[251,254,255],[250,254,255]]]],"adjusted":[[[[24,31,50],[24,31,56],[23,33,74],[23,35,93],[24,37,126],[26,40,171],[26,43,196],[24,45,216],[18,45,235],[12,50,248],[8,57,249],[10,63,250],[8,68,250],[8,70,250],[7,77,250],[6,83,251],[6,86,251]],[[27,38,54],[26,39,59],[27,39,79],[27,42,107],[26,44,139],[27,46,171],[26,47,193],[23,47,215],[16,48,237],[13,53,250],[9,61,249],[8,65,250],[8,69,250],[6,74,253],[7,79,252],[5,86,250],[7,90,252]],[[32,62,66],[30,62,73],[30,62,100],[30,62,125],[29,63,153],[28,64,188],[26,63,205],[21,62,221],[15,61,242],[12,62,250],[9,68,250],[8,73,251],[7,77,251],[7,82,251],[7,87,252],[7,92,251],[7,96,252]],[[33,90,76],[35,91,82],[33,87,113],[29,85,139],[30,87,170],[28,84,198],[23,82,217],[17,81,234],[14,81,248],[11,80,249],[8,78,250],[9,81,250],[7,85,250],[7,89,251],[8,95,252],[6,98,251],[7,105,252]],[[33,125,84],[32,125,89],[30,122,123],[27,121,151],[22,122,183],[19,118,211],[16,117,223],[13,116,239],[10,113,250],[9,111,251],[8,111,252],[7,109,251],[7,111,252],[9,108,252],[9,109,252],[8,113,252],[7,116,253]],[[27,159,89],[24,156,97],[19,155,129],[16,155,157],[13,154,188],[12,151,214],[9,149,229],[9,148,244],[9,145,250],[9,144,252],[8,142,253],[7,143,253],[7,141,252],[7,142,253],[7,143,253],[7,141,254],[7,146,255]],[[21,176,92],[21,175,101],[16,173,131],[12,173,157],[11,171,187],[11,169,213],[9,168,229],[9,167,244],[8,165,251],[7,162,251],[6,162,253],[7,162,253],[7,160,253],[6,159,253],[6,160,254],[5,160,253],[8,164,255]],[[21,194,95],[20,192,103],[15,193,133],[13,192,158],[9,191,185],[8,190,214],[10,189,228],[10,189,243],[8,187,251],[7,184,253],[7,184,253],[7,183,255],[8,184,255],[7,183,254],[8,183,254],[8,185,253],[7,190,255]],[[19,212,99],[19,211,105],[16,210,134],[12,211,156],[10,210,185],[8,210,212],[9,209,227],[8,208,242],[8,208,250],[8,207,253],[6,207,253],[7,205,254],[8,206,254],[8,206,254],[7,205,254],[7,205,253],[7,213,255]],[[16,223,99],[16,225,108],[18,224,135],[14,225,157],[8,224,183],[7,225,212],[6,224,226],[7,224,242],[9,223,252],[8,224,253],[7,224,255],[7,223,254],[7,223,254],[7,223,253],[6,223,254],[8,223,254],[8,228,254]],[[12,236,103],[14,236,108],[14,236,133],[12,236,157],[10,238,182],[8,237,206],[8,238,224],[7,237,238],[7,237,252],[7,239,253],[7,238,254],[6,240,255],[8,239,254],[6,240,255],[7,241,255],[7,242,255],[8,247,255]],[[12,243,104],[13,243,109],[13,244,133],[14,243,155],[10,245,181],[8,245,206],[7,246,222],[8,246,237],[7,247,250],[6,247,252],[8,248,255],[7,247,254],[6,249,254],[7,249,253],[7,249,254],[7,251,255],[7,254,254]],[[12,249,106],[11,249,112],[11,250,134],[14,249,155],[11,252,180],[8,252,205],[8,252,222],[7,252,236],[7,253,250],[7,253,252],[7,253,255],[7,254,254],[6,254,253],[7,254,253],[7,254,254],[8,255,254],[8,255,253]],[[13,253,109],[11,254,113],[11,254,136],[14,253,158],[10,254,180],[8,254,205],[8,255,219],[7,255,236],[7,254,248],[7,254,250],[7,254,255],[7,255,254],[7,254,254],[8,255,253],[7,255,254],[7,255,254],[8,255,254]],[[11,254,110],[10,254,115],[10,254,135],[12,254,156],[11,255,178],[9,255,205],[7,255,216],[8,255,233],[7,255,247],[8,254,250],[6,254,254],[7,254,253],[7,255,254],[7,254,253],[7,254,254],[8,255,253],[7,255,254]],[[10,254,113],[10,254,117],[8,255,137],[10,255,154],[12,254,176],[10,255,201],[7,255,214],[7,255,230],[7,255,246],[7,254,249],[7,255,253],[7,254,254],[7,255,253],[8,254,253],[7,255,253],[8,255,253],[8,255,253]],[[10,255,115],[9,255,119],[7,255,138],[8,255,154],[11,255,175],[11,255,202],[11,255,217],[7,255,228],[7,255,245],[7,255,249],[9,255,253],[9,255,253],[7,255,252],[8,255,253],[7,255,253],[8,255,253],[8,255,253]]],[[[36,31,54],[36,32,60],[33,35,79],[31,36,97],[30,37,126],[30,40,171],[30,43,198],[29,44,219],[24,45,240],[19,50,250],[15,57,250],[13,62,251],[13,65,251],[12,69,251],[11,75,252],[10,81,251],[11,87,252]],[[38,41,60],[38,41,64],[36,41,87],[35,42,111],[31,44,140],[31,47,180],[30,47,194],[29,46,216],[22,49,246],[19,54,251],[15,59,251],[14,64,251],[13,70,251],[11,74,251],[12,78,251],[11,85,253],[10,89,252]],[[44,64,69],[43,64,75],[39,63,105],[36,63,128],[34,64,158],[33,64,192],[30,63,208],[28,61,223],[21,61,249],[18,61,251],[14,67,252],[13,73,252],[12,76,251],[12,81,252],[11,84,252],[9,90,251],[9,96,252]],[[45,92,78],[44,92,83],[42,89,116],[37,87,140],[35,86,170],[32,85,203],[27,84,218],[24,83,237],[20,82,251],[18,80,252],[14,78,250],[14,80,250],[12,85,252],[12,89,251],[9,92,252],[9,98,252],[9,104,252]],[[43,124,85],[40,124,93],[39,123,123],[35,122,152],[31,119,183],[28,116,211],[23,115,225],[20,113,239],[18,113,250],[16,111,251],[13,109,252],[12,105,252],[11,105,254],[11,106,252],[10,107,253],[9,111,253],[10,114,253]],[[38,157,89],[36,157,97],[31,156,129],[26,155,155],[22,154,187],[20,151,214],[20,148,229],[19,148,244],[18,145,250],[15,143,250],[12,141,253],[11,138,254],[9,138,253],[10,141,253],[8,140,252],[10,140,253],[8,141,255]],[[33,174,91],[31,173,99],[27,172,129],[22,172,157],[20,169,185],[19,167,213],[18,167,229],[17,165,244],[16,163,250],[14,163,251],[13,160,252],[10,160,253],[8,162,253],[8,158,253],[9,159,253],[7,160,254],[7,162,255]],[[29,192,95],[31,192,103],[26,191,132],[22,190,156],[18,190,185],[17,190,214],[17,189,228],[15,187,243],[13,186,252],[14,184,253],[10,185,253],[8,184,255],[8,182,254],[8,182,254],[8,183,254],[6,182,254],[8,189,255]],[[29,211,98],[27,212,105],[24,211,134],[21,211,156],[17,210,183],[16,209,210],[15,207,226],[12,208,242],[11,207,251],[10,206,253],[9,206,254],[8,206,253],[9,205,255],[7,203,254],[8,204,254],[8,206,255],[8,212,255]],[[27,223,100],[24,223,106],[27,224,134],[24,225,155],[18,223,182],[12,223,209],[11,223,225],[10,223,241],[9,223,252],[10,223,254],[8,223,254],[9,223,254],[7,223,254],[8,223,253],[8,224,254],[7,225,255],[8,232,255]],[[22,238,104],[22,238,109],[24,236,134],[23,237,158],[18,237,180],[14,237,208],[9,237,224],[9,238,239],[8,237,251],[8,238,254],[7,239,253],[7,239,254],[7,241,254],[8,240,253],[6,241,255],[7,242,255],[8,247,255]],[[23,245,104],[21,245,110],[23,245,134],[24,245,158],[20,246,181],[11,246,207],[10,246,223],[8,247,239],[8,248,251],[8,241,252],[7,247,255],[9,248,255],[6,248,254],[8,249,254],[7,250,255],[8,251,255],[7,254,254]],[[21,250,106],[20,250,113],[19,250,133],[23,249,156],[18,251,180],[13,251,206],[10,251,221],[7,252,237],[7,253,250],[7,254,252],[7,254,253],[7,254,254],[7,255,253],[7,254,254],[7,254,253],[7,255,254],[7,255,253]],[[20,254,109],[18,253,113],[16,252,132],[20,253,154],[18,253,179],[13,254,204],[10,254,218],[8,255,234],[7,254,248],[7,254,251],[7,255,254],[7,255,253],[7,255,254],[8,255,253],[8,255,254],[8,255,255],[9,255,254]],[[17,253,111],[17,253,115],[14,254,134],[17,254,154],[17,254,178],[13,254,202],[9,255,216],[8,255,231],[7,255,248],[7,255,250],[7,255,254],[7,254,254],[7,254,253],[7,255,253],[7,254,254],[7,255,253],[7,255,253]],[[17,254,113],[15,254,118],[13,254,135],[16,254,154],[19,255,176],[12,255,199],[10,255,214],[9,255,231],[8,255,246],[8,255,249],[8,254,253],[8,255,254],[8,255,253],[8,255,253],[7,255,253],[7,255,253],[8,255,253]],[[15,255,114],[15,255,118],[13,255,136],[12,255,154],[16,255,174],[14,255,200],[10,255,213],[8,255,225],[7,255,244],[8,255,250],[8,255,253],[8,255,253],[7,255,252],[8,255,253],[8,255,253],[8,255,253],[8,255,253]]],[[[53,34,60],[51,34,64],[50,36,89],[48,38,114],[44,38,139],[40,39,173],[38,42,200],[36,43,221],[32,45,245],[30,51,251],[28,58,251],[27,62,250],[26,66,251],[23,70,251],[21,75,251],[20,80,253],[19,85,252]],[[57,43,64],[57,44,71],[55,44,98],[51,44,121],[47,44,148],[40,45,177],[38,45,199],[36,46,224],[32,49,250],[29,54,252],[26,60,251],[24,65,250],[23,69,251],[21,74,252],[21,79,252],[18,84,253],[17,88,253]],[[67,66,74],[66,65,78],[59,65,110],[54,64,132],[47,64,161],[39,64,191],[37,62,208],[34,60,226],[31,59,247],[29,61,251],[27,67,251],[26,72,252],[23,76,252],[22,82,252],[21,85,252],[19,91,252],[17,96,252]],[[68,92,79],[68,91,85],[60,88,119],[56,86,142],[47,86,173],[39,84,201],[37,80,219],[34,80,236],[31,79,251],[29,78,252],[29,78,251],[23,80,252],[22,84,252],[21,87,253],[20,91,252],[18,97,253],[16,100,253]],[[65,124,85],[64,124,93],[59,123,125],[53,120,152],[45,119,183],[37,116,211],[35,114,226],[33,113,240],[31,110,251],[28,108,251],[26,107,252],[24,105,253],[22,107,254],[20,106,254],[19,107,253],[18,109,254],[15,112,253]],[[60,155,88],[60,156,97],[54,153,129],[48,153,154],[40,150,185],[34,149,213],[34,147,228],[33,146,242],[30,144,250],[29,144,251],[26,143,253],[23,142,255],[22,142,253],[21,138,253],[18,139,254],[17,139,254],[16,141,254]],[[57,172,91],[56,173,100],[52,172,130],[45,171,156],[38,170,185],[34,167,213],[33,165,227],[32,166,245],[30,163,251],[28,160,252],[24,160,253],[22,160,254],[21,158,254],[18,156,254],[16,156,254],[15,156,254],[13,160,255]],[[50,192,94],[50,192,102],[45,191,134],[39,191,155],[34,190,184],[32,188,214],[31,187,229],[28,186,242],[27,184,251],[26,184,253],[22,184,254],[20,185,254],[21,182,254],[17,182,254],[14,180,254],[14,182,255],[12,186,255]],[[43,211,96],[42,211,103],[40,209,133],[36,210,154],[31,211,184],[29,210,212],[27,208,227],[27,207,242],[24,206,251],[23,205,253],[19,205,254],[18,205,254],[17,205,254],[16,204,255],[13,205,255],[12,208,254],[11,214,255]],[[38,224,101],[36,224,107],[36,222,133],[34,222,155],[31,223,183],[26,224,210],[24,222,226],[24,223,241],[21,223,251],[19,223,253],[16,222,255],[15,220,254],[13,222,254],[12,223,255],[11,223,254],[11,225,254],[11,230,255]],[[34,237,104],[33,238,108],[34,237,134],[33,235,154],[31,237,180],[26,237,208],[21,237,223],[19,237,238],[16,237,252],[16,237,253],[13,238,255],[11,239,254],[10,238,254],[10,240,253],[9,239,255],[9,241,255],[9,247,255]],[[33,244,104],[32,244,110],[32,244,132],[33,245,156],[30,245,180],[24,245,208],[20,245,221],[16,245,236],[14,246,251],[13,246,251],[12,246,255],[9,248,254],[8,249,254],[10,248,254],[8,249,254],[8,252,255],[10,254,255]],[[33,251,107],[30,250,112],[31,251,133],[31,249,156],[29,252,179],[24,251,206],[21,251,221],[14,252,238],[12,252,250],[11,253,251],[10,252,255],[9,253,253],[9,254,253],[8,252,254],[8,253,254],[7,254,253],[7,254,254]],[[29,254,109],[29,253,112],[29,253,134],[31,253,154],[30,254,178],[24,254,204],[20,254,219],[13,254,233],[11,253,249],[9,253,251],[9,254,254],[9,255,254],[7,254,254],[8,254,253],[8,254,255],[9,254,255],[9,255,254]],[[29,253,111],[30,254,115],[27,255,136],[29,253,156],[28,255,179],[23,254,202],[19,254,215],[14,255,230],[10,255,247],[8,255,250],[7,255,254],[6,255,254],[8,255,253],[8,255,253],[7,255,254],[8,255,254],[7,255,254]],[[28,254,112],[26,254,117],[24,255,138],[24,254,155],[28,254,179],[22,254,200],[18,255,214],[13,255,229],[10,255,245],[7,255,249],[8,255,253],[6,255,254],[7,254,253],[8,255,253],[7,255,254],[8,255,254],[8,255,254]],[[26,255,114],[24,254,118],[22,255,137],[22,255,154],[26,255,177],[24,255,201],[21,255,213],[14,255,227],[10,255,242],[8,255,249],[8,255,251],[7,255,253],[7,255,254],[9,255,253],[8,255,252],[7,255,253],[9,255,253]]],[[[75,35,63],[71,36,70],[70,38,99],[67,40,122],[61,40,150],[60,40,186],[53,42,205],[45,42,224],[41,43,245],[40,48,250],[38,55,250],[37,60,251],[36,66,251],[36,70,252],[34,75,252],[32,81,253],[30,86,253]],[[82,45,68],[82,45,74],[74,45,104],[71,46,129],[64,45,157],[59,45,183],[53,46,204],[44,45,226],[43,49,249],[41,55,251],[39,60,251],[37,65,251],[36,69,252],[36,74,251],[34,78,252],[32,84,253],[30,88,252]],[[86,66,75],[88,68,81],[81,66,116],[77,66,138],[69,64,168],[60,64,199],[51,62,212],[44,60,234],[42,58,250],[40,62,252],[38,69,251],[36,73,251],[36,77,252],[34,80,252],[32,82,254],[30,89,252],[30,94,252]],[[90,90,78],[91,91,87],[85,90,120],[77,88,148],[68,87,176],[58,84,204],[52,81,223],[44,81,235],[42,78,250],[40,77,251],[38,77,251],[35,80,252],[35,84,252],[32,88,253],[32,92,252],[29,97,254],[28,104,253]],[[88,124,84],[88,122,92],[82,122,124],[78,121,152],[66,117,183],[56,114,210],[48,113,223],[45,112,239],[41,111,250],[39,109,251],[36,108,253],[36,105,253],[35,106,252],[32,105,253],[30,104,252],[29,109,253],[28,112,254]],[[84,155,87],[82,155,94],[79,153,128],[72,150,154],[65,147,183],[53,147,213],[46,146,226],[45,146,244],[43,143,251],[40,142,252],[38,140,254],[35,139,253],[34,138,254],[31,139,254],[30,140,255],[27,138,254],[27,141,255]],[[79,172,89],[79,171,97],[75,170,131],[70,170,154],[63,169,185],[51,165,212],[46,165,228],[44,164,243],[41,162,251],[37,161,252],[36,159,254],[34,159,254],[32,158,255],[31,156,254],[27,156,254],[26,156,254],[27,161,255]],[[73,190,93],[72,192,100],[68,190,131],[64,190,154],[57,189,184],[46,188,213],[43,187,228],[41,187,244],[39,185,252],[40,184,252],[35,184,255],[34,182,255],[29,180,255],[31,181,255],[26,181,254],[23,181,255],[27,188,255]],[[64,209,96],[63,210,103],[59,209,132],[55,209,154],[47,209,183],[41,209,211],[38,207,226],[38,206,242],[36,206,251],[34,206,253],[31,204,255],[31,204,255],[28,205,254],[27,204,255],[24,204,255],[22,203,254],[22,211,255]],[[55,222,99],[55,223,106],[54,222,133],[49,223,156],[43,223,181],[36,224,209],[35,223,224],[33,223,240],[33,222,252],[32,221,252],[29,221,255],[27,221,254],[23,221,254],[21,222,254],[20,221,255],[18,222,254],[22,231,255]],[[46,235,102],[44,236,109],[46,235,133],[45,237,155],[39,237,180],[37,237,207],[34,238,223],[30,238,238],[29,236,252],[27,238,254],[23,237,255],[21,238,255],[21,239,254],[19,239,255],[16,239,255],[17,240,255],[19,246,255]],[[41,244,104],[41,243,109],[40,243,132],[43,245,155],[40,246,180],[35,245,207],[32,246,223],[29,246,238],[24,247,251],[24,246,253],[21,246,255],[19,246,254],[18,248,253],[16,248,255],[14,247,253],[12,249,254],[19,254,255]],[[41,250,105],[40,250,111],[40,252,135],[42,251,156],[40,251,179],[36,252,206],[31,252,221],[24,252,237],[23,252,250],[21,252,253],[18,252,254],[16,252,254],[17,252,253],[13,253,254],[11,253,254],[11,254,255],[20,255,255]],[[38,253,107],[39,253,113],[37,254,135],[38,255,157],[39,254,181],[34,254,205],[30,255,220],[24,255,234],[19,254,248],[16,254,251],[14,254,254],[15,254,254],[12,254,253],[11,254,254],[11,254,254],[11,254,254],[18,255,254]],[[39,254,112],[39,255,118],[35,253,136],[35,254,156],[37,254,177],[33,254,200],[29,255,215],[24,254,230],[17,254,245],[15,254,250],[13,254,253],[12,254,255],[10,254,253],[9,255,253],[11,255,254],[10,255,254],[20,255,254]],[[35,254,113],[35,254,117],[33,254,136],[33,254,154],[35,254,177],[32,255,201],[30,255,216],[23,255,229],[16,255,245],[11,255,249],[10,254,253],[10,255,254],[9,255,254],[8,255,253],[9,255,253],[9,254,254],[16,255,253]],[[34,255,115],[33,255,117],[32,254,138],[32,255,154],[36,255,178],[33,255,202],[29,255,215],[26,255,229],[18,255,243],[13,255,250],[10,255,253],[9,255,253],[9,255,253],[9,255,252],[8,255,252],[9,255,253],[18,255,252]]],[[[122,34,65],[122,36,73],[110,39,108],[109,41,137],[100,42,163],[95,43,198],[90,42,214],[81,41,233],[70,44,247],[58,48,252],[57,56,251],[59,62,252],[57,65,252],[55,70,251],[54,74,252],[54,82,254],[51,88,253]],[[129,42,70],[118,41,71],[108,43,105],[105,46,136],[100,46,165],[95,46,198],[89,45,216],[80,44,233],[70,48,250],[60,54,251],[59,60,252],[58,64,251],[56,69,253],[54,72,251],[53,79,253],[52,84,252],[51,90,253]],[[126,66,75],[125,66,83],[118,66,118],[113,65,146],[104,64,175],[94,63,204],[89,60,218],[84,58,234],[70,56,249],[59,60,252],[58,67,252],[56,72,253],[55,75,252],[55,81,252],[53,85,253],[50,90,253],[51,95,252]],[[125,91,80],[125,90,87],[120,89,120],[115,87,150],[109,87,183],[101,84,209],[93,82,222],[84,80,242],[67,76,250],[59,77,251],[57,77,252],[57,80,253],[55,84,253],[55,88,253],[53,92,253],[51,98,253],[50,102,253]],[[123,121,85],[122,121,90],[119,120,124],[116,119,152],[108,117,184],[99,115,212],[91,114,226],[81,111,241],[66,108,251],[61,107,251],[57,103,252],[54,102,252],[52,103,253],[50,103,254],[49,103,252],[46,107,253],[49,113,254]],[[118,152,86],[118,151,93],[114,150,129],[108,150,153],[103,148,183],[95,146,212],[89,144,227],[78,144,243],[62,141,250],[59,141,253],[56,138,253],[56,138,255],[53,138,254],[51,137,254],[52,137,255],[48,138,255],[46,142,255]],[[113,168,88],[113,168,96],[109,168,129],[106,168,154],[100,167,184],[91,165,212],[84,163,229],[72,162,244],[60,160,251],[59,160,252],[56,157,254],[54,157,254],[51,157,253],[51,155,254],[49,155,255],[47,156,255],[48,157,255]],[[108,188,91],[106,187,98],[103,188,129],[99,186,153],[95,186,182],[88,186,211],[80,185,227],[71,183,242],[59,184,251],[57,183,252],[54,181,254],[53,181,255],[51,181,254],[49,179,255],[48,181,255],[47,180,255],[47,183,255]],[[98,206,94],[95,206,101],[94,207,130],[91,207,154],[86,207,181],[78,206,209],[72,206,225],[63,206,241],[56,205,252],[53,205,254],[52,203,255],[49,203,255],[49,203,255],[48,205,255],[43,203,255],[45,204,255],[47,210,255]],[[90,221,98],[89,221,104],[86,220,129],[86,221,154],[79,222,181],[68,222,209],[68,221,224],[57,222,240],[52,222,252],[50,222,254],[48,223,255],[47,222,255],[46,222,255],[45,222,255],[43,222,254],[42,222,255],[44,228,255]],[[79,234,100],[81,234,106],[77,235,130],[75,235,154],[69,235,180],[62,235,206],[59,236,223],[50,236,239],[49,237,252],[47,237,252],[44,238,255],[43,237,255],[42,238,255],[41,238,255],[40,239,255],[41,241,255],[44,246,255]],[[71,242,102],[72,242,108],[69,242,133],[71,243,155],[61,244,182],[56,246,207],[50,245,221],[48,245,236],[44,245,251],[43,247,253],[40,247,255],[40,247,255],[40,247,255],[38,248,254],[37,249,255],[39,252,255],[44,255,255]],[[65,249,104],[67,248,110],[61,249,132],[63,249,155],[56,249,180],[54,251,204],[49,250,219],[44,251,235],[42,252,250],[41,253,252],[40,254,255],[41,254,254],[38,254,254],[36,253,254],[36,253,254],[38,255,255],[40,255,255]],[[58,254,107],[58,253,111],[55,254,135],[58,253,155],[56,254,181],[51,255,204],[47,254,219],[43,255,234],[39,254,250],[37,254,251],[36,254,255],[36,254,254],[34,254,254],[33,255,254],[34,255,254],[34,255,253],[41,255,254]],[[57,254,109],[56,254,116],[51,254,135],[54,254,156],[53,254,181],[49,255,202],[48,255,218],[43,255,232],[38,254,248],[35,255,251],[34,255,255],[33,254,253],[29,254,253],[30,255,253],[27,255,254],[34,255,254],[43,255,254]],[[51,254,112],[51,254,117],[49,254,136],[46,255,154],[51,254,178],[48,255,199],[45,255,215],[40,255,231],[36,255,247],[30,255,249],[28,255,254],[28,255,254],[28,255,253],[27,255,253],[28,255,254],[36,255,254],[43,255,253]],[[48,254,114],[49,255,118],[47,255,140],[47,254,154],[51,255,181],[46,255,201],[44,255,217],[42,255,231],[36,255,246],[31,255,249],[27,255,253],[24,255,253],[24,255,254],[22,255,253],[24,255,253],[34,255,253],[41,255,253]]],[[[167,25,64],[168,27,72],[163,32,115],[153,36,143],[148,38,177],[139,39,207],[132,41,220],[125,41,236],[114,45,248],[101,50,251],[88,56,251],[81,59,251],[78,64,253],[78,69,252],[75,72,252],[74,78,253],[74,85,254]],[[169,35,68],[167,36,75],[162,40,116],[152,43,144],[146,44,175],[139,44,206],[131,44,223],[123,45,239],[112,49,248],[101,54,251],[88,58,252],[80,63,252],[78,67,252],[78,72,252],[75,77,253],[73,82,253],[74,87,253]],[[167,62,73],[167,62,80],[159,62,118],[153,62,148],[147,61,181],[139,60,210],[132,59,223],[123,57,239],[111,58,251],[102,62,251],[89,67,252],[81,72,252],[79,74,253],[77,78,254],[74,83,253],[74,89,253],[73,94,253]],[[164,86,76],[162,87,85],[156,85,119],[152,84,148],[147,83,182],[136,82,210],[130,79,224],[123,79,239],[110,77,250],[101,74,251],[87,75,252],[80,79,253],[78,83,252],[77,86,253],[74,90,254],[73,97,253],[73,100,254]],[[158,118,81],[156,117,88],[154,115,124],[151,117,150],[144,113,183],[137,113,211],[131,109,226],[123,109,241],[112,108,251],[98,105,252],[80,101,252],[78,103,254],[75,101,253],[74,100,254],[74,104,255],[71,109,254],[72,113,254]],[[151,148,83],[151,148,91],[148,146,125],[146,145,149],[141,144,181],[134,142,210],[128,141,227],[120,140,242],[108,139,250],[96,136,254],[80,136,254],[77,135,255],[75,136,254],[72,134,255],[72,133,254],[70,135,255],[72,139,255]],[[149,163,84],[148,162,92],[145,162,125],[141,162,151],[137,163,180],[129,162,210],[123,161,226],[117,159,242],[107,159,251],[96,157,253],[79,156,255],[75,155,255],[73,157,255],[73,157,255],[71,155,255],[69,154,255],[72,159,255]],[[142,184,89],[139,184,95],[138,184,125],[136,185,153],[132,185,179],[123,184,209],[118,183,226],[111,183,243],[104,181,252],[91,182,254],[77,179,255],[74,179,255],[72,179,255],[71,179,255],[69,179,255],[69,178,255],[74,188,255]],[[132,203,93],[132,203,99],[129,204,127],[126,204,152],[122,204,179],[117,205,208],[111,203,223],[107,205,240],[97,204,252],[85,204,254],[73,203,255],[72,203,255],[70,203,255],[69,202,254],[67,203,255],[67,204,255],[71,214,255]],[[124,219,95],[123,217,101],[122,219,129],[119,218,151],[115,220,179],[111,219,206],[108,219,222],[99,220,238],[90,220,251],[78,220,255],[71,220,255],[69,221,255],[68,221,255],[67,220,255],[67,220,255],[65,222,255],[70,228,255]],[[114,231,97],[115,231,103],[111,232,129],[110,233,152],[108,232,178],[101,233,204],[97,235,221],[93,235,237],[82,234,251],[70,236,254],[67,235,255],[65,237,255],[65,237,255],[64,237,255],[64,238,255],[63,240,255],[66,246,255]],[[109,241,100],[109,241,105],[107,240,130],[102,241,151],[102,242,179],[92,243,204],[90,243,220],[85,245,236],[73,244,252],[64,245,253],[64,246,255],[63,247,255],[62,248,255],[60,248,254],[61,248,255],[63,250,255],[67,254,255]],[[104,248,103],[104,248,109],[101,248,131],[96,248,153],[94,249,179],[88,249,203],[86,250,218],[78,251,236],[71,252,250],[62,252,253],[63,252,255],[61,253,255],[60,252,255],[59,254,254],[59,254,255],[63,254,255],[65,255,255]],[[98,254,106],[96,254,111],[93,253,134],[91,254,154],[90,254,178],[82,254,202],[80,254,217],[69,254,235],[63,253,249],[60,254,251],[59,254,255],[57,254,255],[57,255,255],[56,255,254],[56,254,255],[59,255,254],[65,255,255]],[[89,254,107],[89,253,113],[87,254,136],[83,254,154],[83,254,177],[77,255,202],[73,255,217],[67,254,232],[59,255,248],[56,254,250],[56,254,254],[54,254,254],[54,255,254],[53,255,255],[54,255,255],[59,255,255],[67,255,255]],[[82,254,111],[82,254,117],[80,254,138],[74,254,154],[75,255,180],[71,255,200],[66,255,215],[63,255,233],[57,255,247],[52,255,249],[50,255,253],[52,255,254],[52,255,253],[50,255,254],[50,255,255],[58,255,254],[61,255,253]],[[77,255,113],[75,255,116],[73,255,138],[70,255,154],[69,255,180],[64,255,201],[64,255,216],[62,255,232],[56,255,247],[52,255,249],[50,255,253],[50,255,255],[50,255,253],[47,255,253],[50,255,253],[58,255,253],[63,255,253]]],[[[194,18,62],[191,20,72],[186,26,115],[177,31,145],[170,34,177],[163,36,208],[158,36,224],[149,39,240],[140,45,248],[131,50,250],[117,56,253],[109,61,253],[98,64,254],[93,68,252],[91,72,252],[89,78,252],[90,83,255]],[[188,30,65],[188,31,74],[183,34,114],[175,38,142],[169,39,177],[162,39,208],[156,42,222],[150,44,240],[138,49,249],[130,54,251],[116,60,252],[104,63,253],[96,67,251],[91,71,253],[91,76,253],[88,81,253],[88,86,255]],[[185,59,69],[184,60,78],[181,58,115],[176,57,147],[155,52,162],[147,53,196],[153,54,220],[149,54,238],[139,58,250],[129,63,251],[119,67,252],[104,72,252],[95,74,252],[90,77,253],[90,82,253],[89,90,254],[88,92,254]],[[183,83,73],[183,82,82],[177,82,117],[175,81,148],[169,82,180],[161,80,209],[155,78,225],[149,77,242],[139,75,250],[125,73,251],[112,75,253],[104,79,253],[94,82,252],[91,87,254],[90,91,254],[89,96,254],[89,100,254]],[[179,114,80],[177,114,86],[173,113,121],[171,113,147],[167,113,181],[159,110,212],[152,109,226],[149,108,242],[138,107,251],[130,104,253],[114,101,253],[103,101,254],[93,101,254],[89,102,253],[90,104,255],[88,108,254],[87,112,254]],[[168,142,79],[170,144,89],[168,143,122],[165,143,149],[160,143,180],[156,141,209],[151,141,227],[146,140,243],[137,139,252],[125,138,252],[111,136,255],[100,133,255],[92,135,254],[89,135,254],[89,135,255],[88,135,255],[90,142,255]],[[166,161,84],[165,161,91],[163,160,124],[160,159,151],[158,160,179],[153,160,210],[149,158,226],[141,157,243],[133,156,251],[120,156,254],[106,153,255],[98,155,255],[88,154,255],[89,156,255],[86,154,255],[85,154,255],[90,161,255]],[[162,179,87],[162,179,93],[158,180,123],[155,181,150],[152,180,178],[147,181,206],[142,180,224],[140,180,242],[125,179,252],[118,179,254],[103,179,255],[91,177,255],[87,179,255],[87,179,255],[86,180,255],[85,177,255],[88,184,255]],[[152,201,91],[152,200,96],[148,200,123],[147,201,148],[146,201,178],[140,202,206],[135,202,222],[130,201,239],[121,201,252],[113,202,255],[99,203,255],[88,202,255],[86,203,255],[85,204,255],[83,202,255],[83,202,255],[85,209,255]],[[144,216,92],[144,216,100],[142,216,126],[140,216,148],[137,217,177],[133,218,205],[128,217,221],[122,218,237],[114,219,253],[106,220,253],[94,220,255],[85,220,255],[82,220,255],[82,220,255],[82,221,255],[80,221,255],[85,230,255]],[[134,230,96],[136,230,102],[132,230,125],[131,231,149],[128,231,175],[123,232,202],[120,232,218],[117,233,235],[107,234,251],[100,235,254],[87,236,255],[81,236,255],[79,236,255],[79,238,255],[78,237,255],[78,237,255],[82,245,255]],[[129,239,98],[128,239,103],[126,239,129],[123,240,150],[121,241,176],[118,242,203],[116,241,219],[110,243,236],[102,244,251],[95,244,253],[83,245,255],[80,247,255],[80,247,255],[78,247,255],[77,248,255],[79,251,255],[84,253,255]],[[123,247,101],[122,246,107],[120,246,130],[118,247,150],[118,249,178],[110,248,201],[108,248,218],[104,250,234],[95,250,251],[89,252,253],[79,253,255],[77,253,255],[77,253,255],[74,254,255],[73,254,255],[77,254,255],[82,255,255]],[[116,252,103],[116,251,108],[112,251,131],[111,253,149],[111,253,176],[108,254,203],[100,254,216],[97,254,233],[92,254,249],[83,254,253],[73,254,255],[72,254,254],[72,255,255],[71,255,255],[72,255,254],[74,255,254],[80,255,255]],[[112,254,105],[113,254,112],[111,254,134],[109,254,154],[107,255,177],[100,255,202],[98,255,216],[94,255,231],[84,255,248],[77,255,250],[70,254,254],[69,255,254],[70,255,254],[69,255,254],[69,255,254],[72,255,254],[80,255,255]],[[105,254,111],[106,254,115],[101,254,136],[100,254,156],[101,255,179],[96,255,201],[91,255,215],[87,255,231],[77,255,246],[69,255,249],[67,255,253],[66,255,255],[66,255,254],[67,255,254],[66,255,254],[74,255,254],[81,255,254]],[[101,254,112],[100,254,118],[97,255,139],[95,254,155],[95,255,179],[90,255,202],[87,255,216],[85,255,233],[73,255,247],[67,255,250],[66,255,253],[65,255,255],[64,255,253],[66,255,254],[66,255,253],[72,255,254],[72,255,253]]],[[[209,23,61],[202,19,64],[203,23,107],[203,26,142],[198,27,177],[191,31,207],[186,34,225],[181,38,237],[171,44,248],[163,48,250],[151,56,252],[143,61,252],[133,65,252],[130,68,253],[120,73,253],[110,78,254],[110,83,254]],[[211,29,64],[209,30,73],[207,30,112],[204,31,144],[199,34,178],[191,36,207],[188,38,226],[181,43,240],[170,47,248],[162,53,251],[151,58,251],[141,63,252],[135,69,253],[128,72,252],[117,77,253],[109,81,254],[109,85,253]],[[204,51,67],[206,52,76],[206,51,111],[202,51,144],[196,53,178],[190,52,208],[184,51,222],[180,53,241],[172,57,250],[160,61,252],[150,67,252],[141,71,253],[134,75,253],[123,79,253],[119,84,252],[109,88,254],[107,91,254]],[[201,76,70],[202,76,79],[203,76,114],[200,76,143],[196,78,181],[189,76,209],[185,74,225],[177,75,240],[169,73,249],[161,73,250],[148,77,253],[141,80,253],[131,83,253],[124,87,253],[118,89,254],[109,94,253],[107,99,253]],[[200,109,74],[200,108,84],[197,107,116],[195,107,144],[192,107,177],[188,108,210],[182,107,225],[176,105,242],[168,104,251],[159,103,253],[148,101,255],[140,101,254],[131,98,254],[122,98,255],[115,103,254],[107,107,255],[107,111,254]],[[193,138,78],[191,138,87],[191,139,119],[189,138,146],[186,138,176],[180,137,206],[176,138,223],[171,137,241],[163,136,251],[156,135,254],[146,135,255],[136,132,255],[128,132,255],[118,131,255],[111,131,255],[105,131,255],[107,133,255]],[[188,154,81],[188,155,88],[187,155,118],[185,157,145],[181,157,174],[176,157,206],[173,156,224],[169,153,239],[161,153,252],[154,152,255],[143,153,255],[135,152,255],[126,151,255],[117,151,255],[111,152,255],[104,151,255],[108,159,255]],[[181,176,84],[182,175,91],[179,176,120],[176,177,146],[177,176,175],[172,177,205],[170,178,221],[165,177,240],[158,177,251],[148,177,255],[142,176,255],[132,176,255],[123,175,255],[117,176,255],[107,175,255],[103,176,255],[104,182,255]],[[174,195,87],[174,195,93],[173,196,120],[171,197,144],[168,198,175],[165,198,201],[162,199,220],[157,199,236],[150,199,253],[144,200,255],[130,194,255],[120,189,255],[114,197,255],[110,199,255],[103,199,255],[102,201,255],[105,210,255]],[[168,211,89],[168,211,95],[167,213,122],[164,214,146],[162,214,175],[159,215,201],[157,215,219],[152,215,234],[144,216,251],[138,218,254],[131,218,255],[122,219,255],[116,220,255],[106,220,255],[101,220,255],[101,222,255],[105,231,255]],[[158,227,93],[159,228,98],[157,228,124],[156,229,145],[156,230,174],[150,231,201],[149,232,218],[144,233,235],[140,233,250],[137,234,253],[125,234,255],[116,235,255],[108,235,255],[99,235,255],[97,236,255],[98,239,255],[100,244,255]],[[153,236,95],[154,237,102],[151,237,125],[149,238,147],[147,238,173],[145,239,202],[143,241,217],[141,241,233],[135,243,251],[129,243,254],[119,243,255],[113,246,255],[103,246,255],[98,246,255],[97,246,255],[98,250,255],[102,255,255]],[[149,245,99],[148,245,104],[146,245,128],[143,245,148],[143,246,174],[142,246,202],[140,248,216],[135,249,233],[132,250,250],[124,249,253],[115,252,255],[109,252,255],[97,253,255],[97,253,254],[95,254,255],[98,254,255],[98,255,255]],[[143,250,101],[143,249,107],[141,251,130],[141,251,150],[138,253,175],[137,253,202],[136,254,216],[132,254,232],[123,254,249],[119,254,253],[109,255,255],[103,255,255],[96,255,255],[92,254,255],[92,255,254],[93,255,255],[98,255,255]],[[136,255,104],[139,254,110],[137,255,132],[135,255,150],[132,254,174],[131,255,201],[129,255,215],[126,255,230],[117,255,247],[112,255,251],[102,255,255],[97,255,255],[91,255,255],[88,255,254],[89,254,255],[92,255,255],[98,255,255]],[[131,254,106],[131,255,112],[130,255,134],[130,254,154],[124,255,176],[125,255,202],[125,255,214],[117,255,231],[113,255,247],[108,255,250],[99,255,254],[93,255,254],[87,255,255],[87,254,254],[87,254,254],[93,255,254],[98,255,254]],[[125,255,109],[128,254,117],[125,254,135],[125,255,154],[121,255,176],[122,255,201],[117,255,214],[116,255,229],[109,255,247],[103,255,250],[94,255,254],[89,255,255],[85,255,253],[84,255,254],[87,255,253],[90,255,254],[95,255,254]]],[[[221,23,62],[224,24,72],[222,23,104],[222,24,136],[219,24,173],[216,27,204],[212,30,220],[208,34,240],[200,40,248],[194,46,249],[185,53,252],[177,57,253],[170,62,252],[165,66,253],[158,71,253],[154,77,254],[145,81,253]],[[222,28,62],[225,28,70],[224,29,104],[222,29,138],[219,30,174],[217,33,205],[214,35,221],[207,38,239],[199,44,247],[194,50,249],[184,57,252],[179,62,253],[172,65,253],[165,71,253],[159,75,254],[151,81,255],[146,85,254]],[[221,45,64],[221,44,71],[223,44,106],[220,45,138],[219,45,174],[215,47,205],[213,47,222],[207,48,239],[199,55,248],[192,59,251],[183,65,252],[176,68,253],[171,72,253],[166,78,254],[156,82,254],[152,88,255],[147,93,255]],[[222,67,66],[221,67,74],[223,67,108],[221,68,139],[218,67,173],[213,68,206],[210,69,223],[204,68,238],[197,68,249],[191,68,251],[184,74,253],[176,77,254],[170,81,254],[164,85,254],[159,89,255],[151,93,255],[144,98,255]],[[219,100,70],[219,100,78],[219,100,111],[218,100,138],[214,99,172],[211,101,206],[209,99,223],[204,100,240],[197,99,250],[190,99,252],[182,98,254],[173,96,254],[168,95,255],[162,98,255],[158,102,255],[147,106,255],[143,111,255]],[[215,130,73],[214,131,82],[213,131,114],[211,131,140],[210,132,170],[207,133,203],[202,134,222],[201,132,239],[193,132,252],[188,132,253],[181,130,255],[174,129,255],[169,131,255],[161,129,255],[155,129,255],[145,128,255],[144,136,255]],[[210,149,78],[210,149,83],[209,149,115],[207,150,141],[205,150,171],[204,152,203],[200,151,221],[197,151,238],[192,152,252],[184,150,254],[177,151,255],[172,151,255],[166,150,255],[161,148,255],[156,149,255],[147,148,255],[148,158,255]],[[203,169,80],[203,171,88],[203,171,116],[204,172,141],[201,173,172],[196,173,200],[194,174,220],[190,173,235],[188,172,251],[184,174,253],[177,172,255],[168,172,255],[164,171,255],[157,173,255],[151,174,255],[142,173,255],[142,178,255]],[[195,192,84],[195,192,90],[195,192,117],[194,194,142],[193,193,171],[193,194,199],[191,194,216],[187,195,235],[185,195,252],[177,195,255],[171,196,255],[165,197,255],[161,196,255],[155,195,255],[147,197,255],[141,199,255],[140,205,255]],[[191,208,85],[192,207,93],[191,208,117],[191,208,142],[190,209,170],[187,211,199],[186,210,215],[181,210,231],[176,213,251],[170,210,254],[164,213,255],[161,214,255],[159,215,255],[153,217,255],[145,217,255],[138,219,255],[139,226,255]],[[185,223,90],[185,223,94],[183,224,120],[182,225,142],[180,226,170],[179,227,199],[176,228,215],[174,229,230],[171,229,249],[169,231,254],[163,231,255],[157,232,255],[152,233,255],[145,233,255],[140,235,255],[133,238,255],[134,244,255]],[[180,233,93],[180,234,97],[180,235,123],[179,235,142],[176,236,171],[175,237,199],[173,237,213],[171,238,230],[167,238,249],[164,241,254],[158,242,255],[153,243,255],[149,245,255],[142,244,255],[137,247,255],[132,249,255],[141,255,255]],[[173,240,96],[174,241,101],[173,242,124],[173,243,145],[173,244,172],[171,245,199],[169,244,215],[166,246,231],[162,247,248],[159,249,253],[154,251,255],[151,251,255],[145,252,255],[138,252,255],[133,253,255],[125,255,255],[137,255,255]],[[170,248,98],[170,249,103],[168,249,126],[167,249,146],[166,250,171],[166,250,200],[166,251,215],[164,252,230],[158,253,247],[155,254,252],[149,254,255],[146,255,255],[141,254,255],[133,255,255],[125,255,255],[126,255,255],[135,255,255]],[[166,253,100],[168,253,106],[166,253,128],[167,253,149],[164,254,172],[162,254,200],[162,254,215],[150,252,223],[147,253,242],[145,255,252],[142,255,255],[138,255,255],[133,255,255],[128,255,254],[125,255,255],[129,255,255],[137,255,255]],[[161,254,105],[161,254,109],[159,254,130],[158,254,148],[157,254,172],[156,254,198],[154,255,213],[153,255,228],[150,255,246],[147,254,251],[143,255,255],[135,255,255],[126,255,255],[123,255,255],[121,255,255],[128,255,255],[137,255,255]],[[155,254,107],[156,254,112],[156,254,132],[156,254,149],[153,255,174],[151,255,198],[151,255,215],[151,255,229],[144,255,246],[143,255,251],[138,255,255],[134,255,255],[128,255,254],[119,255,254],[121,255,253],[133,255,255],[142,255,254]]],[[[233,24,57],[231,23,65],[236,24,98],[235,24,130],[234,24,167],[232,25,201],[230,28,220],[226,31,237],[221,37,247],[217,42,249],[209,50,251],[205,55,253],[199,60,253],[195,65,252],[189,70,254],[186,76,254],[181,82,255]],[[234,28,58],[233,28,67],[235,29,98],[235,29,129],[236,30,168],[232,30,200],[228,32,217],[226,35,236],[220,40,249],[215,47,250],[209,54,251],[206,60,253],[202,63,253],[197,67,253],[189,72,254],[185,78,254],[180,83,255]],[[237,40,60],[237,40,69],[237,41,102],[236,40,132],[235,40,169],[232,42,202],[230,43,220],[227,46,238],[224,51,248],[217,56,251],[209,61,252],[204,66,252],[199,70,253],[195,76,254],[191,81,254],[185,87,254],[181,91,254]],[[236,60,62],[236,60,70],[234,61,103],[233,60,131],[233,61,167],[230,61,200],[226,62,218],[225,61,237],[222,63,250],[216,67,252],[209,71,253],[205,75,253],[199,80,254],[195,84,254],[190,88,254],[187,94,255],[182,99,255]],[[232,91,66],[233,92,74],[232,92,105],[232,93,133],[232,93,168],[230,94,203],[226,94,218],[224,95,238],[219,96,251],[214,95,252],[208,94,254],[205,94,254],[196,95,254],[193,97,254],[190,102,254],[183,105,254],[182,111,255]],[[228,123,69],[228,122,78],[228,123,109],[228,125,135],[226,125,166],[225,125,199],[223,129,220],[220,129,237],[215,129,251],[210,129,253],[206,128,255],[201,126,255],[196,126,255],[192,129,255],[189,126,255],[183,128,255],[179,130,255]],[[224,142,73],[225,143,81],[226,143,110],[226,144,137],[224,145,168],[222,146,201],[219,145,217],[217,146,235],[213,147,253],[209,147,253],[203,147,255],[199,147,255],[195,147,255],[192,147,255],[187,146,255],[183,147,255],[184,154,255]],[[220,164,77],[220,164,82],[218,164,111],[218,166,136],[218,166,167],[217,168,196],[215,169,215],[213,170,233],[209,170,251],[205,170,254],[201,171,255],[197,170,255],[194,170,255],[190,171,255],[186,171,255],[181,172,255],[177,178,255]],[[214,186,81],[213,187,86],[214,187,113],[213,188,138],[211,189,166],[211,191,195],[209,192,213],[208,191,232],[204,192,251],[202,192,255],[198,193,255],[196,193,255],[193,194,255],[187,194,255],[186,195,255],[177,199,255],[179,205,255]],[[209,203,83],[209,204,89],[207,203,114],[207,204,138],[206,206,166],[208,207,199],[207,208,211],[205,209,230],[202,210,251],[200,210,254],[194,212,255],[191,211,255],[188,211,255],[185,214,255],[181,214,255],[172,215,255],[176,226,255]],[[202,220,86],[204,221,92],[203,220,116],[203,222,137],[202,223,167],[200,223,196],[200,224,212],[199,225,228],[197,226,249],[193,228,253],[190,228,255],[188,230,255],[184,230,255],[180,231,255],[174,232,255],[173,236,255],[173,246,255]],[[200,230,87],[200,229,94],[198,230,118],[199,231,139],[197,232,168],[197,233,195],[196,233,213],[196,234,227],[192,236,247],[191,237,254],[188,239,255],[183,240,255],[182,240,255],[176,243,255],[173,244,255],[169,248,255],[172,255,255]],[[196,238,91],[196,238,98],[197,240,121],[196,240,141],[195,241,168],[194,242,196],[193,243,212],[193,244,230],[190,244,247],[188,246,253],[185,248,255],[180,248,255],[173,248,255],[172,251,255],[170,252,255],[167,254,255],[171,255,255]],[[192,246,95],[194,245,100],[194,247,123],[190,246,142],[193,247,167],[192,248,195],[192,249,213],[191,251,228],[187,251,246],[184,253,253],[181,255,255],[175,254,255],[174,254,255],[168,255,255],[164,255,255],[165,255,255],[170,255,255]],[[193,252,98],[191,251,104],[189,250,124],[189,252,144],[190,253,169],[187,254,195],[187,254,213],[186,254,228],[184,255,247],[182,255,252],[174,255,255],[171,255,255],[170,255,255],[165,255,255],[162,255,255],[166,255,255],[169,255,255]],[[185,254,103],[186,254,106],[185,254,128],[183,254,146],[184,254,170],[181,255,195],[181,255,211],[182,255,228],[177,255,243],[176,255,251],[173,255,255],[168,255,255],[164,255,255],[161,255,255],[160,255,255],[166,255,255],[169,255,255]],[[182,254,105],[181,255,111],[181,254,129],[181,254,148],[179,255,173],[179,255,196],[177,255,211],[176,255,228],[177,255,246],[171,255,250],[168,255,255],[165,255,255],[163,255,255],[158,255,255],[158,255,255],[162,255,255],[171,255,255]]],[[[238,22,52],[240,22,59],[244,23,91],[244,24,120],[245,23,158],[244,24,192],[245,24,213],[244,27,231],[239,33,248],[236,37,249],[233,46,252],[230,51,251],[226,56,251],[223,61,252],[220,66,254],[215,74,253],[211,78,255]],[[242,27,53],[241,27,60],[246,27,92],[247,27,119],[247,28,157],[246,28,194],[245,29,214],[244,31,231],[241,37,249],[238,42,250],[233,49,251],[230,55,252],[225,60,252],[225,65,254],[221,69,252],[216,75,254],[204,75,254]],[[241,36,53],[244,37,62],[248,38,96],[248,38,122],[248,38,160],[245,38,194],[246,38,213],[244,41,233],[240,46,249],[236,51,249],[233,59,252],[232,63,252],[226,68,253],[222,72,252],[220,77,253],[216,83,254],[213,89,255]],[[244,51,58],[244,52,65],[247,52,96],[247,51,123],[245,52,159],[246,52,196],[245,53,215],[244,54,233],[240,57,248],[237,62,251],[231,67,253],[228,71,253],[224,75,253],[222,81,254],[219,84,253],[215,91,254],[213,95,255]],[[244,79,61],[245,81,69],[245,82,99],[246,82,126],[246,82,160],[245,84,194],[244,83,214],[241,86,233],[238,87,250],[234,87,252],[230,87,253],[227,88,254],[225,89,254],[222,94,255],[219,98,254],[214,103,254],[212,108,255]],[[243,114,64],[242,113,74],[242,114,103],[243,115,128],[244,117,159],[242,117,194],[240,117,213],[238,119,231],[238,121,250],[233,119,252],[228,120,254],[225,121,255],[224,121,255],[220,121,255],[218,122,255],[211,123,255],[214,131,255]],[[240,133,68],[240,132,75],[240,133,103],[240,135,129],[240,136,160],[240,138,193],[238,139,212],[237,139,231],[233,139,250],[231,141,254],[231,141,255],[226,142,255],[221,142,255],[219,141,255],[216,143,255],[212,143,255],[215,152,255]],[[236,155,71],[235,155,77],[236,157,105],[237,159,129],[235,159,161],[234,161,191],[236,162,212],[233,163,231],[231,165,249],[227,165,253],[225,166,255],[223,167,255],[221,167,255],[218,167,255],[215,167,255],[211,168,255],[214,176,255]],[[231,180,75],[231,180,82],[232,181,107],[231,181,131],[231,182,162],[231,184,192],[231,186,209],[228,186,229],[225,187,248],[224,189,254],[221,190,255],[219,191,255],[216,192,255],[213,192,255],[211,193,255],[210,193,255],[212,205,255]],[[226,198,78],[226,198,84],[226,199,109],[225,199,131],[226,201,161],[224,201,192],[224,203,208],[223,205,226],[220,206,246],[218,206,254],[219,208,255],[218,208,255],[216,209,255],[213,210,255],[211,211,255],[207,215,255],[209,222,255]],[[219,217,83],[220,216,89],[221,218,112],[221,218,133],[221,220,163],[220,221,193],[222,220,210],[221,222,224],[220,224,247],[216,225,254],[216,225,255],[214,226,255],[213,228,255],[210,230,255],[208,230,255],[200,228,255],[206,240,255]],[[217,227,85],[216,227,90],[217,228,113],[219,229,136],[219,229,162],[219,229,192],[220,231,210],[221,232,226],[219,234,247],[216,236,254],[213,237,255],[213,238,255],[210,238,255],[208,239,255],[205,241,255],[204,245,255],[206,251,255]],[[214,235,86],[214,234,92],[215,235,116],[217,236,138],[218,238,164],[216,239,192],[217,239,209],[217,240,227],[215,243,245],[213,245,253],[213,246,255],[210,247,255],[208,248,255],[207,249,255],[203,250,255],[204,254,255],[205,255,255]],[[212,242,90],[212,242,94],[213,243,117],[212,244,139],[212,245,165],[215,246,193],[212,246,209],[213,247,228],[213,249,244],[210,250,252],[207,252,255],[207,252,255],[204,253,255],[204,254,255],[200,255,255],[200,255,255],[205,255,255]],[[210,248,92],[209,248,98],[209,249,120],[212,250,141],[212,252,168],[210,252,193],[209,253,211],[211,253,227],[208,254,244],[207,254,253],[203,254,255],[201,255,255],[200,255,255],[199,255,255],[197,255,255],[198,255,255],[202,255,255]],[[208,254,98],[208,254,102],[208,254,126],[209,254,144],[207,254,167],[206,254,193],[205,254,208],[206,255,226],[205,255,243],[202,255,251],[202,255,255],[200,255,255],[198,255,255],[195,255,255],[195,255,255],[199,255,255],[200,255,255]],[[205,253,100],[205,254,106],[206,254,126],[205,254,145],[203,254,167],[203,255,195],[203,255,210],[205,254,228],[203,255,244],[200,255,249],[199,255,255],[198,255,255],[195,255,255],[194,255,255],[195,255,255],[199,255,255],[204,255,255]]],[[[242,22,48],[243,21,53],[249,22,87],[250,23,113],[250,23,149],[249,23,188],[250,24,206],[246,24,224],[248,30,246],[247,35,250],[244,42,250],[242,49,251],[241,53,251],[238,59,252],[236,64,253],[233,71,253],[231,78,254]],[[245,26,49],[246,26,55],[249,27,87],[250,27,114],[250,26,147],[249,27,186],[250,28,207],[250,29,227],[249,33,248],[247,39,250],[245,47,250],[242,52,251],[240,56,251],[237,61,252],[236,66,253],[230,73,253],[230,79,254]],[[249,35,55],[249,35,60],[251,36,91],[251,36,115],[250,37,151],[252,37,189],[252,37,209],[249,38,229],[249,42,249],[246,48,250],[244,55,250],[242,60,251],[239,64,252],[238,69,254],[235,75,253],[232,80,253],[230,85,255]],[[249,47,56],[249,47,64],[252,47,92],[251,48,118],[252,48,153],[253,48,190],[253,49,211],[251,51,230],[251,54,249],[247,58,249],[245,64,253],[243,68,253],[239,73,253],[236,78,252],[235,83,254],[233,88,255],[228,93,254]],[[251,74,55],[248,73,65],[249,74,94],[250,76,120],[250,76,153],[251,77,190],[250,78,210],[250,80,229],[249,81,249],[246,82,251],[243,81,252],[241,84,253],[239,87,253],[237,91,253],[233,95,253],[228,100,255],[230,107,254]],[[250,108,62],[251,107,70],[250,107,97],[250,107,123],[251,110,155],[251,110,190],[250,112,208],[249,113,228],[247,113,248],[244,115,252],[242,115,254],[240,116,254],[239,117,255],[236,117,255],[233,118,255],[230,118,255],[234,131,255]],[[249,126,64],[247,126,72],[248,126,99],[248,130,124],[247,129,156],[247,131,187],[248,131,208],[247,134,227],[241,131,246],[240,133,253],[238,135,255],[238,137,255],[236,136,255],[235,136,255],[232,139,255],[231,141,255],[232,149,255]],[[245,151,68],[245,150,76],[245,150,103],[245,153,125],[245,154,156],[244,155,188],[244,157,207],[244,158,227],[243,160,248],[241,161,254],[239,162,255],[236,160,255],[235,163,255],[233,165,255],[232,165,255],[226,166,255],[231,174,255]],[[240,174,73],[241,176,77],[240,176,104],[240,177,126],[240,177,157],[241,179,188],[241,180,206],[239,182,226],[239,184,246],[237,185,254],[237,187,255],[233,188,255],[233,189,255],[230,190,255],[227,190,255],[226,192,255],[228,203,255]],[[236,193,75],[236,193,81],[237,194,105],[236,194,127],[237,196,157],[235,196,188],[236,198,204],[235,200,224],[235,201,245],[233,204,253],[232,205,255],[230,206,255],[228,208,255],[227,208,255],[227,209,255],[224,211,255],[228,222,255]],[[231,212,79],[231,212,85],[232,213,108],[232,214,129],[233,216,160],[232,218,189],[233,219,209],[231,221,223],[230,221,244],[231,221,254],[228,223,255],[230,224,255],[228,227,255],[227,225,255],[224,227,255],[225,232,255],[226,239,255]],[[227,222,82],[227,223,87],[227,224,111],[227,224,130],[227,226,158],[227,228,188],[230,228,208],[231,228,226],[231,231,243],[228,232,252],[230,234,255],[227,235,255],[225,236,255],[224,238,255],[224,239,255],[223,244,255],[225,250,255]],[[223,231,83],[226,233,90],[225,232,112],[225,233,133],[226,235,161],[227,236,189],[227,237,207],[227,237,227],[230,240,243],[226,242,252],[226,244,255],[226,244,255],[226,246,255],[224,247,255],[222,248,255],[222,252,255],[222,255,255]],[[225,241,87],[224,240,92],[223,241,114],[225,242,136],[226,243,161],[225,243,190],[225,245,208],[228,246,226],[226,248,243],[227,249,253],[223,251,255],[222,252,255],[223,253,255],[220,253,255],[218,253,255],[220,255,255],[223,255,255]],[[223,247,90],[223,247,95],[224,247,119],[225,248,138],[225,249,164],[224,250,190],[225,251,208],[224,252,225],[223,253,242],[223,253,253],[221,254,255],[221,254,255],[218,254,255],[217,255,255],[216,255,255],[217,255,255],[221,255,255]],[[221,254,96],[222,253,99],[220,253,122],[222,253,140],[222,253,166],[221,254,192],[220,254,206],[220,254,225],[220,255,242],[218,254,250],[217,254,255],[217,255,255],[216,255,255],[213,255,255],[214,255,255],[217,255,255],[212,255,255]],[[217,253,97],[218,254,102],[218,254,123],[219,254,142],[219,254,167],[217,254,191],[218,255,208],[216,255,224],[219,255,242],[217,255,249],[216,255,254],[216,255,255],[213,255,255],[212,255,255],[214,255,255],[218,255,255],[220,255,255]]],[[[246,21,45],[246,20,51],[249,21,84],[252,22,108],[251,22,143],[251,23,177],[252,23,200],[251,22,221],[249,26,243],[251,32,249],[251,39,249],[252,44,251],[250,50,250],[248,54,252],[246,61,252],[245,67,253],[243,73,254]],[[248,26,47],[249,25,52],[251,26,83],[252,26,108],[252,26,143],[251,26,180],[252,27,200],[253,27,223],[251,30,244],[251,36,249],[250,42,250],[250,48,251],[250,53,251],[249,59,251],[247,64,251],[244,71,254],[244,77,252]],[[251,34,48],[251,34,55],[252,34,87],[253,35,111],[253,35,146],[254,35,181],[253,35,202],[253,36,224],[253,40,246],[253,44,249],[252,52,251],[252,58,251],[251,62,252],[249,67,252],[247,72,254],[245,78,253],[245,84,254]],[[253,45,52],[253,45,57],[254,45,90],[254,46,112],[254,46,147],[254,46,184],[253,47,204],[254,47,225],[254,50,244],[252,54,250],[251,61,251],[250,65,251],[251,70,252],[250,75,252],[247,81,253],[243,86,255],[243,91,255]],[[251,68,52],[252,68,60],[252,68,91],[253,69,116],[252,69,145],[253,71,183],[253,71,204],[253,71,224],[252,74,245],[252,76,250],[252,78,252],[251,80,253],[251,85,253],[249,89,254],[248,93,254],[244,97,255],[244,104,255]],[[254,99,59],[253,100,65],[254,100,94],[253,101,118],[254,103,149],[255,105,185],[254,107,204],[253,106,223],[253,109,247],[252,111,251],[251,111,254],[251,111,255],[249,112,255],[247,113,255],[245,114,255],[243,115,254],[246,125,255]],[[253,119,61],[253,119,70],[253,121,96],[253,122,119],[254,123,149],[254,125,184],[253,125,203],[253,128,224],[252,130,246],[252,131,252],[250,132,255],[249,132,254],[246,133,255],[245,134,255],[244,135,255],[243,137,255],[244,145,255]],[[251,145,63],[250,145,72],[252,147,98],[251,147,123],[252,149,153],[252,151,183],[252,151,203],[252,153,225],[251,155,246],[250,156,252],[247,157,255],[248,158,255],[246,159,255],[245,159,255],[244,159,255],[241,161,255],[243,171,255]],[[247,169,69],[247,170,74],[248,171,101],[250,172,123],[249,174,153],[249,175,186],[248,176,202],[248,178,221],[248,180,244],[247,183,254],[246,184,255],[245,185,255],[244,185,255],[243,188,255],[242,189,255],[239,191,255],[244,203,255]],[[245,189,72],[244,190,80],[245,191,103],[245,190,124],[245,192,154],[245,194,186],[245,195,203],[246,197,221],[246,200,243],[244,202,253],[243,203,255],[242,204,255],[241,206,255],[241,208,255],[239,208,255],[239,211,255],[242,221,255]],[[240,210,76],[240,209,83],[241,209,105],[241,211,126],[241,212,155],[241,214,186],[241,215,204],[241,216,221],[240,219,242],[240,220,252],[238,223,255],[238,223,255],[238,224,255],[236,226,255],[236,227,255],[238,232,255],[239,239,255]],[[237,220,81],[238,221,84],[238,221,108],[238,222,129],[238,224,157],[240,226,186],[239,226,204],[237,228,222],[238,230,242],[238,230,252],[239,232,255],[237,234,255],[237,235,255],[237,237,255],[237,237,255],[237,242,255],[239,250,255]],[[235,229,83],[235,230,88],[235,230,110],[235,231,131],[234,232,157],[236,233,187],[235,235,204],[237,235,226],[239,237,238],[237,240,253],[237,241,255],[236,242,255],[236,244,255],[235,245,255],[235,246,255],[237,251,255],[236,254,255]],[[233,239,84],[234,239,90],[233,239,113],[233,240,133],[235,241,158],[236,241,187],[236,243,205],[236,243,223],[238,246,241],[236,248,252],[236,250,255],[236,250,255],[234,251,255],[234,253,255],[232,253,255],[232,255,255],[234,255,255]],[[231,245,87],[230,245,91],[232,246,115],[232,246,134],[234,248,161],[234,249,187],[235,249,205],[234,250,224],[234,252,243],[234,253,251],[234,254,255],[234,254,255],[232,255,255],[231,255,255],[231,255,255],[230,255,255],[234,255,255]],[[230,252,92],[230,253,98],[230,253,119],[230,254,137],[231,253,162],[231,254,189],[233,254,204],[231,254,223],[231,254,241],[230,254,249],[228,255,254],[228,255,255],[223,255,255],[225,255,255],[227,255,255],[228,255,255],[234,255,255]],[[228,254,96],[228,253,101],[230,254,121],[230,254,141],[230,254,165],[228,255,189],[230,254,205],[230,254,224],[231,255,244],[230,255,249],[227,255,254],[230,255,255],[228,255,255],[225,255,255],[227,255,255],[231,255,255],[233,255,255]]],[[[248,20,45],[248,21,49],[251,20,78],[252,20,103],[252,22,136],[253,22,172],[253,21,193],[253,21,216],[252,23,238],[252,29,246],[252,36,249],[254,41,251],[253,47,250],[254,53,251],[253,58,252],[252,65,252],[253,71,252]],[[249,24,44],[249,25,48],[251,25,78],[253,25,104],[254,25,138],[253,27,173],[253,26,193],[254,26,218],[253,28,239],[252,32,248],[253,39,249],[253,45,251],[254,51,251],[254,55,251],[253,61,253],[252,68,252],[254,76,254]],[[252,33,47],[252,33,52],[254,33,81],[254,34,107],[254,35,140],[254,35,174],[253,35,197],[253,35,220],[253,37,240],[253,41,249],[252,49,249],[254,53,253],[254,60,251],[254,64,252],[254,70,252],[253,75,253],[253,81,253]],[[253,43,51],[254,43,55],[255,43,83],[255,44,109],[253,44,140],[255,44,177],[254,46,198],[253,45,221],[253,48,241],[252,50,249],[253,58,251],[254,63,251],[254,68,251],[253,72,252],[253,76,253],[251,83,253],[254,90,254]],[[254,62,52],[253,62,57],[254,62,86],[253,63,112],[252,64,142],[254,64,180],[254,65,197],[254,66,220],[254,70,243],[253,72,249],[253,74,251],[255,78,253],[255,81,253],[254,85,252],[253,90,253],[252,95,254],[254,102,255]],[[254,94,55],[253,94,61],[254,95,89],[254,96,112],[254,96,144],[254,98,178],[255,99,199],[254,100,221],[255,105,243],[255,104,251],[255,107,254],[254,107,254],[254,108,254],[253,109,253],[253,110,254],[254,113,255],[255,124,255]],[[255,113,58],[254,113,64],[254,115,92],[254,116,114],[254,117,144],[255,118,178],[255,119,199],[255,122,221],[255,125,242],[255,125,251],[255,129,255],[254,131,254],[255,130,255],[255,131,255],[253,132,255],[251,132,255],[255,143,255]],[[255,139,60],[255,139,67],[255,139,94],[255,140,117],[255,141,147],[255,145,178],[255,145,199],[255,146,220],[255,150,242],[255,152,252],[255,153,255],[255,154,255],[253,155,255],[252,158,255],[253,159,255],[252,159,255],[254,171,255]],[[253,164,64],[253,165,72],[254,166,97],[254,168,119],[254,168,148],[254,169,180],[253,171,199],[255,173,220],[254,176,241],[253,177,252],[254,181,255],[252,181,255],[252,182,255],[251,183,255],[250,185,255],[249,187,255],[253,197,255]],[[250,185,70],[251,185,75],[251,186,100],[252,187,120],[252,189,150],[253,191,182],[253,192,201],[252,194,218],[251,195,240],[251,196,252],[250,199,255],[251,201,255],[251,202,255],[250,204,255],[249,206,255],[249,209,255],[250,216,255]],[[246,204,74],[247,205,79],[248,206,102],[248,207,122],[249,209,151],[249,210,183],[249,212,201],[248,214,220],[250,217,241],[248,218,252],[248,221,255],[247,221,255],[247,222,255],[246,224,255],[246,225,255],[246,229,255],[250,238,255]],[[245,217,75],[244,217,81],[245,218,104],[246,220,125],[245,220,152],[247,222,183],[246,223,200],[246,224,220],[245,227,239],[245,228,252],[245,231,255],[245,231,255],[245,233,255],[245,234,255],[244,236,255],[246,240,255],[249,248,255]],[[243,227,80],[244,227,86],[243,228,107],[243,229,127],[245,230,156],[244,231,183],[243,232,200],[243,234,222],[242,237,237],[244,238,252],[245,240,255],[246,241,255],[244,243,255],[245,243,255],[245,245,255],[245,250,255],[247,254,255]],[[241,237,82],[241,235,87],[241,237,111],[241,238,130],[240,239,155],[240,240,183],[241,241,201],[244,242,223],[245,243,241],[245,246,251],[245,248,255],[243,249,255],[243,250,255],[239,249,255],[239,250,255],[243,253,255],[244,255,255]],[[239,243,85],[239,242,90],[238,244,113],[240,246,132],[240,246,157],[241,246,186],[243,248,203],[243,248,224],[245,249,243],[243,252,251],[244,254,255],[243,254,255],[242,254,255],[242,254,255],[243,254,255],[242,255,255],[242,255,255]],[[236,251,90],[238,251,95],[237,252,117],[238,252,135],[240,253,161],[240,254,187],[239,254,204],[240,254,221],[240,254,242],[241,254,249],[241,254,253],[241,254,255],[241,255,255],[240,255,255],[241,255,255],[242,255,255],[242,255,255]],[[235,255,92],[235,254,99],[237,254,120],[238,254,139],[238,254,162],[239,254,189],[239,254,204],[239,254,222],[240,254,242],[240,254,249],[238,254,253],[238,254,255],[240,255,255],[239,255,255],[239,255,255],[242,255,255],[244,255,255]]],[[[249,19,43],[249,20,49],[251,20,74],[252,20,99],[253,21,131],[253,22,165],[253,22,186],[253,21,210],[253,21,234],[253,26,246],[253,33,249],[253,37,250],[254,43,251],[254,50,250],[254,54,251],[255,61,252],[255,67,252]],[[250,24,43],[250,24,47],[251,24,74],[252,24,99],[253,25,132],[252,24,167],[253,25,188],[253,24,212],[254,25,235],[253,29,247],[254,36,249],[253,42,251],[254,48,251],[254,54,250],[255,57,251],[253,65,251],[255,70,253]],[[252,32,45],[253,32,50],[253,32,76],[253,33,102],[253,33,133],[253,33,168],[254,34,190],[255,34,212],[255,34,238],[255,38,248],[254,45,249],[254,51,251],[254,55,251],[254,61,251],[254,65,251],[255,72,252],[255,78,252]],[[253,40,47],[253,41,53],[255,42,78],[255,42,105],[254,43,133],[255,43,170],[254,43,193],[254,44,215],[254,45,239],[254,49,248],[253,54,251],[255,61,251],[254,65,251],[255,69,252],[255,73,251],[254,79,253],[255,87,252]],[[253,58,49],[254,57,55],[254,58,82],[254,59,108],[253,60,136],[254,60,172],[254,60,194],[255,60,217],[254,63,237],[253,65,248],[254,69,251],[254,74,253],[255,79,252],[254,82,252],[255,86,252],[254,92,253],[255,98,254]],[[254,87,53],[254,87,59],[254,88,86],[254,88,110],[255,92,140],[254,92,173],[255,93,194],[255,94,216],[254,97,239],[254,99,249],[254,101,253],[254,102,253],[255,103,254],[255,105,254],[255,105,253],[255,109,254],[255,118,255]],[[255,108,57],[254,108,61],[254,110,88],[254,109,111],[254,113,140],[255,114,173],[255,114,195],[255,114,215],[255,116,239],[255,120,251],[255,124,254],[255,123,254],[254,124,253],[255,128,255],[255,128,255],[255,130,255],[255,142,255]],[[255,132,58],[255,133,65],[255,135,91],[254,135,113],[255,138,143],[255,139,176],[255,142,193],[255,142,216],[255,145,240],[255,145,251],[255,150,255],[255,151,255],[255,152,255],[255,153,254],[255,152,255],[255,155,255],[255,167,255]],[[255,159,62],[255,159,67],[254,160,94],[255,162,115],[255,165,144],[255,167,176],[255,169,194],[255,170,216],[255,171,238],[255,172,251],[255,175,255],[255,176,255],[255,178,255],[255,181,255],[255,182,255],[255,184,255],[255,197,255]],[[254,180,67],[254,181,71],[255,181,97],[255,183,116],[254,184,148],[255,186,178],[255,186,196],[255,189,216],[255,190,237],[254,193,251],[255,195,255],[255,197,255],[255,199,255],[255,201,255],[255,203,255],[255,205,255],[255,215,255]],[[252,201,70],[253,202,76],[253,204,98],[254,204,118],[254,205,148],[254,207,180],[254,208,196],[255,210,216],[255,212,239],[254,215,251],[255,218,255],[254,218,255],[253,221,255],[254,222,255],[254,223,255],[254,227,255],[255,234,255]],[[251,214,73],[251,215,79],[248,212,98],[249,214,120],[250,217,148],[252,219,179],[253,220,197],[253,223,217],[253,225,237],[253,226,251],[253,229,255],[253,231,255],[252,232,255],[252,233,255],[252,235,255],[254,239,255],[254,244,255]],[[248,224,75],[249,225,82],[250,226,104],[251,227,124],[250,228,151],[249,228,178],[250,231,198],[251,231,217],[249,235,236],[251,236,251],[251,238,254],[252,240,255],[252,242,255],[252,243,255],[251,244,255],[253,249,255],[255,253,255]],[[248,232,79],[247,232,85],[248,234,106],[249,235,126],[248,237,152],[249,238,182],[250,239,200],[250,242,221],[248,244,242],[250,245,249],[252,248,255],[252,248,255],[253,249,255],[251,250,255],[252,252,255],[254,253,255],[253,255,255]],[[247,241,84],[247,242,90],[247,242,109],[247,244,130],[247,245,154],[247,245,182],[249,246,199],[247,248,221],[251,248,243],[251,251,249],[250,253,255],[253,254,255],[251,254,255],[249,254,255],[252,254,255],[251,255,255],[254,255,255]],[[245,250,88],[245,249,93],[245,251,113],[244,251,133],[245,252,159],[246,252,184],[247,254,200],[248,253,220],[249,254,242],[250,254,250],[249,254,255],[249,254,255],[249,255,255],[249,255,255],[250,255,255],[249,255,255],[251,255,255]],[[244,255,93],[242,254,96],[243,255,116],[243,255,133],[244,255,160],[246,254,187],[247,254,203],[248,254,221],[248,254,241],[249,254,249],[249,254,253],[248,255,255],[248,255,255],[247,255,255],[247,255,255],[248,255,255],[249,255,255]]],[[[249,18,42],[251,19,47],[252,20,71],[251,20,92],[252,20,124],[253,20,157],[252,20,178],[253,20,202],[254,20,226],[252,21,244],[255,28,249],[253,33,250],[255,39,250],[254,43,251],[254,50,251],[254,58,252],[254,62,252]],[[250,22,42],[250,23,47],[251,23,69],[252,24,93],[254,24,123],[252,24,158],[253,24,181],[253,24,203],[255,24,229],[254,26,243],[253,32,249],[253,38,249],[254,43,250],[255,49,250],[254,53,251],[255,61,251],[255,67,252]],[[251,30,44],[253,30,50],[253,30,70],[252,31,95],[255,31,126],[254,32,160],[254,32,183],[254,33,206],[255,33,231],[255,35,246],[254,40,249],[255,46,250],[255,51,250],[255,56,251],[255,60,251],[254,67,252],[255,76,254]],[[252,39,46],[254,39,51],[254,39,72],[254,39,97],[255,40,127],[254,41,162],[255,42,185],[255,42,208],[255,43,232],[255,45,246],[254,49,249],[255,54,251],[255,59,250],[254,64,251],[255,70,252],[255,75,252],[255,83,254]],[[254,53,48],[254,53,53],[254,53,78],[254,55,101],[255,55,130],[254,56,165],[255,57,187],[254,57,211],[255,59,235],[255,62,247],[255,64,250],[255,70,251],[254,74,251],[255,79,252],[255,82,252],[255,87,253],[255,94,253]],[[254,80,51],[254,79,56],[254,80,79],[254,81,103],[254,83,133],[254,86,166],[255,85,188],[255,87,208],[255,88,233],[255,92,247],[255,96,252],[255,94,252],[255,98,253],[254,96,253],[255,99,253],[255,104,253],[255,111,253]],[[255,99,51],[255,99,58],[254,102,81],[254,102,105],[255,103,135],[255,106,166],[255,108,189],[255,109,212],[255,108,234],[255,112,248],[255,114,252],[255,118,254],[255,120,253],[255,120,254],[255,120,254],[255,122,255],[255,133,255]],[[255,124,54],[255,125,61],[255,125,86],[255,129,108],[255,130,135],[255,132,170],[255,133,188],[255,136,210],[255,139,237],[255,140,249],[255,140,253],[255,141,255],[255,145,255],[255,147,254],[255,149,255],[255,151,255],[255,160,255]],[[255,153,58],[255,152,65],[255,153,89],[255,157,110],[255,159,139],[255,160,172],[255,161,190],[255,164,211],[255,166,234],[255,167,250],[255,171,254],[255,172,255],[255,173,255],[255,175,255],[255,176,254],[255,179,255],[255,193,255]],[[255,173,61],[255,174,66],[255,175,90],[255,175,112],[255,178,141],[255,181,171],[255,182,190],[255,184,210],[255,186,235],[255,189,249],[255,190,254],[255,192,255],[255,195,255],[255,197,255],[255,198,255],[255,202,255],[255,211,255]],[[255,196,66],[255,198,71],[255,197,94],[255,199,116],[255,200,142],[255,202,173],[255,203,192],[255,205,213],[255,208,233],[255,209,248],[255,213,255],[255,215,255],[255,218,255],[255,219,255],[255,220,255],[255,225,255],[255,232,255]],[[255,210,70],[255,209,74],[255,211,97],[255,211,117],[254,213,144],[255,215,177],[255,216,193],[255,218,214],[255,220,233],[255,222,249],[255,225,255],[255,227,255],[255,229,255],[255,230,255],[255,231,255],[255,236,255],[255,242,255]],[[254,220,73],[254,220,77],[254,221,100],[255,224,120],[255,224,148],[255,226,176],[255,226,193],[255,227,214],[255,229,235],[255,232,248],[255,234,255],[255,237,255],[255,238,255],[255,242,255],[255,242,255],[255,246,255],[255,251,255]],[[253,229,76],[254,229,81],[254,230,102],[255,232,124],[254,233,149],[254,234,177],[255,235,194],[255,237,213],[254,239,236],[254,241,248],[254,244,255],[255,245,255],[255,246,255],[255,249,255],[255,249,255],[255,252,255],[255,253,255]],[[252,238,79],[253,239,85],[253,238,105],[253,239,125],[254,241,150],[254,243,179],[254,244,196],[254,245,216],[253,247,238],[253,249,248],[255,250,253],[255,251,255],[255,252,255],[255,253,255],[255,254,255],[255,254,255],[255,254,255]],[[252,247,83],[252,248,90],[252,247,110],[252,249,129],[253,250,154],[253,251,181],[253,252,197],[254,254,219],[254,254,241],[255,253,252],[255,254,254],[255,254,255],[255,255,255],[255,254,255],[255,255,255],[255,255,255],[255,255,255]],[[250,252,87],[251,253,93],[250,253,114],[251,253,132],[251,254,156],[250,254,184],[251,254,198],[252,255,217],[254,254,240],[255,254,252],[254,254,254],[255,254,255],[255,255,255],[255,255,255],[255,255,255],[255,255,255],[255,255,255]]],[[[253,19,41],[252,20,46],[253,20,67],[252,20,90],[252,20,119],[252,19,153],[251,19,172],[253,19,197],[253,19,224],[253,19,240],[254,27,249],[253,32,249],[254,37,249],[254,42,250],[254,47,250],[254,54,251],[255,61,251]],[[252,22,42],[251,22,45],[252,22,67],[252,23,89],[251,23,118],[253,23,153],[252,23,175],[254,23,197],[254,24,224],[254,24,240],[253,30,250],[254,35,248],[254,40,250],[255,45,250],[255,51,251],[255,57,250],[255,66,252]],[[251,29,43],[251,29,47],[252,31,68],[252,30,90],[255,31,121],[254,31,155],[253,31,176],[254,31,201],[255,32,227],[253,33,242],[255,38,249],[255,43,251],[254,47,249],[255,52,250],[255,58,251],[255,65,251],[255,70,252]],[[253,37,43],[252,37,48],[253,38,68],[254,38,93],[255,40,123],[253,40,157],[255,40,180],[254,40,203],[255,42,228],[255,42,243],[254,47,248],[255,51,249],[255,57,251],[255,62,250],[255,66,252],[255,72,252],[255,79,252]],[[253,51,48],[253,50,52],[253,51,72],[255,51,96],[255,53,125],[254,54,160],[255,55,183],[255,56,206],[254,57,232],[255,58,244],[255,62,248],[255,66,250],[255,71,251],[255,75,252],[254,80,252],[254,85,252],[255,93,252]],[[254,75,49],[254,75,54],[254,75,74],[254,77,99],[254,78,129],[255,79,161],[255,80,182],[255,82,207],[255,84,232],[255,85,247],[255,88,250],[255,90,252],[255,91,252],[255,95,252],[255,97,253],[255,103,252],[255,113,254]],[[255,94,50],[255,94,53],[255,95,77],[254,96,101],[255,97,130],[255,101,163],[255,102,185],[255,105,209],[255,106,235],[255,106,247],[255,112,251],[255,113,253],[255,115,253],[255,116,253],[255,116,254],[255,117,255],[255,131,255]],[[255,121,53],[255,119,58],[255,121,80],[255,123,103],[255,125,131],[255,126,166],[255,129,185],[255,131,208],[255,134,233],[255,135,248],[255,139,251],[255,140,254],[255,142,254],[255,143,255],[255,146,254],[255,149,254],[255,163,255]],[[255,148,57],[255,149,60],[255,149,85],[255,151,107],[255,154,133],[255,155,168],[255,156,187],[255,159,207],[255,161,232],[255,163,248],[255,167,252],[255,168,254],[255,170,255],[255,171,254],[255,174,255],[255,179,255],[255,189,255]],[[255,170,59],[255,171,64],[255,172,88],[255,173,109],[255,174,137],[255,176,167],[255,178,187],[255,180,207],[255,182,231],[255,185,248],[255,189,253],[255,190,255],[255,191,255],[255,193,255],[255,195,255],[255,200,255],[255,212,255]],[[255,193,63],[255,193,70],[255,194,92],[255,197,112],[255,196,140],[255,199,169],[255,200,189],[255,202,210],[255,204,231],[255,206,247],[255,211,253],[255,213,255],[255,214,255],[255,217,255],[255,218,255],[255,224,255],[255,224,255]],[[255,206,66],[255,206,72],[255,208,95],[255,209,114],[255,210,141],[255,212,170],[255,214,188],[255,214,210],[255,217,230],[255,220,247],[255,222,254],[255,226,255],[255,227,255],[255,228,255],[255,229,255],[255,236,255],[255,241,255]],[[255,218,68],[255,218,74],[255,220,97],[255,220,116],[255,222,145],[255,223,173],[255,224,191],[255,226,211],[255,228,234],[255,231,248],[255,232,253],[255,235,255],[255,236,255],[255,238,255],[255,241,255],[255,245,255],[255,251,255]],[[255,227,72],[254,228,78],[255,228,99],[255,228,120],[255,230,146],[255,232,174],[255,232,191],[255,235,213],[255,236,235],[255,239,247],[255,241,253],[255,243,254],[255,245,255],[255,246,255],[255,248,255],[255,252,255],[255,253,255]],[[254,234,77],[255,234,81],[255,235,102],[255,236,122],[255,238,148],[255,240,176],[255,240,192],[255,243,213],[255,244,235],[255,247,247],[255,249,253],[255,250,255],[255,252,255],[255,253,255],[255,253,255],[255,253,255],[255,253,255]],[[255,245,82],[254,246,86],[255,246,108],[255,247,127],[255,248,151],[255,249,178],[255,249,193],[255,251,212],[254,253,239],[255,253,252],[255,253,253],[255,253,255],[255,253,255],[255,253,255],[255,253,255],[255,254,255],[255,254,255]],[[254,250,85],[254,251,89],[254,252,111],[255,252,130],[255,253,154],[254,254,179],[254,254,195],[254,253,215],[255,253,240],[255,254,250],[255,253,254],[255,253,255],[255,253,255],[255,255,255],[255,254,255],[255,255,255],[255,255,255]]]],"increment":16}
\ No newline at end of file
diff --git a/Source/lumatone_editor_library/assets/png/KeyShadow.png b/Source/lumatone_editor_library/assets/png/KeyShadow.png
new file mode 100644
index 00000000..dd49f1d8
Binary files /dev/null and b/Source/lumatone_editor_library/assets/png/KeyShadow.png differ
diff --git a/Source/lumatone_editor_library/assets/png/KeyShadow@16x.png b/Source/lumatone_editor_library/assets/png/KeyShadow@16x.png
new file mode 100644
index 00000000..cb0b6228
Binary files /dev/null and b/Source/lumatone_editor_library/assets/png/KeyShadow@16x.png differ
diff --git a/Source/lumatone_editor_library/assets/png/KeyShadow@2x.png b/Source/lumatone_editor_library/assets/png/KeyShadow@2x.png
new file mode 100644
index 00000000..0a0c7529
Binary files /dev/null and b/Source/lumatone_editor_library/assets/png/KeyShadow@2x.png differ
diff --git a/Source/lumatone_editor_library/assets/png/KeyShadow@4x.png b/Source/lumatone_editor_library/assets/png/KeyShadow@4x.png
new file mode 100644
index 00000000..3834572c
Binary files /dev/null and b/Source/lumatone_editor_library/assets/png/KeyShadow@4x.png differ
diff --git a/Source/lumatone_editor_library/assets/png/KeyShadow@8x.png b/Source/lumatone_editor_library/assets/png/KeyShadow@8x.png
new file mode 100644
index 00000000..a7e7211c
Binary files /dev/null and b/Source/lumatone_editor_library/assets/png/KeyShadow@8x.png differ
diff --git a/Source/lumatone_editor_library/assets/png/KeyShape.png b/Source/lumatone_editor_library/assets/png/KeyShape.png
new file mode 100644
index 00000000..cee8e97a
Binary files /dev/null and b/Source/lumatone_editor_library/assets/png/KeyShape.png differ
diff --git a/Source/lumatone_editor_library/assets/png/KeyShape@16.png b/Source/lumatone_editor_library/assets/png/KeyShape@16.png
new file mode 100644
index 00000000..11b70891
Binary files /dev/null and b/Source/lumatone_editor_library/assets/png/KeyShape@16.png differ
diff --git a/Source/lumatone_editor_library/assets/png/KeyShape@2x.png b/Source/lumatone_editor_library/assets/png/KeyShape@2x.png
new file mode 100644
index 00000000..cda57b55
Binary files /dev/null and b/Source/lumatone_editor_library/assets/png/KeyShape@2x.png differ
diff --git a/Source/lumatone_editor_library/assets/png/KeyShape@4x.png b/Source/lumatone_editor_library/assets/png/KeyShape@4x.png
new file mode 100644
index 00000000..5444046e
Binary files /dev/null and b/Source/lumatone_editor_library/assets/png/KeyShape@4x.png differ
diff --git a/Source/lumatone_editor_library/assets/png/KeyShape@8x.png b/Source/lumatone_editor_library/assets/png/KeyShape@8x.png
new file mode 100644
index 00000000..cc76b56f
Binary files /dev/null and b/Source/lumatone_editor_library/assets/png/KeyShape@8x.png differ
diff --git a/Source/lumatone_editor_library/assets/png/KeyboardBase.png b/Source/lumatone_editor_library/assets/png/KeyboardBase.png
new file mode 100644
index 00000000..2077d17c
Binary files /dev/null and b/Source/lumatone_editor_library/assets/png/KeyboardBase.png differ
diff --git a/Source/lumatone_editor_library/assets/png/KeyboardBase@2x.png b/Source/lumatone_editor_library/assets/png/KeyboardBase@2x.png
new file mode 100644
index 00000000..8f42161c
Binary files /dev/null and b/Source/lumatone_editor_library/assets/png/KeyboardBase@2x.png differ
diff --git a/Source/lumatone_editor_library/assets/png/KeyboardBase@4x.png b/Source/lumatone_editor_library/assets/png/KeyboardBase@4x.png
new file mode 100644
index 00000000..7b744135
Binary files /dev/null and b/Source/lumatone_editor_library/assets/png/KeyboardBase@4x.png differ
diff --git a/Source/lumatone_editor_library/assets/png/KeyboardBase@8x.png b/Source/lumatone_editor_library/assets/png/KeyboardBase@8x.png
new file mode 100644
index 00000000..580f4093
Binary files /dev/null and b/Source/lumatone_editor_library/assets/png/KeyboardBase@8x.png differ
diff --git a/Source/lumatone_editor_library/color/adjust_layout_colour.cpp b/Source/lumatone_editor_library/color/adjust_layout_colour.cpp
new file mode 100644
index 00000000..cf6eba22
--- /dev/null
+++ b/Source/lumatone_editor_library/color/adjust_layout_colour.cpp
@@ -0,0 +1,683 @@
+#include "adjust_layout_colour.h"
+#include "../data/lumatone_state.h"
+
+AdjustLayoutColour::AdjustLayoutColour(LumatoneState* stateIn)
+    : state(stateIn)
+    , hexMap(stateIn->shareMappingData())
+{
+    endAction();
+}
+
+AdjustLayoutColour::~AdjustLayoutColour()
+{
+}
+
+void AdjustLayoutColour::replaceColour(juce::Colour oldColour, juce::Colour newColour, bool sendUpdate)
+{
+    auto keyCoords = layoutBeforeAdjust.getKeysWithColour(oldColour);
+    juce::Array<MappedLumatoneKey> keyUpdates;
+
+    for (auto coord : keyCoords)
+    {
+        auto key = currentLayout.getKey(coord.boardIndex, coord.keyIndex);
+        key.setColour(newColour);
+        keyUpdates.add(MappedLumatoneKey(key, coord));
+    }
+
+    if (sendUpdate)
+        sendSelectionUpdate(keyUpdates, true);
+}
+
+bool AdjustLayoutColour::rotateHue(float change, LumatoneKey& key)
+{
+    if  (   key.getColour().isTransparent()
+        ||  (   (key.getColour().getRed() == key.getColour().getGreen())
+            &&  (key.getColour().getRed() == key.getColour().getBlue())
+            )
+        )
+        return false;
+
+    key.getColour() = key.getColour().withRotatedHue(change);
+    return true;
+}
+
+void AdjustLayoutColour::rotateHue(float change, bool sendUpdate)
+{
+    auto coords = currentLayout.getAllKeyCoords();
+
+    hueRotateValue = change;
+    auto updatedKeys = updateAdjustedColoursState(coords);
+
+    // rotateHue(change, coords, false);
+    if (sendUpdate)
+        sendSelectionUpdate(updatedKeys, true);
+}
+
+void AdjustLayoutColour::rotateHue(float change, const juce::Array<LumatoneKeyCoord>& selection, bool sendUpdate)
+{
+    if (currentAction != AdjustLayoutColour::Type::ROTATEHUE)
+    {
+        beginAction(AdjustLayoutColour::Type::ROTATEHUE);
+        currentLayout = *state->getMappingData();
+    }
+
+    juce::Array<MappedLumatoneKey> updateKeys;
+    for (auto coord : selection)
+    {
+        LumatoneKey key = currentLayout.getKey(coord.boardIndex, coord.keyIndex);
+        key.setColour(layoutBeforeAdjust.getKey(coord.boardIndex, coord.keyIndex).getColour());
+        if (rotateHue(change, key))
+            updateKeys.add(MappedLumatoneKey(key, coord));
+    }
+
+    if (sendUpdate)
+        sendSelectionUpdate(updateKeys, true);
+}
+
+bool AdjustLayoutColour::multiplyBrightness(float change, LumatoneKey& key)
+{
+    if (key.getColour().isTransparent())
+        return false;
+
+     key.getColour() = key.getColour().withMultipliedBrightness(change);
+     return true;
+}
+
+void AdjustLayoutColour::multiplyBrightness(float change, bool sendUpdate)
+{
+    auto coords = currentLayout.getAllKeyCoords();
+
+    multiplyBrightnessValue = change;
+    auto updatedKeys = updateAdjustedColoursState(coords);
+
+    // multiplyBrightness(change, coords, false);
+    if (sendUpdate)
+        sendSelectionUpdate(updatedKeys, true);
+}
+
+void AdjustLayoutColour::multiplyBrightness(float change, const juce::Array<LumatoneKeyCoord>& selection, bool sendUpdate)
+{
+    if (currentAction != AdjustLayoutColour::Type::ADJUSTBRIGHTNESS)
+    {
+        beginAction(AdjustLayoutColour::Type::ADJUSTBRIGHTNESS);
+        currentLayout = *state->getMappingData();
+    }
+
+    juce::Array<MappedLumatoneKey> updateKeys;
+    for (auto coord : selection)
+    {
+        auto key = currentLayout.getKey(coord.boardIndex, coord.keyIndex);
+        key.setColour(layoutBeforeAdjust.getKey(coord.boardIndex, coord.keyIndex).getColour());
+        if (multiplyBrightness(change, key))
+            updateKeys.add(MappedLumatoneKey(key, coord));
+    }
+
+    if (sendUpdate)
+        sendSelectionUpdate(updateKeys, true);
+}
+
+bool AdjustLayoutColour::multiplySaturation(float change, LumatoneKey& key)
+{
+    if (key.getColour().isTransparent())
+        return false;
+
+    key.getColour() = key.getColour().withMultipliedSaturation(change);
+    return true;
+}
+
+void AdjustLayoutColour::multiplySaturation(float change, bool sendUpdate)
+{
+    auto coords = currentLayout.getAllKeyCoords();
+
+    multiplySaturationValue = change;
+    auto updatedKeys = updateAdjustedColoursState(coords);
+
+    // multiplySaturation(change, coords, false);
+    if (sendUpdate)
+        sendSelectionUpdate(updatedKeys, true);
+}
+
+void AdjustLayoutColour::multiplySaturation(float change, const juce::Array<LumatoneKeyCoord>& selection, bool sendUpdate)
+{
+    if (currentAction != AdjustLayoutColour::Type::ADJUSTSATURATION)
+    {
+        beginAction(AdjustLayoutColour::Type::ADJUSTSATURATION);
+        currentLayout= *state->getMappingData();
+    }
+
+    juce::Array<MappedLumatoneKey> updateKeys;
+    for (auto coord : selection)
+    {
+        auto key = currentLayout.getKey(coord.boardIndex, coord.keyIndex);
+        key.setColour(layoutBeforeAdjust.getKey(coord.boardIndex, coord.keyIndex).getColour());
+        if (multiplySaturation(change, key))
+            updateKeys.add(MappedLumatoneKey(key, coord));
+    }
+
+    if (sendUpdate)
+        sendSelectionUpdate(updateKeys, true);
+}
+
+void AdjustLayoutColour::adjustWhiteBalance(int newWhitePoint, bool sendUpdate)
+{
+    auto coords = currentLayout.getAllKeyCoords();
+
+    whiteKelvinValue = newWhitePoint;
+    auto updatedKeys = updateAdjustedColoursState(coords);
+
+    // multiplySaturation(change, coords, false);
+    if (sendUpdate)
+        sendSelectionUpdate(updatedKeys, true);
+}
+
+void AdjustLayoutColour::adjustWhiteBalance(int newWhitePoint, const juce::Array<LumatoneKeyCoord>& selection, bool sendUpdate)
+{
+    if (currentAction != AdjustLayoutColour::Type::ADJUSTWHITE)
+    {
+        beginAction(AdjustLayoutColour::Type::ADJUSTWHITE);
+        currentLayout= *state->getMappingData();
+    }
+
+    juce::Array<MappedLumatoneKey> updateKeys;
+    for (auto coord : selection)
+    {
+        auto key = currentLayout.getKey(coord.boardIndex, coord.keyIndex);
+        key.setColour(layoutBeforeAdjust.getKey(coord.boardIndex, coord.keyIndex).getColour());
+
+        if (adjustWhiteBalance(newWhitePoint, key))
+            updateKeys.add(MappedLumatoneKey(key, coord));
+    }
+
+    if (sendUpdate)
+        sendSelectionUpdate(updateKeys, true);
+}
+
+bool AdjustLayoutColour::adjustWhiteBalance(int newWhitePoint, LumatoneKey& key)
+{
+    if (key.getColour().isTransparent())
+        return false;
+
+    // adjustWhiteBalanceLab(newWhitePoint, key);
+    adjustWhiteBalanceRgb(newWhitePoint, key);
+
+    return true;
+}
+
+void AdjustLayoutColour::adjustWhiteBalanceRgb(int newWhitePoint, LumatoneKey& key)
+{
+    auto newWhiteColour = kelvinToColour(newWhitePoint);
+    key.getColour() = juce::Colour(LumatoneEditor::roundToUint8(key.getColour().getRed() * newWhiteColour.getFloatRed()),
+                            LumatoneEditor::roundToUint8(key.getColour().getGreen() * newWhiteColour.getFloatGreen()),
+                            LumatoneEditor::roundToUint8(key.getColour().getBlue() * newWhiteColour.getFloatBlue()));
+}
+
+void AdjustLayoutColour::adjustWhiteBalanceLab(int newWhitePoint, LumatoneKey& key)
+{
+    auto newWhiteColour = kelvinToColour(newWhitePoint);
+
+    auto colourLab = rgbToLab(key.getColour());
+    auto oldWhiteLab = rgbToLab(juce::Colours::white);
+    auto newWhiteLab = rgbToLab(newWhiteColour);
+    LAB adjustedLab = {
+        colourLab.L + (newWhiteLab.L - oldWhiteLab.L) / 3.0f,
+        colourLab.A + (newWhiteLab.A - oldWhiteLab.A) / 3.0f,
+        colourLab.B + (newWhiteLab.B - oldWhiteLab.B) / 3.0f,
+        };
+
+    key.getColour() = labToRgb(adjustedLab);
+}
+
+void AdjustLayoutColour::setGradient(SetGradientOptions options)
+{
+    float originColumn = 0;
+    float originRow = 0;
+
+    float furthestColumn = 0;
+    float furthestRow = 0;
+
+    juce::Array<int> presentColumns;
+    juce::Array<int> presentRows;
+
+    juce::Array<Hex::Point> updateHexCoords;
+    for (auto coord : options.selection)
+    {
+        auto hex = hexMap.keyCoordsToHex(coord);
+        updateHexCoords.add(hex);
+
+        if (hex.q < originColumn)
+            originColumn = hex.q;
+        if (hex.r < originRow)
+            originRow = hex.r;
+
+        if (hex.q > furthestColumn)
+            furthestColumn = hex.q;
+        if (hex.r > furthestRow)
+            furthestRow = hex.r;
+
+        presentColumns.addIfNotAlreadyThere(hex.q);
+        presentRows.addIfNotAlreadyThere(hex.r);
+    }
+
+    presentColumns.sort();
+    presentRows.sort();
+
+    auto selectionOrigin = Hex::Point(originColumn, originRow);
+    auto furthestPoint = Hex::Point(furthestColumn, furthestRow);
+    int selectionDistance = furthestPoint.distanceTo(selectionOrigin);
+
+    auto boardOrigin = Hex::Point(0, 0);
+    int maxBoardDistance = 35;
+
+    juce::Array<MappedLumatoneKey> keyUpdates;
+
+    float maxGradientDistance = 1.0f;
+    if (options.selectionOrigin)
+    {
+        if (options.fillRelative)
+            maxGradientDistance = presentColumns.size();
+        else
+            maxGradientDistance = selectionDistance;
+    }
+    else
+    {
+        maxGradientDistance = maxBoardDistance;
+    }
+
+    float keyGradientDistance = 0.0f;
+    for (int i = 0; i < options.selection.size(); i++)
+    {
+        auto mappedKey = options.selection[i];
+        auto hex = updateHexCoords[i];
+
+        if (options.selectionOrigin)
+            {
+                if (options.fillRelative)
+                {
+                    keyGradientDistance = hex.q - presentColumns[0];
+                }
+                else
+                {
+                    keyGradientDistance = hex.distanceTo(selectionOrigin);
+                }
+            }
+        else
+        {
+            keyGradientDistance = hex.distanceTo(boardOrigin);
+        }
+
+        float t = (maxGradientDistance == 0.0f) ? 0.0f : keyGradientDistance / maxGradientDistance;
+        auto colour = options.gradient.getColourAtPosition(t);
+        auto key = currentLayout.getKey(mappedKey.boardIndex, mappedKey.keyIndex);
+        key.setColour(colour);
+
+        keyUpdates.add(MappedLumatoneKey(key, mappedKey.boardIndex, mappedKey.keyIndex));
+    }
+
+    sendSelectionUpdate(keyUpdates, false);
+}
+
+void AdjustLayoutColour::beginAction(AdjustLayoutColour::Type type)
+{
+    if (type == AdjustLayoutColour::Type::NONE)
+        return endAction();
+
+    if (currentAction != type)
+    {
+        if (currentAction == AdjustLayoutColour::Type::NONE)
+        {
+            originalLayout = *state->getMappingData();
+        layoutBeforeAdjust = *state->getMappingData();
+        }
+
+    }
+
+    currentAction = type;
+}
+
+void AdjustLayoutColour::endAction()
+{
+    layoutBeforeAdjust = *state->getMappingData();
+    currentLayout = layoutBeforeAdjust;
+    currentAction = AdjustLayoutColour::Type::NONE;
+}
+
+juce::Array<MappedLumatoneKey> AdjustLayoutColour::updateAdjustedColoursState(const juce::Array<LumatoneKeyCoord>& selection) const
+{
+    juce::Array<MappedLumatoneKey> updateKeys;
+
+    for (auto coord : selection)
+    {
+        auto key = layoutBeforeAdjust.getKey(coord.boardIndex, coord.keyIndex);
+        auto keyCopy = key;
+
+        if (multiplySaturationValue != 1.0f)
+        {
+            multiplySaturation(multiplySaturationValue, key);
+        }
+
+        if (multiplyBrightnessValue != 1.0f)
+        {
+            multiplyBrightness(multiplyBrightnessValue, key);
+        }
+
+        if (hueRotateValue != 0.0f)
+        {
+            rotateHue(hueRotateValue, key);
+        }
+
+        if (whiteKelvinValue != 6500)
+        {
+            adjustWhiteBalance(whiteKelvinValue, key);
+        }
+
+        if (!key.isColour(keyCopy.getColour()))
+            updateKeys.add(MappedLumatoneKey(key, coord));
+    }
+
+    return updateKeys;
+}
+
+void AdjustLayoutColour::commitChanges()
+{
+    endAction();
+
+    hueRotateValue = 0.0f;
+    multiplySaturationValue = 1.0f;
+    multiplyBrightnessValue = 1.0f;
+    whiteKelvinValue = 6500;
+}
+void AdjustLayoutColour::resetChanges()
+{
+    state->setLayout(originalLayout);
+    endAction();
+
+    hueRotateValue = 0.0f;
+    multiplySaturationValue = 1.0f;
+    multiplyBrightnessValue = 1.0f;
+    whiteKelvinValue = 6500;
+}
+
+void AdjustLayoutColour::sendSelectionUpdate(const juce::Array<MappedLumatoneKey>& keyUpdates, bool bufferUpdates)
+{
+    //auto updateAction = new LumatoneEditAction::MultiKeyAssignAction(state, keyUpdates, false, true, bufferUpdates);
+    //state->performAction(updateAction);
+    state->sendSelectionParam(keyUpdates);
+}
+
+void AdjustLayoutColour::sendMappingUpdate(const LumatoneLayout& updatedLayout, bool bufferUpdates)
+{
+    //for (int i = 0; i < state->getNumBoards(); i++)
+    //    state->performAction(new LumatoneEditAction::SectionEditAction(state, i, updatedLayout.getBoard(i), bufferUpdates), true, i == 0);
+    state->setLayout(updatedLayout);
+}
+
+// juce::Colour AdjustLayoutColour::inverseSRGB(juce::Colour rgb)
+// {
+//     float lr, lg, lb;
+
+//     for (int ch = 0; ch < 3; ch++)
+//     {
+//         float v = 0.0f;
+//         switch (ch)
+//         {
+//         case 0:
+//             v = rgb.getFloatRed();
+//             break;
+//         case 1:
+//             v = rgb.getFloatBlue();
+//             break;
+//         case 2:
+//             v = rgb.getFloatGreen();
+//             break;
+//         }
+
+//         if (v < 0.04045f)
+//             v = v / 12.92f;
+//         else
+//             v = powf((v + 0.055f) / 1.055f, 2.4);
+
+//         switch (ch)
+//         {
+//         case 0:
+//             lr = v;
+//             break;
+//         case 1:
+//             lg = v;
+//             break;
+//         case 2:
+//             lb = v;
+//             break;
+//         }
+//     }
+
+//     juce::Colour srgb = juce::Colour((juce::uint8)juce::roundToInt(lr * 255.0f),
+//                                     (juce::uint8)juce::roundToInt(lg * 255.0f),
+//                                     (juce::uint8)juce::roundToInt(lb * 255.0f));
+
+//     return srgb.withAlpha(1.0f);
+// }
+
+AdjustLayoutColour::LAB AdjustLayoutColour::rgbToLab(juce::Colour rgb)
+{
+    float lr, lg, lb;
+    for (int ch = 0; ch < 3; ch++)
+    {
+        float v = 0.0f;
+        switch (ch)
+        {
+        case 0:
+            v = rgb.getFloatRed();
+            break;
+        case 1:
+            v = rgb.getFloatGreen();
+            break;
+        case 2:
+            v = rgb.getFloatBlue();
+            break;
+        }
+
+        if (v <= 0.04045f)
+            v = v / 12.92f;
+        else
+            v = powf((v + 0.055f) / 1.055f, 2.4f);
+
+        switch (ch)
+        {
+        case 0:
+            lr = v;
+            break;
+        case 1:
+            lg = v;
+            break;
+        case 2:
+            lb = v;
+            break;
+        }
+    }
+
+    // float x, y, z;
+
+    // x = lr*0.4124564f + lr*0.3575761f + lr*0.1804375f;
+    // y = lg*0.2126729f + lg*0.7151522f + lg*0.0721750f;
+    // z = lb*0.0193339f + lb*0.1191920f + lb*0.9503041f;
+
+    float x = lr * 0.4124564f + lg * 0.3575761f + lb * 0.1804375f;
+    float y = lr * 0.2126729f + lg * 0.7151522f + lb * 0.0721750f;
+    float z = lr * 0.0193339f + lg * 0.1191920f + lb * 0.9503041f;
+
+    // juce::Colour xyz = juce::Colour((juce::uint8)juce::roundToInt(x * 255.0f),
+    //                                 (juce::uint8)juce::roundToInt(y * 255.0f),
+    //                                 (juce::uint8)juce::roundToInt(z * 255.0f));
+    // return xyz.withAlpha(1.0f);
+
+    const float epsilon = 0.008856f;
+    const float kappa = 903.3f;
+
+    float fx, fy, fz;
+
+    for (int ch = 0; ch < 3; ch++)
+    {
+        float v;
+
+        switch (ch)
+        {
+        case 0:
+            v = x;
+            break;
+        case 1:
+            v = y;
+            break;
+        case 2:
+            v = z;
+            break;
+        }
+
+        if (v > epsilon)
+            v = powf(v, 1.0f/3.0f);
+        else
+            v = (kappa * v + 16.0f) / 116.0f;
+
+        switch (ch)
+        {
+        case 0:
+            fx = v;
+            break;
+        case 1:
+            fy = v;
+            break;
+        case 2:
+            fz = v;
+            break;
+        }
+    }
+
+    float L = 116.0f * fy - 16.0f;
+    float A = 500.0f * (fx - fy);
+    float B = 200.0f * (fy - fz);
+
+    return { L, A, B };
+}
+
+juce::Colour AdjustLayoutColour::labToRgb(LAB lab)
+{
+    float fy = (lab.L + 16.0f) / 116.0f;
+    float fx = lab.A / 500.0f + fy;
+    float fz = fy - lab.B / 200.0f;
+
+    const float epsilon = 0.008856f;
+    const float kappa = 903.3f;
+
+    float xr, yr, zr;
+
+    float fxCbd = powf(fx, 3.0f);
+    if (fxCbd > epsilon)
+        xr = fxCbd;
+    else
+        xr = (116.0f * fx - 16.0f) / kappa;
+
+    if (lab.L > (kappa * epsilon))
+        yr = powf((lab.L + 16.0f) / 116.0f, 3.0f);
+    else
+        yr = lab.L / kappa;
+
+    float fzCbd = powf(fz, 3.0f);
+    if (fzCbd > epsilon)
+        zr = fzCbd;
+    else
+        zr = (116.0f * fz - 16.0f) / kappa;
+
+    float x = xr;
+    float y = yr;
+    float z = zr;
+
+    // for (int ch = 0; ch < 3; ch++)
+    // {
+    //     float v;
+    //     switch (ch)
+    //     {
+    //     case 0:
+    //         v = fx;
+    //         break;
+    //     case 1:
+    //         v = fy;
+    //         break;
+    //     case 2:
+    //         v = fz;
+    //         break;
+    //     }
+
+    //     if (v > (6.0f / 29.0f))
+    //         v = powf(v, 3);
+    //     else
+    //         v = (v - 16.0f / 116.0f) * 3.0f * (6.0f / 29.0f) * (6.0f / 29.0f);
+
+    //     switch (ch)
+    //     {
+    //     case 0:
+    //         x = v;
+    //         break;
+    //     case 1:
+    //         y = v;
+    //         break;
+    //     case 2:
+    //         z = v;
+    //         break;
+    //     }
+    // }
+
+    // float Xr = 0.4124564f, Yr = 0.2126729f, Zr = 0.0193339f;
+    // float YrF = Yr * (100.0f / 100.0f);
+
+    float r = x *  3.2404542f + y * -1.5371385f + z * -0.4985314f;
+    float g = x * -0.9692660f + y *  1.8760108f + z *  0.0415560f;
+    float b = x *  0.0556434f + y * -0.2040259f + z *  1.0572252f;
+
+    // float lr = x*3.24045f + x*-1.53714f + x*-0.498532f;
+    // float lg = y*-0.969266f + y*1.87601f + y*0.0415561f;
+    // float lb = z*0.0556434f + z*-0.204026f + z*1.05723f;
+
+    // float lr = x *  3.2404542f + y * -1.5371385f + z * -0.4985314f;
+    // float lg = x * -0.9692660f + y *  1.8760108f + z *  0.0415560f;
+    // float lb = x *  0.0556434f + y * -0.2040259f + z *  1.0572252f;
+
+    for (int ch = 0; ch < 3; ch++)
+    {
+        float v;
+        switch (ch)
+        {
+        case 0:
+            v = r;
+            break;
+        case 1:
+            v = g;
+            break;
+        case 2:
+            v = b;
+            break;
+        }
+
+        if (v <= 0.0031308f)
+            v *= 12.92f;
+        else
+            v = 1.055f * powf(v, 1.0f / 2.4f) - 0.055f;
+
+        switch (ch)
+        {
+        case 0:
+            r = v;
+            break;
+        case 1:
+            g = v;
+            break;
+        case 2:
+            b = v;
+            break;
+        }
+    }
+
+    juce::Colour rgb((juce::uint8)juce::roundToInt(r * 255.0f),
+                        (juce::uint8)juce::roundToInt(g * 255.0f),
+                        (juce::uint8)juce::roundToInt(b * 255.0f));
+
+    return rgb.withAlpha(1.0f);
+}
diff --git a/Source/lumatone_editor_library/color/adjust_layout_colour.h b/Source/lumatone_editor_library/color/adjust_layout_colour.h
new file mode 100644
index 00000000..e0193cc1
--- /dev/null
+++ b/Source/lumatone_editor_library/color/adjust_layout_colour.h
@@ -0,0 +1,199 @@
+#ifndef LUMATONE_ADJUST_LAYOUT_COLOR_H
+#define LUMATONE_ADJUST_LAYOUT_COLOR_H
+
+#include "../actions/edit_actions.h"
+#include "../mapping/lumatone_hex_map.h"
+
+class LumatoneState;
+
+class AdjustLayoutColour 
+{
+public:
+    enum class Type
+    {
+        NONE,
+        FINDREPLACE,
+        ROTATEHUE,
+        ADJUSTSATURATION,
+        ADJUSTBRIGHTNESS,
+        ADJUSTCONTRAST,
+        ADJUSTWHITE,
+        SETGRADIENT,
+    };
+
+    struct SetGradientOptions
+    {
+        const juce::Array<LumatoneKeyCoord>& selection;
+        juce::ColourGradient gradient;
+        bool selectionOrigin = true;
+        bool fillRelative = true;
+        int numColumns = 1;
+        int numRows = 1;
+
+        SetGradientOptions(const juce::Array<LumatoneKeyCoord>& selectionIn, juce::ColourGradient gradientIn, bool selectionOriginIn = true, bool fillRelativeIn=true, int numColumnsIn = 1, int numRowsIn = 1)
+            : selection(selectionIn)
+            , gradient(gradientIn)
+            , selectionOrigin(selectionOriginIn)
+            , fillRelative(fillRelativeIn)
+            , numColumns(numColumnsIn)
+            , numRows(numRowsIn) {}
+    };
+
+public:
+
+    AdjustLayoutColour(LumatoneState* controller);
+    ~AdjustLayoutColour();
+
+    void replaceColour(juce::Colour oldColour, juce::Colour newColour, bool sendUpdate=true);
+
+    void rotateHue(float change, bool sendUpdate=true);
+    void rotateHue(float change, const juce::Array<LumatoneKeyCoord>& selection, bool sendUpdate=true);
+    static bool rotateHue(float change, LumatoneKey& key);
+
+    void multiplyBrightness(float change, bool sendUpdate=true);
+    void multiplyBrightness(float change, const juce::Array<LumatoneKeyCoord>& selection, bool sendUpdate=true);
+    static bool multiplyBrightness(float change, LumatoneKey& key);
+
+    void multiplySaturation(float change, bool sendUpdate=true);
+    void multiplySaturation(float change, const juce::Array<LumatoneKeyCoord>& selection, bool sendUpdate=true);
+    static bool multiplySaturation(float change, LumatoneKey& key);
+
+    void adjustWhiteBalance(int newWhitePoint, bool sendUpdate=true);
+    void adjustWhiteBalance(int newWhitePoint, const juce::Array<LumatoneKeyCoord>& selection, bool sendUpdate=true);
+    static bool adjustWhiteBalance(int newWhitePoint, LumatoneKey& key);
+private:
+    static void adjustWhiteBalanceRgb(int newWhitePoint, LumatoneKey& key);
+    static void adjustWhiteBalanceLab(int newWhitePoint, LumatoneKey& key);
+
+public:
+    void setGradient(SetGradientOptions options);
+    
+    void commitChanges();
+    void resetChanges();
+
+private:
+    void beginAction(AdjustLayoutColour::Type type);
+    void endAction();
+
+    void applyAdjustmentToSelection(AdjustLayoutColour::Type type, float value, const juce::Array<LumatoneKeyCoord>& selection);
+    juce::Array<MappedLumatoneKey> updateAdjustedColoursState(const juce::Array<LumatoneKeyCoord>& selection) const;
+
+public:
+    
+    struct LAB
+    {
+        float L;
+        float A;
+        float B;
+    };
+
+    // TODO make proper structs for these values
+    // static juce::Colour inverseSRGB(juce::Colour rgb);
+    static LAB rgbToLab(juce::Colour rgb);
+    static juce::Colour labToRgb(LAB lab);
+
+private:
+    void sendColourUpdate(juce::Colour oldColour, juce::Colour newColour, bool bufferUpdates=true);
+    void sendSelectionUpdate(const juce::Array<MappedLumatoneKey>& keyUpdates, bool bufferUpdates=true);
+    void sendMappingUpdate(const LumatoneLayout& updatedLayout, bool bufferUpdates=true);
+
+public:
+
+    // Converts from K to RGB, algorithm courtesy of
+    // http://www.tannerhelland.com/4435/convert-temperature-rgb-algorithm-code/
+    static juce::Colour kelvinToColour(int kelvin)
+    {
+        int temperature = kelvin;
+
+        // range check
+        if (temperature < 1000)
+            temperature = 1000;
+        else if (temperature > 40000)
+            temperature = 40000;
+
+        float tempFloat = temperature * 0.01;
+
+        // red
+        juce::uint8 red = 0;
+        float tempRed = 0.0f;
+
+        if (tempFloat <= 66)
+            red = 255;
+        else
+        {
+            tempRed = 329.698727446f * pow(tempFloat - 60, -0.1332047592f);
+            if (tempRed < 0)
+                red = 0;
+            else if (tempRed > 255)
+                red = 255;
+            else
+                red = tempRed;
+        }
+
+        //  green
+        juce::uint8 green = 0;
+        float tempGreen = 0.0f;
+
+        if (tempFloat <= 66)
+        {
+            tempGreen = 99.4708025861 * logf(tempFloat) - 161.1195681661f;
+            if (tempGreen < 0)
+                green = 0;
+            else if (tempGreen > 255)
+                green = 255;
+            else
+                green = tempGreen;
+        }
+        else
+        {
+            tempGreen = 288.1221695283 * powf(tempFloat - 60, -0.0755148492f);
+            if (tempGreen < 0)
+                green = 0;
+            else if (tempGreen > 255)
+                green = 255;
+            else
+                green = tempGreen;
+        }
+
+        //  blue
+        juce::uint8 blue = 0;
+        float tempBlue = 0;
+
+        if (tempFloat >= 66)
+            blue = 255;
+        else if (tempFloat <= 19)
+            blue = 0;
+        else
+        {
+            tempBlue = 138.5177312231f * logf(tempFloat - 10) - 305.0447927307f;
+            if (tempBlue < 0)
+                blue = 0;
+            else if (tempBlue > 255)
+                blue = 255;
+            else
+                blue = tempBlue;
+        }
+
+        return juce::Colour(red, green, blue);
+    }
+
+private:
+
+    LumatoneState* state;
+    // LumatonePaletteLibrary* paletteLibrary;
+
+    LumatoneHexMap hexMap;
+
+    LumatoneLayout originalLayout;
+    LumatoneLayout layoutBeforeAdjust;
+    LumatoneLayout currentLayout;
+
+    float hueRotateValue = 0.0f;
+    float multiplySaturationValue = 1.0f;
+    float multiplyBrightnessValue = 1.0f;
+    int whiteKelvinValue = 6500;
+
+    AdjustLayoutColour::Type currentAction;
+};
+
+#endif LUMATONE_ADJUST_LAYOUT_COLOR_H
diff --git a/Source/color/colour_model.cpp b/Source/lumatone_editor_library/color/colour_model.cpp
similarity index 88%
rename from Source/color/colour_model.cpp
rename to Source/lumatone_editor_library/color/colour_model.cpp
index 3f2c2270..f37e6d7c 100644
--- a/Source/color/colour_model.cpp
+++ b/Source/lumatone_editor_library/color/colour_model.cpp
@@ -39,14 +39,14 @@ juce::Colour LumatoneColourModel::getModelColour(juce::Colour colour)
 juce::Colour LumatoneColourModel::calculateModelColour(LumatoneColourModel::Type type, const juce::Colour& colour)
 {
     auto params = getInterpolationParams(type, colour);
-
+    
     float ri = Interpolate::trilinear(params.red);
     float gi = Interpolate::trilinear(params.green);
     float bi = Interpolate::trilinear(params.blue);
-
-    juce::uint8 r = roundToUint8(ri);
-    juce::uint8 g = roundToUint8(gi);
-    juce::uint8 b = roundToUint8(bi);
+    
+    juce::uint8 r = LumatoneEditor::roundToUint8(ri);
+    juce::uint8 g = LumatoneEditor::roundToUint8(gi);
+    juce::uint8 b = LumatoneEditor::roundToUint8(bi);
 
     auto modeled = juce::Colour(r, g, b);
 
@@ -142,37 +142,20 @@ LumatoneColourModel::TrilinearInterpolationParams LumatoneColourModel::getInterp
     float bt = bi - b0;
 
     auto redParams = Interpolate::TrilinearParams(
-        n000[0], n100[0], n010[0], n110[0],
+        n000[0], n100[0], n010[0], n110[0], 
         n001[0], n101[0], n011[0], n111[0],
         rt, gt, bt
     );
     auto greenParams = Interpolate::TrilinearParams(
-        n000[1], n100[1], n010[1], n110[1],
+        n000[1], n100[1], n010[1], n110[1], 
         n001[1], n101[1], n011[1], n111[1],
        rt, gt, bt
     );
     auto blueParams = Interpolate::TrilinearParams(
-        n000[2], n100[2], n010[2], n110[2],
+        n000[2], n100[2], n010[2], n110[2], 
         n001[2], n101[2], n011[2], n111[2],
         rt, gt, bt
     );
 
     return LumatoneColourModel::TrilinearInterpolationParams(redParams, greenParams, blueParams);
 }
-
-LumatoneColourModel::uint8 LumatoneColourModel::roundToUint8(float value)
-{
-    if (value >= 255)
-        return (uint8)255;
-
-    if (value <= 0)
-        return (uint8)(0);
-
-    uint8 rounded = (uint8)value;
-    float delta = value - (float)rounded;
-
-    if (delta >= 0.5f)
-        rounded += 1;
-
-    return rounded;
-}
diff --git a/Source/color/colour_model.h b/Source/lumatone_editor_library/color/colour_model.h
similarity index 90%
rename from Source/color/colour_model.h
rename to Source/lumatone_editor_library/color/colour_model.h
index 9a131d0d..10b35c74 100644
--- a/Source/color/colour_model.h
+++ b/Source/lumatone_editor_library/color/colour_model.h
@@ -8,10 +8,11 @@
   ==============================================================================
 */
 
-#pragma once
+#ifndef LUMATONE_COLOR_MODEL_H
+#define LUMATONE_COLOR_MODEL_H
 
-#include "../lumatone_editor_common.h"
-#include "./interpolation.h"
+#include "../data/lumatone_editor_common.h"
+#include "interpolation.h"
 
 #define MAX_INCREMENT 16
 
@@ -57,8 +58,6 @@ class LumatoneColourModel
 
     TrilinearInterpolationParams getInterpolationParams(LumatoneColourModel::Type type, const juce::Colour& c);
 
-    static uint8 roundToUint8(float value);
-
 private:
     int increment = MAX_INCREMENT;
 
@@ -67,3 +66,5 @@ class LumatoneColourModel
 
     std::unique_ptr<juce::HashMap<LumatoneEditor::ColourHash,juce::Colour>> cache;
 };
+
+#endif LUMATONE_COLOR_MODEL_H
diff --git a/Source/ColourSelectionGroup.h b/Source/lumatone_editor_library/color/colour_selection_broadcaster.h
similarity index 89%
rename from Source/ColourSelectionGroup.h
rename to Source/lumatone_editor_library/color/colour_selection_broadcaster.h
index 3521ad78..28f41ab7 100644
--- a/Source/ColourSelectionGroup.h
+++ b/Source/lumatone_editor_library/color/colour_selection_broadcaster.h
@@ -1,7 +1,7 @@
 /*
   ==============================================================================
 
-    ColourSelectionGroup.h
+    colour_selection_group.h
     Created: 20 Dec 2020 5:40:13pm
     Author:  Vincenzo
 
@@ -10,7 +10,9 @@
   ==============================================================================
 */
 
-#pragma once
+#ifndef COLOUR_SELECTION_BROADCASTER_H
+#define COLOUR_SELECTION_BROADCASTER_H
+
 #include <JuceHeader.h>
 
 class ColourSelectionBroadcaster;
@@ -19,7 +21,7 @@ class ColourSelectionListener
 {
 public:
     virtual ~ColourSelectionListener() {}
-    virtual void colourChangedCallback(ColourSelectionBroadcaster* source, Colour newColour) = 0;
+    virtual void colourChangedCallback(ColourSelectionBroadcaster* source, juce::Colour newColour) = 0;
 };
 
 class ColourSelectionBroadcaster
@@ -29,7 +31,7 @@ class ColourSelectionBroadcaster
     ColourSelectionBroadcaster() {};
     virtual ~ColourSelectionBroadcaster() {}
 
-    virtual Colour getSelectedColour() = 0;
+    virtual juce::Colour getSelectedColour() = 0;
 
     virtual void deselectColour() = 0;
 
@@ -38,7 +40,7 @@ class ColourSelectionBroadcaster
 
 protected:
 
-    ListenerList<ColourSelectionListener> selectorListeners;
+    juce::ListenerList<ColourSelectionListener> selectorListeners;
 };
 
 class ColourSelectionGroup :  public ColourSelectionBroadcaster,
@@ -86,12 +88,12 @@ class ColourSelectionGroup :  public ColourSelectionBroadcaster,
         selectedBroadcasterIndex = -1;
     }
 
-    Colour getSelectedColour() override
+    juce::Colour getSelectedColour() override
     {
         if (selectedBroadcasterIndex >= 0)
             return colourSelectors[selectedBroadcasterIndex]->getSelectedColour();
         
-        return Colour();
+        return juce::Colour();
     }
 
     ColourSelectionBroadcaster* getSelectedBroadcaster() const
@@ -136,14 +138,16 @@ class ColourSelectionGroup :  public ColourSelectionBroadcaster,
     /// </summary>
     /// <param name="source"></param>
     /// <param name="newColour"></param>
-    void colourChangedCallback(ColourSelectionBroadcaster* source, Colour newColour) override
+    void colourChangedCallback(ColourSelectionBroadcaster* source, juce::Colour newColour) override
     {
         setCurrentSelector(source);
     }
 
 private:
 
-    Array<ColourSelectionBroadcaster*> colourSelectors;
+    juce::Array<ColourSelectionBroadcaster*> colourSelectors;
 
     int selectedBroadcasterIndex = -1;
 };
+
+#endif COLOUR_SELECTION_BROADCASTER_H
diff --git a/Source/color/interpolation.h b/Source/lumatone_editor_library/color/interpolation.h
similarity index 95%
rename from Source/color/interpolation.h
rename to Source/lumatone_editor_library/color/interpolation.h
index 32f007cf..268a5446 100644
--- a/Source/color/interpolation.h
+++ b/Source/lumatone_editor_library/color/interpolation.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef LUMATONE_COLOR_INTERPOLATION
+#define LUMATONE_COLOR_INTERPOLATION
 
 namespace Interpolate
 {
@@ -85,3 +86,5 @@ namespace Interpolate
                          params.tx, params.ty, params.tz);
     }
 }
+
+#endif LUMATONE_COLOR_INTERPOLATION
diff --git a/Source/lumatone_editor_library/data/application_state.cpp b/Source/lumatone_editor_library/data/application_state.cpp
new file mode 100644
index 00000000..0b28d017
--- /dev/null
+++ b/Source/lumatone_editor_library/data/application_state.cpp
@@ -0,0 +1,424 @@
+#include "application_state.h"
+#include "../device/lumatone_controller.h"
+#include "../color/colour_model.h"
+#include "../data/lumatone_context.h"
+
+#include "../listeners/status_listener.h"
+#include "../listeners/editor_listener.h"
+#include "../listeners/firmware_listener.h"
+#include "../listeners/midi_listener.h"
+
+juce::Array<juce::Identifier> getLumatoneApplicationProperties()
+{
+    juce::Array<juce::Identifier> properties;
+    properties.add(LumatoneApplicationProperty::ConnectionStateId);
+    // properties.add(LumatoneApplicationProperty::DetectDeviceIfDisconnected);
+    // properties.add(LumatoneApplicationProperty::CheckConnectionIfInactive);
+    properties.add(LumatoneApplicationProperty::LayoutContextIsSetId);
+    return properties;
+}
+
+LumatoneApplicationState::LumatoneApplicationState(juce::String nameIn, LumatoneFirmwareDriver& driverIn, juce::ValueTree stateIn, juce::UndoManager *undoManagerIn)
+    : LumatoneState(nameIn, stateIn, undoManagerIn)
+{
+    layoutContext = std::make_shared<LumatoneContext>(*mappingData);
+	controller = std::make_shared<LumatoneController>(*this, driverIn, undoManagerIn);
+    colourModel = std::make_shared<LumatoneColourModel>();
+
+    editorListeners.reset(new juce::ListenerList<LumatoneEditor::EditorListener>());
+    statusListeners.reset(new juce::ListenerList<LumatoneEditor::StatusListener>());
+    firmwareListeners.reset(new juce::ListenerList<LumatoneEditor::FirmwareListener>());
+    midiListeners.reset(new juce::ListenerList<LumatoneEditor::MidiListener>());
+
+    loadStateProperties(stateIn);
+}
+
+// LumatoneApplicationState::LumatoneApplicationState(juce::String nameIn, const LumatoneState &stateIn, juce::UndoManager *undoManagerIn)
+//     : LumatoneState(nameIn, stateIn, undoManagerIn)
+// {
+//     colourModel = std::make_shared<LumatoneColourModel>();
+//     layoutContext = std::make_shared<LumatoneContext>(*mappingData);
+//     loadStateProperties(state);
+// }
+
+LumatoneApplicationState::LumatoneApplicationState(juce::String nameIn, const LumatoneApplicationState &stateIn, juce::UndoManager *undoManagerIn)
+    : LumatoneState(nameIn, (const LumatoneState&)stateIn, undoManagerIn)
+    , layoutContext(stateIn.layoutContext)
+    , controller(stateIn.controller)
+    , colourModel(stateIn.colourModel)
+    , editorListeners(stateIn.editorListeners)
+    , statusListeners(stateIn.statusListeners)
+    , firmwareListeners(stateIn.firmwareListeners)
+    , midiListeners(stateIn.midiListeners)
+{
+    loadStateProperties(state);
+}
+
+LumatoneApplicationState::~LumatoneApplicationState()
+{
+    controller = nullptr;
+    colourModel = nullptr;
+    layoutContext = nullptr;
+}
+
+ConnectionState LumatoneApplicationState::getConnectionState() const
+{
+    return connectionState;
+}
+
+int LumatoneApplicationState::getMidiInputIndex() const
+{
+    return controller->getMidiInputIndex();
+}
+
+int LumatoneApplicationState::getMidiOutputIndex() const
+{
+    return controller->getMidiOutputIndex();
+}
+
+bool LumatoneApplicationState::sendSysExToDevice() const
+{
+    return connectionState == ConnectionState::ONLINE;
+}
+
+LumatoneController *LumatoneApplicationState::getLumatoneController() const
+{
+    return controller.get();
+}
+
+LumatoneColourModel *LumatoneApplicationState::getColourModel() const
+{
+    return colourModel.get();
+}
+
+const LumatoneContext *LumatoneApplicationState::getContext() const
+{
+    return contextIsSet ? layoutContext.get() : nullptr;
+}
+
+std::shared_ptr<LumatoneContext> LumatoneApplicationState::shareContext()
+{
+    return layoutContext;
+}
+
+juce::ValueTree LumatoneApplicationState::loadStateProperties(juce::ValueTree stateIn)
+{
+    juce::ValueTree newState = (stateIn.hasType(LumatoneStateProperty::StateTree))
+                             ? stateIn
+                             : juce::ValueTree(LumatoneStateProperty::StateTree);
+
+    // DBG("LumatoneApplicationState::loadStateProperties:\n" + newState.toXmlString());
+    for (auto property : getLumatoneApplicationProperties())
+    {
+        if (newState.hasProperty(property))
+            handleStatePropertyChange(newState, property);
+    }
+
+    LumatoneState::loadStateProperties(newState);
+
+    return newState;
+}
+
+void LumatoneApplicationState::handleStatePropertyChange(juce::ValueTree stateIn, const juce::Identifier &property)
+{
+    if (property == LumatoneApplicationProperty::ConnectionStateId)
+    {
+        connectionState = ConnectionState((int)stateIn.getProperty(property, (int)ConnectionState::DISCONNECTED));
+    }
+    else if (property == LumatoneApplicationProperty::LayoutContextIsSetId)
+    {
+        contextIsSet = (bool)stateIn.getProperty(property, false);
+    }
+    else
+    {
+        LumatoneState::handleStatePropertyChange(stateIn, property);
+    }
+}
+
+LumatoneKeyContext LumatoneApplicationState::getKeyContext(int boardIndex, int keyIndex) const
+{
+    if (contextIsSet)
+    {
+        return layoutContext->getKeyContext(boardIndex, keyIndex);
+    }
+
+    MappedLumatoneKey key = MappedLumatoneKey(getKey(boardIndex, keyIndex), boardIndex, keyIndex);
+    return LumatoneKeyContext(key);
+}
+
+void LumatoneApplicationState::setContext(const LumatoneContext& contextIn)
+{
+    if (layoutContext.get() != nullptr)
+        clearContext();
+
+    *layoutContext = contextIn;
+    contextIsSet = true;
+
+    state.setPropertyExcludingListener(this, LumatoneApplicationProperty::LayoutContextIsSetId, contextIsSet, undoManager);
+}
+
+void LumatoneApplicationState::clearContext()
+{
+    *layoutContext = LumatoneContext(*mappingData);
+    contextIsSet = false;
+
+    state.setPropertyExcludingListener(this, LumatoneApplicationProperty::LayoutContextIsSetId, contextIsSet, undoManager);
+}
+
+void LumatoneApplicationState::setCompleteConfig(const LumatoneLayout &layoutIn)
+{
+    LumatoneState::setCompleteConfig(layoutIn);
+
+    if (sendSysExToDevice())
+    {
+        controller->sendCurrentCompleteConfig();
+    }
+
+    editorListeners->call(&LumatoneEditor::EditorListener::completeMappingLoaded, *mappingData);
+}
+
+void LumatoneApplicationState::setLayout(const LumatoneLayout &layoutIn)
+{
+    LumatoneState::setLayout(layoutIn);
+
+    if (sendSysExToDevice())
+    {
+        controller->sendCompleteMapping(layoutIn);
+    }
+
+    editorListeners->call(&LumatoneEditor::EditorListener::completeMappingLoaded, *mappingData);
+}
+
+void LumatoneApplicationState::setBoard(const LumatoneBoard &boardIn, int boardId)
+{
+    LumatoneState::setBoard(boardIn, boardId);
+
+    if (sendSysExToDevice())
+    {
+        controller->sendAllParamsOfBoard(boardId, &boardIn);
+    }
+
+    editorListeners->call(&LumatoneEditor::EditorListener::boardChanged, getBoard(boardId-1));
+}
+
+void LumatoneApplicationState::setKey(const LumatoneKey &keyIn, int boardId, int keyIndex)
+{
+    LumatoneState::setKey(keyIn, boardId, keyIndex);
+
+    if (sendSysExToDevice())
+    {
+        controller->sendKeyParam(boardId, keyIndex, keyIn);
+    }
+
+    editorListeners->call(&LumatoneEditor::EditorListener::keyChanged, boardId - 1, keyIndex, getKey(boardId-1, keyIndex));
+}
+
+void LumatoneApplicationState::setKeyConfig(const LumatoneKey& keyIn, int boardId, int keyIndex)
+{
+    LumatoneState::setKeyConfig(keyIn, boardId, keyIndex);
+
+    if (sendSysExToDevice())
+    {
+        controller->sendKeyConfig(boardId, keyIndex, keyIn);
+    }
+
+    editorListeners->call(&LumatoneEditor::EditorListener::keyChanged, boardId - 1, keyIndex, getKey(boardId - 1, keyIndex));
+}
+
+
+void LumatoneApplicationState::setKeyColour(juce::Colour colour, int boardId, int keyIndex)
+{
+    LumatoneState::setKeyColour(colour, boardId, keyIndex);
+
+    if (sendSysExToDevice())
+    {
+        controller->sendKeyColourConfig(boardId, keyIndex, colour);
+    }
+
+    editorListeners->call(&LumatoneEditor::EditorListener::keyChanged, boardId - 1, keyIndex, getKey(boardId - 1, keyIndex));
+}
+
+void LumatoneApplicationState::sendSelectionParam(const juce::Array<MappedLumatoneKey>& selection, bool signalEditorListeners, bool bufferKeyUpdates)
+{
+    LumatoneState::sendSelectionParam(selection);
+
+    for (auto mappedKey : selection)
+    {
+        controller->sendKeyParam(mappedKey.boardIndex + 1, mappedKey.keyIndex, static_cast<const LumatoneKey&>(mappedKey));
+        //sendKeyConfig(mappedKey.boardIndex + 1, mappedKey.keyIndex, (LumatoneKey)mappedKey, false, bufferKeyUpdates);
+    }
+
+    //if (signalEditorListeners)
+    editorListeners->call(&LumatoneEditor::EditorListener::selectionChanged, selection);
+}
+
+void LumatoneApplicationState::sendSelectionColours(const juce::Array<MappedLumatoneKey>& selection, bool signalEditorListeners, bool bufferKeyUpdates)
+{
+    LumatoneState::sendSelectionColours(selection);
+
+    for (auto mappedKey : selection)
+    {
+        controller->sendKeyColourConfig(mappedKey.boardIndex, mappedKey.keyIndex, static_cast<const LumatoneKey&>(mappedKey));
+        //sendKeyColourConfig(mappedKey.boardIndex + 1, mappedKey.keyIndex, (LumatoneKey)mappedKey, false, bufferKeyUpdates);
+    }
+
+    //if (signalEditorListeners)
+    editorListeners->call(&LumatoneEditor::EditorListener::selectionChanged, selection);
+}
+
+void LumatoneApplicationState::setAftertouchEnabled(bool enabled)
+{
+    LumatoneState::setAftertouchEnabled(enabled);
+
+    if (sendSysExToDevice())
+    {
+        controller->setAftertouchEnabled(enabled);
+    }
+
+    editorListeners->call(&LumatoneEditor::EditorListener::aftertouchToggled, enabled);
+}
+
+void LumatoneApplicationState::setLightOnKeyStrokes(bool enabled)
+{
+    LumatoneState::setLightOnKeyStrokes(enabled);
+
+    if (sendSysExToDevice())
+    {
+        controller->sendLightOnKeyStrokes(enabled);
+    }
+
+    editorListeners->call(&LumatoneEditor::EditorListener::lightOnKeyStrokesChanged, enabled);
+}
+
+void LumatoneApplicationState::setInvertExpression(bool invert)
+{
+    LumatoneState::setInvertExpression(invert);
+
+    if (sendSysExToDevice())
+    {
+        controller->sendInvertFootController(invert);
+    }
+
+    editorListeners->call(&LumatoneEditor::EditorListener::invertFootControllerChanged, invert);
+}
+
+void LumatoneApplicationState::setInvertSustain(bool invert)
+{
+    LumatoneState::setInvertSustain(invert);
+    
+    if (sendSysExToDevice())
+    {
+        controller->invertSustainPedal(invert);
+    }
+
+    editorListeners->call(&LumatoneEditor::EditorListener::invertSustainToggled, invert);
+}
+
+void LumatoneApplicationState::setExpressionSensitivity(juce::uint8 sensitivity)
+{
+    LumatoneState::setExpressionSensitivity(sensitivity);
+
+    if (sendSysExToDevice())
+    {
+        controller->sendExpressionPedalSensivity(sensitivity);
+    }
+
+    editorListeners->call(&LumatoneEditor::EditorListener::expressionPedalSensitivityChanged, sensitivity);
+}
+
+void LumatoneApplicationState::setConfigTable(LumatoneConfigTable::TableType type, const LumatoneConfigTable& table)
+{
+    LumatoneState::setConfigTable(type, table);
+
+    if (sendSysExToDevice())
+    {
+        controller->sendTableConfig(type, table.velocityValues);
+    }
+
+    editorListeners->call(&LumatoneEditor::EditorListener::configTableChanged, type, *mappingData->getConfigTable(type));
+}
+//
+//void LumatoneApplicationState::setVelocityIntervalTable(const LumatoneConfigTable& tableIn)
+//{
+//    LumatoneState::setVelocityIntervalTable(tableIn);
+//
+//    if (sendSysExToDevice())
+//    {
+//        controller->setVelocityIntervalTable(tableIn);
+//    }
+//}
+//
+//void LumatoneApplicationState::setNoteVelocityTable(const LumatoneConfigTable& tableIn)
+//{
+//    LumatoneState::setNoteVelocityTable(tableIn);
+//
+//    if (sendSysExToDevice())
+//    {
+//        controller->setNoteVelocityTable(tableIn);
+//    }
+//}
+//
+//void LumatoneApplicationState::setAftertouchTable(const LumatoneConfigTable& tableIn)
+//{
+//    LumatoneState::setAftertouchTable(tableIn);
+//
+//    if (sendSysExToDevice())
+//    {
+//        controller->setAftertouchTable(tableIn);
+//    }
+//}
+//
+//void LumatoneApplicationState::setLumatouchTable(const LumatoneConfigTable& tableIn)
+//{
+//    LumatoneState::setLumatouchTable(tableIn);
+//
+//    if (sendSysExToDevice())
+//    {
+//        controller->setLumatouchTable(tableIn);
+//    }
+//}
+
+bool LumatoneApplicationState::performAction(LumatoneAction *action, bool undoable, bool newTransaction)
+{
+    return controller->performAction(action, undoable, newTransaction);
+}
+
+void LumatoneApplicationState::addStatusListener(LumatoneEditor::StatusListener* listenerIn)
+{
+    statusListeners->add(listenerIn);
+}
+
+void LumatoneApplicationState::removeStatusListener(LumatoneEditor::StatusListener* listenerIn)
+{
+    statusListeners->remove(listenerIn);
+}
+
+void LumatoneApplicationState::addEditorListener(LumatoneEditor::EditorListener* listenerIn)
+{
+    editorListeners->add(listenerIn);
+}
+
+void LumatoneApplicationState::removeEditorListener(LumatoneEditor::EditorListener* listenerIn)
+{
+    editorListeners->remove(listenerIn);
+}
+
+void LumatoneApplicationState::addFirmwareListener(LumatoneEditor::FirmwareListener* listenerIn)
+{
+    firmwareListeners->add(listenerIn);
+}
+
+void LumatoneApplicationState::removeMidiListener(LumatoneEditor::MidiListener* listenerIn)
+{
+    midiListeners->remove(listenerIn);
+}
+
+void LumatoneApplicationState::addMidiListener(LumatoneEditor::MidiListener* listenerIn)
+{
+    midiListeners->add(listenerIn);
+}
+
+void LumatoneApplicationState::removeFirmwareListener(LumatoneEditor::FirmwareListener* listenerIn)
+{
+    firmwareListeners->remove(listenerIn);
+}
diff --git a/Source/lumatone_editor_library/data/application_state.h b/Source/lumatone_editor_library/data/application_state.h
new file mode 100644
index 00000000..e8b1ab43
--- /dev/null
+++ b/Source/lumatone_editor_library/data/application_state.h
@@ -0,0 +1,148 @@
+#ifndef LUMATONE_APPLICATION_STATE_H
+#define LUMATONE_APPLICATION_STATE_H
+
+#include "lumatone_state.h"
+#include "lumatone_context.h"
+
+enum class ConnectionState
+{
+    DISCONNECTED = 0,
+    SEARCHING,
+    OFFLINE,
+    ONLINE,
+    BUSY,
+    ERROR
+};
+
+namespace LumatoneEditor
+{
+    class StatusListener;
+    class EditorListener;
+    class FirmwareListener;
+    class MidiListener;
+}
+
+namespace LumatoneApplicationProperty
+{
+    // Device Management
+    // static const juce::Identifier DetectDeviceIfDisconnected = juce::Identifier("DetectDeviceIfDisconnected");
+    // static const juce::Identifier CheckConnectionIfInactive = juce::Identifier("CheckConnectionIfInactive");
+
+    static const juce::Identifier DetectDevicesTimeout = juce::Identifier("DetectDevicesTimeout");
+    static const juce::Identifier LastInputDeviceId = juce::Identifier("LastInputDeviceId");
+    static const juce::Identifier LastOutputDeviceId = juce::Identifier("LastOutputDeviceId");
+
+    // UI States
+    static const juce::Identifier ConnectionStateId = juce::Identifier("ConnectionState");
+
+    static const juce::Identifier LayoutContextIsSetId = juce::Identifier("LayoutContextIsSetId");
+
+    // Settings
+    // static const juce::Identifier DefaultMappingsDirectory = juce::Identifier("DefaultMappingsDirectory");
+    // static const juce::Identifier LastMappingsDirectory = juce::Identifier("LastMappingsDirectory");
+}
+
+juce::Array<juce::Identifier> getLumatoneApplicationProperties();
+
+class LumatoneFirmwareDriver;
+class LumatoneController;
+class LumatoneColourModel;
+class LumatoneAction;
+
+class LumatoneApplicationState : public LumatoneState
+{
+public:
+    LumatoneApplicationState(juce::String nameIn, LumatoneFirmwareDriver& driverIn, juce::ValueTree stateIn=juce::ValueTree(), juce::UndoManager* undoManager=nullptr);
+    // LumatoneApplicationState(juce::String nameIn, const LumatoneState& stateIn, juce::UndoManager* undoManager=nullptr);
+    LumatoneApplicationState(juce::String nameIn, const LumatoneApplicationState& stateIn, juce::UndoManager* undoManager=nullptr);
+
+    virtual ~LumatoneApplicationState();
+
+    LumatoneController* getLumatoneController() const;
+    LumatoneColourModel* getColourModel() const;
+
+    // Connection Methods
+    ConnectionState getConnectionState() const;
+    int getMidiInputIndex() const;
+    int getMidiOutputIndex() const;
+
+    virtual bool sendSysExToDevice() const;
+
+    // Context Methods
+    bool isContextSet() const { return contextIsSet; }
+    const LumatoneContext* getContext() const;
+    std::shared_ptr<LumatoneContext> shareContext();
+
+    LumatoneKeyContext getKeyContext(int boardIndex, int keyIndex) const;
+
+    virtual void setContext(const LumatoneContext& contextIn);
+    virtual void clearContext();
+
+public:
+    virtual void setCompleteConfig(const LumatoneLayout& layoutIn) override;
+    virtual void setLayout(const LumatoneLayout& layoutIn) override;
+    virtual void setBoard(const LumatoneBoard& boardIn, int boardId) override;
+    
+    virtual void setKey(const LumatoneKey& keyIn, int boardId, int keyIndex) override;
+    virtual void setKeyConfig(const LumatoneKey& keyIn, int boardId, int keyIndex) override;
+    virtual void setKeyColour(juce::Colour colour, int boardId, int keyIndex) override;
+    virtual void sendSelectionParam(const juce::Array<MappedLumatoneKey>& selection, bool signalEditorListeners = true, bool bufferKeyUpdates = false) override;
+    virtual void sendSelectionColours(const juce::Array<MappedLumatoneKey>& selection, bool signalEditorListeners = true, bool bufferKeyUpdates = false) override;
+    
+    virtual void setAftertouchEnabled(bool enabled) override;
+    virtual void setLightOnKeyStrokes(bool enabled) override;
+    virtual void setInvertExpression(bool invert) override;
+    virtual void setInvertSustain(bool invert) override;
+    virtual void setExpressionSensitivity(juce::uint8 sensitivity) override;
+    
+    virtual void setConfigTable(LumatoneConfigTable::TableType type, const LumatoneConfigTable& table) override;
+
+    //void setVelocityIntervalTable(const LumatoneConfigTable& table) override;
+    //void setNoteVelocityTable(const LumatoneConfigTable& tableIn) override;
+    //void setAftertouchTable(const LumatoneConfigTable& tableIn) override;
+    //void setLumatouchTable(const LumatoneConfigTable& tableIn) override;
+
+    virtual bool performAction(LumatoneAction* action, bool undoable = true, bool newTransaction = true);
+
+
+protected:
+    virtual juce::ValueTree loadStateProperties(juce::ValueTree stateIn);
+
+    virtual void handleStatePropertyChange(juce::ValueTree stateIn, const juce::Identifier& property) override;
+
+private:
+    ConnectionState connectionState = ConnectionState::DISCONNECTED;
+
+    std::shared_ptr<LumatoneContext> layoutContext;
+	std::shared_ptr<LumatoneController> controller;
+    std::shared_ptr<LumatoneColourModel> colourModel;
+
+    bool contextIsSet = false;
+
+private:
+    std::shared_ptr<juce::ListenerList<LumatoneEditor::StatusListener>> statusListeners;
+public:
+    void addStatusListener(LumatoneEditor::StatusListener* listenerIn);
+    void removeStatusListener(LumatoneEditor::StatusListener* listenerIn);
+
+private:
+    std::shared_ptr<juce::ListenerList<LumatoneEditor::EditorListener>> editorListeners;
+public:
+    void addEditorListener(LumatoneEditor::EditorListener* listenerIn);
+    void removeEditorListener(LumatoneEditor::EditorListener* listenerIn);
+
+private:
+    std::shared_ptr<juce::ListenerList<LumatoneEditor::MidiListener>> midiListeners;
+public:
+    void addMidiListener(LumatoneEditor::MidiListener* listenerIn);
+    void removeMidiListener(LumatoneEditor::MidiListener* listenerIn);
+
+private:
+    std::shared_ptr<juce::ListenerList<LumatoneEditor::FirmwareListener>> firmwareListeners;
+public:
+    void addFirmwareListener(LumatoneEditor::FirmwareListener* listenerIn);
+    void removeFirmwareListener(LumatoneEditor::FirmwareListener* listenerIn);
+
+};
+
+#endif LUMATONE_APPLICATION_STATE_H
diff --git a/Source/lumatone_editor_library/data/lumatone_board.cpp b/Source/lumatone_editor_library/data/lumatone_board.cpp
new file mode 100644
index 00000000..5fb33ba9
--- /dev/null
+++ b/Source/lumatone_editor_library/data/lumatone_board.cpp
@@ -0,0 +1,150 @@
+/*
+  ==============================================================================
+
+    lumatone_board.cpp
+    Created: 6 Aug 2023 2:16:27pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#include "lumatone_board.h"
+
+/*
+==============================================================================
+TerpstraKeys class
+==============================================================================
+*/
+
+LumatoneBoard::LumatoneBoard(LumatoneKeyType newKeyType, int numKeysIn, int boardIndex)
+    : numKeys(numKeysIn)
+    , board_idx(boardIndex)
+{
+    for (int i = 0; i < numKeys; i++)
+        theKeys[i] = LumatoneKey(newKeyType);
+
+    //key_idx = 0;
+    state = juce::ValueTree(LumatoneBoardProperty::State);
+    updateState();
+}
+
+LumatoneBoard::LumatoneBoard(const LumatoneBoard& copyBoard)
+{
+    state = juce::ValueTree(LumatoneBoardProperty::State);
+    operator=(copyBoard);
+}
+
+LumatoneBoard::LumatoneBoard(juce::ValueTree stateIn)
+{
+    juce::ValueTree stateToCopy(LumatoneBoardProperty::State);
+    if (stateIn.hasType(LumatoneBoardProperty::State))
+        stateToCopy = stateIn;
+
+    state = stateToCopy;
+    refreshFromState();
+}
+
+void LumatoneBoard::operator=(const LumatoneBoard& copyBoard)
+{
+    numKeys = copyBoard.numKeys;
+    state.copyPropertiesAndChildrenFrom(copyBoard.state, nullptr);
+
+    for (int i = 0; i < numKeys; i++)
+    {
+        theKeys[i] = copyBoard.getKey(i);
+    }
+
+    updateState();
+}
+
+bool LumatoneBoard::isEmpty() const
+{
+    LumatoneKey emptyKeyData = LumatoneKey();
+
+    for (int i = 0; i < numKeys; i++)
+        if (theKeys[i] != emptyKeyData)
+            return false;
+
+    return true;
+}
+
+int LumatoneBoard::getNumKeys() const
+{
+    return numKeys;
+}
+
+const LumatoneKey& LumatoneBoard::getKey(int index) const
+{
+    return theKeys[index];
+}
+
+void LumatoneBoard::setKey(LumatoneKey key, int index)
+{
+    theKeys[index] = key;
+}
+
+void LumatoneBoard::setKey(const MappedLumatoneKey &mappedKey)
+{
+    theKeys[mappedKey.keyIndex] = static_cast<const LumatoneKey&>(mappedKey);
+}
+
+void LumatoneBoard::setKeyConfig(LumatoneKey key, int index)
+{
+    theKeys[index].setConfig(key);
+}
+
+void LumatoneBoard::setKeyColour(juce::Colour colour, int index)
+{
+    theKeys[index].setColour(colour);
+}
+
+juce::Array<juce::Colour> LumatoneBoard::getBoardColours() const
+{
+    juce::Array<juce::Colour> boardColours;
+
+    for (int i = 0; i < numKeys; i++)
+    {
+        if (!boardColours.contains(theKeys[i].getColour()))
+            boardColours.add(theKeys[i].getColour());
+    }
+
+    return boardColours;
+}
+
+juce::Array<LumatoneKeyCoord> LumatoneBoard::getKeysWithColour(const juce::Colour& c) const
+{
+    juce::Array<LumatoneKeyCoord> keyCoords;
+
+    for (int i = 0; i < numKeys; i++)
+    {
+        if (theKeys[i].isColour(c))
+            keyCoords.add(LumatoneKeyCoord(board_idx, i));
+    }
+
+    return keyCoords;
+}
+
+void LumatoneBoard::updateState()
+{
+    juce::ValueTree newState(LumatoneBoardProperty::State);
+
+    newState.setProperty(LumatoneBoardProperty::Id, board_idx, nullptr);
+    for (int i = 0; i < numKeys; i++)
+    {
+        newState.addChild(theKeys[i].getState(), i, nullptr);
+    }
+
+    state.copyPropertiesAndChildrenFrom(newState, nullptr);
+}
+
+void LumatoneBoard::refreshFromState()
+{
+    board_idx = (int)state[LumatoneBoardProperty::Id];
+
+    for (int i = 0; i < numKeys; i++)
+    {
+        auto keyState = state.getChild(i);
+        LumatoneKey key = LumatoneKey(keyState);
+        theKeys[i] = key;
+    }
+}
diff --git a/Source/lumatone_editor_library/data/lumatone_board.h b/Source/lumatone_editor_library/data/lumatone_board.h
new file mode 100644
index 00000000..25a61258
--- /dev/null
+++ b/Source/lumatone_editor_library/data/lumatone_board.h
@@ -0,0 +1,69 @@
+/*
+==============================================================================
+
+    lumatone_board.h
+    Created: 6 Aug 2023 2:16:27pm
+    Author:  Vincenzo
+
+==============================================================================
+*/
+
+#ifndef LUMATONE_BOARD_STATE_H
+#define LUMATONE_BOARD_STATE_H
+
+#include "../data/lumatone_editor_common.h"
+#include "lumatone_key.h"
+
+#define MAXBOARDSIZE 56
+
+namespace LumatoneBoardProperty
+{
+    static const juce::Identifier State = juce::Identifier("LumatoneBoardState");
+    static const juce::Identifier Id = juce::Identifier("Id");
+    static const juce::Identifier Size = juce::Identifier("Size");
+}
+
+class LumatoneLayout;
+
+// Subset of 56 or 55) keys
+class LumatoneBoard
+{
+public:
+    LumatoneBoard(LumatoneKeyType newKeyType = LumatoneKeyType::disabled, int numKeysIn=MAXBOARDSIZE, int boardIndex = 0);
+    LumatoneBoard(const LumatoneBoard& copyBoard);
+    LumatoneBoard(juce::ValueTree stateIn);
+
+    void operator=(const LumatoneBoard& copyBoard);
+
+    int getBoardIndex() const { return board_idx; }
+    bool isEmpty() const;
+
+    juce::ValueTree getState() const { return state; }
+
+    int getNumKeys() const;
+    const LumatoneKey& getKey(int index) const;
+
+    void setKey(LumatoneKey key, int index);
+    void setKey(const MappedLumatoneKey& mappedKey);
+    void setKeyConfig(LumatoneKey key, int index);
+    void setKeyColour(juce::Colour colour, int index);
+
+    juce::Array<juce::Colour> getBoardColours() const;
+    juce::Array<LumatoneKeyCoord> getKeysWithColour(const juce::Colour& c) const;
+
+private:
+    void updateState();
+    void refreshFromState();
+
+private:
+    LumatoneKey        theKeys[MAXBOARDSIZE];
+    int                board_idx;
+
+    int numKeys;
+
+    juce::ValueTree state;
+
+    friend class LumatoneLayout;
+};
+
+#endif LUMATONE_BOARD_STATE_H
diff --git a/Source/lumatone_editor_library/data/lumatone_context.cpp b/Source/lumatone_editor_library/data/lumatone_context.cpp
new file mode 100644
index 00000000..d50d2880
--- /dev/null
+++ b/Source/lumatone_editor_library/data/lumatone_context.cpp
@@ -0,0 +1,106 @@
+#include "lumatone_context.h"
+
+LumatoneContext::LumatoneContext(const LumatoneLayout &layout)
+    : LumatoneLayout(layout)
+{
+
+}
+
+LumatoneContext::LumatoneContext(const LumatoneContext &context)
+    : LumatoneContext(context, (const LumatoneLayout&)context)
+{
+
+}
+
+LumatoneContext::LumatoneContext(const LumatoneContext &context, const LumatoneLayout &layout)
+    : LumatoneLayout(layout)
+    , midiChannelsMapped(context.midiChannelsMapped)
+    , mappedMidiChannels(context.mappedMidiChannels)
+    , midiNotesMapped(context.midiNotesMapped)
+    , mappedMidiNotes(context.mappedMidiNotes)
+{
+
+}
+
+LumatoneContext::~LumatoneContext()
+{
+}
+
+bool LumatoneContext::setMappedMidiChannels(juce::Array<int> midiChannelMap)
+{
+    const int expectedSize = getNumBoards() * getOctaveBoardSize(); // TODO cache this
+
+    if (midiChannelMap.size() != expectedSize)
+        return false;
+
+    juce::ScopedLock l(mappedMidiChannels.getLock());
+    for (int i = 0; i < expectedSize; i++)
+    {
+        mappedMidiChannels.set(i, midiChannelMap[i]);
+    }
+
+    midiChannelsMapped = true;
+
+    return true;
+}
+
+void LumatoneContext::clearMappedMidiChannels()
+{
+    juce::ScopedLock l(mappedMidiChannels.getLock());
+
+    mappedMidiChannels.clear();
+    midiChannelsMapped = false;
+}
+
+bool LumatoneContext::setMappedMidiNotes(juce::Array<int> midiNoteMap)
+{
+    const int expectedSize = getNumBoards() * getOctaveBoardSize(); // TODO cache this
+
+    if (midiNoteMap.size() != expectedSize)
+        return false;
+
+    juce::ScopedLock l(mappedMidiNotes.getLock());
+    for (int i = 0; i < expectedSize; i++)
+    {
+        mappedMidiNotes.set(i, midiNoteMap[i]);
+    }
+
+    midiNotesMapped = true;
+
+    return true;
+}
+
+void LumatoneContext::clearMappedMidiNotes()
+{
+    juce::ScopedLock l(mappedMidiNotes.getLock());
+
+    mappedMidiNotes.clear();
+    midiNotesMapped = false;
+}
+
+LumatoneKeyContext LumatoneContext::getKeyContext(int boardIndex, int keyIndex) const
+{
+    auto coord = LumatoneKeyCoord(boardIndex, keyIndex);
+    if (!isKeyCoordValid(coord))
+        return LumatoneKeyContext();
+
+    auto keyNum = keyCoordToKeyNum(coord);
+    MappedLumatoneKey mappedKey = MappedLumatoneKey(getKey(boardIndex, keyIndex), coord);
+    LumatoneKeyContext keyContext = LumatoneKeyContext(mappedKey);
+
+    // TODO make a cache of this
+
+    if (midiChannelsMapped)
+        keyContext.setChannelNumber(mappedMidiChannels[keyNum]);
+
+    if (midiNotesMapped)
+        keyContext.setNoteOrCC(mappedMidiNotes[keyNum]);
+
+    return keyContext;
+}
+
+LumatoneKeyContext LumatoneContext::getKeyContext(int keyNum) const
+{
+    auto coord = keyNumToKeyCoord(keyNum);
+    return getKeyContext(coord.boardIndex, coord.keyIndex);
+}
diff --git a/Source/lumatone_editor_library/data/lumatone_context.h b/Source/lumatone_editor_library/data/lumatone_context.h
new file mode 100644
index 00000000..c931c950
--- /dev/null
+++ b/Source/lumatone_editor_library/data/lumatone_context.h
@@ -0,0 +1,48 @@
+// Supply pitch/note, tuning, or remapped configs for a LumatoneLayout
+
+#ifndef LUMATONE_LAYOUT_CONTEXT_H
+#define LUMATONE_LAYOUT_CONTEXT_H
+
+#include "./lumatone_layout.h"
+
+struct LumatoneKeyContext : public MappedLumatoneKey
+{
+    LumatoneKeyContext() : MappedLumatoneKey() {}
+
+    LumatoneKeyContext(const LumatoneKey& keyData, int boardIndex, int keyIndex) 
+        : MappedLumatoneKey(keyData, boardIndex, keyIndex) {}
+
+    LumatoneKeyContext(const MappedLumatoneKey& key) : MappedLumatoneKey(key) {}
+
+    // TODO add more properties
+};
+
+class LumatoneContext : public LumatoneLayout
+{
+public:
+
+    LumatoneContext(const LumatoneLayout& layout);
+    LumatoneContext(const LumatoneContext& context);
+    LumatoneContext(const LumatoneContext& context, const LumatoneLayout& layout);
+    
+    ~LumatoneContext();
+
+    bool setMappedMidiChannels(juce::Array<int> midiChannelMap);
+    void clearMappedMidiChannels();
+
+    bool setMappedMidiNotes(juce::Array<int> midiNoteMap);
+    void clearMappedMidiNotes();
+
+    LumatoneKeyContext getKeyContext(int boardIndex, int keyIndex) const;
+    LumatoneKeyContext getKeyContext(int keyNum) const;
+
+private:
+
+    bool midiChannelsMapped = false;
+    juce::Array<int, juce::CriticalSection> mappedMidiChannels;
+
+    bool midiNotesMapped = false;
+    juce::Array<int, juce::CriticalSection> mappedMidiNotes;
+};
+
+#endif LUMATONE_LAYOUT_CONTEXT_H
diff --git a/Source/lumatone_editor_common.h b/Source/lumatone_editor_library/data/lumatone_editor_common.h
similarity index 71%
rename from Source/lumatone_editor_common.h
rename to Source/lumatone_editor_library/data/lumatone_editor_common.h
index 8f1ea36d..8b007586 100644
--- a/Source/lumatone_editor_common.h
+++ b/Source/lumatone_editor_library/data/lumatone_editor_common.h
@@ -1,4 +1,6 @@
-#pragma once
+#ifndef LUMATONE_EDITOR_COMMON_H
+#define LUMATONE_EDITOR_COMMON_H
+
 #include <JuceHeader.h>
 
 namespace LumatoneEditor
@@ -9,6 +11,23 @@ namespace LumatoneEditor
     {
         return (colour.getRed() << 16) | (colour.getGreen() << 8) | colour.getBlue();
     }
+
+    static juce::uint8 roundToUint8(float value)
+	{
+		if (value >= 255)
+			return (juce::uint8)255;
+
+		if (value <= 0)
+			return (juce::uint8)(0);
+
+		juce::uint8 rounded = (juce::uint8)value;
+		float delta = value - (float)rounded;
+
+		if (delta >= 0.5f)
+			rounded += 1;
+
+		return rounded;
+	}
 }
 
 struct LumatoneKeyCoord
@@ -29,3 +48,4 @@ struct LumatoneKeyCoord
 	juce::String toString() { return LumatoneKeyCoord::toString(boardIndex, keyIndex); }
 };
 
+#endif LUMATONE_EDITOR_COMMON_H
diff --git a/Source/lumatone_editor_library/data/lumatone_key.cpp b/Source/lumatone_editor_library/data/lumatone_key.cpp
new file mode 100644
index 00000000..3cdb5384
--- /dev/null
+++ b/Source/lumatone_editor_library/data/lumatone_key.cpp
@@ -0,0 +1,138 @@
+/*
+==============================================================================
+
+    lumatone_key.cpp
+    Created: 6 Aug 2023 2:16:18pm
+    Author:  Vincenzo
+
+==============================================================================
+*/
+
+#include "lumatone_key.h"
+
+LumatoneKey::LumatoneKey(LumatoneKeyType newKeyType)
+{
+    noteNumber = 0;
+    channelNumber = 1;
+    colour = juce::Colour();
+    keyType = newKeyType;
+    ccFaderDefault = true;
+
+    state = juce::ValueTree(LumatoneKeyProperty::State);
+    updateState();
+}
+
+LumatoneKey::LumatoneKey(LumatoneKeyType newKeyType, int newChannelNumber, int newNoteNumber, juce::Colour newColour, bool invertCCFader)
+{
+    keyType = newKeyType;
+    channelNumber = newChannelNumber;
+    noteNumber = newNoteNumber;
+    colour = newColour;
+    ccFaderDefault = invertCCFader;
+
+    state = juce::ValueTree(LumatoneKeyProperty::State);
+    updateState();
+}
+
+LumatoneKey::LumatoneKey(juce::ValueTree keyStateIn)
+{
+    juce::ValueTree stateToCopy(LumatoneKeyProperty::State);
+
+    if (keyStateIn.hasType(LumatoneKeyProperty::State))
+    {
+        stateToCopy = keyStateIn;
+    }
+
+    state = stateToCopy;
+    refreshFromState();
+}
+
+bool LumatoneKey::configIsEqual(const LumatoneKey &compare) const
+{
+    return keyType == compare.keyType
+        && channelNumber == compare.channelNumber
+        && noteNumber == compare.noteNumber
+        && ccFaderDefault == compare.ccFaderDefault;
+}
+
+bool LumatoneKey::colourIsEqual(const LumatoneKey& compare) const
+{
+    return colour == compare.colour;
+}
+
+void LumatoneKey::operator=(const LumatoneKey &keyToCopy)
+{
+    if (configIsEqual(keyToCopy))
+      return;
+
+    keyType = keyToCopy.keyType;
+    channelNumber = keyToCopy.channelNumber;
+    noteNumber = keyToCopy.noteNumber;
+    colour = keyToCopy.colour;
+    ccFaderDefault = keyToCopy.ccFaderDefault;
+    updateState();
+}
+
+void LumatoneKey::setKeyType(LumatoneKeyType typeIn)
+{
+    keyType = typeIn;
+    state.setProperty(LumatoneKeyProperty::Type, keyType, nullptr);
+}
+
+void LumatoneKey::setColour(juce::Colour colourIn)
+{
+    colour = colourIn;
+    state.setProperty(LumatoneKeyProperty::Colour, colour.toString(), nullptr);
+}
+
+void LumatoneKey::setNoteOrCC(int noteOrCC)
+{
+    noteNumber = noteOrCC;
+    state.setProperty(LumatoneKeyProperty::MidiNote, noteNumber, nullptr);
+}
+
+void LumatoneKey::setChannelNumber(int channelIn)
+{
+    channelNumber = channelIn;
+    state.setProperty(LumatoneKeyProperty::MidiChnl, channelNumber, nullptr);
+}
+
+void LumatoneKey::setDefaultCCFader(bool defaultCCFader)
+{
+    ccFaderDefault = defaultCCFader;
+    state.setProperty(LumatoneKeyProperty::DefaultCCFader, ccFaderDefault, nullptr);
+}
+
+void LumatoneKey::setConfig(const LumatoneKey& config)
+{
+    noteNumber = config.noteNumber;
+    channelNumber = config.channelNumber;
+    ccFaderDefault = config.ccFaderDefault;
+    keyType = config.keyType;
+    updateState();
+}
+
+juce::ValueTree LumatoneKey::getState() const
+{
+    return state;
+}
+
+void LumatoneKey::updateState()
+{
+    juce::ValueTree newState(LumatoneKeyProperty::State);
+    newState.setProperty(LumatoneKeyProperty::Type, keyType, nullptr);
+    newState.setProperty(LumatoneKeyProperty::Colour, colour.toString(), nullptr);
+    newState.setProperty(LumatoneKeyProperty::MidiNote, noteNumber, nullptr);
+    newState.setProperty(LumatoneKeyProperty::MidiChnl, channelNumber, nullptr);
+    newState.setProperty(LumatoneKeyProperty::DefaultCCFader, ccFaderDefault, nullptr);
+    state.copyPropertiesFrom(newState, nullptr);
+}
+
+void LumatoneKey::refreshFromState()
+{
+    keyType = (LumatoneKeyType)(int)state.getProperty(LumatoneKeyProperty::Type, (int)LumatoneKeyType::disabled);
+    colour = juce::Colour::fromString(state.getProperty(LumatoneKeyProperty::Colour, juce::Colours::transparentBlack.toString()).toString());
+    noteNumber = (int)state.getProperty(LumatoneKeyProperty::MidiNote, 0);
+    channelNumber = (int)state.getProperty(LumatoneKeyProperty::MidiChnl, 1);
+    ccFaderDefault = (bool)state.getProperty(LumatoneKeyProperty::DefaultCCFader, false);
+}
diff --git a/Source/lumatone_editor_library/data/lumatone_key.h b/Source/lumatone_editor_library/data/lumatone_key.h
new file mode 100644
index 00000000..357948a1
--- /dev/null
+++ b/Source/lumatone_editor_library/data/lumatone_key.h
@@ -0,0 +1,123 @@
+/*
+  ==============================================================================
+
+    lumatone_key.h
+    Created: 6 Aug 2023 2:16:18pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#ifndef LUMATONE_KEY_STATE_H
+#define LUMATONE_KEY_STATE_H
+
+#include "lumatone_editor_common.h"
+
+#include "../lumatone_midi_driver/firmware_definitions.h"
+
+typedef LumatoneFirmware::LumatoneKeyType LumatoneKeyType;
+
+namespace LumatoneKeyProperty
+{
+    static const juce::Identifier State = juce::Identifier("LumatoneKeyState");
+    static const juce::Identifier Type = juce::Identifier("Type");
+    static const juce::Identifier Colour = juce::Identifier("Colour");
+    static const juce::Identifier MidiNote = juce::Identifier("MidiNote");
+    static const juce::Identifier MidiChnl = juce::Identifier("MidiChannel");
+    static const juce::Identifier DefaultCCFader = juce::Identifier("InvertCCFader");
+
+    static const juce::Identifier Index = juce::Identifier("Index");
+    static const juce::Identifier Board = juce::Identifier("Board");
+}
+
+// Mapping of one key
+
+class LumatoneKey
+{
+public:
+    LumatoneKey(LumatoneKeyType newKeyType = LumatoneKeyType::disabled);
+    LumatoneKey(LumatoneKeyType newKeyType, int newChannelNumber, int newNoteNumber, juce::Colour newColour, bool invertCCFader = false);
+    LumatoneKey(juce::ValueTree keyStateIn);
+
+    bool isEmpty() const { return channelNumber == 0; }
+
+    bool configIsEqual(const LumatoneKey& compare) const;
+    bool colourIsEqual(const LumatoneKey& compare) const;
+
+    void operator=(const LumatoneKey& keyToCopy);
+
+    bool operator==(const LumatoneKey& compare) const { return configIsEqual(compare) && colourIsEqual(compare); }
+    bool operator!=(const LumatoneKey& compare) const { return !(*this == compare); }
+
+    LumatoneKeyType getType() const { return keyType; }
+    int getMidiNumber() const { return noteNumber; }
+    int getMidiChannel() const { return channelNumber; }
+    juce::Colour getColour() const { return colour; }
+    bool isCCFaderDefault() const { return ccFaderDefault; }
+
+    bool hasType(LumatoneKeyType compare) const { return keyType == compare; }
+    bool isColour(juce::Colour compare) const { return colour == compare; }
+    bool hasMidiNumber(int number) const { return noteNumber == number; }
+    bool hasMidiChannel(int number) const { return channelNumber == number; }
+    bool hasCCFaderFlag(bool flag) const { return ccFaderDefault == flag; }
+
+    void setKeyType(LumatoneKeyType typeIn);
+    void setColour(juce::Colour colourIn);
+    void setNoteOrCC(int noteOrCC);
+    void setChannelNumber(int channelIn);
+    void setDefaultCCFader(bool invertCCFaderIn);
+
+    // Everything except for colour
+    void setConfig(const LumatoneKey& config);
+
+    // // Chainable setters
+    // LumatoneKey withKeyType(LumatoneKeyType type) const { return LumatoneKey(type, channelNumber, noteNumber, colour, ccFaderDefault); }
+    // LumatoneKey withColour(juce::Colour newColour) const { return LumatoneKey(keyType, channelNumber, noteNumber, newColour, ccFaderDefault); }
+    // LumatoneKey withNoteOrCC(int noteOrCC) const { return LumatoneKey(keyType, channelNumber, noteOrCC, colour, ccFaderDefault); }
+    // LumatoneKey withChannelNumber(int channel) const { return LumatoneKey(keyType, channel, noteNumber, colour, ccFaderDefault); }
+    // LumatoneKey withInvertCCFader(bool invertCCFader) const { return LumatoneKey(keyType, channelNumber, noteNumber, colour, invertCCFader); }
+
+    juce::ValueTree getState() const;
+
+private:
+    void updateState();
+    void refreshFromState();
+
+private:
+    LumatoneKeyType    keyType;
+    int                noteNumber;
+    int                channelNumber;
+    juce::Colour       colour;
+    bool               ccFaderDefault;
+
+    juce::ValueTree     state;
+
+};
+
+class MappedLumatoneKey : public LumatoneKey
+{
+public:
+    MappedLumatoneKey()
+        : LumatoneKey()
+        , boardIndex(-1)
+        , keyIndex(-1)
+        { }
+
+    MappedLumatoneKey(LumatoneKey key, int boardIndexIn, int keyIndexIn)
+        : LumatoneKey(key)
+		, boardIndex(boardIndexIn)
+        , keyIndex(keyIndexIn)
+        { }
+
+	MappedLumatoneKey(LumatoneKey key, LumatoneKeyCoord coord)
+		: MappedLumatoneKey(key, coord.boardIndex, coord.keyIndex) {}
+
+    LumatoneKeyCoord getKeyCoord() const { return LumatoneKeyCoord(boardIndex, keyIndex); }
+
+public:
+
+    int boardIndex = -1;
+    int keyIndex = -1;
+};
+
+#endif LUMATONE_KEY_STATE_H
diff --git a/Source/data/lumatone_layout.cpp b/Source/lumatone_editor_library/data/lumatone_layout.cpp
similarity index 63%
rename from Source/data/lumatone_layout.cpp
rename to Source/lumatone_editor_library/data/lumatone_layout.cpp
index 314f6886..5ee8118d 100644
--- a/Source/data/lumatone_layout.cpp
+++ b/Source/lumatone_editor_library/data/lumatone_layout.cpp
@@ -16,7 +16,7 @@ LumatoneConfigTable class
 ==============================================================================
 */
 
-int DefaultVelocityIntervalTable[127] = {
+unsigned int DefaultVelocityIntervalTable[127] = {
     1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
     21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
     41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 60, 61,
@@ -26,7 +26,7 @@ int DefaultVelocityIntervalTable[127] = {
     280, 285, 290, 295, 300, 305, 310};
 
 // Empty velocity curve config: one to one
-int EmptyVelocityCurveTable[128] = {
+unsigned int EmptyVelocityCurveTable[128] = {
     0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
     20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
     40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
@@ -35,7 +35,7 @@ int EmptyVelocityCurveTable[128] = {
     100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
     120, 121, 122, 123, 124, 125, 126, 127};
 
-int DefaultOnOffVelocityTable[128] = {
+unsigned int DefaultOnOffVelocityTable[128] = {
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
     11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
@@ -44,7 +44,7 @@ int DefaultOnOffVelocityTable[128] = {
     74, 76, 77, 79, 80, 82, 84, 85, 87, 88, 90, 92, 94, 96, 97, 99, 101, 103, 105, 108,
     110, 112, 114, 117, 119, 121, 124, 127};
 
-int DefaultFaderVelocityTable[128] = {
+unsigned int DefaultFaderVelocityTable[128] = {
     1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 6, 6, 6, 7, 7, 7, 8, 8,
     9, 9, 9, 10, 10, 10, 11, 11, 12, 12, 12, 13, 13, 14, 14, 14, 15, 15, 16, 16,
     17, 17, 17, 18, 18, 19, 19, 20, 20, 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25,
@@ -53,7 +53,7 @@ int DefaultFaderVelocityTable[128] = {
     55, 56, 57, 59, 62, 65, 68, 71, 74, 77, 79, 82, 85, 88, 91, 94, 97, 99, 102, 105,
     108, 111, 114, 117, 119, 122, 125, 127};
 
-int DefaultAfterTouchVelocityTable[128] = {
+unsigned int DefaultAfterTouchVelocityTable[128] = {
     0, 2, 3, 5, 6, 8, 9, 10, 12, 13, 14, 16, 17, 18, 20, 21, 22, 24, 25, 26,
     27, 28, 30, 31, 32, 33, 34, 36, 37, 38, 39, 40, 41, 43, 44, 45, 46, 47, 48, 49,
     50, 51, 52, 53, 54, 55, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
@@ -62,7 +62,7 @@ int DefaultAfterTouchVelocityTable[128] = {
     106, 107, 108, 108, 109, 110, 111, 112, 112, 113, 114, 115, 116, 116, 117, 118, 119, 120, 120, 121,
     122, 123, 123, 124, 125, 126, 126, 127};
 
-int DefaulLumatouchVelocityTable[128] = {
+unsigned int DefaulLumatouchVelocityTable[128] = {
     0, 1, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 7, 7, 7, 8, 8,
     8, 9, 9, 10, 10, 10, 11, 11, 11, 12, 12, 13, 13, 13, 14, 14, 15, 15, 15, 16,
     16, 17, 17, 18, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 22, 23, 23, 24, 24, 25,
@@ -158,7 +158,7 @@ LumatoneConfigTable::LumatoneConfigTable(const juce::String& velocityCurveConfig
     }
 }
 
-juce::String LumatoneConfigTable::toConfigString()
+juce::String LumatoneConfigTable::toConfigString() const
 {
     switch (editStrategy) {
         case DrawMode::freeDrawing:
@@ -197,9 +197,14 @@ juce::String LumatoneConfigTable::toConfigString()
     }
 }
 
+void LumatoneConfigTable::setValues(const int* values)
+{
+    memmove(velocityValues, values, sizeof(int));
+}
+
 /*
 ==============================================================================
-LumatoneLayout class
+TerpstraKeyMapping class
 ==============================================================================
 */
 
@@ -207,28 +212,164 @@ LumatoneLayout::LumatoneLayout(int numBoardsIn, int octaveBoardSizeIn, bool init
     : numBoards(numBoardsIn)
     , octaveBoardSize(octaveBoardSizeIn)
 {
+    state = juce::ValueTree(LumatoneConfigProperty::State);
     clearAll(initWithNotes);
 }
 
-void LumatoneLayout::clearVelocityIntervalTable()
+LumatoneLayout::LumatoneLayout(juce::ValueTree stateIn)
+{
+    juce::ValueTree stateToCopy(LumatoneConfigProperty::State);
+    if (stateIn.hasType(LumatoneConfigProperty::State))
+        stateToCopy = stateIn;
+
+    state = stateToCopy;
+    refreshFromState();
+}
+
+LumatoneLayout::LumatoneLayout(juce::StringArray stringArray)
+{
+    // Parse string to find sizes first?
+    numBoards = 5;
+    octaveBoardSize = 56;
+
+    state = juce::ValueTree(LumatoneConfigProperty::State);
+    fromStringArray(stringArray);
+}
+
+void LumatoneLayout::clearVelocityIntervalTable(LumatoneConfigTable* table)
 {
     jassert(sizeof(DefaultVelocityIntervalTable) == sizeof(table));
     memmove(table, DefaultVelocityIntervalTable, sizeof(DefaultVelocityIntervalTable));
 }
 
-const LumatoneBoard* LumatoneLayout::readBoard(int index) const
+const LumatoneBoard& LumatoneLayout::getBoard(int index) const
+{
+    return boards[index];
+}
+
+void LumatoneLayout::setBoard(const LumatoneBoard &boardIn, int boardIndex)
+{
+    boards[boardIndex] = boardIn;
+}
+
+const LumatoneKey& LumatoneLayout::getKey(int boardIndex, int keyIndex) const
+{
+    return boards[boardIndex].theKeys[keyIndex];
+}
+
+MappedLumatoneKey LumatoneLayout::getMappedKey(int boardIndex, int keyIndex) const
+{
+    return MappedLumatoneKey(boards[boardIndex].theKeys[keyIndex], boardIndex, keyIndex);
+}
+
+void LumatoneLayout::setKey(const LumatoneKey &keyIn, int boardIndex, int keyIndex)
+{
+    boards[boardIndex].setKey(keyIn, keyIndex);
+}
+
+void LumatoneLayout::setKey(MappedLumatoneKey keyIn)
+{
+    boards[keyIn.boardIndex].setKey(keyIn);
+}
+
+void LumatoneLayout::setKeyConfig(const LumatoneKey& keyIn, int boardIndex, int keyIndex)
+{
+    boards[boardIndex].setKeyConfig(keyIn, keyIndex);
+}
+
+void LumatoneLayout::setKeyColour(juce::Colour colour, int boardIndex, int keyIndex)
 {
-    return &boards[index];
+    boards[boardIndex].setKeyColour(colour, keyIndex);
 }
 
-LumatoneBoard* LumatoneLayout::getBoard(int index)
+bool LumatoneLayout::isKeyCoordValid(const LumatoneKeyCoord &coord) const
 {
-    return &boards[index];
+    return coord.isInitialized()
+        && coord.boardIndex < getNumBoards()
+        && coord.keyIndex < getOctaveBoardSize();
 }
 
-const LumatoneKey* LumatoneLayout::readKey(int boardIndex, int keyIndex) const
+bool LumatoneLayout::isKeyCoordValid(int keyIndex, int boardIndex) const
 {
-    return &boards[boardIndex].theKeys[keyIndex];
+    return keyIndex >= 0
+        && keyIndex < getOctaveBoardSize()
+        && boardIndex >= 0
+        && boardIndex < getNumBoards();
+}
+
+int LumatoneLayout::keyCoordToKeyNum(const LumatoneKeyCoord& coord) const
+{
+    if (!isKeyCoordValid(coord))
+        return -1;
+    return coord.boardIndex * getOctaveBoardSize() + coord.keyIndex;
+}
+
+int LumatoneLayout::keyCoordToKeyNum(int keyIndex, int boardIndex) const
+{
+    if (!isKeyCoordValid(keyIndex, boardIndex))
+        return -1;
+    return boardIndex * getOctaveBoardSize() + keyIndex;
+}
+
+LumatoneKeyCoord LumatoneLayout::keyNumToKeyCoord(int keyNum) const
+{
+    return LumatoneKeyCoord(keyNum / getOctaveBoardSize(), keyNum % getOctaveBoardSize());
+}
+
+void LumatoneLayout::setOctaveBoardSize(int size)
+{
+    octaveBoardSize = size;
+    state.setProperty(LumatoneBoardProperty::Size, size, nullptr);
+}
+
+void LumatoneLayout::setAftertouchEnabled(bool enabled)
+{
+    afterTouchActive = enabled;
+    state.setProperty(LumatoneConfigProperty::AftertouchEnabled, afterTouchActive, nullptr);
+}
+
+void LumatoneLayout::setLightOnKeyStrokes(bool enabled)
+{
+    lightOnKeyStrokes = enabled;
+    state.setProperty(LumatoneConfigProperty::LightOnKeyStrokes, lightOnKeyStrokes, nullptr);
+}
+
+void LumatoneLayout::setInvertExpression(bool invert)
+{
+    invertExpression = invert;
+    state.setProperty(LumatoneConfigProperty::InvertExpression, invertExpression, nullptr);
+}
+
+void LumatoneLayout::setInvertSustain(bool invert)
+{
+    invertSustain = invert;
+    state.setProperty(LumatoneConfigProperty::InvertSustain, invert, nullptr);
+}
+
+void LumatoneLayout::setExpressionSensitivity(juce::uint8 value)
+{
+    expressionSensitivity = value;
+    state.setProperty(LumatoneConfigProperty::ExpressionSensitivity, (int)expressionSensitivity, nullptr);
+}
+
+void LumatoneLayout::transform(std::function<void(int,int,LumatoneKey&)> transformFnc)
+{
+    for (int b = 0; b < getNumBoards(); b++)
+    {
+        for (int k = 0; k < getOctaveBoardSize(); k++)\
+        {
+            LumatoneKey key = getKey(b, k);
+            transformFnc(b, k, key);
+            setKey(key, b, k);
+        }
+    }
+}
+
+LumatoneLayout LumatoneLayout::withKeyTransform(std::function<void(int,int,LumatoneKey &)> transformFnc) const
+{
+    LumatoneLayout transformed = *this;
+    transformed.transform(transformFnc);
+    return transformed;
 }
 
 void LumatoneLayout::clearAll(bool initializeWithNoteKeyType)
@@ -237,8 +378,7 @@ void LumatoneLayout::clearAll(bool initializeWithNoteKeyType)
 
     for (int i = 0; i < numBoards; i++)
     {
-        boards[i] = LumatoneBoard(newKeyType, octaveBoardSize);
-        boards[i].board_idx = i;
+        boards[i] = LumatoneBoard(newKeyType, octaveBoardSize, i);
     }
 
     // Default values for options
@@ -246,13 +386,15 @@ void LumatoneLayout::clearAll(bool initializeWithNoteKeyType)
     lightOnKeyStrokes = false;
     invertExpression = false;
     invertSustain = false;
-    expressionControllerSensivity = 0;
+    expressionSensitivity = 0;
 
-    clearVelocityIntervalTable();
+    // clearVelocityIntervalTable();
     velocityTable = LumatoneConfigTable(LumatoneConfigTable::TableType::velocityInterval);
     faderTable = LumatoneConfigTable(LumatoneConfigTable::TableType::fader);
     afterTouchTable = LumatoneConfigTable(LumatoneConfigTable::TableType::afterTouch);
     lumaTouchTable = LumatoneConfigTable(LumatoneConfigTable::TableType::lumaTouch);
+
+    updateState();
 }
 
 bool LumatoneLayout::isEmpty() const
@@ -265,6 +407,28 @@ bool LumatoneLayout::isEmpty() const
     return isEmpty;
 }
 
+void LumatoneLayout::operator=(const LumatoneLayout& toCopy)
+{
+    for (int i = 0; i < numBoards; i++)
+    {
+        boards[i] = toCopy.getBoard(i);
+    }
+
+    afterTouchActive = toCopy.afterTouchActive;
+    lightOnKeyStrokes = toCopy.lightOnKeyStrokes;
+    invertExpression = toCopy.invertExpression;
+    invertSustain = toCopy.invertSustain;
+    expressionSensitivity = toCopy.expressionSensitivity;
+
+    // clearVelocityIntervalTable();
+    velocityTable = LumatoneConfigTable(toCopy.velocityTable.toConfigString());
+    faderTable = LumatoneConfigTable(toCopy.faderTable.toConfigString());
+    afterTouchTable = LumatoneConfigTable(toCopy.afterTouchTable.toConfigString());
+    lumaTouchTable = LumatoneConfigTable(toCopy.lumaTouchTable.toConfigString());
+
+    updateState();
+}
+
 void LumatoneLayout::fromStringArray(const juce::StringArray& stringArray)
 {
     clearAll(true);
@@ -296,7 +460,9 @@ void LumatoneLayout::fromStringArray(const juce::StringArray& stringArray)
                 if (boardIndex >= 0 && boardIndex < octaveBoardSize)
                 {
                     if (keyIndex >= 0 && keyIndex < 56)
-                        boards[boardIndex].theKeys[keyIndex].noteNumber = keyValue;
+                    {
+                        boards[boardIndex].theKeys[keyIndex].setNoteOrCC(keyValue);
+                    }
                     else
                         jassert(false);
                 }
@@ -318,11 +484,12 @@ void LumatoneLayout::fromStringArray(const juce::StringArray& stringArray)
 
                         if (keyValue > 0 && keyValue <= 16)
                         {
-                            boards[boardIndex].theKeys[keyIndex].channelNumber = keyValue;
-                        } else
+                            boards[boardIndex].theKeys[keyIndex].setChannelNumber(keyValue);
+                        }
+                        else
                         {
-                            boards[boardIndex].theKeys[keyIndex].channelNumber = 1;
-                            boards[boardIndex].theKeys[keyIndex].keyType = LumatoneKeyType::disabledDefault;
+                            boards[boardIndex].theKeys[keyIndex].setChannelNumber(1);
+                            boards[boardIndex].theKeys[keyIndex].setKeyType(LumatoneKeyType::disabledDefault);
                         }
 
                         if (keyIndex == 55)
@@ -345,7 +512,7 @@ void LumatoneLayout::fromStringArray(const juce::StringArray& stringArray)
                 if (boardIndex >= 0 && boardIndex < octaveBoardSize)
                 {
                     if (keyIndex >= 0 && keyIndex < 56)
-                        boards[boardIndex].theKeys[keyIndex].colour = juce::Colour(colValue).withAlpha(1.0f);
+                        boards[boardIndex].theKeys[keyIndex].setColour(juce::Colour(colValue).withAlpha(1.0f));
                     else
                         jassert(false);
                 }
@@ -364,11 +531,11 @@ void LumatoneLayout::fromStringArray(const juce::StringArray& stringArray)
                 {
                     if (keyIndex >= 0 && keyIndex < 56)
                     {
-                        auto currentKeyType = boards[boardIndex].theKeys[keyIndex].keyType;
+                        auto currentKeyType = boards[boardIndex].theKeys[keyIndex].getType();
                         if (keyValue < 0 && keyValue >= 5 || currentKeyType == LumatoneKeyType::disabledDefault)
-                            boards[boardIndex].theKeys[keyIndex].keyType = LumatoneKeyType::disabled;
+                            boards[boardIndex].theKeys[keyIndex].setKeyType(LumatoneKeyType::disabled);
                         else
-                            boards[boardIndex].theKeys[keyIndex].keyType = (LumatoneKeyType)keyValue;
+                            boards[boardIndex].theKeys[keyIndex].setKeyType((LumatoneKeyType)keyValue);
                     }
                     else
                         jassert(false);
@@ -383,7 +550,7 @@ void LumatoneLayout::fromStringArray(const juce::StringArray& stringArray)
             if (boardIndex >= 0 && boardIndex < octaveBoardSize)
             {
                 if (keyIndex >= 0 && keyIndex < 56)
-                        boards[boardIndex].theKeys[keyIndex].ccFaderDefault = false;
+                        boards[boardIndex].theKeys[keyIndex].setDefaultCCFader(false);
                 else
                     jassert(false);
             }
@@ -403,7 +570,7 @@ void LumatoneLayout::fromStringArray(const juce::StringArray& stringArray)
             invertSustain = currentLine.substring(pos1 + 14).getIntValue() > 0;
 
         else if ((pos1 = currentLine.indexOf("ExprCtrlSensivity=")) >= 0)
-            expressionControllerSensivity = currentLine.substring(pos1 + 18).getIntValue();
+            expressionSensitivity = currentLine.substring(pos1 + 18).getIntValue();
 
         // Velocity curve config
         else if ((pos1 = currentLine.indexOf("VelocityIntrvlTbl=")) >= 0)
@@ -421,7 +588,7 @@ void LumatoneLayout::fromStringArray(const juce::StringArray& stringArray)
             }
             else
             {
-                clearVelocityIntervalTable();
+                clearVelocityIntervalTable(&velocityTable);
             }
         }
         // Note on/off velocity configuration
@@ -447,13 +614,13 @@ void LumatoneLayout::fromStringArray(const juce::StringArray& stringArray)
     }
 
     // Conversion between 55-key and 56-key layout
-    //if (TerpstraSysExApplication::getApp().getOctaveBoardSize() == 56 && !hasFiftySixKeys) {
+    //if (getOctaveBoardSize() == 56 && !hasFiftySixKeys) {
     //    // Loaded layout has 55-key layout. Adjust geometry to 56-key layout
     //    for (boardIndex = 0; boardIndex < octaveBoardSize; boardIndex++) {
     //        boards[boardIndex].theKeys[55] = boards[boardIndex].theKeys[54];
     //        boards[boardIndex].theKeys[54] = TerpstraKey();
     //    }
-    //} else if (TerpstraSysExApplication::getApp().getOctaveBoardSize() == 55 && hasFiftySixKeys) {
+    //} else if (getOctaveBoardSize() == 55 && hasFiftySixKeys) {
     //    // Loaded layout has 56-key layout. Adjust geometry to 55-key layout
     //    for (boardIndex = 0; boardIndex < octaveBoardSize; boardIndex++) {
     //        boards[boardIndex].theKeys[54] = boards[boardIndex].theKeys[55];
@@ -462,22 +629,22 @@ void LumatoneLayout::fromStringArray(const juce::StringArray& stringArray)
     //}
 }
 
-juce::StringArray LumatoneLayout::toStringArray()
+juce::StringArray LumatoneLayout::toStringArray() const
 {
     juce::StringArray result;
 
-    for (int boardIndex = 0; boardIndex < octaveBoardSize; boardIndex++) {
+    for (int boardIndex = 0; boardIndex < numBoards; boardIndex++) {
         result.add("[Board" + juce::String(boardIndex) + "]");
 
-        //for (int keyIndex = 0; keyIndex < TerpstraSysExApplication::getApp().getOctaveBoardSize(); keyIndex++) {
+        //for (int keyIndex = 0; keyIndex < getOctaveBoardSize(); keyIndex++) {
             for (int keyIndex = 0; keyIndex < 56; keyIndex++) {
-            result.add("Key_" + juce::String(keyIndex) + "=" + juce::String(boards[boardIndex].theKeys[keyIndex].noteNumber));
-            result.add("Chan_" + juce::String(keyIndex) + "=" + juce::String(boards[boardIndex].theKeys[keyIndex].channelNumber));
+            result.add("Key_" + juce::String(keyIndex) + "=" + juce::String(boards[boardIndex].theKeys[keyIndex].getMidiNumber()));
+            result.add("Chan_" + juce::String(keyIndex) + "=" + juce::String(boards[boardIndex].theKeys[keyIndex].getMidiChannel()));
             //if (boards[boardIndex].theKeys[keyIndex].colour != juce::Colour())
-            result.add("Col_" + juce::String(keyIndex) + "=" + boards[boardIndex].theKeys[keyIndex].colour.toDisplayString(false));
-            if (boards[boardIndex].theKeys[keyIndex].keyType != LumatoneKeyType::noteOnNoteOff)
-                result.add("KTyp_" + juce::String(keyIndex) + "=" + juce::String(boards[boardIndex].theKeys[keyIndex].keyType));
-            if (boards[boardIndex].theKeys[keyIndex].ccFaderDefault != true)
+            result.add("Col_" + juce::String(keyIndex) + "=" + boards[boardIndex].theKeys[keyIndex].getColour().toDisplayString(false));
+            if (boards[boardIndex].theKeys[keyIndex].getType() != LumatoneKeyType::noteOnNoteOff)
+                result.add("KTyp_" + juce::String(keyIndex) + "=" + juce::String(boards[boardIndex].theKeys[keyIndex].getType()));
+            if (boards[boardIndex].theKeys[keyIndex].isCCFaderDefault() != true)
                 result.add("CCInvert_" + juce::String(keyIndex));
         }
     }
@@ -487,7 +654,7 @@ juce::StringArray LumatoneLayout::toStringArray()
     result.add("LightOnKeyStrokes=" + juce::String(lightOnKeyStrokes ? 1 : 0));
     result.add("InvertFootController=" + juce::String(invertExpression ? 1 : 0));
     result.add("InvertSustain=" + juce::String(invertSustain ? 1 : 0));
-    result.add("ExprCtrlSensivity=" + juce::String(expressionControllerSensivity));
+    result.add("ExprCtrlSensivity=" + juce::String(expressionSensitivity));
 
     // Velocity curve interval table
     juce::String intervalTableString;
@@ -507,13 +674,12 @@ juce::StringArray LumatoneLayout::toStringArray()
     return result;
 }
 
-LumatoneConfigTable* LumatoneLayout::getConfigTable(LumatoneConfigTable::TableType velocityCurveType)
+const LumatoneConfigTable* LumatoneLayout::getConfigTable(LumatoneConfigTable::TableType tableType) const
 {
-	switch (velocityCurveType)
+	switch (tableType)
 	{
 	case LumatoneConfigTable::TableType::velocityInterval:
 		return &velocityTable;
-
 	case LumatoneConfigTable::TableType::fader:
 		return &faderTable;
 	case LumatoneConfigTable::TableType::afterTouch:
@@ -526,13 +692,35 @@ LumatoneConfigTable* LumatoneLayout::getConfigTable(LumatoneConfigTable::TableTy
 	}
 }
 
+void LumatoneLayout::setConfigTable(LumatoneConfigTable::TableType tableType, const int* table)
+{
+	switch (tableType)
+	{
+	case LumatoneConfigTable::TableType::velocityInterval:
+		velocityTable.setValues(table);
+        break;
+	case LumatoneConfigTable::TableType::fader:
+		faderTable.setValues(table);
+        break;
+	case LumatoneConfigTable::TableType::afterTouch:
+		afterTouchTable.setValues(table);
+        break;
+	case LumatoneConfigTable::TableType::lumaTouch:
+		lumaTouchTable.setValues(table);
+        break;
+	default:
+		jassertfalse;
+		break;
+    }
+}
+
 juce::Array<juce::Colour> LumatoneLayout::getLayoutColours() const
 {
-    juce::Array<juce::Colour> layoutColours = readBoard(0)->getBoardColours();
+    juce::Array<juce::Colour> layoutColours = getBoard(0).getBoardColours();
 
     for (int i = 1; i < getNumBoards(); i++)
     {
-        auto boardColours = readBoard(i)->getBoardColours();
+        auto boardColours = getBoard(i).getBoardColours();
         for (auto c : boardColours)
         {
             if (!layoutColours.contains(c))
@@ -566,3 +754,83 @@ juce::Array<LumatoneKeyCoord> LumatoneLayout::getAllKeyCoords() const
 
     return coords;
 }
+
+LumatoneLayout LumatoneLayout::IdentityMapping(int numBoards, int octaveBoardSize, LumatoneKeyType keyType)
+{
+    LumatoneLayout layout(numBoards, octaveBoardSize);
+
+    for (int i = 0; i < layout.getNumBoards(); i++)
+    {
+        LumatoneBoard& newBoard = layout.boards[i];
+        newBoard.board_idx = i;
+
+        int midiChannel = i + 1;
+
+        for (int k = 0; k < layout.getOctaveBoardSize(); k++)
+        {
+            LumatoneKey key(keyType, midiChannel, k, juce::Colours::black);
+            newBoard.setKey(key, k);
+        }
+    }
+
+    return layout;
+}
+
+void LumatoneLayout::updateState()
+{
+    juce::ValueTree newState(LumatoneConfigProperty::State);
+
+    juce::ValueTree newLayout(LumatoneConfigProperty::LayoutState);
+    for (int i = 0; i < numBoards; i++)
+    {
+        newLayout.appendChild(boards[i].getState(), nullptr);
+    }
+    newState.appendChild(newLayout, nullptr);
+
+    // Default values for options
+    newState.setProperty(LumatoneConfigProperty::AftertouchEnabled, afterTouchActive, nullptr);
+    newState.setProperty(LumatoneConfigProperty::LightOnKeyStrokes, lightOnKeyStrokes, nullptr);
+    newState.setProperty(LumatoneConfigProperty::InvertExpression, invertExpression, nullptr);
+    newState.setProperty(LumatoneConfigProperty::InvertSustain, invertSustain, nullptr);
+    newState.setProperty(LumatoneConfigProperty::ExpressionSensitivity, expressionSensitivity, nullptr);
+
+    newState.setProperty(LumatoneConfigProperty::VelocityIntervalTable, velocityTable.toConfigString(), nullptr);
+    newState.setProperty(LumatoneConfigProperty::NoteVelocityTable, faderTable.toConfigString(), nullptr);
+    newState.setProperty(LumatoneConfigProperty::AftertouchTable, afterTouchTable.toConfigString(), nullptr);
+    newState.setProperty(LumatoneConfigProperty::LumatouchTable, lumaTouchTable.toConfigString(), nullptr);
+
+    state.copyPropertiesAndChildrenFrom(newState, nullptr);
+}
+
+void LumatoneLayout::refreshFromState()
+{
+    juce::ValueTree parsedState = state.createCopy();
+
+    parsedState.removeAllChildren(nullptr);
+    juce::ValueTree parsedLayoutState(LumatoneConfigProperty::LayoutState);
+    parsedState.appendChild(parsedLayoutState, nullptr);
+
+    auto layoutState = state.getOrCreateChildWithName(LumatoneConfigProperty::LayoutState, nullptr);
+    for (int i = 0; i < numBoards; i++)
+    {
+        auto boardState = layoutState.getChild(i).createCopy();
+        boardState.setProperty(LumatoneBoardProperty::Id, i + 1, nullptr);
+
+        LumatoneBoard board = LumatoneBoard(boardState);
+        parsedLayoutState.appendChild(board.getState(), nullptr);
+        boards[i] = board;
+    }
+
+    afterTouchActive = (bool)parsedState.getProperty(LumatoneConfigProperty::AftertouchEnabled, false);
+    lightOnKeyStrokes = (bool)parsedState.getProperty(LumatoneConfigProperty::LightOnKeyStrokes, false);
+    invertExpression = (bool)parsedState.getProperty(LumatoneConfigProperty::InvertExpression, false);
+    invertSustain = (bool)parsedState.getProperty(LumatoneConfigProperty::InvertSustain, false);
+    expressionSensitivity = (int)parsedState.getProperty(LumatoneConfigProperty::ExpressionSensitivity, 127);
+
+    velocityTable = LumatoneConfigTable(parsedState.getProperty(LumatoneConfigProperty::VelocityIntervalTable).toString());
+    faderTable = LumatoneConfigTable(parsedState.getProperty(LumatoneConfigProperty::NoteVelocityTable).toString());
+    afterTouchTable = LumatoneConfigTable(parsedState.getProperty(LumatoneConfigProperty::AftertouchTable).toString());
+    lumaTouchTable = LumatoneConfigTable(parsedState.getProperty(LumatoneConfigProperty::LumatouchTable).toString());
+
+    state.copyPropertiesAndChildrenFrom(parsedState, nullptr);
+}
diff --git a/Source/lumatone_editor_library/data/lumatone_layout.h b/Source/lumatone_editor_library/data/lumatone_layout.h
new file mode 100644
index 00000000..ca28b11f
--- /dev/null
+++ b/Source/lumatone_editor_library/data/lumatone_layout.h
@@ -0,0 +1,185 @@
+/*
+==============================================================================
+
+LumatoneDataStructures.h
+Created: XXX
+Author:  hsstraub
+
+==============================================================================
+*/
+
+#ifndef LUMATONE_LAYOUT_STATE_H
+#define LUMATONE_LAYOUT_STATE_H
+
+#include "./lumatone_board.h"
+
+namespace LumatoneConfigProperty
+{
+	static const juce::Identifier State = juce::Identifier("LumatoneConfigState");
+	static const juce::Identifier LayoutState = juce::Identifier("LayoutState");
+
+	static const juce::Identifier AftertouchEnabled = juce::Identifier("AftertouchEnabled");
+	static const juce::Identifier LightOnKeyStrokes = juce::Identifier("LightOnKeyStrokes");
+	static const juce::Identifier InvertExpression = juce::Identifier("InvertExpression");
+	static const juce::Identifier InvertSustain = juce::Identifier("InvertSustain");
+	static const juce::Identifier ExpressionSensitivity = juce::Identifier("ExpressionSensitivity");
+
+	static const juce::Identifier VelocityIntervalTable = juce::Identifier("VelocityIntervalTable");
+	static const juce::Identifier NoteVelocityTable = juce::Identifier("NoteVelocityTable");
+	static const juce::Identifier AftertouchTable = juce::Identifier("AftertouchTable");
+	static const juce::Identifier LumatouchTable = juce::Identifier("LumatouchTable");
+}
+
+// Velocity curve config
+class LumatoneConfigTable
+{
+public:
+
+	typedef enum
+	{
+		none = -1,
+		freeDrawing = 0,
+		linearSegments = 1,
+		quadraticCurves = 2
+	} DrawMode;
+
+	typedef enum
+	{
+		velocityInterval = 1,
+		fader = 2,
+		afterTouch = 3,
+		lumaTouch = 4
+		// ToDo modulation wheel
+	} TableType;
+
+public:
+	LumatoneConfigTable();
+	// Default value for the given curve type
+	LumatoneConfigTable(TableType tableType);
+	LumatoneConfigTable(const juce::String& configString);
+
+	juce::String toConfigString() const;
+
+	void setValues(const int* values);
+
+public:
+	DrawMode editStrategy;
+
+	// Velocity curve values. Meaning varies depending on editStrategy
+	int velocityValues[128];
+};
+
+/*
+==============================================================================
+A complete key mapping
+==============================================================================
+*/
+#define MAXNUMBOARDS 5
+
+// Number of entries in the velocity interval table
+#define VELOCITYINTERVALTABLESIZE 127
+
+class LumatoneLayout
+{
+private:
+	LumatoneBoard boards[MAXNUMBOARDS];
+
+public:
+	LumatoneLayout(int numBoards=5, int octaveBoardSize=56, bool initializeWithNotes=false);
+	LumatoneLayout(juce::ValueTree stateIn);
+	LumatoneLayout(juce::StringArray stringArray);
+
+	void clearVelocityIntervalTable(LumatoneConfigTable* table);
+	void clearAll(bool initializeWithNoteKeyType=false);
+    bool isEmpty() const;
+
+	void operator=(const LumatoneLayout& toCopy);
+
+	void fromStringArray(const juce::StringArray& stringArray);
+	juce::StringArray toStringArray() const;
+
+	juce::ValueTree getState() const { return state; }
+
+	int getNumBoards() const { return numBoards; }
+	int getOctaveBoardSize() const { return octaveBoardSize; }
+
+	bool getAftertouchOn() const { return afterTouchActive; }
+	bool getLightOnKeyStrokes() const { return lightOnKeyStrokes; }
+	bool getInvertExpression() const { return invertExpression; }
+	bool getInvertSustain() const { return invertSustain; }
+	int getExpressionSensitivity() const { return expressionSensitivity; }
+
+	const LumatoneConfigTable* getConfigTable(LumatoneConfigTable::TableType tableType) const;
+	void setConfigTable(LumatoneConfigTable::TableType tableType, const int* table);
+
+	juce::Array<juce::Colour> getLayoutColours() const;
+    juce::Array<LumatoneKeyCoord> getKeysWithColour(const juce::Colour& c) const;
+
+	// Key configuration
+	const LumatoneBoard& getBoard(int index) const;
+	virtual void setBoard(const LumatoneBoard& boardIn, int boardIndex);
+
+	const LumatoneKey& getKey(int boardIndex, int keyIndex) const;
+	MappedLumatoneKey getMappedKey(int boardIndex, int keyIndex) const;
+
+	virtual void setKey(const LumatoneKey& keyIn, int boardIndex, int keyIndex);
+	virtual void setKey(MappedLumatoneKey keyIn);
+	virtual void setKeyConfig(const LumatoneKey& keyIn, int boardIndex, int keyIndex);
+	virtual void setKeyColour(juce::Colour colour, int boardIndex, int keyIndex);
+
+	// Config
+	void setOctaveBoardSize(int size);
+
+	virtual void setAftertouchEnabled(bool enabled);
+	virtual void setLightOnKeyStrokes(bool enabled);
+	virtual void setInvertExpression(bool invert);
+	virtual void setInvertSustain(bool invert);
+	virtual void setExpressionSensitivity(juce::uint8 value);
+
+	// Mutators
+	virtual void transform(std::function<void(int,int,LumatoneKey&)> transformFnc);
+	virtual LumatoneLayout withKeyTransform(std::function<void(int,int,LumatoneKey&)> transformFnc) const;
+
+public:
+	juce::Array<LumatoneKeyCoord> getAllKeyCoords() const;
+
+	bool isKeyCoordValid(const LumatoneKeyCoord& coord) const;
+	bool isKeyCoordValid(int keyIndex, int boardIndex) const;
+
+	int keyCoordToKeyNum(const LumatoneKeyCoord& coord) const;
+	int keyCoordToKeyNum(int keyIndex, int boardIndex) const;
+
+	LumatoneKeyCoord keyNumToKeyCoord(int keyNum) const;
+
+public:
+	static LumatoneLayout IdentityMapping(int numBoards=MAXNUMBOARDS, int octaveBoardSize=56, LumatoneKeyType keyType=LumatoneKeyType::noteOnNoteOff);
+
+private:
+
+	void updateState();
+	void refreshFromState();
+
+private:
+	int numBoards = 0;
+	int octaveBoardSize = 0;
+
+	// General options
+	bool afterTouchActive;
+	bool lightOnKeyStrokes;
+	bool invertExpression;
+	bool invertSustain;
+	int expressionSensitivity;
+
+	// Velocity curves
+	int table[VELOCITYINTERVALTABLESIZE];
+
+	LumatoneConfigTable	velocityTable;
+	LumatoneConfigTable faderTable;
+	LumatoneConfigTable afterTouchTable;
+	LumatoneConfigTable lumaTouchTable;
+
+private:
+	juce::ValueTree state;
+};
+
+#endif LUMATONE_LAYOUT_STATE_H
diff --git a/Source/lumatone_editor_library/data/lumatone_state.cpp b/Source/lumatone_editor_library/data/lumatone_state.cpp
new file mode 100644
index 00000000..775b7a81
--- /dev/null
+++ b/Source/lumatone_editor_library/data/lumatone_state.cpp
@@ -0,0 +1,347 @@
+/*
+  ==============================================================================
+
+    lumatone_state.cpp
+    Created: 4 Jun 2023 4:57:50pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#include "lumatone_state.h"
+
+#include "../mapping/lumatone_output_map.h"
+
+juce::Array<juce::Identifier> LumatoneState::getLumatoneStateProperties()
+{
+    juce::Array<juce::Identifier> properties;
+    properties.add(LumatoneStateProperty::LastConnectedSerialNumber);
+    properties.add(LumatoneStateProperty::LastConnectedFirmwareVersion);
+    properties.add(LumatoneStateProperty::LastConnectedNumBoards);
+
+    properties.add(LumatoneStateProperty::MappingData);
+
+    return properties;
+}
+
+LumatoneState::LumatoneState(juce::String nameIn, juce::ValueTree stateIn, juce::UndoManager* undoManagerIn)
+    : LumatoneStateBase(nameIn)
+    , undoManager(undoManagerIn)
+{
+    state = loadStateProperties(stateIn);
+    state.addListener(this);
+
+    mappingData = std::make_shared<LumatoneLayout>();
+    midiKeyMap = std::make_shared<LumatoneOutputMap>(mappingData.get());
+
+    juce::ValueTree layoutState = juce::ValueTree(juce::Identifier(nameIn));
+    layoutState.appendChild(mappingData->getState(), nullptr);
+    state.appendChild(layoutState, nullptr);
+}
+
+LumatoneState::LumatoneState(juce::String nameIn, const LumatoneState& stateToCopy, juce::UndoManager* undoManagerIn)
+    : LumatoneState(nameIn, stateToCopy.state, undoManagerIn)
+{
+    mappingData = stateToCopy.mappingData;
+    midiKeyMap = stateToCopy.midiKeyMap;
+}
+
+LumatoneState::~LumatoneState()
+{
+    state.removeListener(this);
+
+    midiKeyMap = nullptr;
+    mappingData = nullptr;
+}
+
+juce::ValueTree LumatoneState::loadStateProperties(juce::ValueTree stateIn)
+{
+    juce::ValueTree newState = (stateIn.hasType(LumatoneStateProperty::StateTree))
+                             ? stateIn
+                             : juce::ValueTree(LumatoneStateProperty::StateTree);
+
+    for (auto property : getLumatoneStateProperties())
+    {
+        if (newState.hasProperty(property))
+            handleStatePropertyChange(newState, property);
+    }
+
+    return newState;
+}
+
+void LumatoneState::handleStatePropertyChange(juce::ValueTree stateIn, const juce::Identifier& property)
+{
+    if (property == LumatoneStateProperty::LastConnectedSerialNumber)
+    {
+        connectedSerialNumber = stateIn.getProperty(property).toString();
+    }
+    else if (property == LumatoneStateProperty::LastConnectedFirmwareVersion)
+    {
+        setLumatoneVersion(
+            LumatoneFirmware::ReleaseVersion((int)stateIn.getProperty(property, (int)LumatoneFirmware::ReleaseVersion::FUTURE_VERSION))
+            );
+        firmwareVersion = LumatoneFirmware::Version::fromReleaseVersion(determinedVersion);
+    }
+    else if (property == LumatoneStateProperty::MappingData)
+    {
+        // juce::String mappingString = stateIn.getProperty(property).toString();
+        // if (mappingString.isEmpty())
+        //     return;
+
+        // auto stringArray = juce::StringArray::fromLines(mappingString);
+        // LumatoneLayout loadedLayout(getNumBoards(), getOctaveBoardSize());
+        // loadedLayout.fromStringArray(stringArray);
+
+        // if (!loadedLayout.isEmpty())
+        // {
+        //     mappingData.reset(new LumatoneLayout(loadedLayout));
+        // }
+    }
+}
+
+void LumatoneState::setConnectedSerialNumber(juce::String serialNumberIn)
+{
+    connectedSerialNumber = serialNumberIn;
+    state.setPropertyExcludingListener(
+        this,
+        LumatoneStateProperty::LastConnectedSerialNumber,
+        connectedSerialNumber,
+        undoManager);
+
+    // numBoards = 5;
+
+    if (connectedSerialNumber == SERIAL_55_KEYS)
+    {
+        setLumatoneVersion(LumatoneFirmware::ReleaseVersion::VERSION_55_KEYS);
+    }
+}
+
+void LumatoneState::setFirmwareVersion(LumatoneFirmware::Version& versionIn, bool writeToState)
+{
+    firmwareVersion = LumatoneFirmware::Version(versionIn);
+    setLumatoneVersion(firmwareSupport.getReleaseVersion(firmwareVersion), writeToState);
+}
+
+void LumatoneState::setLumatoneVersion(LumatoneFirmware::ReleaseVersion versionIn, bool writeToState)
+{
+    determinedVersion = versionIn;
+
+    // numBoards = 5;
+
+    switch (determinedVersion)
+    {
+    case LumatoneFirmware::ReleaseVersion::VERSION_55_KEYS:
+        mappingData->setOctaveBoardSize(55);
+        break;
+    default:
+        mappingData->setOctaveBoardSize(56);
+        break;
+    }
+
+    if (writeToState)
+    {
+        state.setPropertyExcludingListener(
+            this,
+            LumatoneStateProperty::LastConnectedFirmwareVersion,
+            (int)determinedVersion,
+            undoManager);
+    }
+}
+
+void LumatoneState::setCompleteConfig(const LumatoneLayout &layoutIn)
+{
+    *mappingData = layoutIn;
+}
+
+void LumatoneState::setLayout(const LumatoneLayout &layoutIn)
+{
+    for (int i = 0; i < layoutIn.getNumBoards(); i++)
+    {
+        mappingData->setBoard(layoutIn.getBoard(i), i);
+    }
+}
+
+void LumatoneState::setBoard(const LumatoneBoard &boardIn, int boardId)
+{
+    mappingData->setBoard(boardIn, boardId-1);
+}
+
+void LumatoneState::setKey(const LumatoneKey &keyIn, int boardId, int keyIndex)
+{
+    mappingData->setKey(keyIn, boardId-1, keyIndex);
+}
+
+void LumatoneState::setKeyConfig(const LumatoneKey& keyIn, int boardId, int keyIndex)
+{
+    mappingData->setKeyConfig(keyIn, boardId-1, keyIndex);
+}
+
+void LumatoneState::setKeyColour(juce::Colour colour, int boardId, int keyIndex)
+{
+    mappingData->setKeyColour(colour, boardId-1, keyIndex);
+}
+
+void LumatoneState::sendSelectionParam(const juce::Array<MappedLumatoneKey>& selection, bool signalEditorListeners, bool bufferKeyUpdates)
+{
+    for (auto mappedKey : selection)
+    {
+        mappingData->setKey(mappedKey);
+    }
+}
+
+void LumatoneState::sendSelectionColours(const juce::Array<MappedLumatoneKey>& selection, bool signalEditorListeners, bool bufferKeyUpdates)
+{
+    for (auto mappedKey : selection)
+    {
+        mappingData->setKeyColour(mappedKey.getColour(), mappedKey.boardIndex, mappedKey.keyIndex);
+    }
+}
+
+void LumatoneState::setAftertouchEnabled(bool enabled)
+{
+    mappingData->setAftertouchEnabled(enabled);
+}
+
+void LumatoneState::setLightOnKeyStrokes(bool enabled)
+{
+    mappingData->setLightOnKeyStrokes(enabled);
+}
+
+void LumatoneState::valueTreePropertyChanged(juce::ValueTree& treeWhosePropertyHasChanged, const juce::Identifier& property)
+{
+    //if (treeWhosePropertyHasChanged == state)
+    //{
+        DBG("LumatoneState::valueTreePropertyChanged("
+            + treeWhosePropertyHasChanged.getType().toString() + ", "
+            + property.toString() + ")");
+
+    if (treeWhosePropertyHasChanged == state)
+    {
+        handleStatePropertyChange(state, property);
+    }
+}
+
+LumatoneFirmware::ReleaseVersion LumatoneState::getLumatoneVersion() const
+{
+    return determinedVersion;
+}
+
+LumatoneFirmware::Version LumatoneState::getFirmwareVersion() const
+{
+    return firmwareVersion;
+}
+
+juce::String LumatoneState::getSerialNumber() const
+{
+    return connectedSerialNumber;
+}
+
+LumatoneLayout* LumatoneState::getMappingData() const
+{
+    return mappingData.get();
+}
+
+const LumatoneBoard& LumatoneState::getBoard(int boardIndex) const
+{
+    return mappingData->getBoard(boardIndex);
+}
+const LumatoneKey& LumatoneState::getKey(int boardIndex, int keyIndex) const
+{
+    return mappingData->getKey(boardIndex, keyIndex);
+}
+
+const LumatoneKey& LumatoneState::getKey(LumatoneKeyCoord coord) const
+{
+    return getKey(coord.boardIndex, coord.keyIndex);
+}
+
+const LumatoneOutputMap* LumatoneState::getMidiKeyMap() const
+{
+    return midiKeyMap.get();
+}
+
+const FirmwareSupport& LumatoneState::getFirmwareSupport() const
+{
+    return firmwareSupport;
+}
+
+void LumatoneState::setInvertExpression(bool invert)
+{
+    mappingData->setInvertExpression(invert);
+}
+
+void LumatoneState::setInvertSustain(bool invert)
+{
+    mappingData->setInvertSustain(invert);
+}
+
+void LumatoneState::setExpressionSensitivity(juce::uint8 sensitivity)
+{
+    mappingData->setExpressionSensitivity(sensitivity);
+}
+
+void LumatoneState::setConfigTable(LumatoneConfigTable::TableType type, const LumatoneConfigTable& table)
+{
+    mappingData->setConfigTable(type, table.velocityValues);
+}
+
+//  bool LumatoneState::loadLayoutFromFile(const juce::File& layoutFile)
+// {
+//     bool fileOpened = false;
+//     bool fileParsed = false;
+
+//     if (layoutFile.existsAsFile())
+//     {
+//         fileOpened = true;
+
+//         juce::StringArray stringArray;
+//         layoutFile.readLines(stringArray);
+
+//         LumatoneLayout newLayout(getNumBoards(), getOctaveBoardSize(), true);
+//         newLayout.fromStringArray(stringArray);
+
+//         // TODO: something if boards/size don't match?
+//         fileParsed = true;
+
+
+//         if (fileParsed)
+//         {
+//             *mappingData = LumatoneLayout(newLayout);
+
+//             auto layoutString = mappingData->toStringArray().joinIntoString(juce::newLine);
+//             DBG("Loaded: " + layoutString);
+
+//             writeStringProperty(LumatoneStateProperty::MappingData, layoutString, undoManager);
+
+//             invertSustain = mappingData->invertSustain;
+//             writeBoolProperty(LumatoneStateProperty::InvertSustain, invertSustain, undoManager);
+
+//             invertExpression = mappingData->invertExpression;
+//             writeBoolProperty(LumatoneStateProperty::InvertExpression, invertExpression, undoManager);
+
+//             expressionSensitivity = mappingData->expressionSensitivity;
+//             writeIntProperty(LumatoneStateProperty::ExpressionSensitivity, expressionSensitivity, undoManager);
+
+//             // Mark file as unchanged
+//             //setHasChangesToSave(false);
+
+//             // Clear undo history
+//             //undoManager.clearUndoHistory();
+
+//             // Add file to recent files list
+//             //recentFiles.addFile(currentFile);
+
+//             return true;
+//         }
+//     }
+
+//     if (fileOpened)
+//     {
+//         // Show error message
+//         juce::AlertWindow::showMessageBoxAsync(juce::AlertWindow::AlertIconType::WarningIcon, "Open File Error", "The file " + layoutFile.getFullPathName() + " could not be opened.");
+
+//         // XXX Update Window title in any case? Make file name empty/make data empty in case of error?
+//     }
+
+//     return false;
+// }
diff --git a/Source/lumatone_editor_library/data/lumatone_state.h b/Source/lumatone_editor_library/data/lumatone_state.h
new file mode 100644
index 00000000..e6141ca3
--- /dev/null
+++ b/Source/lumatone_editor_library/data/lumatone_state.h
@@ -0,0 +1,133 @@
+/*
+  ==============================================================================
+
+    lumatone_state.h
+    Created: 4 Jun 2023 4:57:50pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#ifndef LUMATONE_STATE_H
+#define LUMATONE_STATE_H
+
+#include "state_base.h"
+#include "lumatone_layout.h"
+
+#include "../lumatone_midi_driver/firmware_support.h"
+
+class LumatoneOutputMap;
+
+
+namespace LumatoneStateProperty
+{
+    static const juce::Identifier StateTree = juce::Identifier("LumatoneEditorStateTree");
+
+    // Lumatone Data
+    static const juce::Identifier LastConnectedSerialNumber = juce::Identifier("LastConnectedSerialNumber");
+    static const juce::Identifier LastConnectedFirmwareVersion = juce::Identifier("LastConnectedFirmwareVersion");
+    static const juce::Identifier LastConnectedNumBoards = juce::Identifier("LastConnectedNumBoards");
+
+    static const juce::Identifier MappingData = juce::Identifier("MappingData");
+
+    static const juce::Identifier InvertExpression = juce::Identifier("InvertExpression");
+    static const juce::Identifier InvertSustain = juce::Identifier("InvertSustain");
+    static const juce::Identifier ExpressionSensitivity = juce::Identifier("ExpressionSensitivity");
+};
+
+class LumatoneState : public LumatoneStateBase
+{
+public:
+
+    LumatoneState(juce::String nameIn, juce::ValueTree stateIn=juce::ValueTree(), juce::UndoManager* undoManager=nullptr);
+    LumatoneState(juce::String nameIn, const LumatoneState& stateToCopy, juce::UndoManager* undoManagerIn=nullptr);
+
+    virtual ~LumatoneState() override;
+
+    LumatoneFirmware::ReleaseVersion getLumatoneVersion() const;
+    LumatoneFirmware::Version getFirmwareVersion() const;
+
+    juce::String getSerialNumber() const;
+
+    LumatoneLayout* getMappingData() const;
+    std::shared_ptr<LumatoneLayout> shareMappingData() { return mappingData; }
+
+    const LumatoneBoard& getBoard(int boardIndex) const;
+
+    const LumatoneKey& getKey(int boardIndex, int keyIndex) const;
+    const LumatoneKey& getKey(LumatoneKeyCoord coord) const;
+
+    const LumatoneOutputMap* getMidiKeyMap() const;
+
+    const FirmwareSupport& getFirmwareSupport() const;
+
+    // virtual bool loadLayoutFromFile(const juce::File& layoutFile);
+
+    virtual void setCompleteConfig(const LumatoneLayout& layoutIn);
+    virtual void setLayout(const LumatoneLayout& layoutIn);
+    virtual void setBoard(const LumatoneBoard& boardIn, int boardId);
+
+    virtual void setKey(const LumatoneKey& keyIn, int boardId, int keyIndex);
+    virtual void setKeyConfig(const LumatoneKey& keyIn, int boardId, int keyIndex);
+    virtual void setKeyColour(juce::Colour colour, int boardId, int keyIndex);
+
+    virtual void sendSelectionParam(const juce::Array<MappedLumatoneKey>& selection, bool signalEditorListeners = true, bool bufferKeyUpdates = false);
+    virtual void sendSelectionColours(const juce::Array<MappedLumatoneKey>& selection, bool signalEditorListeners = true, bool bufferKeyUpdates = false);
+
+    virtual void setAftertouchEnabled(bool enabled);
+    virtual void setLightOnKeyStrokes(bool enabled);
+    virtual void setInvertExpression(bool invert);
+    virtual void setInvertSustain(bool invert);
+    virtual void setExpressionSensitivity(juce::uint8 sensitivity);
+
+    virtual void setConfigTable(LumatoneConfigTable::TableType type, const LumatoneConfigTable& table);
+
+public:
+    // Layout Helpers
+    int getNumBoards() const { return mappingData->getNumBoards(); }
+    int getOctaveBoardSize() const { return mappingData->getOctaveBoardSize(); }
+
+    bool getAftertouchOn() const { return mappingData->getAftertouchOn(); }
+    bool getLightOnKeyStrokes() const { return mappingData->getLightOnKeyStrokes(); }
+    bool getInvertExpression() const { return mappingData->getInvertExpression(); }
+    bool getInvertSustain() const { return mappingData->getInvertSustain(); }
+    int getExpressionSensitivity() const { return mappingData->getExpressionSensitivity(); }
+
+protected:
+    void setConnectedSerialNumber(juce::String serialNumberIn);
+    void setFirmwareVersion(LumatoneFirmware::Version& versionIn, bool writeToState=false);
+
+    void setLumatoneVersion(LumatoneFirmware::ReleaseVersion versionIn, bool writeToState=false);
+
+protected:
+
+    virtual juce::ValueTree loadStateProperties(juce::ValueTree stateIn) override;
+
+    virtual void valueTreePropertyChanged(juce::ValueTree& treeWhosePropertyHasChanged, const juce::Identifier& property) override;
+
+    virtual void handleStatePropertyChange(juce::ValueTree stateIn, const juce::Identifier& property) override;
+
+public:
+    static juce::Array<juce::Identifier> getLumatoneStateProperties();
+
+protected:
+
+    juce::UndoManager* undoManager;
+
+    FirmwareSupport firmwareSupport;
+
+    std::shared_ptr<LumatoneLayout> mappingData;
+    std::shared_ptr<LumatoneOutputMap> midiKeyMap;
+
+
+private:
+    juce::String connectedSerialNumber = juce::String();
+
+    LumatoneFirmware::ReleaseVersion     determinedVersion;
+    LumatoneFirmware::Version             firmwareVersion;
+    LumatoneFirmware::Version             incomingVersion;
+};
+
+
+
+#endif LUMATONE_STATE_H
diff --git a/Source/lumatone_editor_library/data/state_base.cpp b/Source/lumatone_editor_library/data/state_base.cpp
new file mode 100644
index 00000000..1bf69c95
--- /dev/null
+++ b/Source/lumatone_editor_library/data/state_base.cpp
@@ -0,0 +1,55 @@
+/*
+  ==============================================================================
+
+    LumatoneStateBase.cpp
+    Created: 4 Jun 2023 4:56:00pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#include "state_base.h"
+
+bool LumatoneStateBase::writeToPropertiesFile()
+{
+    // todo
+    return false;
+}
+
+bool LumatoneStateBase::getBoolProperty(const juce::Identifier key, bool fallback) const
+{
+    auto prop = state.getProperty(key, juce::var((bool)fallback));
+    return (bool)prop;
+}
+
+int LumatoneStateBase::getIntProperty(const juce::Identifier key, int fallback) const
+{
+    auto prop = state.getProperty(key, juce::var((int)fallback));
+    return (int)prop;
+}
+
+juce::String LumatoneStateBase::getStringProperty(const juce::Identifier key, juce::String fallback) const
+{
+    auto prop = state.getProperty(key, juce::var(fallback));
+    return prop.toString();
+}
+
+void LumatoneStateBase::writeBoolProperty(const juce::Identifier key, bool value, juce::UndoManager* undo)
+{
+    state.setPropertyExcludingListener(this, key, value, undo);
+}
+
+void LumatoneStateBase::writeIntProperty(const juce::Identifier key, int value, juce::UndoManager* undo )
+{
+    state.setPropertyExcludingListener(this, key, value, undo);
+}
+
+void LumatoneStateBase::writeStringProperty(const juce::Identifier key, juce::String value, juce::UndoManager* undo)
+{
+    state.setPropertyExcludingListener(this, key, value, undo);
+}
+
+void LumatoneStateBase::valueTreePropertyChanged(juce::ValueTree& treeWhosePropertyHasChanged, const juce::Identifier &property)
+{
+    handleStatePropertyChange(treeWhosePropertyHasChanged, property);
+}
diff --git a/Source/lumatone_editor_library/data/state_base.h b/Source/lumatone_editor_library/data/state_base.h
new file mode 100644
index 00000000..0a01f552
--- /dev/null
+++ b/Source/lumatone_editor_library/data/state_base.h
@@ -0,0 +1,46 @@
+/*
+==============================================================================
+
+    LumatoneStateBase.h
+    Created: 4 Jun 2023 4:56:00pm
+    Author:  Vincenzo
+
+==============================================================================
+*/
+
+#ifndef LUMATONE_STATE_BASE_H
+#define LUMATONE_STATE_BASE_H
+
+#include <JuceHeader.h>
+
+class LumatoneStateBase : protected juce::ValueTree::Listener
+{
+public:
+    LumatoneStateBase(juce::String nameIn) : name(nameIn) { }
+    // LumatoneStateBase(const LumatoneStateBase& stateIn) 
+    //     : state(stateIn.state) 
+    //     , name(stateIn.name) { }
+
+    bool getBoolProperty(const juce::Identifier key, bool fallback) const;
+    int getIntProperty(const juce::Identifier key, int fallback) const;
+    juce::String getStringProperty(const juce::Identifier key, juce::String fallback = juce::String()) const;
+
+    virtual bool writeToPropertiesFile();
+
+protected:
+    void writeBoolProperty(const juce::Identifier key, bool value, juce::UndoManager* undo=nullptr);
+    void writeIntProperty(const juce::Identifier key, int value, juce::UndoManager* undo=nullptr);
+    void writeStringProperty(const juce::Identifier key, juce::String value, juce::UndoManager* undo=nullptr);
+
+protected:
+    virtual void valueTreePropertyChanged(juce::ValueTree& treeWhosePropertyHasChanged, const juce::Identifier& property) override;
+
+    virtual juce::ValueTree loadStateProperties(juce::ValueTree stateIn) = 0;
+    virtual void handleStatePropertyChange(juce::ValueTree stateIn, const juce::Identifier& property) = 0;
+
+protected:
+    juce::ValueTree state;
+    juce::String name;
+};
+
+#endif LUMATONE_STATE_BASE_H
diff --git a/Source/lumatone_editor_library/device/activity_monitor.cpp b/Source/lumatone_editor_library/device/activity_monitor.cpp
new file mode 100644
index 00000000..ea77fa22
--- /dev/null
+++ b/Source/lumatone_editor_library/device/activity_monitor.cpp
@@ -0,0 +1,619 @@
+/*
+  ==============================================================================
+
+    activity_monitor.cpp
+    Created: 11 Feb 2021 9:15:43pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#include "activity_monitor.h"
+
+#include "../lumatone_midi_driver/lumatone_midi_driver.h"
+#include "../lumatone_midi_driver/firmware_sysex.h"
+
+DeviceActivityMonitor::DeviceActivityMonitor(LumatoneFirmwareDriver* midiDriverIn, LumatoneApplicationState stateIn)
+    :   LumatoneApplicationState("DeviceActivityMonitor", stateIn)
+    ,   midiDriver(midiDriverIn)
+{
+    // detectDevicesIfDisconnected = getBoolProperty(LumatoneApplicationProperty::DetectDeviceIfDisconnected, true);
+    // checkConnectionOnInactivity = getBoolProperty(LumatoneApplicationProperty::CheckConnectionIfInactive, true);
+    responseTimeoutMs = getIntProperty(LumatoneApplicationProperty::DetectDevicesTimeout, detectRoutineTimeoutMs);
+
+    midiDriver->addDriverListener(this);
+
+    // avoid resizing during communication
+    ensureStorageAllocated(2000);
+}
+
+DeviceActivityMonitor::~DeviceActivityMonitor()
+{
+    midiDriver->removeDriverListener(this);
+}
+
+void DeviceActivityMonitor::setDetectDeviceIfDisconnected(bool doDetection)
+{
+    detectDevicesIfDisconnected = doDetection;
+    // writeBoolProperty(LumatoneApplicationProperty::DetectDeviceIfDisconnected, detectDevicesIfDisconnected);
+
+    if (!detectDevicesIfDisconnected)
+    {
+        deviceConnectionMode = DetectConnectionMode::idle;
+        midiDriver->closeTestingDevices();
+    }
+    else
+    {
+        startTimer(detectRoutineTimeoutMs);
+    }
+}
+
+void DeviceActivityMonitor::setCheckForInactivity(bool monitorActivity)
+{
+    checkConnectionOnInactivity = monitorActivity;
+    // writeBoolProperty(LumatoneApplicationProperty::CheckConnectionIfInactive, checkConnectionOnInactivity);
+
+    if (checkConnectionOnInactivity && isConnectionEstablished())
+    {
+        startTimer(inactivityTimeoutMs);
+    }
+}
+
+void DeviceActivityMonitor::pingAllDevices()
+{
+    DBG("Ping all devices!");
+
+    deviceDetectInProgress = true;
+
+    outputDevices = midiDriver->getMidiOutputList();
+
+    outputPingIds.clear();
+
+    waitingForResponse = true;
+
+    int maxDevices = juce::jmin(outputDevices.size(), 128);
+    if (midiDriver->getHostMode() == LumatoneFirmwareDriver::HostMode::Plugin)
+        maxDevices = 1;
+
+    for (int i = 0; i < maxDevices; i++)
+    {
+        unsigned int id = (unsigned int)(i + 1);
+        midiDriver->ping(id, i);
+        outputPingIds.add(id);
+    }
+
+    startTimer(responseTimeoutMs);
+}
+
+// bool DeviceActivityMonitor::testLastConnectedDevice()
+// {
+//     juce::String inputId = getStringProperty(LumatoneApplicationProperty::LastInputDeviceId);
+//     if (inputId.length() <= 0)
+//         return false;
+
+//     int inputIndex = midiDriver->findIndexOfInputDevice(inputId);
+//     if (inputIndex >= 0)
+//     {
+//         juce::String outputId = getStringProperty(LumatoneApplicationProperty::LastOutputDeviceId);
+//         if (outputId.length() <= 0)
+//             return false;
+
+//         int outputIndex = midiDriver->findIndexOfOutputDevice(outputId);
+//         if (outputIndex >= 0)
+//         {
+//             deviceDetectInProgress = true;
+//             waitingForResponse = true;
+
+//             DBG("Testing last connected device");
+//             midiDriver->setMidiInput(inputIndex);
+//             midiDriver->setMidiOutput(outputIndex);
+//             midiDriver->sendGetSerialIdentityRequest();
+//             return true;
+//         }
+//     }
+
+//     return false;
+// }
+
+void DeviceActivityMonitor::startIndividualDetection()
+{
+    jassert(outputPingIds.size() == 0);
+
+    testOutputIndex = -1;
+    outputDevices = midiDriver->getMidiOutputList();
+    inputDevices = midiDriver->getMidiInputList();
+
+    if (outputDevices.size() > 0 && inputDevices.size() > 0)
+    {
+        deviceDetectInProgress = true;
+        testNextOutput();
+    }
+    else
+    {
+        DBG("No input and output MIDI device combination could be made.");
+        deviceDetectInProgress = false;
+        startTimer(detectRoutineTimeoutMs);
+    }
+}
+
+void DeviceActivityMonitor::testNextOutput()
+{
+
+    if (midiDriver->getHostMode() == LumatoneFirmwareDriver::HostMode::Driver)
+    {
+        testOutputIndex++;
+        if (testOutputIndex < 0 || testOutputIndex >= outputDevices.size())
+        {
+            // Start over
+            startTimer(10);
+        }
+    }
+
+    #if JUCE_DEBUG
+        juce::String deviceName = midiDriver->getHostMode() == LumatoneFirmwareDriver::HostMode::Driver ? outputDevices[testOutputIndex].name : "Host";
+        juce::String command = sendCalibratePitchModOff ? "Calibrate" : "GetSerial";
+        DBG("Test via " + command + ": " + deviceName);
+    #endif
+
+    if (sendCalibratePitchModOff)
+    {
+        midiDriver->sendCalibratePitchModWheel(false, testOutputIndex);
+    }
+    else
+    {
+        midiDriver->sendGetSerialIdentityRequest(testOutputIndex);
+    }
+
+    waitingForResponse = true;
+    startTimer(responseTimeoutMs);
+}
+
+void DeviceActivityMonitor::startDeviceDetection()
+{
+    // if (midiDriver->getHostMode() != LumatoneFirmwareDriver::HostMode::Driver)
+    //     return; // Only allow in Driver mode
+
+    // Belongs somewhere else?
+    if (!midiDriver->hasDevicesDefined())
+    {
+        confirmedInputIndex = -1;
+        confirmedOutputIndex = -1;
+    }
+
+    if (detectDevicesIfDisconnected)
+    {
+        deviceConnectionMode = DetectConnectionMode::lookingForDevice;
+        deviceDetectInProgress = false; // Don't start until first test response is sent
+        startTimer(10);
+    }
+}
+
+void DeviceActivityMonitor::startActivityMonitoring()
+{
+    if (midiDriver->getHostMode() != LumatoneFirmwareDriver::HostMode::Driver)
+        return; // Only allow in Driver mode
+
+    deviceConnectionMode = DetectConnectionMode::waitingForInactivity;
+    startTimer(inactivityTimeoutMs);
+}
+
+void DeviceActivityMonitor::stopDeviceDetection()
+{
+    deviceConnectionMode = DetectConnectionMode::idle;
+    deviceDetectInProgress = false;
+}
+
+void DeviceActivityMonitor::stopMonitoringDevice()
+{
+    stopTimer();
+    waitingForResponse = false;
+    deviceConnectionMode = DetectConnectionMode::noDeviceMonitoring;
+}
+
+bool DeviceActivityMonitor::initializeConnectionTest()
+{
+    bool isIdle = !midiDriver->isWaitingForResponse();
+    if (isIdle)
+    {
+        if (getSerialNumber().isNotEmpty() && getLumatoneVersion() >= LumatoneFirmware::ReleaseVersion::VERSION_1_0_9)
+        {
+            midiDriver->ping(0xf);
+        }
+
+        else
+        {
+            midiDriver->sendGetSerialIdentityRequest();
+        }
+
+        waitingForResponse = true;
+    }
+
+    startTimer(inactivityTimeoutMs);
+    return isIdle;
+}
+
+int DeviceActivityMonitor::getPingIdFromResponse(const juce::MidiMessage &msg)
+{
+    unsigned int pingId = 0;
+
+    auto errorCode = LumatoneSysEx::unpackPingResponse(msg, pingId);
+
+    if (errorCode != FirmwareSupport::Error::noError)
+    {
+        if (errorCode == FirmwareSupport::Error::messageIsAnEcho)
+            return -1;
+
+        DBG("WARNING: Ping response error in auto connection routine detected");
+        jassertfalse;
+    }
+
+    return (int)pingId - 1;
+}
+
+void DeviceActivityMonitor::removeFailedPingDevice(const juce::MidiMessage &msg)
+{
+    unsigned int pingId = 0;
+    LumatoneSysEx::unpackPingResponse(msg, pingId);
+    outputDevices.remove(outputPingIds.indexOf(pingId));
+}
+
+void DeviceActivityMonitor::checkDetectionStatus()
+{
+    // Successful
+    if (isConnectionEstablished())
+    {
+        deviceDetectInProgress = false;
+        //statusListeners->call(&LumatoneEditor::StatusListener::connectionStateChanged, ConnectionState::ONLINE);
+
+        outputPingIds.clear();
+
+        if (checkConnectionOnInactivity)
+            startActivityMonitoring();
+        else
+            deviceConnectionMode = DetectConnectionMode::noDeviceMonitoring;
+
+        return;
+    }
+
+    if (midiDriver->getHostMode() == LumatoneFirmwareDriver::HostMode::Plugin)
+    {
+        if (deviceDetectInProgress)
+        {
+            DBG("Detect device timeout.");
+            deviceDetectInProgress = false;
+            waitingForResponse = false;
+            startTimer(detectRoutineTimeoutMs);
+
+            //statusListeners.call(&LumatoneEditor::StatusListener::connectionFailed);
+        }
+        else
+        {
+            deviceDetectInProgress = true;
+            if (sendCalibratePitchModOff)
+            {
+                midiDriver->sendCalibratePitchModWheel(false, testOutputIndex);
+            }
+            else
+            {
+                midiDriver->sendGetSerialIdentityRequest(testOutputIndex);
+            }
+
+            waitingForResponse = true;
+            startTimer(responseTimeoutMs);
+        }
+    }
+    else
+    {
+        if (deviceDetectInProgress)
+        {
+            // Failed last-device test
+            if (midiDriver->hasDevicesDefined())
+            {
+                DBG("Unable to connect to last device.");
+                waitingForResponse = false;
+                midiDriver->closeMidiInput();
+                midiDriver->closeMidiOutput();
+                pingAllDevices();
+            }
+
+            // Failed ping routine
+            else if (outputPingIds.size() > 0)
+            {
+                waitingForResponse = false;
+                outputPingIds.clear();
+                startIndividualDetection();
+            }
+
+            // Ongoing GetSerial routine
+            else if (testOutputIndex >= 0 && testOutputIndex < outputDevices.size())
+            {
+                testNextOutput();
+            }
+
+            // Set timeout for next attempt
+            else
+            {
+                DBG("Detect device timeout.");
+                deviceDetectInProgress = false;
+                waitingForResponse = false;
+                startTimer(detectRoutineTimeoutMs);
+
+                //statusListeners.call(&LumatoneEditor::StatusListener::connectionFailed);
+            }
+        }
+
+        // Start detection
+        else
+        {
+            midiDriver->refreshDeviceLists();
+            midiDriver->openAvailableDevicesForTesting();
+            deviceConnectionMode = DetectConnectionMode::lookingForDevice;
+
+            // If there's no last-connected-device, skip to pinging
+            //if (!testLastConnectedDevice())
+            //{
+                pingAllDevices();
+            //}
+        }
+    }
+}
+
+void DeviceActivityMonitor::timerCallback()
+{
+    stopTimer();
+
+    switch (deviceConnectionMode)
+    {
+    case DetectConnectionMode::idle:
+    case DetectConnectionMode::lookingForDevice:
+        if (detectDevicesIfDisconnected)
+        {
+            checkDetectionStatus();
+            break;
+        }
+
+        stopDeviceDetection();
+        break;
+
+    case DetectConnectionMode::noDeviceMonitoring:
+    case DetectConnectionMode::waitingForInactivity:
+        if (!checkConnectionOnInactivity)
+        {
+            stopMonitoringDevice();
+            break;
+        }
+
+        if (!waitingForResponse)
+        {
+            if (sentQueueSize > 0)
+            {
+                // Skip test because there's already a message being sent
+                startTimer(inactivityTimeoutMs);
+                break;
+            }
+
+            if (deviceConnectionMode == DetectConnectionMode::noDeviceMonitoring)
+                deviceConnectionMode = DetectConnectionMode::waitingForInactivity;
+
+            initializeConnectionTest();
+        }
+        else
+        {
+            DBG("DAM: testing connection...");
+        }
+
+        break;
+
+    default:
+        jassertfalse;
+    }
+}
+
+void DeviceActivityMonitor::handleResponse(int inputDeviceIndex, const juce::MidiMessage& msg)
+{
+    if (!msg.isSysEx())
+        return;
+
+    auto sysExData = msg.getSysExData();
+    auto cmd = sysExData[CMD_ID];
+
+    if (cmd == PERIPHERAL_CALBRATION_DATA && !isConnectionEstablished())
+    {
+        sendCalibratePitchModOff = true;
+        // startTimer(100);
+        return;
+    }
+
+    if (waitingForResponse) switch (sysExData[MSG_STATUS])
+    {
+        // Ignore or mark as a failed ping
+        case TEST_ECHO:
+        {
+            DBG("DAM ignoring feedback from device " + juce::String(inputDeviceIndex) + " with message: " + msg.getDescription());
+            if (cmd == LUMA_PING)
+                removeFailedPingDevice(msg);
+            return;
+        }
+
+        case LumatoneFirmware::ReturnCode::ACK:
+        {
+            int establishOutIndex = -1;
+
+            switch (cmd)
+            {
+            case GET_SERIAL_IDENTITY:
+                establishOutIndex = testOutputIndex;
+                break;
+
+            case CALIBRATE_PITCH_MOD_WHEEL:
+                if (sysExData[PAYLOAD_INIT] != TEST_ECHO)
+                {
+                    if (!isConnectionEstablished())
+                    {
+                        sendCalibratePitchModOff = true;
+                    }
+                }
+                break;
+
+            case GET_FIRMWARE_REVISION:
+                break;
+
+            case LUMA_PING:
+                if (outputPingIds.size() == 0)
+                    break;
+
+                establishOutIndex = getPingIdFromResponse(msg);
+                break;
+
+            default:
+                break;
+            }
+
+            waitingForResponse = false;
+
+            if (sendCalibratePitchModOff)
+            {
+                sendCalibratePitchModOff = false;
+                juce::MessageManager::callAsync([&]() { checkDetectionStatus(); });
+                return;
+            }
+
+            switch (deviceConnectionMode)
+            {
+            case DetectConnectionMode::lookingForDevice:
+                if (establishOutIndex >= 0)
+                {
+                    establishConnection(inputDeviceIndex, establishOutIndex);
+                }
+                else
+                    jassertfalse;
+                break;
+
+            case DetectConnectionMode::waitingForInactivity:
+                startTimer(inactivityTimeoutMs);
+                break;
+
+            default:
+                break;
+            }
+
+            break;
+        }
+
+        case LumatoneFirmware::ReturnCode::STATE:
+        {
+            // TODO set warning flag ?
+            break;
+        }
+    }
+
+    // Edge case if we're disconnected but get a response
+    else if (!isConnectionEstablished())
+    {
+        establishConnection(midiDriver->getMidiInputIndex(), midiDriver->getMidiOutputIndex());
+    }
+    else if (checkConnectionOnInactivity)
+    {
+        startTimer(inactivityTimeoutMs);
+    }
+}
+
+//=========================================================================
+// LumatoneFirmwareDriver::Listener Implementation
+
+void DeviceActivityMonitor::midiMessageReceived(juce::MidiInput* source, const juce::MidiMessage& msg)
+{
+    if (!msg.isSysEx())
+        return;
+
+    int deviceIndex = (source == nullptr) ? -1
+                                          : midiDriver->getMidiInputList().indexOf(source->getDeviceInfo());
+
+    stopTimer();
+    handleResponse(deviceIndex, msg);
+}
+
+void DeviceActivityMonitor::noAnswerToMessage(juce::MidiDeviceInfo expectedDevice, const juce::MidiMessage& midiMessage)
+{
+    stopTimer();
+
+    if (waitingForResponse && deviceConnectionMode < DetectConnectionMode::noDeviceMonitoring)
+    {
+        waitingForResponse = false;
+        auto sysExData = midiMessage.getSysExData();
+        if (sysExData[CMD_ID] == LUMA_PING && outputPingIds.size() > 0)
+        {
+            removeFailedPingDevice(midiMessage);
+        }
+        else
+        {
+            startTimer(threadDelayMs);
+        }
+    }
+
+    else if (isConnectionEstablished())
+    {
+        onDisconnection();
+    }
+}
+
+void DeviceActivityMonitor::onDisconnection()
+{
+    DBG("DISCONNECTION DETECTED");
+
+    confirmedInputIndex = -1;
+    confirmedOutputIndex = -1;
+
+    waitingForResponse = false;
+
+    //juce::MessageManager::callAsync([&]() { statusListeners.call(&LumatoneEditor::StatusListener::connectionStateChanged, ConnectionState::DISCONNECTED); });
+
+    if (detectDevicesIfDisconnected)
+    {
+        startDeviceDetection();
+    }
+    else
+    {
+        deviceConnectionMode = DetectConnectionMode::idle;
+        stopTimer();
+    }
+}
+
+//==============================================================================
+// LumatoneEditor::StatusListener
+
+void DeviceActivityMonitor::establishConnection(int inputIndex, int outputIndex)
+{
+    stopTimer();
+
+    DBG("DAM: Devices confirmed.");
+
+    if (midiDriver->hasDevicesDefined())
+    {
+        confirmedOutputIndex = midiDriver->getMidiOutputIndex();
+        confirmedInputIndex = midiDriver->getMidiInputIndex();
+
+        DBG("\tInput: " + midiDriver->getMidiInputInfo().name);
+        DBG("\tOutput: " + midiDriver->getMidiOutputInfo().name);
+    }
+    else if (midiDriver->getHostMode() == LumatoneFirmwareDriver::HostMode::Driver)
+    {
+        midiDriver->setMidiInput(inputIndex);
+        confirmedInputIndex = inputIndex;
+
+        midiDriver->setMidiOutput(outputIndex);
+        confirmedOutputIndex = outputIndex;
+
+        DBG("\tInput: " + midiDriver->getMidiInputInfo().name);
+        DBG("\tOutput: " + midiDriver->getMidiOutputInfo().name);
+    }
+    else
+    {
+        confirmedInputIndex = 0;
+        confirmedOutputIndex = 0;
+
+        DBG("\tPlugin host mode.");
+    }
+
+    startTimer(threadDelayMs);
+}
diff --git a/Source/DeviceActivityMonitor.h b/Source/lumatone_editor_library/device/activity_monitor.h
similarity index 65%
rename from Source/DeviceActivityMonitor.h
rename to Source/lumatone_editor_library/device/activity_monitor.h
index 4435d282..c24d3d0d 100644
--- a/Source/DeviceActivityMonitor.h
+++ b/Source/lumatone_editor_library/device/activity_monitor.h
@@ -1,7 +1,7 @@
 /*
   ==============================================================================
 
-    DeviceActivityMonitor.h
+    activity_monitor.h
     Created: 11 Feb 2021 9:15:43pm
     Author:  Vincenzo
 
@@ -10,24 +10,31 @@
     a change signal will be broadcasted (for LumatoneController).
  
     When looking for devices, a response timeout is required, but once a device
-    has been confirmed, the timing and callbacks are dependent on TerpstraMidiDriver.
+    has been confirmed, the timing and callbacks are dependent on LumatoneFirmwareDriver.
 
   ==============================================================================
 */
 
-#pragma once
+#ifndef LUMATONE_ACTIVITY_MONITOR_H
+#define LUMATONE_ACTIVITY_MONITOR_H
 
-#include "TerpstraMidiDriver.h"
+#include "../lumatone_midi_driver/firmware_driver_listener.h"
 
-class DeviceActivityMonitor : public juce::Timer, 
-                              public juce::ChangeBroadcaster, 
-                              protected TerpstraMidiDriver::Collector
+#include "../data/application_state.h"
+#include "../listeners/status_listener.h"
+
+class LumatoneFirmwareDriver;
+
+class DeviceActivityMonitor : protected LumatoneApplicationState,
+                              public juce::Timer, 
+                              public LumatoneEditor::StatusEmitter,
+                              protected LumatoneFirmwareDriverListener
 {
     
 public:
     enum class DetectConnectionMode
     {
-        noDeviceActivity = -1,
+        idle = -1,
         lookingForDevice,
         noDeviceMonitoring,
         waitingForInactivity
@@ -35,7 +42,7 @@ class DeviceActivityMonitor : public juce::Timer,
     
 public:
 
-    DeviceActivityMonitor(TerpstraMidiDriver& midiDriverIn);
+    DeviceActivityMonitor(LumatoneFirmwareDriver* midiDriverIn, LumatoneApplicationState stateIn);
     ~DeviceActivityMonitor() override;
 
     DetectConnectionMode getMode() const { return deviceConnectionMode; }
@@ -50,28 +57,32 @@ class DeviceActivityMonitor : public juce::Timer,
     int getConfirmedOutputIndex() const { return confirmedOutputIndex; }
     int getConfirmedInputIndex() const { return confirmedInputIndex; }
 
+    int getResponseTimeoutMs() { return responseTimeoutMs; }
+    void setResponseTimeoutMs(int timeoutMs) { responseTimeoutMs = timeoutMs; }
+
+    //=========================================================================
+
     // Start monitoring available MIDI devices and wait for an expected response
     // First uses the "Ping" command to send to all available devices,
     // then goes through a legacy-supported routine with individual output devices.
-    void initializeDeviceDetection();
-
-    // Set the timeout for message responses
-    void setResponseTimeoutMs(int timeoutMs) { responseTimeoutMs = timeoutMs; }
+    void startDeviceDetection();
 
     // Begin polling selected device until it stops responding. Other messages
     // will reset the inactivity timer.
-    void intializeConnectionLossDetection();
+    void startActivityMonitoring();
 
     // Turn off device monitoring and idle
     void stopMonitoringDevice();
+    
+private:
 
     //=========================================================================
     // juce::Timer Implementation
 
     void timerCallback() override;
 
-    
-private:
+
+    //=========================================================================
 
     /// <summary>
     /// Sends a ping to all devices to see if we get a response
@@ -82,10 +93,10 @@ class DeviceActivityMonitor : public juce::Timer,
     /// If a MIDI device identifier is defined in properties, send a GetSerialIdentity to it.
     /// Returns whether or not a test response was sent
     /// </summary>
-    bool testLastConnectedDevice();
+    // bool testLastConnectedDevice();
 
     /// <summary>
-    /// Prepares to ping devices by refreshing available devices, opening them, and starting pinging routine
+    /// Resets device list and starts routine for sending tests to each device individually
     /// </summary>
     void startIndividualDetection();
 
@@ -109,62 +120,54 @@ class DeviceActivityMonitor : public juce::Timer,
     bool initializeConnectionTest();
 
     /// <summary>
-    /// Handle a response from a test or confirmed MidiInput device
+    /// Handle a response from a test or confirmed juce::MidiInput device
     /// </summary>
     /// <param name="testInputIndex"></param>
     /// <param name="midiMessage"></param>
-    void handleResponse(int inputDeviceIndex, const MidiMessage& midiMessage);
+    void handleResponse(int inputDeviceIndex, const juce::MidiMessage& midiMessage);
 
 
 private:
     //=========================================================================
     // Callback functions
 
-    void handleMessageQueue(const MidiBuffer& readBuffer, const Array<int, CriticalSection>& devices);
-
-    void onSerialIdentityResponse(const MidiMessage& msg, int deviceIndexResponded);
-
-    void onFailedPing(const MidiMessage& msg);
-    void onPingResponse(const MidiMessage& msg, int deviceIndexResponded);
-
-    void onTestResponseReceived();
-
-    void onSuccessfulDetection();
+    void removeFailedPingDevice(const juce::MidiMessage& msg);
 
+    void establishConnection(int inputIndex, int outputIndex);
     void onDisconnection();
+
+    static int getPingIdFromResponse(const juce::MidiMessage& msg);
     
 protected:
 
     //=========================================================================
-    // TerpstraMidiDriver::Listener Implementation
+    // LumatoneFirmwareDriver::Listener Implementation
 
-    void midiMessageReceived(MidiInput* source, const MidiMessage& midiMessage) override;
-    void midiMessageSent(MidiOutput* target, const MidiMessage& midiMessage) override {}
+    void midiMessageReceived(juce::MidiInput* source, const juce::MidiMessage& midiMessage) override;
+    void noAnswerToMessage(juce::MidiDeviceInfo expectedDevice, const juce::MidiMessage& midiMessage) override;
     void midiSendQueueSize(int queueSizeIn) override { sentQueueSize = queueSizeIn; }
-    void generalLogMessage(String textMessage, HajuErrorVisualizer::ErrorLevel errorLevel) override {}
-    void noAnswerToMessage(MidiInput* expectedDevice, const MidiMessage& midiMessage) override;
+    
+    void midiMessageSent(juce::MidiOutput*, const juce::MidiMessage&) override {}
 
 private:
 
-    TerpstraMidiDriver&     midiDriver;
+    LumatoneFirmwareDriver*     midiDriver;
 
-    DetectConnectionMode    deviceConnectionMode   = DetectConnectionMode::noDeviceActivity;
+    DetectConnectionMode    deviceConnectionMode   = DetectConnectionMode::idle;
     bool                    deviceDetectInProgress = false;
-    bool                    waitingForTestResponse = false;
+    bool                    waitingForResponse = false;
 
+    int                     threadDelayMs = 50;
     int                     responseTimeoutMs = 600;
     int                     detectRoutineTimeoutMs = 1000;
-    int                     inactivityTimeoutMs  = 1500;
+    int                     inactivityTimeoutMs  = 3000;
 
-    Array<int, CriticalSection> testResponseDeviceIndices;
-    std::atomic<int>        readQueueSize;
-    const int               readBlockSize = 64;
     int                     sentQueueSize = 0;
 
-    int                     testOutputIndex = -1;
-    Array<MidiDeviceInfo>   outputDevices;
-    Array<MidiDeviceInfo>   inputDevices;
-    Array<unsigned int>     outputPingIds;
+    int                                 testOutputIndex = -1;
+    juce::Array<juce::MidiDeviceInfo>   outputDevices;
+    juce::Array<juce::MidiDeviceInfo>   inputDevices;
+    juce::Array<unsigned int>           outputPingIds;
 
     int                     confirmedInputIndex = -1;
     int                     confirmedOutputIndex = -1;
@@ -176,3 +179,5 @@ class DeviceActivityMonitor : public juce::Timer,
     
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(DeviceActivityMonitor)
 };
+
+#endif LUMATONE_ACTIVITY_MONITOR_H
diff --git a/Source/lumatone_editor_library/device/key_update_buffer.cpp b/Source/lumatone_editor_library/device/key_update_buffer.cpp
new file mode 100644
index 00000000..01aa1218
--- /dev/null
+++ b/Source/lumatone_editor_library/device/key_update_buffer.cpp
@@ -0,0 +1,135 @@
+#include "key_update_buffer.h"
+#include "../lumatone_midi_driver/lumatone_midi_driver.h"
+
+LumatoneKeyUpdateBuffer::LumatoneKeyUpdateBuffer(LumatoneFirmwareDriver& driverIn, LumatoneState state)
+    : firmwareDriver(driverIn)
+    , LumatoneState("LumatoneKeyUpdateBuffer", state)
+{
+    keysToUpdate.remapTable(280);
+}
+
+LumatoneKeyUpdateBuffer::~LumatoneKeyUpdateBuffer()
+{
+
+}
+
+int LumatoneKeyUpdateBuffer::getKeyNum(int boardIndex, int keyIndex) const
+{
+    return boardIndex * getOctaveBoardSize() + keyIndex;
+}
+
+LumatoneKeyCoord LumatoneKeyUpdateBuffer::getKeyCoord(int keyNum) const
+{
+    return LumatoneKeyCoord(keyNum / getOctaveBoardSize(), keyNum % getOctaveBoardSize());
+}
+
+void LumatoneKeyUpdateBuffer::sendKeyConfig(int boardId, int keyIndex, const LumatoneKey& noteDataConfig, bool signalEditorListeners)
+{
+    updateKeyConfig(boardId - 1, keyIndex, noteDataConfig);
+}
+
+void LumatoneKeyUpdateBuffer::sendKeyColourConfig(int boardId, int keyIndex, juce::Colour colour, bool signalEditorListeners)
+{
+    updateKeyColour(boardId - 1, keyIndex, colour);
+}
+
+void LumatoneKeyUpdateBuffer::updateKeyConfig(int boardIndex, int keyIndex, const LumatoneKey& config)
+{
+    juce::ScopedLock l(lock);
+    // while (!lock.tryEnter()) {}
+
+    auto keyNum = getKeyNum(boardIndex, keyIndex);
+    MappedLumatoneKey currentUpdateData = keysToUpdate[keyNum];
+
+    const LumatoneKey& currentKey = getKey(boardIndex, keyIndex);
+    preUpdateLayout.setKey(currentKey, boardIndex, keyIndex);
+
+    if (currentKey == config)
+    {
+        keysToUpdate.set(keyNum, MappedLumatoneKey());
+    }
+    else if (currentUpdateData.boardIndex < 0 || currentUpdateData.keyIndex < 0)
+    {
+        auto updateKey = MappedLumatoneKey(config, boardIndex, keyIndex);
+        updateKey.setColour(currentKey.getColour());
+        keysToUpdate.set(keyNum, updateKey);
+    }
+    else if (!currentUpdateData.configIsEqual(config))
+    {
+        auto updateKey = MappedLumatoneKey(config, boardIndex, keyIndex);
+        updateKey.setColour(currentUpdateData.getColour());
+        keysToUpdate.set(keyNum, updateKey);
+    }
+
+    startTimer(updateMs);
+}
+
+void LumatoneKeyUpdateBuffer::updateKeyColour(int boardIndex, int keyIndex, juce::Colour colour)
+{
+    juce::ScopedLock l(lock);
+    // while (!lock.tryEnter()) {}
+
+    auto keyNum = getKeyNum(boardIndex, keyIndex);
+    MappedLumatoneKey currentUpdateData = keysToUpdate[keyNum];
+    const LumatoneKey& currentKey = getKey(boardIndex, keyIndex);
+    preUpdateLayout.setKey(currentKey, boardIndex, keyIndex);
+
+    if (currentKey.getColour() == colour && currentKey.configIsEqual(currentUpdateData))
+    {
+        keysToUpdate.set(keyNum, MappedLumatoneKey());
+    }
+    else if (currentUpdateData.boardIndex < 0 || currentUpdateData.keyIndex < 0)
+    {
+        auto updateKey = MappedLumatoneKey(currentKey, boardIndex, keyIndex);
+        updateKey.setColour(colour);
+        keysToUpdate.set(keyNum, updateKey);
+    }
+    else if (currentUpdateData.isColour(colour))
+    {
+        auto updateKey = MappedLumatoneKey(currentUpdateData, boardIndex, keyIndex);
+        updateKey.setColour(colour);
+        keysToUpdate.set(keyNum, updateKey);
+    }
+
+
+    startTimer(updateMs);
+}
+
+void LumatoneKeyUpdateBuffer::timerCallback()
+{
+    stopTimer();
+
+    if (! lock.tryEnter())
+        return;
+
+    int keyNum = 0;
+    for (int board = 0; board < getNumBoards(); board++)
+    {
+        int boardId = board + 1;
+        for (int keyIndex = 0; keyIndex < getOctaveBoardSize(); keyIndex++)
+        {
+            auto keyUpdate = keysToUpdate[keyNum];
+            if (keyUpdate.boardIndex >= 0 && keyUpdate.keyIndex >= 0)
+            {
+                // auto currentKey = getKey(board, keyIndex);
+                auto currentKey = preUpdateLayout.getKey(board, keyIndex);
+                if (!currentKey.configIsEqual(keyUpdate))
+                    firmwareDriver.sendKeyFunctionParameters(boardId, keyIndex, keyUpdate.getMidiNumber(), keyUpdate.getMidiChannel(), keyUpdate.getType(), keyUpdate.isCCFaderDefault());
+
+                if (!currentKey.colourIsEqual(keyUpdate))
+                {
+                    auto colour = keyUpdate.getColour();
+                    if (getLumatoneVersion() >= LumatoneFirmware::ReleaseVersion::VERSION_1_0_11)
+                        firmwareDriver.sendKeyLightParameters(boardId, keyIndex, colour.getRed(), colour.getGreen(), colour.getBlue());
+                    else
+                        firmwareDriver.sendKeyLightParameters_Version_1_0_0(boardId, keyIndex, colour.getRed() * 0.5f, colour.getGreen() * 0.5f, colour.getBlue() * 0.5f);
+                }
+            }
+
+            keysToUpdate.set(keyNum, MappedLumatoneKey());
+            keyNum++;
+        }
+    }
+
+
+}
diff --git a/Source/key_update_buffer.h b/Source/lumatone_editor_library/device/key_update_buffer.h
similarity index 67%
rename from Source/key_update_buffer.h
rename to Source/lumatone_editor_library/device/key_update_buffer.h
index e57dfe87..136e3546 100644
--- a/Source/key_update_buffer.h
+++ b/Source/lumatone_editor_library/device/key_update_buffer.h
@@ -1,19 +1,18 @@
-#pragma once
+#ifndef LUMATONE_UPDATE_BUFFER_H
 
-#include "./data/lumatone_layout.h"
+#include "../data/lumatone_state.h"
 
-#include "TerpstraMidiDriver.h"
+class LumatoneFirmwareDriver;
 
-class LumatoneKeyUpdateBuffer : private juce::Timer
+class LumatoneKeyUpdateBuffer : public LumatoneState,
+                                private juce::Timer
 {
 public:
 
-    LumatoneKeyUpdateBuffer(TerpstraMidiDriver& midiDriver);
+    LumatoneKeyUpdateBuffer(LumatoneFirmwareDriver& firmwareDriver, LumatoneState state);
     ~LumatoneKeyUpdateBuffer() override;
 
     void sendKeyConfig(int boardId, int keyIndex, const LumatoneKey& noteDataConfig, bool signalEditorListeners = true);
-    void sendKeyConfig(int boardIndex, int keyIndex, int noteOrCCNum, int channel, int keyType, bool faderUpIsNull = true);
-
     void sendKeyColourConfig(int boardId, int keyIndex, juce::Colour colour, bool signalEditorListeners = true);
 
     void timerCallback() override;
@@ -30,7 +29,7 @@ class LumatoneKeyUpdateBuffer : private juce::Timer
 
     juce::CriticalSection lock;
 
-    TerpstraMidiDriver& midiDriver;
+    LumatoneFirmwareDriver& firmwareDriver;
 
     juce::HashMap<int, MappedLumatoneKey> keysToUpdate;
 
@@ -38,3 +37,5 @@ class LumatoneKeyUpdateBuffer : private juce::Timer
 
     int updateMs = 300;
 };
+
+#endif LUMATONE_UPDATE_BUFFER_H
diff --git a/Source/lumatone_editor_library/device/lumatone_controller.cpp b/Source/lumatone_editor_library/device/lumatone_controller.cpp
new file mode 100644
index 00000000..0965df36
--- /dev/null
+++ b/Source/lumatone_editor_library/device/lumatone_controller.cpp
@@ -0,0 +1,797 @@
+/*
+  ==============================================================================
+
+    LumatoneCommandManager.cpp
+    Created: 17 Apr 2021 10:17:31pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#include "lumatone_controller.h"
+
+#include "lumatone_event_manager.h"
+#include "../actions/lumatone_action.h"
+#include "../lumatone_midi_driver/lumatone_midi_driver.h"
+
+LumatoneController::LumatoneController(const LumatoneApplicationState& stateIn, LumatoneFirmwareDriver& firmwareDriverIn, juce::UndoManager* undoManager)
+    : LumatoneApplicationState("LumatoneController", stateIn, undoManager)
+    , LumatoneApplicationMidiController(stateIn, firmwareDriverIn)
+    , firmwareDriver(firmwareDriverIn)
+    , updateBuffer(firmwareDriverIn, stateIn)
+    // , LumatoneSandboxLogger("LumatoneController")
+{
+    firmwareDriver.addDriverListener(this);
+
+    eventManager = std::make_unique<LumatoneEventManager>(firmwareDriver, stateIn);
+    eventManager->addFirmwareListener(this);
+}
+
+LumatoneController::~LumatoneController()
+{
+    firmwareDriver.removeDriverListener(this);
+}
+
+juce::ValueTree LumatoneController::loadStateProperties(juce::ValueTree stateIn)
+{
+    LumatoneApplicationState::loadStateProperties(stateIn);
+    //editorListeners.call(&LumatoneEditor::EditorListener::completeMappingLoaded, *getMappingData());
+    return state;
+}
+
+// void LumatoneController::setContext(const LumatoneContext& contextIn)
+// {
+//     LumatoneApplicationState::setContext(contextIn);
+//     editorListeners.call(&LumatoneEditor::EditorListener::contextChanged, layoutContext.get());
+// }
+
+// void LumatoneController::clearContext()
+// {
+//     LumatoneApplicationState::clearContext();
+//     editorListeners.call(&LumatoneEditor::EditorListener::contextChanged, nullptr);
+// }
+
+void LumatoneController::connectionStateChanged(ConnectionState newState)
+{
+    switch (newState)
+    {
+    case ConnectionState::DISCONNECTED:
+        currentDevicePairConfirmed = false;
+        break;
+
+    case ConnectionState::ONLINE:
+        onConnectionConfirmed();
+        return;
+
+    default:
+        break;
+    }
+
+    //statusListeners.call(&LumatoneEditor::StatusListener::connectionStateChanged, newState);
+}
+
+juce::Array<juce::MidiDeviceInfo> LumatoneController::getMidiInputList()
+{
+    return firmwareDriver.getMidiInputList();
+}
+
+juce::Array<juce::MidiDeviceInfo> LumatoneController::getMidiOutputList()
+{
+    return firmwareDriver.getMidiOutputList();
+}
+
+int LumatoneController::getMidiInputIndex() const
+{
+    return firmwareDriver.getMidiInputIndex();
+}
+
+int LumatoneController::getMidiOutputIndex() const
+{
+    return firmwareDriver.getMidiOutputIndex();
+}
+
+void LumatoneController::setMidiInput(int deviceIndex, bool test)
+{
+    const bool changed = firmwareDriver.getMidiInputIndex() != deviceIndex;
+
+    firmwareDriver.setMidiInput(deviceIndex);
+
+    if (changed)
+        currentDevicePairConfirmed = false;
+
+    if (test && deviceIndex >= 0)
+        testCurrentDeviceConnection();
+}
+
+void LumatoneController::setMidiOutput(int deviceIndex, bool test)
+{
+    const bool changed = firmwareDriver.getMidiOutputIndex() != deviceIndex;
+
+    firmwareDriver.setMidiOutput(deviceIndex);
+
+    if (changed)
+        currentDevicePairConfirmed = false;
+
+    if (test && deviceIndex >= 0)
+        testCurrentDeviceConnection();
+}
+
+bool LumatoneController::performAction(LumatoneAction* action, bool undoable, bool newTransaction)
+{
+    if (action == nullptr)
+        return false;
+
+    if (undoable)
+    {
+        if (undoManager == nullptr)
+            return false;
+
+        if (newTransaction)
+            undoManager->beginNewTransaction();
+
+        return undoManager->perform((juce::UndoableAction*)action, action->getName());
+    }
+
+    return action->perform();
+}
+
+/*
+==============================================================================
+Combined (hi-level) commands
+*/
+
+
+void LumatoneController::sendAllParamsOfBoard(int boardId, const LumatoneBoard* boardData, bool signalEditorListeners, bool bufferKeyUpdates)
+{
+    for (int keyIndex = 0; keyIndex < getOctaveBoardSize(); keyIndex++)
+    {
+        LumatoneKey key = boardData->getKey(keyIndex);
+        sendKeyParam(boardId, keyIndex, key, false, bufferKeyUpdates);
+    }
+
+    //if (signalEditorListeners)
+    //    editorListeners.call(&LumatoneEditor::EditorListener::boardChanged, *boardData);
+}
+
+void LumatoneController::sendCompleteMapping(const LumatoneLayout& mappingData, bool signalEditorListeners, bool bufferKeyUpdates)
+{
+    for (int boardId = 1; boardId <= getNumBoards(); boardId++)
+        sendAllParamsOfBoard(boardId, &mappingData.getBoard(boardId - 1), false, bufferKeyUpdates);
+
+    clearContext();
+
+    //if (signalEditorListeners)
+    //    editorListeners.call(&LumatoneEditor::EditorListener::completeMappingLoaded, mappingData);
+}
+
+void LumatoneController::sendCurrentCompleteConfig(bool signalEditorListeners)
+{
+	// MIDI channel, MIDI note, colour and key type config for all keys
+	sendCompleteMapping(*getMappingData(), true, false);
+
+	// General options
+	setAftertouchEnabled(getMappingData()->getAftertouchOn());
+	sendLightOnKeyStrokes(getMappingData()->getLightOnKeyStrokes());
+	sendInvertFootController(getMappingData()->getInvertExpression());
+	sendExpressionPedalSensivity(getMappingData()->getExpressionSensitivity());
+    invertSustainPedal(getMappingData()->getInvertSustain());
+
+	// Velocity curve config
+	setVelocityIntervalConfig(getMappingData()->getConfigTable(LumatoneConfigTable::velocityInterval)->velocityValues);
+}
+
+void LumatoneController::sendGetMappingOfBoardRequest(int boardId)
+{
+    getRedLEDConfig(boardId);
+    getGreenLEDConfig(boardId);
+    getBlueLEDConfig(boardId);
+    getChannelConfig(boardId);
+    getNoteConfig(boardId);
+    getKeyTypeConfig(boardId);
+    getFaderTypeConfig(boardId);
+}
+
+void LumatoneController::sendGetCompleteMappingRequest()
+{
+    for (int boardId = 1; boardId <= getNumBoards(); boardId++)
+        sendGetMappingOfBoardRequest(boardId);
+}
+
+void LumatoneController::resetVelocityConfig(LumatoneConfigTable::TableType velocityCurveType)
+{
+    switch (velocityCurveType)
+    {
+    case LumatoneConfigTable::TableType::velocityInterval:
+        resetVelocityConfig();
+        break;
+    case LumatoneConfigTable::TableType::fader:
+        resetFaderConfig();
+        break;
+    case LumatoneConfigTable::TableType::afterTouch:
+        resetAftertouchConfig();
+        break;
+    case LumatoneConfigTable::TableType::lumaTouch:
+        resetLumatouchConfig();
+        break;
+    default:
+        jassert(false);
+        break;
+    }
+}
+
+unsigned int LumatoneController::sendTestMessageToDevice(int deviceIndex, unsigned int pingId)
+{
+    if (!firmwareDriver.testIsIncomplete())
+    {
+        firmwareDriver.openAvailableDevicesForTesting();
+    }
+
+    int value = (pingId < 0)
+        ? deviceIndex
+        : pingId &= 0xFFFFFFF;
+
+    if (getLumatoneVersion() >= LumatoneFirmware::ReleaseVersion::VERSION_1_0_9)
+    {
+        firmwareDriver.ping(value, deviceIndex);
+    }
+    else
+    {
+        firmwareDriver.sendGetSerialIdentityRequest(deviceIndex);
+    }
+
+    // lastTestDeviceSent = deviceIndex;
+    waitingForTestResponse = true;
+
+    return value;
+}
+
+void LumatoneController::testCurrentDeviceConnection()
+{
+    // On confirmed connection send connection listener message
+    if (firmwareDriver.hasDevicesDefined())
+    {
+        waitingForTestResponse = true;
+
+        if (getSerialNumber().isNotEmpty() && getLumatoneVersion() >= LumatoneFirmware::ReleaseVersion::VERSION_1_0_9)
+        {
+            pingLumatone(0xf);
+        }
+
+        else
+        {
+            sendGetSerialIdentityRequest(true);
+        }
+    }
+    else
+    {
+        currentDevicePairConfirmed = false;
+    }
+}
+
+// Send parametrization of one key to the device
+void LumatoneController::sendKeyParam(int boardId, int keyIndex, LumatoneKey keyData, bool signalEditorListeners, bool bufferKeyUpdates)
+{
+    // Default CC polarity = 1, Inverted CC polarity = 0
+    sendKeyConfig(boardId, keyIndex, keyData, false, bufferKeyUpdates);
+    sendKeyColourConfig(boardId, keyIndex, keyData, false, bufferKeyUpdates);
+
+    //if (signalEditorListeners)
+    //    editorListeners.call(&LumatoneEditor::EditorListener::keyChanged, boardId - 1, keyIndex, keyData);
+}
+
+// Send configuration of a certain look up table
+void LumatoneController::sendTableConfig(LumatoneConfigTable::TableType velocityCurveType, const juce::uint8* table)
+{
+    switch (velocityCurveType)
+    {
+    case LumatoneConfigTable::TableType::fader:
+        setFaderConfig(table);
+        break;
+
+    case LumatoneConfigTable::TableType::afterTouch:
+        setAftertouchConfig(table);
+        break;
+
+    case LumatoneConfigTable::TableType::lumaTouch:
+        setLumatouchConfig(table);
+        break;
+
+    default:
+        sendVelocityConfig(table);
+    }
+}
+
+void LumatoneController::sendTableConfig(LumatoneConfigTable::TableType velocityCurveType, const int* table)
+{
+    juce::uint8 formatted[128];
+    for (int i = 0; i < 128; i++)
+    {
+        formatted[i] = (juce::uint8)table[i];
+    }
+
+    switch (velocityCurveType)
+    {
+    case LumatoneConfigTable::TableType::fader:
+        setFaderConfig(formatted);
+        break;
+
+    case LumatoneConfigTable::TableType::afterTouch:
+        setAftertouchConfig(formatted);
+        break;
+
+    case LumatoneConfigTable::TableType::lumaTouch:
+        setLumatouchConfig(formatted);
+        break;
+
+    default:
+        sendVelocityConfig(formatted);
+    }
+}
+
+//=============================================================================
+// Mid-level firmware functions
+
+// Send note, channel, cc, and fader polarity data
+void LumatoneController::sendKeyConfig(int boardId, int keyIndex, const LumatoneKey& keyData, bool signalEditorListeners, bool bufferKeyUpdates)
+{
+    if (bufferKeyUpdates)
+        updateBuffer.sendKeyConfig(boardId, keyIndex, keyData);
+    else
+        firmwareDriver.sendKeyFunctionParameters(boardId, keyIndex, keyData.getMidiNumber(), keyData.getMidiChannel(), keyData.getType(), keyData.isCCFaderDefault());
+
+    //if (signalEditorListeners)
+    //    editorListeners.call(&LumatoneEditor::EditorListener::keyConfigChanged, boardId - 1, keyIndex, keyData);
+}
+
+void LumatoneController::sendKeyColourConfig(int boardId, int keyIndex, juce::Colour colour, bool signalEditorListeners, bool bufferKeyUpdates)
+{
+    if (bufferKeyUpdates)
+        updateBuffer.sendKeyColourConfig(boardId, keyIndex, colour);
+    else
+    {
+        if (getLumatoneVersion() >= LumatoneFirmware::ReleaseVersion::VERSION_1_0_11)
+            firmwareDriver.sendKeyLightParameters(boardId, keyIndex, colour.getRed(), colour.getGreen(), colour.getBlue());
+        else
+            firmwareDriver.sendKeyLightParameters_Version_1_0_0(boardId, keyIndex, colour.getRed() / 2, colour.getGreen() / 2, colour.getBlue() / 2);
+    }
+
+    //if (signalEditorListeners)
+        //editorListeners.call(&LumatoneEditor::EditorListener::keyColourChanged, boardId - 1, keyIndex, colour);
+}
+
+void LumatoneController::sendKeyColourConfig(int boardId, int keyIndex, const LumatoneKey& keyColourConfig, bool signalEditorListeners, bool bufferKeyUpdates)
+{
+    sendKeyColourConfig(boardId, keyIndex, keyColourConfig.getColour(), signalEditorListeners, bufferKeyUpdates);
+}
+
+
+// Send expression pedal sensivity
+void LumatoneController::sendExpressionPedalSensivity(unsigned char value)
+{
+    setExpressionSensitivity(value);
+    firmwareDriver.sendExpressionPedalSensivity(value);
+    //editorListeners.call(&LumatoneEditor::EditorListener::expressionPedalSensitivityChanged, value);
+}
+
+// Send parametrization of foot controller
+void LumatoneController::sendInvertFootController(bool value)
+{
+    setInvertExpression(value);
+    firmwareDriver.sendInvertFootController(value);
+    //editorListeners.call(&LumatoneEditor::EditorListener::invertFootControllerChanged, value);
+}
+
+// Colour for macro button in active state
+void LumatoneController::sendMacroButtonActiveColour(juce::String colourAsString)
+{
+    auto c = juce::Colour::fromString(colourAsString);
+    if (getLumatoneVersion() >= LumatoneFirmware::ReleaseVersion::VERSION_1_0_11)
+        firmwareDriver.sendMacroButtonActiveColour(c.getRed(), c.getGreen(), c.getBlue());
+    else
+        firmwareDriver.sendMacroButtonActiveColour_Version_1_0_0(c.getRed(), c.getGreen(), c.getBlue());
+    //editorListeners.call(&LumatoneEditor::EditorListener::macroButtonActiveColourChagned, c);
+}
+
+// Colour for macro button in inactive state
+void LumatoneController::sendMacroButtonInactiveColour(juce::String colourAsString)
+{
+    auto c = juce::Colour::fromString(colourAsString);
+    if (getLumatoneVersion() >= LumatoneFirmware::ReleaseVersion::VERSION_1_0_11)
+        firmwareDriver.sendMacroButtonInactiveColour(c.getRed(), c.getGreen(), c.getBlue());
+    else
+        firmwareDriver.sendMacroButtonInactiveColour_Version_1_0_0(c.getRed(), c.getGreen(), c.getBlue());
+    //editorListeners.call(&LumatoneEditor::EditorListener::macroButtonInactiveColourChanged, c);
+}
+
+// Send parametrization of light on keystrokes
+void LumatoneController::sendLightOnKeyStrokes(bool value)
+{
+    firmwareDriver.sendLightOnKeyStrokes(value);
+    //editorListeners.call(&LumatoneEditor::EditorListener::lightOnKeyStrokesChanged, value);
+}
+
+// Send a value for a velocity lookup table
+void LumatoneController::sendVelocityConfig(const juce::uint8 velocityTable[])
+{
+    firmwareDriver.sendVelocityConfig(velocityTable);
+    //editorListeners.call(&LumatoneEditor::EditorListener::tableChanged, LumatoneConfigTable::TableType::velocityInterval, velocityTable, VELOCITYINTERVALTABLESIZE);
+}
+
+// Save velocity config to EEPROM
+void LumatoneController::saveVelocityConfig()
+{
+    firmwareDriver.saveVelocityConfig();
+}
+
+void LumatoneController::resetVelocityConfig()
+{
+    firmwareDriver.resetVelocityConfig();
+}
+
+void LumatoneController::setFaderConfig(const juce::uint8 faderTable[])
+{
+    firmwareDriver.sendFaderConfig(faderTable);
+    //editorListeners.call(&LumatoneEditor::EditorListener::tableChanged, LumatoneConfigTable::TableType::fader, faderTable, VELOCITYINTERVALTABLESIZE);
+}
+
+void LumatoneController::resetFaderConfig()
+{
+    firmwareDriver.resetFaderConfig();
+}
+
+void LumatoneController::setAftertouchEnabled(bool value)
+{
+    firmwareDriver.sendAfterTouchActivation(value);
+}
+
+void LumatoneController::startCalibrateAftertouch()
+{
+    firmwareDriver.sendCalibrateAfterTouch();
+}
+
+void LumatoneController::setAftertouchConfig(const juce::uint8 aftertouchTable[])
+{
+    firmwareDriver.sendAftertouchConfig(aftertouchTable);
+    //editorListeners.call(&LumatoneEditor::EditorListener::tableChanged, LumatoneConfigTable::TableType::afterTouch, aftertouchTable, VELOCITYINTERVALTABLESIZE);
+}
+
+void LumatoneController::resetAftertouchConfig()
+{
+    firmwareDriver.resetAftertouchConfig();
+}
+
+void LumatoneController::setVelocityIntervalConfig(const int velocityIntervalTable[])
+{
+    firmwareDriver.sendVelocityIntervalConfig(velocityIntervalTable);
+}
+
+void LumatoneController::getRedLEDConfig(int boardIndex)
+{
+    firmwareDriver.sendRedLEDConfigRequest(boardIndex);
+}
+
+void LumatoneController::getGreenLEDConfig(int boardIndex)
+{
+    firmwareDriver.sendGreenLEDConfigRequest(boardIndex);
+}
+
+void LumatoneController::getBlueLEDConfig(int boardIndex)
+{
+    firmwareDriver.sendBlueLEDConfigRequest(boardIndex);
+}
+
+void LumatoneController::getChannelConfig(int boardIndex)
+{
+    firmwareDriver.sendChannelConfigRequest(boardIndex);
+}
+
+void LumatoneController::getNoteConfig(int boardIndex)
+{
+    firmwareDriver.sendNoteConfigRequest(boardIndex);
+}
+
+void LumatoneController::getKeyTypeConfig(int boardIndex)
+{
+    firmwareDriver.sendKeyTypeConfigRequest(boardIndex);
+}
+
+void LumatoneController::sendVelocityConfigRequest()
+{
+    firmwareDriver.sendVelocityConfigRequest();
+}
+
+void LumatoneController::sendFaderConfigRequest()
+{
+    firmwareDriver.sendFaderConfigRequest();
+}
+
+void LumatoneController::sendAftertouchConfigRequest()
+{
+    firmwareDriver.sendAftertouchConfigRequest();
+}
+
+void LumatoneController::sendVelocityIntervalConfigRequest()
+{
+    firmwareDriver.sendVelocityIntervalConfigRequest();
+}
+
+void LumatoneController::getFaderTypeConfig(int boardIndex)
+{
+    firmwareDriver.sendFaderTypeConfigRequest(boardIndex);
+}
+
+// This command is used to read back the serial identification number of the keyboard.
+void LumatoneController::sendGetSerialIdentityRequest(bool confirmConnectionAfterResponse)
+{
+    waitingForTestResponse = confirmConnectionAfterResponse;
+    firmwareDriver.sendGetSerialIdentityRequest();
+}
+
+void LumatoneController::startCalibrateKeys()
+{
+    firmwareDriver.sendCalibrateKeys();
+}
+
+void LumatoneController::setCalibratePitchModWheel(bool startCalibration)
+{
+    firmwareDriver.sendCalibratePitchModWheel(startCalibration);
+}
+
+void LumatoneController::setLumatouchConfig(const juce::uint8 lumatouchTable[])
+{
+    firmwareDriver.setLumatouchConfig(lumatouchTable);
+    //editorListeners.call(&LumatoneEditor::EditorListener::tableChanged, LumatoneConfigTable::TableType::lumaTouch, lumatouchTable, VELOCITYINTERVALTABLESIZE);
+}
+
+void LumatoneController::resetLumatouchConfig()
+{
+    firmwareDriver.resetLumatouchConfig();
+}
+
+void LumatoneController::getLumatouchConfig()
+{
+    firmwareDriver.sendLumatouchConfigRequest();
+}
+
+// This command is used to read back the current Lumatone firmware revision.
+void LumatoneController::sendGetFirmwareRevisionRequest()
+{
+    firmwareDriver.sendGetFirmwareRevisionRequest();
+}
+
+// Send a value for the Lumatone to echo back; used for auto device connection and monitoring
+int LumatoneController::pingLumatone(juce::uint8 pingId)
+{
+    return firmwareDriver.ping(pingId);
+}
+
+// Set MIDI Channels of peripheral controllers, pitch & mod wheels, expression & sustain pedals
+void LumatoneController::setPeripheralChannels(int pitchWheelChannel, int modWheelChannel, int expressionChannel, int sustainChannel)
+{
+    if (firmwareSupport.versionAcknowledgesCommand(getLumatoneVersion(), SET_PERIPHERAL_CHANNELS))
+        firmwareDriver.setPeripheralChannels(pitchWheelChannel, modWheelChannel, expressionChannel, sustainChannel);
+}
+
+void LumatoneController::setPeripheralChannels(LumatoneFirmware::PeripheralChannelSettings channelSettings)
+{
+    setPeripheralChannels(channelSettings.pitchWheel, channelSettings.modWheel, channelSettings.expressionPedal, channelSettings.sustainPedal);
+}
+
+// Get MIDI Channels of peripheral controllers, pitch & mod wheels, expression & sustain pedals
+void LumatoneController::getPeripheralChannels()
+{
+    if (firmwareSupport.versionAcknowledgesCommand(getLumatoneVersion(), GET_PERIPHERAL_CHANNELS))
+        firmwareDriver.getPeripheralChannels();
+}
+
+void LumatoneController::invertSustainPedal(bool setInverted)
+{
+    setInvertSustain(setInverted);
+
+    if (firmwareSupport.versionAcknowledgesCommand(getLumatoneVersion(), INVERT_SUSTAIN_PEDAL))
+        firmwareDriver.sendInvertSustainPedal(setInverted);
+}
+
+void LumatoneController::resetPresetsToFactoryDefault()
+{
+    if (firmwareSupport.versionAcknowledgesCommand(getLumatoneVersion(), RESET_DEFAULT_PRESETS))
+    {
+        for (int i = 0; i < 10; i++)
+            firmwareDriver.sendResetDefaultPresetsRequest(i);
+    }
+}
+
+void LumatoneController::resetPresetToFactoryDefault(int presetIndex)
+{
+    firmwareDriver.sendResetDefaultPresetsRequest(presetIndex);
+}
+
+// Get interaction flags of current preset
+void LumatoneController::requestPresetFlags()
+{
+    if (firmwareSupport.versionAcknowledgesCommand(getLumatoneVersion(), GET_PRESET_FLAGS))
+        firmwareDriver.sendGetPresetFlagsReset();
+}
+
+// Get sensitivity setting of expression pedal
+void LumatoneController::requestExpressionPedalSensitivity()
+{
+    if (firmwareSupport.versionAcknowledgesCommand(getLumatoneVersion(), GET_EXPRESSION_PEDAL_SENSITIVIY))
+        firmwareDriver.sendGetExpressionPedalSensitivity();
+}
+
+bool LumatoneController::connectionConfirmed() const
+{
+    return firmwareDriver.hasDevicesDefined() && currentDevicePairConfirmed;
+}
+
+void LumatoneController::onConnectionConfirmed()
+{
+    waitingForTestResponse = false;
+    currentDevicePairConfirmed = true;
+    waitingForFirmwareVersion = true;
+
+    if (getSerialNumber().isEmpty())
+    {
+        sendGetSerialIdentityRequest(true);
+        return; // a bit of a kludge
+    }
+    else if (getSerialNumber() != SERIAL_55_KEYS)
+    {
+        sendGetFirmwareRevisionRequest();
+    }
+
+    //statusListeners.call(&LumatoneEditor::StatusListener::connectionStateChanged, ConnectionState::ONLINE);
+}
+
+// bool LumatoneController::loadLayoutFromFile(const juce::File& file)
+// {
+//     const bool loaded = LumatoneState::loadLayoutFromFile(file);
+//     if (loaded)
+//     {
+//         sendCompleteMapping(*mappingData, true, false);
+//     }
+
+//     return loaded;
+// }
+
+void LumatoneController::handleStatePropertyChange(juce::ValueTree stateIn, const juce::Identifier &property)
+{
+    LumatoneApplicationState::handleStatePropertyChange(stateIn, property);
+
+    if (waitingForFirmwareVersion && property == LumatoneStateProperty::LastConnectedFirmwareVersion)
+    {
+        waitingForFirmwareVersion = false;
+        sendGetCompleteMappingRequest();
+    }
+}
+
+// LumatoneEditor::FirmwareListener Implementation
+
+void LumatoneController::serialIdentityReceived(const int* serialBytes)
+{
+    juce::String serialNumber = firmwareSupport.serialIdentityToString(serialBytes);
+    DBG("Device serial is: " + serialNumber);
+
+    setConnectedSerialNumber(serialNumber);
+
+    if (waitingForTestResponse)
+    {
+        if (serialNumber != SERIAL_55_KEYS)
+            sendGetFirmwareRevisionRequest();
+        else
+            onConnectionConfirmed();
+    }
+}
+
+void LumatoneController::firmwareRevisionReceived(LumatoneFirmware::Version version)
+{
+    // setFirmwareVersion(version, true);
+
+    if (waitingForTestResponse)
+        onConnectionConfirmed();
+}
+
+void LumatoneController::pingResponseReceived(unsigned int pingValue)
+{
+    if (waitingForTestResponse)
+        onConnectionConfirmed();
+}
+
+void LumatoneController::octaveColourConfigReceived(int boardId, juce::uint8 rgbFlag, const int* colourData)
+{
+    auto octaveSize = getOctaveBoardSize();
+    auto numBoards = getNumBoards();
+
+    int boardIndex = boardId - 1;
+
+    for (int keyIndex = 0; keyIndex < octaveSize; keyIndex++)
+    {
+        LumatoneKey keyData = getKey(boardIndex, keyIndex);
+        auto newValue = colourData[keyIndex];
+
+        if (rgbFlag == 0)
+        {
+            keyData.setColour(juce::Colour(newValue, keyData.getColour().getGreen(), keyData.getColour().getBlue()));
+        }
+        else if (rgbFlag == 1)
+        {
+            keyData.setColour(juce::Colour(keyData.getColour().getRed(), newValue, keyData.getColour().getBlue()));
+        }
+        else if (rgbFlag == 2)
+        {
+            keyData.setColour(juce::Colour(keyData.getColour().getRed(), keyData.getColour().getGreen(), newValue));
+        }
+        else
+        {
+            jassertfalse;
+        }
+    }
+
+    //editorListeners.call(&LumatoneEditor::EditorListener::boardChanged, getBoard(boardIndex));
+};
+
+
+void LumatoneController::octaveChannelConfigReceived(int boardId, const int* channelData)
+{
+    for (int keyIndex = 0; keyIndex < getOctaveBoardSize(); keyIndex++)
+    {
+        // Check channel values?
+        auto key = getKey(boardId-1, keyIndex);
+        key.setChannelNumber(channelData[keyIndex]);
+        LumatoneState::setKey(key, boardId, keyIndex);
+        // getEditKey(boardId-1, keyIndex)->channelNumber = channelData[keyIndex];
+    }
+
+    //editorListeners.call(&LumatoneEditor::EditorListener::boardChanged, getBoard(boardId - 1));
+}
+
+void LumatoneController::octaveNoteConfigReceived(int boardId, const int* noteData)
+{
+    for (int keyIndex = 0; keyIndex < getOctaveBoardSize(); keyIndex++)
+    {
+        auto key = getKey(boardId-1, keyIndex);
+        key.setNoteOrCC(noteData[keyIndex]);
+        LumatoneState::setKey(key, boardId, keyIndex);
+        // Check note values?
+        // getEditKey(boardId - 1, keyIndex)->noteNumber = noteData[keyIndex];
+    }
+
+    //editorListeners.call(&LumatoneEditor::EditorListener::boardChanged, getBoard(boardId - 1));
+}
+
+void LumatoneController::keyTypeConfigReceived(int boardId, const int* keyTypeData)
+{
+    for (int keyIndex = 0; keyIndex < getOctaveBoardSize(); keyIndex++)
+    {
+        auto key = getKey(boardId-1, keyIndex);
+        key.setKeyType((LumatoneKeyType)keyTypeData[keyIndex]);
+        LumatoneState::setKey(key, boardId, keyIndex);
+        // Check note values?
+        // getEditKey(boardId - 1, keyIndex)->keyType = LumatoneKeyType(keyTypeData[keyIndex]);
+    }
+
+    //editorListeners.call(&LumatoneEditor::EditorListener::boardChanged, getBoard(boardId - 1));
+}
+
+//void LumatoneController::loadRandomMapping(int testTimeoutMs,  int maxIterations, int i)
+//{
+//    auto dir = juce::File::getSpecialLocation(juce::File::SpecialLocationType::userDocumentsDirectory).getChildFile("Lumatone Editor").getChildFile("Mappings");
+//    auto mappings = dir.findChildFiles(juce::File::TypesOfFileToFind::findFiles, true);
+//    auto numfiles = mappings.size();
+//    auto r = juce::Random();
+//
+//    auto fileIndex = r.nextInt(numfiles-1);
+//    auto file = mappings[fileIndex];
+//
+//    if (file.exists() && file.hasFileExtension(".ltn"))
+//    {
+//        DBG("Found " + juce::String(numfiles) + " files, loading " + file.getFileName());
+//        juce::MessageManager::callAsync([file]() { TerpstraSysExApplication::getApp().setCurrentFile(file); });
+//    }
+//
+////    if (i < maxIterations)
+////        Timer::callAfterDelay(testTimeoutMs, [&]() { loadRandomMapping(testTimeoutMs, maxIterations, i + 1); });
+////    else
+////        DBG("Finished random mappings test.");
+//}
diff --git a/Source/lumatone_editor_library/device/lumatone_controller.h b/Source/lumatone_editor_library/device/lumatone_controller.h
new file mode 100644
index 00000000..d94e9d6f
--- /dev/null
+++ b/Source/lumatone_editor_library/device/lumatone_controller.h
@@ -0,0 +1,257 @@
+/*
+  ==============================================================================
+
+    LumatoneCommandManager.h
+    Created: 17 Apr 2021 10:17:31pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#ifndef LUMATONE_CONTROLLER_H
+#define LUMATONE_CONTROLLER_H
+
+#include "./key_update_buffer.h"
+
+#include "../listeners/status_listener.h"
+#include "../listeners/firmware_listener.h"
+
+#include "../data/application_state.h"
+#include "../midi/lumatone_midi_manager.h"
+
+class LumatoneEventManager;
+class LumatoneAction;
+
+//==============================================================================
+// Helper class for parsing and comparing (todo) firmware versions
+
+
+class LumatoneController :  private LumatoneApplicationState
+                         ,  public LumatoneApplicationMidiController
+                         ,  public LumatoneEditor::StatusListener
+                         ,  protected LumatoneEditor::FirmwareListener
+                        //  , private LumatoneSandboxLogger
+{
+public:
+
+    LumatoneController(const LumatoneApplicationState& stateIn, LumatoneFirmwareDriver& firmwareDriverIn, juce::UndoManager* undoManager);
+    ~LumatoneController() override;
+
+    juce::ValueTree loadStateProperties(juce::ValueTree stateIn) override;
+
+    // void setContext(const LumatoneContext& contextIn) override;
+    // void clearContext() override;
+
+    //============================================================================
+    // Methods to configure firmware communication parameters
+
+    const FirmwareSupport& getFirmwareSupport() const { return firmwareSupport; }
+
+    juce::Array<juce::MidiDeviceInfo> getMidiInputList();
+    juce::Array<juce::MidiDeviceInfo> getMidiOutputList();
+
+    int getMidiInputIndex() const;
+    int getMidiOutputIndex() const;
+
+    void setMidiInput(int deviceIndex, bool test = true);
+    void setMidiOutput(int deviceIndex, bool test = true);
+
+    bool connectionConfirmed() const;
+private:
+    void onConnectionConfirmed();
+
+public:
+    //============================================================================
+    // Status Listener implementation
+
+    void connectionStateChanged(ConnectionState newState) override;
+
+public:
+    //============================================================================
+    // Combined (hi-level) commands
+
+    // Send all parametrizations of one sub board
+    void sendAllParamsOfBoard(int boardId, const LumatoneBoard* boardData, bool signalEditorListeners=true, bool bufferKeyUpdates=false);
+
+    // Send and save a complete key mapping
+    void sendCompleteMapping(const LumatoneLayout& mappingData, bool signalEditorListeners=true, bool bufferKeyUpdates=true);
+
+    void sendCurrentCompleteConfig(bool signalEditorListeners=true);
+
+    // Send request to receive the current mapping of one sub board on the controller
+    void sendGetMappingOfBoardRequest(int boardId);
+
+    // Send request to receive the complete current mapping on the controller
+    void sendGetCompleteMappingRequest();
+
+    // Send parametrization of one key to the device
+    void sendKeyParam(int boardId, int keyIndex, LumatoneKey keyData, bool signalEditorListeners=true, bool bufferKeyUpdates=false);
+
+    // Send configuration of a certain look up table
+    void sendTableConfig(LumatoneConfigTable::TableType velocityCurveType, const juce::uint8* table);
+    void sendTableConfig(LumatoneConfigTable::TableType velocityCurveType, const int* table);
+
+    // Reset configuration of a certain look up table to factory settings
+    void resetVelocityConfig(LumatoneConfigTable::TableType velocityCurveType);
+
+    // Ping a device cached in the device list, will primarily use GetSerialIdentity, or Ping if determined version happens to be >= 1.0.9
+    unsigned int sendTestMessageToDevice(int deviceIndex, unsigned int pingId);
+
+    // Sends a generic test message to the current device pair to see if we get an expected response
+    void testCurrentDeviceConnection();
+
+    //============================================================================
+    // Single (mid-level) commands
+
+    // Send note, channel, cc, and fader polarity data
+    void sendKeyConfig(int boardId, int keyIndex, const LumatoneKey& noteDataConfig, bool signalEditorListeners=true, bool bufferKeyUpdates=false);
+
+    // Send RGB colour data
+    void sendKeyColourConfig(int boardId, int keyIndex, juce::Colour colour, bool signalEditorListeners = true, bool bufferKeyUpdates=false);
+    void sendKeyColourConfig(int boardId, int keyIndex, const LumatoneKey& keyColourConfig, bool signalEditorListeners = true, bool bufferKeyUpdates=false);
+
+    // Send expression pedal sensivity
+    void sendExpressionPedalSensivity(unsigned char value);
+
+    // Send parametrization of foot controller
+    void sendInvertFootController(bool value);
+
+    // Colour for macro button in active state
+    void sendMacroButtonActiveColour(juce::String colourAsString);
+
+    // Colour for macro button in inactive state
+    void sendMacroButtonInactiveColour(juce::String colourAsString);
+
+    // Send parametrization of light on keystrokes
+    void sendLightOnKeyStrokes(bool value);
+
+    // Send a value for a velocity lookup table
+    void sendVelocityConfig(const juce::uint8 velocityTable[]);
+
+    // Save velocity config to EEPROM
+    void saveVelocityConfig();
+
+    void resetVelocityConfig();
+
+    void setFaderConfig(const juce::uint8 faderTable[]);
+
+    void resetFaderConfig();
+
+    void setAftertouchEnabled(bool isEnabled);
+
+    void startCalibrateAftertouch();
+
+    void setAftertouchConfig(const juce::uint8 aftertouchTable[]);
+
+    void resetAftertouchConfig();
+
+    void setCalibratePitchModWheel(bool startCalibration);
+
+    void setVelocityIntervalConfig(const int velocityIntervalTable[]);
+
+    void getRedLEDConfig(int boardIndex);
+
+    void getGreenLEDConfig(int boardIndex);
+
+    void getBlueLEDConfig(int boardIndex);
+
+    void getChannelConfig(int boardIndex);
+
+    void getNoteConfig(int boardIndex);
+
+    void getKeyTypeConfig(int boardIndex);
+
+    void sendVelocityConfigRequest();
+
+    // CMD 1Eh: Read back the current fader look up table of the keyboard.
+    void sendFaderConfigRequest();
+
+    // CMD 1Fh: Read back the current aftertouch look up table of the keyboard.
+    void sendAftertouchConfigRequest();
+
+    void sendVelocityIntervalConfigRequest();
+
+    // CMD 22h: Read back the fader type of all keys on the targeted board.
+	void getFaderTypeConfig(int boardIndex);
+
+    // This command is used to read back the serial identification number of the keyboard.
+    void sendGetSerialIdentityRequest(bool confirmConnectionAfterResponse);
+
+    void startCalibrateKeys();
+
+    void setLumatouchConfig(const juce::uint8 lumatouchTable[]);
+
+    void resetLumatouchConfig();
+
+    void getLumatouchConfig();
+
+    // This command is used to read back the current Lumatone firmware revision.
+    void sendGetFirmwareRevisionRequest();
+
+    // Send a value from 0-127 for the Lumatone to echo back, returns actual value sent (in case of 7-bit masking); used for auto device connection and monitoring
+    int pingLumatone(juce::uint8 pingId);
+
+    // Set MIDI Channels of peripheral controllers, pitch & mod wheels, expression & sustain pedals
+    void setPeripheralChannels(int pitchWheelChannel, int modWheelChannel, int expressionChannel, int sustainChannel);
+    void setPeripheralChannels(LumatoneFirmware::PeripheralChannelSettings channelSettings);
+
+    // Get MIDI Channels of peripheral controllers, pitch & mod wheels, expression & sustain pedals
+    void getPeripheralChannels();
+
+    // Invert the polarity of the sustain pedal
+    void invertSustainPedal(bool setInverted);
+
+    // Reset preset mappings to factory mappings
+    void resetPresetsToFactoryDefault();
+    void resetPresetToFactoryDefault(int presetIndex);
+
+    // Get interaction flags of current preset
+    void requestPresetFlags();
+
+    // Get sensitivity setting of expression pedal
+    void requestExpressionPedalSensitivity();
+
+public:
+
+    bool performAction(LumatoneAction* action, bool undoable=true, bool newTransaction=true);
+
+    // bool loadLayoutFromFile(const juce::File& file) override;
+
+private:
+    // juce::ValueTree::Listener implementation
+
+    void handleStatePropertyChange(juce::ValueTree stateIn, const juce::Identifier& property) override;
+
+protected:
+    //============================================================================
+    // LumatoneEditor::FirmwareListener implementation
+
+    void serialIdentityReceived(const int* serialBytes) override;
+
+    void firmwareRevisionReceived(LumatoneFirmware::Version version) override;
+
+    void pingResponseReceived(unsigned int pingValue) override;
+
+    void octaveColourConfigReceived(int boardId, juce::uint8 rgbFlag, const int* colourData) override;
+    void octaveChannelConfigReceived(int octaveIndex, const int* channelData) override;
+    void octaveNoteConfigReceived(int octaveIndex, const int* noteData) override;
+    void keyTypeConfigReceived(int boardId, const int* keyTypeData) override;
+
+    //============================================================================
+    // Test functions
+
+    //void loadRandomMapping(int testTimeoutMs, int maxIterations, int i = 0);
+
+private:
+
+    LumatoneFirmwareDriver& firmwareDriver;
+    LumatoneKeyUpdateBuffer updateBuffer;
+
+    std::unique_ptr<LumatoneEventManager>   eventManager;
+
+    bool    waitingForTestResponse      = false;
+    bool    currentDevicePairConfirmed  = false;
+    bool    waitingForFirmwareVersion   = false;
+};
+
+#endif LUMATONE_CONTROLLER_H
diff --git a/Source/lumatone_editor_library/device/lumatone_event_manager.cpp b/Source/lumatone_editor_library/device/lumatone_event_manager.cpp
new file mode 100644
index 00000000..c32cee00
--- /dev/null
+++ b/Source/lumatone_editor_library/device/lumatone_event_manager.cpp
@@ -0,0 +1,556 @@
+/*
+  ==============================================================================
+
+    lumatone_event_manager.cpp
+    Created: 5 Jun 2023 8:19:04pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#include "lumatone_event_manager.h"
+
+#include "../lumatone_midi_driver/lumatone_midi_driver.h"
+#include "../lumatone_midi_driver/firmware_sysex.h"
+
+LumatoneEventManager::LumatoneEventManager(LumatoneFirmwareDriver& midiDriverIn, const LumatoneState& stateIn)
+    : LumatoneState(stateIn)
+    , midiDriver(midiDriverIn)
+{
+    midiDriver.addDriverListener(this);
+
+    juce::MidiMessageCollector::reset(bufferReadTimeoutMs);
+}
+
+LumatoneEventManager::~LumatoneEventManager()
+{
+    midiDriver.removeDriverListener(this);
+}
+
+//=============================================================================
+// Communication and broadcasting
+
+void LumatoneEventManager::midiMessageReceived(juce::MidiInput* source, const juce::MidiMessage& midiMessage)
+{
+    //bool connected = state.getConnectionState() >= ConnectionState::SEARCHING;
+    //if (connected)
+    //{
+        if (midiMessage.isSysEx())
+        {
+            addMessageToQueue(midiMessage);
+            readQueueSize.store(readQueueSize.load() + 1);
+
+            if (!bufferReadRequested)
+            {
+                bufferReadRequested = true;
+                startTimer(bufferReadTimeoutMs);
+            }
+        }
+    //}
+
+    if (!midiMessage.isSysEx())
+    {
+        processNextMidiEvent(midiMessage);
+    }
+}
+
+void LumatoneEventManager::midiMessageSent(juce::MidiOutput* target, const juce::MidiMessage& midiMessage) { }
+
+void LumatoneEventManager::midiSendQueueSize(int queueSize)
+{
+    sendQueueSize = queueSize;
+}
+
+//void LumatoneEventManager::generalLogMessage(juce::String textMessage, LumatoneFirmwareDriver::ErrorLevel errorLevel) { }
+
+void LumatoneEventManager::noAnswerToMessage(juce::MidiDeviceInfo expectedDevice, const juce::MidiMessage& midiMessage)
+{
+    if (midiMessage.isSysEx())
+    {
+        //    callAfterDelay(bufferReadTimeoutMs, [&]() { firmwareListeners.call(&LumatoneEditor::FirmwareListener::noAnswerToCommand, midiMessage.getSysExData()[CMD_ID]); });
+
+        //if (currentDevicePairConfirmed)
+        //    statusListeners.call(&LumatoneEditor::StatusListener::connectionLost);
+        //else
+        //    statusListeners.call(&LumatoneEditor::StatusListener::connectionFailed);
+    }
+}
+
+FirmwareSupport::Error LumatoneEventManager::handleOctaveConfigResponse(
+    const juce::MidiMessage& midiMessage,
+    std::function<FirmwareSupport::Error(const juce::MidiMessage&, int&, juce::uint8, int*)> unpackFunction,
+    std::function<void(int, void*)> callbackFunctionIfNoError)
+{
+    int boardId = -1;
+    int channelData[56];
+
+    int boardSize = getOctaveBoardSize();
+    auto errorCode = unpackFunction(midiMessage, boardId, boardSize, channelData);
+    if (errorCode == FirmwareSupport::Error::noError)
+    {
+        callbackFunctionIfNoError(boardId, channelData);
+    }
+
+    return errorCode;
+}
+
+FirmwareSupport::Error LumatoneEventManager::handleTableConfigResponse(
+    const juce::MidiMessage& midiMessage,
+    std::function<FirmwareSupport::Error(const juce::MidiMessage&, int*)> unpackFunction,
+    std::function<void(void*)> callbackFunctionIfNoError)
+{
+    int veloctiyData[128];
+    auto errorCode = unpackFunction(midiMessage, veloctiyData);
+    if (errorCode == FirmwareSupport::Error::noError)
+        callbackFunctionIfNoError(veloctiyData);
+
+    return errorCode;
+}
+
+FirmwareSupport::Error LumatoneEventManager::handleLEDConfigResponse(const juce::MidiMessage& midiMessage)
+{
+    int boardId = -1;
+    int colourData[56];
+
+    int cmd = firmwareSupport.getCommandNumber(midiMessage);
+    FirmwareSupport::Error errorCode;
+
+    auto version = getLumatoneVersion();
+    auto boardSize = getOctaveBoardSize();
+
+    // Use correct unpacking function
+    if (version < LumatoneFirmware::ReleaseVersion::VERSION_1_0_11)
+    {
+        errorCode = LumatoneSysEx::unpackGetLEDConfigResponse_Version_1_0_0(midiMessage, boardId, boardSize, colourData);
+    }
+    else
+    {
+        errorCode = LumatoneSysEx::unpackGetLEDConfigResponse(midiMessage, boardId, colourData);
+    }
+
+    if (errorCode == FirmwareSupport::Error::noError)
+    {
+        int colorCode = cmd - GET_RED_LED_CONFIG;
+        firmwareListeners.call(&LumatoneEditor::FirmwareListener::octaveColourConfigReceived, boardId, colorCode, colourData);
+    }
+
+    return errorCode;
+}
+
+FirmwareSupport::Error LumatoneEventManager::handleChannelConfigResponse(const juce::MidiMessage& midiMessage)
+{
+    auto unpack = [&](const juce::MidiMessage& msg, int& boardId, juce::uint8 numKeys, int* data) {
+        auto errorCode = LumatoneSysEx::unpackGetChannelConfigResponse(msg, boardId, numKeys, data);
+        if (errorCode == FirmwareSupport::Error::noError)
+            for (int i = 0; i < numKeys; i++)
+                data[i]++; // MIDI Channels are 1-based
+        return errorCode;
+    };
+    auto callback = [&](int boardId, void* data) { firmwareListeners.call(&LumatoneEditor::FirmwareListener::octaveChannelConfigReceived, boardId, (int*)data); };
+    return handleOctaveConfigResponse(midiMessage, unpack, callback);
+}
+
+FirmwareSupport::Error LumatoneEventManager::handleNoteConfigResponse(const juce::MidiMessage& midiMessage)
+{
+    auto unpack = [&](const juce::MidiMessage& msg, int& boardId, juce::uint8 numKeys, int* data) {
+        return LumatoneSysEx::unpackGetNoteConfigResponse(msg, boardId, numKeys, data);
+    };
+    auto callback = [&](int boardId, void* data) { firmwareListeners.call(&LumatoneEditor::FirmwareListener::octaveNoteConfigReceived, boardId, (int*)data); };
+    return handleOctaveConfigResponse(midiMessage, unpack, callback);
+}
+
+FirmwareSupport::Error LumatoneEventManager::handleKeyTypeConfigResponse(const juce::MidiMessage& midiMessage)
+{
+    auto unpack = [&](const juce::MidiMessage& msg, int& boardId, juce::uint8 numKeys, int* data) {
+        return LumatoneSysEx::unpackGetTypeConfigResponse(msg, boardId, numKeys, data);
+    };
+    auto callback = [&](int boardId, void* data) { firmwareListeners.call(&LumatoneEditor::FirmwareListener::keyTypeConfigReceived, boardId, (int*)data); };
+    return handleOctaveConfigResponse(midiMessage, unpack, callback);
+}
+
+FirmwareSupport::Error LumatoneEventManager::handleVelocityConfigResponse(const juce::MidiMessage& midiMessage)
+{
+    auto unpack = [&](const juce::MidiMessage& msg, int* data) {
+        return LumatoneSysEx::unpackGetVelocityConfigResponse(msg, data);
+    };
+    auto callback = [&](void* data) { firmwareListeners.call(&LumatoneEditor::FirmwareListener::velocityConfigReceived, (int*)data); };
+    return handleTableConfigResponse(midiMessage, unpack, callback);
+}
+
+FirmwareSupport::Error LumatoneEventManager::handleAftertouchConfigResponse(const juce::MidiMessage& midiMessage)
+{
+    auto unpack = [&](const juce::MidiMessage& msg, int* data) {
+        return LumatoneSysEx::unpackGetAftertouchConfigResponse(msg, data);
+    };
+    auto callback = [&](void* data) { firmwareListeners.call(&LumatoneEditor::FirmwareListener::aftertouchConfigReceived, (int*)data); };
+    return handleTableConfigResponse(midiMessage, unpack, callback);
+}
+
+FirmwareSupport::Error LumatoneEventManager::handleVelocityIntervalConfigResponse(const juce::MidiMessage& midiMessage)
+{
+    auto unpack = [&](const juce::MidiMessage& msg, int* data) {
+        return LumatoneSysEx::unpackGetVelocityIntervalConfigResponse(msg, data);
+    };
+    auto callback = [&](void* data) { firmwareListeners.call(&LumatoneEditor::FirmwareListener::velocityIntervalConfigReceived, (int*)data); };
+    return handleTableConfigResponse(midiMessage, unpack, callback);
+}
+
+FirmwareSupport::Error LumatoneEventManager::handleFaderConfigResponse(const juce::MidiMessage& midiMessage)
+{
+    auto unpack = [&](const juce::MidiMessage& msg, int* data) {
+        return LumatoneSysEx::unpackGetFaderConfigResponse(msg, data);
+    };
+    auto callback = [&](void* data) { firmwareListeners.call(&LumatoneEditor::FirmwareListener::faderConfigReceived, (int*)data); };
+    return handleTableConfigResponse(midiMessage, unpack, callback);
+}
+
+FirmwareSupport::Error LumatoneEventManager::handleFaderTypeConfigResponse(const juce::MidiMessage& midiMessage)
+{
+    auto unpack = [&](const juce::MidiMessage& msg, int& boardId, juce::uint8 numKeys, int* data) {
+        return LumatoneSysEx::unpackGetTypeConfigResponse(msg, boardId, numKeys, data);
+    };
+    auto callback = [&](int boardId, void* data) { firmwareListeners.call(&LumatoneEditor::FirmwareListener::faderTypeConfigReceived, boardId, (int*)data); };
+    return handleOctaveConfigResponse(midiMessage, unpack, callback);
+}
+
+FirmwareSupport::Error LumatoneEventManager::handleSerialIdentityResponse(const juce::MidiMessage& midiMessage)
+{
+    int serialBytes[6];
+    auto errorCode = LumatoneSysEx::unpackGetSerialIdentityResponse(midiMessage, serialBytes);
+    if (errorCode != FirmwareSupport::Error::noError)
+        return errorCode;
+
+    firmwareListeners.call(&LumatoneEditor::FirmwareListener::serialIdentityReceived, serialBytes);
+
+    return errorCode;
+}
+
+FirmwareSupport::Error LumatoneEventManager::handleFirmwareRevisionResponse(const juce::MidiMessage& midiMessage)
+{
+    int major, minor, revision;
+    auto errorCode = LumatoneSysEx::unpackGetFirmwareRevisionResponse(midiMessage, major, minor, revision);
+    if (errorCode != FirmwareSupport::Error::noError)
+        return errorCode;
+
+    auto version = LumatoneFirmware::Version(major, minor, revision);
+    setLumatoneVersion(getFirmwareSupport().getReleaseVersion(version), true);
+
+    DBG("Firmware version is: " + version.toString());
+    firmwareListeners.call(&LumatoneEditor::FirmwareListener::firmwareRevisionReceived, version);
+
+    return FirmwareSupport::Error::noError;
+}
+
+FirmwareSupport::Error LumatoneEventManager::handleLumatouchConfigResponse(const juce::MidiMessage& midiMessage)
+{
+    auto unpack = [&](const juce::MidiMessage& msg, int* data) {
+        return LumatoneSysEx::unpackGetLumatouchConfigResponse(msg, data);
+    };
+    auto callback = [&](void* data) { firmwareListeners.call(&LumatoneEditor::FirmwareListener::lumatouchConfigReceived, (int*)data); };
+    return handleTableConfigResponse(midiMessage, unpack, callback);
+}
+
+FirmwareSupport::Error LumatoneEventManager::handlePingResponse(const juce::MidiMessage& midiMessage)
+{
+    unsigned int value = 0;
+    auto errorCode = LumatoneSysEx::unpackPingResponse(midiMessage, value);
+
+    if (errorCode != FirmwareSupport::Error::noError)
+        return errorCode;
+
+    firmwareListeners.call(&LumatoneEditor::FirmwareListener::pingResponseReceived, value);
+
+    return errorCode;
+}
+
+FirmwareSupport::Error LumatoneEventManager::handleGetPeripheralChannelResponse(const juce::MidiMessage& midiMessage)
+{
+    auto channelSettings = LumatoneFirmware::PeripheralChannelSettings();
+    auto errorCode = LumatoneSysEx::unpackGetPeripheralChannelsResponse(midiMessage,
+        channelSettings.pitchWheel,
+        channelSettings.modWheel,
+        channelSettings.expressionPedal,
+        channelSettings.sustainPedal
+    );
+
+    firmwareListeners.call(&LumatoneEditor::FirmwareListener::peripheralMidiChannelsReceived, channelSettings);
+
+    return errorCode;
+}
+
+FirmwareSupport::Error LumatoneEventManager::handleGetPresetFlagsResponse(const juce::MidiMessage& midiMessage)
+{
+    auto presetFlags = LumatoneFirmware::PresetFlags();
+    auto errorCode = LumatoneSysEx::unpackGetPresetFlagsResponse(midiMessage,
+        presetFlags.expressionPedalInverted,
+        presetFlags.lightsOnKeystroke,
+        presetFlags.polyphonicAftertouch,
+        presetFlags.sustainPedalInverted
+    );
+
+    firmwareListeners.call(&LumatoneEditor::FirmwareListener::presetFlagsReceived, presetFlags);
+
+    return errorCode;
+}
+
+FirmwareSupport::Error LumatoneEventManager::handleGetExpressionPedalSensitivityResponse(const juce::MidiMessage& midiMessage)
+{
+    int sensitivity = 127;
+    auto errorCode = LumatoneSysEx::unpackGetExpressionPedalSensitivityResponse(midiMessage, sensitivity);
+
+    firmwareListeners.call(&LumatoneEditor::FirmwareListener::expressionPedalSensitivityReceived, sensitivity);
+
+    return errorCode;
+}
+
+FirmwareSupport::Error LumatoneEventManager::handlePeripheralCalibrationData(const juce::MidiMessage& midiMessage)
+{
+    int mode = -1;
+    auto errorCode = LumatoneSysEx::unpackPeripheralCalibrationMode(midiMessage, mode);
+
+    if (errorCode != FirmwareSupport::Error::noError)
+        return errorCode;
+
+    switch (mode)
+    {
+    case LumatoneFirmware::PeripheralCalibrationDataMode::ExpressionPedal:
+        errorCode = handleExpressionPedalCalibrationData(midiMessage);
+        break;
+    case LumatoneFirmware::PeripheralCalibrationDataMode::PitchAndModWheels:
+        errorCode = handleWheelsCalibrationData(midiMessage);
+        break;
+    default:
+        errorCode = FirmwareSupport::Error::messageIsNotResponseToCommand;
+    }
+
+    if (errorCode != FirmwareSupport::Error::noError)
+        return errorCode;
+
+    return errorCode;
+}
+
+FirmwareSupport::Error LumatoneEventManager::handleExpressionPedalCalibrationData(const juce::MidiMessage& midiMessage)
+{
+    int minBound = 0;
+    int maxBound = 0;
+    bool isValid = false;
+
+    auto errorCode = LumatoneSysEx::unpackExpressionPedalCalibrationPayload(midiMessage, minBound, maxBound, isValid);
+
+    firmwareListeners.call(&LumatoneEditor::FirmwareListener::pedalCalibrationDataReceived, minBound, maxBound, isValid);
+
+    return errorCode;
+}
+
+FirmwareSupport::Error LumatoneEventManager::handleWheelsCalibrationData(const juce::MidiMessage& midiMessage)
+{
+    LumatoneFirmware::WheelsCalibrationData calibrationData;
+    auto errorCode = LumatoneSysEx::unpackWheelsCalibrationPayload(midiMessage,
+        calibrationData.centerPitch,
+        calibrationData.minPitch,
+        calibrationData.maxPitch,
+        calibrationData.minMod,
+        calibrationData.maxMod
+    );
+
+    firmwareListeners.call(&LumatoneEditor::FirmwareListener::wheelsCalibrationDataReceived, calibrationData);
+    return errorCode;
+}
+
+void LumatoneEventManager::handleMidiDriverError(FirmwareSupport::Error errorToHandle, int commandReceived)
+{
+    switch (errorToHandle)
+    {
+    case FirmwareSupport::Error::noError:
+    case FirmwareSupport::Error::messageIsAnEcho:
+    case FirmwareSupport::Error::commandNotImplemented:
+        return;
+
+    // case FirmwareSupport::Error::messageHasInvalidStatusByte:
+    //     return;
+
+    case FirmwareSupport::Error::deviceIsBusy:
+        DBG("DEVICE IS BUSY from command " + juce::String::toHexString(commandReceived));
+        return;
+
+    default:
+        DBG("ERROR from command " + juce::String::toHexString(commandReceived) + ": " + firmwareSupport.errorToString(errorToHandle));
+    }
+
+    jassertfalse;
+}
+
+
+FirmwareSupport::Error LumatoneEventManager::getBufferErrorCode(const juce::uint8* sysExData)
+{
+    switch (sysExData[MSG_STATUS])
+    {
+    case LumatoneFirmware::ReturnCode::NACK:  // Not recognized
+        //errorVisualizer.setErrorLevel(
+        //    LumatoneFirmwareDriver::ErrorLevel::error,
+        //    "Not Recognized");
+        return FirmwareSupport::Error::unknownCommand;
+        break;
+
+    case LumatoneFirmware::ReturnCode::ACK:  // Acknowledged, OK
+        //errorVisualizer.setErrorLevel(
+        //    LumatoneFirmwareDriver::ErrorLevel::noError,
+        //    "Ack");
+        break;
+
+    case LumatoneFirmware::ReturnCode::BUSY: // Controller busy
+        //errorVisualizer.setErrorLevel(
+        //    LumatoneFirmwareDriver::ErrorLevel::warning,
+        //    "Busy");
+        return FirmwareSupport::Error::deviceIsBusy;
+        break;
+
+    case LumatoneFirmware::ReturnCode::ERROR:    // Error
+        //errorVisualizer.setErrorLevel(
+        //    LumatoneFirmwareDriver::ErrorLevel::error,
+        //    "Error from device");
+        return FirmwareSupport::Error::externalError;
+        break;
+
+    case TEST_ECHO:
+        return FirmwareSupport::Error::messageIsAnEcho;
+        break;
+
+    default:
+        //errorVisualizer.setErrorLevel(
+        //    LumatoneFirmwareDriver::ErrorLevel::noError,
+        //    "");
+        break;
+    }
+
+    return FirmwareSupport::Error::noError;
+}
+
+FirmwareSupport::Error LumatoneEventManager::handleBufferCommand(const juce::MidiMessage& midiMessage)
+{
+    auto sysExData = midiMessage.getSysExData();
+    unsigned int cmd = sysExData[CMD_ID];
+
+    switch (cmd)
+    {
+    case GET_RED_LED_CONFIG:
+        return handleLEDConfigResponse(midiMessage);
+
+    case GET_GREEN_LED_CONFIG:
+        return handleLEDConfigResponse(midiMessage);
+
+    case GET_BLUE_LED_CONFIG:
+        return handleLEDConfigResponse(midiMessage);
+
+    case GET_CHANNEL_CONFIG:
+        return handleChannelConfigResponse(midiMessage);
+
+    case GET_NOTE_CONFIG:
+        return handleNoteConfigResponse(midiMessage);
+
+    case GET_KEYTYPE_CONFIG:
+        return handleKeyTypeConfigResponse(midiMessage);
+
+        // TODO
+
+    case GET_VELOCITY_CONFIG:
+        return handleVelocityConfigResponse(midiMessage);
+
+    case GET_FADER_TYPE_CONFIGURATION:
+        return handleFaderTypeConfigResponse(midiMessage);
+
+    case GET_SERIAL_IDENTITY:
+        return handleSerialIdentityResponse(midiMessage);
+
+    case CALIBRATE_PITCH_MOD_WHEEL:
+        firmwareListeners.call(&LumatoneEditor::FirmwareListener::calibratePitchModWheelAnswer, (LumatoneFirmware::ReturnCode)sysExData[MSG_STATUS]);
+        return FirmwareSupport::Error::noError;
+
+    case GET_LUMATOUCH_CONFIG:
+        return handleLumatouchConfigResponse(midiMessage);
+
+    case GET_FIRMWARE_REVISION:
+        return handleFirmwareRevisionResponse(midiMessage);
+
+    case LUMA_PING:
+        return handlePingResponse(midiMessage);
+
+    case GET_PERIPHERAL_CHANNELS:
+        return handleGetPeripheralChannelResponse(midiMessage);
+
+    case PERIPHERAL_CALBRATION_DATA:
+        return handlePeripheralCalibrationData(midiMessage);
+
+    case GET_PRESET_FLAGS:
+        return handleGetPresetFlagsResponse(midiMessage);
+
+    case GET_EXPRESSION_PEDAL_SENSITIVIY:
+        return handleGetExpressionPedalSensitivityResponse(midiMessage);
+
+    case SET_VELOCITY_CONFIG:
+        DBG("Send layout complete.");
+        // loadRandomMapping(1000, 1); // uncomment for test sequence
+        return FirmwareSupport::Error::noError;
+
+    default:
+        jassert(sysExData[MSG_STATUS] == LumatoneFirmware::ReturnCode::ACK);
+        if (midiMessage.getRawDataSize() <= 8)
+        {
+            // Simple confirmation
+            return FirmwareSupport::Error::noError;
+        }
+        else
+        {
+            // Returned data
+            DBG("WARNING: UNIMPLEMENTED RESPONSE HANDLING CMD " + juce::String(sysExData[CMD_ID]));
+            return FirmwareSupport::Error::commandNotImplemented;
+        }
+    }
+
+    return FirmwareSupport::Error::unknownCommand;
+}
+
+void LumatoneEventManager::timerCallback()
+{
+    stopTimer();
+
+    juce::MidiBuffer readBuffer;
+    removeNextBlockOfMessages(readBuffer, bufferReadSize);
+    for (auto event : readBuffer)
+    {
+        bool configMsg = false;
+        auto midiMessage = event.getMessage();
+        if (midiMessage.isSysEx())
+        {
+            auto sysExData = midiMessage.getSysExData();
+            auto cmd = sysExData[CMD_ID];
+
+            configMsg = cmd < 0x2;
+            
+            
+            #if JUCE_DEBUG
+                if (verbose > 1)
+                    DBG("READ: " + midiMessage.getDescription());
+            #endif
+
+            auto errorCode = getBufferErrorCode(sysExData);
+            handleMidiDriverError(errorCode, cmd);
+
+            if (sysExData[MSG_STATUS] == 1)
+            {
+                errorCode = handleBufferCommand(midiMessage);
+                handleMidiDriverError(errorCode, cmd);
+            }
+        }
+
+        // Ignore non-sysex messages
+    }
+
+    auto bufferSize = juce::jlimit(0, 999999, readQueueSize.load() - bufferReadSize);
+    readQueueSize.store(bufferSize);
+
+    if (bufferSize != 0)
+        startTimer(bufferReadTimeoutMs);
+
+    bufferReadRequested = false;
+}
diff --git a/Source/lumatone_editor_library/device/lumatone_event_manager.h b/Source/lumatone_editor_library/device/lumatone_event_manager.h
new file mode 100644
index 00000000..1fd7f745
--- /dev/null
+++ b/Source/lumatone_editor_library/device/lumatone_event_manager.h
@@ -0,0 +1,137 @@
+/*
+  ==============================================================================
+
+    lumatone_event_manager.h
+    Created: 5 Jun 2023 8:19:04pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#pragma once
+
+#include "../listeners/status_listener.h"
+#include "../listeners/firmware_listener.h"
+#include "../midi/lumatone_midi_state.h"
+
+#include "../lumatone_midi_driver/firmware_driver_listener.h"
+
+class LumatoneFirmwareDriver;
+
+class LumatoneEventManager : private LumatoneFirmwareDriverListener,
+                             public LumatoneMidiState,
+                             public LumatoneState,
+                             private juce::Timer
+{
+
+public:
+
+    LumatoneEventManager(LumatoneFirmwareDriver& midiDriver, const LumatoneState& stateIn);
+    ~LumatoneEventManager() override;
+
+private:
+
+    void timerCallback() override;
+
+protected:
+    //============================================================================
+    // Implementation of LumatoneFirmwareDriver::Listener
+
+    virtual void midiMessageReceived(juce::MidiInput* source, const juce::MidiMessage& midiMessage) override;
+    virtual void midiMessageSent(juce::MidiOutput* target, const juce::MidiMessage& midiMessage) override;
+    virtual void midiSendQueueSize(int queueSize) override;
+    //virtual void generalLogMessage(juce::String textMessage, HajuErrorVisualizer::ErrorLevel errorLevel) override;
+    virtual void noAnswerToMessage(juce::MidiDeviceInfo expectedDevice, const juce::MidiMessage& midiMessage) override;
+
+private:
+    juce::ListenerList<LumatoneEditor::FirmwareListener> firmwareListeners;
+public:
+    void    addFirmwareListener(LumatoneEditor::FirmwareListener* listenerIn) { firmwareListeners.add(listenerIn); }
+    void removeFirmwareListener(LumatoneEditor::FirmwareListener* listenerIn) { firmwareListeners.remove(listenerIn); }
+
+//private:
+//    ListenerList<MidiListener> midiListeners;
+//public:
+//    void    addMidiListener(MidiListener* listenerIn) { midiListeners.add(listenerIn); }
+//    void removeMidiListener(MidiListener* listenerIn) { midiListeners.remove(listenerIn); }
+
+private:
+    //============================================================================
+    // Lower-level message unpacking and handling
+
+    FirmwareSupport::Error handleOctaveConfigResponse(
+        const juce::MidiMessage& midiMessage,
+        std::function <FirmwareSupport::Error(const juce::MidiMessage&, int&, juce::uint8, int*)> unpackFunction,
+        std::function <void(int, void*)> callbackFunctionIfNoError = {}
+    );
+
+    FirmwareSupport::Error handleTableConfigResponse(
+        const juce::MidiMessage& midiMessage,
+        std::function<FirmwareSupport::Error(const juce::MidiMessage&, int*)> unpackFunction,
+        std::function <void(void*)> callbackFunctionIfNoError = {}
+    );
+
+    FirmwareSupport::Error handleLEDConfigResponse(const juce::MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handleChannelConfigResponse(const juce::MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handleNoteConfigResponse(const juce::MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handleKeyTypeConfigResponse(const juce::MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handleVelocityConfigResponse(const juce::MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handleAftertouchConfigResponse(const juce::MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handleVelocityIntervalConfigResponse(const juce::MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handleFaderConfigResponse(const juce::MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handleFaderTypeConfigResponse(const juce::MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handleSerialIdentityResponse(const juce::MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handleFirmwareRevisionResponse(const juce::MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handleLumatouchConfigResponse(const juce::MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handlePingResponse(const juce::MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handlePeripheralCalibrationData(const juce::MidiMessage& midiMessage);
+    FirmwareSupport::Error handleExpressionPedalCalibrationData(const juce::MidiMessage& midiMessage);
+    FirmwareSupport::Error handleWheelsCalibrationData(const juce::MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handleGetPeripheralChannelResponse(const juce::MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handleGetPresetFlagsResponse(const juce::MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handleGetExpressionPedalSensitivityResponse(const juce::MidiMessage& midiMessage);
+
+    void handleMidiDriverError(FirmwareSupport::Error errorToHandle, int commandReceived = -1);
+
+    // Buffer read helpers
+    FirmwareSupport::Error getBufferErrorCode(const juce::uint8* sysExData);
+    FirmwareSupport::Error handleBufferCommand(const juce::MidiMessage& midiMessage);
+
+private:
+    //void confirmAutoConnection();
+    //void onConnectionConfirm(bool sendChangeSignal);
+    //void onDisconnection();
+    //void onFirmwareUpdateReceived();
+
+private:
+    LumatoneFirmwareDriver&         midiDriver;
+
+    FirmwareSupport             firmwareSupport;
+
+
+    const int                   bufferReadTimeoutMs = 30;
+    const int                   bufferReadSize = 16;
+    bool                        bufferReadRequested = false;
+
+    std::atomic<int>            readQueueSize;
+    int                         sendQueueSize = 0;
+
+    
+    int                         verbose = 0;
+};
diff --git a/Source/lumatone_assets.h b/Source/lumatone_editor_library/graphics/lumatone_assets.h
similarity index 53%
rename from Source/lumatone_assets.h
rename to Source/lumatone_editor_library/graphics/lumatone_assets.h
index 2040fd97..5cb3c09f 100644
--- a/Source/lumatone_assets.h
+++ b/Source/lumatone_editor_library/graphics/lumatone_assets.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef LUMATONE_ASSETS_H
+#define LUMATONE_ASSETS_H
 
 #include <JuceHeader.h>
 
@@ -53,31 +54,38 @@ namespace LumatoneAssets
         switch (assetId)
         {
         case LumatoneAssets::ID::LumatoneGraphic:
-            juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyboardBase_png,   BinaryData::KeyboardBase_pngSize),   (juce::int64)LumatoneAssets::HashCodes::LumatoneGraphic_1x);
-            juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyboardBase2x_png, BinaryData::KeyboardBase2x_pngSize), (juce::int64)LumatoneAssets::HashCodes::LumatoneGraphic_2x);
-            juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyboardBase4x_png, BinaryData::KeyboardBase4x_pngSize), (juce::int64)LumatoneAssets::HashCodes::LumatoneGraphic_4x);
-            juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyboardBase8x_png, BinaryData::KeyboardBase8x_pngSize), (juce::int64)LumatoneAssets::HashCodes::LumatoneGraphic_8x);
+            if (juce::ImageCache::getFromHashCode((juce::int64)LumatoneAssets::HashCodes::LumatoneGraphic_1x).isNull())
+                juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyboardBase_png,   BinaryData::KeyboardBase_pngSize),   (juce::int64)LumatoneAssets::HashCodes::LumatoneGraphic_1x);
+            if (juce::ImageCache::getFromHashCode((juce::int64)LumatoneAssets::HashCodes::LumatoneGraphic_2x).isNull())
+                juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyboardBase2x_png, BinaryData::KeyboardBase2x_pngSize), (juce::int64)LumatoneAssets::HashCodes::LumatoneGraphic_2x);
+            if (juce::ImageCache::getFromHashCode((juce::int64)LumatoneAssets::HashCodes::LumatoneGraphic_4x).isNull())
+                juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyboardBase4x_png, BinaryData::KeyboardBase4x_pngSize), (juce::int64)LumatoneAssets::HashCodes::LumatoneGraphic_4x);
+            if (juce::ImageCache::getFromHashCode((juce::int64)LumatoneAssets::HashCodes::LumatoneGraphic_8x).isNull())
+                juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyboardBase8x_png, BinaryData::KeyboardBase8x_pngSize), (juce::int64)LumatoneAssets::HashCodes::LumatoneGraphic_8x);
             break;
 
-        // case LumatoneAssets::ID::KeybedShadows:
-        //     juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeybedShadows_png,   BinaryData::KeybedShadows_pngSize),   (juce::int64)LumatoneAssets::HashCodes::KeybedShadows_1x);
-        //     juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeybedShadows2x_png, BinaryData::KeybedShadows2x_pngSize), (juce::int64)LumatoneAssets::HashCodes::KeybedShadows_2x);
-        //     juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeybedShadows4x_png, BinaryData::KeybedShadows4x_pngSize), (juce::int64)LumatoneAssets::HashCodes::KeybedShadows_4x);
-        //     juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeybedShadows8x_png, BinaryData::KeybedShadows8x_pngSize), (juce::int64)LumatoneAssets::HashCodes::KeybedShadows_8x);
-        //     break;
-
         case LumatoneAssets::ID::KeyShape:
-            juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyShape_png,   BinaryData::KeyShape_pngSize),   (juce::int64)LumatoneAssets::HashCodes::KeyShape_1x);
-            juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyShape2x_png, BinaryData::KeyShape2x_pngSize), (juce::int64)LumatoneAssets::HashCodes::KeyShape_2x);
-            juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyShape4x_png, BinaryData::KeyShape4x_pngSize), (juce::int64)LumatoneAssets::HashCodes::KeyShape_4x);
-            juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyShape8x_png, BinaryData::KeyShape8x_pngSize), (juce::int64)LumatoneAssets::HashCodes::KeyShape_8x);
+            if (juce::ImageCache::getFromHashCode((juce::int64)LumatoneAssets::HashCodes::KeyShape_1x).isNull())
+                juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyShape_png,   BinaryData::KeyShape_pngSize),   (juce::int64)LumatoneAssets::HashCodes::KeyShape_1x);
+            if (juce::ImageCache::getFromHashCode((juce::int64)LumatoneAssets::HashCodes::KeyShape_2x).isNull())
+                juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyShape2x_png, BinaryData::KeyShape2x_pngSize), (juce::int64)LumatoneAssets::HashCodes::KeyShape_2x);
+            if (juce::ImageCache::getFromHashCode((juce::int64)LumatoneAssets::HashCodes::KeyShape_4x).isNull())
+                juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyShape4x_png, BinaryData::KeyShape4x_pngSize), (juce::int64)LumatoneAssets::HashCodes::KeyShape_4x);
+            if (juce::ImageCache::getFromHashCode((juce::int64)LumatoneAssets::HashCodes::KeyShape_8x).isNull())
+                juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyShape8x_png, BinaryData::KeyShape8x_pngSize), (juce::int64)LumatoneAssets::HashCodes::KeyShape_8x);
             break;
 
         case LumatoneAssets::ID::KeyShadow:
-            juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyShadow_png,   BinaryData::KeyShadow_pngSize),  (juce::int64)LumatoneAssets::HashCodes::KeyShadow_1x);
-            juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyShadow2x_png, BinaryData::KeyShadow2x_pngSize), (juce::int64)LumatoneAssets::HashCodes::KeyShadow_2x);
-            juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyShadow4x_png, BinaryData::KeyShadow4x_pngSize), (juce::int64)LumatoneAssets::HashCodes::KeyShadow_4x);
-            juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyShadow8x_png, BinaryData::KeyShadow8x_pngSize), (juce::int64)LumatoneAssets::HashCodes::KeyShadow_8x);
+            {
+            if (juce::ImageCache::getFromHashCode((juce::int64)LumatoneAssets::HashCodes::KeyShadow_1x).isNull())
+                juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyShadow_png, BinaryData::KeyShadow_pngSize), (juce::int64)LumatoneAssets::HashCodes::KeyShadow_1x);
+            if (juce::ImageCache::getFromHashCode((juce::int64)LumatoneAssets::HashCodes::KeyShadow_2x).isNull())
+                juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyShadow2x_png, BinaryData::KeyShadow2x_pngSize), (juce::int64)LumatoneAssets::HashCodes::KeyShadow_2x);
+            if (juce::ImageCache::getFromHashCode((juce::int64)LumatoneAssets::HashCodes::KeyShadow_4x).isNull())
+                juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyShadow4x_png, BinaryData::KeyShadow4x_pngSize), (juce::int64)LumatoneAssets::HashCodes::KeyShadow_4x);
+            if (juce::ImageCache::getFromHashCode((juce::int64)LumatoneAssets::HashCodes::KeyShadow_8x).isNull())
+                juce::ImageCache::addImageToCache(juce::ImageCache::getFromMemory(BinaryData::KeyShadow8x_png, BinaryData::KeyShadow8x_pngSize), (juce::int64)LumatoneAssets::HashCodes::KeyShadow_8x);
+            }
             break;
 
         default:
@@ -87,25 +95,25 @@ namespace LumatoneAssets
 
     enum class LumatoneGraphicRenderSize
     {
-        _1x = 0x00,
-        _2x = 0x01,
-        _4x = 0x02,
-        _8x = 0x03
+        _1x =   0x00,
+        _2x =   0x01,
+        _4x =   0x02,
+        _8x =   0x03
     };
 
     static int LumatoneKeyboardRenderWidth(LumatoneAssets::LumatoneGraphicRenderSize size)
     {
         switch (size)
         {
-        default:
-        case LumatoneGraphicRenderSize::_1x:
-            return 530;
-        case LumatoneGraphicRenderSize::_2x:
-            return 1060;
-        case LumatoneGraphicRenderSize::_4x:
-            return 2121;
-        case LumatoneGraphicRenderSize::_8x:
-            return 4241;
+            default:
+            case LumatoneGraphicRenderSize::_1x:
+                return 530;
+            case LumatoneGraphicRenderSize::_2x:
+                return 1060;
+            case LumatoneGraphicRenderSize::_4x:
+                return 2121;
+            case LumatoneGraphicRenderSize::_8x:
+                return 4241;
         }
     }
 
@@ -113,15 +121,15 @@ namespace LumatoneAssets
     {
         switch (size)
         {
-        default:
-        case LumatoneGraphicRenderSize::_1x:
-            return 212;
-        case LumatoneGraphicRenderSize::_2x:
-            return 424;
-        case LumatoneGraphicRenderSize::_4x:
-            return 849;
-        case LumatoneGraphicRenderSize::_8x:
-            return 1697;
+            default:
+            case LumatoneGraphicRenderSize::_1x:
+                return 212;
+            case LumatoneGraphicRenderSize::_2x:
+                return 424;
+            case LumatoneGraphicRenderSize::_4x:
+                return 849;
+            case LumatoneGraphicRenderSize::_8x:
+                return 1697;
         }
     }
 
@@ -139,6 +147,8 @@ namespace LumatoneAssets
 
     static juce::Image getImage(LumatoneAssets::ID assetId, int height = 0, int width = 0)
     {
+        LoadAssets(assetId);
+
         switch (assetId)
         {
         case LumatoneAssets::ID::LumatoneGraphic:
@@ -189,3 +199,5 @@ namespace LumatoneAssets
         }
     }
 }
+
+#endif LUMATONE_ASSETS_H
diff --git a/Source/lumatone_render.cpp b/Source/lumatone_editor_library/graphics/lumatone_render.cpp
similarity index 77%
rename from Source/lumatone_render.cpp
rename to Source/lumatone_editor_library/graphics/lumatone_render.cpp
index 4e3554a4..60f27a9f 100644
--- a/Source/lumatone_render.cpp
+++ b/Source/lumatone_editor_library/graphics/lumatone_render.cpp
@@ -1,26 +1,21 @@
 #include "lumatone_render.h"
-#include "Main.h"
+#include "../color/colour_model.h"
 
-LumatoneRender::LumatoneRender()
+LumatoneRender::LumatoneRender(const LumatoneApplicationState& stateIn)
+    : LumatoneApplicationState("LumatoneRender", stateIn)
 {
     imageProcessor.reset(new ImageProcessor());
-
-    LumatoneAssets::LoadAssets(LumatoneAssets::ID::LumatoneGraphic);
-    LumatoneAssets::LoadAssets(LumatoneAssets::ID::KeyShape);
-    LumatoneAssets::LoadAssets(LumatoneAssets::ID::KeyShadow);
 }
 
-LumatoneRender::~LumatoneRender() 
-{ 
+LumatoneRender::~LumatoneRender()
+{
     imageProcessor = nullptr;
 }
 
 void LumatoneRender::resetOctaveSize()
 {
-    auto numBoards = TerpstraSysExApplication::getApp().getNumBoards();
-    auto octaveSize = TerpstraSysExApplication::getApp().getOctaveBoardSize();
-    lumatoneGeometry = LumatoneGeometry(GetLumatoneBoardSize(octaveSize));
-    
+    lumatoneGeometry = LumatoneGeometry(GetLumatoneBoardSize(getOctaveBoardSize()));
+
     // tilingGeometry.setColumnAngle(LUMATONEGRAPHICCOLUMNANGLE);
     // tilingGeometry.setRowAngle(LUMATONEGRAPHICROWANGLE);
 
@@ -29,12 +24,12 @@ void LumatoneRender::resetOctaveSize()
     oct5Key7 = juce::Point<float>(oct5Key7X, oct5Key7Y);
 
     tilingGeometry.fitSkewedTiling(oct1Key1, oct1Key56, 10, oct5Key7, 24, true);
-    keyCentres = tilingGeometry.getHexagonCentresSkewed(lumatoneGeometry, 0, numBoards);
+    keyCentres = tilingGeometry.getHexagonCentresSkewed(lumatoneGeometry, 0, getNumBoards());
 }
 
 juce::Array<juce::Point<float>> LumatoneRender::getKeyCentres()
 {
-    return tilingGeometry.getHexagonCentresSkewed(lumatoneGeometry, 0, TerpstraSysExApplication::getApp().getNumBoards());
+    return tilingGeometry.getHexagonCentresSkewed(lumatoneGeometry, 0, getNumBoards());
 }
 
 void LumatoneRender::render(LumatoneAssets::LumatoneGraphicRenderSize maxRenderSize)
@@ -45,7 +40,7 @@ void LumatoneRender::render(LumatoneAssets::LumatoneGraphicRenderSize maxRenderS
     int keyWidth = juce::roundToInt(width * keyW);
     int keyHeight = juce::roundToInt(height * keyH);
 
-    juce::Image renderImage = juce::Image(juce::Image::PixelFormat::ARGB, width, height, false);
+    juce::Image renderImage = juce::Image(juce::Image::PixelFormat::ARGB, width, height, true);
     juce::Graphics g(renderImage);
 
     g.drawImageAt(LumatoneAssets::getImage(LumatoneAssets::ID::LumatoneGraphic, height, width), 0, 0);
@@ -53,16 +48,14 @@ void LumatoneRender::render(LumatoneAssets::LumatoneGraphicRenderSize maxRenderS
     auto shapeLayer = LumatoneAssets::getImage(LumatoneAssets::ID::KeyShape, keyHeight, keyWidth);
     auto shadowLayer = LumatoneAssets::getImage(LumatoneAssets::ID::KeyShadow, keyHeight, keyWidth);
 
-    auto numBoards = TerpstraSysExApplication::getApp().getNumBoards();
-    auto octaveSize = TerpstraSysExApplication::getApp().getOctaveBoardSize();
-    LumatoneColourModel* colourModel = TerpstraSysExApplication::getApp().getColourModel();
+    LumatoneColourModel* colourModel = getColourModel();
 
     int keyNum = 0;
-    for (int boardIndex = 0; boardIndex < numBoards; boardIndex++)
+    for (int boardIndex = 0; boardIndex < getNumBoards(); boardIndex++)
     {
-        for (int keyIndex = 0; keyIndex < octaveSize; keyIndex++)
+        for (int keyIndex = 0; keyIndex < getOctaveBoardSize(); keyIndex++)
         {
-            juce::Colour keyColour = TerpstraSysExApplication::getApp().getMappingData()->readKey(boardIndex, keyIndex)->colour;
+            juce::Colour keyColour = getKey(boardIndex, keyIndex).getColour();
             keyColour = colourModel->getModelColour(keyColour);
 
             juce::Point<int> keyPos = juce::Point<int>(
@@ -124,9 +117,9 @@ juce::Image LumatoneRender::getResizedRender(int targetWidth, int targetHeight)
 {
     if (targetWidth == 0 || targetHeight == 0)
         return juce::Image();
-        
+
     LumatoneAssets::LumatoneGraphicRenderSize size = LumatoneAssets::GetLumatoneRenderSize(targetWidth, targetHeight);
-    
+
     juce::Image baseRender = renders[(int)size];
 
     if (baseRender.isNull())
@@ -134,6 +127,6 @@ juce::Image LumatoneRender::getResizedRender(int targetWidth, int targetHeight)
 
     if (baseRender.getWidth() == targetWidth && baseRender.getHeight() == targetHeight)
         return baseRender;
-    
+
     return imageProcessor->resizeImage(baseRender, targetWidth, targetHeight);
 }
diff --git a/Source/lumatone_render.h b/Source/lumatone_editor_library/graphics/lumatone_render.h
similarity index 79%
rename from Source/lumatone_render.h
rename to Source/lumatone_editor_library/graphics/lumatone_render.h
index 1237a570..0626c888 100644
--- a/Source/lumatone_render.h
+++ b/Source/lumatone_editor_library/graphics/lumatone_render.h
@@ -1,13 +1,17 @@
-#pragma once
+#ifndef LUMATONE_GRAPHICS_RENDER_H
+#define LUMATONE_GRAPHICS_RENDER_H
 
-#include "lumatone_tiling.h"
-#include "lumatone_assets.h"
-#include "ImageResampling/ImageResampler.h"
+#include "./lumatone_assets.h"
 
-class LumatoneRender
+#include "../data/application_state.h"
+#include "../mapping/lumatone_tiling.h"
+
+#include "../graphics/resampler/image_resampler.h"
+
+class LumatoneRender : private LumatoneApplicationState
 {
 public:
-    LumatoneRender();
+    LumatoneRender(const LumatoneApplicationState& stateIn);
     ~LumatoneRender();
 
     LumatoneGeometry& getLumatoneGeometry() { return lumatoneGeometry; }
@@ -58,3 +62,5 @@ class LumatoneRender
     juce::Point<float> oct1Key56;
     juce::Point<float>  oct5Key7;
 };
+
+#endif LUMATONE_GRAPHICS_RENDER_H
diff --git a/Source/ImageResampling/ImageResampler.h b/Source/lumatone_editor_library/graphics/resampler/image_resampler.h
similarity index 86%
rename from Source/ImageResampling/ImageResampler.h
rename to Source/lumatone_editor_library/graphics/resampler/image_resampler.h
index ee28b1ae..9637ddac 100644
--- a/Source/ImageResampling/ImageResampler.h
+++ b/Source/lumatone_editor_library/graphics/resampler/image_resampler.h
@@ -1,7 +1,7 @@
 /*
   ==============================================================================
 
-    ImageResampler.h
+    image_resampler.h
 
   ==============================================================================
 */
@@ -19,7 +19,7 @@ class ImageProcessor
     ImageProcessor() {};
     ~ImageProcessor() {};
 
-    juce::Image resizeImage(const Image& src, int widthOut, int heightOut, String filter_name = "lanczos3", float source_gamma = 1.0f)
+    juce::Image resizeImage(const juce::Image& src, int widthOut, int heightOut, juce::String filter_name = "lanczos3", float source_gamma = 1.0f)
     {
         return resizeImageGeldreich(src, widthOut, heightOut, filter_name.getCharPointer(), source_gamma);
     }
@@ -28,7 +28,7 @@ class ImageProcessor
 private:
 
     // Source : https://forum.juce.com/t/problems-with-downsampling-images/9408/4
-    juce::Image resizeImageGeldreich(const Image& src, int dst_width, int dst_height, const char* filter_name, float source_gamma)
+    juce::Image resizeImageGeldreich(const juce::Image& src, int dst_width, int dst_height, const char* filter_name, float source_gamma)
     {
         int n = 1;
         if (src.isRGB()) n = 3; else if (src.isARGB()) n = 4; else jassert(src.isSingleChannel());
@@ -38,10 +38,10 @@ class ImageProcessor
 
         if (std::max(src_width, src_height) > RESAMPLER_MAX_DIMENSION || n > max_components) {
             printf("Image is too large!\n");
-            return Image();
+            return juce::Image();
         }
 
-        Image dest(src.getFormat(), dst_width, dst_height, false);
+        juce::Image dest(src.getFormat(), dst_width, dst_height, false);
 
         // Filter scale - values < 1.0 cause aliasing, but create sharper looking mips.
         const float filter_scale = 1.0f;//.75f;
@@ -76,8 +76,8 @@ class ImageProcessor
             samples[i].resize(src_width);
         }
 
-        Image::BitmapData bm_src(src, Image::BitmapData::readOnly);
-        Image::BitmapData bm_dst(dest, Image::BitmapData::writeOnly);
+        juce::Image::BitmapData bm_src(src, juce::Image::BitmapData::readOnly);
+        juce::Image::BitmapData bm_dst(dest, juce::Image::BitmapData::writeOnly);
 
         int dst_y = 0;
 
@@ -87,7 +87,7 @@ class ImageProcessor
             const unsigned char* pSrc = bm_src.getLinePointer(src_y);
             for (int x = 0; x < src_width; x++) {
                 if (n == 4) {
-                    PixelARGB& p = (PixelARGB&)(*pSrc);
+                    juce::PixelARGB& p = (juce::PixelARGB&)(*pSrc);
                     p.unpremultiply();
                     samples[0][x] = srgb_to_linear[p.getBlue()];
                     samples[1][x] = srgb_to_linear[p.getGreen()];
@@ -105,7 +105,7 @@ class ImageProcessor
             for (int c = 0; c < n; c++) {
                 if (!resamplers[c]->put_line(&samples[c][0])) {
                     printf("Out of memory!\n");
-                    return Image();
+                    return juce::Image();
                 }
             }
             for (; ; ) {
@@ -137,7 +137,7 @@ class ImageProcessor
                     break;
 
                 if (n == 4) {
-                    PixelARGB* p = (PixelARGB*)bm_dst.getLinePointer(dst_y);
+                    juce::PixelARGB* p = (juce::PixelARGB*)bm_dst.getLinePointer(dst_y);
                     for (int x = 0; x < dst_width; x++) {
                         p[x].premultiply();
                     }
diff --git a/Source/ImageResampling/resampler.cpp b/Source/lumatone_editor_library/graphics/resampler/resampler.cpp
similarity index 100%
rename from Source/ImageResampling/resampler.cpp
rename to Source/lumatone_editor_library/graphics/resampler/resampler.cpp
diff --git a/Source/ImageResampling/resampler.h b/Source/lumatone_editor_library/graphics/resampler/resampler.h
similarity index 100%
rename from Source/ImageResampling/resampler.h
rename to Source/lumatone_editor_library/graphics/resampler/resampler.h
diff --git a/Source/ViewConstants.h b/Source/lumatone_editor_library/graphics/view_constants.h
similarity index 92%
rename from Source/ViewConstants.h
rename to Source/lumatone_editor_library/graphics/view_constants.h
index e037033a..32fd4ab8 100644
--- a/Source/ViewConstants.h
+++ b/Source/lumatone_editor_library/graphics/view_constants.h
@@ -1,56 +1,59 @@
-/*
-  ==============================================================================
-
-    ViewConstants.h
-    Created: 19 Jun 2014 7:23:25pm
-    Author:  hsstraub
-
-  ==============================================================================
-*/
-
-#pragma once
-
-// General constants
-#define STANDARDLABELHEIGTH 15
-
-// Main window
-#define DEFAULTMAINWINDOWWIDTH 868
-#define DEFAULTMAINWINDOWHEIGHT 768
-#define DEFAULTMAINWINDOWASPECT 1.13f
-
-// Key set fields
-#define TERPSTRAKEYSETVERTICALRIM 12
-#define MINIMALTERPSTRAKEYSETAREAHEIGHT 30
-
-#define OCTAVEBOARDTABHEIGHT 30
-
-// All keys overview
-#define LUMATONEGRAPHICCOLUMNANGLE -0.30404
-#define LUMATONEGRAPHICROWANGLE 0.809175
-
-// Single key fields
-#define TERPSTRASINGLEKEYFIELDRIMABOVE 24
-#define TERPSTRASINGLEKEYFIELDRIMLEFT 16
-#define TERPSTRASINGLEKEYFLDSIZE 50
-#define TERPSTRASINGLEKEYFLDLINEWIDTH 2.0f
-#define TERPSTRASELECTEDKEYFLDLINEWIDTH 3.0f
-#define TERPSTRASINGLEKEYFLDMARGIN 1.5f
-#define TERPSTRASINGLEKEYROTATIONANGLE -0.25f
-#define TERPSTRASINGLEKEYCOLOURHIGHLIGHTEDALPHA 0.9f
-#define TERPSTRASINGLEKEYCOLOURALPHA 0.8f
-#define TERPSTRASINGLEKEYCOLOURUNSELECTEDMINIALPHA 0.6f
-
-#define TERPSTRASINGLEKEYLABELSIZE 0.8f;
-
-// Edit area
-#define NOTEASSIGNSUBWINTOP 44
-#define NOTEASSIGNSUBWINHEIGHT 352
-#define MAPPINGSUBWINTOP 88
-#define MAPPINGSUBWINHEIGHT 128
-
-#define MINIMALCURVESAREAHEIGHT 30
-#define MINIMALCURVESAREAWIDTH 100
-#define CURVETABRIMABOVE 8
-#define BEAMTABLERIMABOVE 8
-
-#define CURVEGRIDXRESOLUTION 0.02f
+/*
+  ==============================================================================
+
+    view_constants.h
+    Created: 19 Jun 2014 7:23:25pm
+    Author:  hsstraub
+
+  ==============================================================================
+*/
+
+#ifndef LUMATONE_VIEW_CONSTANTS_H
+#define LUMATONE_VIEW_CONSTANTS_H
+
+// General constants
+#define STANDARDLABELHEIGTH 15
+
+// Main window
+#define DEFAULTMAINWINDOWWIDTH 868
+#define DEFAULTMAINWINDOWHEIGHT 768
+#define DEFAULTMAINWINDOWASPECT 1.13f
+
+// Key set fields
+#define TERPSTRAKEYSETVERTICALRIM 12
+#define MINIMALTERPSTRAKEYSETAREAHEIGHT 30
+
+#define OCTAVEBOARDTABHEIGHT 30
+
+// All keys overview
+#define LUMATONEGRAPHICCOLUMNANGLE -0.30404
+#define LUMATONEGRAPHICROWANGLE 0.809175
+
+// Single key fields
+#define TERPSTRASINGLEKEYFIELDRIMABOVE 24
+#define TERPSTRASINGLEKEYFIELDRIMLEFT 16
+#define TERPSTRASINGLEKEYFLDSIZE 50
+#define TERPSTRASINGLEKEYFLDLINEWIDTH 2.0f
+#define TERPSTRASELECTEDKEYFLDLINEWIDTH 3.0f
+#define TERPSTRASINGLEKEYFLDMARGIN 1.5f
+#define TERPSTRASINGLEKEYROTATIONANGLE -0.25f
+#define TERPSTRASINGLEKEYCOLOURHIGHLIGHTEDALPHA 0.9f
+#define TERPSTRASINGLEKEYCOLOURALPHA 0.8f
+#define TERPSTRASINGLEKEYCOLOURUNSELECTEDMINIALPHA 0.6f
+
+#define TERPSTRASINGLEKEYLABELSIZE 0.8f;
+
+// Edit area
+#define NOTEASSIGNSUBWINTOP 44
+#define NOTEASSIGNSUBWINHEIGHT 352
+#define MAPPINGSUBWINTOP 88
+#define MAPPINGSUBWINHEIGHT 128
+
+#define MINIMALCURVESAREAHEIGHT 30
+#define MINIMALCURVESAREAWIDTH 100
+#define CURVETABRIMABOVE 8
+#define BEAMTABLERIMABOVE 8
+
+#define CURVEGRIDXRESOLUTION 0.02f
+
+#endif LUMATONE_VIEW_CONSTANTS_H
diff --git a/Source/hex/hex_field.cpp b/Source/lumatone_editor_library/hex/hex_field.cpp
similarity index 76%
rename from Source/hex/hex_field.cpp
rename to Source/lumatone_editor_library/hex/hex_field.cpp
index 1c9fabbe..a3bc4d1e 100644
--- a/Source/hex/hex_field.cpp
+++ b/Source/lumatone_editor_library/hex/hex_field.cpp
@@ -56,6 +56,16 @@ Hex::Point::Point(float hex_q, float hex_r)
 
 Hex::Point::Point(Hex::Cube cube) : q(cube.q), r(cube.r) { }
 
+Hex::Point Hex::Point::FromString(juce::StringRef pointStr)
+{
+    auto tks = juce::StringArray::fromTokens(pointStr, juce::String(","), juce::String());
+    if (tks.size() == 0)
+        return Point();
+    if (tks.size() == 1)
+        return Point(tks[0].getIntValue(), 0);
+    return Point(tks[0].getIntValue(), tks[1].getIntValue());
+}
+
 float Hex::Point::line(int a, int b, float t)
 {
     return a + (b - a) * t;
@@ -209,15 +219,60 @@ Hex::Point Hex::Point::stepDownQDownR(int steps_q, int steps_r)
     return Hex::Point(q - steps_q, r - steps_r);
 }
 
+Hex::Point Hex::Point::rotate60(int numRotations, Hex::Point origin)
+{
+    int rotateMod = ((numRotations % 6) + 6) % 6;
+    if (rotateMod == 0)
+        return *this;
+
+    auto vec = *this - origin;
+
+    switch (rotateMod)
+    {
+    default:
+        return *this;
+    case 1:
+        return origin + Hex::Point(-vec.r, vec.q + vec.r);
+    case 2:
+        return origin + Hex::Point(-vec.q - vec.r, vec.q);
+    case 3:
+        return origin + Hex::Point(-vec.q, -vec.r);
+    case 4:
+        return origin + Hex::Point(vec.r, -vec.q - vec.r);
+    case 5:
+        return origin + Hex::Point(vec.q + vec.r, -vec.q);
+    }
+}
+
+Hex::Point Hex::Point::rotate120(int numRotations, Hex::Point origin)
+{
+    return rotate60(numRotations * 2, origin);
+}
+
+
 juce::Array<Hex::Point> Hex::Point::ring(int distance) const
 {
     juce::Array<Hex::Point> points;
 
-    if (distance > 0) for (int d = 0; d <= distance; d++)
+    int axisLength = distance * 2;
+
+    for (int d = 0; d < distance; d++)
+    {
+        points.add(Hex::Point(q + distance - d, r + d));
+    }
+
+    if (axisLength == 0)
+        return points;
+
+    for (int i = 0; i < distance; i++)
+    {
+        points.add(points[i].rotate60(1, *this));
+    }
+
+    for (int i = 0; i < axisLength; i++)
     {
-        points.add(Hex::Point(q + distance, r - distance + d));
-        points.add(Hex::Point(q - d, r + distance));
-        points.add(Hex::Point(q - distance + d, r - d));
+        points.add(points[i].rotate120(1, *this));
+        points.add(points[i].rotate120(2, *this));
     }
 
     return points;
diff --git a/Source/hex/hex_field.h b/Source/lumatone_editor_library/hex/hex_field.h
similarity index 85%
rename from Source/hex/hex_field.h
rename to Source/lumatone_editor_library/hex/hex_field.h
index 26a693a8..2409a17e 100644
--- a/Source/hex/hex_field.h
+++ b/Source/lumatone_editor_library/hex/hex_field.h
@@ -34,7 +34,6 @@ namespace Hex
         float r = 0;
 
     private:
-
         static float line(int a, int b, float t);
 
     public:
@@ -56,9 +55,11 @@ namespace Hex
         Point(float hex_q, float hex_r);
         Point(Hex::Cube cube);
 
+        static Point FromString(juce::StringRef pointStr);
         juce::String toString() const { return juce::String(q) + "," + juce::String(r); }
 
         bool operator==(const Hex::Point& compare) const;
+        bool operator!=(const Hex::Point& compare) const { return !operator==(compare); }
 
         Hex::Point operator+(const Hex::Point& toAdd) const;
         void operator+=(const Hex::Point& toAdd);
@@ -87,9 +88,15 @@ namespace Hex
         Hex::Point stepDownQUpR(int steps_q = 1, int steps_r = 1);
         Hex::Point stepDownQDownR(int steps_q = 1, int steps_r = 1);
 
+        Hex::Point rotate60(int numRotations = 1, Hex::Point origin=Hex::Point(0,0));
+        Hex::Point rotate120(int numRotations = 1, Hex::Point origin=Hex::Point(0,0));
+
         juce::Array<Hex::Point> ring(int distance = 1) const;
         juce::Array<Hex::Point> neighbors(int maxDistance = 1) const;
 
         juce::Array<Hex::Point> lineTo(Hex::Point endPoint);
     };
+
+    template <class JuceCriticalSectionType>
+    using Matrix = juce::Array<Hex::Point, JuceCriticalSectionType>;
 }
\ No newline at end of file
diff --git a/Source/lumatone_editor_library/listeners/editor_listener.h b/Source/lumatone_editor_library/listeners/editor_listener.h
new file mode 100644
index 00000000..a29a0bd8
--- /dev/null
+++ b/Source/lumatone_editor_library/listeners/editor_listener.h
@@ -0,0 +1,83 @@
+#ifndef LUMATONE_EDITOR_EDITOR_LISTENER_H
+#define LUMATONE_EDITOR_EDITOR_LISTENER_H
+
+#include <JuceHeader.h>
+#include "../data/lumatone_context.h"
+
+namespace LumatoneEditor
+{
+
+class EditorListener
+{
+public:
+
+    virtual ~EditorListener() {}
+    
+    // App Actions
+    virtual void completeMappingLoaded(LumatoneLayout mappingData) {}
+    virtual void boardChanged(LumatoneBoard boardData) {}
+    virtual void keyChanged(int boardIndex, int keyIndex, LumatoneKey lumatoneKey) {}
+
+    virtual void selectionChanged(juce::Array<MappedLumatoneKey> selection) {}
+
+    //virtual void tableChanged(LumatoneConfigTable::TableType type, const juce::uint8* table, int tableSize) {}
+
+    virtual void contextChanged(LumatoneContext* context) {}
+
+    virtual void configTableChanged(LumatoneConfigTable::TableType type, const LumatoneConfigTable& table) {}
+
+
+    // Firmware Actions
+    virtual void keyConfigChanged(int boardIndex, int keyIndex, LumatoneKey keyData) {}
+    virtual void keyColourChanged(int boardIndex, int keyIndex, juce::Colour keyColour) {}
+    virtual void expressionPedalSensitivityChanged(unsigned char value) {}
+    virtual void invertFootControllerChanged(bool inverted) {}
+    virtual void macroButtonActiveColourChagned(juce::Colour colour) {}
+    virtual void macroButtonInactiveColourChanged(juce::Colour colour) {}
+    virtual void lightOnKeyStrokesChanged(bool lightOn) {}
+
+
+    virtual void velocityConfigSaved() {}
+    virtual void velocityConfigReset() {}
+
+    virtual void aftertouchToggled(bool enabled) {}
+    virtual void calibrateAftertouchToggled(bool active) {}
+
+    virtual void aftertouchConfigReset() {}
+
+    virtual void serialIdentityRequested() {}
+    virtual void calibrateKeysRequested() {}
+    virtual void calibratePitchModWheelToggled(bool active) {}
+
+    virtual void lumatouchConfigReset() {}
+
+    virtual void firmwareVersionRequested() {}
+    virtual void pingSent(juce::uint8 pingId) {}
+
+    virtual void peripheralChannelsChanged(int pitchWheelChannel, int modWheelChannel, int expressionChannel, int sustainChannel) {}
+    virtual void invertSustainToggled(bool inverted) {}
+
+};
+
+class EditorEmitter
+{
+protected:
+
+    juce::ListenerList<LumatoneEditor::EditorListener> editorListeners;
+
+public:
+    EditorEmitter() { }
+
+    virtual ~EditorEmitter() { editorListeners.clear(); }
+
+    virtual void addEditorListener(LumatoneEditor::EditorListener* listenerIn) { editorListeners.add(listenerIn); }
+
+    virtual void removeEditorListener(LumatoneEditor::EditorListener* listenerIn) { editorListeners.remove(listenerIn); }
+
+private:
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(EditorEmitter)
+};
+
+}
+
+#endif
diff --git a/Source/lumatone_editor_library/listeners/firmware_listener.h b/Source/lumatone_editor_library/listeners/firmware_listener.h
new file mode 100644
index 00000000..5ef13622
--- /dev/null
+++ b/Source/lumatone_editor_library/listeners/firmware_listener.h
@@ -0,0 +1,61 @@
+#ifndef LUMATONE_EDITOR_FIRMWARE_LISTENER_H
+#define LUMATONE_EDITOR_FIRMWARE_LISTENER_H
+
+#include <JuceHeader.h>
+#include "../lumatone_midi_driver/firmware_definitions.h"
+
+namespace LumatoneEditor
+{
+//============================================================================
+// Public interface for Lumatone firmware communication
+class FirmwareListener
+{
+public:
+    
+    virtual ~FirmwareListener() {}
+
+    // rgbFlag uses 0 for red, 1 for green, 2 for blue
+    virtual void octaveColourConfigReceived(int octaveIndex, juce::uint8 rgbFlag, const int* colourData) {};
+
+    virtual void octaveChannelConfigReceived(int octaveIndex, const int* channelData) {};
+
+    virtual void octaveNoteConfigReceived(int octaveIndex, const int* noteData) {};
+
+    virtual void keyTypeConfigReceived(int octaveIndex, const int* keyTypeData) {};
+
+    virtual void velocityConfigReceived(const int* velocityData) {};
+
+    virtual void aftertouchConfigReceived(const int* aftertouch) {};
+
+    virtual void velocityIntervalConfigReceived(const int* velocityData) {};
+
+    virtual void faderConfigReceived(const int* faderData) {};
+
+    virtual void faderTypeConfigReceived(int octaveIndex, const int* faderTypeData) {};
+
+    virtual void serialIdentityReceived(const int* serialBytes) {};
+    
+    virtual void calibratePitchModWheelAnswer(LumatoneFirmware::ReturnCode code) {};
+
+    virtual void lumatouchConfigReceived(const int* lumatouchData) {};
+
+    virtual void firmwareRevisionReceived(LumatoneFirmware::Version version) {};
+
+    virtual void pingResponseReceived(unsigned int pingValue) {};
+
+    virtual void peripheralMidiChannelsReceived(LumatoneFirmware::PeripheralChannelSettings channelSettings) {};
+
+    virtual void pedalCalibrationDataReceived(int minBound, int maxBound, bool pedalIsActive) {};
+
+    virtual void wheelsCalibrationDataReceived(LumatoneFirmware::WheelsCalibrationData calibrationData) {};
+
+    virtual void presetFlagsReceived(LumatoneFirmware::PresetFlags presetFlags) {};
+
+    virtual void expressionPedalSensitivityReceived(int sensitivity) {};
+
+    virtual void noAnswerToCommand(int cmd) {};
+};
+
+}
+
+#endif
diff --git a/Source/lumatone_editor_library/listeners/midi_listener.h b/Source/lumatone_editor_library/listeners/midi_listener.h
new file mode 100644
index 00000000..cc3fa20d
--- /dev/null
+++ b/Source/lumatone_editor_library/listeners/midi_listener.h
@@ -0,0 +1,91 @@
+#ifndef LUMATONE_EDITOR_MIDI_LISTENER_H
+#define LUMATONE_EDITOR_MIDI_LISTENER_H
+
+#include <JuceHeader.h>
+ 
+namespace LumatoneEditor
+{
+
+class MidiListener
+{
+public:
+    /*
+        Callback for device or app MIDI note ons.
+        If this needs to invoke any intensive code, be sure to do it on a message thread.
+    */
+    // virtual void handleAnyNoteOn(int midiChannel, int midiNote, juce::uint8 velocity) {}
+    
+    /*
+        Callback for device or app MIDI note offs.
+        If this needs to invoke any intensive code, be sure to do it on a message thread.
+    */
+    // virtual void handleAnyNoteOff(int midiChannel, int midiNote) {}
+    
+    /*
+        Callback for device or app MIDI aftertouch updates.
+        If this needs to invoke any intensive code, be sure to do it on a message thread.
+    */
+    // virtual void handleAnyAftertouch(int midiChannel, int midiNote, juce::uint8 value) {}
+    
+    /*
+        Callback for device or app MIDI controller updates.
+        If this needs to invoke any intensive code, be sure to do it on a message thread.
+    */
+    // virtual void handleAnyController(int midiChannel, int ccNum, juce::uint8 volocity) {}
+
+    /*
+        Callback for device MIDI note ons.
+        If this needs to invoke any intensive code, be sure to do it on a message thread.
+    */
+    virtual void handleNoteOn(int midiChannel, int midiNote, juce::uint8 velocity) {}
+
+    /*
+        Callback for device MIDI note offs.
+        If this needs to invoke any intensive code, be sure to do it on a message thread.
+    */
+    virtual void handleNoteOff(int midiChannel, int midiNote) {}
+
+    /*
+        Callback for device MIDI aftertouch updates.
+        If this needs to invoke any intensive code, be sure to do it on a message thread.
+    */
+    virtual void handleAftertouch(int midiChannel, int midiNote, juce::uint8 value) {}
+
+    /*
+        Callback for device MIDI controller updates.
+        If this needs to invoke any intensive code, be sure to do it on a message thread.
+    */
+    virtual void handleController(int midiChannel, int ccNum, juce::uint8 value) {}
+
+    /*
+        Callback for components that use a MIDI Clock
+    */
+    virtual void handleMidiClock(int quarterNoteDuration) {}
+
+    /*
+        Callback for sustain pedal messages
+    */
+    virtual void handleSustain(bool toggled) {}
+
+
+
+    // /*
+    //     Callback for virtual key pressed.
+    // */
+    // virtual void handleKeyDown(int keyNum) {}
+
+    // /*
+    //     Callback for virtual key released.
+    // */
+    // virtual void handleKeyUp(int keyNum) {}
+
+    // /*
+    //     Callback for virtual key dragged.
+    // */
+    // virtual void handleKeyHold(int key, float xDistance, float yDistance) {}
+
+};
+
+}
+
+#endif
diff --git a/Source/lumatone_editor_library/listeners/status_listener.h b/Source/lumatone_editor_library/listeners/status_listener.h
new file mode 100644
index 00000000..0c6a8edc
--- /dev/null
+++ b/Source/lumatone_editor_library/listeners/status_listener.h
@@ -0,0 +1,49 @@
+/*
+  ==============================================================================
+
+    status_listener.h
+    Created: 22 Mar 2022 10:11:10pm
+    Author:  Vincenzo Sicurella
+ 
+  ==============================================================================
+*/
+
+#pragma once
+
+#include "../data/application_state.h"
+
+namespace LumatoneEditor
+{
+    //============================================================================
+    // Public interface for Lumatone connection status
+
+    class StatusListener
+    {
+    public:
+
+        virtual ~StatusListener() {}
+
+        virtual void connectionFailed() {}
+        virtual void connectionStateChanged(ConnectionState state) {}
+        // virtual void connectionEstablished(juce::String inputDeviceId, juce::String outputDeviceId) {}
+        // virtual void connectionLost() {}
+    };
+
+    //============================================================================
+    // Interface for components that declare Lumatone connection changes
+
+    class StatusEmitter
+    {
+    protected:
+        juce::ListenerList<StatusListener> statusListeners;
+
+    public:
+
+        virtual ~StatusEmitter() {}
+
+        void addStatusListener(StatusListener* listener) { statusListeners.add(listener); }
+
+        void removeStatusListener(StatusListener* listener) { statusListeners.remove(listener); }
+    };
+
+}
diff --git a/Source/lumatone_editor_library/lumatone_midi_driver/firmware_definitions.h b/Source/lumatone_editor_library/lumatone_midi_driver/firmware_definitions.h
new file mode 100644
index 00000000..021e6037
--- /dev/null
+++ b/Source/lumatone_editor_library/lumatone_midi_driver/firmware_definitions.h
@@ -0,0 +1,233 @@
+/*
+  ==============================================================================
+
+    LumatoneFirmwareDefinitions.h
+    Created: 17 Apr 2021 10:19:39pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#ifndef LUMATONE_FIRMWARE_DEFINITIONS_H
+#define LUMATONE_FIRMWARE_DEFINITIONS_H
+
+#include <JuceHeader.h>
+
+/*
+==============================================================================
+System exclusive board definitions
+==============================================================================
+*/
+
+#define BOARD_SERVER 0x0
+#define BOARD_OCT_1  0x1
+#define BOARD_OCT_2  0x2
+#define BOARD_OCT_3  0x3
+#define BOARD_OCT_4  0x4
+#define BOARD_OCT_5  0x5
+
+/*
+==============================================================================
+System exclusive command structure
+==============================================================================
+*/
+
+#define MANUFACTURER_ID_0 0x00
+#define MANUFACTURER_ID_1 0x21
+#define MANUFACTURER_ID_2 0x50
+
+#define MANU_0       0x0
+#define MANU_1       0x1
+#define MANU_2       0x2
+#define BOARD_IND    0x3
+#define CMD_ID       0x4
+#define MSG_STATUS   0x5
+#define CALIB_MODE   0x5
+#define PAYLOAD_INIT 0x6
+
+#define ECHO_FLAG    0x5  // Used to differentiate test responses from MIDI feedback
+#define TEST_ECHO    0x7F // Should not be returned by Lumatone firmware
+
+#define SERIAL_55_KEYS "00 00 00 00 00 00"
+
+/*
+==============================================================================
+System exclusive command bytes
+==============================================================================
+*/
+
+// Start support at 55-keys firmware version, Developmental versions
+#define CHANGE_KEY_NOTE 0x00
+#define SET_KEY_COLOUR 0x01
+
+#define SAVE_PROGRAM 0x02
+
+#define SET_FOOT_CONTROLLER_SENSITIVITY 0x03
+#define INVERT_FOOT_CONTROLLER 0x04
+
+#define MACROBUTTON_COLOUR_ON 0x05
+#define MACROBUTTON_COLOUR_OFF 0x06
+
+#define SET_LIGHT_ON_KEYSTROKES 0x07
+
+#define SET_VELOCITY_CONFIG 0x08
+#define SAVE_VELOCITY_CONFIG 0x09
+#define RESET_VELOCITY_CONFIG 0x0A
+
+#define SET_FADER_CONFIG 0x0B
+#define SAVE_FADER_CONFIG 0x0C
+#define RESET_FADER_CONFIG 0x0D
+
+#define SET_AFTERTOUCH_FLAG 0x0E
+#define CALIBRATE_AFTERTOUCH 0x0F
+#define SET_AFTERTOUCH_CONFIG 0x10
+#define SAVE_AFTERTOUCH_CONFIG 0x11
+#define RESET_AFTERTOUCH_CONFIG 0x12
+
+#define GET_RED_LED_CONFIG 0x13
+#define GET_GREEN_LED_CONFIG 0x14
+#define GET_BLUE_LED_CONFIG 0x15
+#define GET_CHANNEL_CONFIG 0x16
+#define GET_NOTE_CONFIG 0x17
+#define GET_KEYTYPE_CONFIG 0x18
+
+#define GET_MAX_THRESHOLD 0x19
+#define GET_MIN_THRESHOLD 0x1A
+#define GET_AFTERTOUCH_MAX 0x1B
+#define GET_KEY_VALIDITY 0x1C
+
+#define GET_VELOCITY_CONFIG 0x1D
+#define GET_FADER_CONFIG 0x1E
+#define GET_AFTERTOUCH_CONFIG 0x1F
+
+// Firmware Version 1.0.3
+#define SET_VELOCITY_INTERVALS 0x20
+#define GET_VELOCITY_INTERVALS 0x21
+
+// Firmware Version 1.0.4
+#define GET_FADER_TYPE_CONFIGURATION 0x22
+
+// Start 56-keys, Firmware Version 1.0.5
+#define GET_SERIAL_IDENTITY 0x23
+// 0x23 will acknowledge in 55-keys but will not return serial number
+
+#define CALIBRATE_KEYS 0x24
+
+#define DEMO_MODE 0x25
+
+// Firmware Version 1.0.6
+#define CALIBRATE_PITCH_MOD_WHEEL 0x26
+#define SET_MOD_WHEEL_SENSITIVITY 0x27
+#define SET_PITCH_WHEEL_SENSITIVITY 0x28
+
+// Firmware Version 1.0.7, Start shipping backers and batches
+#define SET_KEY_MAX_THRESHOLD 0x29
+#define SET_KEY_MIN_THRESHOLD 0x2A
+#define SET_KEY_FADER_SENSITIVITY 0x2B
+#define SET_KEY_AFTERTOUCH_SENSITIVITY 0x2C
+
+#define SET_LUMATOUCH_CONFIG 0x2D
+#define SAVE_LUMATOUCH_CONFIG 0x2E
+#define RESET_LUMATOUCH_CONFIG 0x2F
+#define GET_LUMATOUCH_CONFIG 0x30
+
+// Firmware Version 1.0.8
+#define GET_FIRMWARE_REVISION 0x31
+
+// Firmware Version 1.0.9
+#define SET_CC_ACTIVE_THRESHOLD 0x32
+#define LUMA_PING 0x33
+
+// Firmware Version 1.0.10
+#define RESET_BOARD_THRESHOLDS 0x34
+#define SET_KEY_SAMPLING 0x35
+
+// Firmware Version 1.0.11
+#define RESET_WHEELS_THRESHOLD 0x36
+#define SET_PITCH_WHEEL_CENTER_THRESHOLD 0x37
+#define CALLIBRATE_EXPRESSION_PEDAL 0x38
+#define RESET_EXPRESSION_PEDAL_BOUNDS 0x39
+
+// Firmware Version 1.0.12 / 1.1.0
+#define GET_BOARD_THRESHOLD_VALUES 0x3A
+#define GET_BOARD_SENSITIVITY_VALUES 0x3B
+
+#define SET_PERIPHERAL_CHANNELS 0x3C
+#define GET_PERIPHERAL_CHANNELS 0x3D
+#define PERIPHERAL_CALBRATION_DATA 0x3E
+
+#define SET_AFTERTOUCH_TRIGGER_DELAY 0x3F
+#define GET_AFTERTOUCH_TRIGGER_DELAY 0x40
+
+#define SET_LUMATOUCH_NOTE_OFF_DELAY 0x41
+#define GET_LUMATOUCH_NOTE_OFF_DELAY 0x42
+#define SET_EXPRESSION_PEDAL_THRESHOLD 0x43
+#define GET_EXPRESSION_PEDAL_THRESHOLD 0x44
+#define INVERT_SUSTAIN_PEDAL 0x45
+#define RESET_DEFAULT_PRESETS 0x46
+#define GET_PRESET_FLAGS 0x47
+#define GET_EXPRESSION_PEDAL_SENSITIVIY 0x48
+
+#define GET_MACRO_LIGHT_INTENSITY 0x49
+#define RESET_MACRO_LIGHT_INTENSITY 0x4A
+
+#define RESET_BOARD_KEYS 0x4B
+#define RESET_AFTERTOUCH_TRIGGER_DELAY 0x4C
+
+#define RESET_LUMATOUCH_NOTE_OFF_DELAY 0x4D
+#define GET_PITCH_AND_MOD_BOUNDS 0x4E
+#define GET_EXPRESSION_PEDAL_BOUNDS 0x4F
+
+
+#define VELOCITYINTERVALTABLESIZE 127
+
+#define ADCSCALAR 2.44140625e-4f;
+
+namespace LumatoneFirmware
+{
+
+struct PresetFlags
+{
+	bool expressionPedalInverted = false;
+	bool lightsOnKeystroke = false;
+	bool polyphonicAftertouch = false;
+	bool sustainPedalInverted = false;
+};
+
+typedef enum
+{
+	PitchWheel = 0,
+	ModWheel,
+	Expression,
+	Sustain
+} PeripheralChannel;
+
+typedef enum
+{
+	NACK    = 0x00, // Not recognized
+	ACK     = 0x01, // Acknowledged, OK
+	BUSY    = 0x02, // Controller busy
+	ERROR   = 0x03, // Error
+	STATE   = 0x04, // Not in MIDI state
+} ReturnCode;
+
+
+typedef enum
+{
+    disabledDefault      = 0,
+	noteOnNoteOff        = 1,
+	continuousController = 2,
+	lumaTouch            = 3,
+	disabled             = 4
+} LumatoneKeyType;
+
+
+typedef enum
+{
+	ExpressionPedal = 0,
+	PitchAndModWheels
+} PeripheralCalibrationDataMode;
+
+}
+
+#endif
diff --git a/Source/lumatone_editor_library/lumatone_midi_driver/firmware_driver_listener.h b/Source/lumatone_editor_library/lumatone_midi_driver/firmware_driver_listener.h
new file mode 100644
index 00000000..c4bd887b
--- /dev/null
+++ b/Source/lumatone_editor_library/lumatone_midi_driver/firmware_driver_listener.h
@@ -0,0 +1,34 @@
+/*
+  ==============================================================================
+
+    firmware_driver_listener.h
+    Created: 30 Sep 2023
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#ifndef LUMATONE_FIRMWARE_DRIVER_LISTENER_H
+#define LUMATONE_FIRMWARE_DRIVER_LISTENER_H
+
+#include <JuceHeader.h>
+
+// juce::MidiMessageCollector version of previous TerpstraMidiDriver::Listener, as to keep the Midi thread lightweight
+class LumatoneFirmwareDriverListener : protected juce::MidiMessageCollector
+{
+    juce::MidiBuffer messagesSentQueue;
+
+public:
+    virtual ~LumatoneFirmwareDriverListener() {}
+    
+    virtual void midiMessageReceived(juce::MidiInput* source, const juce::MidiMessage& message) = 0;
+    virtual void midiMessageSent(juce::MidiOutput* target, const juce::MidiMessage& message) = 0;
+    virtual void midiSendQueueSize(int size) = 0;
+    // virtual void generalLogMessage(juce::String textMessage, ErrorLevel errorLevel) {}
+
+    // Realtime messages before a device is connected - not for heavy processing!
+    virtual void noAnswerToMessage(juce::MidiDeviceInfo expectedDevice, const juce::MidiMessage& message) = 0;
+//		virtual void testMessageReceived(int testInputIndex, const juce::MidiMessage& midiMessage) {};
+};
+
+#endif
diff --git a/Source/lumatone_editor_library/lumatone_midi_driver/firmware_support.h b/Source/lumatone_editor_library/lumatone_midi_driver/firmware_support.h
new file mode 100644
index 00000000..a29463c4
--- /dev/null
+++ b/Source/lumatone_editor_library/lumatone_midi_driver/firmware_support.h
@@ -0,0 +1,533 @@
+/*
+  ==============================================================================
+
+    firmware_support.h
+    Created: 30 Sep 2023
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#ifndef LUMATONE_FIRMWARE_SUPPORT_H
+#define LUMATONE_FIRMWARE_SUPPORT_H
+
+#include "./firmware_types.h"
+
+struct FirmwareSupport
+{
+	enum class Error
+	{
+		noError = 0,
+		noMidiOutputSet,
+		deviceIsBusy,
+		messageTooShort,
+		messageTooLong,
+        messageIsAnEcho,
+		messageHasIncorrectManufacturerId,
+		messageHasInvalidBoardIndex,
+		messageHasInvalidStatusByte,
+		messageIsNotResponseToCommand,
+		messageIsNotSysEx,
+		unknownCommand,
+		externalError,
+        commandNotImplemented
+	};
+
+	static juce::String errorToString(Error err)
+	{
+		switch (err)
+		{
+		case Error::noError:
+			return "No error";
+		case Error::noMidiOutputSet:
+			return "No Midi output set";
+		case Error::deviceIsBusy:
+			return "Device is busy";
+		case Error::messageTooShort:
+            return "Message too short";
+		case Error::messageTooLong:
+            return "Message too long";
+        case Error::messageIsAnEcho:
+            return "Message is an echo";
+		case Error::messageHasIncorrectManufacturerId:
+			return "Incorrect manufacturer ID";
+		case Error::messageHasInvalidBoardIndex:
+			return "Invalid board index";
+		case Error::messageHasInvalidStatusByte:
+			return "Message has invalid status byte";
+		case Error::messageIsNotResponseToCommand:
+			return "Message is not a response to the command";
+		case Error::messageIsNotSysEx:
+			return "Message is not a valid SysEx message.";
+		case Error::unknownCommand:
+			return "Unknown command / Not Acknowledged";
+		case Error::externalError:
+			return "Error from device";
+        case Error::commandNotImplemented:
+            return "Command handling not implemented";
+		default:
+			return "Undefined error..";
+		}
+	}
+
+	static LumatoneFirmware::ReleaseVersion getReleaseVersion(LumatoneFirmware::Version versionIn)
+	{
+		if (!(versionIn.major | versionIn.minor | versionIn.revision))
+			return LumatoneFirmware::ReleaseVersion::VERSION_55_KEYS;
+
+		else if ((versionIn.major < 0) | (versionIn.minor < 0) | (versionIn.revision < 0))
+			return LumatoneFirmware::ReleaseVersion::UNKNOWN_VERSION;
+		
+        // MAJOR: 1
+		else if (versionIn.major == 1)
+		{
+            // MINOR: 0
+			if (versionIn.minor == 0)
+			{
+				if (versionIn.revision < 3)
+					return LumatoneFirmware::ReleaseVersion::VERSION_55_KEYS;
+
+                // Computing is probably not the best thing to do but edge cases are extremely unlikely here
+				else if (versionIn.revision - 3 > (int)LumatoneFirmware::ReleaseVersion::LAST_VERSION - (int)LumatoneFirmware::ReleaseVersion::VERSION_1_0_3)
+					return LumatoneFirmware::ReleaseVersion::FUTURE_VERSION;
+
+				else if (versionIn.revision >= 3)
+					return (LumatoneFirmware::ReleaseVersion)((int)LumatoneFirmware::ReleaseVersion::VERSION_1_0_3 + (versionIn.revision - 3));
+			}
+            
+            // MINOR: 1
+            else if (versionIn.minor == 1)
+            {
+                if (versionIn.revision == 0)
+                    return LumatoneFirmware::ReleaseVersion::VERSION_1_1_0;
+            }
+            
+            else if (versionIn.minor == 2)
+            {
+                if (versionIn.revision == 0)
+                    return LumatoneFirmware::ReleaseVersion::VERSION_1_2_0;
+            }
+            
+            return LumatoneFirmware::ReleaseVersion::FUTURE_VERSION;
+		}
+
+        // Unsure if this is needed, or if returning FUTURE_VERSION without a condition is better
+		else if (versionIn.major < 9 && versionIn.minor < 9 && versionIn.revision < 999)
+			return LumatoneFirmware::ReleaseVersion::FUTURE_VERSION;
+
+		return LumatoneFirmware::ReleaseVersion::UNKNOWN_VERSION;
+	}
+
+	// TODO use map instead
+	// Returns the lowest version that will return ACK for a given command
+	static LumatoneFirmware::ReleaseVersion getLowestVersionAcknowledged(unsigned int CMD)
+	{
+		if (CMD < CHANGE_KEY_NOTE) // 0x00
+			return LumatoneFirmware::ReleaseVersion::UNKNOWN_VERSION;
+
+		else if (CMD <= GET_SERIAL_IDENTITY) // 0x23
+			return LumatoneFirmware::ReleaseVersion::NO_VERSION;
+
+		else if (CMD <= DEMO_MODE) // 0x25
+			return LumatoneFirmware::ReleaseVersion::VERSION_1_0_5;
+
+		else if (CMD <= CALIBRATE_PITCH_MOD_WHEEL) // 0x26
+			return LumatoneFirmware::ReleaseVersion::VERSION_1_0_6;
+
+		else if (CMD <= SET_KEY_MAX_THRESHOLD) // 0x29
+			return LumatoneFirmware::ReleaseVersion::VERSION_1_0_7;
+
+		else if (CMD <= GET_FIRMWARE_REVISION) // 0x31
+			return LumatoneFirmware::ReleaseVersion::VERSION_1_0_8;
+
+		else if (CMD <= LUMA_PING) // 0x33
+			return LumatoneFirmware::ReleaseVersion::VERSION_1_0_9;
+
+		else if (CMD <= SET_KEY_SAMPLING) // 0x35
+			return LumatoneFirmware::ReleaseVersion::VERSION_1_0_10;
+
+		else if (CMD <= RESET_EXPRESSION_PEDAL_BOUNDS) // 0x39
+			return LumatoneFirmware::ReleaseVersion::VERSION_1_0_11;
+
+		else if (CMD <= GET_EXPRESSION_PEDAL_BOUNDS) // 0x4F
+			return LumatoneFirmware::ReleaseVersion::VERSION_1_1_0;
+
+		else
+			return LumatoneFirmware::ReleaseVersion::FUTURE_VERSION;
+	}
+
+	static bool versionAcknowledgesCommand(LumatoneFirmware::ReleaseVersion VERSION, unsigned int CMD)
+	{
+		return getLowestVersionAcknowledged(CMD) <= VERSION;
+	}
+
+	static bool versionAcknowledgesCommand(LumatoneFirmware::Version versionIn, unsigned int CMD)
+	{
+		auto VERSION = getReleaseVersion(versionIn);
+		return versionAcknowledgesCommand(VERSION, CMD);
+	}
+
+	// Should always be 56 in production
+	static int getOctaveSize(LumatoneFirmware::ReleaseVersion VERSION)
+	{
+		if (VERSION >= LumatoneFirmware::ReleaseVersion::VERSION_1_0_3)
+			return 56;
+		else
+			return 55;
+	}
+
+	static int getCommandNumber(const juce::MidiMessage& msg)
+	{
+		return msg.getSysExData()[CMD_ID];
+	}
+    
+    static juce::String serialIdentityToString(const int* serialBytes)
+    {
+        return juce::String::toHexString(serialBytes, 6);
+    }
+
+	static juce::String getCommandDescription(const juce::MidiMessage& msg)
+	{
+		// TODO unpack values?
+		juce::String name;
+		juce::String description;
+
+		const juce::uint8* data = msg.getRawData();
+		juce::uint8 board = static_cast<juce::uint8>(data[BOARD_IND]);
+
+		switch (getCommandNumber(msg))
+		{
+		case CHANGE_KEY_NOTE:
+			name = "Set Key Params";
+			description = "Board " + juce::String(board) + " Key " + juce::String(data[5]);
+			break;
+		case SET_KEY_COLOUR:
+			name = "Set Key Color";
+			description = "Board " + juce::String(board) + " Key " + juce::String(data[5]);
+			for (int i = 6; i < msg.getRawDataSize(); i++)
+				description += juce::String(data[i]) + "|";
+			break;
+		case SAVE_PROGRAM:
+			name = "SAVE_PROGRAM";
+			description = "";
+			break;
+		case SET_FOOT_CONTROLLER_SENSITIVITY:
+			name = "SET_FOOT_CONTROLLER_SENSITIVITY";
+			description = "";
+			break;
+		case INVERT_FOOT_CONTROLLER:
+			name = "INVERT_FOOT_CONTROLLER";
+			description = "";
+			break;
+		case MACROBUTTON_COLOUR_ON:
+			name = "MACROBUTTON_COLOUR_ON";
+			description = "";
+			break;
+		case MACROBUTTON_COLOUR_OFF:
+			name = "MACROBUTTON_COLOUR_OFF";
+			description = "";
+			break;
+		case SET_LIGHT_ON_KEYSTROKES:
+			name = "SET_LIGHT_ON_KEYSTROKES";
+			description = "";
+			break;
+		case SET_VELOCITY_CONFIG:
+			name = "SET_VELOCITY_CONFIG";
+			description = "";
+			break;
+		case SAVE_VELOCITY_CONFIG:
+			name = "SAVE_VELOCITY_CONFIG";
+			description = "";
+			break;
+		case RESET_VELOCITY_CONFIG:
+			name = "RESET_VELOCITY_CONFIG";
+			description = "";
+			break;
+		case SET_FADER_CONFIG:
+			name = "SET_FADER_CONFIG";
+			description = "";
+			break;
+		case SAVE_FADER_CONFIG:
+			name = "SAVE_FADER_CONFIG";
+			description = "";
+			break;
+		case RESET_FADER_CONFIG:
+			name = "RESET_FADER_CONFIG";
+			description = "";
+			break;
+		case SET_AFTERTOUCH_FLAG:
+			name = "SET_AFTERTOUCH_FLAG";
+			description = "";
+			break;
+		case CALIBRATE_AFTERTOUCH:
+			name = "CALIBRATE_AFTERTOUCH";
+			description = "";
+			break;
+		case SET_AFTERTOUCH_CONFIG:
+			name = "SET_AFTERTOUCH_CONFIG";
+			description = "";
+			break;
+		case SAVE_AFTERTOUCH_CONFIG:
+			name = "SAVE_AFTERTOUCH_CONFIG";
+			description = "";
+			break;
+		case RESET_AFTERTOUCH_CONFIG:
+			name = "RESET_AFTERTOUCH_CONFIG";
+			description = "";
+			break;
+		case GET_RED_LED_CONFIG:
+			name = "GET_RED_LED_CONFIG";
+			description = "";
+			break;
+		case GET_GREEN_LED_CONFIG:
+			name = "GET_GREEN_LED_CONFIG";
+			description = "";
+			break;
+		case GET_BLUE_LED_CONFIG:
+			name = "GET_BLUE_LED_CONFIG";
+			description = "";
+			break;
+		case GET_CHANNEL_CONFIG:
+			name = "GET_CHANNEL_CONFIG";
+			description = "";
+			break;
+		case GET_NOTE_CONFIG:
+			name = "GET_NOTE_CONFIG";
+			description = "";
+			break;
+		case GET_KEYTYPE_CONFIG:
+			name = "GET_KEYTYPE_CONFIG";
+			description = "";
+			break;
+		case GET_MAX_THRESHOLD:
+			name = "GET_MAX_THRESHOLD";
+			description = "";
+			break;
+		case GET_MIN_THRESHOLD:
+			name = "GET_MIN_THRESHOLD";
+			description = "";
+			break;
+		case GET_AFTERTOUCH_MAX:
+			name = "GET_AFTERTOUCH_MAX";
+			description = "";
+			break;
+		case GET_KEY_VALIDITY:
+			name = "GET_KEY_VALIDITY";
+			description = "";
+			break;
+		case GET_VELOCITY_CONFIG:
+			name = "GET_VELOCITY_CONFIG";
+			description = "";
+			break;
+		case GET_FADER_CONFIG:
+			name = "GET_FADER_CONFIG";
+			description = "";
+			break;
+		case GET_AFTERTOUCH_CONFIG:
+			name = "GET_AFTERTOUCH_CONFIG";
+			description = "";
+			break;
+		case SET_VELOCITY_INTERVALS:
+			name = "SET_VELOCITY_INTERVALS";
+			description = "";
+			break;
+		case GET_VELOCITY_INTERVALS:
+			name = "GET_VELOCITY_INTERVALS";
+			description = "";
+			break;
+		case GET_FADER_TYPE_CONFIGURATION:
+			name = "GET_FADER_TYPE_CONFIGURATION";
+			description = "";
+			break;
+		case GET_SERIAL_IDENTITY:
+			name = "GET_SERIAL_IDENTITY";
+			description = "";
+			break;
+		case CALIBRATE_KEYS:
+			name = "CALIBRATE_KEYS";
+			description = "";
+			break;
+		case DEMO_MODE:
+			name = "DEMO_MODE";
+			description = "";
+			break;
+		case CALIBRATE_PITCH_MOD_WHEEL:
+			name = "CALIBRATE_PITCH_MOD_WHEEL";
+			description = "";
+			break;
+		case SET_MOD_WHEEL_SENSITIVITY:
+			name = "SET_MOD_WHEEL_SENSITIVITY";
+			description = "";
+			break;
+		case SET_PITCH_WHEEL_SENSITIVITY:
+			name = "SET_PITCH_WHEEL_SENSITIVITY";
+			description = "";
+			break;
+		case SET_KEY_MAX_THRESHOLD:
+			name = "SET_KEY_MAX_THRESHOLD";
+			description = "";
+			break;
+		case SET_KEY_MIN_THRESHOLD:
+			name = "SET_KEY_MIN_THRESHOLD";
+			description = "";
+			break;
+		case SET_KEY_FADER_SENSITIVITY:
+			name = "SET_KEY_FADER_SENSITIVITY";
+			description = "";
+			break;
+		case SET_KEY_AFTERTOUCH_SENSITIVITY:
+			name = "SET_KEY_AFTERTOUCH_SENSITIVITY";
+			description = "";
+			break;
+		case SET_LUMATOUCH_CONFIG:
+			name = "SET_LUMATOUCH_CONFIG";
+			description = "";
+			break;
+		case SAVE_LUMATOUCH_CONFIG:
+			name = "SAVE_LUMATOUCH_CONFIG";
+			description = "";
+			break;
+		case RESET_LUMATOUCH_CONFIG:
+			name = "RESET_LUMATOUCH_CONFIG";
+			description = "";
+			break;
+		case GET_LUMATOUCH_CONFIG:
+			name = "GET_LUMATOUCH_CONFIG";
+			description = "";
+			break;
+		case GET_FIRMWARE_REVISION:
+			name = "GET_FIRMWARE_REVISION";
+			description = "";
+			break;
+		case SET_CC_ACTIVE_THRESHOLD:
+			name = "SET_CC_ACTIVE_THRESHOLD";
+			description = "";
+			break;
+		case LUMA_PING:
+			name = "LUMA_PING";
+			description = "";
+			break;
+		case RESET_BOARD_THRESHOLDS:
+			name = "RESET_BOARD_THRESHOLDS";
+			description = "";
+			break;
+		case SET_KEY_SAMPLING:
+			name = "SET_KEY_SAMPLING";
+			description = "";
+			break;
+		case RESET_WHEELS_THRESHOLD:
+			name = "RESET_WHEELS_THRESHOLD";
+			description = "";
+			break;
+		case SET_PITCH_WHEEL_CENTER_THRESHOLD:
+			name = "SET_PITCH_WHEEL_CENTER_THRESHOLD";
+			description = "";
+			break;
+		case CALLIBRATE_EXPRESSION_PEDAL:
+			name = "CALLIBRATE_EXPRESSION_PEDAL";
+			description = "";
+			break;
+		case RESET_EXPRESSION_PEDAL_BOUNDS:
+			name = "RESET_EXPRESSION_PEDAL_BOUNDS";
+			description = "";
+			break;
+		case GET_BOARD_THRESHOLD_VALUES:
+			name = "GET_BOARD_THRESHOLD_VALUES";
+			description = "";
+			break;
+		case GET_BOARD_SENSITIVITY_VALUES:
+			name = "GET_BOARD_SENSITIVITY_VALUES";
+			description = "";
+			break;
+		case SET_PERIPHERAL_CHANNELS:
+			name = "SET_PERIPHERAL_CHANNELS";
+			description = "";
+			break;
+		case GET_PERIPHERAL_CHANNELS:
+			name = "GET_PERIPHERAL_CHANNELS";
+			description = "";
+			break;
+		case PERIPHERAL_CALBRATION_DATA:
+			name = "PERIPHERAL_CALBRATION_DATA";
+			description = "";
+			break;
+		case SET_AFTERTOUCH_TRIGGER_DELAY:
+			name = "SET_AFTERTOUCH_TRIGGER_DELAY";
+			description = "";
+			break;
+		case GET_AFTERTOUCH_TRIGGER_DELAY:
+			name = "GET_AFTERTOUCH_TRIGGER_DELAY";
+			description = "";
+			break;
+		case SET_LUMATOUCH_NOTE_OFF_DELAY:
+			name = "SET_LUMATOUCH_NOTE_OFF_DELAY";
+			description = "";
+			break;
+		case GET_LUMATOUCH_NOTE_OFF_DELAY:
+			name = "GET_LUMATOUCH_NOTE_OFF_DELAY";
+			description = "";
+			break;
+		case SET_EXPRESSION_PEDAL_THRESHOLD:
+			name = "SET_EXPRESSION_PEDAL_THRESHOLD";
+			description = "";
+			break;
+		case GET_EXPRESSION_PEDAL_THRESHOLD:
+			name = "GET_EXPRESSION_PEDAL_THRESHOLD";
+			description = "";
+			break;
+		case INVERT_SUSTAIN_PEDAL:
+			name = "INVERT_SUSTAIN_PEDAL";
+			description = "";
+			break;
+		case RESET_DEFAULT_PRESETS:
+			name = "RESET_DEFAULT_PRESETS";
+			description = "";
+			break;
+		case GET_PRESET_FLAGS:
+			name = "GET_PRESET_FLAGS";
+			description = "";
+			break;
+		case GET_EXPRESSION_PEDAL_SENSITIVIY:
+			name = "GET_EXPRESSION_PEDAL_SENSITIVIY";
+			description = "";
+			break;
+		case GET_MACRO_LIGHT_INTENSITY:
+			name = "GET_MACRO_LIGHT_INTENSITY";
+			description = "";
+			break;
+		case RESET_MACRO_LIGHT_INTENSITY:
+			name = "RESET_MACRO_LIGHT_INTENSITY";
+			description = "";
+			break;
+		case RESET_BOARD_KEYS:
+			name = "RESET_BOARD_KEYS";
+			description = "";
+			break;
+		case RESET_AFTERTOUCH_TRIGGER_DELAY:
+			name = "RESET_AFTERTOUCH_TRIGGER_DELAY";
+			description = "";
+			break;
+		case RESET_LUMATOUCH_NOTE_OFF_DELAY:
+			name = "RESET_LUMATOUCH_NOTE_OFF_DELAY";
+			description = "";
+			break;
+		case GET_PITCH_AND_MOD_BOUNDS:
+			name = "GET_PITCH_AND_MOD_BOUNDS";
+			description = "";
+			break;
+		case GET_EXPRESSION_PEDAL_BOUNDS:
+			name = "GET_EXPRESSION_PEDAL_BOUNDS";
+			description = "";
+			break;
+		default:
+			name = "ERROR_UNKNOWN_COMMAND";
+			jassertfalse;
+			break;
+		}
+
+		return name + ": " + description;
+	}
+
+};
+
+#endif
diff --git a/Source/lumatone_editor_library/lumatone_midi_driver/firmware_sysex.cpp b/Source/lumatone_editor_library/lumatone_midi_driver/firmware_sysex.cpp
new file mode 100644
index 00000000..f1b0001f
--- /dev/null
+++ b/Source/lumatone_editor_library/lumatone_midi_driver/firmware_sysex.cpp
@@ -0,0 +1,637 @@
+#include "firmware_sysex.h"
+
+void LumatoneSysEx::fillManufacturerId(unsigned char* data)
+{
+    data[0] = MANUFACTURER_ID_0;
+    data[1] = MANUFACTURER_ID_1;
+    data[2] = MANUFACTURER_ID_2;
+}
+
+juce::MidiMessage LumatoneSysEx::createTerpstraSysEx(juce::uint8 boardIndex, juce::uint8 cmd, juce::uint8 data1, juce::uint8 data2, juce::uint8 data3, juce::uint8 data4)
+{
+    unsigned char sysExData[9];
+    fillManufacturerId(sysExData);
+    sysExData[3] = boardIndex;
+    sysExData[4] = cmd;
+    sysExData[5] = data1;
+    sysExData[6] = data2;
+    sysExData[7] = data3;
+    sysExData[8] = data4;
+
+    juce::MidiMessage msg = juce::MidiMessage::createSysExMessage(sysExData, 9);
+    return msg;
+}
+
+// Create a SysEx message to send 8-bit color precision
+juce::MidiMessage LumatoneSysEx::createExtendedKeyColourSysEx(juce::uint8 boardIndex, juce::uint8 cmd, juce::uint8 keyIndex, juce::uint8 redUpper, juce::uint8 redLower, juce::uint8 greenUpper, juce::uint8 greenLower, juce::uint8 blueUpper, juce::uint8 blueLower)
+{
+    unsigned char sysExData[12];
+    fillManufacturerId(sysExData);
+    sysExData[3] = boardIndex;
+    sysExData[4] = cmd;
+    sysExData[5] = keyIndex;
+    sysExData[6] = redUpper;
+    sysExData[7] = redLower;
+    sysExData[8] = greenUpper;
+    sysExData[9] = greenLower;
+    sysExData[10] = blueUpper;
+    sysExData[11] = blueLower;
+
+    juce::MidiMessage msg = juce::MidiMessage::createSysExMessage(sysExData, 12);
+    return msg;
+}
+juce::MidiMessage LumatoneSysEx::createExtendedKeyColourSysEx(juce::uint8 boardIndex, juce::uint8 cmd, juce::uint8 keyIndex, int red, int green, int blue)
+{
+    return createExtendedKeyColourSysEx(boardIndex, cmd, keyIndex, red >> 4, red & 0xf, green >> 4, green & 0xf, blue >> 4, blue & 0xf);
+}
+
+juce::MidiMessage LumatoneSysEx::createExtendedMacroColourSysEx(juce::uint8 cmd, juce::uint8 redUpper, juce::uint8 redLower, juce::uint8 greenUpper, juce::uint8 greenLower, juce::uint8 blueUpper, juce::uint8 blueLower)
+{
+    unsigned char sysExData[11];
+    fillManufacturerId(sysExData);
+    sysExData[3] = 0;
+    sysExData[4] = cmd;
+    sysExData[5] = redUpper;
+    sysExData[6] = redLower;
+    sysExData[7] = greenUpper;
+    sysExData[8] = greenLower;
+    sysExData[9] = blueUpper;
+    sysExData[10] = blueLower;
+
+    juce::MidiMessage msg = juce::MidiMessage::createSysExMessage(sysExData, 11);
+    return msg;
+}
+
+juce::MidiMessage LumatoneSysEx::createExtendedMacroColourSysEx(juce::uint8 cmd, int red, int green, int blue)
+{
+    return createExtendedMacroColourSysEx(cmd, red >> 4, red & 0xf, green >> 4, green & 0xf, blue >> 4, blue & 0xf);
+}
+
+juce::MidiMessage LumatoneSysEx::createTableSysEx(juce::uint8 boardIndex, juce::uint8 cmd, juce::uint8 tableSize, const juce::uint8 table[])
+{
+    size_t msgSize = tableSize + 5;
+    juce::Array<unsigned char> dataArray;
+    dataArray.resize(msgSize);
+
+    auto sysExData = dataArray.getRawDataPointer();
+    fillManufacturerId(sysExData);
+
+    sysExData[3] = '\0';
+    sysExData[4] = cmd;
+
+    memmove(&sysExData[5], table, sizeof(juce::uint8) * tableSize);
+
+#if JUCE_DEBUG
+    for (int i = 0; i < tableSize; i++)
+        jassert(table[i] <= 0x7f);
+#endif
+
+    auto msg = juce::MidiMessage::createSysExMessage(sysExData, msgSize);
+    return msg;
+}
+
+
+// Checks if message is a valid Lumatone firmware response and is expected length, then runs supplied unpacking function or returns an error code 
+FirmwareSupport::Error LumatoneSysEx::unpackIfValid(const juce::MidiMessage& response, size_t numBytes, std::function<FirmwareSupport::Error(const juce::uint8*)> unpackFunction)
+{
+    auto status = messageIsValidLumatoneResponse(response);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    status = responseIsExpectedLength(response, numBytes);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    return unpackFunction(&response.getSysExData()[PAYLOAD_INIT]);
+}
+
+// Generic unpacking of octave data from a SysEx message
+FirmwareSupport::Error LumatoneSysEx::unpackOctaveConfig(const juce::MidiMessage& msg, int& boardId, size_t numBytes, int* keyData, std::function<FirmwareSupport::Error(const juce::MidiMessage&, size_t, int*)> nBitUnpackFunction)
+{
+    auto status = nBitUnpackFunction(msg, numBytes, keyData);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    boardId = msg.getSysExData()[BOARD_IND];
+    return status;
+}
+
+// Generic unpacking of 7-bit data from a SysEx message
+FirmwareSupport::Error LumatoneSysEx::unpack7BitData(const juce::MidiMessage& msg, size_t numBytes, int* unpackedData)
+{
+    auto unpack = [&](const juce::uint8* payload) {
+        for (int i = 0; i < numBytes; i++)
+            unpackedData[i] = payload[i];
+        return FirmwareSupport::Error::noError;
+    };
+
+    return unpackIfValid(msg, numBytes, unpack);
+}
+
+// Unpacking of octave-based 7-bit key configuration data
+FirmwareSupport::Error LumatoneSysEx::unpack7BitOctaveData(const juce::MidiMessage& msg, int& boardId, juce::uint8 numKeys, int* keyData)
+{
+    return unpackOctaveConfig(msg, boardId, numKeys, keyData, [&](const juce::MidiMessage&, juce::uint8, int*) {
+        return unpack7BitData(msg, numKeys, keyData);
+    });
+}
+
+// Generic unpacking of 8-bit data from a SysEx message
+FirmwareSupport::Error LumatoneSysEx::unpack8BitData(const juce::MidiMessage& msg, size_t numBytes, int* unpackedData)
+{
+    auto unpack = [&](const juce::uint8* payload) {
+        auto numValues = numBytes / 2;
+        for (int i = 0; i < numValues; i++)
+            unpackedData[i] = (payload[(i * 2)] << 4) | (payload[(i * 2) + 1]);
+        return FirmwareSupport::Error::noError;
+    };
+
+    return unpackIfValid(msg, numBytes, unpack);
+}
+
+// Unpacking of octave-based 8-bit data
+FirmwareSupport::Error LumatoneSysEx::unpack8BitOctaveData(const juce::MidiMessage& msg, int& boardId, juce::uint8 numKeys, int* keyData)
+{
+    return unpackOctaveConfig(msg, boardId, numKeys, keyData, [&](const juce::MidiMessage&, size_t, int*) {
+        return unpack8BitData(msg, numKeys * 2, keyData);
+    });
+}
+
+// Generic unpacking of 12-bit data from a SysEx message, when packed with two 7-bit values
+FirmwareSupport::Error LumatoneSysEx::unpack12BitDataFrom7Bit(const juce::MidiMessage& msg, size_t numBytes, int* unpackedData)
+{
+    auto unpack = [&](const juce::uint8* payload) {
+        auto numValues = numBytes / 2;
+        for (int i = 0; i < numValues; i++)
+            unpackedData[i] = (payload[i * 2] << 6) | (payload[(i * 2) + 1]);
+        return FirmwareSupport::Error::noError;
+    };
+
+    return unpackIfValid(msg, numBytes, unpack);
+}
+
+// Generic unpacking of 12-bit data from a SysEx message, when packed with three 4-bit values
+FirmwareSupport::Error LumatoneSysEx::unpack12BitDataFrom4Bit(const juce::MidiMessage& msg, size_t numBytes, int* unpackedData)
+{
+    auto unpack = [&](const juce::uint8* payload) {
+        auto numValues = numBytes / 3;
+        for (int i = 0; i < numValues; i++)
+        {
+            int start = i * 3;
+            unpackedData[i] = (payload[start] << 8) | (payload[start + 1] << 4) | (payload[start + 2]);
+        }
+        return FirmwareSupport::Error::noError;
+    };
+
+    return unpackIfValid(msg, numBytes, unpack);
+}
+bool LumatoneSysEx::messageIsResponseToMessage(const juce::MidiMessage& answer, const juce::MidiMessage& originalMessage)
+{
+    // Only for SysEx messages
+    if (answer.isSysEx() != originalMessage.isSysEx())
+        return false;
+
+    auto answerSysExData = answer.getSysExData();
+    auto originalSysExData = originalMessage.getSysExData();
+
+    // Manufacturer Id, board index, command coincide?
+    if (answerSysExData[0] != originalSysExData[0] ||
+        answerSysExData[1] != originalSysExData[1] ||
+        answerSysExData[2] != originalSysExData[2] ||
+        answerSysExData[3] != originalSysExData[3] ||
+        answerSysExData[4] != originalSysExData[4])
+    {
+        return false;
+    }
+    else
+    {
+        return true;
+    }
+}
+
+FirmwareSupport::Error LumatoneSysEx::messageIsValidLumatoneResponse(const juce::MidiMessage& midiMessage)
+{
+    if (!midiMessage.isSysEx())
+        return FirmwareSupport::Error::messageIsNotSysEx;
+
+    auto sysExData = midiMessage.getSysExData();
+
+    if (midiMessage.getSysExDataSize() < PAYLOAD_INIT)
+        return FirmwareSupport::Error::messageTooShort;
+
+    if (!(sysExData[MANU_0] == MANUFACTURER_ID_0) &&
+        !(sysExData[MANU_1] == MANUFACTURER_ID_1) &&
+        !(sysExData[MANU_2] == MANUFACTURER_ID_2))
+        return FirmwareSupport::Error::messageHasIncorrectManufacturerId;
+
+    if (sysExData[BOARD_IND] > BOARD_OCT_5)
+        return FirmwareSupport::Error::messageHasInvalidBoardIndex;
+
+    if (sysExData[MSG_STATUS] > LumatoneFirmware::ReturnCode::ERROR)
+        return FirmwareSupport::Error::messageHasInvalidStatusByte;
+
+    return FirmwareSupport::Error::noError;
+}
+
+FirmwareSupport::Error LumatoneSysEx::responseIsExpectedLength(const juce::MidiMessage& midiMessage, size_t numPayloadBytes)
+{
+    auto size = midiMessage.getSysExDataSize();
+    auto expected = numPayloadBytes + PAYLOAD_INIT;
+
+    if (size == expected)
+        return FirmwareSupport::Error::noError;
+
+    else if (size < expected)
+        return FirmwareSupport::Error::messageTooShort;
+
+    else
+        return FirmwareSupport::Error::messageTooLong;
+}
+
+// For CMD 13h response: unpacks 8-bit key data for red LED intensity. 112 bytes, lower and upper nibbles for 56 values
+FirmwareSupport::Error LumatoneSysEx::unpackGetLEDConfigResponse(const juce::MidiMessage& response, int& boardId, int* keyData)
+{
+    // TODO: Maybe should define keys per octave somewhere
+    return unpack8BitOctaveData(response, boardId, 56, keyData);
+}
+
+// For CMD 13h response: unpacks key data for red LED intensity. 55 or 56 bytes, each value must be multiplied by 5
+FirmwareSupport::Error LumatoneSysEx::unpackGetLEDConfigResponse_Version_1_0_0(const juce::MidiMessage& response, int& boardId, juce::uint8 numKeys, int* keyData)
+{
+    // Custom unpacking function for intensity multiplication
+    auto unpackFunction = [&](const juce::uint8* payload) {
+        for (int i = 0; i < numKeys; i++)
+            keyData[i] = ((int)payload[i] * 5) & 0xff;
+        return FirmwareSupport::Error::noError;
+    };
+
+    return unpackOctaveConfig(response, boardId, numKeys, keyData, [&](const juce::MidiMessage&, juce::uint8, int*) {
+        return unpackIfValid(response, numKeys, unpackFunction);
+    });
+}
+
+// For CMD 16h response: unpacks channel data for note configuration. 55 or 56 bytes
+FirmwareSupport::Error LumatoneSysEx::unpackGetChannelConfigResponse(const juce::MidiMessage& response, int& boardId, juce::uint8 numKeys, int* keyData)
+{
+    return unpack7BitOctaveData(response, boardId, numKeys, keyData);
+}
+
+// For CMD 17h response: unpacks 7-bit key data for note configuration. 55 or 56 bytes
+FirmwareSupport::Error LumatoneSysEx::unpackGetNoteConfigResponse(const juce::MidiMessage& response, int& boardId, juce::uint8 numKeys, int* keyData)
+{
+    return unpack7BitOctaveData(response, boardId, numKeys, keyData);
+}
+
+// For CMD 18h response: unpacks 7-bit key type data for key configuration. 55 or 56 bytes
+FirmwareSupport::Error LumatoneSysEx::unpackGetTypeConfigResponse(const juce::MidiMessage& response, int& boardId, juce::uint8 numKeys, int* keyData)
+{
+    return unpack7BitOctaveData(response, boardId, numKeys, keyData);
+}
+
+// For CMD 19h response: unpacks 8-bit key data for maximums of adc threshold. 55 or 56 bytes
+FirmwareSupport::Error LumatoneSysEx::unpackGetKeyMaxThresholdsResponse(const juce::MidiMessage& response, int& boardId, juce::uint8 numKeys, int* keyData)
+{
+    return unpack8BitData(response, numKeys, keyData);
+}
+
+// For CMD 1Ah response: unpacks 8-bit key data for minimums of adc threshold. 55 or 56 bytes
+FirmwareSupport::Error LumatoneSysEx::unpackGetKeyMinThresholdsResponse(const juce::MidiMessage& response, int& boardId, juce::uint8 numKeys, int* keyData)
+{
+    return unpack8BitOctaveData(response, boardId, numKeys, keyData);
+}
+
+// For CMD 1Bh response: unpacks 8-bit key data for maximums of adc threshold for aftertouch triggering. 55 or 56 bytes
+FirmwareSupport::Error LumatoneSysEx::unpackGetAftertouchMaxThresholdsResponse(const juce::MidiMessage& response, int& boardId, juce::uint8 numKeys, int* keyData)
+{
+    return unpack8BitOctaveData(response, boardId, numKeys, keyData);
+}
+
+// For CMD 1Ch response: unpacks boolean key validity data for board, whether or not each key meets threshold specs
+FirmwareSupport::Error LumatoneSysEx::unpackGetKeyValidityResponse(const juce::MidiMessage& response, int& boardId, juce::uint8 numKeys, bool* keyValidityData)
+{
+    // TODO: perhaps define boolean unpacking, or combine with 7-bit somehow
+
+    // Custom unpacking function for boolean array
+    auto unpackFunction = [&](const juce::uint8* payload) {
+        for (int i = 0; i < numKeys; i++)
+            keyValidityData[i] = (bool)payload[i];
+        return FirmwareSupport::Error::noError;
+    };
+
+    auto status = unpackIfValid(response, numKeys, unpackFunction);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    boardId = response.getSysExData()[BOARD_IND];
+    return status;
+}
+
+// For CMD 1Dh response: unpacks 7-bit velocity configuration of keyboard, 128 bytes
+FirmwareSupport::Error LumatoneSysEx::unpackGetVelocityConfigResponse(const juce::MidiMessage& response, int* velocityData)
+{
+    return unpack7BitData(response, 128, velocityData);
+}
+
+// For CMD 1Eh response: unpacks 7-bit fader configuration of keyboard, 128 bytes
+FirmwareSupport::Error LumatoneSysEx::unpackGetFaderConfigResponse(const juce::MidiMessage& response, int* faderData)
+{
+    return unpack7BitData(response, 128, faderData);
+}
+
+// For CMD 1Fh response: unpacks 7-bit aftertouch configuration of keyboard, 128 bytes
+FirmwareSupport::Error LumatoneSysEx::unpackGetAftertouchConfigResponse(const juce::MidiMessage& response, int* aftertouchData)
+{
+    return unpack7BitData(response, 128, aftertouchData);
+}
+
+// For CMD 21h response: unpacks 12-bit velocity interval configuration of keyboard, 254 bytes encoding 127 values
+FirmwareSupport::Error LumatoneSysEx::unpackGetVelocityIntervalConfigResponse(const juce::MidiMessage& response, int* intervalData)
+{
+    return unpack12BitDataFrom7Bit(response, 254, intervalData);
+}
+
+// For CMD 22h response: unpacks 7-bit fader type configuration of board, 56 bytes
+FirmwareSupport::Error LumatoneSysEx::unpackGetFaderConfigResponse(const juce::MidiMessage& response, int& boardId, juce::uint8 numKeys, int* faderData)
+{
+    return unpackOctaveConfig(response, boardId, numKeys, faderData, [&](const juce::MidiMessage&, size_t, int*) {
+        return unpack7BitData(response, numKeys, faderData);
+    });
+}
+
+// For CMD 23h response: unpacks serial ID number of keyboard, 12 7-bit values encoding 6 bytes
+FirmwareSupport::Error LumatoneSysEx::unpackGetSerialIdentityResponse(const juce::MidiMessage& response, int* serialBytes)
+{
+    // Check for echo first
+    auto sysExData = response.getSysExData();
+    if (sysExData[MSG_STATUS] == TEST_ECHO)
+        return FirmwareSupport::Error::messageIsAnEcho;
+    
+    auto errorCode = FirmwareSupport::Error::noError;
+
+    if (response.getSysExDataSize() == 18)
+        errorCode = unpack8BitData(response, 12, serialBytes);
+    else if (response.getSysExDataSize() < 18)
+    {
+        // Early firmware versions don't send serial payload
+        errorCode = messageIsValidLumatoneResponse(response);
+        if (errorCode == FirmwareSupport::Error::noError)
+        {
+            for (juce::uint8 i = 0; i < 6; i++)
+                serialBytes[i] = 0;
+        }
+    }
+    else
+        errorCode = FirmwareSupport::Error::messageTooLong;
+
+    return errorCode;
+}
+
+// For CMD 30h response: unpacks 7-bit Lumatouch configuration of keyboard, 128 bytes
+FirmwareSupport::Error LumatoneSysEx::unpackGetLumatouchConfigResponse(const juce::MidiMessage& response, int* lumatouchData)
+{
+    return unpack7BitData(response, 128, lumatouchData);
+}
+
+// For CMD 31h response: unpacks firmware revision running on the keyboard
+FirmwareSupport::Error LumatoneSysEx::unpackGetFirmwareRevisionResponse(const juce::MidiMessage& response, int& majorVersion, int& minorVersion, int& revision)
+{
+    auto status = messageIsValidLumatoneResponse(response);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    status = responseIsExpectedLength(response, 3);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    auto payload = &response.getSysExData()[PAYLOAD_INIT];
+    majorVersion = payload[0];
+    minorVersion = payload[1];
+    revision     = payload[2];
+
+    return status;
+}
+
+// For CMD 33h response: echo payload
+// FirmwareSupport::Error LumatoneSysEx::unpackPingResponse(const juce::MidiMessage& response, int& value1, int& value2, int& value3, int& value4)
+// {
+//     auto status = messageIsValidLumatoneResponse(response);
+//     if (status != FirmwareSupport::Error::noError)
+//         return status;
+
+//     status = responseIsExpectedLength(response, 4);
+//     if (status != FirmwareSupport::Error::noError)
+//         return status;
+
+//     auto payload = &response.getSysExData()[PAYLOAD_INIT];
+//     value1 = payload[0];
+//     value2 = payload[1];
+//     value3 = payload[2];
+//     value4 = payload[3];
+
+//     return status;
+// }
+
+// For CMD 33h response: echo payload
+FirmwareSupport::Error LumatoneSysEx::unpackPingResponse(const juce::MidiMessage& response, unsigned int& value)
+{
+    // Check for echo first
+    auto sysExData = response.getSysExData();
+    if (sysExData[MSG_STATUS] == TEST_ECHO)
+        return FirmwareSupport::Error::messageIsAnEcho;
+    
+    auto status = messageIsValidLumatoneResponse(response);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    status = responseIsExpectedLength(response, 4);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    auto payload = &sysExData[PAYLOAD_INIT];
+    value = (payload[1] << 14) | (payload[2] << 7) | (payload[3]);
+
+    return status;
+}
+
+// For CMD 3Ah response: retrieve all 8-bit threshold values of a certain board
+FirmwareSupport::Error LumatoneSysEx::unpackGetBoardThresholdValuesResponse(const juce::MidiMessage& response, int& boardId, int& minHighThreshold, int& minLowThreshold, int& maxThreshold, int& aftertouchThreshold, int& ccThreshold)
+{
+    const short NUM_UNPACKED = 5;
+    int unpackedData[NUM_UNPACKED];
+    auto status = unpack8BitOctaveData(response, boardId, NUM_UNPACKED, unpackedData);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    minHighThreshold     = unpackedData[0];
+    minLowThreshold      = unpackedData[1];
+    maxThreshold         = unpackedData[2];
+    aftertouchThreshold  = unpackedData[3];
+    ccThreshold          = unpackedData[4];
+
+    return status;
+}
+
+// For CMD 3Bh response: retrieve all threshold values of a certain board
+FirmwareSupport::Error LumatoneSysEx::unpackGetBoardSensitivityValuesResponse(const juce::MidiMessage& response, int& boardId, int& ccSensitivity, int& aftertouchSensitivity)
+{
+    const short NUM_UNPACKED = 2;
+    int unpackedData[NUM_UNPACKED];
+    auto status = unpack8BitOctaveData(response, boardId, NUM_UNPACKED, unpackedData);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    ccSensitivity           = unpackedData[0];
+    aftertouchSensitivity   = unpackedData[1];
+
+    return status;
+}
+
+// For CMD 3Dh response: retrieve all threshold values of a certain board
+FirmwareSupport::Error LumatoneSysEx::unpackGetPeripheralChannelsResponse(const juce::MidiMessage& response, int& pitchWheelChannel, int& modWheelChannel, int& expressionChannel, int& sustainPedalChannel)
+{
+    const short NUM_UNPACKED = 4;
+    int unpackedData[NUM_UNPACKED];
+    auto status = unpack7BitData(response, NUM_UNPACKED, unpackedData);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    pitchWheelChannel   = unpackedData[0] + 1;
+    modWheelChannel     = unpackedData[1] + 1;
+    expressionChannel   = unpackedData[2] + 1;
+    sustainPedalChannel = unpackedData[3] + 1;
+
+    return status;
+}
+
+// For CMD 3Eh response: read back the calibration mode of the message
+FirmwareSupport::Error LumatoneSysEx::unpackPeripheralCalibrationMode(const juce::MidiMessage& response, int& calibrationMode)
+{
+    // Other errors will be caught in corresponding mode unpacking
+    int msgSize = response.getSysExDataSize();
+    int expectedSize = PAYLOAD_INIT + 15;
+    
+    if (msgSize < expectedSize)
+        return FirmwareSupport::Error::messageTooShort;
+    
+    else if (msgSize > expectedSize)
+        return FirmwareSupport::Error::messageTooLong;
+
+    auto sysExData = response.getSysExData();
+    calibrationMode = sysExData[CALIB_MODE];
+
+    return FirmwareSupport::Error::noError;
+}
+
+// For CMD 3Eh response: retrieve 12-bit expression pedal calibration status values in respective mode, automatically sent every 100ms
+FirmwareSupport::Error LumatoneSysEx::unpackExpressionPedalCalibrationPayload(const juce::MidiMessage& response, int& minBound, int& maxBound, bool& valid)
+{
+    const short NUM_UNPACKED = 15; // Actually two + boolean, but this message always returns 15-byte payload
+    int unpackedData[NUM_UNPACKED];
+    auto status = unpack12BitDataFrom4Bit(response, 15, unpackedData);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    minBound = unpackedData[0];
+    maxBound = unpackedData[1];
+    valid = response.getSysExData()[PAYLOAD_INIT + 3];
+    
+    return status;
+}
+
+// For CMD 3Eh response: retrieve 12-bit pitch & mod wheel calibration status values in respective mode, automatically sent every 100ms
+FirmwareSupport::Error LumatoneSysEx::unpackWheelsCalibrationPayload(const juce::MidiMessage& response, int& centerPitch, int& minPitch, int& maxPitch, int& minMod, int& maxMod)
+{
+    const short NUM_UNPACKED = 15;
+    int unpackedData[NUM_UNPACKED];
+    auto status = unpack12BitDataFrom4Bit(response, NUM_UNPACKED, unpackedData);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    centerPitch = unpackedData[0];
+    minPitch    = unpackedData[1];
+    maxPitch    = unpackedData[2];
+    minMod      = unpackedData[3];
+    maxMod      = unpackedData[4];
+
+    return status;
+}
+
+// For CMD 40h response: retrieve aftertouch trigger delay of a certain board
+FirmwareSupport::Error LumatoneSysEx::unpackGetAftertouchTriggerDelayResponse(const juce::MidiMessage& response, int& boardId, int& triggerDelay)
+{
+    const short NUM_UNPACKED = 1;
+    int unpackedData[NUM_UNPACKED];
+    auto status = unpack8BitData(response, NUM_UNPACKED, unpackedData);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    triggerDelay = unpackedData[0];
+    return status;
+}
+
+// For CMD 42h response: retrieve 12-bit Lumatouch note off delay of a certain board
+FirmwareSupport::Error LumatoneSysEx::unpackGetLumatouchNoteOffDelayResponse(const juce::MidiMessage& response, int& boardId, int& delay)
+{
+    auto status = messageIsValidLumatoneResponse(response);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    status = responseIsExpectedLength(response, 3);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    auto payload = &response.getSysExData()[PAYLOAD_INIT];
+
+    delay = (payload[0] << 8) | (payload[1] << 4) | payload[2];
+
+    return status;
+}
+
+// For CMD 44h response: retrieve 12-bit expression pedal adc threshold, a 12-bit value
+FirmwareSupport::Error LumatoneSysEx::unpackGetExpressionPedalThresholdResponse(const juce::MidiMessage& response, int& thresholdValue)
+{
+    auto status = messageIsValidLumatoneResponse(response);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    status = responseIsExpectedLength(response, 3);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    auto payload = &response.getSysExData()[PAYLOAD_INIT];
+
+    thresholdValue = (payload[0] << 8) | (payload[1] << 4) | payload[2];
+
+    return status;
+}
+
+// For CMD 47h response: retrieve preset flags
+FirmwareSupport::Error LumatoneSysEx::unpackGetPresetFlagsResponse(const juce::MidiMessage& response, bool& expressionInverted, bool& lightsOnKeystroke, bool& aftertouchOn, bool& sustainInverted)
+{
+    const short NUM_UNPACKED = 4;
+    int unpackedData[NUM_UNPACKED];
+    auto status = unpack7BitData(response, NUM_UNPACKED, unpackedData);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    expressionInverted  = unpackedData[0];
+    lightsOnKeystroke   = unpackedData[1];
+    aftertouchOn        = unpackedData[2];
+    sustainInverted     = unpackedData[3];
+
+    return status;
+}
+
+// For CMD 48h response: get expression pedal sensitivity
+FirmwareSupport::Error LumatoneSysEx::unpackGetExpressionPedalSensitivityResponse(const juce::MidiMessage& response, int& sensitivity)
+{
+    const short NUM_UNPACKED = 1;
+    int unpackedData[NUM_UNPACKED];
+    auto status = unpack7BitData(response, NUM_UNPACKED, unpackedData);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    sensitivity = unpackedData[0];
+
+    return status;
+}
diff --git a/Source/lumatone_editor_library/lumatone_midi_driver/firmware_sysex.h b/Source/lumatone_editor_library/lumatone_midi_driver/firmware_sysex.h
new file mode 100644
index 00000000..ad80c17e
--- /dev/null
+++ b/Source/lumatone_editor_library/lumatone_midi_driver/firmware_sysex.h
@@ -0,0 +1,164 @@
+/*
+  ==============================================================================
+
+    firmware_sysex.h
+    Created: 30 Sep 2023
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#ifndef LUMATONE_FIRMWARE_SYSEX_H
+#define LUMATONE_FIRMWARE_SYSEX_H
+
+#include <JuceHeader.h>
+#include "firmware_support.h"
+
+struct LumatoneSysEx
+{
+
+// Fill a buffer with 3-bytes representing the manufacturer's ID
+static void fillManufacturerId(unsigned char* data);
+
+// Create a SysEx message with standardized length
+static juce::MidiMessage createTerpstraSysEx(juce::uint8 boardIndex, juce::uint8 cmd, juce::uint8 data1, juce::uint8 data2, juce::uint8 data3, juce::uint8 data4);
+
+// Create a SysEx message to send 8-bit colour precision to a Lumatone key
+static juce::MidiMessage createExtendedKeyColourSysEx(juce::uint8 boardIndex, juce::uint8 cmd, juce::uint8 keyIndex, juce::uint8 redUpper, juce::uint8 redLower, juce::uint8 greenUpper, juce::uint8 greenLower, juce::uint8 blueUpper, juce::uint8 blueLower);
+static juce::MidiMessage createExtendedKeyColourSysEx(juce::uint8 boardIndex, juce::uint8 cmd, juce::uint8 keyIndex, int red, int green, int blue);
+
+// Create a SysEx message to send 8-bit colour precision to macro buttons
+static juce::MidiMessage createExtendedMacroColourSysEx(juce::uint8 cmd, juce::uint8 redUpper, juce::uint8 redLower, juce::uint8 greenUpper, juce::uint8 greenLower, juce::uint8 blueUpper, juce::uint8 blueLower);
+static juce::MidiMessage createExtendedMacroColourSysEx(juce::uint8 cmd, int red, int green, int blue);
+
+// Create a SysEx message encoding a table with a defined size
+static juce::MidiMessage createTableSysEx(juce::uint8 boardIndex, juce::uint8 cmd, juce::uint8 tableSize, const juce::uint8 table[]);
+
+
+// Checks if message is a valid Lumatone firmware response and is expected length, then runs supplied unpacking function or returns an error code 
+static FirmwareSupport::Error unpackIfValid(const juce::MidiMessage& response, size_t numBytes, std::function<FirmwareSupport::Error(const juce::uint8*)> unpackFunction);
+
+// Generic unpacking of octave data from a SysEx message
+static FirmwareSupport::Error unpackOctaveConfig(const juce::MidiMessage& msg, int& boardId, size_t numBytes, int* keyData, std::function<FirmwareSupport::Error(const juce::MidiMessage&, size_t, int*)> nBitUnpackFunction);
+
+// Generic unpacking of 7-bit data from a SysEx message
+static FirmwareSupport::Error unpack7BitData(const juce::MidiMessage& msg, size_t numBytes, int* unpackedData);
+
+// Unpacking of octave-based 7-bit key configuration data
+static FirmwareSupport::Error unpack7BitOctaveData(const juce::MidiMessage& msg, int& boardId, juce::uint8 numKeys, int* keyData);
+
+// Generic unpacking of 8-bit data from a SysEx message
+static FirmwareSupport::Error unpack8BitData(const juce::MidiMessage& msg, size_t numBytes, int* unpackedData);
+
+// Unpacking of octave-based 8-bit data
+static FirmwareSupport::Error unpack8BitOctaveData(const juce::MidiMessage& msg, int& boardId, juce::uint8 numKeys, int* keyData);
+
+// Generic unpacking of 12-bit data from a SysEx message, when packed with two 7-bit values
+static FirmwareSupport::Error unpack12BitDataFrom7Bit(const juce::MidiMessage& msg, size_t numBytes, int* unpackedData);
+
+// Generic unpacking of 12-bit data from a SysEx message, when packed with three 4-bit values
+static FirmwareSupport::Error unpack12BitDataFrom4Bit(const juce::MidiMessage& msg, size_t numBytes, int* unpackedData);
+
+
+// Message is SysEx message with Lumatone Inc. manufacturer ID, valid board ID byte, and acknowledged status
+static FirmwareSupport::Error messageIsValidLumatoneResponse(const juce::MidiMessage& midiMessage);
+
+// Determines if response is too short, too long, or expected
+static FirmwareSupport::Error responseIsExpectedLength(const juce::MidiMessage& midiMessage, size_t numPayloadBytes);
+
+//============================================================================
+// Specific commands for unpacking responses, returns error code
+
+// For CMD 13h response: unpacks 8-bit key data for red LED intensity. 112 bytes, lower and upper nibbles for 56 values
+static FirmwareSupport::Error unpackGetLEDConfigResponse(const juce::MidiMessage& response, int& boardId, int* keyData);
+
+// For CMD 13h response: unpacks 7-bit key data for red LED intensity. 56 bytes, each value must be multiplied by 5
+static FirmwareSupport::Error unpackGetLEDConfigResponse_Version_1_0_0(const juce::MidiMessage& response, int& boardId, juce::uint8 numKeys, int* keyData);
+
+// For CMD 16h response: unpacks 7-bit channel data for note configuration. 55 or 56 bytes
+static FirmwareSupport::Error unpackGetChannelConfigResponse(const juce::MidiMessage& response, int& boardId, juce::uint8 numKeys, int* keyData);
+
+// For CMD 17h response: unpacks 7-bit key data for note configuration. 55 or 56 bytes
+static FirmwareSupport::Error unpackGetNoteConfigResponse(const juce::MidiMessage& response, int& boardId, juce::uint8 numKeys, int* keyData);
+
+// For CMD 18h response: unpacks 7-bit key type data for key configuration. 55 or 56 bytes
+static FirmwareSupport::Error unpackGetTypeConfigResponse(const juce::MidiMessage& response, int& boardId, juce::uint8 numKeys, int* keyData);
+
+// For CMD 19h response: unpacks 8-bit key data for maximums of adc threshold. 55 or 56 bytes
+static FirmwareSupport::Error unpackGetKeyMaxThresholdsResponse(const juce::MidiMessage& response, int& boardId, juce::uint8 numKeys, int* keyData);
+
+// For CMD 1Ah response: unpacks 8-bit key data for minimums of adc threshold. 55 or 56 bytes
+static FirmwareSupport::Error unpackGetKeyMinThresholdsResponse(const juce::MidiMessage& response, int& boardId, juce::uint8 numKeys, int* keyData);
+
+// For CMD 1Bh response: unpacks 8-bit key data for maximums of adc threshold for aftertouch triggering. 55 or 56 bytes
+static FirmwareSupport::Error unpackGetAftertouchMaxThresholdsResponse(const juce::MidiMessage& response, int& boardId, juce::uint8 numKeys, int* keyData);
+
+// For CMD 1Ch response: unpacks boolean key validity data for board, whether or not each key meets threshold specs
+static FirmwareSupport::Error unpackGetKeyValidityResponse(const juce::MidiMessage& response, int& boardId, juce::uint8 numKeys, bool* keyValidityData);
+
+// For CMD 1Dh response: unpacks 7-bit velocity configuration of keyboard, 128 bytes
+static FirmwareSupport::Error unpackGetVelocityConfigResponse(const juce::MidiMessage& response, int* velocityData);
+
+// For CMD 1Eh response: unpacks 7-bit fader configuration of keyboard, 128 bytes
+static FirmwareSupport::Error unpackGetFaderConfigResponse(const juce::MidiMessage& response, int* faderData);
+
+// For CMD 1Fh response: unpacks 7-bit aftertouch configuration of keyboard, 128 bytes
+static FirmwareSupport::Error unpackGetAftertouchConfigResponse(const juce::MidiMessage& response, int* aftertouchData);
+
+// For CMD 21h response: unpacks 12-bit velocity interval configuration of keyboard, 254 bytes encoding 127 values
+static FirmwareSupport::Error unpackGetVelocityIntervalConfigResponse(const juce::MidiMessage& response, int* intervalData);
+
+// For CMD 22h response: unpacks 7-bit fader type configuration of board, 56 bytes
+static FirmwareSupport::Error unpackGetFaderConfigResponse(const juce::MidiMessage& response, int& boardId, juce::uint8 numKeys, int* faderData);
+
+// For CMD 23h response: unpacks serial ID number of keyboard, 12 7-bit values encoding 6 bytes
+static FirmwareSupport::Error unpackGetSerialIdentityResponse(const juce::MidiMessage& response, int* serialBytes);
+
+// For CMD 30h response: unpacks 7-bit Lumatouch configuration of keyboard, 128 bytes
+static FirmwareSupport::Error unpackGetLumatouchConfigResponse(const juce::MidiMessage& response, int* lumatouchData);
+
+// For CMD 31h response: unpacks firmware revision running on the keyboard
+static FirmwareSupport::Error unpackGetFirmwareRevisionResponse(const juce::MidiMessage& response, int& majorVersion, int& minorVersion, int& revision);
+
+// For CMD 33h response: echo payload
+// static FirmwareSupport::Error unpackPingResponse(const juce::MidiMessage& response, int& value1, int& value2, int& value3, int& value4);
+static FirmwareSupport::Error unpackPingResponse(const juce::MidiMessage& response, unsigned int& value);
+
+// For CMD 3Ah response: retrieve all 8-bit threshold values of a certain board
+static FirmwareSupport::Error unpackGetBoardThresholdValuesResponse(const juce::MidiMessage& response, int& boardId, int& minHighThreshold, int& minLowThreshold, int& maxThreshold, int& aftertouchThreshold, int& ccThreshold);
+
+// For CMD 3Bh response: retrieve all threshold values of a certain board
+static FirmwareSupport::Error unpackGetBoardSensitivityValuesResponse(const juce::MidiMessage& response, int& boardId, int& ccSensitivity, int& aftertouchSensitivity);
+
+// For CMD 3Dh response: retrieve MIDI channels of which peripherals are configured
+static FirmwareSupport::Error unpackGetPeripheralChannelsResponse(const juce::MidiMessage& response, int& pitchWheelChannel, int& modWheelChannel, int& expressionChannel, int& sustainPedalChannel);
+
+// For CMD 3Eh response: read back the calibration mode of the message
+static FirmwareSupport::Error unpackPeripheralCalibrationMode(const juce::MidiMessage& response, int& calibrationMode);
+
+// For CMD 3Eh response: retrieve 12-bit expression pedal calibration status values in respective mode, automatically sent every 100ms
+static FirmwareSupport::Error unpackExpressionPedalCalibrationPayload(const juce::MidiMessage& response, int& minBound, int& maxBound, bool& valid);
+
+// For CMD 3Eh response: retrieve 12-bit pitch & mod wheel calibration status values in respective mode, automatically sent every 100ms
+static FirmwareSupport::Error unpackWheelsCalibrationPayload(const juce::MidiMessage& response, int& centerPitch, int& minPitch, int& maxPitch, int& minMod, int& maxMod);
+
+// For CMD 40h response: retrieve 8-bit aftertouch trigger delay of a certain board
+static FirmwareSupport::Error unpackGetAftertouchTriggerDelayResponse(const juce::MidiMessage& response, int& boardId, int& triggerDelay);
+
+// For CMD 42h response: retrieve 12-bit Lumatouch note off delay of a certain board
+static FirmwareSupport::Error unpackGetLumatouchNoteOffDelayResponse(const juce::MidiMessage& response, int& boardId, int& delay);
+
+// For CMD 44h response: retrieve 12-bit expression pedal adc threshold
+static FirmwareSupport::Error unpackGetExpressionPedalThresholdResponse(const juce::MidiMessage& response, int& thresholdValue);
+
+// For CMD 47h response: retrieve preset flags
+static FirmwareSupport::Error unpackGetPresetFlagsResponse(const juce::MidiMessage& response, bool& expressionInverted, bool& lightsOnKeystroke, bool& aftertouchOn, bool& sustainInverted);
+
+// For CMD 48h response: get expression pedal sensitivity
+static FirmwareSupport::Error unpackGetExpressionPedalSensitivityResponse(const juce::MidiMessage& response, int& sensitivity);
+
+// Message is an answer to a sent message yes/no
+static bool messageIsResponseToMessage(const juce::MidiMessage& answer, const juce::MidiMessage& originalMessage);
+};
+
+#endif
diff --git a/Source/lumatone_editor_library/lumatone_midi_driver/firmware_types.h b/Source/lumatone_editor_library/lumatone_midi_driver/firmware_types.h
new file mode 100644
index 00000000..cb5aec53
--- /dev/null
+++ b/Source/lumatone_editor_library/lumatone_midi_driver/firmware_types.h
@@ -0,0 +1,205 @@
+/*
+  ==============================================================================
+
+    firmware_types.h
+    Created: 30 Sep 2023
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#ifndef LUMATONE_FIRMWARE_TYPES_H
+#define LUMATONE_FIRMWARE_TYPES_H
+
+#include <JuceHeader.h>
+#include "firmware_definitions.h"
+
+namespace LumatoneFirmware
+{
+
+enum class ReleaseVersion
+{
+	NO_VERSION      = 0,  // Used for instantiation
+	UNKNOWN_VERSION = 0,  // Used when no other version applies
+	VERSION_55_KEYS = 1,  // Used when GetSerialIdentity returns 00000000
+	VERSION_1_0_3 = 0x10,
+	VERSION_1_0_4,
+	VERSION_1_0_5,
+	VERSION_1_0_6,
+	VERSION_1_0_7,
+	VERSION_1_0_8,
+	VERSION_1_0_9,
+	VERSION_1_0_10,
+	VERSION_1_0_11,
+	VERSION_1_0_12,
+    VERSION_1_1_0 = VERSION_1_0_12,
+    VERSION_1_2_0,
+	LAST_VERSION = VERSION_1_2_0,
+	FUTURE_VERSION = 0xFFFF  // Used when version is nonnegative and below 9.9.999
+};
+
+
+struct PeripheralChannelSettings
+{
+	int pitchWheel = 1;
+	int modWheel = 1;
+	int expressionPedal = 1;
+	int sustainPedal = 1;
+
+	void setChannel(PeripheralChannel controlId, int channelIn)
+	{
+		if (channelIn < 1)
+			channelIn = 1;
+
+		if (channelIn > 16)
+			channelIn = 16;
+
+		switch (controlId)
+		{
+		case PeripheralChannel::PitchWheel:
+			pitchWheel = channelIn;
+			break;
+
+		case PeripheralChannel::ModWheel:
+			modWheel = channelIn;
+			break;
+
+		case PeripheralChannel::Expression:
+			expressionPedal = channelIn;
+			break;
+
+		case PeripheralChannel::Sustain:
+			sustainPedal = channelIn;
+			break;
+		}
+	}
+
+	int getChannel(PeripheralChannel controlId)
+	{
+		switch (controlId)
+		{
+		case PeripheralChannel::PitchWheel:
+			return pitchWheel;
+
+		case PeripheralChannel::ModWheel:
+			return modWheel;
+
+		case PeripheralChannel::Expression:
+			return expressionPedal;
+
+		case PeripheralChannel::Sustain:
+			return sustainPedal;
+		}
+
+		return 0;
+	}
+};
+
+
+struct WheelsCalibrationData
+{
+	int centerPitch = 0;
+	int minPitch = 0;
+	int maxPitch = 0;
+
+	int minMod = 0;
+	int maxMod = 0;
+
+	float getCentrePitchNorm() const { return (float)centerPitch * ADCSCALAR; }
+	float getMinPitchNorm() const { return (float)minPitch * ADCSCALAR; }
+	float getMaxPitchNorm() const { return (float)maxPitch * ADCSCALAR; }
+	float getMinModNorm() const { return (float)minMod * ADCSCALAR; }
+	float getMaxModNorm() const { return (float)maxMod * ADCSCALAR; }
+
+	juce::String toString() const
+	{
+		juce::String str;
+		str += ("Center Pitch: " + juce::String(centerPitch) + juce::newLine);
+		str += ("   Min Pitch: " + juce::String(minPitch) + juce::newLine);
+		str += ("   Max Pitch: " + juce::String(maxPitch) + juce::newLine);
+		str += ("     Min Mod: " + juce::String(minMod) + juce::newLine);
+		str += ("     Max Mod: " + juce::String(maxMod) + juce::newLine);
+		return str;
+	}
+};
+
+
+struct Version
+{
+	int major = 0;
+	int minor = 0;
+	int revision = 0;
+
+	Version(int majorVersion=0, int minorVersion=0, int revisionNumber=0)
+		: major(majorVersion), minor(minorVersion), revision(revisionNumber) {}
+
+	bool isValid() { return major > 0 || minor > 0 || revision > 0; }
+
+	juce::String toString() const { return juce::String(major) + "." + juce::String(minor) + "." + juce::String(revision); }
+
+	juce::String toDisplayString() const 
+	{ 
+		juce::String str = juce::String(major) + "." + juce::String(minor);
+		if (revision > 0)
+			str += ("." + juce::String(revision));
+
+		return str;
+	}
+
+	//============================================================================
+
+	static Version fromString(juce::String firmwareVersion)
+	{
+		Version version(0, 0, 0);
+
+		juce::String afterFirstDecimal = firmwareVersion.fromFirstOccurrenceOf(".", false, true);
+
+		// Just check if it contains at least two decimals
+		if (firmwareVersion.contains(".") && afterFirstDecimal.contains("."))
+		{
+			juce::String majorNum = firmwareVersion.upToFirstOccurrenceOf(".", false, true);
+
+			juce::String minorNum = afterFirstDecimal.upToFirstOccurrenceOf(".", false, true);
+
+			if (minorNum == afterFirstDecimal)
+			{
+				// This means there was only one decimal, don't try to parse
+				return version;
+			}
+
+			juce::String revisionNum = firmwareVersion.fromLastOccurrenceOf(".", false, true);
+			if (revisionNum != revisionNum.upToFirstOccurrenceOf(".", false, true))
+			{
+				// This means there's an additional decimal, don't try to parse
+				return version;
+			}
+
+			version.major = majorNum.getIntValue();
+			version.minor = majorNum.getIntValue();
+			version.revision = majorNum.getIntValue();
+		}
+
+		return version;
+	}
+
+	static Version fromReleaseVersion(ReleaseVersion versionIn)
+	{
+		int versionIndex = (int)versionIn;
+		if (versionIn >= ReleaseVersion::VERSION_1_0_3)
+		{
+			// Return special definition for future version
+			if (versionIn > ReleaseVersion::LAST_VERSION)
+				return Version(0, 0, (int)ReleaseVersion::FUTURE_VERSION);
+			else
+				return Version(1, 0, versionIndex - (int)ReleaseVersion::VERSION_1_0_3);
+		}
+		// Return special definition for 55-keys version
+		else if (versionIn == ReleaseVersion::VERSION_55_KEYS)
+			return Version(0, 0, 55);
+		
+		return Version(0, 0, 0);
+	}
+};
+
+}
+#endif
diff --git a/Source/lumatone_editor_library/lumatone_midi_driver/lumatone_midi_driver.cpp b/Source/lumatone_editor_library/lumatone_midi_driver/lumatone_midi_driver.cpp
new file mode 100644
index 00000000..f2c8d1f4
--- /dev/null
+++ b/Source/lumatone_editor_library/lumatone_midi_driver/lumatone_midi_driver.cpp
@@ -0,0 +1,1024 @@
+/*
+  ==============================================================================
+
+    LumatoneFirmwareDriver.cpp
+    Created: 20 Feb 2015 8:04:02pm
+    Author:  hsstraub
+
+  ==============================================================================
+*/
+
+#ifndef LUMATONE_FIRMWARE_DRIVER_H
+#define LUMATONE_FIRMWARE_DRIVER_H
+
+#include "lumatone_midi_driver.h"
+#include "./firmware_sysex.h"
+#include "./firmware_driver_listener.h"
+// #include "./firmware_support.h"
+
+// There are different race-condition issues between macOS and Windows. 
+// This Driver may need to be redesigned, but for now this define is
+// used for including a juce::MessageManagerLock on Windows & Linux, but not on macOS.
+
+#define MIDI_DRIVER_USE_LOCK JUCE_WINDOWS //|| JUCE_LINUX
+
+LumatoneFirmwareDriver::LumatoneFirmwareDriver(HostMode hostModeIn, int numBoardsIn)
+    : hostMode(hostModeIn)
+    , numBoards(numBoardsIn)
+    // , LumatoneSandboxLogger("LumatoneFirmwareDriver")
+{
+}     
+
+LumatoneFirmwareDriver::~LumatoneFirmwareDriver()
+{
+    listeners.clear();
+}
+
+//============================================================================
+// TerpstaMidiDriver::LumatoneFirmwareDriverListener helpers
+
+void LumatoneFirmwareDriver::addDriverListener(LumatoneFirmwareDriverListener* collectorToAdd)
+{ 
+    listeners.add(collectorToAdd);
+}
+
+void LumatoneFirmwareDriver::removeDriverListener(LumatoneFirmwareDriverListener* collectorToRemove)
+{
+    listeners.remove(collectorToRemove);
+}
+
+void LumatoneFirmwareDriver::readNextBuffer(juce::MidiBuffer &nextBuffer)
+{
+    juce::ScopedTryLock l(hostLock);
+    if (l.isLocked())
+    {
+        nextBuffer.swapWith(hostQueue);
+        hostQueue.clear();
+        hostQueueSize = 0;
+    }
+}
+
+void LumatoneFirmwareDriver::sendMessageNow(const juce::MidiMessage &msg)
+{
+    // if (msg.isSysEx())
+    //     logInfo("sendMessageNow", FirmwareSupport::getCommandDescription(msg));
+
+    switch (hostMode)
+    {
+    case HostMode::Driver:
+        HajuMidiDriver::sendMessageNow(msg);
+        break;
+    case HostMode::Plugin:
+    default:
+        break;
+    }
+
+    juce::ScopedLock l(hostLock);
+    hostQueue.addEvent(msg, hostQueueSize++);
+}
+
+void LumatoneFirmwareDriver::notifyMessageReceived(juce::MidiInput* source, const juce::MidiMessage& midiMessage)
+{
+// #if MIDI_DRIVER_USE_LOCK
+//     const juce::MessageManagerLock lock;
+// #endif
+//     juce::MessageManager::callAsync([this, source, midiMessage]{
+//         for (auto collector : listeners) collector->midiMessageReceived(source, midiMessage);
+//     });
+    listeners.call(&LumatoneFirmwareDriverListener::midiMessageReceived, source, midiMessage);
+}
+
+void LumatoneFirmwareDriver::notifyMessageSent(juce::MidiOutput* target, const juce::MidiMessage& midiMessage)
+{
+    // Currently unused
+// #if MIDI_DRIVER_USE_LOCK
+//     const juce::MessageManagerLock lock;
+// #endif
+
+//     juce::MessageManager::callAsync([this, target, midiMessage]{
+//         for (auto collector : listeners) collector->midiMessageSent(target, midiMessage);
+//     });
+}
+
+void LumatoneFirmwareDriver::notifySendQueueSize()
+{
+    auto size = sysexQueue.size();
+    // for (auto collector : listeners) collector->midiSendQueueSize(size);
+    listeners.call(&LumatoneFirmwareDriverListener::midiSendQueueSize, size);
+}
+
+// void LumatoneFirmwareDriver::notifyLogMessage(juce::String textMessage, ErrorLevel errorLevel)
+// {
+//     for (auto collector : listeners) collector->generalLogMessage(textMessage, errorLevel);
+// }
+
+void LumatoneFirmwareDriver::notifyNoAnswerToMessage(juce::MidiDeviceInfo expectedDevice, const juce::MidiMessage& midiMessage)
+{
+    // juce::MessageManager::callAsync([this, expectedDevice, midiMessage]{
+    //     for (auto collector : listeners) collector->noAnswerToMessage(expectedDevice, midiMessage);
+    // });
+    listeners.call(&LumatoneFirmwareDriverListener::noAnswerToMessage, expectedDevice, midiMessage);
+}
+
+/*
+==============================================================================
+Single (mid-level) commands, firmware specific
+*/
+
+// CMD 00h: Send a single key's functionctional configuration
+void LumatoneFirmwareDriver::sendKeyFunctionParameters(juce::uint8 boardIndex, juce::uint8 keyIndex, juce::uint8 noteOrCCNum, juce::uint8 midiChannel, juce::uint8 keyType, bool faderUpIsNull)
+{
+    // DBG("SEND KEY FUNCTION REQUESTED " + juce::String(boardIndex) + "," + juce::String(keyIndex));
+    // boardIndex is expected 1-based
+    jassert(boardIndex > 0 && boardIndex <= numBoards);
+    jassert(midiChannel > 0 && midiChannel <= 16);
+    jassert(noteOrCCNum >= 0 && noteOrCCNum < 128);
+
+    midiChannel = (midiChannel - 1) & 0xF;
+    juce::uint8 typeByte = (faderUpIsNull << 4) | (keyType & 0x3);
+
+    sendSysEx(boardIndex, CHANGE_KEY_NOTE, keyIndex, noteOrCCNum, midiChannel, typeByte);
+}
+
+// CMD 01h: Send a single key's LED channel intensities
+void LumatoneFirmwareDriver::sendKeyLightParameters(juce::uint8 boardIndex, juce::uint8 keyIndex, juce::uint8 red, juce::uint8 green, juce::uint8 blue)
+{
+    // DBG("SEND KEY COLOUR REQUESTED " + juce::String(boardIndex) + "," + juce::String(keyIndex));
+
+    juce::MidiMessage msg = LumatoneSysEx::createExtendedKeyColourSysEx(boardIndex, SET_KEY_COLOUR, keyIndex, red, green, blue);
+
+    sendMessageWithAcknowledge(msg);
+}
+
+// CMD 01h: Send a single key's LED channel intensities, three pairs of 4-bit values for each channel
+void LumatoneFirmwareDriver::sendKeyLightParameters(juce::uint8 boardIndex, juce::uint8 keyIndex, juce::uint8 redUpper, juce::uint8 redLower, juce::uint8 greenUpper, juce::uint8 greenLower, juce::uint8 blueUpper, juce::uint8 blueLower)
+{
+    // boardIndex is expected 1-based
+    jassert(boardIndex > 0 && boardIndex <= numBoards);
+
+    if (redUpper   > 0xf) redUpper   &= 0xf;
+    if (redLower   > 0xf) redLower   &= 0xf;
+    if (greenUpper > 0xf) greenUpper &= 0xf;
+    if (greenLower > 0xf) greenLower &= 0xf;
+    if (blueUpper  > 0xf) blueUpper  &= 0xf;
+    if (blueLower  > 0xf) blueLower  &= 0xf;
+ 
+    juce::MidiMessage msg = LumatoneSysEx::createExtendedKeyColourSysEx(boardIndex, SET_KEY_COLOUR, keyIndex, redUpper, redLower, greenUpper, greenLower, blueUpper, blueLower);
+}
+
+// CMD 01h: Send a single key's LED channel intensities (pre-version 1.0.11)
+void LumatoneFirmwareDriver::sendKeyLightParameters_Version_1_0_0(juce::uint8 boardIndex, juce::uint8 keyIndex, juce::uint8 red, juce::uint8 green, juce::uint8 blue)
+{
+    // boardIndex is expected 1-based
+    jassert(boardIndex > 0 && boardIndex <= numBoards);
+
+    // clip if exceed 0x7f
+    if (red > 0x7f) red &= 0x7f;
+    if (green > 0x7f) green &= 0x7f;
+    if (blue > 0x7f) blue &= 0x7f;
+
+    sendSysEx(boardIndex, SET_KEY_COLOUR, keyIndex, red, green, blue);
+}
+
+// CMD 02h: Save current configuration to specified preset index
+void LumatoneFirmwareDriver::saveProgram(juce::uint8 presetNumber)
+{
+    jassert(presetNumber >= 0 && presetNumber < 10);
+    sendSysEx(0, SAVE_PROGRAM, presetNumber, '\0', '\0', '\0');
+}
+
+// CMD 03h: Send expression pedal sensivity
+void LumatoneFirmwareDriver::sendExpressionPedalSensivity(juce::uint8 value)
+{
+	jassert(value <= 0x7f);
+
+	sendSysEx(0, SET_FOOT_CONTROLLER_SENSITIVITY, value, '\0', '\0', '\0');
+}
+
+// CMD 04h: Send parametrization of foot controller
+void LumatoneFirmwareDriver::sendInvertFootController(bool value)
+{
+    sendSysExToggle(0, INVERT_FOOT_CONTROLLER, value);
+}
+
+// CMD 05h: Colour for macro button in active state, each value should be in range of 0x0-0xF and represents the upper and lower four bytes of each channel intensity
+void LumatoneFirmwareDriver::sendMacroButtonActiveColour(juce::uint8 red, juce::uint8 green, juce::uint8 blue)
+{
+    juce::MidiMessage msg = LumatoneSysEx::createExtendedMacroColourSysEx(MACROBUTTON_COLOUR_ON, red, green, blue);
+    sendMessageWithAcknowledge(msg);
+}
+
+// CMD 05h: Colour for macro button in active state, 3 pairs for 4-bit values for each LED channel
+void LumatoneFirmwareDriver::sendMacroButtonActiveColour(juce::uint8 redUpper, juce::uint8 redLower, juce::uint8 greenUpper, juce::uint8 greenLower, juce::uint8 blueUpper, juce::uint8 blueLower)
+{
+    juce::MidiMessage msg = LumatoneSysEx::createExtendedMacroColourSysEx(MACROBUTTON_COLOUR_ON, redUpper, redLower, greenUpper, greenLower, blueUpper, blueLower);
+    sendMessageWithAcknowledge(msg);
+}
+
+// CMD 05h: Colour for macro button in active state, each value should be in range of 0x00-0x7F (pre-version 1.0.11)
+void LumatoneFirmwareDriver::sendMacroButtonActiveColour_Version_1_0_0(juce::uint8 red, juce::uint8 green, juce::uint8 blue)
+{
+    if (red   > 0x7f) red   &= 0x7f;
+    if (green > 0x7f) green &= 0x7f;
+    if (blue  > 0x7f) blue  &= 0x7f;
+
+	sendSysEx(0, MACROBUTTON_COLOUR_ON, red, green, blue, '\0');
+}
+
+// CMD 06h: Colour for macro button in inactive state, each value should be in range of 0x0-0xF and represents the upper and lower four bytes of each channel intensity
+void LumatoneFirmwareDriver::sendMacroButtonInactiveColour(int red, int green, int blue)
+{
+    juce::MidiMessage msg = LumatoneSysEx::createExtendedMacroColourSysEx(MACROBUTTON_COLOUR_OFF, red, green, blue);
+    sendMessageWithAcknowledge(msg);
+}
+
+// CMD 05h: Colour for macro button in active state, 3 pairs for 4-bit values for each LED channel
+void LumatoneFirmwareDriver::sendMacroButtonInactiveColour(juce::uint8 redUpper, juce::uint8 redLower, juce::uint8 greenUpper, juce::uint8 greenLower, juce::uint8 blueUpper, juce::uint8 blueLower)
+{
+    juce::MidiMessage msg = LumatoneSysEx::createExtendedMacroColourSysEx(MACROBUTTON_COLOUR_OFF, redUpper, redLower, greenUpper, greenLower, blueUpper, blueLower);
+    sendMessageWithAcknowledge(msg);
+}
+
+// CMD 06h: Colour for macro button in inactive state, each value should be in range of 0x00-0x7F (pre-version 1.0.11)
+void LumatoneFirmwareDriver::sendMacroButtonInactiveColour_Version_1_0_0(juce::uint8 red, juce::uint8 green, juce::uint8 blue)
+{
+    if (red   > 0x7f) red   &= 0x7f;
+    if (green > 0x7f) green &= 0x7f;
+    if (blue  > 0x7f) blue  &= 0x7f;
+
+	sendSysEx(0, MACROBUTTON_COLOUR_OFF, red, green, blue, '\0');
+}
+
+// CMD 07h: Send parametrization of light on keystrokes
+void LumatoneFirmwareDriver::sendLightOnKeyStrokes(bool value)
+{
+    sendSysExToggle(0, SET_LIGHT_ON_KEYSTROKES, value);
+}
+
+// CMD 08h: Send a value for a velocity lookup table
+void LumatoneFirmwareDriver::sendVelocityConfig(const juce::uint8 velocityTable[])
+{
+    // Values are in reverse order (shortest ticks count is the highest velocity)
+    juce::uint8 reversedTable[128];
+    for (juce::uint8 x = 0; x < 128; x++)
+    {
+        reversedTable[x] = velocityTable[127 - x] & 0x7f;
+    }
+
+    auto msg = LumatoneSysEx::createTableSysEx(0, SET_VELOCITY_CONFIG, 128, reversedTable);
+    sendMessageWithAcknowledge(msg);
+}
+
+// CMD 09h: Save velocity config to EEPROM
+void LumatoneFirmwareDriver::saveVelocityConfig()
+{            
+    sendSysExRequest(0, SAVE_VELOCITY_CONFIG);
+}
+
+// CMD 0Ah: Reset velocity config to value from EEPROM
+void LumatoneFirmwareDriver::resetVelocityConfig()
+{
+    sendSysExRequest(0, RESET_VELOCITY_CONFIG);
+}
+
+// CMD 0Bh: Adjust the internal fader look-up table (128 7-bit values)
+void LumatoneFirmwareDriver::sendFaderConfig(const juce::uint8 faderTable[])
+{
+    juce::MidiMessage msg = LumatoneSysEx::createTableSysEx(0, SET_FADER_CONFIG, 128, faderTable);
+    sendMessageWithAcknowledge(msg);
+}
+
+// CMD 0Ch: **DEPRECATED** Save the changes made to the fader look-up table
+void LumatoneFirmwareDriver::saveFaderConfiguration()
+{
+    sendSysExRequest(0, SAVE_FADER_CONFIG);
+}
+
+// CMD 0Dh: Reset the fader lookup table back to its factory fader settings.
+void LumatoneFirmwareDriver::resetFaderConfig()
+{
+    sendSysExRequest(0, RESET_FADER_CONFIG);
+}
+
+// CMD 0Eh: Enable or disable aftertouch functionality
+void LumatoneFirmwareDriver::sendAfterTouchActivation(bool value)
+{
+    sendSysExToggle(0, SET_AFTERTOUCH_FLAG, value);
+}
+
+// CMD 0Fh: Initiate aftertouch calibration routine
+void LumatoneFirmwareDriver::sendCalibrateAfterTouch()
+{
+    sendSysExRequest(0, CALIBRATE_AFTERTOUCH);
+}
+
+// CMD 10h: Adjust the internal aftertouch look-up table (size of 128)
+void LumatoneFirmwareDriver::sendAftertouchConfig(const juce::uint8 aftertouchTable[])
+{
+    juce::MidiMessage msg = LumatoneSysEx::createTableSysEx(0, SET_AFTERTOUCH_CONFIG, 128, aftertouchTable);
+    sendMessageWithAcknowledge(msg);
+}
+
+// CMD 11h: **DEPRECATED** Save the changes made to the aftertouch look-up table
+void LumatoneFirmwareDriver::saveAftertouchConfig()
+{
+    sendSysExRequest(0, SAVE_AFTERTOUCH_CONFIG);
+}
+
+// CMD 12h: Reset the aftertouch lookup table back to its factory aftertouch settings.
+void LumatoneFirmwareDriver::resetAftertouchConfig()
+{
+    sendSysExRequest(0, RESET_AFTERTOUCH_CONFIG);
+}
+
+// CMD 13h: Read back the current red intensity of all the keys of the target board.
+void LumatoneFirmwareDriver::sendRedLEDConfigRequest(juce::uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_RED_LED_CONFIG);
+}
+
+// CMD 14h: Read back the current green intensity of all the keys of the target board.
+void LumatoneFirmwareDriver::sendGreenLEDConfigRequest(juce::uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_GREEN_LED_CONFIG);
+}
+
+// CMD 15h: Read back the current blue intensity of all the keys of the target board.
+void LumatoneFirmwareDriver::sendBlueLEDConfigRequest(juce::uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_BLUE_LED_CONFIG);
+}
+
+// CMD 16h: Read back the current channel configuration of all the keys of the target board.
+void LumatoneFirmwareDriver::sendChannelConfigRequest(juce::uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_CHANNEL_CONFIG);
+}
+
+// CMD 17h: Read back the current note configuration of all the keys of the target board.
+void LumatoneFirmwareDriver::sendNoteConfigRequest(juce::uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_NOTE_CONFIG);
+}
+
+// CMD 18h: Read back the current key type configuration of all the keys of the target board.
+void LumatoneFirmwareDriver::sendKeyTypeConfigRequest(juce::uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_KEYTYPE_CONFIG);
+}
+
+// CMD 19h: Read back the maximum threshold of all the keys of the target board.
+void LumatoneFirmwareDriver::sendMaxFaderThresholdRequest(juce::uint8 boardIndex)
+{
+    sendSysExRequest(0, GET_MAX_THRESHOLD);
+}
+
+// CMD 1Ah: Read back the maximum threshold of all the keys of the target board
+void LumatoneFirmwareDriver::sendMinFaderThresholdRequest(juce::uint8 boardIndex)
+{
+    sendSysExRequest(0, GET_MIN_THRESHOLD);
+}
+
+// CMD 1Bh: Read back the aftertouch maximum threshold of all the keys of the target board
+void LumatoneFirmwareDriver::sendMaxAftertouchThresholdRequest(juce::uint8 boardIndex)
+{
+    sendSysExRequest(0, GET_AFTERTOUCH_MAX);
+}
+
+// CMD 1Ch: Get back flag whether or not each key of target board meets minimum threshold
+void LumatoneFirmwareDriver::sendKeyValidityParametersRequest(juce::uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_KEY_VALIDITY);
+}
+
+// CMD 1Dh: Read back the current velocity look up table of the keyboard.
+void LumatoneFirmwareDriver::sendVelocityConfigRequest()
+{
+    sendSysExRequest(0, GET_VELOCITY_CONFIG);
+}
+
+// CMD 1Eh: Read back the current fader look up table of the keyboard.
+void LumatoneFirmwareDriver::sendFaderConfigRequest()
+{
+    sendSysExRequest(0, GET_FADER_CONFIG);
+}
+
+// CMD 1Fh: Read back the current aftertouch look up table of the keyboard.
+void LumatoneFirmwareDriver::sendAftertouchConfigRequest()
+{
+    sendSysExRequest(0, GET_AFTERTOUCH_CONFIG);
+}
+
+// CMD 20h: Set the velocity interval table, 127 12-bit values
+void LumatoneFirmwareDriver::sendVelocityIntervalConfig(const int velocityIntervalTable[])
+{
+    const int payloadSize = 254;
+    juce::uint8 formattedTable[payloadSize];
+
+    // Interval table contains 127 values!
+	for (juce::uint8 i = 0; i < VELOCITYINTERVALTABLESIZE; i++)
+    {
+        formattedTable[2*i]     = (velocityIntervalTable[i] >> 6) & 0x3f;
+        formattedTable[1 + 2*i] = velocityIntervalTable[i] & 0x3f;
+    }
+
+	juce::MidiMessage msg = LumatoneSysEx::createTableSysEx(0, SET_VELOCITY_INTERVALS, payloadSize, formattedTable);
+	sendMessageWithAcknowledge(msg);
+}
+
+// CMD 21h: Sead back the velocity interval table
+void LumatoneFirmwareDriver::sendVelocityIntervalConfigRequest()
+{
+    sendSysExRequest(0, GET_VELOCITY_INTERVALS);
+}
+
+// CMD 22h: Read back the fader type of all keys on the targeted board.
+void LumatoneFirmwareDriver::sendFaderTypeConfigRequest(juce::uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_FADER_TYPE_CONFIGURATION);
+}
+
+// CMD 23h: This command is used to read back the serial identification number of the keyboard.
+void LumatoneFirmwareDriver::sendGetSerialIdentityRequest(int sendToTestDevice)
+{
+    if (sendToTestDevice < 0)
+        sendSysEx(0, GET_SERIAL_IDENTITY, TEST_ECHO, '\0', '\0', '\0');
+    else
+        sendTestMessageNow(sendToTestDevice, LumatoneSysEx::createTerpstraSysEx(0, GET_SERIAL_IDENTITY, TEST_ECHO, '\0', '\0', '\0'));
+}
+
+// CMD 24h: Initiate the key calibration routine; each pair of macro buttons  
+// on each octave must be pressed to return to normal state
+void LumatoneFirmwareDriver::sendCalibrateKeys()
+{
+    sendSysExRequest(0, CALIBRATE_KEYS);
+}
+
+// CMD 25h: Pass in true to enter Demo Mode, or false to exit
+void LumatoneFirmwareDriver::startDemoMode(bool turnOn)
+{
+    sendSysExToggle(0, DEMO_MODE, turnOn);
+}
+
+// CMD 26h: Initiate the pitch and mod wheel calibration routine, pass in false to stop
+void LumatoneFirmwareDriver::sendCalibratePitchModWheel(bool startCalibration, int testOutputIndex)
+{
+    if (testOutputIndex < 0)
+        sendSysExToggle(0, CALIBRATE_PITCH_MOD_WHEEL, startCalibration);
+    else
+        sendTestMessageNow(testOutputIndex, LumatoneSysEx::createTerpstraSysEx(0, CALIBRATE_PITCH_MOD_WHEEL, startCalibration, TEST_ECHO, '\0', '\0'));
+}
+
+// CMD 27h: Set the sensitivity value of the mod wheel, 0x01 to 0x07f
+void LumatoneFirmwareDriver::setModWheelSensitivity(juce::uint8 sensitivity)
+{
+    if (sensitivity > 0x7f) sensitivity &= 0x7f;  // Restrict to upper bound
+    if (sensitivity < 0x01) sensitivity  = 0x01;  // Restrict to lower bound
+
+    sendSysEx(0, SET_MOD_WHEEL_SENSITIVITY, sensitivity, '\0', '\0', '\0');
+}
+
+// CMD 28h: Set the sensitivity value of the pitch bend wheel between 0x01 and 0x3FFF
+void LumatoneFirmwareDriver::setPitchBendSensitivity(int sensitivity)
+{
+    if (sensitivity > 0x3fff) sensitivity &= 0x3fff; // Restrict to upper bound
+    if (sensitivity < 0x0001) sensitivity  = 0x0001;  // Restrict to lower bound
+
+    sendSysEx(0, SET_PITCH_WHEEL_SENSITIVITY, sensitivity >> 7, sensitivity & 0x7f, '\0',  '\0');
+}
+
+// CMD 29h: Set abs. distance from max value to trigger CA-004 submodule key events, ranging from 0x00 to 0xFE
+void LumatoneFirmwareDriver::setKeyMaximumThreshold(juce::uint8 boardIndex, juce::uint8 maxThreshold, juce::uint8 aftertouchMax)
+{
+    if (maxThreshold  > 0xfe) maxThreshold  &= 0xfe;
+    if (aftertouchMax > 0xfe) aftertouchMax &= 0xfe;
+    sendSysEx(boardIndex, SET_KEY_MAX_THRESHOLD, maxThreshold >> 4, maxThreshold & 0xf, aftertouchMax >> 4, aftertouchMax & 0xf);
+}
+
+// CMD 2Ah: Set abs. distance from min value to trigger CA-004 submodule key events, ranging from 0x00 to 0xFE
+void LumatoneFirmwareDriver::setKeyMinimumThreshold(juce::uint8 boardIndex, juce::uint8 minThresholdHigh, juce::uint8 minThresholdLow)
+{
+    if (minThresholdHigh > 0xfe) minThresholdHigh &= 0xfe;
+    if (minThresholdLow  > 0xfe) minThresholdLow  &= 0xfe;
+    sendSysEx(boardIndex, SET_KEY_MIN_THRESHOLD, minThresholdHigh >> 4, minThresholdHigh & 0xf, minThresholdLow >> 4, minThresholdLow & 0xf);
+}
+
+// CMD 2Bh: Set the sensitivity for CC events, ranging from 0x00 to 0xFE
+void LumatoneFirmwareDriver::setFaderKeySensitivity(juce::uint8 boardIndex, juce::uint8 sensitivity)
+{
+    if (sensitivity > 0xfe) sensitivity &= 0xfe;
+    sendSysEx(boardIndex, SET_KEY_FADER_SENSITIVITY, sensitivity >> 4, sensitivity & 0xf, '\0', '\0');
+}
+
+// CMD 2Ch: Set the target board sensitivity for aftertouch events, ranging from 0x00 to 0xFE
+void LumatoneFirmwareDriver::setAftertouchKeySensitivity(juce::uint8 boardIndex, juce::uint8 sensitivity)
+{
+    if (sensitivity > 0xfe) sensitivity &= 0xfe;
+    sendSysEx(boardIndex, SET_KEY_AFTERTOUCH_SENSITIVITY, sensitivity >> 4, sensitivity & 0xf, '\0', '\0');
+}
+
+// CMD 2Dh: Adjust the Lumatouch table, a 128 byte array with value of 127 being a key fully pressed
+void LumatoneFirmwareDriver::setLumatouchConfig(const juce::uint8 lumatouchTable[])
+{
+    juce::MidiMessage msg = LumatoneSysEx::createTableSysEx(0, SET_LUMATOUCH_CONFIG, 128, lumatouchTable);
+    sendMessageWithAcknowledge(msg);
+}
+
+// CMD 2Eh: **DEPRECATED** Save Lumatouch table changes
+void LumatoneFirmwareDriver::saveLumatoneConfig()
+{
+    sendSysExRequest(0, SAVE_LUMATOUCH_CONFIG);
+}
+
+// CMD 2Fh: Reset the Lumatouch table back to factory settings
+void LumatoneFirmwareDriver::resetLumatouchConfig()
+{
+    sendSysExRequest(0, RESET_LUMATOUCH_CONFIG);
+}
+
+// CMD 30h: Read back the Lumatouch table
+void LumatoneFirmwareDriver::sendLumatouchConfigRequest()
+{
+    sendSysExRequest(0, GET_LUMATOUCH_CONFIG);
+}
+
+// CMD 31h: This command is used to read back the current Lumatone firmware revision.
+void LumatoneFirmwareDriver::sendGetFirmwareRevisionRequest(int sendToTestDevice)
+{
+    if (sendToTestDevice < 0)
+        sendSysExRequest(0, GET_FIRMWARE_REVISION);
+    else
+        sendTestMessageNow(sendToTestDevice, LumatoneSysEx::createTerpstraSysEx(0, GET_FIRMWARE_REVISION, TEST_ECHO, '\0', '\0', '\0'));
+}
+
+// CMD 32h: Set the thresold from key's min value to trigger CA - 004 submodule CC events, ranging from 0x00 to 0xFE
+void LumatoneFirmwareDriver::setCCActiveThreshold(juce::uint8 boardIndex, juce::uint8 sensitivity)
+{
+    if (sensitivity > 0xfe) sensitivity &= 0xfe;
+    sendSysEx(boardIndex, SET_CC_ACTIVE_THRESHOLD, sensitivity >> 4, sensitivity & 0xf, '\0', '\0');
+}
+
+// CMD 33h: Echo the payload, 0x00-0x7f, for use in connection monitoring
+// the first 7-bit value is reserved for echo differentiation
+void LumatoneFirmwareDriver::ping(juce::uint8 value1, juce::uint8 value2, juce::uint8 value3, int sendToTestDevice)
+{
+    if (value1 > 0x7f) value1 &= 0x7f;
+    if (value2 > 0x7f) value2 &= 0x7f;
+    if (value3 > 0x7f) value3 &= 0x7f;
+
+    if (sendToTestDevice < 0)
+        sendSysEx(0, LUMA_PING, TEST_ECHO, value1, value2, value3);
+    else
+    {
+        sendTestMessageNow(sendToTestDevice, LumatoneSysEx::createTerpstraSysEx(0, LUMA_PING, TEST_ECHO, value1, value2, value3));
+    }
+}
+
+// CMD 33h: Echo the payload, 0x00-0x7f, for use in connection monitoring
+unsigned int LumatoneFirmwareDriver::ping(unsigned int value, int sendToTestDevice)
+{
+    value &= 0xFFFFFFF; // Limit 28-bits
+    ping((value >> 14) & 0x7f, (value >> 7) & 0x7f, value & 0x7f, sendToTestDevice);
+    return value;
+}
+
+// CMD 34h: Reset the thresholds for events and sensitivity for CC & aftertouch on the target board
+void LumatoneFirmwareDriver::resetBoardThresholds(juce::uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, RESET_BOARD_THRESHOLDS);
+}
+
+// CMD 35h: Enable/disable key sampling over SSH for the target key and board
+void LumatoneFirmwareDriver::setKeySampling(juce::uint8 boardIndex, juce::uint8 keyIndex, bool turnSamplingOn)
+{
+    sendSysExToggle(boardIndex, SET_KEY_SAMPLING, turnSamplingOn);
+}
+
+// CMD 36h: Set thresholds for the pitch and modulation wheel to factory settings
+void LumatoneFirmwareDriver::resetWheelsThresholds()
+{
+    sendSysExRequest(0, RESET_WHEELS_THRESHOLD);
+}
+
+// CMD 37h: Set the bounds from the calibrated zero adc value of the pitch wheel, 0x00 to 0x7f
+void LumatoneFirmwareDriver::setPitchWheelZeroThreshold(juce::uint8 threshold)
+{
+    if (threshold > 0x7f) threshold &= 0x7f;
+    sendSysEx(0, SET_PITCH_WHEEL_CENTER_THRESHOLD, threshold, '\0', '\0', '\0');
+}
+
+// CMD 38h: Pass in true to initiate the expression pedal calibration routine, or false to stop
+void LumatoneFirmwareDriver::calibrateExpressionPedal(bool startCalibration)
+{
+    sendSysExToggle(0, CALLIBRATE_EXPRESSION_PEDAL, startCalibration);
+}
+
+// CMD 39h: Reset expression pedal minimum and maximum bounds to factory settings
+void LumatoneFirmwareDriver::resetExpressionPedalBounds()
+{
+    sendSysExRequest(0, RESET_EXPRESSION_PEDAL_BOUNDS);
+}
+
+// CMD 3Ah: Retrieve the threshold values of target board
+void LumatoneFirmwareDriver::getBoardThresholdValues(juce::uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_BOARD_THRESHOLD_VALUES);
+}
+
+// CMD 3Bh: Retrieve the sensitivity values of target board
+void LumatoneFirmwareDriver::getBoardSensitivityValues(juce::uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_BOARD_SENSITIVITY_VALUES);
+}
+
+// CMD 3Ch: Set the MIDI channels for peripheral controllers
+void LumatoneFirmwareDriver::setPeripheralChannels(juce::uint8 pitchWheelChannel, juce::uint8 modWheelChannel, juce::uint8 expressionChannel, juce::uint8 sustainChannel)
+{
+    pitchWheelChannel -= 1;
+    modWheelChannel -= 1;
+    expressionChannel -= 1;
+    sustainChannel -= 1;
+
+    // For now set default channel to 1
+    if (pitchWheelChannel > 0xf) pitchWheelChannel &= 0x00;
+    if (modWheelChannel   > 0xf) modWheelChannel   &= 0x00;
+    if (expressionChannel > 0xf) expressionChannel &= 0x00;
+    if (sustainChannel    > 0xf) sustainChannel    &= 0x00;
+
+    sendSysEx(0, SET_PERIPHERAL_CHANNELS, pitchWheelChannel, modWheelChannel, expressionChannel, sustainChannel);
+}
+
+// CMD 3Dh: Retrieve the MIDI channels for peripheral controllers
+void LumatoneFirmwareDriver::getPeripheralChannels()
+{
+    sendSysExRequest(0, GET_PERIPHERAL_CHANNELS);
+}
+
+// CMD 3Fh: Set the 8-bit aftertouch trigger delay value, the time between a note on event and the initialization of aftertouch events
+void LumatoneFirmwareDriver::setAfterTouchTriggerDelay(juce::uint8 boardIndex, juce::uint8 aftertouchTriggerValue)
+{
+    setAfterTouchTriggerDelay(boardIndex, aftertouchTriggerValue >> 4, aftertouchTriggerValue & 0xf);
+}
+
+// CMD 3Fh: Set the 8-bit aftertouch trigger delay value, the time between a note on event and the initialization of aftertouch events
+void LumatoneFirmwareDriver::setAfterTouchTriggerDelay(juce::uint8 boardIndex, juce::uint8 triggerValueUpperNibble, juce::uint8 triggerValueLowerNibble)
+{
+    sendSysEx(boardIndex, SET_AFTERTOUCH_TRIGGER_DELAY, triggerValueUpperNibble, triggerValueLowerNibble, '\0', '\0');
+}
+
+// CMD 40h: Retrieve the aftertouch trigger delay of the given board
+void LumatoneFirmwareDriver::sendGetAftertouchTriggerDelayRequest(juce::uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_AFTERTOUCH_TRIGGER_DELAY);
+}
+
+// CMD 41h: Set the Lumatouch note-off delay value, an 11-bit integer representing the amount of 1.1ms ticks before
+// sending a note-off event after a Lumatone-configured key is released. 
+void LumatoneFirmwareDriver::setLumatouchNoteOffDelay(juce::uint8 boardIndex, int delayValue)
+{
+    setLumatouchNoteOffDelay(boardIndex,
+        (delayValue >> 8) & 0xf,
+        (delayValue >> 4) & 0xf,
+        delayValue & 0xf
+    );
+}
+
+void LumatoneFirmwareDriver::setLumatouchNoteOffDelay(juce::uint8 boardIndex, juce::uint8 valueBits8_11, juce::uint8 valueBits4_7, juce::uint8 valueBits0_3)
+{
+    sendSysEx(boardIndex, SET_LUMATOUCH_NOTE_OFF_DELAY, valueBits8_11, valueBits4_7, valueBits0_3, '\0');
+}
+
+// CMD 42h: Retrieve the note-off delay value of the given board
+void LumatoneFirmwareDriver::sendGetLumatouchNoteOffDelayRequest(juce::uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_LUMATOUCH_NOTE_OFF_DELAY);
+}
+
+// CMD 43h: Set expression pedal ADC threshold value, a 12-bit integer
+void LumatoneFirmwareDriver::setExpressionPedalADCThreshold(int thresholdValue)
+{
+    setExpressionPedalADCThreshold(
+        (thresholdValue >> 8) & 0xf,
+        (thresholdValue >> 4) & 0xf,
+        thresholdValue & 0xf
+    );
+}
+
+// CMD 43h: Set expression pedal ADC threshold value with 3 4-bit integers representing a 12-bit integer
+void LumatoneFirmwareDriver::setExpressionPedalADCThreshold(juce::uint8 valueBits8_12, juce::uint8 valueBits4_7, juce::uint8 valueBits0_3)
+{
+    sendSysEx(0, SET_EXPRESSION_PEDAL_THRESHOLD, valueBits8_12, valueBits4_7, valueBits0_3, '\0');
+}
+
+// CMD 44h: Get the current expression pedal ADC threshold value
+void LumatoneFirmwareDriver::sendGetExpressionPedalADCThresholdRequest()
+{
+    sendSysExRequest(0, GET_EXPRESSION_PEDAL_THRESHOLD);
+}
+
+// CMD 45h: Configure the on/off settings of the sustain pedal
+void LumatoneFirmwareDriver::sendInvertSustainPedal(bool setInverted)
+{
+    sendSysExToggle(0, INVERT_SUSTAIN_PEDAL, setInverted);
+}
+
+// CMD 46h: Replace current presets with factory presets
+void LumatoneFirmwareDriver::sendResetDefaultPresetsRequest(int presetIndex)
+{
+    presetIndex %= 10;
+    sendSysEx(0, RESET_DEFAULT_PRESETS, presetIndex, '\0', '\0', '\0');
+}
+
+// CMD 47h: Read back the currently configured preset flags of expression & sustain inversion,
+// plus light-on-keystroke and polyphonic aftertouch
+void LumatoneFirmwareDriver::sendGetPresetFlagsReset()
+{
+    sendSysExRequest(0, GET_PRESET_FLAGS);
+}
+
+// For CMD 48h response: get expression pedal sensitivity
+void LumatoneFirmwareDriver::sendGetExpressionPedalSensitivity()
+{
+    sendSysExRequest(0, GET_EXPRESSION_PEDAL_SENSITIVIY);
+}
+
+/*
+==============================================================================
+Low-level SysEx calls
+*/
+
+void LumatoneFirmwareDriver::sendSysEx(juce::uint8 boardIndex, juce::uint8 cmd, juce::uint8 data1, juce::uint8 data2, juce::uint8 data3, juce::uint8 data4, bool overrideEditMode)
+{
+    switch (hostMode)
+    {
+    case HostMode::Driver:
+        if (getMidiInputIndex() < 0)
+        {
+            return;
+        }
+        break;
+    default:
+        break;
+    }
+
+    jassert(boardIndex < 0x6 && data1 <= 0x7f && data2 <= 0x7f && data3 <= 0x7f && data4 <= 0x7f);
+    juce::MidiMessage msg = LumatoneSysEx::createTerpstraSysEx(boardIndex, cmd, data1, data2, data3, data4);
+    sendMessageWithAcknowledge(msg);
+}
+
+// Send a SysEx message without parameters
+void LumatoneFirmwareDriver::sendSysExRequest(juce::uint8 boardIndex, juce::uint8 cmd)
+{
+    unsigned char sysExData[9];
+    LumatoneSysEx::fillManufacturerId(sysExData);
+    sysExData[3] = boardIndex;
+    sysExData[4] = cmd;
+    sysExData[5] = '\0';
+    sysExData[6] = '\0';
+    sysExData[7] = '\0';
+    sysExData[8] = '\0';
+    auto msg = juce::MidiMessage::createSysExMessage(sysExData, 9);
+    sendMessageWithAcknowledge(msg);
+}
+
+void LumatoneFirmwareDriver::sendSysExToggle(juce::uint8 boardIndex, juce::uint8 cmd, bool turnStateOn)
+{
+    unsigned char sysExData[9];
+    LumatoneSysEx::fillManufacturerId(sysExData);
+    sysExData[3] = boardIndex;
+    sysExData[4] = cmd;
+    sysExData[5] = turnStateOn;
+    sysExData[6] = '\0';
+    sysExData[7] = '\0';
+    sysExData[8] = '\0';
+    auto msg = juce::MidiMessage::createSysExMessage(sysExData, 9);
+    sendMessageWithAcknowledge(msg);
+}
+
+void LumatoneFirmwareDriver::sendTestMessageNow(int outputDeviceIndex, const juce::MidiMessage &message)
+{
+    switch (hostMode)
+    {
+    case HostMode::Driver:
+        HajuMidiDriver::sendTestMessageNow(outputDeviceIndex, message);
+        break;
+    case HostMode::Plugin:
+        sendMessageNow(message);
+        break;
+    }
+}
+
+void LumatoneFirmwareDriver::sendMessageWithAcknowledge(const juce::MidiMessage &message)
+{
+    // Prevent certain messages from being sent
+    if (onlySendRequestMessages && message.isSysEx())
+    {
+        auto sysExData = message.getSysExData();
+        if (   sysExData[CMD_ID] == CHANGE_KEY_NOTE
+            || sysExData[CMD_ID] == SET_KEY_COLOUR
+            || sysExData[CMD_ID] == SET_VELOCITY_CONFIG
+            || sysExData[CMD_ID] == SET_FADER_CONFIG
+            || sysExData[CMD_ID] == SET_AFTERTOUCH_CONFIG
+            || sysExData[CMD_ID] == SET_VELOCITY_INTERVALS
+            || sysExData[CMD_ID] == SET_LUMATOUCH_CONFIG)
+        {
+            return;
+        }
+    }
+
+    if (hostMode == HostMode::Driver && getMidiInputIndex() < 0)
+    {
+        DBG("No juce::MidiInput open to send message to.");
+        // notifyMessageSent(midiOutput, message);
+    }
+    else
+    {
+        // Add message to queue first. The oldest message in queue will be sent.
+        {
+            juce::ScopedLock l(sysexQueue.getLock());
+			sysexQueue.add(message);
+            notifySendQueueSize();
+        }
+
+        // If there is no message waiting for acknowledge: send oldest message of queue
+       	if (timerType == TimerType::checkQueue || !hasMsgWaitingForAck)
+        {
+            stopTimer();
+            sendOldestMessageInQueue();
+        }
+    }
+}
+
+void LumatoneFirmwareDriver::sendOldestMessageInQueue()
+{
+    if (sysexQueue.isEmpty())
+        return;
+
+    // jassert(timerType == TimerType::checkQueue);
+    jassert(!isTimerRunning());
+    jassert(!hasMsgWaitingForAck);
+
+    currentMsgWaitingForAck = sysexQueue[0];     // oldest element in buffer
+    hasMsgWaitingForAck = true;
+    receivedAnswer = false;
+
+    sysexQueue.remove(0);                        // remove from buffer
+    
+    notifySendQueueSize();
+    sendCurrentMessage();
+}
+
+void LumatoneFirmwareDriver::sendCurrentMessage()
+{
+    jassert(!isTimerRunning());
+    jassert(hasMsgWaitingForAck);
+
+// #if JUCE_DEBUG
+//     if (currentMsgWaitingForAck.isSysEx())
+//     {
+//         auto sysExData = currentMsgWaitingForAck.getSysExData();
+//         for (int i = 0; i < currentMsgWaitingForAck.getSysExDataSize(); i++)
+//             jassert(sysExData[i] <= 0x7f);
+//     }
+// #endif
+
+    sendMessageNow(currentMsgWaitingForAck);        // send it
+
+    // Notify listeners
+    DBG("SENT: " + currentMsgWaitingForAck.getDescription());
+    // const juce::MessageManagerLock mmLock;
+    // this->listeners.call(&Listener::midiMessageSent, currentMsgWaitingForAck);
+    // notifyMessageSent(midiOutput, currentMsgWaitingForAck);
+
+    timerType = TimerType::waitForAnswer;
+    startTimer(receiveTimeoutInMilliseconds);       // Start waiting for answer
+}
+
+void LumatoneFirmwareDriver::handleIncomingMidiMessage(juce::MidiInput* source, const juce::MidiMessage& message)
+{
+#if JUCE_DEBUG
+    if (message.isSysEx())
+    {
+        if (source)
+            DBG("RCVD: " + message.getDescription() + "; from " + source->getName());
+        else
+            DBG("RCVD: " + message.getDescription() + "; called by processor");
+    }
+    if (!message.isSysEx() && !message.isMidiClock())
+    {
+        if (source)
+            DBG("RCVD: " + message.getDescription() + "; from " + source->getName());
+        else
+            DBG("RCVD: " + message.getDescription() + "; called by processor");
+    }
+#endif
+
+    if (hostMode == HostMode::Driver && !message.isSysEx() && testIsIncomplete())
+    {
+        return; // ignore note messages before connection is confirmed
+    }
+
+    juce::MessageManager::callAsync([=]() { notifyMessageReceived(source, message); });
+
+    if (!hasMsgWaitingForAck)
+        return;
+
+    jassert(timerType == TimerType::waitForAnswer);
+ 
+    // Check whether received message is an answer to the previously sent one
+    if (LumatoneSysEx::messageIsResponseToMessage(message, currentMsgWaitingForAck))
+    {
+        // Answer has come, we can stop the timer
+        stopTimer();
+        
+        receivedAnswer = true;
+
+        // Check answer state (error yes/no)
+        auto answerState = message.getSysExData()[MSG_STATUS];
+
+        // if answer state is "busy": resend message after a little delay
+        if (answerState == LumatoneFirmware::ReturnCode::BUSY)
+        {
+            // Start delay timer, after which message will be sent again
+            timerType = TimerType::delayWhileDeviceBusy;
+            DBG("Starting Busy Timer");
+            startTimer(busyTimeDelayInMilliseconds);
+        }
+        else
+        {
+            juce::ScopedLock l(sysexQueue.getLock());
+            // In case of error, NACK: ?
+            // For now: Remove from buffer in any case
+            hasMsgWaitingForAck = false;
+
+            // If there are more messages waiting in the queue: send the next one
+            // timerType = TimerType::checkQueue;
+            // startTimer(checkQueueTimerDelayInMilliseconds);
+            sendOldestMessageInQueue();
+        }
+    }
+
+    // Other incoming messages are ignored
+}
+
+void LumatoneFirmwareDriver::timerCallback()
+{
+    jassert(
+           ((hasMsgWaitingForAck == false) && (receivedAnswer == true))
+        || ((hasMsgWaitingForAck == true) && (receivedAnswer == false))
+        );
+
+    stopTimer();
+
+    if (timerType == TimerType::waitForAnswer)
+    {
+        // Rare race condition
+        if (receivedAnswer)
+        {
+            DBG("DRIVER: Got answer in timercallback, bailing no answer!");
+            return;
+        }
+
+        // For now: Remove from buffer, try to send next one
+        hasMsgWaitingForAck = false;
+
+        // No answer came from MIDI input
+		
+        DBG("DRIVER: NO ANSWER");
+        notifyNoAnswerToMessage(getMidiInputInfo(), currentMsgWaitingForAck);
+
+        sendOldestMessageInQueue();
+    }
+    else if (timerType == TimerType::delayWhileDeviceBusy)
+    {
+        // Resend current message and start waiting for answer again
+        sendCurrentMessage();
+    }
+    else if (timerType == TimerType::checkQueue)
+    {
+        jassert(!hasMsgWaitingForAck);
+        sendOldestMessageInQueue();
+    }
+    else
+        jassertfalse;
+}
+
+void LumatoneFirmwareDriver::clearMIDIMessageBuffer()
+{
+    stopTimer();
+    hasMsgWaitingForAck = false;
+
+    {
+        juce::ScopedLock l(sysexQueue.getLock());
+        sysexQueue.clear();
+    }
+
+    {
+        juce::ScopedLock l(hostLock);
+        hostQueue.clear();
+    }
+
+    notifySendQueueSize();
+}
+
+#endif
diff --git a/Source/lumatone_editor_library/lumatone_midi_driver/lumatone_midi_driver.h b/Source/lumatone_editor_library/lumatone_midi_driver/lumatone_midi_driver.h
new file mode 100644
index 00000000..ffea6abe
--- /dev/null
+++ b/Source/lumatone_editor_library/lumatone_midi_driver/lumatone_midi_driver.h
@@ -0,0 +1,420 @@
+/*
+  ==============================================================================
+
+    TerpstraMidiDriver.h
+    Created: 20 Feb 2015 8:04:02pm
+    Author:  hsstraub
+
+  ==============================================================================
+*/
+
+/** BEGIN_JUCE_MODULE_DECLARATION
+
+	ID:             lumatone_midi_driver
+	vendor:         vsicurella
+	version:        0.0.1
+	name:           Lumatone MIDI Library
+	description:
+	website:
+	license:        BSD-0
+
+	dependencies:	juce_core, juce_audio_basics, juce_audio_devices, juce_events
+
+	END_JUCE_MODULE_DECLARATION
+*/
+
+#ifndef LUMATONE_DRIVER_H
+#define LUMATONE_DRIVER_H
+
+//[Headers]     -- You can add your own extra header files here --
+#include <JuceHeader.h>
+
+#include "./midi_driver.h"
+#include "./firmware_driver_listener.h"
+
+// #include "../../debug/LumatoneSandboxLogger.h"
+
+#define DEFAULT_NUM_BOARDS 5
+
+//[/Headers]
+
+/*
+==============================================================================
+Connection to midi, sending SysEx parameters to keyboard
+==============================================================================
+*/
+class LumatoneFirmwareDriver : public HajuMidiDriver
+							, public juce::Timer
+							// , private LumatoneSandboxLogger
+{
+public:
+	enum class HostMode
+	{
+		Driver = 0, // For applications, open and manage devices with HajuMidiDriver
+		Plugin // Hosted in a DAW as a plugin - MIDI messages are received through DAW's buffer	
+	};
+
+private:
+	enum class TimerType
+	{
+		waitForAnswer,
+		delayWhileDeviceBusy,
+		checkQueue
+	};
+
+public:
+
+	enum class ErrorLevel
+	{
+		noError = 0,
+		warning = 1,
+		error = 2
+	};
+
+private:
+	// Helper callbacks for notifying Collectors
+	void notifyMessageReceived(juce::MidiInput* source, const juce::MidiMessage& midiMessage);
+	void notifyMessageSent(juce::MidiOutput* target, const juce::MidiMessage& midiMessage);
+	void notifySendQueueSize();
+	// void notifyLogMessage(juce::String textMessage, ErrorLevel errorLevel);
+    void notifyNoAnswerToMessage(juce::MidiDeviceInfo expectedDevice, const juce::MidiMessage& midiMessage);
+//	void notifyTestMessageReceived(int testInputIndex, const juce::MidiMessage& midiMessage);
+
+
+public:
+	LumatoneFirmwareDriver(HostMode hostModeIn, int numBoards=DEFAULT_NUM_BOARDS);
+	~LumatoneFirmwareDriver();
+
+	HostMode getHostMode() const { return hostMode; }
+
+    void addDriverListener(LumatoneFirmwareDriverListener* collectorToAdd);
+    void removeDriverListener(LumatoneFirmwareDriverListener* collectorToRemove);
+
+	void readNextBuffer(juce::MidiBuffer& nextBuffer);
+
+	void restrictToRequestMessages(bool testMessagesOnly) { onlySendRequestMessages = testMessagesOnly; }
+
+	bool isWaitingForResponse() const { return hasMsgWaitingForAck; }
+
+	// Low-level send MIDI message in a host dependent way
+	void sendMessageNow(const juce::MidiMessage& msg);
+
+	//============================================================================
+	// Single (mid-level) commands, firmware specific
+
+	// CMD 00h: Send a single key's functionctional configuration
+	void sendKeyFunctionParameters(juce::uint8 boardIndex, juce::uint8 keyIndex, juce::uint8 noteOrCCNum, juce::uint8 midiChannel, juce::uint8 keyType, bool faderUpIsNull = true);
+
+	// CMD 01h: Send a single key's LED channel intensities, three 8-bit values
+	void sendKeyLightParameters(juce::uint8 boardIndex, juce::uint8 keyIndex, juce::uint8 red, juce::uint8 green, juce::uint8 blue);
+	// CMD 01h: Send a single key's LED channel intensities, three pairs of 4-bit values for each channel
+	void sendKeyLightParameters(juce::uint8 boardIndex, juce::uint8 keyIndex, juce::uint8 redUpper, juce::uint8 redLower, juce::uint8 greenUpper, juce::uint8 greenLower, juce::uint8 blueUpper, juce::uint8 blueLower);
+	// CMD 01h: Send a single key's LED channel intensities, three 7-bit values
+	void sendKeyLightParameters_Version_1_0_0(juce::uint8 boardIndex, juce::uint8 keyIndex, juce::uint8 red, juce::uint8 green, juce::uint8 blue);
+
+	// CMD 02h: Save current configuration to specified preset index
+	void saveProgram(juce::uint8 presetNumber);
+
+	// CMD 03h: Send expression pedal sensivity
+	void sendExpressionPedalSensivity(juce::uint8 value);
+
+	// CMD 04h: Send parametrization of foot controller
+	void sendInvertFootController(bool value);
+
+	// CMD 05h: Colour for macro button in active state, 3 8-bit values
+	void sendMacroButtonActiveColour(juce::uint8 red, juce::uint8 green, juce::uint8 blue);
+	// CMD 05h: Colour for macro button in active state, 3 pairs for 4-bit values for each LED channel
+	void sendMacroButtonActiveColour(juce::uint8 redUpper, juce::uint8 redLower, juce::uint8 greenUpper, juce::uint8 greenLower, juce::uint8 blueUpper, juce::uint8 blueLower);
+	// CMD 05h: Colour for macro button in active state, 3 7-bit values
+	void sendMacroButtonActiveColour_Version_1_0_0(juce::uint8 red, juce::uint8 green, juce::uint8 blue);
+
+	// CMD 06h: Colour for macro button in inactive state
+	void sendMacroButtonInactiveColour(int red, int green, int blue);
+	// CMD 05h: Colour for macro button in active state, 3 pairs for 4-bit values for each LED channel
+	void sendMacroButtonInactiveColour(juce::uint8 redUpper, juce::uint8 redLower, juce::uint8 greenUpper, juce::uint8 greenLower, juce::uint8 blueUpper, juce::uint8 blueLower);
+	// CMD 05h: Colour for macro button in active state, 3 7-bit values
+	void sendMacroButtonInactiveColour_Version_1_0_0(juce::uint8 red, juce::uint8 green, juce::uint8 blue);
+
+	// CMD 07h: Send parametrization of light on keystrokes
+	void sendLightOnKeyStrokes(bool value);
+
+	// CMD 08h: Send a value for a velocity lookup table (128 7-bit values)
+	void sendVelocityConfig(const juce::uint8 velocityTable[]);
+
+	// CMD 09h: Save velocity config to EEPROM
+	void saveVelocityConfig();
+
+	// CMD 0Ah: Reset velocity config to value from EEPROM
+	void resetVelocityConfig();
+
+	// CMD 0Bh: Adjust the internal fader look-up table (size of 128)
+	void sendFaderConfig(const juce::uint8 faderTable[]);
+
+	// CMD 0Ch: **DEPRECATED** Save the changes made to the fader look-up table
+	void saveFaderConfiguration();
+
+	// CMD 0Dh: Reset the fader lookup table back to its factory fader settings.
+	void resetFaderConfig();
+
+	// CMD 0Eh: Enable or disable aftertouch functionality
+	void sendAfterTouchActivation(bool value);
+
+	// CMD 0Fh: Initiate aftertouch calibration routine
+	void sendCalibrateAfterTouch();
+
+	// CMD 10h: Adjust the internal aftertouch look-up table (size of 128)
+	void sendAftertouchConfig(const juce::uint8 aftertouchTable[]);
+
+	// CMD 11h: **DEPRECATED** Save the changes made to the aftertouch look-up table
+	void saveAftertouchConfig();
+
+	// CMD 12h: Reset the aftertouch lookup table back to its factory aftertouch settings.
+	void resetAftertouchConfig();
+
+	// CMD 13h: Read back the current red intensity of all the keys of the target board.
+	void sendRedLEDConfigRequest(juce::uint8 boardIndex);
+
+	// CMD 14h: Read back the current green intensity of all the keys of the target board.
+	void sendGreenLEDConfigRequest(juce::uint8 boardIndex);
+
+	// CMD 15h: Read back the current blue intensity of all the keys of the target board.
+	void sendBlueLEDConfigRequest(juce::uint8 boardIndex);
+
+	// CMD 16h: Read back the current channel configuration of all the keys of the target board.
+	void sendChannelConfigRequest(juce::uint8 boardIndex);
+
+	// CMD 17h: Read back the current note configuration of all the keys of the target board.
+	void sendNoteConfigRequest(juce::uint8 boardIndex);
+
+	// CMD 18h: Read back the current key type configuration of all the keys of the target board.
+	void sendKeyTypeConfigRequest(juce::uint8 boardIndex);
+
+	// CMD 19h: Read back the maximum fader (note on) threshold of all the keys of the target board.
+	void sendMaxFaderThresholdRequest(juce::uint8 boardIndex);
+
+	// CMD 1Ah: Read back the maximum fader (note on) threshold of all the keys of the target board
+	void sendMinFaderThresholdRequest(juce::uint8 boardIndex);
+
+	// CMD 1Bh: Read back the aftertouch maximum threshold of all the keys of the target board
+	void sendMaxAftertouchThresholdRequest(juce::uint8 boardIndex);
+
+	// CMD 1Ch: Get back flag whether or not each key of target board meets minimum threshold
+	void sendKeyValidityParametersRequest(juce::uint8 boardIndex);
+	
+	// CMD 1Dh: Read back the current velocity look up table of the keyboard.
+	void sendVelocityConfigRequest();
+
+	// CMD 1Eh: Read back the current fader look up table of the keyboard.
+	void sendFaderConfigRequest();
+
+	// CMD 1Fh: Read back the current aftertouch look up table of the keyboard.
+	void sendAftertouchConfigRequest();
+
+	// CMD 20h: Set the velocity interval table, 127 12-bit values (up to 0x7fff
+    void sendVelocityIntervalConfig(const int velocityIntervalTable[]);
+
+	// CMD 21h: Sead back the velocity interval table
+	void sendVelocityIntervalConfigRequest();
+
+	// CMD 22h: Read back the fader type of all keys on the targeted board.
+	void sendFaderTypeConfigRequest(juce::uint8 boardIndex);
+
+	// CMD 23h: This command is used to read back the serial identification number of the keyboard.
+	void sendGetSerialIdentityRequest(int sendToTestDevice = -1);
+
+	// CMD 24h: Initiate the key calibration routine; each pair of macro buttons  
+	// on each octave must be pressed to return to normal state
+	void sendCalibrateKeys();
+
+	// CMD 25h: Pass in true to enter Demo Mode, or false to exit
+	void startDemoMode(bool turnOn);
+
+	// CMD 26h: Initiate the pitch and mod wheel calibration routine, pass in false to stop
+	void sendCalibratePitchModWheel(bool startCalibration, int testOutputIndex = -1);
+
+	// CMD 27h: Set the sensitivity value of the mod wheel, 0x01 to 0x07f
+	void setModWheelSensitivity(juce::uint8 sensitivity);
+
+	// CMD 28h: Set the sensitivity value of the pitch bend wheel between 0x01 and 0x3FFF
+	void setPitchBendSensitivity(int sensitivity);
+
+	// CMD 29h: Set abs. distance from max value to trigger CA-004 submodule key events, ranging from 0x00 to 0xFE
+	void setKeyMaximumThreshold(juce::uint8 boardIndex, juce::uint8 maxThreshold, juce::uint8 aftertouchMax);
+
+	// CMD 2Ah: Set abs. distance from min value to trigger CA-004 submodule key events, ranging from 0x00 to 0xFE
+	void setKeyMinimumThreshold(juce::uint8 boardIndex, juce::uint8 minThresholdHigh, juce::uint8 minThresholdLow);
+
+	// CMD 2Bh: Set the sensitivity for CC events, ranging from 0x00 to 0xFE
+	void setFaderKeySensitivity(juce::uint8 boardIndex, juce::uint8 sensitivity);
+
+	// CMD 2Ch: Set the target board sensitivity for aftertouch events, ranging from 0x00 to 0xFE
+	void setAftertouchKeySensitivity(juce::uint8 boardIndex, juce::uint8 sensitivity);
+
+	// CMD 2Dh: Adjust the Lumatouch table, 127 7-bit values, where 127 is a result of a fully pressed key
+	void setLumatouchConfig(const juce::uint8 lumatouchTable[]);
+
+	// CMD 2Eh: **DEPRECATED** Save Lumatouch table changes
+	void saveLumatoneConfig();
+
+	// CMD 2Fh: Reset the Lumatouch table back to factory settings
+	void resetLumatouchConfig();
+
+	// CMD 30h: Read back the Lumatouch table
+	void sendLumatouchConfigRequest();
+
+	// CMD 31h: This command is used to read back the current Lumatone firmware revision.
+	// The firmware version format is in the form {Major}.{Minor}.{Revision}
+	// If the board has not been initialized, the Beaglebone will contain a firmware revision of 0.0.0 for the board
+	void sendGetFirmwareRevisionRequest(int sendToTestDevice = -1);
+
+	// CMD 32h: Set the thresold from key�s min value to trigger CA - 004 submodule CC events, ranging from 0x00 to 0xFE
+	void setCCActiveThreshold(juce::uint8 boardIndex, juce::uint8 sensitivity);
+
+	// CMD 33h: Echo the payload, 3 7-bit values, for use in connection monitoring
+    // the first 7-bit value is reserved for echo differentiation
+	void ping(juce::uint8 value1, juce::uint8 value2, juce::uint8 value3, int sendToTestDevice = -1);
+	unsigned int ping(unsigned int value, int sendToTestDevice = -1);
+
+	// CMD 34h: Reset the thresholds for events and sensitivity for CC & aftertouch on the target board
+	void resetBoardThresholds(juce::uint8 boardIndex);
+
+	// CMD 35h: Enable/disable key sampling over SSH for the target key and board
+	void setKeySampling(juce::uint8 boardIndex, juce::uint8 keyIndex, bool turnSamplingOn);
+
+	// CMD 36h: Set thresholds for the pitch and modulation wheel to factory settings
+	void resetWheelsThresholds();
+
+	// CMD 37h: Set the bounds from the calibrated zero adc value of the pitch wheel, 0x00 to 0x7f
+	void setPitchWheelZeroThreshold(juce::uint8 threshold);
+
+	// CMD 38h: Pass in true to initiate the expression pedal calibration routine, or false to stop
+	void calibrateExpressionPedal(bool startCalibration);
+
+	// CMD 39h: Reset expression pedal minimum and maximum bounds to factory settings
+	void resetExpressionPedalBounds();
+
+	// CMD 3Ah: Retrieve the threshold values of target board
+	void getBoardThresholdValues(juce::uint8 boardIndex);
+
+	// CMD 3Bh: Retrieve the sensitivity values of target board
+	void getBoardSensitivityValues(juce::uint8 boardIndex);
+
+	// CMD 3Ch: Set the MIDI channels for peripheral controllers
+	void setPeripheralChannels(juce::uint8 pitchWheelChannel, juce::uint8 modWheelChannel, juce::uint8 expressionChannel, juce::uint8 sustainChannel);
+
+	// CMD 3Dh: Retrieve the MIDI channels for peripheral controllers
+	void getPeripheralChannels();
+
+	// CMD 3Eh: This command is only used for automatic responses containing calibration data every 100ms while in calibration mode
+	// Sending a SysEx message containing this command will result in a NACK response
+
+	// CMD 3Fh: Set the 8-bit aftertouch trigger delay value, the time between a note on event and the initialization of aftertouch events
+	void setAfterTouchTriggerDelay(juce::uint8 boardIndex, juce::uint8 aftertouchTriggerValue);
+	void setAfterTouchTriggerDelay(juce::uint8 boardIndex, juce::uint8 triggerValueUpperNibble, juce::uint8 triggerValueLowerNibble);
+
+	// CMD 40h: Retrieve the aftertouch trigger delay of the given board
+	void sendGetAftertouchTriggerDelayRequest(juce::uint8 boardIndex);
+
+	// CMD 41h: Set the Lumatouch note-off delay value, an 11-bit integer representing the amount of 1.1ms ticks before
+	// sending a note-off event after a Lumatone-configured key is released. 
+	void setLumatouchNoteOffDelay(juce::uint8 boardIndex, int delayValue);
+	void setLumatouchNoteOffDelay(juce::uint8 boardIndex, juce::uint8 valueBits8_11, juce::uint8 valueBits4_7, juce::uint8 valueBits0_3);
+
+	// CMD 42h: Retrieve the note-off delay value of the given board
+	void sendGetLumatouchNoteOffDelayRequest(juce::uint8 boardIndex);
+
+	// CMD 43h: Set expression pedal ADC threshold value, a 12-bit integer
+	void setExpressionPedalADCThreshold(int thresholdValue);
+	// CMD 43h: Set expression pedal ADC threshold value with 3 4-bit integers representing a 12-bit integer
+	void setExpressionPedalADCThreshold(juce::uint8 valueBits8_12, juce::uint8 valueBits4_7, juce::uint8 valueBits0_3);
+
+	// CMD 44h: Get the current expression pedal ADC threshold value
+	void sendGetExpressionPedalADCThresholdRequest();
+
+	// CMD 45h: Configure the on/off settings of the sustain pedal
+	void sendInvertSustainPedal(bool setInverted);
+
+	// CMD 46h: Replace a certain preset with the factory preset
+	void sendResetDefaultPresetsRequest(int presetIndex);
+
+	// CMD 47h: Read back the currently configured preset flags of expression & sustain inversion,
+	// plus light-on-keystroke and polyphonic aftertouch
+	void sendGetPresetFlagsReset();
+
+	// For CMD 48h response: get expression pedal sensitivity
+	void sendGetExpressionPedalSensitivity();
+	
+	// TODO CMD 49h-4Eh
+
+	//============================================================================
+	// Implementation of bidirectional communication with acknowledge messages
+
+	// MIDI input callback: handle acknowledge messages
+	void handleIncomingMidiMessage(juce::MidiInput* source, const juce::MidiMessage& message) override;
+
+	// Handle timeout
+	void timerCallback() override;
+
+
+	//============================================================================
+
+	// Clear MIDI message buffer
+	void clearMIDIMessageBuffer();
+
+private:
+
+	// Send a message now without confirming it's a Lumatone
+	void sendTestMessageNow(int outputDeviceIndex, const juce::MidiMessage& message);
+
+	// Low-level SysEx message sending
+	void sendMessageWithAcknowledge(const juce::MidiMessage& message);
+
+	// Send the oldest message in queue and start waiting for answer
+	void sendOldestMessageInQueue();
+
+	// Send the message marked as current and start waiting for answer
+    void sendCurrentMessage();
+
+    // Send a SysEx message with standardized length
+	void sendSysEx(juce::uint8 boardIndex, juce::uint8 cmd, juce::uint8 data1, juce::uint8 data2, juce::uint8 data3, juce::uint8 data4, bool overrideEditMode = false);
+
+	// Send a SysEx message without parameters
+	void sendSysExRequest(juce::uint8 boardIndex, juce::uint8 cmd);
+
+	// Send a SysEx message to toggle a state
+	void sendSysExToggle(juce::uint8 boardIndex, juce::uint8 cmd, bool turnStateOn);
+
+	// Attributes
+protected:
+	juce::ListenerList<LumatoneFirmwareDriverListener> listeners;
+
+private:
+
+	HostMode hostMode;
+//	juce::PluginHostType host;
+
+	juce::CriticalSection hostLock;
+	juce::MidiBuffer hostQueue;
+	int hostQueueSize = 0;
+
+    juce::MidiMessage currentMsgWaitingForAck;
+	bool hasMsgWaitingForAck = false;
+
+	juce::Array<juce::MidiMessage, juce::CriticalSection> sysexQueue;
+
+	// Used for device detection and "Offline" mode (no messages that mutate board data)
+	bool      onlySendRequestMessages = false;
+
+	const int numBoards = 0;
+
+	const int receiveTimeoutInMilliseconds = 2000;
+	const int busyTimeDelayInMilliseconds = 500;
+	const int checkQueueTimerDelayInMilliseconds = 10;
+	TimerType timerType;
+
+	bool receivedAnswer = false; // Debug helper flag
+
+	int verbose = 0;
+};
+
+#endif
diff --git a/Source/HajuLib/HajuMidiDriver.cpp b/Source/lumatone_editor_library/lumatone_midi_driver/midi_driver.cpp
similarity index 75%
rename from Source/HajuLib/HajuMidiDriver.cpp
rename to Source/lumatone_editor_library/lumatone_midi_driver/midi_driver.cpp
index 537fbcbe..6be1c083 100644
--- a/Source/HajuLib/HajuMidiDriver.cpp
+++ b/Source/lumatone_editor_library/lumatone_midi_driver/midi_driver.cpp
@@ -8,13 +8,13 @@
   ==============================================================================
 */
 
-#include "HajuMidiDriver.h"
+#include "./midi_driver.h"
 
 
 HajuMidiDriver::HajuMidiDriver()
 {
-	midiInputs = MidiInput::getAvailableDevices();
-	midiOutputs = MidiOutput::getAvailableDevices();
+	midiInputs = juce::MidiInput::getAvailableDevices();
+	midiOutputs = juce::MidiOutput::getAvailableDevices();
     midiInput = nullptr;
     midiOutput = nullptr;
 }
@@ -25,17 +25,17 @@ HajuMidiDriver::~HajuMidiDriver()
     closeMidiOutput();
 }
 
-const Array<MidiDeviceInfo>& HajuMidiDriver::getMidiInputList()
+const juce::Array<juce::MidiDeviceInfo>& HajuMidiDriver::getMidiInputList() const
 {
 	return midiInputs;
 }
 
-const Array<MidiDeviceInfo>& HajuMidiDriver::getMidiOutputList()
+const juce::Array<juce::MidiDeviceInfo>& HajuMidiDriver::getMidiOutputList() const
 { 
 	return midiOutputs;
 }
 
-int HajuMidiDriver::getIndexOfInputDevice(String inputDeviceId) const
+int HajuMidiDriver::findIndexOfInputDevice(juce::String inputDeviceId) const
 {
     for (int i = 0; i < midiInputs.size(); i++)
         if (midiInputs[i].identifier == inputDeviceId)
@@ -45,7 +45,7 @@ int HajuMidiDriver::getIndexOfInputDevice(String inputDeviceId) const
 }
 
 
-int HajuMidiDriver::getIndexOfOutputDevice(String outputDeviceId) const
+int HajuMidiDriver::findIndexOfOutputDevice(juce::String outputDeviceId) const
 {
     for (int i = 0; i < midiOutputs.size(); i++)
         if (midiOutputs[i].identifier == outputDeviceId)
@@ -57,7 +57,7 @@ int HajuMidiDriver::getIndexOfOutputDevice(String outputDeviceId) const
 bool HajuMidiDriver::refreshDeviceLists()
 {
     bool inputsChanged = false;
-    auto newInputs = MidiInput::getAvailableDevices();
+    auto newInputs = juce::MidiInput::getAvailableDevices();
     if (newInputs.size() == midiInputs.size())
     {
         for (int i = 0; i < newInputs.size(); i++)
@@ -75,7 +75,7 @@ bool HajuMidiDriver::refreshDeviceLists()
     {
         if (lastInputIndex >= 0)
         {
-            String lastInputId = midiInputs[lastInputIndex].identifier;
+            juce::String lastInputId = midiInputs[lastInputIndex].identifier;
 
             for (int i = 0; i < newInputs.size(); i++)
                 if (newInputs[i].identifier == lastInputId)
@@ -86,7 +86,7 @@ bool HajuMidiDriver::refreshDeviceLists()
     }
 
     bool outputsChanged = false;
-    auto newOutputs = MidiOutput::getAvailableDevices();
+    auto newOutputs = juce::MidiOutput::getAvailableDevices();
     if (newOutputs.size() == midiOutputs.size())
     {
         for (int i = 0; i < newOutputs.size(); i++)
@@ -100,7 +100,7 @@ bool HajuMidiDriver::refreshDeviceLists()
     {
         if (lastOutputIndex >= 0)
         {
-            String lastOutputId = midiOutputs[lastOutputIndex].identifier;
+            juce::String lastOutputId = midiOutputs[lastOutputIndex].identifier;
 
             for (int i = 0; i < newOutputs.size(); i++)
                 if (newOutputs[i].identifier == lastOutputId)
@@ -126,7 +126,7 @@ void HajuMidiDriver::setMidiInput(int deviceIndex)
     }
     
     DBG("Trying to open input device: " + midiInputs[deviceIndex].name);
-    selectedInput = MidiInput::openDevice(midiInputs[deviceIndex].identifier, this);
+    selectedInput = juce::MidiInput::openDevice(midiInputs[deviceIndex].identifier, this);
 
     if (selectedInput != nullptr)
     {
@@ -138,7 +138,7 @@ void HajuMidiDriver::setMidiInput(int deviceIndex)
     }
     else
     {
-        DBG("WARNING: Could not open up input device " + String(deviceIndex));
+        DBG("WARNING: Could not open up input device " + juce::String(deviceIndex));
     }
 }
 
@@ -155,7 +155,7 @@ void HajuMidiDriver::setMidiOutput(int deviceIndex)
     }
 
     DBG("Trying to open output device: " + midiOutputs[deviceIndex].name);
-    selectedOutput = MidiOutput::openDevice(midiOutputs[deviceIndex].identifier);
+    selectedOutput = juce::MidiOutput::openDevice(midiOutputs[deviceIndex].identifier);
 
     if (selectedOutput != nullptr)
     {
@@ -165,11 +165,11 @@ void HajuMidiDriver::setMidiOutput(int deviceIndex)
     }
     else
     {
-        DBG("WARNING: Could not open up output device " + String(deviceIndex));
+        DBG("WARNING: Could not open up output device " + juce::String(deviceIndex));
     }
 }
 
-void HajuMidiDriver::sendMessageNow(const MidiMessage& message)
+void HajuMidiDriver::sendMessageNow(const juce::MidiMessage& message)
 {
 	// Send only if output device is there
 	if (midiOutput != nullptr)
@@ -177,22 +177,10 @@ void HajuMidiDriver::sendMessageNow(const MidiMessage& message)
 		midiOutput->sendMessageNow(message);
         return;
     }
-    jassertfalse;
+    // jassertfalse;
     DBG("MidiOutput is null!");
 }
 
-void HajuMidiDriver::sendNoteOnMessage(int noteNumber, int channelNumber, uint8 velocity)
-{
-	if (channelNumber > 0 && noteNumber >= 0)
-		sendMessageNow(MidiMessage::noteOn(channelNumber, noteNumber, velocity));
-}
-
-void HajuMidiDriver::sendNoteOffMessage(int noteNumber, int channelNumber, uint8 velocity)
-{
-	if (channelNumber > 0 && noteNumber >= 0)
-		sendMessageNow(MidiMessage::noteOff(channelNumber, noteNumber, velocity));
-}
-
 void HajuMidiDriver::closeMidiInput()
 {
     if (midiInput != nullptr)
@@ -229,7 +217,7 @@ void HajuMidiDriver::openAvailableDevicesForTesting()
 
     for (auto device : midiOutputs)
     {
-        auto newOutput = MidiOutput::openDevice(device.identifier);
+        auto newOutput = juce::MidiOutput::openDevice(device.identifier);
         if (newOutput == nullptr)
             continue;
 
@@ -238,7 +226,7 @@ void HajuMidiDriver::openAvailableDevicesForTesting()
 
     for (auto device : midiInputs)
     {
-        auto newInput = MidiInput::openDevice(device.identifier, this);
+        auto newInput = juce::MidiInput::openDevice(device.identifier, this);
         if (newInput == nullptr)
             continue;
 
@@ -247,7 +235,7 @@ void HajuMidiDriver::openAvailableDevicesForTesting()
     }
 }
 
-void HajuMidiDriver::sendTestMessageNow(int outputDeviceIndex, const MidiMessage& message)
+void HajuMidiDriver::sendTestMessageNow(int outputDeviceIndex, const juce::MidiMessage& message)
 {
     // Return some error code?
     if (outputDeviceIndex >= 0 && outputDeviceIndex < testOutputs.size())
diff --git a/Source/HajuLib/HajuMidiDriver.h b/Source/lumatone_editor_library/lumatone_midi_driver/midi_driver.h
similarity index 63%
rename from Source/HajuLib/HajuMidiDriver.h
rename to Source/lumatone_editor_library/lumatone_midi_driver/midi_driver.h
index 1ed0161e..541f5415 100644
--- a/Source/HajuLib/HajuMidiDriver.h
+++ b/Source/lumatone_editor_library/lumatone_midi_driver/midi_driver.h
@@ -1,119 +1,115 @@
-/*
-  ==============================================================================
-
-    HajuMidiDriver.h
-    Created: 23 Feb 2018 11:30:58pm
-    Author:  hsstraub
-
-  ==============================================================================
-*/
-
-#ifndef HAJUMIDIDRIVER_H_INCLUDED
-#define HAJUMIDIDRIVER_H_INCLUDED
-
-//[Headers]     -- You can add your own extra header files here --
-#include <JuceHeader.h>
-//[/Headers]
-
-
-/*
-==============================================================================
-Driver encapsulating MIDI functionality, extension of JUCE
-==============================================================================
-*/
-class HajuMidiDriver : public MidiInputCallback
-{
-public:
-	HajuMidiDriver();
-	~HajuMidiDriver();
-
-	virtual void handleIncomingMidiMessage(MidiInput*, const MidiMessage&) = 0;
-
-	//============================================================================
-	// Primary functions with supported MIDI device
-
-	// List of MIDI input device names
-	const Array<MidiDeviceInfo>& getMidiInputList();
-	// List of MIDI output device names
-	const Array<MidiDeviceInfo>& getMidiOutputList();
-
-	MidiDeviceInfo getLastMidiOutputInfo() const { return lastOutputDevice; }
-	MidiDeviceInfo getLastMidiInputInfo() const { return lastInputDevice; }
-
-	// Return the current input device index
-    int getMidiInputIndex() const { return lastInputIndex; }
-
-	// Return the current output device index
-    int getMidiOutputIndex() const { return lastOutputIndex; }
-
-	// Returns whether or not the current device indicies are valid
-	bool hasDevicesDefined() const { return lastInputIndex >= 0 && lastOutputIndex >= 0; }
-
-	// Returns the index of the given MidiDevice if found, or -1 if not present
-	int getIndexOfInputDevice(MidiDeviceInfo inputDeviceInfo) const { return midiInputs.indexOf(inputDeviceInfo); }
-	int getIndexOfInputDevice(String inputDeviceId) const;
-	// Returns the index of the given MidiDevice if found, or -1 if not present
-	int getIndexOfOutputDevice(MidiDeviceInfo outputDeviceInfo) const { return midiOutputs.indexOf(outputDeviceInfo); }
-	int getIndexOfOutputDevice(String outputDeviceId) const;
-
-	// Re-initializes device list in case of changes, returns true if a change was detected
-	bool refreshDeviceLists();
-
-	// Open the specified input device
-	void setMidiInput(int deviceIndex);
-
-	// Open the specified output device
-	void setMidiOutput(int deviceIndex);
-
-	// Send a MIDI message directly
-	void sendMessageNow(const MidiMessage& message);
-
-	// Higher level commands
-	void sendNoteOnMessage(int noteNumber, int channelNumber, uint8 velocity);
-	void sendNoteOffMessage(int noteNumber, int channelNumber, uint8 velocity);
-
-    // Close current input device
-    void closeMidiInput();
-
-    // Close current output device
-    void closeMidiOutput();
-
-	//============================================================================
-	// Device detection support
-
-	// Refreshes and opens all available MIDI devices
-	void openAvailableDevicesForTesting();
-
-	// Send a message to a specific device
-	void sendTestMessageNow(int outputDeviceIndex, const MidiMessage& message);
-
-	// Closes all open testing devices; either setMidiInput and setMidiOutput will call this if it's not empty
-	void closeTestingDevices();
-
-	bool testIsIncomplete() const { return (testInputs.size() > 0 || testOutputs.size() > 0) && midiInput == nullptr && midiOutput == nullptr; }
-
-	// Attributes
-protected:
-	Array<MidiDeviceInfo> midiInputs;
-	Array<MidiDeviceInfo> midiOutputs;
-
-    int lastOutputIndex = -1;
-	int lastInputIndex = -1;
-
-	MidiDeviceInfo lastOutputDevice;
-	MidiDeviceInfo lastInputDevice;
-
-	std::unique_ptr<MidiInput> selectedInput;
-	std::unique_ptr<MidiOutput> selectedOutput;
-
-	// Currently open MIDI output
-	MidiOutput* midiOutput;
-
-	// Last MIDI input opened
-	MidiInput* midiInput;
-
-	OwnedArray<MidiOutput> testOutputs;
-	OwnedArray<MidiInput> testInputs;
-};
-
-#endif  // HAJUMIDIDRIVER_H_INCLUDED
+/*
+  ==============================================================================
+
+    HajuMidiDriver.h
+    Created: 23 Feb 2018 11:30:58pm
+    Author:  hsstraub
+
+  ==============================================================================
+*/
+
+#ifndef HAJUMIDIDRIVER_H_INCLUDED
+#define HAJUMIDIDRIVER_H_INCLUDED
+
+//[Headers]     -- You can add your own extra header files here --
+#include <JuceHeader.h>
+//[/Headers]
+
+
+/*
+==============================================================================
+Driver encapsulating MIDI functionality, extension of JUCE
+==============================================================================
+*/
+class HajuMidiDriver : public juce::MidiInputCallback
+{
+public:
+	HajuMidiDriver();
+	~HajuMidiDriver();
+
+	virtual void handleIncomingMidiMessage(juce::MidiInput*, const juce::MidiMessage&) = 0;
+
+	//============================================================================
+	// Primary functions with supported MIDI device
+
+	// List of MIDI input device names
+	const juce::Array<juce::MidiDeviceInfo>& getMidiInputList() const;
+	// List of MIDI output device names
+	const juce::Array<juce::MidiDeviceInfo>& getMidiOutputList() const;
+    
+	juce::MidiDeviceInfo getMidiOutputInfo() const { return lastOutputDevice; }
+	juce::MidiDeviceInfo getMidiInputInfo() const { return lastInputDevice; }
+    
+	// Return the current input device index
+    int getMidiInputIndex() const { return lastInputIndex; }
+
+	// Return the current output device index
+    int getMidiOutputIndex() const { return lastOutputIndex; }
+
+	// Returns whether or not the current device indicies are valid
+	bool hasDevicesDefined() const { return lastInputIndex >= 0 && lastOutputIndex >= 0; }
+
+	// Returns the index of the given MidiDevice if found, or -1 if not present
+	int findIndexOfInputDevice(juce::MidiDeviceInfo inputDeviceInfo) const { return midiInputs.indexOf(inputDeviceInfo); }
+	int findIndexOfInputDevice(juce::String inputDeviceId) const;
+	// Returns the index of the given MidiDevice if found, or -1 if not present
+	int findIndexOfOutputDevice(juce::MidiDeviceInfo outputDeviceInfo) const { return midiOutputs.indexOf(outputDeviceInfo); }
+	int findIndexOfOutputDevice(juce::String outputDeviceId) const;
+
+	// Re-initializes device list in case of changes, returns true if a change was detected
+	bool refreshDeviceLists();
+
+	// Open the specified input device
+	void setMidiInput(int deviceIndex);
+
+	// Open the specified output device
+	void setMidiOutput(int deviceIndex);
+
+	// Send a MIDI message directly
+	virtual void sendMessageNow(const  juce::MidiMessage& message);
+    
+    // Close current input device
+    void closeMidiInput();
+    
+    // Close current output device
+    void closeMidiOutput();
+
+	//============================================================================
+	// Device detection support
+
+	// Refreshes and opens all available MIDI devices
+	void openAvailableDevicesForTesting();
+
+	// Send a message to a specific device
+	virtual void sendTestMessageNow(int outputDeviceIndex, const  juce::MidiMessage& message);
+
+	// Closes all open testing devices; either setMidiInput and setMidiOutput will call this if it's not empty
+	void closeTestingDevices();
+
+	bool testIsIncomplete() const { return (testInputs.size() > 0 || testOutputs.size() > 0) && midiInput == nullptr && midiOutput == nullptr; }
+
+	// Attributes
+protected:
+	juce::Array<juce::MidiDeviceInfo> midiInputs;
+	juce::Array<juce::MidiDeviceInfo> midiOutputs;
+
+    int lastOutputIndex = -1;
+	int lastInputIndex = -1;
+
+	juce::MidiDeviceInfo lastOutputDevice;
+	juce::MidiDeviceInfo lastInputDevice;
+
+	std::unique_ptr<juce::MidiInput> selectedInput;
+	std::unique_ptr<juce::MidiOutput> selectedOutput;
+
+	// Currently open MIDI output
+	juce::MidiOutput* midiOutput;
+
+	// Last MIDI input opened
+	juce::MidiInput* midiInput;
+
+	juce::OwnedArray<juce::MidiOutput> testOutputs;
+	juce::OwnedArray<juce::MidiInput> testInputs;
+};
+
+#endif  // HAJUMIDIDRIVER_H_INCLUDED
diff --git a/Source/lumatone_geometry.cpp b/Source/lumatone_editor_library/mapping/lumatone_geometry.cpp
similarity index 99%
rename from Source/lumatone_geometry.cpp
rename to Source/lumatone_editor_library/mapping/lumatone_geometry.cpp
index adc15714..2fc004a2 100644
--- a/Source/lumatone_geometry.cpp
+++ b/Source/lumatone_editor_library/mapping/lumatone_geometry.cpp
@@ -9,7 +9,7 @@
 */
 
 #include "lumatone_geometry.h"
-#include "./data/lumatone_layout.h"
+#include "../data/lumatone_layout.h"
 
 
 //==============================================================================
@@ -293,4 +293,4 @@ int LumatoneGeometry::getLastIndexForRow(int rowIndex) const
 int LumatoneGeometry::getVerticalOriginLineIndexForRow(int rowIndex) const
 {
     return rowVerticalOriginLineIndex[rowIndex];
-}
+}
\ No newline at end of file
diff --git a/Source/lumatone_geometry.h b/Source/lumatone_editor_library/mapping/lumatone_geometry.h
similarity index 95%
rename from Source/lumatone_geometry.h
rename to Source/lumatone_editor_library/mapping/lumatone_geometry.h
index b1658520..df2fe0c2 100644
--- a/Source/lumatone_geometry.h
+++ b/Source/lumatone_editor_library/mapping/lumatone_geometry.h
@@ -48,6 +48,7 @@ static LumatoneBoardSize GetLumatoneBoardSize(int octaveBoardSize)
     }
 }
 
+
 //==============================================================================
 // Manages the geometry of the board - used to create isomorphic key mappings
 class LumatoneGeometry
@@ -66,6 +67,9 @@ class LumatoneGeometry
     StraightLine horizontalLineOfField(int fieldIndex) const { return getLineOfField(fieldIndex, this->horizontalLines); };
     StraightLine rightUpwardLineOfField(int fieldIndex) const { return getLineOfField(fieldIndex, this->rightUpwardLines); };
 
+    StraightLine horizontalLine(int rowIndex) const { return horizontalLines[rowIndex]; }
+    StraightLine rightUpwardLine(int colIndex) const { return rightUpwardLines[colIndex]; }
+
     int horizontalLineCount() const { return this->horizontalLines.size(); }
     int rightUpwardLineCount() const { return this->rightUpwardLines.size(); }
 
@@ -96,10 +100,10 @@ class LumatoneGeometry
 
     StraightLineSet    horizontalLines;
     StraightLineSet    rightUpwardLines;
-
+    
     juce::Array<int> firstColumnOffsets;
     juce::Array<int> rowOffsets; // Horizonal offset of each horizontal line on the board, relative to the lower left key.
-
+    
     juce::Array<int> rowVerticalOriginLineIndex;    // Key index for the key in a vertical line with the board's 0th key, for a given row
 
     int boardXOffset; // Offset along shallow diagonals between analogous keys from one board to the next (typically 7)
diff --git a/Source/lumatone_editor_library/mapping/lumatone_hex_map.cpp b/Source/lumatone_editor_library/mapping/lumatone_hex_map.cpp
new file mode 100644
index 00000000..e7069858
--- /dev/null
+++ b/Source/lumatone_editor_library/mapping/lumatone_hex_map.cpp
@@ -0,0 +1,214 @@
+/*
+  ==============================================================================
+
+    lumatone_hex_map.cpp
+    Created: 31 Jul 2023 1:39:39am
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#include "lumatone_hex_map.h"
+
+LumatoneHexMap::LumatoneHexMap(std::shared_ptr<LumatoneLayout> layoutIn, Hex::Point originPointIn, int originBoardIndexIn, int originKeyIndexIn)
+    : layout(layoutIn)
+    , originPoint(originPointIn)
+    , originBoardIndex(originBoardIndexIn)
+    , originKeyIndex(originKeyIndexIn)
+{
+    map.reset(new juce::HashMap<juce::String, MappedKey>(280));
+    renderMap();
+}
+
+LumatoneHexMap::~LumatoneHexMap()
+{
+    map = nullptr;
+}
+
+LumatoneKeyCoord LumatoneHexMap::hexToKeyCoords(Hex::Point point) const
+{
+    auto key = point.toString();
+    return (*map)[key].key;
+}
+
+int LumatoneHexMap::hexToKeyNum(Hex::Point point) const
+{
+    auto coord = hexToKeyCoords(point);
+    if (layout->isKeyCoordValid(coord))
+        return coord.boardIndex * layout->getOctaveBoardSize() + coord.keyIndex;
+    return -1;
+}
+
+Hex::Point LumatoneHexMap::keyCoordsToHex(int boardIndex, int keyIndex) const
+{
+    return boards[boardIndex].keys[keyIndex].point;
+}
+
+Hex::Point LumatoneHexMap::keyCoordsToHex(const LumatoneKeyCoord& keyCoord) const
+{
+    return keyCoordsToHex(keyCoord.boardIndex, keyCoord.keyIndex);
+}
+
+Hex::Point LumatoneHexMap::keyNumToHex(int keyNum) const
+{
+    return keyCoordsToHex(keyNum / layout->getOctaveBoardSize(), keyNum % layout->getOctaveBoardSize());
+}
+
+Hex::Point LumatoneHexMap::addBoardIndex(Hex::Point point, int numIndexes)
+{
+    return Hex::Point(point.q + numIndexes * 5, point.r + numIndexes * 2);
+}
+
+void LumatoneHexMap::renderMap()
+{
+    map->clear();
+
+    for (int i = 0; i < layout->getNumBoards(); i++)
+        boards[i] = MapBoard(layout->getOctaveBoardSize());
+
+    int originRowIndex = 0;
+    int lineToZeroDiff = 0;
+
+    for (int row = 0; row < lumatoneGeometry.horizontalLineCount(); row++)
+    {
+        if (originKeyIndex < lumatoneGeometry.getLastIndexForRow(row))
+        {
+            originRowIndex = row;
+            lineToZeroDiff = originKeyIndex - lumatoneGeometry.getVerticalOriginLineIndexForRow(row);
+            break;
+        }
+    }
+    
+    Hex::Point zeroKeyPoint = addBoardIndex(
+                                Hex::Point(originPoint.q + lineToZeroDiff, originPoint.r - originRowIndex),
+                                -originBoardIndex);
+
+    int keyIndex = 0;
+    int numRows = lumatoneGeometry.horizontalLineCount();
+
+    for (int row = 0; row < numRows; row++)
+    {
+        Hex::Point rowPoint = zeroKeyPoint;
+
+        switch (row)
+        {
+        default:
+            rowPoint = zeroKeyPoint + Hex::Point(-(row / 2), row);
+            break;
+
+        case 9:
+            rowPoint = zeroKeyPoint + Hex::Point(-3, row);
+            break;
+
+        case 10:
+            rowPoint = zeroKeyPoint + Hex::Point(-1, row);
+            break;
+
+        }
+
+        auto rowKeys = lumatoneGeometry.horizontalLine(row);
+        int rowLength = rowKeys.size();
+
+        for (int rowKeyIndex = 0; rowKeyIndex < rowLength; rowKeyIndex++)
+        {
+            for (int boardIndex = 0; boardIndex < layout->getNumBoards(); boardIndex++)
+            {
+                auto boordCoord = Hex::Point(rowPoint.q + rowKeyIndex, rowPoint.r);
+                auto hexCoord = addBoardIndex(boordCoord, boardIndex);
+
+                LumatoneKeyCoord keyCoord(boardIndex, keyIndex);
+
+                MappedKey mappedKey = { keyCoord, hexCoord };
+                boards[boardIndex].keys[keyIndex] = mappedKey;
+
+                auto hexHash = hexCoord.toString();
+                map->set(hexHash, mappedKey);
+            }
+
+            keyIndex++;
+        }
+    }
+}
+
+bool LumatoneHexMap::testIdentityMap()
+{
+    const int octaveSize = 56;
+    auto layout = std::make_shared<LumatoneLayout>(LumatoneLayout::IdentityMapping(1, octaveSize));
+    LumatoneHexMap hexMap(layout);
+
+    auto board = layout->getBoard(0);
+
+    Hex::Point expectedHexCoords[] =
+    {
+        Hex::Point(0, 0),
+        Hex::Point(1, 0),
+        Hex::Point(0, 1),
+        Hex::Point(1, 1),
+        Hex::Point(2, 1),
+        Hex::Point(3, 1),
+        Hex::Point(4, 1),
+        Hex::Point(-1, 2),
+        Hex::Point(0, 2),
+        Hex::Point(1, 2),
+        Hex::Point(2, 2),
+        Hex::Point(3, 2),
+        Hex::Point(4, 2),
+        Hex::Point(-1, 3),
+        Hex::Point(0, 3),
+        Hex::Point(1, 3),
+        Hex::Point(2, 3),
+        Hex::Point(3, 3),
+        Hex::Point(4, 3),
+        Hex::Point(-2, 4),
+        Hex::Point(-1, 4),
+        Hex::Point(0, 4),
+        Hex::Point(1, 4),
+        Hex::Point(2, 4),
+        Hex::Point(3, 4),
+        Hex::Point(-2, 5),
+        Hex::Point(-1, 5),
+        Hex::Point(0, 5),
+        Hex::Point(1, 5),
+        Hex::Point(2, 5),
+        Hex::Point(3, 5),
+        Hex::Point(-3, 6),
+        Hex::Point(-2, 6),
+        Hex::Point(-1, 6),
+        Hex::Point(0, 6),
+        Hex::Point(1, 6),
+        Hex::Point(2, 6),
+        Hex::Point(-3, 7),
+        Hex::Point(-2, 7),
+        Hex::Point(-1, 7),
+        Hex::Point(0, 7),
+        Hex::Point(1, 7),
+        Hex::Point(2, 7),
+        Hex::Point(-4, 8),
+        Hex::Point(-3, 8),
+        Hex::Point(-2, 8),
+        Hex::Point(-1, 8),
+        Hex::Point(0, 8),
+        Hex::Point(1, 8),
+        Hex::Point(-3, 9),
+        Hex::Point(-2, 9),
+        Hex::Point(-1, 9),
+        Hex::Point(0, 9),
+        Hex::Point(1, 9),
+        Hex::Point(-1, 10),
+        Hex::Point(0, 10)
+    };
+
+    for (int keyIndex = 0; keyIndex < octaveSize; keyIndex++)
+    {
+        auto keyCoord = LumatoneKeyCoord(0, keyIndex);
+        auto mapped = hexMap.keyCoordsToHex(keyCoord);
+
+        if (expectedHexCoords[keyIndex] != mapped)
+        {
+            DBG("ERROR mapping " + keyCoord.toString() + ", expected " + expectedHexCoords[keyIndex].toString() + " got " + mapped.toString());
+            return false;
+        }
+    }
+
+    return true;
+}
diff --git a/Source/hex/lumatone_hex_map.h b/Source/lumatone_editor_library/mapping/lumatone_hex_map.h
similarity index 79%
rename from Source/hex/lumatone_hex_map.h
rename to Source/lumatone_editor_library/mapping/lumatone_hex_map.h
index 5b1f2387..2d7b8ead 100644
--- a/Source/hex/lumatone_hex_map.h
+++ b/Source/lumatone_editor_library/mapping/lumatone_hex_map.h
@@ -8,9 +8,12 @@
   ==============================================================================
 */
 
-#pragma once
-#include "./hex_field.h"
-#include "../lumatone_geometry.h"
+#ifndef LUMATONE_HEX_MAP_H
+#define LUMATONE_HEX_MAP_H
+
+#include "./lumatone_geometry.h"
+
+#include "../hex/hex_field.h"
 #include "../data/lumatone_layout.h"
 
 class LumatoneHexMap
@@ -37,7 +40,7 @@ class LumatoneHexMap
     };
 
 public:
-    LumatoneHexMap(const LumatoneLayout& layout, 
+    LumatoneHexMap(std::shared_ptr<LumatoneLayout> layout, 
                    Hex::Point originPoint = Hex::Point(0, 0),
                    int originBoardIndex = 0, 
                    int originKeyIndex = 0);
@@ -45,10 +48,13 @@ class LumatoneHexMap
     ~LumatoneHexMap();
 
     LumatoneKeyCoord hexToKeyCoords(Hex::Point point) const;
+    int hexToKeyNum(Hex::Point point) const;
    
     Hex::Point keyCoordsToHex(int boardIndex, int keyIndex) const;
     Hex::Point keyCoordsToHex(const LumatoneKeyCoord& keyCoord) const;
 
+    Hex::Point keyNumToHex(int keyNum) const;
+
 private:
 
     std::unique_ptr<juce::HashMap<juce::String, MappedKey>> map;
@@ -57,9 +63,13 @@ class LumatoneHexMap
 
     Hex::Point addBoardIndex(Hex::Point point, int numIndexes);
 
+public:
+
+    static bool testIdentityMap();
+
 private:
 
-    LumatoneLayout layout;
+    std::shared_ptr<LumatoneLayout> layout;
 
     LumatoneGeometry lumatoneGeometry;
 
@@ -69,4 +79,6 @@ class LumatoneHexMap
     Hex::Point originPoint;
     int originBoardIndex = 0;
     int originKeyIndex = 0;
-};
\ No newline at end of file
+};
+
+#endif LUMATONE_HEX_MAP_H
diff --git a/Source/lumatone_editor_library/mapping/lumatone_output_map.cpp b/Source/lumatone_editor_library/mapping/lumatone_output_map.cpp
new file mode 100644
index 00000000..155ef27a
--- /dev/null
+++ b/Source/lumatone_editor_library/mapping/lumatone_output_map.cpp
@@ -0,0 +1,49 @@
+/*
+  ==============================================================================
+
+    lumatone_output_map.cpp
+    Created: 31 Jul 2023 9:28:35pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#include "lumatone_output_map.h"
+
+LumatoneOutputMap::LumatoneOutputMap(LumatoneLayout* layout)
+    : midiMap(280)
+{
+    if (layout != nullptr)
+    {
+        render(*layout);
+    }
+}
+
+juce::Array<LumatoneKeyCoord> LumatoneOutputMap::getKeysAssignedToNoteOn(int midiChannel, int noteNumber)
+{
+    juce::String hash = juce::String(midiChannel) + "," + juce::String(noteNumber);
+    return midiMap[hash];
+}
+
+void LumatoneOutputMap::render(const LumatoneLayout& layout, juce::HashMap<juce::String, juce::Array<LumatoneKeyCoord>>& map)
+{
+    map.clear();
+
+    for (int boardIndex = 0; boardIndex < layout.getNumBoards(); boardIndex++)
+    {
+        for (int keyIndex = 0; keyIndex < layout.getOctaveBoardSize(); keyIndex++)
+        {
+            auto key = layout.getKey(boardIndex, keyIndex);
+
+            juce::String midiHash = juce::String(key.getMidiChannel()) + "," + juce::String(key.getMidiNumber());
+            auto mappedKeys = map[midiHash];
+            mappedKeys.add(LumatoneKeyCoord(boardIndex, keyIndex));
+            map.set(midiHash, mappedKeys);
+        }
+    }
+}
+
+void LumatoneOutputMap::render(const LumatoneLayout& layout)
+{
+    render(layout, midiMap);
+}
diff --git a/Source/lumatone_editor_library/mapping/lumatone_output_map.h b/Source/lumatone_editor_library/mapping/lumatone_output_map.h
new file mode 100644
index 00000000..cc69ea59
--- /dev/null
+++ b/Source/lumatone_editor_library/mapping/lumatone_output_map.h
@@ -0,0 +1,39 @@
+/*
+  ==============================================================================
+
+    lumatone_output_map.h
+    Created: 31 Jul 2023 9:28:35pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#pragma once
+#include "../data/lumatone_layout.h"
+
+class LumatoneOutputMap
+{
+    struct MidiCoord
+    {
+        MidiCoord(int channelNum = 0, int noteNum = -1)
+            : channelNumber(channelNum)
+            , noteNumber(noteNum) {}
+        int channelNumber;
+        int noteNumber;
+    };
+
+public:
+
+    LumatoneOutputMap(LumatoneLayout* layout=nullptr);
+
+    juce::Array<LumatoneKeyCoord> getKeysAssignedToNoteOn(int midiChannel, int noteNumber);
+
+    void render(const LumatoneLayout& layout);
+
+public:
+    static void render(const LumatoneLayout& layout, juce::HashMap<juce::String, juce::Array<LumatoneKeyCoord>>& map);
+
+private:
+
+    juce::HashMap<juce::String, juce::Array<LumatoneKeyCoord>> midiMap;
+};
diff --git a/Source/lumatone_tiling.cpp b/Source/lumatone_editor_library/mapping/lumatone_tiling.cpp
similarity index 100%
rename from Source/lumatone_tiling.cpp
rename to Source/lumatone_editor_library/mapping/lumatone_tiling.cpp
diff --git a/Source/lumatone_tiling.h b/Source/lumatone_editor_library/mapping/lumatone_tiling.h
similarity index 97%
rename from Source/lumatone_tiling.h
rename to Source/lumatone_editor_library/mapping/lumatone_tiling.h
index e41efe9a..aad67062 100644
--- a/Source/lumatone_tiling.h
+++ b/Source/lumatone_editor_library/mapping/lumatone_tiling.h
@@ -9,7 +9,7 @@
 */
 
 #pragma once
-#include "lumatone_geometry.h"
+#include "./lumatone_geometry.h"
 
 //==============================================================================
 // Used to calculate the center point coordinates for a hexagon tiling.
@@ -73,11 +73,11 @@ class LumatoneTiling
 	/// <param name="radiusScalarIn"></param>
 	/// <param name="lateralScalarIn"></param>
 	void fitTilingTo(
-		juce::Rectangle<float>	boundsIn,
+		juce::Rectangle<float>	boundsIn, 
 		int					widestRow,
 		int					longestColumn,
-		float				marginSize,
-		float				rotateAngle,
+		float				marginSize, 
+		float				rotateAngle, 
 		bool				scaleToFitRotation = true,
 		float				radiusScalarIn = 1.0f,
 		float				lateralScalarIn = 1.0f
@@ -108,10 +108,10 @@ class LumatoneTiling
 
 	juce::Array<juce::Point<float>> getHexagonCentresSkewed(const LumatoneGeometry& boardGeometry, int startingOctave, int numOctavesIn) const;
 
-	// I have a new model of this class in the TilingGeometry branch that is based on this function, but it happened to perform worse
+	// I have a new model of this class in the TilingGeometry branch that is based on this function, but it happened to perform worse 
 	// in terms of rounding errors, so this is a quick-fix for implementing HexPalettes before I can officially clean this class up
 	juce::Array<juce::Point<float>> transformPointsFromOrigin(juce::Array<juce::Point<int>> hexagonalCoordinatesIn);
-
+	
 	//==============================================================================
 	// Property getters
 
@@ -153,7 +153,7 @@ class LumatoneTiling
 	double getRowAngleBasis() const { return rowBasisAngle; }
 
 	//==============================================================================
-
+	
 	double findBestRadius(int widestRow, int longestColumn);
 
 private:
@@ -183,8 +183,8 @@ class LumatoneTiling
 	static double distanceStepsAwayY(double radiusBounding, double margin, int stepsY);
 
 	static juce::Point<double> getSkewedPoint(
-		double columnAngleX, double columnAngleY,
-		double rowAngleX, double rowAngleY,
+		double columnAngleX, double columnAngleY, 
+		double rowAngleX, double rowAngleY, 
 		double colUnit, double rowUnit, int columnOffset, int rowOffset
 	);
 
@@ -192,7 +192,7 @@ class LumatoneTiling
 
 	//=======================================================================
 	// Parameters
-
+	
 	juce::Rectangle<float> bounds = juce::Rectangle<float>(0, 0, 1, 1);
 	double radius = 0.5;
 
diff --git a/Source/lumatone_editor_library/midi/lumatone_midi_manager.cpp b/Source/lumatone_editor_library/midi/lumatone_midi_manager.cpp
new file mode 100644
index 00000000..70d7e41e
--- /dev/null
+++ b/Source/lumatone_editor_library/midi/lumatone_midi_manager.cpp
@@ -0,0 +1,200 @@
+#include "lumatone_midi_manager.h"
+#include "../listeners/midi_listener.h"
+
+#include "../lumatone_midi_driver/lumatone_midi_driver.h"
+
+LumatoneApplicationMidiController::LumatoneApplicationMidiController(const LumatoneApplicationState& stateIn, LumatoneFirmwareDriver& firmwareDriverIn)
+    : appState("LumatoneApplicationMidiController", stateIn)
+    , firmwareDriver(firmwareDriverIn)
+    // , LumatoneSandboxLogger("LumatoneApplicationMidiController")
+{
+    firmwareDriver.addDriverListener(this);
+}
+
+LumatoneApplicationMidiController::~LumatoneApplicationMidiController()
+{
+    listeners.clear();
+    firmwareDriver.removeDriverListener(this);
+}
+
+void LumatoneApplicationMidiController::sendMidiMessage(const juce::MidiMessage msg)
+{
+    // logInfo("sendMidiMessage", msg.getDescription());
+    appMidiState.processNextMidiEvent(msg);
+    firmwareDriver.sendMessageNow(msg);
+}
+
+void LumatoneApplicationMidiController::sendMidiMessageInContext(const juce::MidiMessage msg, int boardIndex, int keyIndex)
+{
+    if (! appState.isContextSet())
+    {
+        sendMidiMessage(msg);
+        return;
+    }
+
+    bool setNote = msg.isNoteOnOrOff() || msg.isAftertouch();
+    bool setController = msg.isController();
+
+    // auto key = appState.getKeyContext(msg.getChannel(), setNote ? msg.getNoteNumber() : msg.getControllerNumber());
+    auto key = appState.getKeyContext(boardIndex, keyIndex);
+
+    juce::MidiMessage newMsg = msg;
+    newMsg.setChannel(key.getMidiChannel());
+
+    if (setNote)
+        newMsg.setNoteNumber(key.getMidiNumber());
+
+    if (setController)
+        newMsg = juce::MidiMessage::controllerEvent(key.getMidiChannel(), key.getMidiNumber(), msg.getControllerValue());
+
+    sendMidiMessage(newMsg);
+}
+
+void LumatoneApplicationMidiController::sendKeyNoteOn(int boardIndex, int keyIndex, juce::uint8 velocity, bool ignoreContext)
+{
+    bool useContext = !ignoreContext && appState.isContextSet();
+
+    // const LumatoneKey* keyData = appState.getKey(boardIndex, keyIndex);
+    // LumatoneKeyContext context = appState.getKeyContext(boardIndex, keyIndex);
+    // LumatoneKey key = *keyData;
+    // LumatoneKey ctx = appState.getKeyContext(boardIndex, keyIndex);
+
+// #if JUCE_DEBUG
+//     LumatoneKey key;
+//     if (useContext)
+//         key = (LumatoneKey)appState.getKeyContext(boardIndex, keyIndex);
+//     else
+//         key = appState.getKeyContext(boardIndex, keyIndex);
+// #else
+//     LumatoneKey key = (useContext)
+//         ? (LumatoneKey)appState.getKeyContext(boardIndex, keyIndex);
+//         : appState.getKeyContext(boardIndex, keyIndex);
+// #endif
+
+    LumatoneKey key
+    #if JUCE_DEBUG
+    ; if (useContext)
+        key =
+    #else
+       = (useContext) ?
+    #endif
+        (LumatoneKey)appState.getKeyContext(boardIndex, keyIndex)
+    #if JUCE_DEBUG
+    ; else
+        key =
+    #else
+        :
+    #endif
+        appState.getKey(boardIndex, keyIndex);
+
+
+    jassert(key.getMidiChannel() > 0 && key.getMidiChannel() <= 16 && key.getMidiNumber() >= 0 && key.getMidiNumber() < 128);
+
+    juce::MidiMessage msg = juce::MidiMessage::noteOn(key.getMidiChannel(), key.getMidiNumber(), velocity);
+    sendMidiMessage(msg);
+}
+
+void LumatoneApplicationMidiController::sendKeyNoteOff(int boardIndex, int keyIndex, bool ignoreContext)
+{
+    bool useContext = !ignoreContext && appState.isContextSet();
+
+    LumatoneKey key = (useContext)
+        ? (LumatoneKey)appState.getKeyContext(boardIndex, keyIndex)
+        : appState.getKey(boardIndex, keyIndex);
+
+    jassert(key.getMidiChannel() > 0 && key.getMidiChannel() <= 16 && key.getMidiNumber() >= 0 && key.getMidiNumber() < 128);
+
+    juce::MidiMessage msg = juce::MidiMessage::noteOff(key.getMidiChannel(), key.getMidiNumber());
+    sendMidiMessage(msg);
+}
+
+void LumatoneApplicationMidiController::allNotesOff(int midiChannel)
+{
+    // auto msg = juce::MidiMessage::allNotesOff(midiChannel);
+    // sendMidiMessage(msg);
+
+    for (int i = 0; i < 128; i++)
+    {
+        if (appMidiState.isNoteOn(midiChannel, i))
+        {
+            auto msg = juce::MidiMessage::noteOff(midiChannel, i);
+            sendMidiMessage(msg);
+        }
+
+    }
+}
+
+void LumatoneApplicationMidiController::allNotesOff()
+{
+    for (int ch = 1; ch <=16; ch++)
+        allNotesOff(ch);
+}
+
+void LumatoneApplicationMidiController::handleLumatoneMidi(LumatoneMidiState *midiState, const juce::MidiMessage &msg)
+{
+    appMidiState.processNextMidiEvent(msg);
+}
+
+void LumatoneApplicationMidiController::handleNoteOn(LumatoneMidiState *midiState, int midiChannel, int midiNote, juce::uint8 velocity)
+{
+    listeners.call(&LumatoneEditor::MidiListener::handleNoteOn, midiChannel, midiNote, velocity);
+    // listeners.call(&LumatoneEditor::MidiListener::handleKeyDown, midiChannel, midiNote, velocity);
+}
+
+void LumatoneApplicationMidiController::handleNoteOff(LumatoneMidiState* midiState, int midiChannel, int midiNote)
+{
+    listeners.call(&LumatoneEditor::MidiListener::handleNoteOff, midiChannel, midiNote);
+    // listeners.call(&LumatoneEditor::MidiListener::handleKeyUp, midiChannel, midiNote);
+}
+
+void LumatoneApplicationMidiController::handleAftertouch(LumatoneMidiState* midiState, int midiChannel, int midiNote, juce::uint8 aftertouch)
+{
+    listeners.call(&LumatoneEditor::MidiListener::handleAftertouch, midiChannel, midiNote, aftertouch);
+    // listeners.call(&LumatoneEditor::MidiListener::handleKeyHold, midiChannel, midiNote, aftertouch);
+}
+
+void LumatoneApplicationMidiController::handleController(LumatoneMidiState* midiState, int midiChannel, int midiNote, juce::uint8 controller)
+{
+    listeners.call(&LumatoneEditor::MidiListener::handleController, midiChannel, midiNote, controller);
+    // listeners.call(&LumatoneEditor::MidiListener::handleAppController, midiChannel, midiNote, controller);
+}
+
+// Always will be coming from the device
+void LumatoneApplicationMidiController::midiMessageReceived(juce::MidiInput *source, const juce::MidiMessage &message)
+{
+    if (message.isSysEx())
+        return;
+
+    deviceMidiState.processNextMidiEvent(message);
+    appMidiState.processNextMidiEvent(message);
+
+    if (message.isMidiClock())
+    {
+        listeners.call(&LumatoneEditor::MidiListener::handleMidiClock, quarterNoteInterval);
+    }
+    else if (message.isNoteOn())
+    {
+        // listeners.call(&LumatoneEditor::MidiListener::handleAnyNoteOn, message.getChannel(), message.getNoteNumber(), message.getVelocity());
+        listeners.call(&LumatoneEditor::MidiListener::handleNoteOn, message.getChannel(), message.getNoteNumber(), message.getVelocity());
+    }
+    else if (message.isNoteOff())
+    {
+        // listeners.call(&LumatoneEditor::MidiListener::handleAnyNoteOff, message.getChannel(), message.getNoteNumber());
+        listeners.call(&LumatoneEditor::MidiListener::handleNoteOff, message.getChannel(), message.getNoteNumber());
+    }
+    else if (message.isAftertouch())
+    {
+        // listeners.call(&LumatoneEditor::MidiListener::handleAnyAftertouch, message.getChannel(), message.getNoteNumber(), (juce::uint8) message.getAfterTouchValue());
+        listeners.call(&LumatoneEditor::MidiListener::handleAftertouch, message.getChannel(), message.getNoteNumber(), (juce::uint8) message.getAfterTouchValue());
+    }
+    else if (message.isController())
+    {
+        // listeners.call(&LumatoneEditor::MidiListener::handleAnyController, message.getChannel(), message.getControllerNumber(), (juce::uint8) message.getControllerValue());
+        listeners.call(&LumatoneEditor::MidiListener::handleController, message.getChannel(), message.getControllerNumber(), (juce::uint8) message.getControllerValue());
+    }
+    else if (message.isSustainPedalOn() || message.isSoftPedalOff())
+    {
+        bool isToggled = message.isSustainPedalOn();
+        listeners.call(&LumatoneEditor::MidiListener::handleSustain, isToggled);
+    }
+}
diff --git a/Source/lumatone_editor_library/midi/lumatone_midi_manager.h b/Source/lumatone_editor_library/midi/lumatone_midi_manager.h
new file mode 100644
index 00000000..ac07bb89
--- /dev/null
+++ b/Source/lumatone_editor_library/midi/lumatone_midi_manager.h
@@ -0,0 +1,91 @@
+/*
+  ==============================================================================
+
+    lumatone_midi_manager.h
+    Created: 24 Sep 2023
+    Author:  vsicurella
+
+    Combine Device MIDI with app generated MIDI states and provide 
+    a listener interface to react to them inclusively or exclusively.
+
+  ==============================================================================
+*/
+
+
+#ifndef LUMATONE_MIDI_MANAGER_H
+#define LUMATONE_MIDI_MANAGER_H
+
+#include "./lumatone_midi_state.h"
+
+#include "../data/application_state.h"
+#include "../data/lumatone_context.h"
+
+#include "../lumatone_midi_driver/firmware_driver_listener.h"
+
+// #include "../../debug/LumatoneSandboxLogger.h"
+
+class LumatoneFirmwareDriver;
+
+namespace LumatoneEditor
+{
+    class MidiListener;
+}
+
+class LumatoneApplicationMidiController : public LumatoneMidiState::Listener
+                                        , protected LumatoneFirmwareDriverListener
+                                        // , private LumatoneSandboxLogger
+{
+public:
+
+    LumatoneApplicationMidiController(const LumatoneApplicationState& state, LumatoneFirmwareDriver& firmwareDriver);
+    virtual ~LumatoneApplicationMidiController() override;
+
+    LumatoneMidiState* getDeviceMidiState() { return &deviceMidiState; }
+    LumatoneMidiState* getAppMidiState() { return &appMidiState; }
+
+    void sendMidiMessage(const juce::MidiMessage msg);
+    void sendMidiMessageInContext(const juce::MidiMessage msg, int boardIndex, int keyIndex);
+
+    void sendKeyNoteOn(int boardIndex, int keyIndex, juce::uint8 velocity, bool ignoreContext=false);
+    void sendKeyNoteOff(int boardIndex, int keyIndex, bool ignoreContext=false);
+
+    void allNotesOff(int midiChannel);
+    void allNotesOff();
+
+private:
+    juce::ListenerList<LumatoneEditor::MidiListener> listeners;
+
+public:
+    void addMidiListener(LumatoneEditor::MidiListener* listenerIn) { listeners.add(listenerIn); }
+    void removeMidiListener(LumatoneEditor::MidiListener* listenerIn) { listeners.remove(listenerIn); }
+
+protected:
+
+    // LumatoneMidiState::Listener implementation
+    void handleLumatoneMidi(LumatoneMidiState* midiState, const juce::MidiMessage& msg) override;
+
+    void handleNoteOn(LumatoneMidiState* midiState, int midiChannel, int midiNote, juce::uint8 velocity) override;
+    void handleNoteOff(LumatoneMidiState* midiState, int midiChannel, int midiNote) override;
+    void handleAftertouch(LumatoneMidiState* midiState, int midiChannel, int midiNote, juce::uint8 aftertouch) override;
+    void handleController(LumatoneMidiState* midiState, int midiChannel, int midiNote, juce::uint8 controller) override;
+
+
+    // LumatoneFirmwareDriver::Collector implementation
+	void midiMessageReceived(juce::MidiInput* source, const juce::MidiMessage& message) override;
+    void midiMessageSent(juce::MidiOutput* target, const juce::MidiMessage& message) override {}
+    void midiSendQueueSize(int size) override {}
+    void noAnswerToMessage(juce::MidiDeviceInfo expectedDevice, const juce::MidiMessage& message) override {}
+
+private:
+
+    LumatoneApplicationState appState;
+    LumatoneFirmwareDriver& firmwareDriver;
+
+    LumatoneMidiState deviceMidiState;
+    LumatoneMidiState appMidiState;
+
+    int quarterNoteInterval = 24;
+};
+
+
+#endif
diff --git a/Source/lumatone_editor_library/midi/lumatone_midi_state.cpp b/Source/lumatone_editor_library/midi/lumatone_midi_state.cpp
new file mode 100644
index 00000000..707ba12b
--- /dev/null
+++ b/Source/lumatone_editor_library/midi/lumatone_midi_state.cpp
@@ -0,0 +1,193 @@
+/*
+  ==============================================================================
+
+    lumatone_midi_state.cpp
+    Created: 6 Aug 2023 8:58:06am
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#include "lumatone_midi_state.h"
+
+LumatoneMidiState::LumatoneMidiState() 
+{
+    reset();
+}
+
+void LumatoneMidiState::reset()
+{
+    juce::MidiKeyboardState::reset();
+
+    for (int ch = 0; ch < 16; ch++)
+    {
+        for (int n = 0; n < 128; n++)
+        {
+            velocityStates[ch][n] = 0;
+            aftertouchStates[ch][n] = 0;
+            controllerStates[ch][n] = 0;
+        }
+    }
+
+    eventsToAdd.clear();
+}
+
+void LumatoneMidiState::processNextMidiEvent(const juce::MidiMessage& message)
+{
+    if (message.isNoteOn())
+    {
+        noteOnInternal(message, message.getChannel(), message.getNoteNumber(), message.getVelocity());
+    }
+    else if (message.isNoteOff())
+    {
+        noteOffInternal(message, message.getChannel(), message.getNoteNumber(), message.getVelocity());
+    }
+    else if (message.isAftertouch())
+    {
+        aftertouchInternal(message.getChannel(), message.getNoteNumber(), message.getAfterTouchValue());
+    }
+    else if (message.isController())
+    {
+        controllerInternal(message.getChannel(), message.getControllerNumber(), message.getControllerValue());
+    }
+    else if (message.isAllNotesOff())
+    {
+        for (int i = 0; i < 128; ++i)
+            noteOff(message.getChannel(), i, (juce::uint8)0);
+    }
+}
+
+void LumatoneMidiState::processNextMidiBuffer(juce::MidiBuffer& buffer, int startSample, int numSamples, bool injectIndirectEvents)
+{
+    const juce::ScopedLock sl(lock);
+
+    for (const auto metadata : buffer)
+        processNextMidiEvent(metadata.getMessage());
+
+    if (injectIndirectEvents)
+    {
+        const int firstEventToAdd = eventsToAdd.getFirstEventTime();
+        const double scaleFactor = numSamples / (double)(eventsToAdd.getLastEventTime() + 1 - firstEventToAdd);
+
+        for (const auto metadata : eventsToAdd)
+        {
+            const auto pos = juce::jlimit(0, numSamples - 1, juce::roundToInt((metadata.samplePosition - firstEventToAdd) * scaleFactor));
+            buffer.addEvent(metadata.getMessage(), startSample + pos);
+        }
+    }
+
+    eventsToAdd.clear();
+}
+
+void LumatoneMidiState::noteOn(const int midiChannel, const int midiNote, juce::uint8 velocity)
+{
+    jassert(midiChannel > 0 && midiChannel <= 16);
+    jassert(juce::isPositiveAndBelow(midiNote, 128));
+
+    if (juce::isPositiveAndBelow(midiNote, 128))
+    {
+        const int timeNow = (int)juce::Time::getMillisecondCounter();
+
+        auto msg = juce::MidiMessage::noteOn(midiChannel, midiNote, velocity);
+        eventsToAdd.addEvent(msg, timeNow);
+        eventsToAdd.clear(0, timeNow - 500);
+
+        noteOnInternal(msg, midiChannel, midiNote, velocity);
+    }
+}
+
+void LumatoneMidiState::noteOff(const int midiChannel, const int midiNote, const juce::uint8 velocity)
+{
+    jassert(midiChannel > 0 && midiChannel <= 16);
+    jassert(juce::isPositiveAndBelow(midiNote, 128));
+
+    if (juce::isPositiveAndBelow(midiNote, 128))
+    {
+        const int timeNow = (int)juce::Time::getMillisecondCounter();
+
+        auto msg = juce::MidiMessage::noteOff(midiChannel, midiNote, velocity);
+        eventsToAdd.addEvent(msg, timeNow);
+        eventsToAdd.clear(0, timeNow - 500);
+
+        noteOffInternal(msg, midiChannel, midiNote, velocity);
+    }
+}
+
+void LumatoneMidiState::aftertouch(const int midiChannel, const int midiNote, const juce::uint8 aftertouch)
+{
+    jassert(midiChannel > 0 && midiChannel <= 16);
+    jassert(juce::isPositiveAndBelow(midiNote, 128));
+
+    if (juce::isPositiveAndBelow(midiNote, 128))
+    {
+        const int timeNow = (int)juce::Time::getMillisecondCounter();
+
+        auto msg = juce::MidiMessage::aftertouchChange(midiChannel, midiNote, aftertouch);
+        eventsToAdd.addEvent(msg, timeNow);
+        eventsToAdd.clear(0, timeNow - 500);
+
+        aftertouchInternal(midiChannel, midiNote, aftertouch);
+    }
+
+}
+
+void LumatoneMidiState::controller(const int midiChannel, const int number, const juce::uint8 value)
+{
+    jassert(midiChannel > 0 && midiChannel <= 16);
+    jassert(juce::isPositiveAndBelow(number, 128));
+
+    if (juce::isPositiveAndBelow(number, 128))
+    {
+        const int timeNow = (int)juce::Time::getMillisecondCounter();
+
+        auto msg = juce::MidiMessage::controllerEvent(midiChannel, number, value);
+        eventsToAdd.addEvent(msg, timeNow);
+        eventsToAdd.clear(0, timeNow - 500);
+
+        controllerInternal(midiChannel, number, value);
+    }
+}
+
+
+void LumatoneMidiState::addMidiStateListener(LumatoneMidiState::Listener* listener)
+{
+    midiListeners.add(listener);
+}
+
+void LumatoneMidiState::removeMidiStateListener(LumatoneMidiState::Listener* listener)
+{
+    midiListeners.remove(listener);
+}
+
+void LumatoneMidiState::noteOnInternal(const juce::MidiMessage& msg, int midiChannel, int midiNote, juce::uint8 velocity)
+{
+    juce::MidiKeyboardState::processNextMidiEvent(msg);
+
+    velocityStates[midiChannel - 1][midiNote] = velocity;
+
+    midiListeners.call(&LumatoneMidiState::Listener::handleLumatoneMidi, this, msg);
+    midiListeners.call(&LumatoneMidiState::Listener::handleNoteOn, this, midiChannel, midiNote, velocity);
+}
+
+void LumatoneMidiState::noteOffInternal(const juce::MidiMessage& msg, int midiChannel, int midiNote, juce::uint8 velocity)
+{
+    juce::MidiKeyboardState::processNextMidiEvent(msg);
+
+    velocityStates[midiChannel - 1][midiNote] = velocity;
+
+    midiListeners.call(&LumatoneMidiState::Listener::handleLumatoneMidi, this, msg);
+    midiListeners.call(&LumatoneMidiState::Listener::handleNoteOff, this,  midiChannel, midiNote);
+}
+
+void LumatoneMidiState::aftertouchInternal(int midiChannel, int midiNote, juce::uint8 aftertouch)
+{
+    aftertouchStates[midiChannel - 1][midiNote] = aftertouch;
+    midiListeners.call(&LumatoneMidiState::Listener::handleAftertouch, this, midiChannel, midiNote, aftertouch);
+}
+
+void LumatoneMidiState::controllerInternal(int midiChannel, int midiNote, juce::uint8 value)
+{
+    controllerStates[midiChannel - 1][midiNote] = value;
+    midiListeners.call(&LumatoneMidiState::Listener::handleController, this, midiChannel, midiNote, value);
+}
+
diff --git a/Source/lumatone_editor_library/midi/lumatone_midi_state.h b/Source/lumatone_editor_library/midi/lumatone_midi_state.h
new file mode 100644
index 00000000..20185c72
--- /dev/null
+++ b/Source/lumatone_editor_library/midi/lumatone_midi_state.h
@@ -0,0 +1,76 @@
+/*
+  ==============================================================================
+
+    lumatone_midi_state.h
+    Created: 6 Aug 2023 8:58:06am
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#pragma once
+
+#include <JuceHeader.h>
+
+class LumatoneMidiState : private juce::MidiKeyboardState
+{
+public:
+
+    LumatoneMidiState();
+    virtual ~LumatoneMidiState() {}
+
+    void reset();
+
+    bool isNoteOn(int midiChannel, int midiNoteNumber) const noexcept { return juce::MidiKeyboardState::isNoteOn(midiChannel, midiNoteNumber); }
+    bool isNoteOnForChannels(int midiChannelMask, int midiNoteNumber) const noexcept { return juce::MidiKeyboardState::isNoteOnForChannels(midiChannelMask, midiNoteNumber); }
+    void allNotesOff(int midiChannel) { return juce::MidiKeyboardState::allNotesOff(midiChannel); }
+
+    void processNextMidiEvent(const juce::MidiMessage& message);
+    void processNextMidiBuffer(juce::MidiBuffer& buffer, int startSample, int numSamples, bool injectIndirectEvents);
+
+public:
+    void noteOn(const int midiChannel, const int midiNote, const juce::uint8 velocity);
+    void noteOff(const int midiChannel, const int midiNote, const juce::uint8 velocity);
+
+    void aftertouch(const int midiChannel, const int midiNote, const juce::uint8 aftertouch);
+    void controller(const int midiChannel, const int number, const juce::uint8 value);
+
+public:
+
+    class Listener
+    {
+    public:
+        virtual ~Listener() {}
+
+        virtual void handleLumatoneMidi(LumatoneMidiState* midiState, const juce::MidiMessage& msg) {}
+
+        virtual void handleNoteOn(LumatoneMidiState* midiState, int midiChannel, int midiNote, juce::uint8 velocity) {}
+        virtual void handleNoteOff(LumatoneMidiState* midiState, int midiChannel, int midiNote) {}
+        virtual void handleAftertouch(LumatoneMidiState* midiState, int midiChannel, int midiNote, juce::uint8 aftertouch) {}
+        virtual void handleController(LumatoneMidiState* midiState, int midiChannel, int midiNote, juce::uint8 controller) {}
+    };
+
+public:
+    void addMidiStateListener(LumatoneMidiState::Listener* listener);
+    void removeMidiStateListener(LumatoneMidiState::Listener* listener);
+private:
+    juce::ListenerList<Listener> midiListeners;
+
+protected:
+
+    virtual void noteOnInternal(const juce::MidiMessage& msg, int midiChannel, int midiNote, juce::uint8 velocity);
+    virtual void noteOffInternal(const juce::MidiMessage& msg, int midiChannel, int midiNote, juce::uint8 velocity);
+    virtual void aftertouchInternal(int midiChannel, int midiNote, juce::uint8 aftertouch);
+    // virtual void lumatouchInternal(int midiChannel, int midiNote, juce::uint8 lumatouch);
+    virtual void controllerInternal(int midiChannel, int midiNote, juce::uint8 value);
+
+
+private:
+
+    juce::CriticalSection lock;
+    juce::MidiBuffer eventsToAdd;
+
+    juce::uint8 velocityStates[16][128];
+    juce::uint8 aftertouchStates[16][128];
+    juce::uint8 controllerStates[16][128];
+};
\ No newline at end of file
diff --git a/Source/lumatone_editor_library/palettes/colour_edit_textbox.cpp b/Source/lumatone_editor_library/palettes/colour_edit_textbox.cpp
new file mode 100644
index 00000000..67a09c30
--- /dev/null
+++ b/Source/lumatone_editor_library/palettes/colour_edit_textbox.cpp
@@ -0,0 +1,105 @@
+#include "colour_edit_textbox.h"
+
+//====================================================================================================
+
+ColourTextEditor::ColourTextEditor(juce::String componentName, juce::String initialString)
+    : TextEditor(componentName)
+{
+    setMultiLine(false);
+    setJustification(juce::Justification::centredLeft);
+    setTooltip(juce::translate("ColourHexValueEditorTool"));
+    setInputRestrictions(6, "0123456789ABCDEFabcdef");
+    addListener(this);
+
+    setText(initialString, juce::NotificationType::dontSendNotification);
+    checkInputAndUpdate();
+}
+
+juce::String ColourTextEditor::checkInputAndUpdate(bool sendSelectorListenerUpdate)
+{
+    juce::String text = parseTextToColourString(getText().toLowerCase());
+    if (text.length() > 0)
+    {
+        // only accept RGB
+        if (text.length() > 6)
+            text = text.substring(text.length() - 6);
+
+        // restrict to lowercase display
+        setText(text, juce::NotificationType::dontSendNotification);
+
+        if (sendSelectorListenerUpdate)
+        {
+            juce::String opaque = "ff" + text;
+            lastBroadcastedColour = juce::Colour(opaque.getHexValue32());
+            selectorListeners.call(&ColourSelectionListener::colourChangedCallback, this, lastBroadcastedColour);
+        }
+    }
+
+    return text;
+}
+
+void ColourTextEditor::resetToLastUpdated(bool sendSelectorListenerUpdate)
+{
+    juce::NotificationType notification = (sendSelectorListenerUpdate) 
+        ? juce::NotificationType::sendNotification 
+        : juce::NotificationType::dontSendNotification;
+
+    setText(lastBroadcastedColour.toDisplayString(true).toLowerCase(), notification);
+}
+
+/** Called when the user changes the text in some way. */
+void ColourTextEditor::textEditorTextChanged(juce::TextEditor&)
+{
+    // confirm changes
+    checkInputAndUpdate();
+}
+
+/** Called when the user presses the return key. */
+void ColourTextEditor::textEditorReturnKeyPressed(juce::TextEditor&)
+{
+    // confirm changes
+    checkInputAndUpdate();
+}
+
+/** Called when the user presses the escape key. */
+void ColourTextEditor::textEditorEscapeKeyPressed(juce::TextEditor&)
+{
+    // reset changes
+    resetToLastUpdated();
+}
+
+/** Called when the text editor loses focus. */
+void ColourTextEditor::textEditorFocusLost(juce::TextEditor& editor)
+{
+    // confirm changes
+    checkInputAndUpdate();
+}
+
+juce::Colour ColourTextEditor::getSelectedColour()
+{
+    juce::String opaque = "ff" + parseTextToColourString(getText());
+    return juce::Colour(opaque.getHexValue32());
+}
+
+void ColourTextEditor::colourChangedCallback(ColourSelectionBroadcaster* source, juce::Colour newColour)
+{
+    // Safeguard
+    if (this != source)
+        setText(newColour.toString().substring(2), false);
+}
+
+juce::Colour ColourTextEditor::getLastUpdatedColour() const
+{
+    return lastBroadcastedColour;
+}
+
+juce::String ColourTextEditor::parseTextToColourString(juce::String textIn)
+{
+    // Skip odd-numbered lengths and those less than 6 for RGB
+    if (textIn.length() % 2 == 1 || textIn.length() != 6)
+    {
+        return juce::String();
+    }
+
+    return textIn;
+}
diff --git a/Source/lumatone_editor_library/palettes/colour_edit_textbox.h b/Source/lumatone_editor_library/palettes/colour_edit_textbox.h
new file mode 100644
index 00000000..1ddb987a
--- /dev/null
+++ b/Source/lumatone_editor_library/palettes/colour_edit_textbox.h
@@ -0,0 +1,59 @@
+
+#ifndef LUMATONE_COLOUR_EDIT_TEXTBOX_H
+#define LUMATONE_COLOUR_EDIT_TEXTBOX_H
+
+#include <JuceHeader.h>
+#include "colour_selection_group.h"
+
+/**
+
+    TextEditor container for parsing colour strings
+
+*/
+
+class ColourTextEditor :
+    public juce::TextEditor,
+    public ColourSelectionListener,
+    public ColourSelectionBroadcaster,
+    private juce::TextEditor::Listener
+{
+public:
+
+    ColourTextEditor(juce::String componentName, juce::String initialString);
+
+    juce::String checkInputAndUpdate(bool sendSelectorListenerUpdate = true);
+
+    void resetToLastUpdated(bool sendSelectorListenerUpdate = true);
+
+    juce::Colour getLastUpdatedColour() const;
+
+    // ColourSelectionBroadcaster Implementation
+    juce::Colour getSelectedColour() override;
+
+    void deselectColour() override {};
+
+    // ColourSelectionListener Implementation
+    void colourChangedCallback(ColourSelectionBroadcaster* source, juce::Colour newColour) override;
+
+    static juce::String parseTextToColourString(juce::String textIn);
+
+private:
+    // TextEditor::Listener Implementation
+    /** Called when the user changes the text in some way. */
+    void textEditorTextChanged(juce::TextEditor&) override;
+
+    /** Called when the user presses the return key. */
+    void textEditorReturnKeyPressed(juce::TextEditor&) override;
+
+    /** Called when the user presses the escape key. */
+    void textEditorEscapeKeyPressed(juce::TextEditor&) override;
+
+    /** Called when the text editor loses focus. */
+    void textEditorFocusLost(juce::TextEditor&) override;
+
+private:
+
+    juce::Colour lastBroadcastedColour;
+};
+
+#endif LUMATONE_COLOUR_EDIT_TEXTBOX_H
diff --git a/Source/ColourPaletteComponent.cpp b/Source/lumatone_editor_library/palettes/colour_palette_component.cpp
similarity index 53%
rename from Source/ColourPaletteComponent.cpp
rename to Source/lumatone_editor_library/palettes/colour_palette_component.cpp
index 062b5f2b..207a9865 100644
--- a/Source/ColourPaletteComponent.cpp
+++ b/Source/lumatone_editor_library/palettes/colour_palette_component.cpp
@@ -1,7 +1,7 @@
 /*
   ==============================================================================
 
-    ColourPaletteComponent.cpp
+    colour_palette_component.cpp
     Created: 18 Dec 2020 1:48:01am
     Author:  Vincenzo
 
@@ -9,16 +9,17 @@
 */
 
 #include <JuceHeader.h>
-#include "ColourPaletteComponent.h"
+#include "colour_palette_component.h"
+#include "../graphics/lumatone_assets.h"
 
 //==============================================================================
 // ColourPaletteComponent Definitions
 
-ColourPaletteComponent::ColourPaletteComponent(String nameIn)
+ColourPaletteComponent::ColourPaletteComponent(juce::String nameIn)
     : TenHexagonPalette()
 {
     setName(nameIn);
-    setColourPalette(Array<Colour>());
+    setColourPalette(juce::Array<juce::Colour>());
 }
 
 ColourPaletteComponent::ColourPaletteComponent(LumatoneEditorColourPalette paletteIn)
@@ -48,7 +49,7 @@ void ColourPaletteComponent::setSelectedSwatchNumber(int swatchIndex)
     selectorListeners.call(&ColourSelectionListener::colourChangedCallback, this, getSelectedSwatchColour());
 }
 
-void ColourPaletteComponent::setColourPalette(Array<Colour> colourPaletteIn)
+void ColourPaletteComponent::setColourPalette(juce::Array<juce::Colour> colourPaletteIn)
 {
     if (colourPaletteIn.size() == 0)
     {
@@ -61,7 +62,7 @@ void ColourPaletteComponent::setColourPalette(Array<Colour> colourPaletteIn)
 
     while (colourPaletteIn.size() < getNumberOfSwatches())
     {
-        colourPaletteIn.add(Colour(0xff1b1b1b));
+        colourPaletteIn.add(juce::Colour(0xff1b1b1b));
     }
 
     Palette::setColourPalette(colourPaletteIn);
@@ -78,7 +79,7 @@ void ColourPaletteComponent::setColourPalette(Array<Colour> colourPaletteIn)
     }
 }
 
-void ColourPaletteComponent::setSwatchColour(int swatchNumber, Colour newColour)
+void ColourPaletteComponent::setSwatchColour(int swatchNumber, juce::Colour newColour)
 {
     Palette::setSwatchColour(swatchNumber, newColour);
 
@@ -88,7 +89,7 @@ void ColourPaletteComponent::setSwatchColour(int swatchNumber, Colour newColour)
 
 //==========================================================================
 
-Colour ColourPaletteComponent::getSelectedColour()
+juce::Colour ColourPaletteComponent::getSelectedColour()
 {
     return Palette::getSelectedSwatchColour();
 }
@@ -108,22 +109,53 @@ PaletteControlGroup::PaletteControlGroup(LumatoneEditorColourPalette newPaletteI
       trashButton("TrashButton_" + newPaletteIn.getName())
 {
     editButton.setButtonText("Edit");
-    editButton.getProperties().set(LumatoneEditorStyleIDs::textButtonHyperlinkFlag, 1);
-    editButton.setTooltip(translate("EditButtonTip"));
+    // editButton.getProperties().set(LumatoneEditorStyleIDs::textButtonHyperlinkFlag, 1);
+    editButton.setTooltip(juce::translate("EditButtonTip"));
 
-    const Image cloneIcon = getCachedCloneImage();
+    const juce::Image cloneIcon = getCloneImage();
     cloneButton.setImages(false, true, true,
-        cloneIcon, 1.0f, Colour(),
-        cloneIcon, 1.0f, Colours::white.withAlpha(0.4f),
-        cloneIcon, 1.0f, Colour()
+        cloneIcon, 1.0f, juce::Colour(),
+        cloneIcon, 1.0f, juce::Colours::white.withAlpha(0.4f),
+        cloneIcon, 1.0f, juce::Colour()
     );
-    cloneButton.setTooltip(translate("CloneButtonTip"));
+    cloneButton.setTooltip(juce::translate("CloneButtonTip"));
 
-    const Image trashIcon = ImageCache::getFromHashCode((juce::int64)LumatoneAssets::ID::TrashCanIcon);
+    const juce::Image trashIcon = juce::ImageCache::getFromHashCode((juce::int64)LumatoneAssets::ID::TrashCanIcon);
     trashButton.setImages(false, true, true,
-        trashIcon, 1.0f, Colour(),
-        trashIcon, 1.0f, Colours::white.withAlpha(0.4f),
-        trashIcon, 1.0f, Colour()
+        trashIcon, 1.0f, juce::Colour(),
+        trashIcon, 1.0f, juce::Colours::white.withAlpha(0.4f),
+        trashIcon, 1.0f, juce::Colour()
     );
-    trashButton.setTooltip(translate("TrashButtonTip"));
+    trashButton.setTooltip(juce::translate("TrashButtonTip"));
 }
+
+juce::Image PaletteControlGroup::getCloneImage() const
+{
+    auto cloneImg = juce::ImageCache::getFromHashCode((juce::int64)LumatoneAssets::ID::CloneIcon);
+    if (cloneImg.isValid())
+        return cloneImg;
+
+    // Create duplicate icon
+    float xMargin = 0.1f;
+    float yMargin = 0.1f;
+    float size = 0.5f;
+
+    auto leftRect = juce::Rectangle<float>(xMargin, 1.0f - yMargin - size, size, size);
+    auto rightRect = juce::Rectangle<float>(1.0f - xMargin - size, yMargin, size, size);
+
+    auto cloneIcon = juce::Path();
+    cloneIcon.addRoundedRectangle(leftRect, 0.1f, 0.1f);
+    cloneIcon.addRoundedRectangle(rightRect, 0.1f, 0.1f);
+
+    // auto cloneIcon = getCloneIconPath();
+    cloneIcon.scaleToFit(0, 0, 80, 80, true);
+
+    cloneImg = juce::Image(juce::Image::PixelFormat::ARGB, 100, 100, true);
+    juce::Graphics cloneG(cloneImg);
+    cloneG.setColour(juce::Colours::white.darker(0.1f));
+    cloneG.setOrigin(juce::Point<int>(10, 10));
+    auto stroke = juce::PathStrokeType(8.0f, juce::PathStrokeType::JointStyle::curved);
+    cloneG.strokePath(cloneIcon, stroke);
+    juce::ImageCache::addImageToCache(cloneImg, (juce::int64)LumatoneAssets::ID::CloneIcon);
+    return cloneImg;
+}
\ No newline at end of file
diff --git a/Source/ColourPaletteComponent.h b/Source/lumatone_editor_library/palettes/colour_palette_component.h
similarity index 60%
rename from Source/ColourPaletteComponent.h
rename to Source/lumatone_editor_library/palettes/colour_palette_component.h
index 49463f72..831fe6fd 100644
--- a/Source/ColourPaletteComponent.h
+++ b/Source/lumatone_editor_library/palettes/colour_palette_component.h
@@ -1,7 +1,7 @@
 /*
   ==============================================================================
 
-    ColourPaletteComponent.h
+    colour_palette_component.h
     Created: 18 Dec 2020 1:48:01am
     Author:  Vincenzo
 
@@ -11,20 +11,23 @@
 #pragma once
 
 #include <JuceHeader.h>
-#include "PolygonPalette.h"
-#include "HexagonPalette.h"
-#include "ColourSelectionGroup.h"
-#include "ColourPaletteDataStructure.h"
-#include "LumatoneEditorStyleCommon.h"
+
+#include "./hex_group_palette.h"
+#include "./colour_selection_broadcaster.h"
+
+#include "./colour_palette_file.h"
+
+// #include "LumatoneEditorStyleCommon.h"
 
 //==============================================================================
 /*
 * Inherits from PolygonPalette for Lumatone Editor specific functionality
 */
-class ColourPaletteComponent  : public TenHexagonPalette, public ColourSelectionBroadcaster
+class ColourPaletteComponent  : public TenHexagonPalette
+                              , public ColourSelectionBroadcaster
 {
 public:
-    ColourPaletteComponent(String nameIn);
+    ColourPaletteComponent(juce::String nameIn);
     ColourPaletteComponent(LumatoneEditorColourPalette paletteIn);
     ColourPaletteComponent(const ColourPaletteComponent& paletteToCopy);
     ~ColourPaletteComponent() override;
@@ -35,17 +38,16 @@ class ColourPaletteComponent  : public TenHexagonPalette, public ColourSelection
     void setSelectedSwatchNumber(int swatchIndex) override;
 
     // Add disabled/new palette functionality
-    void setColourPalette(Array<Colour> colourPaletteIn) override;
+    void setColourPalette(juce::Array<juce::Colour> colourPaletteIn) override;
 
-    void setSwatchColour(int swatchNumber, Colour newColour) override;
+    void setSwatchColour(int swatchNumber, juce::Colour newColour) override;
 
     //==========================================================================
     // ColourSelectionBroadcaster implementation
 
-    Colour getSelectedColour() override;
+    juce::Colour getSelectedColour() override;
 
     void deselectColour() override;
-
 };
 
 //==============================================================================
@@ -62,16 +64,20 @@ class PaletteControlGroup
 
     ColourPaletteComponent* getPaletteComponent() { return &palette; }
 
-    TextButton* getEditButton() { return &editButton; }
+    juce::TextButton* getEditButton() { return &editButton; }
 
-    ImageButton* getCloneButton() { return &cloneButton; }
+    juce::ImageButton* getCloneButton() { return &cloneButton; }
+
+    juce::ImageButton* getTrashButton() { return &trashButton; }
+
+private:
 
-    ImageButton* getTrashButton() { return &trashButton; }
+  juce::Image getCloneImage() const;
 
 private:
 
     ColourPaletteComponent palette;
-    TextButton editButton;
-    ImageButton cloneButton;
-    ImageButton trashButton;
+    juce::TextButton editButton;
+    juce::ImageButton cloneButton;
+    juce::ImageButton trashButton;
 };
diff --git a/Source/ColourPaletteDataStructure.h b/Source/lumatone_editor_library/palettes/colour_palette_file.h
similarity index 60%
rename from Source/ColourPaletteDataStructure.h
rename to Source/lumatone_editor_library/palettes/colour_palette_file.h
index c72a04c5..258df3bd 100644
--- a/Source/ColourPaletteDataStructure.h
+++ b/Source/lumatone_editor_library/palettes/colour_palette_file.h
@@ -1,7 +1,7 @@
 /*
   ==============================================================================
 
-    ColourPaletteDataStructure.h
+    colour_palette_file.h
     Created: 17 Jan 2021 9:55:13pm
     Author:  Vincenzo
 
@@ -13,15 +13,15 @@
 
 namespace LumatoneEditorPaletteIds
 {
-    static Identifier libraryId         = Identifier("PaletteLibrary"); // Currently unused
-    static Identifier paletteId         = Identifier("ColourPalette");
-    static Identifier swatchId          = Identifier("Swatch");
-    static Identifier colourId          = Identifier("Colour");
-
-    static Identifier nameId            = Identifier("Name");
-    static Identifier dateCreatedId     = Identifier("DateCreated");
-    static Identifier authorId          = Identifier("Author");
-    static Identifier notesId           = Identifier("Notes");
+    static juce::Identifier libraryId         = juce::Identifier("PaletteLibrary"); // Currently unused
+    static juce::Identifier paletteId         = juce::Identifier("ColourPalette");
+    static juce::Identifier swatchId          = juce::Identifier("Swatch");
+    static juce::Identifier colourId          = juce::Identifier("Colour");
+
+    static juce::Identifier nameId            = juce::Identifier("Name");
+    static juce::Identifier dateCreatedId     = juce::Identifier("DateCreated");
+    static juce::Identifier authorId          = juce::Identifier("Author");
+    static juce::Identifier notesId           = juce::Identifier("Notes");
 }
 
 #define PALETTEFILEEXTENSION ".ltp"
@@ -34,21 +34,21 @@ namespace LumatoneEditorPaletteIds
 class LumatoneEditorColourPalette
 {
 public:
-    LumatoneEditorColourPalette(String paletteName="")
+    LumatoneEditorColourPalette(juce::String paletteName="")
     {
         colourPalette.resize(DEFAULTPALETTESIZE);
-        colourPalette.fill(Colour(0xff1b1b1b));
+        colourPalette.fill(juce::Colour(0xff1b1b1b));
         name = paletteName;
-        dateCreated = Time::getCurrentTime().toISO8601(false);
+        dateCreated = juce::Time::getCurrentTime().toISO8601(false);
     }
 
-    LumatoneEditorColourPalette(Array<Colour> colourPaletteIn, String paletteName="")
+    LumatoneEditorColourPalette(juce::Array<juce::Colour> colourPaletteIn, juce::String paletteName="")
         : LumatoneEditorColourPalette(paletteName)
     {
         setColours(colourPaletteIn);
     }
 
-    LumatoneEditorColourPalette(Array<Colour> colourPaletteIn, String paletteName, String paletteAuthor, String paletteNotes="")
+    LumatoneEditorColourPalette(juce::Array<juce::Colour> colourPaletteIn, juce::String paletteName, juce::String paletteAuthor, juce::String paletteNotes="")
         : LumatoneEditorColourPalette(colourPaletteIn, paletteName)
     {
         author = paletteAuthor;
@@ -59,13 +59,13 @@ class LumatoneEditorColourPalette
 
     int size() const { return colourPalette.size(); }
 
-    Array<Colour>* getColours() { return &colourPalette; }
+    juce::Array<juce::Colour>* getColours() { return &colourPalette; }
 
-    String getName() const { return name; }
+    juce::String getName() const { return name; }
 
-    String getAuthor() const { return author; }
+    juce::String getAuthor() const { return author; }
 
-    String getNotes() const { return notes; }
+    juce::String getNotes() const { return notes; }
 
     bool hasBeenModified() const { return modifiedSinceLastSave; }
 
@@ -73,11 +73,11 @@ class LumatoneEditorColourPalette
     /// The timestamp from when this was first created
     /// </summary>
     /// <returns>String created from Time::toISO8601()</returns>
-    String getDateCreated() const { return dateCreated; }
+    juce::String getDateCreated() const { return dateCreated; }
 
-    String getPathToFile() const { return pathToFile; }
+    juce::String getPathToFile() const { return pathToFile; }
 
-    void setColours(const Array<Colour>& newColourPalette)
+    void setColours(const juce::Array<juce::Colour>& newColourPalette)
     {
         setModifiedIfChanged(colourPalette, newColourPalette);
 
@@ -85,11 +85,11 @@ class LumatoneEditorColourPalette
         colourPalette.addArray(newColourPalette);
     }
 
-    void setName(String nameIn)     { setModifiedIfChanged(name, nameIn); name = nameIn; }
+    void setName(juce::String nameIn)     { setModifiedIfChanged(name, nameIn); name = nameIn; }
 
-    void setAuthor(String authorIn) { setModifiedIfChanged(author, authorIn); author = authorIn; }
+    void setAuthor(juce::String authorIn) { setModifiedIfChanged(author, authorIn); author = authorIn; }
 
-    void setNotes(String notesIn)   { setModifiedIfChanged(notes, notesIn); notes = notesIn; }
+    void setNotes(juce::String notesIn)   { setModifiedIfChanged(notes, notesIn); notes = notesIn; }
 
     /// <summary>
     /// Save palette to a .ltp file (and update internal file path)
@@ -97,7 +97,7 @@ class LumatoneEditorColourPalette
     /// </summary>
     /// <param name="fileToSaveTo"></param>
     /// <param name="deleteOldVersion"></param>
-    bool saveToFile(File fileToSaveTo, bool deleteOldVersion = true)
+    bool saveToFile(juce::File fileToSaveTo, bool deleteOldVersion = true)
     {
         // Make sure it has proper extension
         fileToSaveTo = fileToSaveTo.withFileExtension(PALETTEFILEEXTENSION);
@@ -107,7 +107,7 @@ class LumatoneEditorColourPalette
 
         if (deleteOldVersion)
         {
-            File originalFile = pathToFile;
+            juce::File originalFile = pathToFile;
 
             if (originalFile.existsAsFile())
                 originalFile.deleteFile();
@@ -128,12 +128,12 @@ class LumatoneEditorColourPalette
     }
     bool saveToFile()
     {
-        return saveToFile(File(pathToFile));
+        return saveToFile(juce::File(pathToFile));
     }
 
-    ValueTree toValueTree() const
+    juce::ValueTree toValueTree() const
     {
-        ValueTree node(LumatoneEditorPaletteIds::paletteId);
+        juce::ValueTree node(LumatoneEditorPaletteIds::paletteId);
         node.setProperty(LumatoneEditorPaletteIds::nameId, name, nullptr);
         node.setProperty(LumatoneEditorPaletteIds::authorId, author, nullptr);
         node.setProperty(LumatoneEditorPaletteIds::dateCreatedId, dateCreated, nullptr);
@@ -141,7 +141,7 @@ class LumatoneEditorColourPalette
 
         for (auto c : colourPalette)
         {
-            ValueTree swatch(LumatoneEditorPaletteIds::swatchId);
+            juce::ValueTree swatch(LumatoneEditorPaletteIds::swatchId);
             swatch.setProperty(LumatoneEditorPaletteIds::colourId, c.toString(), nullptr);
             node.appendChild(swatch, nullptr);
         }
@@ -149,23 +149,23 @@ class LumatoneEditorColourPalette
         return node;
     }
 
-    String toString() const { return toValueTree().toXmlString(); }
+    juce::String toString() const { return toValueTree().toXmlString(); }
 
     //==============================================================================
     // Palette static methods
 
-    static LumatoneEditorColourPalette loadFromValueTree(ValueTree paletteNode)
+    static LumatoneEditorColourPalette loadFromValueTree(juce::ValueTree paletteNode)
     {
         LumatoneEditorColourPalette loadedPalette;
 
         if (paletteNode.hasType(LumatoneEditorPaletteIds::paletteId))
         {
-            Array<Colour> palette;
+            juce::Array<juce::Colour> palette;
 
             for (auto swatch : paletteNode)
             {
                 if (swatch.hasType(LumatoneEditorPaletteIds::swatchId))
-                    palette.add(Colour::fromString(swatch[LumatoneEditorPaletteIds::colourId].toString()));
+                    palette.add(juce::Colour::fromString(swatch[LumatoneEditorPaletteIds::colourId].toString()));
             }
 
             loadedPalette = LumatoneEditorColourPalette(palette,
@@ -174,7 +174,7 @@ class LumatoneEditorColourPalette
                 paletteNode[LumatoneEditorPaletteIds::notesId]
             );
 
-            if (paletteNode[LumatoneEditorPaletteIds::dateCreatedId].toString() != String())
+            if (paletteNode[LumatoneEditorPaletteIds::dateCreatedId].toString() != juce::String())
                 loadedPalette.dateCreated = paletteNode[LumatoneEditorPaletteIds::dateCreatedId];
 
             loadedPalette.modifiedSinceLastSave = false;
@@ -183,16 +183,16 @@ class LumatoneEditorColourPalette
         return loadedPalette;
     }
 
-    static LumatoneEditorColourPalette loadFromFile(const File& pathToPalette)
+    static LumatoneEditorColourPalette loadFromFile(const juce::File& pathToPalette)
     {
         LumatoneEditorColourPalette loadedPalette;
 
         if (pathToPalette.existsAsFile())
         {
-            loadedPalette = loadFromValueTree(ValueTree::fromXml(pathToPalette.loadFileAsString()));
+            loadedPalette = loadFromValueTree(juce::ValueTree::fromXml(pathToPalette.loadFileAsString()));
 
             // Set empty palette name to file name if it does not appear to be a placeholder
-            if (loadedPalette.name == String() && !pathToPalette.getFileNameWithoutExtension().contains("UnnamedPalette"))
+            if (loadedPalette.name == juce::String() && !pathToPalette.getFileNameWithoutExtension().contains("UnnamedPalette"))
             {
                 loadedPalette.name = pathToPalette.getFileNameWithoutExtension();
             }
@@ -210,16 +210,16 @@ class LumatoneEditorColourPalette
 
 private:
     
-    Array<Colour> colourPalette;
+    juce::Array<juce::Colour> colourPalette;
     
-    String name = "";
-    String author = "";
-    String notes = "";
+    juce::String name = "";
+    juce::String author = "";
+    juce::String notes = "";
 
-    String dateCreated = "";
+    juce::String dateCreated = "";
 
     // Internal use only
-    String pathToFile = "";
+    juce::String pathToFile = "";
     bool modifiedSinceLastSave = true;
 };
 
@@ -229,8 +229,8 @@ class LumatoneEditorPaletteSorter : juce::DefaultElementComparator<const Lumaton
     static int compareElements(const LumatoneEditorColourPalette& first, const LumatoneEditorColourPalette& second)
     {
         // Reverse chronological sort
-        Time t0 = Time::fromISO8601(first.getDateCreated());
-        Time t1 = Time::fromISO8601(second.getDateCreated());
+        juce::Time t0 = juce::Time::fromISO8601(first.getDateCreated());
+        juce::Time t1 = juce::Time::fromISO8601(second.getDateCreated());
         return (t1 < t0) ? -1 : ((t0 < t1) ? 1 : 0);
     }
 };
diff --git a/Source/ColourPaletteWindow.cpp b/Source/lumatone_editor_library/palettes/colour_palette_window.cpp
similarity index 71%
rename from Source/ColourPaletteWindow.cpp
rename to Source/lumatone_editor_library/palettes/colour_palette_window.cpp
index 53dd9e69..569aa2bf 100644
--- a/Source/ColourPaletteWindow.cpp
+++ b/Source/lumatone_editor_library/palettes/colour_palette_window.cpp
@@ -1,24 +1,29 @@
 /*
   ==============================================================================
 
-    ColourPaletteWindow.cpp
+    colour_palette_window.cpp
     Created: 14 Dec 2020 11:32:03pm
     Author:  Vincenzo
 
   ==============================================================================
 */
 
-#include "ColourPaletteWindow.h"
-#include "Main.h"
+#include "colour_palette_window.h"
+
+#include "./colour_palette_component.h"
+
+#include "./palette_selection_panel.h"
+#include "./colour_picker_panel.h"
+#include "./palette_edit_panel.h"
 
 //==============================================================================
 // ColourPaletteWindow Definitions
 
-ColourPaletteWindow::ColourPaletteWindow(Array<LumatoneEditorColourPalette>& colourPalettesIn)
-    : lookAndFeel(TerpstraSysExApplication::getApp().getLookAndFeel()),
-      colourPalettes(colourPalettesIn)
+ColourPaletteWindow::ColourPaletteWindow(juce::Array<LumatoneEditorColourPalette>& colourPalettesIn)
+    // : lookAndFeel(TerpstraSysExApplication::getApp().getLookAndFeel()),
+      : colourPalettes(colourPalettesIn)
 {
-    setLookAndFeel(&lookAndFeel);
+    // setLookAndFeel(&lookAndFeel);
     
     setName("ColourPaletteWindow");
 
@@ -27,24 +32,24 @@ ColourPaletteWindow::ColourPaletteWindow(Array<LumatoneEditorColourPalette>& col
     palettePanel.reset(new ColourPalettesPanel(colourPalettes, colourSelectorGroup.get()));
     palettePanel->addListener(this);
 
-    palettePanelViewport.reset(new Viewport("PalettePanelViewport"));
+    palettePanelViewport.reset(new juce::Viewport("PalettePanelViewport"));
     palettePanelViewport->setViewedComponent(palettePanel.get(), false);
     palettePanelViewport->setScrollBarsShown(true, false, true, false);
-    palettePanelViewport->getVerticalScrollBar().setColour(ScrollBar::ColourIds::thumbColourId, Colour(0xff2d3135));
+    palettePanelViewport->getVerticalScrollBar().setColour(juce::ScrollBar::ColourIds::thumbColourId, juce::Colour(0xff2d3135));
 
     customPickerPanel.reset(new CustomPickerPanel());
     colourSelectorGroup->addSelector(customPickerPanel.get());
     colourSelectorGroup->addColourSelectionListener(customPickerPanel.get());
 
-    colourToolTabs.reset(new TabbedComponent(TabbedButtonBar::Orientation::TabsAtTop));
+    colourToolTabs.reset(new juce::TabbedComponent(juce::TabbedButtonBar::Orientation::TabsAtTop));
     colourToolTabs->setName("ColourSelectionToolTabs");
-    colourToolTabs->addTab(translate("ColourPalettes"), Colour(), palettePanelViewport.get(), false);
-    colourToolTabs->addTab(translate("CustomPicker"), Colour(), customPickerPanel.get(), false);
-    colourToolTabs->setColour(TabbedComponent::ColourIds::outlineColourId, Colour());
-    colourToolTabs->getTabbedButtonBar().getProperties().set(LumatoneEditorStyleIDs::fontHeightScalar, 0.9f);
+    colourToolTabs->addTab(juce::translate("ColourPalettes"), juce::Colour(), palettePanelViewport.get(), false);
+    colourToolTabs->addTab(juce::translate("CustomPicker"), juce::Colour(), customPickerPanel.get(), false);
+    colourToolTabs->setColour(juce::TabbedComponent::ColourIds::outlineColourId, juce::Colour());
+    // colourToolTabs->getTabbedButtonBar().getProperties().set(LumatoneEditorStyleIDs::fontHeightScalar, 0.9f);
     addAndMakeVisible(*colourToolTabs);
     
-    const int firstTabIndex = TerpstraSysExApplication::getApp().getPropertiesFile()->getIntValue("LastColourPopupTabIndex");
+    const int firstTabIndex = 0;//; TerpstraSysExApplication::getApp().getPropertiesFile()->getIntValue("LastColourPopupTabIndex");
     colourToolTabs->setCurrentTabIndex(firstTabIndex);
     colourToolTabs->getTabbedButtonBar().addChangeListener(this);
 }
@@ -93,17 +98,17 @@ void ColourPaletteWindow::duplicatePalette(int paletteIndexIn)
 {
     auto copiedPalette = colourPalettes[paletteIndexIn].clone();
     colourPalettes.insert(paletteIndexIn + 1, copiedPalette);
-    TerpstraSysExApplication::getApp().saveColourPalette(copiedPalette);
+    // TerpstraSysExApplication::getApp().saveColourPalette(copiedPalette);
     palettePanel->rebuildPanel(colourPalettes);
 }
 
 void ColourPaletteWindow::removePalette(int paletteIndexToRemove)
 {
     // Remove loaded colour palette
-    String deletedPalette = colourPalettes[paletteIndexToRemove].getPathToFile();
+    juce::String deletedPalette = colourPalettes[paletteIndexToRemove].getPathToFile();
     colourPalettes.remove(paletteIndexToRemove);
 
-    TerpstraSysExApplication::getApp().deletePaletteFile(deletedPalette);
+    // TerpstraSysExApplication::getApp().deletePaletteFile(deletedPalette);
 
     palettePanel->rebuildPanel(colourPalettes);
 }
@@ -145,7 +150,7 @@ void ColourPaletteWindow::newPaletteRequested()
     startEditingPalette(0, 0);
 }
 
-void ColourPaletteWindow::changeListenerCallback(ChangeBroadcaster* source)
+void ColourPaletteWindow::changeListenerCallback(juce::ChangeBroadcaster* source)
 {
     // Palette editing finished
     if (source == paletteEditPanel.get())
@@ -157,10 +162,10 @@ void ColourPaletteWindow::changeListenerCallback(ChangeBroadcaster* source)
                 auto palette = colourPalettes.getReference(paletteIndexEditing);
                 palette.setColours(paletteEditPanel->getCurrentPalette());
 
-                String newName = paletteEditPanel->getPaletteName();
+                juce::String newName = paletteEditPanel->getPaletteName();
                 palette.setName(newName);
 
-                TerpstraSysExApplication::getApp().saveColourPalette(palette);
+                // TerpstraSysExApplication::getApp().saveColourPalette(palette);
             }
             else
                 jassert(true); // Something bad happened!
@@ -179,6 +184,6 @@ void ColourPaletteWindow::changeListenerCallback(ChangeBroadcaster* source)
     else if (source == &colourToolTabs->getTabbedButtonBar())
     {
         const int newTab = colourToolTabs->getCurrentTabIndex();
-        TerpstraSysExApplication::getApp().getPropertiesFile()->setValue("LastColourPopupTabIndex", newTab);
+        // TerpstraSysExApplication::getApp().getPropertiesFile()->setValue("LastColourPopupTabIndex", newTab);
     }
 }
diff --git a/Source/ColourPaletteWindow.h b/Source/lumatone_editor_library/palettes/colour_palette_window.h
similarity index 81%
rename from Source/ColourPaletteWindow.h
rename to Source/lumatone_editor_library/palettes/colour_palette_window.h
index b57d42ae..08dac39c 100644
--- a/Source/ColourPaletteWindow.h
+++ b/Source/lumatone_editor_library/palettes/colour_palette_window.h
@@ -1,7 +1,7 @@
 /*
   ==============================================================================
 
-    ColourPaletteWindow.h
+    colour_palette_window.h
     Created: 14 Dec 2020 11:32:03pm
     Author:  Vincenzo
 
@@ -11,25 +11,32 @@
 #pragma once
 
 #include <JuceHeader.h>
-#include "LumatoneEditorStyleCommon.h"
-#include "ColourPaletteComponent.h"
-#include "ColourSelectionPanels.h"
-#include "ColourPaletteDataStructure.h"
+// #include "LumatoneEditorStyleCommon.h"
+
+#include "./colour_selection_group.h"
+#include "./colour_palette_file.h"
+
+#include "./palette_selection_panel.h"
+
+class ColourPaletteComponent;
+
+class CustomPickerPanel;
+class PaletteEditPanel;
 
 //==============================================================================
 /*
 */
 class ColourPaletteWindow  :    public juce::Component,
-                                public ChangeListener,
+                                public juce::ChangeListener,
                                 public ColourPalettesPanel::Listener
 {
 public:
-    ColourPaletteWindow(Array<LumatoneEditorColourPalette>& colourPalettesIn);
+    ColourPaletteWindow(juce::Array<LumatoneEditorColourPalette>& colourPalettesIn);
     ~ColourPaletteWindow() override;
 
     void resized() override;
 
-    void changeListenerCallback(ChangeBroadcaster* source) override;
+    void changeListenerCallback(juce::ChangeBroadcaster* source) override;
 
     //====================================================================
 
@@ -90,16 +97,16 @@ class ColourPaletteWindow  :    public juce::Component,
 
 private:
     
-    LumatoneEditorLookAndFeel lookAndFeel;
+    // LumatoneEditorLookAndFeel lookAndFeel;
 
-    Array<LumatoneEditorColourPalette>& colourPalettes;
+    juce::Array<LumatoneEditorColourPalette>& colourPalettes;
 
-    std::unique_ptr<TabbedComponent> colourToolTabs;
+    std::unique_ptr<juce::TabbedComponent> colourToolTabs;
     std::unique_ptr<ColourPalettesPanel> palettePanel;
     std::unique_ptr<CustomPickerPanel> customPickerPanel;
     std::unique_ptr<PaletteEditPanel> paletteEditPanel;
 
-    std::unique_ptr<Viewport> palettePanelViewport;
+    std::unique_ptr<juce::Viewport> palettePanelViewport;
 
     std::unique_ptr<ColourSelectionGroup> colourSelectorGroup;
 
diff --git a/Source/lumatone_editor_library/palettes/colour_picker_panel.h b/Source/lumatone_editor_library/palettes/colour_picker_panel.h
new file mode 100644
index 00000000..fe140e2a
--- /dev/null
+++ b/Source/lumatone_editor_library/palettes/colour_picker_panel.h
@@ -0,0 +1,82 @@
+/*
+  ==============================================================================
+
+    ColourSelectionPanels.h
+    Created: 21 Dec 2020 9:48:08pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#ifndef LUMATONE_COLOUR_PICKER_PANEL_H
+#define LUMATONE_COLOUR_PICKER_PANEL_H
+
+#include "./colour_selection_broadcaster.h"
+
+//==============================================================================
+/*
+*   Full RGB colour selector panel
+*/
+class CustomPickerPanel : public juce::Component,
+    public juce::ChangeListener,
+    public ColourSelectionBroadcaster,
+    public ColourSelectionListener
+{
+public:
+
+    CustomPickerPanel()
+    {
+        colourPicker.reset(new juce::ColourSelector(
+              juce::ColourSelector::ColourSelectorOptions::editableColour
+            + juce::ColourSelector::ColourSelectorOptions::showColourAtTop
+            + juce::ColourSelector::ColourSelectorOptions::showColourspace
+        ));
+
+        colourPicker->setName("ColourPicker");
+        addAndMakeVisible(*colourPicker);
+        colourPicker->addChangeListener(this);
+    }
+
+    ~CustomPickerPanel()
+    {
+        colourPicker = nullptr;
+    }
+
+    void paint(juce::Graphics& g) override {};
+
+    void resized() override
+    {
+        colourPicker->setBounds(getLocalBounds());
+    }
+
+    void setCurrentColour(juce::Colour colourIn)
+    {
+        colourPicker->setCurrentColour(colourIn, juce::NotificationType::dontSendNotification);
+    }
+
+    void changeListenerCallback(juce::ChangeBroadcaster* source) override
+    {
+        selectorListeners.call(&ColourSelectionListener::colourChangedCallback, this, colourPicker->getCurrentColour());
+    }
+
+    void colourChangedCallback(ColourSelectionBroadcaster* source, juce::Colour newColour) override
+    {
+        if (this != source)
+            colourPicker->setCurrentColour(newColour, juce::NotificationType::dontSendNotification);
+    }
+
+    //==============================================================================
+
+    juce::Colour getSelectedColour() override
+    {
+        return colourPicker->getCurrentColour();
+    }
+
+    void deselectColour() override {};
+
+private:
+
+    std::unique_ptr<juce::ColourSelector> colourPicker;
+};
+
+#endif // LUMATONE_COLOUR_PICKER_PANEL_H
diff --git a/Source/lumatone_editor_library/palettes/colour_selection_broadcaster.h b/Source/lumatone_editor_library/palettes/colour_selection_broadcaster.h
new file mode 100644
index 00000000..06eb4094
--- /dev/null
+++ b/Source/lumatone_editor_library/palettes/colour_selection_broadcaster.h
@@ -0,0 +1,46 @@
+/*
+  ==============================================================================
+
+    colour_selection_group.h
+    Created: 20 Dec 2020 5:40:13pm
+    Author:  Vincenzo
+
+    Base classes for maintaining multiple objects that resolve to one or zero colours being selected.
+
+  ==============================================================================
+*/
+
+#ifndef LUMATONE_COLOUR_SELECTION_BROADCASTER_H
+#define LUMATONE_COLOUR_SELECTION_BROADCASTER_H
+
+#include <JuceHeader.h>
+
+class ColourSelectionBroadcaster;
+
+class ColourSelectionListener
+{
+public:
+    virtual ~ColourSelectionListener() {}
+    virtual void colourChangedCallback(ColourSelectionBroadcaster* source, juce::Colour newColour)=0;
+};
+
+class ColourSelectionBroadcaster
+{
+public:
+
+    ColourSelectionBroadcaster() {};
+    virtual ~ColourSelectionBroadcaster() {}
+
+    virtual juce::Colour getSelectedColour() = 0;
+
+    virtual void deselectColour() = 0;
+
+    void    addColourSelectionListener(ColourSelectionListener* listenerIn) { selectorListeners.add(listenerIn); }
+    void removeColourSelectionListener(ColourSelectionListener* listenerIn) { selectorListeners.remove(listenerIn); }
+
+protected:
+
+    juce::ListenerList<ColourSelectionListener> selectorListeners;
+};
+
+#endif // LUMATONE_COLOUR_SELECTION_BROADCASTER_H
diff --git a/Source/lumatone_editor_library/palettes/colour_selection_group.h b/Source/lumatone_editor_library/palettes/colour_selection_group.h
new file mode 100644
index 00000000..8286a396
--- /dev/null
+++ b/Source/lumatone_editor_library/palettes/colour_selection_group.h
@@ -0,0 +1,125 @@
+/*
+  ==============================================================================
+
+    colour_selection_group.h
+    Created: 20 Dec 2020 5:40:13pm
+    Author:  Vincenzo
+
+    Base classes for maintaining multiple objects that resolve to one or zero colours being selected.
+
+  ==============================================================================
+*/
+
+#ifndef LUMATONE_COLOUR_SELECTION_GROUP_H
+#define LUMATONE_COLOUR_SELECTION_GROUP_H
+
+#include "./colour_selection_broadcaster.h"
+
+class ColourSelectionGroup :  public ColourSelectionBroadcaster,
+                              private ColourSelectionListener
+{
+public:
+
+    ~ColourSelectionGroup()
+    {
+        for (auto selector : colourSelectors)
+            selector->removeColourSelectionListener(this);
+    }
+
+    /// <summary>
+    /// Adds a ColourPaletteComponent and returns the palette's group index
+    /// </summary>
+    /// <param name="paletteComponentToAdd"></param>
+    /// <returns></returns>
+    int addSelector(ColourSelectionBroadcaster* selectorToAdd)
+    {
+        bool newSelector = colourSelectors.addIfNotAlreadyThere(selectorToAdd);
+
+        if (newSelector)
+            selectorToAdd->addColourSelectionListener(this);
+
+        return colourSelectors.indexOf(selectorToAdd);
+    }
+
+    void removeSelector(ColourSelectionBroadcaster* selectorToRemove)
+    {
+        int removed = colourSelectors.removeAllInstancesOf(selectorToRemove);
+
+        if (removed > 0)
+            selectorToRemove->removeColourSelectionListener(this);
+    }
+
+    /// <summary>
+    /// Removes the selected status from the selected palette swatch
+    /// </summary>
+    void deselectColour() override
+    {
+        if (selectedBroadcasterIndex >= 0)
+            colourSelectors[selectedBroadcasterIndex]->deselectColour();
+
+        selectedBroadcasterIndex = -1;
+    }
+
+    juce::Colour getSelectedColour() override
+    {
+        if (selectedBroadcasterIndex >= 0)
+            return colourSelectors[selectedBroadcasterIndex]->getSelectedColour();
+        
+        return juce::Colour();
+    }
+
+    ColourSelectionBroadcaster* getSelectedBroadcaster() const
+    {
+        if (selectedBroadcasterIndex >= 0)
+            return colourSelectors[selectedBroadcasterIndex];
+
+        return nullptr;
+    }
+
+    int getSelectedBroadcasterIndex() const
+    {
+        return selectedBroadcasterIndex;
+    }
+
+    int getIndexOfSelector(ColourSelectionBroadcaster* selectorIn) const
+    {
+        return colourSelectors.indexOf(selectorIn);
+    }
+
+    void setCurrentSelector(ColourSelectionBroadcaster* selector)
+    {
+        auto index = colourSelectors.indexOf(selector);
+
+        if (index >= 0 && index < colourSelectors.size())
+        {
+            if (selectedBroadcasterIndex >= 0 && getSelectedBroadcaster() != selector)
+            {
+                getSelectedBroadcaster()->deselectColour();
+            }
+
+            selectedBroadcasterIndex = index;
+
+            selectorListeners.call(&ColourSelectionListener::colourChangedCallback, selector, selector->getSelectedColour());
+        }
+    }
+
+    //=========================================================================
+
+    /// <summary>
+    /// Use this callback to determine the selected colour among all colour selectors
+    /// </summary>
+    /// <param name="source"></param>
+    /// <param name="newColour"></param>
+    void colourChangedCallback(ColourSelectionBroadcaster* source, juce::Colour newColour) override
+    {
+        setCurrentSelector(source);
+    }
+
+private:
+
+    juce::Array<ColourSelectionBroadcaster*> colourSelectors;
+
+    int selectedBroadcasterIndex = -1;
+};
+
+#endif // LUMATONE_COLOUR_SELECTION_GROUP_H
\ No newline at end of file
diff --git a/Source/lumatone_editor_library/palettes/colour_view_component.cpp b/Source/lumatone_editor_library/palettes/colour_view_component.cpp
new file mode 100644
index 00000000..1ada9c37
--- /dev/null
+++ b/Source/lumatone_editor_library/palettes/colour_view_component.cpp
@@ -0,0 +1,315 @@
+/*
+  ==============================================================================
+
+  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: 6.0.4
+
+  ------------------------------------------------------------------------------
+
+  The Projucer is part of the JUCE library.
+  Copyright (c) 2020 - Raw Material Software Limited.
+
+  ==============================================================================
+*/
+
+//[Headers] You can add your own extra header files here...
+#include "../graphics/view_constants.h"
+#include "../ui/key_edit_component.h"
+//[/Headers]
+
+#include "colour_view_component.h"
+
+
+//[MiscUserDefs] You can add your own user definitions and misc code here...
+
+/*
+==============================================================================
+ColourComboBox class
+==============================================================================
+*/
+
+// ColourComboBox::ColourComboBox(juce::StringRef componentName) : juce::ComboBox(componentName)
+// {
+// }
+
+// void ColourComboBox::setTextFieldToColourAsObject(juce::Colour newColourAsObject, juce::NotificationType notification)
+// {
+// 	setText(newColourAsObject.toDisplayString(false));
+
+// 	// getLookAndFeel().setColour(juce::ComboBox::arrowColourId, newColourAsObject.contrasting(1.0)); Doesn't work XXX
+
+// 	// ToDo Add to box
+// }
+
+// juce::String ColourComboBox::getColourAsStringFromText(colourComboboxOptions boxOptions)
+// {
+// 	juce::String colourAsString = getText();
+
+// 	// ToDo validation of colour value
+
+// 	if (boxOptions == colourComboboxOptions::AddColourToComboBox && !colourAsString.isEmpty())
+// 		addColourToBox(colourAsString);
+
+// 	return colourAsString;
+// }
+
+// int ColourComboBox::getColourAsNumberFromText(colourComboboxOptions boxOptions)
+// {
+// 	juce::String colourString = getColourAsStringFromText(boxOptions);
+
+// 	// ToDo validation of colour value
+
+// 	int colourAsNumber = colourString.getHexValue32();
+
+// 	return colourAsNumber;
+// }
+
+// // Add colour to combo box
+// void ColourComboBox::addColourToBox(juce::String newColourAsString)
+// {
+// 	int pos;
+// 	for (pos = 0; pos < getNumItems(); pos++)
+// 	{
+// 		if (getItemText(pos) == newColourAsString)
+// 			break;
+// 	}
+
+// 	if (pos >= getNumItems())
+// 	{
+// 		// juce::Colour is not in list yet - add it
+// 		addItem(newColourAsString, pos + 1);
+// 	}
+// }
+
+// juce::Colour ColourComboBox::getColourAsObjectFromText(colourComboboxOptions boxOptions)
+// {
+// 	int colourAsNumber = getColourAsNumberFromText(boxOptions);
+// 	return juce::Colour(colourAsNumber);
+// }
+
+
+/*
+==============================================================================
+juce::ColourComboLookAndFeel class
+==============================================================================
+*/
+
+// void ColourComboLookAndFeel::drawPopupMenuItem (juce::Graphics g, const juce::Rectangle<int>& area,
+//                                         const bool isSeparator, const bool isActive,
+//                                         const bool isHighlighted, const bool isTicked,
+//                                         const bool hasSubMenu, const juce::String& text,
+//                                         const juce::String& shortcutKeyText,
+//                                         const juce::Drawable* icon, const juce::Colour* const textColourToUse)
+// {
+//     if (isSeparator)
+//     {
+//         juce::LookAndFeel_V4::drawPopupMenuItem(
+//             g, area, isSeparator, isActive, isHighlighted, isTicked, hasSubMenu, text, shortcutKeyText, icon, textColourToUse);
+//     }
+//     else
+//     {
+//         //  auto bgColour = findColour(TerpstraKeyEdit::backgroundColourId).overlaidWith(
+//         //     juce::Colour(text.getHexValue32())
+//         //         .withAlpha(isHighlighted && isActive ? TERPSTRASINGLEKEYCOLOURALPHA : TERPSTRASINGLEKEYCOLOURUNSELECTEDMINIALPHA));
+//         auto bgColour = juce::Colours::slategrey;
+//         auto textColour = bgColour.contrasting(1.0);
+
+//         auto r  = area.reduced (1);
+
+//         g.setColour (bgColour);
+//         g.fillRect (r);
+
+//         g.setColour (textColour);
+
+//         r.reduce (juce::jmin(5, area.getWidth() / 20), 0);
+
+//         auto font = getPopupMenuFont();
+
+//         auto maxFontHeight = r.getHeight() / 1.3f;
+
+//         if (font.getHeight() > maxFontHeight)
+//             font.setHeight (maxFontHeight);
+
+//         g.setFont (font);
+
+//         auto iconArea = r.removeFromLeft (juce::roundToInt (maxFontHeight)).toFloat();
+
+//         if (icon != nullptr)
+//         {
+//             icon->drawWithin (g, iconArea, juce::RectanglePlacement::centred | juce::RectanglePlacement::onlyReduceInSize, 1.0f);
+//             r.removeFromLeft (juce::roundToInt (maxFontHeight * 0.5f));
+//         }
+//         else if (isTicked)
+//         {
+//             auto tick = getTickShape (1.0f);
+//             g.fillPath (tick, tick.getTransformToScaleToFit (iconArea.reduced (iconArea.getWidth() / 5, 0).toFloat(), true));
+//         }
+
+//         if (hasSubMenu)
+//         {
+//             auto arrowH = 0.6f * getPopupMenuFont().getAscent();
+
+//             auto x = static_cast<float> (r.removeFromRight ((int) arrowH).getX());
+//             auto halfH = static_cast<float> (r.getCentreY());
+
+//             juce::Path path;
+//             path.startNewSubPath (x, halfH - arrowH * 0.5f);
+//             path.lineTo (x + arrowH * 0.6f, halfH);
+//             path.lineTo (x, halfH + arrowH * 0.5f);
+
+//             g.strokePath (path, juce::PathStrokeType (2.0f));
+//         }
+
+//         r.removeFromRight (3);
+//         g.drawFittedText (text, r, juce::Justification::centredLeft, 1);
+
+//         if (shortcutKeyText.isNotEmpty())
+//         {
+//             auto f2 = font;
+//             f2.setHeight (f2.getHeight() * 0.75f);
+//             f2.setHorizontalScale (0.95f);
+//             g.setFont (f2);
+
+//             g.drawText (shortcutKeyText, r, juce::Justification::centredRight, true);
+//         }
+//     }
+// }
+
+//[/MiscUserDefs]
+
+//==============================================================================
+ColourViewComponent::ColourViewComponent (juce::Colour initialColour)
+    : Button("ColourViewComponent")
+{
+    //[Constructor_pre] You can add your own custom stuff here..
+    //[/Constructor_pre]
+
+    //[UserPreSize]
+    //[/UserPreSize]
+
+    //setSize (120, 32);
+
+
+    //[Constructor] You can add your own custom stuff here..
+
+    currentColour = initialColour;
+    currentColourAsString = currentColour.toString();
+
+    setButtonText("v");
+    //[/Constructor]
+}
+
+ColourViewComponent::~ColourViewComponent()
+{
+    //[Destructor_pre]. You can add your own custom destruction code here..
+    //[/Destructor_pre]
+
+    //[Destructor]. You can add your own custom destruction code here..
+    //[/Destructor]
+}
+
+
+//[MiscUserCode] You can add your own definitions of your custom methods or any other code here...
+
+void ColourViewComponent::paintButton(juce::Graphics& g, bool shouldDrawButtonAsHighlighted, bool shouldDrawButtonAsDown)
+{
+    juce::Colour backgroundColour = findColour(juce::TextButton::ColourIds::buttonColourId);
+    juce::Colour textColour       = backgroundColour.contrasting();
+
+    if (!isEnabled())
+    {
+        backgroundColour = backgroundColour.darker().withMultipliedSaturation(0.3f);
+        textColour = textColour.overlaidWith(juce::Colours::darkgrey.withAlpha(0.6f));
+    }
+
+    if (shouldDrawButtonAsHighlighted)
+    {
+        backgroundColour = (isMouseButtonDown())
+            ? backgroundColour.darker(0.25f)
+            : backgroundColour.brighter(0.25f);
+    }
+
+    g.setColour(backgroundColour);
+    g.fillRoundedRectangle(getLocalBounds().toFloat(), getHeight() / 3.0f);
+
+    g.setFont(juce::Font().withHeight(proportionOfHeight(0.75f)).withHorizontalScale(2.0f));
+    g.setColour(textColour);
+    g.drawFittedText(getButtonText(), getLocalBounds(), juce::Justification::centred, 1);
+}
+
+void ColourViewComponent::setColour(juce::String colourAsString)
+{
+	//jassert(colourCombo != nullptr);
+
+    currentColourAsString = colourAsString;
+    if (currentColourAsString.length() == 6)
+        currentColourAsString = "FF" + colourAsString;
+
+    currentColour = juce::Colour::fromString(currentColourAsString);
+    Component::setColour(juce::TextButton::ColourIds::buttonColourId, currentColour);
+    repaint();
+
+    // Notify parent that value has changed and can be sent to MIDI controller
+    sendChangeMessage();
+}
+
+juce::String ColourViewComponent::getColourAsString()
+{
+    return currentColourAsString;
+}
+
+int ColourViewComponent::getColourAsNumber()
+{
+	return currentColourAsString.getHexValue32();
+}
+
+juce::Colour ColourViewComponent::getColourAsObject()
+{
+    return currentColour;
+}
+
+void ColourViewComponent::colourChangedCallback(ColourSelectionBroadcaster* source, juce::Colour newColour)
+{
+    setColour(newColour.toString());
+}
+
+
+//[/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="ColourViewComponent" componentName=""
+                 parentClasses="public Component, public juce::ChangeListener, public juce::ChangeBroadcaster"
+                 constructorParams="" variableInitialisers="" snapPixels="8" snapActive="1"
+                 snapShown="1" overlayOpacity="0.330" fixedSize="1" initialWidth="120"
+                 initialHeight="32">
+  <BACKGROUND backgroundColour="ffb8d0de"/>
+  <TEXTBUTTON name="btnColourPicker" id="fb8f62a75c5cd9ec" memberName="btnColourPicker"
+              virtualName="" explicitFocusOrder="0" pos="88 0 24 24" buttonText=".."
+              connectedEdges="0" needsCallback="1" radioGroupId="0"/>
+  <COMBOBOX name="colourCombo" id="86628debb1bafc04" memberName="colourCombo"
+            virtualName="ColourComboBox" explicitFocusOrder="0" pos="0 0 79 24"
+            editable="1" layout="33" items="" textWhenNonSelected="" textWhenNoItems="(no choices)"/>
+</JUCER_COMPONENT>
+
+END_JUCER_METADATA
+*/
+#endif
+
+
+//[EndFile] You can add extra defines here...
+//[/EndFile]
+
diff --git a/Source/lumatone_editor_library/palettes/colour_view_component.h b/Source/lumatone_editor_library/palettes/colour_view_component.h
new file mode 100644
index 00000000..a6ee105d
--- /dev/null
+++ b/Source/lumatone_editor_library/palettes/colour_view_component.h
@@ -0,0 +1,140 @@
+/*
+  ==============================================================================
+
+  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: 6.0.4
+
+  ------------------------------------------------------------------------------
+
+  The Projucer is part of the JUCE library.
+  Copyright (c) 2020 - Raw Material Software Limited.
+
+  ==============================================================================
+*/
+
+#pragma once
+
+//[Headers]     -- You can add your own extra header files here --
+#include <JuceHeader.h>
+#include "colour_selection_group.h"
+
+/*
+==============================================================================
+Combo box with colours - unused with new GUI design
+==============================================================================
+*/
+
+#define ADDCOLOURTOCOMBOBOX true
+#define DONTADDCOLOURTOCOMBOBOX false
+
+// class ColourComboBox : public juce::ComboBox
+// {
+// public:
+// 	enum colourComboboxOptions
+// 	{
+// 		DoNotAddColourToCombobox = 0,
+// 		AddColourToComboBox
+// 	};
+
+// 	explicit ColourComboBox(juce::StringRef componentName = juce::String());
+
+// 	void setTextFieldToColourAsObject(juce::Colour newColourAsObject,
+// 		juce::NotificationType notification = juce::NotificationType::sendNotificationAsync);
+// 	juce::String getColourAsStringFromText(colourComboboxOptions boxOptions);
+// 	int getColourAsNumberFromText(colourComboboxOptions boxOptions);
+// 	juce::Colour getColourAsObjectFromText(colourComboboxOptions boxOptions);
+
+// 	void addColourToBox(juce::String newColourAsString);
+// 	void addColourToBox(juce::Colour newColourAsObject) { addColourToBox(newColourAsObject.toDisplayString(false)); }
+// 	void addColourToBox(int newColourAsNumber) { addColourToBox(juce::Colour(newColourAsNumber)); }
+// };
+
+/*
+==============================================================================
+Draw each item in ColourComboBox's drop-down list in "its" colour
+==============================================================================
+// */
+// class ColourComboLookAndFeel : public juce::LookAndFeel_V4
+// {
+// public:
+//     void drawPopupMenuItem (juce::Graphics&, const juce::Rectangle<int>& area,
+//                             bool isSeparator, bool isActive, bool isHighlighted, bool isTicked, bool hasSubMenu,
+//                             const juce::String& text, const juce::String& shortcutKeyText,
+//                             const juce::Drawable* icon, const juce::Colour* textColour) override;
+
+// };
+
+
+//[/Headers]
+
+
+
+//==============================================================================
+/**
+                                                                    //[Comments]
+    An auto-generated component, created by the Projucer.
+
+    Describe your class and how it works here!
+                                                                    //[/Comments]
+*/
+class ColourViewComponent  : public juce::Button,
+                             public juce::ChangeBroadcaster,
+                             public ColourSelectionListener
+{
+public:
+    //==============================================================================
+    ColourViewComponent (juce::Colour initialColour = juce::Colour(0xff5c7cf2));
+    ~ColourViewComponent() override;
+
+    //==============================================================================
+    //[UserMethods]     -- You can add your own custom methods in this section.
+	//void changeListenerCallback(juce::ChangeBroadcaster *source) override;
+
+	void setColour(juce::String colourAsString);
+	juce::String getColourAsString();
+	int getColourAsNumber();
+    juce::Colour getColourAsObject();
+	//void addColourToBox(int newColourAsNumber);
+    //[/UserMethods]
+
+    //void paint (juce::Graphics g) override;
+    //void resized() override;
+    //void buttonClicked (juce::Button* buttonThatWasClicked) override;
+    //void comboBoxChanged (juce::ComboBox* comboBoxThatHasChanged) override;
+
+    void paintButton(juce::Graphics& g, bool shouldDrawButtonAsHighlighted, bool shouldDrawButtonAsDown) override;
+
+    //==============================================================================
+    // ColourSelectionListener implementation
+
+    void colourChangedCallback(ColourSelectionBroadcaster* source, juce::Colour newColour) override;
+
+
+private:
+    //[UserVariables]   -- You can add your own custom variables in this section.
+    //std::unique_ptr<ColourComboLookAndFeel> colourComboLookAndFeel;
+
+    juce::Colour currentColour = juce::Colour(0xffd1d1d1);
+    juce::String currentColourAsString = currentColour.toString();
+    float brightnessAdjust = 0.0f;
+
+    //[/UserVariables]
+
+    //==============================================================================
+    //std::unique_ptr<juce::TextButton> btnColourPicker;
+    //std::unique_ptr<ColourComboBox> colourCombo;
+
+
+    //==============================================================================
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ColourViewComponent)
+};
+
+//[EndFile] You can add extra defines here...
+
+//[/EndFile]
+
diff --git a/Source/HexagonPalette.h b/Source/lumatone_editor_library/palettes/hex_group_palette.h
similarity index 63%
rename from Source/HexagonPalette.h
rename to Source/lumatone_editor_library/palettes/hex_group_palette.h
index 97cc99b5..cc875bd4 100644
--- a/Source/HexagonPalette.h
+++ b/Source/lumatone_editor_library/palettes/hex_group_palette.h
@@ -1,7 +1,7 @@
 /*
   ==============================================================================
 
-    PolygonPalette.h
+    polygon_palette.h
     Created: 13 Nov 2020 7:24:40pm
     Author:  Vincenzo
 
@@ -10,10 +10,9 @@
 
 #pragma once
 
-#include "Palette.h"
-#include "lumatone_geometry.h"
-#include "lumatone_tiling.h"
+#include "palette_base.h"
 
+#include "../mapping/lumatone_tiling.h"
 
 //==============================================================================
 /*
@@ -21,8 +20,10 @@
 class HexagonPalette: public Palette
 {
 public:
-    HexagonPalette(Array<Point<int>> hexCoordsIn, double rotationAngle = 0.0)
-        : Palette(hexCoordsIn.size()), hexCoordinates(hexCoordsIn), angleOffset(rotationAngle)
+    HexagonPalette(juce::Array<juce::Point<int>> hexCoordsIn, double rotationAngle = 0.0)
+        : Palette(hexCoordsIn.size())
+        , hexCoordinates(hexCoordsIn)
+        , angleOffset(rotationAngle)
     {
         for (auto point : hexCoordinates)
         {
@@ -43,11 +44,11 @@ class HexagonPalette: public Palette
     {
     }
 
-    void paint(Graphics& g) override
+    void paint(juce::Graphics& g) override
     {
         for (int i = 0; i < getNumberOfSwatches(); i++)
         {
-            Path& swatch = swatchPaths.getReference(i);
+            juce::Path& swatch = swatchPaths.getReference(i);
 
             g.setColour(getSwatchColour(i));
             g.fillPath(swatch);
@@ -60,8 +61,8 @@ class HexagonPalette: public Palette
 
         if (selectedSwatch >= 0)
         {
-            g.setColour(Colours::white);
-            g.strokePath(swatchPaths[selectedSwatch], PathStrokeType(2.0f));
+            g.setColour(juce::Colours::white);
+            g.strokePath(swatchPaths[selectedSwatch], juce::PathStrokeType(2.0f));
         }
     }
 
@@ -80,13 +81,13 @@ class HexagonPalette: public Palette
         float yOffset = (getHeight() - newHeight) * 0.5f;
 
         // Get scaling and centering transform
-        AffineTransform transform = AffineTransform()
-            .followedBy(AffineTransform::scale(scalar))
-            .followedBy(AffineTransform::translation(xOffset, 0));
+        juce::AffineTransform transform = juce::AffineTransform()
+            .followedBy(juce::AffineTransform::scale(scalar))
+            .followedBy(juce::AffineTransform::translation(xOffset, 0));
 
         for (int i = 0; i < getNumberOfSwatches(); i++)
         {
-            Path p = swatchPaths[i];
+            juce::Path p = swatchPaths[i];
             p.applyTransform(transform);
             swatchPaths.set(i, p);
         }
@@ -97,46 +98,46 @@ class HexagonPalette: public Palette
     void createSwatches()
     {
         LumatoneTiling tiling;
-        tiling.fitTilingTo(Rectangle<float>(0.0, 0.0, width, height),
+        tiling.fitTilingTo(juce::Rectangle<float>(0.0, 0.0, width, height),
             numColumns, numRows, margin, 0, true
         );
 
-        Array<Point<float>> centres = tiling.transformPointsFromOrigin(hexCoordinates);
+        juce::Array<juce::Point<float>> centres = tiling.transformPointsFromOrigin(hexCoordinates);
 
-        AffineTransform transform;
+        juce::AffineTransform transform;
 
         // TODO get rotation pivot
         if (angleOffset != 0.0)
-            transform = AffineTransform::rotation(angleOffset);
+            transform = juce::AffineTransform::rotation(angleOffset);
 
         // For finding actual width and height
-        Path tilePath;
+        juce::Path tilePath;
 
         swatchPaths.clear();
         for (auto c : centres)
         {
             c.applyTransform(transform);
 
-            Path hex;
+            juce::Path hex;
             hex.addPolygon(c, 6, tiling.getRadius());
             swatchPaths.add(hex);
 
             tilePath.addPath(hex);
         }
 
-        Rectangle<float> tileBounds = tilePath.getBounds(); // does this clip (translate) for optimal size, or does it retain original origin?
+        juce::Rectangle<float> tileBounds = tilePath.getBounds(); // does this clip (juce::translate) for optimal size, or does it retain original origin?
         width = tileBounds.getWidth();
         height = tileBounds.getHeight();
     }
 
 private:
 
-    const Array<Point<int>> hexCoordinates;
+    const juce::Array<juce::Point<int>> hexCoordinates;
     const float angleOffset;
 
     const float margin = 0.024f;
     float width = 1, height = 1;
-
+    
     int numColumns = 0;
     int numRows = 0;
 
@@ -145,19 +146,19 @@ class HexagonPalette: public Palette
 
 class TenHexagonPalette : public HexagonPalette
 {
-    Array<Point<int>> createCoordinates()
+    juce::Array<juce::Point<int>> createCoordinates()
     {
-        Array<Point<int>> coords = {
-			Point<int>(1, 0),
-			Point<int>(2, 0),
-			Point<int>(3, 0),
-			Point<int>(0, 1),
-			Point<int>(1, 1),
-			Point<int>(2, 1),
-			Point<int>(3, 1),
-			Point<int>(0, 2),
-			Point<int>(1, 2),
-			Point<int>(2, 2)
+        juce::Array<juce::Point<int>> coords = { 
+			juce::Point<int>(1, 0), 
+			juce::Point<int>(2, 0), 
+			juce::Point<int>(3, 0),
+			juce::Point<int>(0, 1), 
+			juce::Point<int>(1, 1), 
+			juce::Point<int>(2, 1), 
+			juce::Point<int>(3, 1),
+			juce::Point<int>(0, 2), 
+			juce::Point<int>(1, 2), 
+			juce::Point<int>(2, 2)
         };
 
         return coords;
@@ -168,4 +169,4 @@ class TenHexagonPalette : public HexagonPalette
     TenHexagonPalette(double rotationAngle = 0.0)
         : HexagonPalette(createCoordinates(), rotationAngle)
     {}
-};
+};
\ No newline at end of file
diff --git a/Source/Palette.h b/Source/lumatone_editor_library/palettes/palette_base.h
similarity index 76%
rename from Source/Palette.h
rename to Source/lumatone_editor_library/palettes/palette_base.h
index 526903fd..78c1c90e 100644
--- a/Source/Palette.h
+++ b/Source/lumatone_editor_library/palettes/palette_base.h
@@ -1,7 +1,7 @@
 /*
   ==============================================================================
 
-    PolygonPalette.h
+    polygon_palette.h
     Created: 4 Feb 2021 11:42:00pm
     Author:  Vincenzo
 
@@ -31,7 +31,7 @@ class Palette : public juce::Component, protected juce::ChangeListener
     //======================================================================
     // Implementation of juce::Component
 
-    virtual void mouseDown(const MouseEvent& e) override    
+    virtual void mouseDown(const juce::MouseEvent& e) override    
     {
         if (isEnabled())
         {
@@ -63,20 +63,20 @@ class Palette : public juce::Component, protected juce::ChangeListener
         return selectedSwatch;
     } 
 
-    Colour getSelectedSwatchColour() const
+    juce::Colour getSelectedSwatchColour() const
     {
         if (selectedSwatch >= 0 && selectedSwatch < numSwatches)
             return palette[selectedSwatch];
 
-        return Colour();
+        return juce::Colour();
     }
 
-    Colour getSwatchColour(int swatchIndex) const
+    juce::Colour getSwatchColour(int swatchIndex) const
     {
         return palette[swatchIndex];
     }
 
-    Array<Colour> getColourPalette() const
+    juce::Array<juce::Colour> getColourPalette() const
     {
         return palette;
     }
@@ -89,24 +89,24 @@ class Palette : public juce::Component, protected juce::ChangeListener
         selectedSwatch = swatchIndex;
         if (selector)
         {
-            selector->setCurrentColour(palette[selectedSwatch], dontSendNotification);
+            selector->setCurrentColour(palette[selectedSwatch], juce::NotificationType::dontSendNotification);
         }
         repaint();
     }
 
-    virtual void setColourPalette(Array<Colour> colourPaletteIn)
+    virtual void setColourPalette(juce::Array<juce::Colour> colourPaletteIn)
     {
         palette = colourPaletteIn;
         repaint();
     }
 
-    virtual void setSwatchColour(int swatchNumber, Colour newColour)
+    virtual void setSwatchColour(int swatchNumber, juce::Colour newColour)
     {
         if (swatchNumber >= 0 && swatchNumber < numSwatches)
             palette.set(swatchNumber, newColour);
     }
 
-    virtual void attachColourSelector(ColourSelector* selectorIn)
+    virtual void attachColourSelector(juce::ColourSelector* selectorIn)
     {
         selector = selectorIn;
         
@@ -114,7 +114,7 @@ class Palette : public juce::Component, protected juce::ChangeListener
         {
             if (selectedSwatch > -1)
             {
-                selector->setCurrentColour(palette[selectedSwatch], dontSendNotification);
+                selector->setCurrentColour(palette[selectedSwatch], juce::NotificationType::dontSendNotification);
                 //selector->setFocusserCallback([&](Component* c, var data) {
                 //    palette.set(focussedSwatch, Colour::fromString(data.toString()));
                 //    repaint();
@@ -128,7 +128,7 @@ class Palette : public juce::Component, protected juce::ChangeListener
     //======================================================================
     // Implementation of juce::ChangeListener
 
-    void changeListenerCallback(ChangeBroadcaster* source) override
+    void changeListenerCallback(juce::ChangeBroadcaster* source) override
     {
         if (source == selector && selectedSwatch > -1)
         {
@@ -140,7 +140,7 @@ class Palette : public juce::Component, protected juce::ChangeListener
 
 protected:
 
-    Array<Path> swatchPaths;
+    juce::Array<juce::Path> swatchPaths;
 
     int selectedSwatch = -1;
     bool onlyRepaintSelectedSwatch = false;
@@ -149,16 +149,16 @@ class Palette : public juce::Component, protected juce::ChangeListener
 
     const int numSwatches;
 
-    ColourSelector* selector = nullptr;
+    juce::ColourSelector* selector = nullptr;
 
-    Array<Colour> palette =
+    juce::Array<juce::Colour> palette =
     {
-        Colours::orange,
-        Colours::red,
-        Colours::springgreen,
-        Colours::lightsteelblue,
-        Colours::yellowgreen,
-        Colours::rebeccapurple
+        juce::Colours::orange,
+        juce::Colours::red,
+        juce::Colours::springgreen,
+        juce::Colours::lightsteelblue,
+        juce::Colours::yellowgreen,
+        juce::Colours::rebeccapurple
     };
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Palette)
diff --git a/Source/lumatone_editor_library/palettes/palette_edit_panel.h b/Source/lumatone_editor_library/palettes/palette_edit_panel.h
new file mode 100644
index 00000000..9b3bf1d6
--- /dev/null
+++ b/Source/lumatone_editor_library/palettes/palette_edit_panel.h
@@ -0,0 +1,239 @@
+/*
+  ==============================================================================
+
+    ColourSelectionPanels.h
+    Created: 21 Dec 2020 9:48:08pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#ifndef LUMATONE_PALETTE_EDIT_PANEL_H
+#define LUMATONE_PALETTE_EDIT_PANEL_H
+
+#include "./colour_palette_component.h"
+
+//==============================================================================
+/*
+*   Colour palette edtior panel
+*/
+class PaletteEditPanel : public juce::Component
+                       , public juce::Button::Listener
+                       , public juce::Label::Listener
+                       , public juce::ChangeBroadcaster
+{
+public:
+
+    PaletteEditPanel(const LumatoneEditorColourPalette& paletteIn)
+        : colourPalette(paletteIn)
+    {
+        colourPicker.reset(new juce::ColourSelector(
+            juce::ColourSelector::ColourSelectorOptions::editableColour
+            + juce::ColourSelector::ColourSelectorOptions::showColourAtTop
+            + juce::ColourSelector::ColourSelectorOptions::showColourspace
+        ));
+        addAndMakeVisible(*colourPicker);
+
+        paletteControl.reset(new TenHexagonPalette());
+        paletteControl->setColourPalette(*colourPalette.getColours());
+        paletteControl->attachColourSelector(colourPicker.get());
+        addAndMakeVisible(*paletteControl);
+
+        editPaletteLabel.reset(new juce::Label("EditPaletteLabel", juce::translate("EditPalette")));
+        editPaletteLabel->setJustificationType(juce::Justification::centred);
+        addAndMakeVisible(*editPaletteLabel);
+
+        paletteNameEditor.reset(new juce::Label("PaletteNameEditor"));
+        paletteNameEditor->setJustificationType(juce::Justification::centred);
+        paletteNameEditor->setEditable(true);
+        paletteNameEditor->addListener(this);
+        paletteNameEditor->setColour(juce::Label::ColourIds::backgroundColourId, juce::Colour());
+        paletteNameEditor->setText(colourPalette.getName(), juce::dontSendNotification);
+        // paletteNameEditor->getProperties().set(LumatoneEditorStyleIDs::labelMaximumLineCount, 3);
+        addAndMakeVisible(*paletteNameEditor);
+        labelTextChanged(paletteNameEditor.get()); // force update
+
+
+        saveButton.reset(new juce::TextButton("SaveButton", juce::translate("SavePaletteTip")));
+        saveButton->setButtonText("Save");
+        saveButton->addListener(this);
+        addAndMakeVisible(*saveButton);
+
+        cancelButton.reset(new juce::TextButton("CancelButton", juce::translate("CancelPaletteTip")));
+        cancelButton->setButtonText("Cancel");
+        cancelButton->addListener(this);
+        addAndMakeVisible(*cancelButton);
+    }
+
+    ~PaletteEditPanel()
+    {
+        paletteControl = nullptr;
+    }
+
+    void paint(juce::Graphics& g) override
+    {
+        g.fillAll(juce::Colours::black);
+    }
+
+    void resized() override
+    {
+        float leftWidth = getWidth() * leftColumnWidth;
+        float leftCenter = leftWidth * 0.5f;
+
+        auto labelText = editPaletteLabel->getText() + " ";
+        int labelWidth = editPaletteLabel->getFont().getStringWidth(labelText);
+        // resizeLabelWithHeight(editPaletteLabel.get(), proportionOfHeight(editPaletteHeight));
+        editPaletteLabel->setSize(labelWidth, proportionOfHeight(editPaletteHeight));
+        editPaletteLabel->setCentrePosition(leftCenter, juce::roundToInt(editPaletteLabel->getHeight() * 0.5f + proportionOfHeight(editPaletteLabelY)));
+
+        float paletteWidth = proportionOfWidth(paletteWidthScalar);
+        float paletteHeight = proportionOfHeight(paletteHeightScalar);
+        paletteControl->setSize(paletteWidth, paletteHeight);
+        paletteControl->setCentrePosition(leftCenter, juce::roundToInt(paletteHeight * 0.5f + proportionOfHeight(paletteY)));
+
+        saveButton->setSize(proportionOfWidth(buttonWidth), proportionOfHeight(buttonHeight));
+        saveButton->setCentrePosition(leftCenter, juce::roundToInt(saveButton->getHeight() * 0.5f + proportionOfHeight(buttonY)));
+        cancelButton->setBounds(saveButton->getBounds().translated(0, saveButton->getHeight() * 1.125f));
+
+        colourPicker->setSize(proportionOfWidth(pickerWidth), proportionOfHeight(pickerHeight));
+        colourPicker->setTopLeftPosition(leftWidth, juce::roundToInt((getHeight() - colourPicker->getHeight()) * 0.5f));
+
+        float leftMargin = colourPicker->getRight() * 0.03f * 0.5f;
+        paletteNameEditor->setBounds(juce::Rectangle<int>(
+            juce::Point<int>(juce::roundToInt(leftMargin), paletteControl->getBottom()),
+            juce::Point<int>(colourPicker->getX() - leftMargin, saveButton->getY())
+            ));
+        // paletteNameEditor->getProperties().set(LumatoneEditorStyleIDs::fontHeightScalar, editPaletteLabel->getHeight() / (float)paletteNameEditor->getHeight());
+
+        //if (lookAndFeel)
+        //{
+        //    Font labelFont = (paletteUnnamed)
+        //        ? lookAndFeel->getAppFont(LumatoneEditorFont::UniviaProBold)
+        //        : lookAndFeel->getAppFont(LumatoneEditorFont::GothamNarrowMedium);
+
+        //    paletteNameEditor->setFont(labelFont);
+        //}
+
+    }
+
+    // void lookAndFeelChanged() override
+    // {
+    //     lookAndFeel = dynamic_cast<LumatoneEditorLookAndFeel*>(&getLookAndFeel());
+    //     if (lookAndFeel)
+    //     {
+    //     }
+    // }
+
+    //==============================================================================
+
+    void buttonClicked(juce::Button* btn) override
+    {
+        if (btn == saveButton.get())
+        {
+            saveRequested = true;
+        }
+
+        sendChangeMessage();
+    }
+
+    //==============================================================================
+
+    void labelTextChanged(juce::Label* label) override
+    {
+        // Italics and font override here is a bit of a hack
+        if (label == paletteNameEditor.get())
+        {
+            bool nameIsEmpty = paletteNameEditor->getText() == "";
+
+            if (!nameIsEmpty)
+            {
+                paletteUnnamed = false;
+                colourPalette.setName(paletteNameEditor->getText());
+                // paletteNameEditor->getProperties().remove(LumatoneEditorStyleIDs::fontOverrideTypefaceStyle);
+                // paletteNameEditor->getProperties().set(LumatoneEditorStyleIDs::fontOverride, LumatoneEditorFont::GothamNarrowMedium);
+            }
+
+            else if (nameIsEmpty && !paletteUnnamed)
+            {
+                paletteUnnamed = true;
+            }
+
+            if (paletteUnnamed)
+            {
+                paletteNameEditor->setText("unnamed", juce::NotificationType::dontSendNotification);
+                // paletteNameEditor->getProperties().set(LumatoneEditorStyleIDs::fontOverrideTypefaceStyle, "Italic");
+                // paletteNameEditor->getProperties().remove(LumatoneEditorStyleIDs::fontOverride);
+            }
+
+            //resized();
+        }
+    }
+
+    void editorShown(juce::Label* label, juce::TextEditor& editor) override
+    {
+        editor.setColour(juce::TextEditor::ColourIds::backgroundColourId, juce::Colours::black);
+        editor.setJustification(juce::Justification::centred);
+        editor.setMultiLine(true);
+    }
+
+    //==============================================================================
+
+    juce::Array<juce::Colour> getCurrentPalette() const
+    {
+        return paletteControl->getColourPalette();
+    }
+
+    void setSelectedSwatch(int selectedSwatchNumber)
+    {
+        if (selectedSwatchNumber >= 0 && selectedSwatchNumber < paletteControl->getNumberOfSwatches())
+            paletteControl->setSelectedSwatchNumber(selectedSwatchNumber);
+    }
+
+    juce::String getPaletteName()
+    {
+        return colourPalette.getName();
+    }
+
+    bool wasSaveRequested() const
+    {
+        return saveRequested;
+    }
+
+private:
+
+    LumatoneEditorColourPalette     colourPalette;
+
+    std::unique_ptr<Palette>              paletteControl;
+    std::unique_ptr<juce::ColourSelector> colourPicker;
+
+    std::unique_ptr<juce::Label>          editPaletteLabel;
+    std::unique_ptr<juce::Label>          paletteNameEditor;
+    std::unique_ptr<juce::TextButton>     saveButton;
+    std::unique_ptr<juce::TextButton>     cancelButton;
+
+    // LumatoneEditorLookAndFeel*      lookAndFeel = nullptr;
+
+    bool saveRequested = false;
+
+    bool paletteUnnamed = false;
+
+    // Drawing constants
+
+    const float leftColumnWidth     = 0.3677f;
+
+    const float editPaletteLabelY   = 0.1212f;
+    const float editPaletteHeight   = 0.0606f;
+
+    const float paletteY            = 0.26f;
+    const float paletteWidthScalar  = 0.25f;
+    const float paletteHeightScalar = 0.25f;
+
+    const float buttonY             = 0.6739f;
+    const float buttonWidth         = 0.2208f;
+    const float buttonHeight        = 0.0889f;
+
+    const float pickerWidth         = 0.6f;
+    const float pickerHeight        = 0.9f;
+};
+
+#endif // LUMATONE_PALETTE_EDIT_PANEL_H
diff --git a/Source/lumatone_editor_library/palettes/palette_library.h b/Source/lumatone_editor_library/palettes/palette_library.h
new file mode 100644
index 00000000..19ae0875
--- /dev/null
+++ b/Source/lumatone_editor_library/palettes/palette_library.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "./colour_palette_file.h"
+
+class LumatonePaletteLibrary
+{
+public:
+
+    LumatonePaletteLibrary()
+    { 
+        juce::Array<juce::Colour> test;
+        test.add(juce::Colours::red);
+        test.add(juce::Colours::blue);
+        test.add(juce::Colours::green);
+        test.add(juce::Colours::yellow);
+        test.add(juce::Colours::cyan);
+        test.add(juce::Colours::magenta);
+        test.add(juce::Colours::white);
+
+        palettes.clear();
+        palettes.add(LumatoneEditorColourPalette(test));
+    }
+    ~LumatonePaletteLibrary() {}
+
+    juce::Array<LumatoneEditorColourPalette> getPalettes() const { return palettes; }
+    juce::Array<LumatoneEditorColourPalette>& getPalettesReference() { return palettes; }
+
+private:
+
+    juce::Array<LumatoneEditorColourPalette> palettes;
+
+};
diff --git a/Source/lumatone_editor_library/palettes/palette_selection_panel.h b/Source/lumatone_editor_library/palettes/palette_selection_panel.h
new file mode 100644
index 00000000..054511d7
--- /dev/null
+++ b/Source/lumatone_editor_library/palettes/palette_selection_panel.h
@@ -0,0 +1,314 @@
+/*
+  ==============================================================================
+
+    ColourSelectionPanels.h
+    Created: 21 Dec 2020 9:48:08pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#ifndef LUMATONE_PALETTE_SELECTION_PANEL_H
+#define LUMATONE_PALETTE_SELECTION_PANEL_H
+
+#include "./colour_palette_component.h"
+
+//==============================================================================
+/*
+*   Panel that displays the palettes and allows users to select a swatch
+*/
+class ColourPalettesPanel : public juce::Component
+{
+public:
+
+    ColourPalettesPanel(juce::Array<LumatoneEditorColourPalette> palettesIn, ColourSelectionGroup* colourSelectionGroup = nullptr)
+        : selectionGroup(colourSelectionGroup)
+    {
+        addMouseListener(this, true);
+        setRepaintsOnMouseActivity(true);
+
+        newPalette.reset(new ColourPaletteComponent("EmptyPalette"));
+        newPaletteBtn.reset(new juce::TextButton("NewButton", juce::translate("NewPaletteTip")));
+        newPaletteBtn->setButtonText(juce::translate("NewPalette"));
+        // newPaletteBtn->getProperties().set(LumatoneEditorStyleIDs::textButtonHyperlinkFlag, 1);
+        newPaletteBtn->onClick = [&] { listeners.call(&ColourPalettesPanel::Listener::newPaletteRequested); };
+        
+    };
+
+    ~ColourPalettesPanel()
+    {
+        for (auto palette : allPalettes)
+            selectionGroup->removeSelector(palette);
+
+        paletteLabels.clear();
+        controlGroups.clear();
+        newPaletteBtn = nullptr;
+        newPalette = nullptr;
+    }
+
+    // Used to make this component resize itself depending on how many swatches there are
+    //void setViewUnits(int widthIn, int heightIn)
+    //{
+    //    viewableWidth = widthIn;
+    //    viewableHeight = heightIn;
+
+    //    setSize(viewableWidth, getHeightFromNumRows(numRows));
+    //}
+
+    int getHeightFromNumRows(int widthIn, int numRowsIn)
+    {
+        float rowHeight = widthIn * (itemHeightScalar + topMarginScalar + bottomMarginScalar);
+        auto height = juce::roundToInt(numRowsIn * rowHeight);
+        return height;
+    }
+
+    void paint(juce::Graphics& g) override 
+    {
+        //Draws rectangles around items and margins 
+        //for (auto item : dbgItems)
+        //{
+        //    g.setColour(Colours::red);
+        //    g.drawRect(item.currentBounds);
+
+        //    g.setColour(Colours::green);
+        //    g.drawRect(item.currentBounds.getX(), item.currentBounds.getBottom(), item.width, item.margin.bottom, 1.0f);
+
+        //    g.setColour(Colours::yellow);
+        //    g.drawRect(item.currentBounds.getX() - item.margin.left - 1, item.currentBounds.getY(), item.margin.left - 1, item.currentBounds.getHeight(), 1.0f);
+        //    g.drawRect(item.currentBounds.getRight() + 1, item.currentBounds.getY(), item.margin.right - 1, item.currentBounds.getHeight(), 1.0f);
+
+        //    g.setColour(Colours::violet);
+        //    g.drawRect(item.currentBounds.getX(), item.currentBounds.getY() - item.margin.top, item.width, item.margin.top);
+        //}
+    };
+
+    void resized() override
+    {
+        juce::Rectangle<int> viewportBounds(getWidth(), viewableHeight);
+        juce::FlexBox flexBox(juce::FlexBox::Direction::row, juce::FlexBox::Wrap::wrap, juce::FlexBox::AlignContent::flexStart, juce::FlexBox::AlignItems::center, juce::FlexBox::JustifyContent::flexStart);
+
+        float itemWidth         = viewportBounds.proportionOfWidth(itemWidthScalar);
+        float itemHeight        = viewportBounds.proportionOfWidth(itemHeightScalar);
+        float topMargin         = viewportBounds.proportionOfWidth(topMarginScalar);
+        float bottomMargin      = viewportBounds.proportionOfWidth(bottomMarginScalar);
+        float horizontalMargin  = (viewportBounds.getWidth() - (3 * itemWidth)) * 0.143f;
+
+        for (auto palette : allPalettes)
+        {
+            juce::FlexItem item(itemWidth, itemHeight, *palette);
+            item.margin = juce::FlexItem::Margin(topMargin, horizontalMargin, bottomMargin, horizontalMargin);
+            flexBox.items.add(item);
+        }
+
+        flexBox.performLayout(viewportBounds);
+        
+        float bottomMarginControlHeight = juce::roundToInt(viewportBounds.proportionOfWidth(btmMarginCtrlScalar));
+        float bottomMarginControlSpace  = (bottomMargin - bottomMarginControlHeight) * 0.5f;
+
+        float labelYItemOffset = itemHeight * 0.8f;
+        for (int i = 0; i < controlGroups.size(); i++)
+        {
+            juce::FlexItem& item = flexBox.items.getReference(i + 1);
+            juce::Rectangle<float> bottomMarginBounds(item.currentBounds.getX(), item.currentBounds.getBottom(), itemWidth, bottomMargin);
+            int fourthWidthItem = bottomMarginBounds.proportionOfWidth(0.25f);
+
+            juce::Rectangle<float> labelBounds = item.currentBounds.withTrimmedTop(labelYItemOffset);
+            juce::Point<float> controlsPosition;
+            if (paletteLabels[i]->getText().isNotEmpty())
+            {
+                auto label = paletteLabels[i];
+                label->setBounds(labelBounds.toNearestInt());
+                controlsPosition = bottomMarginBounds.getPosition().translated(0, bottomMarginControlSpace);
+            }
+            else
+            {
+                controlsPosition = labelBounds.getPosition();
+            }
+
+            auto group = controlGroups.getUnchecked(i);
+            group->getEditButton()->setSize(fourthWidthItem, bottomMarginControlHeight);
+            group->getEditButton()->setTopLeftPosition(controlsPosition.roundToInt().translated(bottomMarginBounds.proportionOfWidth(0.125f), 0));
+            group->getCloneButton()->setBounds(group->getEditButton()->getBounds().translated(fourthWidthItem, 0));
+            group->getTrashButton()->setBounds(group->getEditButton()->getBounds().translated(fourthWidthItem * 2.0f, 0));
+
+            auto hitBox = juce::Rectangle<float>(item.currentBounds.getTopLeft().translated(-horizontalMargin, -topMargin), bottomMarginBounds.getBottomRight()).toNearestInt();
+            controlGroupHitBoxes.set(i, hitBox);
+        }
+
+        dbgItems = flexBox.items;
+
+        newPaletteBtn->setSize(itemWidth, bottomMarginControlHeight);
+        newPaletteBtn->setTopLeftPosition(newPalette->getX(), newPalette->getY() + labelYItemOffset);
+        newPaletteBtn->toFront(false);
+
+        needsResize = false;
+    }
+
+    void mouseMove(const juce::MouseEvent& mouse) override
+    {
+        int newIndex = -1;
+        if (mouse.eventComponent->getProperties().contains("index"))
+        {
+            newIndex = mouse.eventComponent->getProperties()["index"];
+        }
+        else
+        {
+            for (int i = 0; i < controlGroups.size(); i++)
+            {
+                if (controlGroupHitBoxes[i].contains(mouse.getEventRelativeTo(this).position.roundToInt()))
+                {
+                    newIndex = i;
+                    break;
+                }
+            }
+        }
+
+        if (newIndex != lastPaletteMouseOver && lastPaletteMouseOver >= 0 && lastPaletteMouseOver < controlGroups.size())
+            setControlsVisibleForPalette(lastPaletteMouseOver, false);
+
+        if (newIndex >= 0 && newIndex < controlGroups.size())
+        {
+            setControlsVisibleForPalette(newIndex, true);
+            lastPaletteMouseOver = newIndex;
+        }
+    }
+
+    // Setup panels from scratch
+    void rebuildPanel(juce::Array<LumatoneEditorColourPalette> palettesIn, int width = 0, bool resize = true)
+    {
+        for (auto group : controlGroups)
+            selectionGroup->removeSelector(group->getPaletteComponent());
+
+        removeAllChildren();
+        addAndMakeVisible(newPaletteBtn.get());
+        addAndMakeVisible(newPalette.get());
+
+        controlGroups.clear();
+        paletteLabels.clear();
+        
+        allPalettes = juce::Array<ColourPaletteComponent*>(newPalette.get());
+
+        // Palettes with colour
+        for (int i = 0; i < palettesIn.size(); i++)
+        {
+            auto group = controlGroups.add(new PaletteControlGroup(palettesIn.getReference(i)));
+
+            auto paletteComponent = group->getPaletteComponent();
+            paletteComponent->getProperties().set("index", i);
+            addAndMakeVisible(paletteComponent);
+
+            allPalettes.add(paletteComponent);
+
+            if (selectionGroup)
+                selectionGroup->addSelector(paletteComponent);
+
+            group->getEditButton()->getProperties().set("index", i);
+            group->getEditButton()->onClick = [&, i, paletteComponent] { listeners.call(&ColourPalettesPanel::Listener::editPaletteRequested, i, paletteComponent->getSelectedSwatchNumber()); };
+            addChildComponent(group->getEditButton());
+
+            group->getCloneButton()->getProperties().set("index", i);
+            group->getCloneButton()->onClick = [&, i, paletteComponent] { listeners.call(&ColourPalettesPanel::Listener::clonePaletteRequested, i); };
+            addChildComponent(group->getCloneButton());
+
+            group->getTrashButton()->getProperties().set("index", i);
+            group->getTrashButton()->onClick = [&, group, i] { listeners.call(&ColourPalettesPanel::Listener::deletePaletteRequested, i); };
+            addChildComponent(group->getTrashButton());
+
+            juce::String name = palettesIn[i].getName();
+            auto label = paletteLabels.add(new juce::Label("Label_" + name, name));
+            label->setJustificationType(juce::Justification::centred);
+            label->getProperties().set("index", i);
+            // label->getProperties().set(LumatoneEditorStyleIDs::labelMaximumLineCount, 2);
+            addAndMakeVisible(*label);
+
+            controlGroupHitBoxes.set(i, juce::Rectangle<int>());
+        }
+
+        int rows = ceil((palettesIn.size() + 1) * 0.333333f);
+
+        int w = getWidth();
+
+        // Set height depending on how many rows
+        width = (width < 1) ? w : width;
+        viewableHeight = getHeightFromNumRows(width, rows);
+
+        if (resize)
+        {
+            needsResize = true;
+            setSize(width, viewableHeight);
+
+            // Force resize
+            if (needsResize)
+                resized();
+        }
+
+        numRows = rows;
+
+    }
+
+private:
+
+    void setControlsVisibleForPalette(int paletteIndex, bool areVisible)
+    {
+        auto group = controlGroups.getUnchecked(paletteIndex);
+        group->getEditButton()->setVisible(areVisible);
+        group->getCloneButton()->setVisible(areVisible);
+        group->getTrashButton()->setVisible(areVisible);
+    }
+
+private:
+
+    ColourSelectionGroup* selectionGroup;
+
+    std::unique_ptr<ColourPaletteComponent> newPalette;
+    std::unique_ptr<juce::TextButton> newPaletteBtn;
+    juce::OwnedArray<PaletteControlGroup> controlGroups;
+    juce::Array<ColourPaletteComponent*> allPalettes;
+    juce::OwnedArray<juce::Label> paletteLabels;
+
+    juce::Array<juce::FlexItem> dbgItems;
+
+    int numRows = 1;
+    int viewableHeight = 0;
+    bool needsResize = false;
+
+    juce::Array<juce::Rectangle<int>> controlGroupHitBoxes;
+    int lastPaletteMouseOver = -1;
+
+    const float itemWidthScalar         = 0.265f;
+    const float itemHeightScalar        = 0.24f;
+
+    const float topMarginScalar         = 0.04f;
+    const float horizontalMarginScalar  = 0.0367f;
+    const float bottomMarginScalar      = 0.06f;
+    const float btmMarginCtrlScalar     = 0.04f;
+
+    const float buttonWidthScalar       = 0.333333f;
+    const float buttonHeightScalar      = 0.166667f;
+
+    const float panelLeftMarginWidth    = 0.020833f;
+
+    //==============================================================================
+
+public:
+
+    class Listener
+    {
+    public:
+        virtual ~Listener() {}
+
+        virtual void editPaletteRequested(int paletteIndex, int selectedSwatchIndex) = 0;
+        virtual void clonePaletteRequested(int paletteIndex) = 0;
+        virtual void deletePaletteRequested(int paletteIndex) = 0;
+        virtual void newPaletteRequested() = 0;
+    };
+
+    void addListener(Listener* listenerIn) { listeners.add(listenerIn); }
+    void removeListener(Listener* listenerIn) { listeners.remove(listenerIn); }
+
+protected:
+
+    juce::ListenerList<ColourPalettesPanel::Listener> listeners;
+};
+
+#endif // LUMATONE_PALETTE_SELECTION_PANEL_H
diff --git a/Source/PolygonPalette.h b/Source/lumatone_editor_library/palettes/polygon_palette.h
similarity index 70%
rename from Source/PolygonPalette.h
rename to Source/lumatone_editor_library/palettes/polygon_palette.h
index f38563f3..78fb52f8 100644
--- a/Source/PolygonPalette.h
+++ b/Source/lumatone_editor_library/palettes/polygon_palette.h
@@ -1,7 +1,7 @@
 /*
   ==============================================================================
 
-    PolygonPalette.h
+    polygon_palette.h
     Created: 13 Nov 2020 7:24:40pm
     Author:  Vincenzo
 
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "Palette.h"
+#include "palette_base.h"
 
 
 //==============================================================================
@@ -19,7 +19,7 @@
 class PolygonPalette  : public Palette
 {
 public:
-    PolygonPalette(int numSidesIn = 6, float angleOffsetIn = MathConstants<float>::pi / 12.0f)
+    PolygonPalette(int numSidesIn = 6, float angleOffsetIn = juce::MathConstants<float>::pi / 12.0f)
         : Palette(numSidesIn), angleOffset(angleOffsetIn)
     {
         createSwatches();
@@ -29,11 +29,11 @@ class PolygonPalette  : public Palette
     {
     }
 
-    void paint(Graphics& g) override
+    void paint(juce::Graphics& g) override
     {
         for (int i = 0; i < getNumberOfSwatches(); i++)
         {
-            Path& swatch = swatchPaths.getReference(i);
+            juce::Path& swatch = swatchPaths.getReference(i);
 
             g.setColour(getSwatchColour(i));
             g.fillPath(swatch);
@@ -46,27 +46,27 @@ class PolygonPalette  : public Palette
 
         if (selectedSwatch >= 0)
         {
-            g.setColour(Colours::white);
-            g.strokePath(swatchPaths[selectedSwatch], PathStrokeType(2.0f));
+            g.setColour(juce::Colours::white);
+            g.strokePath(swatchPaths[selectedSwatch], juce::PathStrokeType(2.0f));
         }
     }
 
     void resized() override
     {
         // Original bounds
-        Rectangle<float> originalBounds = { 0.0f, 0.0f, 1.0f, 1.0f };
+        juce::Rectangle<float> originalBounds = { 0.0f, 0.0f, 1.0f, 1.0f };
         
-        float size = jmin(getWidth(), getHeight());
+        float size = juce::jmin(getWidth(), getHeight());
 
         // Crop to square
-        Rectangle<float> scaled = { 0, 0, size, size };
+        juce::Rectangle<float> scaled = { 0, 0, size, size };
 
         // Get scaling and centering transform
-        AffineTransform transform = RectanglePlacement().getTransformToFit(originalBounds, scaled.withCentre({ (float)getLocalBounds().getCentreX(), size * 0.5f }));
+        juce::AffineTransform transform = juce::RectanglePlacement().getTransformToFit(originalBounds, scaled.withCentre({ (float)getLocalBounds().getCentreX(), size * 0.5f }));
 
         for (int i = 0; i < getNumberOfSwatches(); i++)
         {
-            Path p = triangles[i];
+            juce::Path p = triangles[i];
             p.applyTransform(transform);
             swatchPaths.set(i, p);
         }
@@ -76,28 +76,28 @@ class PolygonPalette  : public Palette
 
     void createSwatches()
     {
-        float angInc = 2 * MathConstants<float>::pi / getNumberOfSwatches();
+        float angInc = 2 * juce::MathConstants<float>::pi / getNumberOfSwatches();
         float angMargin = angInc * margin * 0.5f;
 
         for (int i = 0; i < getNumberOfSwatches(); i++)
         {
-            Path swatchPath;
+            juce::Path swatchPath;
             
             float angFrom  =  angInc *  i      + angleOffset + angMargin;
             float angTo    =  angInc * (i + 1) + angleOffset - angMargin;
             float bisector = (angFrom + angTo) * 0.5f;
 
-            Point<float> pointFrom = {
+            juce::Point<float> pointFrom = {
                 center.x + cosf(angFrom)  * outerRadius + cosf(angFrom) * innerRadius,
                 center.y + sinf(angFrom)  * outerRadius + sinf(angFrom) * innerRadius
             };
 
-            Point<float> pointTo = {
+            juce::Point<float> pointTo = {
                 center.x + cosf(angTo)    * outerRadius + cosf(angTo)   * innerRadius,
                 center.y + sinf(angTo)    * outerRadius + sinf(angTo)   * innerRadius
             };
             
-            Point<float> pointCenter = {
+            juce::Point<float> pointCenter = {
                 center.x + cosf(bisector) * innerRadius,
                 center.y + sinf(bisector) * innerRadius
             };
@@ -116,7 +116,7 @@ class PolygonPalette  : public Palette
 
     const float angleOffset;
 
-    const Point<float> center = { 0.5f, 0.5f };
+    const juce::Point<float> center = { 0.5f, 0.5f };
 
     const float margin = 0.025f;
     const float radiusBounds = 0.5f;
@@ -126,7 +126,7 @@ class PolygonPalette  : public Palette
 
     float width = 1, height = 1;
 
-    Array<Path> triangles;
+    juce::Array<juce::Path> triangles;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PolygonPalette)
 };
diff --git a/Source/lumatone_editor_library/ui/key_component.cpp b/Source/lumatone_editor_library/ui/key_component.cpp
new file mode 100644
index 00000000..7bc40e61
--- /dev/null
+++ b/Source/lumatone_editor_library/ui/key_component.cpp
@@ -0,0 +1,301 @@
+    /*
+  ==============================================================================
+
+    key_component.cpp
+    Created: 26 Jul 2023 11:51:13pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#include "key_component.h"
+
+//==============================================================================
+
+LumatoneKeyDisplay::LumatoneKeyDisplay(int newBoardIndex, int newKeyIndex, const LumatoneKey& keyDataIn)
+    : LumatoneKeyContext(keyDataIn, newBoardIndex, newKeyIndex)
+    , Component("LumatoneKeyDisplay_" + LumatoneKeyCoord::toString(newBoardIndex, newKeyIndex))
+{
+    renderMode = LumatoneComponentRenderMode::GraphicInteractive;
+    clearUiState();
+}
+
+LumatoneKeyDisplay::~LumatoneKeyDisplay()
+{
+}
+
+void LumatoneKeyDisplay::setRenderMode(LumatoneComponentRenderMode modeIn)
+{
+    renderMode = modeIn;
+}
+
+void LumatoneKeyDisplay::paint(juce::Graphics& g)
+{
+    juce::Colour hexagonColour = getColour();
+    // juce::Colour hexagonColour = findColour(LumatoneKeyEdit::backgroundColourId).overlaidWith(getKeyColour());
+    // if (hexagonColour.getPerceivedBrightness() >= 0.6f)
+    //    hexagonColour = hexagonColour.darker((1.0f - hexagonColour.getPerceivedBrightness()));
+
+    // set color
+    juce::Colour drawColour = hexagonColour;
+
+    switch (renderMode)
+    {
+    default:
+        break;
+
+    case LumatoneComponentRenderMode::ShapeInteractive:
+    case LumatoneComponentRenderMode::GraphicInteractive:
+    case LumatoneComponentRenderMode::MaxRes:
+        if(isSelected)
+        {
+            drawColour = drawColour.overlaidWith(juce::Colours::slateblue.withAlpha(0.2f));
+        }
+        if (isNoteOn || isClicked)
+        {
+            drawColour = hexagonColour.contrasting(0.5f);
+        }
+        else if (mouseIsOver)
+        {
+            drawColour = drawColour.contrasting(0.25f);
+        }
+        break;
+    }
+
+    // draw
+    switch (renderMode)
+    {
+    case LumatoneComponentRenderMode::Shape:
+    case LumatoneComponentRenderMode::ShapeInteractive:
+        break; // TODO
+
+    default:
+    case LumatoneComponentRenderMode::Graphic:
+    case LumatoneComponentRenderMode::GraphicInteractive:
+    {
+        g.setColour(drawColour);
+
+        if (colourGraphic.isValid())
+        {
+            g.drawImageAt(colourGraphic, 0, 0, true);
+        }
+
+        if (shadowGraphic.isValid())
+        {
+            g.drawImageAt(shadowGraphic, 0, 0);
+        }
+        break;
+    }
+
+    case LumatoneComponentRenderMode::MaxRes:
+    {
+        if (drawColour != hexagonColour && shadowGraphic.isValid())
+        {
+            g.setColour(drawColour.overlaidWith(juce::Colours::black.withAlpha(0.88f)));
+            g.drawImageAt(shadowGraphic, 0, 0, true);
+        }
+        break;
+    }
+    }
+}
+
+void LumatoneKeyDisplay::resized()
+{
+}
+
+void LumatoneKeyDisplay::parentHierarchyChanged()
+{
+    //if (getParentComponent())
+    //{
+    //    removeMouseListener(this);
+    //}
+    //else
+    //{
+    //    addMouseListener(this, true);
+    //}
+}
+
+void LumatoneKeyDisplay::mouseEnter(const juce::MouseEvent& e)
+{
+    mouseIsOver = true;
+    repaintIfInteractive();
+}
+
+void LumatoneKeyDisplay::mouseExit(const juce::MouseEvent& e)
+{
+    mouseIsOver = false;
+    repaintIfInteractive();
+}
+
+void LumatoneKeyDisplay::mouseDown(const juce::MouseEvent& e)
+{
+    //DBG("KEY MOUSE DOWN");
+
+    mouseIsOver = true;
+
+    if (e.mods.isRightButtonDown())
+    {
+        // Right mouse click: popup menu
+        //juce::PopupMenu menu;
+        //TerpstraSysExApplication::getApp().getMainMenu()->createEditMenu(menu);
+        //menu.showMenuAsync(PopupMenu::Options());
+    }
+
+    // TODO integrate interaction through LumatoneController
+
+    //else
+    //{
+    //    // NoteOn MIDI message
+    //    auto keyData = getKeyData();
+    //    if (keyData != nullptr && keyData->channelNumber > 0)
+    //    {
+    //        if (keyData->keyType == LumatoneKeyType::velocityInterval)
+    //        {
+    //            // Send "note on" event
+    //            //TerpstraSysExApplication::getApp().getMidiDriver().sendNoteOnMessage(keyData->noteNumber, keyData->channelNumber, 60);
+    //        }
+    //        // ToDo if keyType is "continuous controller": send controller event?
+    //    }
+    //}
+}
+
+void LumatoneKeyDisplay::mouseUp(const juce::MouseEvent& e)
+{
+    //DBG("KEY MOUSE UP");
+    if (!isMouseOver() && mouseIsOver)
+    {
+        mouseIsOver = false;
+    }
+
+    repaintIfInteractive();
+}
+
+//void LumatoneKeyDisplay::handleMidiMessage(const juce::MidiMessage& msg)
+//{
+//    auto keyData = getKeyData();
+//    if (keyData != nullptr && msg.getChannel() == keyData->channelNumber && msg.getNoteNumber() == keyData->noteNumber)
+//    {
+//        isMouseOver = msg.isNoteOn();
+//        repaint();
+//    }
+//}
+
+void LumatoneKeyDisplay::mouseMove(const juce::MouseEvent& e)
+{
+    if (!mouseIsOver)
+    {
+        mouseIsOver = true;
+        repaintIfInteractive();
+    }
+}
+
+void LumatoneKeyDisplay::mouseDrag(const juce::MouseEvent& e)
+{
+    //DBG("KEY DRAG on " + getCoord().toString() + ": " + e.getPosition().toString
+    //mouseDragInternal(e);
+}
+
+void LumatoneKeyDisplay::startDrag()
+{
+    if (!isClicked)
+    {
+        isClicked = true;
+        noteOn();
+    }
+}
+
+void LumatoneKeyDisplay::endDrag()
+{
+    if (isClicked)
+    {
+        isClicked = false;
+
+        if (noteOffMode != NoteOffModifier::Sustain)
+        {
+            noteOff();
+        }
+
+    }
+}
+
+// const LumatoneKey* LumatoneKeyDisplay::getKeyData() const
+// {
+//     return &keyData;
+// }
+
+// juce::Colour LumatoneKeyDisplay::getKeyColour() const
+// {
+
+// }
+
+void LumatoneKeyDisplay::setLumatoneKey(const LumatoneKey& lumatoneKey, int boardIdx, int keyIdx)
+{
+    auto thisKey = static_cast<LumatoneKey*>(this);
+    *thisKey = lumatoneKey;
+
+    boardIndex = boardIdx;
+    keyIndex = keyIdx;
+    // repaint();
+}
+
+void LumatoneKeyDisplay::setDisplayColour(const juce::Colour& colourIn)
+{
+    LumatoneKey::setColour(colourIn);
+    // redrawRender();
+}
+
+void LumatoneKeyDisplay::setKeyGraphics(juce::Image& colourGraphicIn, juce::Image& shadowGraphicIn)
+{
+    colourGraphic = colourGraphicIn;
+    shadowGraphic = shadowGraphicIn;
+}
+
+void LumatoneKeyDisplay::setSelected(bool selected)
+{
+    isSelected = selected;
+    repaintIfInteractive();
+}
+
+void LumatoneKeyDisplay::clearUiState()
+{
+    isSelected = false;
+    mouseIsOver = false; // mouseMove doesn't fix this atm
+    isNoteOn = false;
+    isClicked = false;
+    repaintIfInteractive();
+}
+
+void LumatoneKeyDisplay::repaintIfInteractive()
+{
+    switch (renderMode)
+    {
+    default:
+        break;
+    case LumatoneComponentRenderMode::ShapeInteractive:
+    case LumatoneComponentRenderMode::GraphicInteractive:
+    case LumatoneComponentRenderMode::MaxRes:
+        if (mouseIsOver != isMouseOver())
+        {
+            mouseIsOver = isMouseOver();
+        }
+
+        repaint();
+        break;
+    }
+}
+
+void LumatoneKeyDisplay::noteOn()
+{
+    isNoteOn = true;
+    isClicked = true;
+
+    repaintIfInteractive();
+}
+
+void LumatoneKeyDisplay::noteOff()
+{
+    isNoteOn = false;
+    isClicked = false;
+
+    repaintIfInteractive();
+}
diff --git a/Source/lumatone_editor_library/ui/key_component.h b/Source/lumatone_editor_library/ui/key_component.h
new file mode 100644
index 00000000..08040147
--- /dev/null
+++ b/Source/lumatone_editor_library/ui/key_component.h
@@ -0,0 +1,111 @@
+/*
+  ==============================================================================
+
+    key_component.h
+    Created: 26 Jul 2023 11:51:13pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#ifndef LUMATONE_KEY_COMPONENT_H
+#define LUMATONE_KEY_COMPONENT_H
+
+#include <JuceHeader.h>
+#include "../data/lumatone_context.h"
+#include "../graphics/resampler/image_resampler.h"
+#include "../mapping/lumatone_tiling.h"
+
+enum class LumatoneComponentRenderMode
+{
+    NoDisplay = -1,
+
+    Shape = 0x000010,
+    ShapeInteractive = 0x000011,
+
+    Graphic = 0x000020,
+    GraphicInteractive = 0x000021,
+
+    MaxRes = 0x000030,
+};
+
+// Representation of a key inside the overview
+class LumatoneKeyDisplay : public LumatoneKeyContext, 
+                           public juce::Component
+{
+public:
+    enum class NoteOffModifier
+    {
+        None = 0,
+        Sustain,
+        Legato
+    };
+
+public:
+    LumatoneKeyDisplay(int newBoardIndex, int newKeyIndex, const LumatoneKey& keyData=LumatoneKey());
+    ~LumatoneKeyDisplay();
+
+    LumatoneComponentRenderMode getRenderMode() const { return renderMode; }
+    void setRenderMode(LumatoneComponentRenderMode uiModeIn);
+
+    void paint(juce::Graphics&) override;
+    void resized() override;
+
+    void setKeyGraphics(juce::Image& colourGraphicIn, juce::Image& shadowGraphicIn);
+
+    void setLumatoneKey(const LumatoneKey& lumatoneKey, int boardIdx, int keyIdx);
+
+    void setDisplayColour(const juce::Colour& colour);
+
+    // const LumatoneKey* getKeyData() const;
+    // juce::Colour getKeyColour() const;
+
+    int getBoardIndex() const { return boardIndex; }
+    int getKeyIndex() const { return keyIndex; }
+    LumatoneKeyCoord getCoord() const { return LumatoneKeyCoord(boardIndex, keyIndex); }
+
+    void setSelected(bool selected);
+
+    bool selected() const { return isSelected; }
+    bool clicked() const { return isClicked; }
+    bool mouseOver() const { return mouseIsOver; }
+
+    void startDrag();
+    void endDrag();
+    void clearUiState();
+
+    void noteOn();
+    void noteOff();
+
+private:
+
+    void repaintIfInteractive();
+
+public:
+
+    void parentHierarchyChanged() override;
+
+    void mouseEnter(const juce::MouseEvent& e) override;
+    void mouseExit(const juce::MouseEvent& e) override;
+    void mouseMove(const juce::MouseEvent& e) override;
+    
+    void mouseDown(const juce::MouseEvent& e) override;
+    void mouseUp(const juce::MouseEvent& e) override;
+    void mouseDrag(const juce::MouseEvent& e) override;
+
+private:
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(LumatoneKeyDisplay)
+
+    LumatoneComponentRenderMode renderMode;
+    LumatoneKeyDisplay::NoteOffModifier noteOffMode;
+
+    bool mouseIsOver = false;
+    bool isSelected = false;
+    bool isClicked = false;
+    bool isNoteOn = false;
+
+    juce::Image colourGraphic;
+    juce::Image shadowGraphic;
+};
+
+#endif LUMATONE_KEY_COMPONENT_H
diff --git a/Source/lumatone_editor_library/ui/keyboard_component.cpp b/Source/lumatone_editor_library/ui/keyboard_component.cpp
new file mode 100644
index 00000000..c8b92c06
--- /dev/null
+++ b/Source/lumatone_editor_library/ui/keyboard_component.cpp
@@ -0,0 +1,729 @@
+/*
+  ==============================================================================
+
+    keyboard_component.cpp
+    Created: 24 Jul 2023 9:52:28pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#include "keyboard_component.h"
+
+#include "../color/colour_model.h"
+#include "../device/lumatone_controller.h"
+
+LumatoneKeyboardComponent::LumatoneKeyboardComponent(const LumatoneApplicationState& stateIn)
+    : LumatoneApplicationState("LumatoneKeyboardComponent", stateIn)
+    , lumatoneRender(stateIn)
+{
+    renderMode = LumatoneComponentRenderMode::GraphicInteractive;
+    resetOctaveSize(false);
+    completeMappingLoaded(*getMappingData());
+
+    addMouseListener(this, this);
+    addKeyListener(this);
+    setWantsKeyboardFocus(true);
+
+    addEditorListener(this);
+    addMidiListener(this);
+}
+
+LumatoneKeyboardComponent::~LumatoneKeyboardComponent()
+{
+    removeMidiListener(this);
+    removeEditorListener(this);
+}
+
+void LumatoneKeyboardComponent::paint (juce::Graphics& g)
+{
+    switch (renderMode)
+    {
+    case LumatoneComponentRenderMode::Graphic:
+    case LumatoneComponentRenderMode::GraphicInteractive:
+        g.drawImageAt(lumatoneGraphic, lumatoneBounds.getX(), lumatoneBounds.getY());
+        break;
+
+    case LumatoneComponentRenderMode::MaxRes:
+        g.drawImageAt(currentRender, lumatoneBounds.getX(), lumatoneBounds.getY());
+        break;
+    }
+
+    // Draw a line under the selected sub board
+    // if (currentSetSelection >= 0 && currentSetSelection < state.getNumBoards())
+    // {
+    //     juce::Path selectionMarkPath;
+    //     selectionMarkPath.startNewSubPath(octaveBoards[currentSetSelection]->leftPos, octaveLineY);
+    //     selectionMarkPath.lineTo(octaveBoards[currentSetSelection]->rightPos, octaveLineY);
+
+    //     juce::Colour lineColour = juce::Colours::white;// findColour(LumatoneKeyEdit::outlineColourId);
+    //     g.setColour(lineColour);
+    //     g.strokePath(selectionMarkPath, juce::PathStrokeType(1.0f));
+    // }
+}
+
+void LumatoneKeyboardComponent::resized()
+{
+    currentWidth = getWidth();
+    currentHeight = juce::roundToInt((float)getWidth() / imageAspect);
+
+    if (currentHeight > getHeight())
+    {
+        currentHeight = getHeight();
+        currentWidth = juce::roundToInt((float)currentHeight * imageAspect);
+    }
+
+    // Prepare position helpers for graphics
+    lumatoneBounds.setBounds(juce::roundToInt((getWidth() - currentWidth) * 0.5f),
+                             juce::roundToInt((getHeight() - currentHeight) * 0.5f),
+                             currentWidth,
+                             currentHeight);
+
+    octaveLineY = lumatoneBounds.getBottom() + juce::roundToInt(getHeight() * octaveLineYRatio);
+
+    // int btnHeight = juce::roundToInt(getHeight() * saveLoadH);
+    //resizeLabelWithHeight(lblFirmwareVersion.get(), btnHeight * 0.6f);
+    // lblFirmwareVersion->setTopLeftPosition(lumatoneBounds.getX(), lumatoneBounds.getY() - btnHeight * 0.6f);
+
+    keyWidth = juce::roundToInt(lumatoneBounds.getWidth() * keyW);
+    keyHeight = juce::roundToInt(lumatoneBounds.getHeight() * keyH);
+
+    switch (renderMode)
+    {
+        case LumatoneComponentRenderMode::Graphic:
+        case LumatoneComponentRenderMode::GraphicInteractive:
+            lumatoneGraphic = lumatoneRender.getResizedAsset(LumatoneAssets::ID::LumatoneGraphic, lumatoneBounds.getWidth(), lumatoneBounds.getHeight());
+            keyShapeGraphic = lumatoneRender.getResizedAsset(LumatoneAssets::ID::KeyShape, keyWidth, keyHeight);
+            break;
+        case LumatoneComponentRenderMode::MaxRes:
+            currentRender = lumatoneRender.getResizedRender(lumatoneBounds.getWidth(), lumatoneBounds.getHeight());
+            break;
+    }
+
+    keyShadowGraphic = lumatoneRender.getResizedAsset(LumatoneAssets::ID::KeyShadow, keyWidth, keyHeight, true);
+
+    int octaveIndex = 0;
+    int octaveX = keyCentres[0].getX() * lumatoneBounds.getWidth() + lumatoneBounds.getX();
+    octaveBoards[octaveIndex]->leftPos = octaveX - keyWidth * 0.5;
+
+    const int octaveBoardSize = getOctaveBoardSize();
+
+    for (int keyIndex = 0; keyIndex < keyCentres.size(); keyIndex++)
+    {
+        int keyOctaveIndex = keyIndex % octaveBoardSize;
+
+        juce::Point<int> keyPos = juce::Point<int>(
+            juce::roundToInt(keyCentres[keyIndex].x * lumatoneBounds.getWidth() + lumatoneBounds.getX() - keyWidth * 0.5f),
+            juce::roundToInt(keyCentres[keyIndex].y * lumatoneBounds.getHeight() + lumatoneBounds.getY() - keyHeight * 0.5f)
+        );
+
+        auto key = octaveBoards[octaveIndex]->keyMiniDisplay[keyOctaveIndex];
+        key->setKeyGraphics(keyShapeGraphic, keyShadowGraphic);
+        key->setBounds(keyPos.x, keyPos.y, keyWidth, keyHeight);
+
+        if (keyOctaveIndex + 1 == octaveBoardSize)
+        {
+            octaveBoards[octaveIndex]->rightPos = key->getRight();
+            octaveIndex++;
+
+            if (octaveIndex < getNumBoards())
+                octaveBoards[octaveIndex]->leftPos = key->getX();
+        }
+    }
+}
+
+void LumatoneKeyboardComponent::resetOctaveSize(bool resetState)
+{
+    const int octaveBoardSize = getOctaveBoardSize();
+    if (currentOctaveSize != octaveBoardSize)
+    {
+        octaveBoards.clear();
+
+        for (int subBoardIndex = 0; subBoardIndex < getNumBoards(); subBoardIndex++)
+        {
+            OctaveBoard* board = octaveBoards.add(new OctaveBoard());
+
+            for (int keyIndex = 0; keyIndex < octaveBoardSize; keyIndex++)
+            {
+                const LumatoneKey& keyData = getKey(subBoardIndex, keyIndex);
+                auto key = board->keyMiniDisplay.add(new LumatoneKeyDisplay(subBoardIndex, keyIndex, keyData));
+                key->setRenderMode(renderMode);
+                addAndMakeVisible(key);
+            }
+        }
+
+        currentOctaveSize = octaveBoardSize;
+    }
+
+    lumatoneRender.resetOctaveSize();
+    keyCentres = lumatoneRender.getKeyCentres();
+
+    if (resetState)
+        resetLayoutState();
+}
+
+void LumatoneKeyboardComponent::setRenderMode(LumatoneComponentRenderMode modeIn)
+{
+    renderMode = modeIn;
+    for (int boardIndex = 0; boardIndex < octaveBoards.size(); boardIndex++)
+    {
+        auto board = octaveBoards[boardIndex];
+
+        for (int keyIndex = 0; keyIndex < board->keyMiniDisplay.size(); keyIndex++)
+        {
+            auto key = board->keyMiniDisplay[keyIndex];
+            key->setRenderMode(renderMode);
+        }
+    }
+
+    mappingUpdateCallback();
+}
+
+void LumatoneKeyboardComponent::setUiMode(LumatoneKeyboardComponent::UiMode modeIn)
+{
+    if (uiMode == LumatoneKeyboardComponent::UiMode::Perform && uiMode != modeIn)
+    {
+        clearHeldNotes();
+    }
+
+    uiMode = modeIn;
+}
+
+void LumatoneKeyboardComponent::completeMappingLoaded(LumatoneLayout mappingData)
+{
+    for (int boardIndex = 0; boardIndex < octaveBoards.size(); boardIndex++)
+    {
+        auto board = octaveBoards[boardIndex];
+
+        for (int keyIndex = 0; keyIndex < board->keyMiniDisplay.size(); keyIndex++)
+        {
+            const LumatoneKey& keyData = mappingData.getKey(boardIndex, keyIndex);
+            keyUpdateCallback(boardIndex, keyIndex, keyData, false);
+
+        }
+    }
+
+    resetLayoutState(&mappingData);
+}
+
+void LumatoneKeyboardComponent::boardChanged(LumatoneBoard boardData)
+{
+    auto board = octaveBoards[boardData.getBoardIndex()];
+
+    for (int keyIndex = 0; keyIndex < getOctaveBoardSize(); keyIndex++)
+    {
+        auto key = board->keyMiniDisplay[keyIndex];
+
+        const LumatoneKey& keyData = boardData.getKey(keyIndex);
+        keyUpdateCallback(boardData.getBoardIndex(), keyIndex, keyData, false);
+    }
+
+    resetLayoutState();
+}
+
+void LumatoneKeyboardComponent::contextChanged(LumatoneContext *newOrEmptyContext)
+{
+    // LumatoneLayout layout = (newOrEmptyContext == nullptr)
+    //     ? *getMappingData()
+    //     : *newOrEmptyContext;
+
+    // completeMappingLoaded(layout);
+}
+
+void LumatoneKeyboardComponent::keyChanged(int boardIndex, int keyIndex, LumatoneKey lumatoneKey)
+{
+    keyUpdateCallback(boardIndex, keyIndex, lumatoneKey);
+}
+
+void LumatoneKeyboardComponent::keyConfigChanged(int boardIndex, int keyIndex, LumatoneKey keyData)
+{
+    keyUpdateCallback(boardIndex, keyIndex, keyData);
+}
+
+void LumatoneKeyboardComponent::keyColourChanged(int boardIndex, int keyIndex, juce::Colour keyColour)
+{
+    keyUpdateCallback(boardIndex, keyIndex, getKey(boardIndex, keyIndex));
+}
+
+void LumatoneKeyboardComponent::selectionChanged(juce::Array<MappedLumatoneKey> selection)
+{
+    auto paintKey = renderMode != LumatoneComponentRenderMode::MaxRes;
+    for (auto mappedKey : selection)
+    {
+        keyUpdateCallback(mappedKey.boardIndex, mappedKey.keyIndex, mappedKey, paintKey);
+    }
+
+    if (renderMode == LumatoneComponentRenderMode::MaxRes)
+        rerender();
+}
+
+void LumatoneKeyboardComponent::keyUpdateCallback(int boardIndex, int keyIndex, const LumatoneKey& newKey, bool doRepaint)
+{
+    auto key = octaveBoards[boardIndex]->keyMiniDisplay[keyIndex];
+
+    key->setLumatoneKey(newKey, boardIndex, keyIndex);
+    updateKeyColour(boardIndex, keyIndex, newKey.getColour());
+
+    if (!doRepaint)
+        return;
+
+    if (!key->configIsEqual(newKey))
+    {
+        resetLayoutState();
+    }
+    else if (!key->isColour(newKey.getColour()))
+    {
+        if (renderMode == LumatoneComponentRenderMode::MaxRes)
+            rerender();
+        else
+        {
+            key->repaint();
+        }
+    }
+    else
+        key->repaint(); //kludge
+}
+
+void LumatoneKeyboardComponent::mappingUpdateCallback()
+{
+    if (renderMode == LumatoneComponentRenderMode::MaxRes)
+        lumatoneRender.render();
+
+    if (currentWidth == 0 || currentHeight == 0)
+        return;
+
+    resized();
+    repaint(lumatoneBounds);
+}
+
+void LumatoneKeyboardComponent::rerender()
+{
+    lumatoneRender.render();
+    currentRender = lumatoneRender.getResizedRender(lumatoneBounds.getWidth(), lumatoneBounds.getHeight());
+    repaint(lumatoneBounds);
+}
+
+void LumatoneKeyboardComponent::updateKeyColour(int boardIndex, int keyIndex, const juce::Colour& colour)
+{
+    auto modelColour = getColourModel()->getModelColour(colour);
+    auto key = octaveBoards[boardIndex]->keyMiniDisplay[keyIndex];
+    key->setDisplayColour(modelColour);
+}
+
+void LumatoneKeyboardComponent::resetLayoutState(const LumatoneLayout* optionalLayout)
+{
+    const LumatoneLayout* layout = optionalLayout;
+    if (layout == nullptr)
+        layout = getMappingData();
+
+    lumatoneMidiMap.render(*layout);
+    LumatoneMidiState::reset();
+    mappingUpdateCallback();
+}
+
+void LumatoneKeyboardComponent::clearHeldNotes()
+{
+    for (auto key : keysOn)
+    {
+        if (key)
+        {
+            key->noteOff();
+            key->clearUiState();
+        }
+    }
+
+    keysOn.clear();
+}
+
+void LumatoneKeyboardComponent::sustainStarted()
+{
+
+}
+
+void LumatoneKeyboardComponent::sustainEnded()
+{
+    clearHeldNotes();
+}
+
+void LumatoneKeyboardComponent::lumatoneKeyDown(int boardIndex, int keyIndex)
+{
+    auto coord = LumatoneKeyCoord(boardIndex, keyIndex);
+    if (getMappingData()->isKeyCoordValid(coord))
+    {
+        juce::uint8 velocity = 0x70;
+        if (ctrlHeld)
+            velocity = 0x30;
+
+        keyDownInternal(boardIndex, keyIndex, velocity);
+    }
+}
+
+void LumatoneKeyboardComponent::lumatoneKeyUp(int boardIndex, int keyIndex)
+{
+    auto coord = LumatoneKeyCoord(boardIndex, keyIndex);
+    if (getMappingData()->isKeyCoordValid(coord))
+    {
+        keyUpInternal(boardIndex, keyIndex);
+    }
+}
+
+void LumatoneKeyboardComponent::updateKeyState(int boardIndex, int keyIndex, bool keyIsDown)
+{
+    auto keyComponent = octaveBoards[boardIndex]->keyMiniDisplay[keyIndex];
+
+    jassert(keyComponent != nullptr);
+    if (keyComponent != nullptr)
+    {
+        if (keyIsDown)
+            keyComponent->noteOn();
+        else
+            keyComponent->noteOff();
+    }
+}
+
+LumatoneKeyDisplay* LumatoneKeyboardComponent::getKeyFromMouseEvent(const juce::MouseEvent& e)
+{
+    juce::Point<float> position = e.position;
+
+    if (e.eventComponent != this)
+    {
+        position = e.getEventRelativeTo(this).position;
+    }
+
+    auto child = getComponentAt(position);
+    LumatoneKeyDisplay* key = nullptr;
+    if (child && child->getParentComponent() == this)
+        key = (LumatoneKeyDisplay*)child;
+
+    return key;
+}
+
+void LumatoneKeyboardComponent::mouseMove(const juce::MouseEvent& e)
+{
+    const int mouseIndex = e.source.getIndex();
+    auto lastOver = keysOverPerMouse[mouseIndex];
+
+    LumatoneKeyCoord keyCoord;
+    auto key = getKeyFromMouseEvent(e);
+    if (key)
+    {
+        keyCoord = key->getCoord();
+    }
+
+    // if (state.isKeyCoordValid(lastOver))
+    // {
+    //     auto lastOverForMouse = octaveBoards[lastOver.boardIndex]->keyMiniDisplay[lastOver.keyIndex];
+    // }
+
+
+    keysOverPerMouse.set(mouseIndex, keyCoord);
+}
+
+void LumatoneKeyboardComponent::mouseDown(const juce::MouseEvent& e)
+{
+    auto key = getKeyFromMouseEvent(e);
+    if (key)
+    {
+        lumatoneKeyDown(key->getBoardIndex(), key->getKeyIndex());
+        lastMouseKeyDown = key;
+
+        keysDownPerMouse.set(e.source.getIndex(), key->getCoord());
+        keysOn.addIfNotAlreadyThere(key);
+    }
+}
+
+void LumatoneKeyboardComponent::mouseUp(const juce::MouseEvent& e)
+{
+    if (e.mods.isShiftDown())
+    {
+
+    }
+    else if (lastMouseKeyDown)
+    {
+        lumatoneKeyUp(lastMouseKeyDown->getBoardIndex(), lastMouseKeyDown->getKeyIndex());
+        keysOn.removeFirstMatchingValue(lastMouseKeyDown);
+    }
+
+    keysDownPerMouse.set(e.source.getIndex(), LumatoneKeyCoord());
+}
+
+void LumatoneKeyboardComponent::mouseDrag(const juce::MouseEvent& e)
+{
+    const int mouseIndex = e.source.getIndex();
+    auto lastDownCoord = keysDownPerMouse[mouseIndex];
+
+    LumatoneKeyDisplay* mouseKeyLastDown = nullptr;
+    if (getMappingData()->isKeyCoordValid(lastDownCoord))
+        mouseKeyLastDown = octaveBoards[lastDownCoord.boardIndex]->keyMiniDisplay[lastDownCoord.keyIndex];
+
+
+    bool onNewKey = false;
+
+    auto key = getKeyFromMouseEvent(e);
+    LumatoneKeyCoord keyCoord;
+    if (key)
+    {
+        keyCoord = key->getCoord();
+    }
+
+    bool validKey = getMappingData()->isKeyCoordValid(keyCoord);
+    bool keyChanged = lastDownCoord != keyCoord;
+    onNewKey = validKey && (mouseKeyLastDown == nullptr || keyChanged);
+
+    bool setLastNoteOff = !e.mods.isShiftDown() && (onNewKey || !validKey);
+    if (mouseKeyLastDown != nullptr && setLastNoteOff)
+    {
+        keyUpInternal(mouseKeyLastDown->boardIndex, mouseKeyLastDown->keyIndex);
+    }
+
+    if (onNewKey)
+    {
+        keysDownPerMouse.set(mouseIndex, keyCoord);
+        keysOverPerMouse.set(mouseIndex, keyCoord);
+
+        juce::uint8 velocity = 0x70;
+        if (ctrlHeld)
+            velocity = 0x30;
+
+        keyDownInternal(keyCoord.boardIndex, keyCoord.keyIndex, velocity);
+
+        lastMouseKeyOver = key;
+        lastMouseKeyDown = key;
+    }
+    else if (!e.mods.isShiftDown())
+    {
+        if (validKey)
+        {
+
+        }
+        else
+        {
+            keysDownPerMouse.set(mouseIndex, LumatoneKeyCoord());
+            keysOverPerMouse.set(mouseIndex, LumatoneKeyCoord());
+        }
+    }
+}
+
+
+bool LumatoneKeyboardComponent::keyStateChanged(bool isKeyDown)
+{
+    //if (!juce::KeyPress::isKeyCurrentlyDown(juce::KeyPress::upKey) && upHeld)
+    //{
+    //    upHeld = false;
+    //    return true;
+    //}
+
+    //if (!juce::KeyPress::isKeyCurrentlyDown(juce::KeyPress::downKey) && downHeld)
+    //{
+    //    downHeld = false;
+    //    return true;
+    //}
+
+    //if (!juce::KeyPress::isKeyCurrentlyDown(juce::KeyPress::leftKey) && leftHeld)
+    //{
+    //    leftHeld = false;
+    //    return true;
+    //}
+
+    //if (!juce::KeyPress::isKeyCurrentlyDown(juce::KeyPress::rightKey) && rightHeld)
+    //{
+    //    rightHeld = false;
+    //    return true;
+    //}
+
+    //if (!juce::KeyPress::isKeyCurrentlyDown(juce::KeyPress::spaceKey) && spaceHeld)
+    //{
+    //    spaceHeld = false;
+    //    return true;
+    //}
+
+    return false;
+}
+
+bool LumatoneKeyboardComponent::keyPressed(const juce::KeyPress& key, Component* originatingComponent)
+{
+    return false;
+}
+
+void LumatoneKeyboardComponent::modifierKeysChanged(const juce::ModifierKeys& modifiers)
+{
+    //if (!rightMouseHeld && modifiers.isRightButtonDown())
+    //{
+    //    rightMouseHeld = true;
+    //}
+    //if (rightMouseHeld && !modifiers.isRightButtonDown())
+    //{
+    //    rightMouseHeld = false;
+    //}
+
+    if (!shiftHeld && modifiers.isShiftDown())
+    {
+        shiftHeld = true;
+    }
+
+    if (shiftHeld && !modifiers.isShiftDown())
+    {
+        shiftHeld = false;
+
+        clearHeldNotes();
+
+    }
+
+    //if (!altHeld && modifiers.isAltDown())
+    //{
+    //    altHeld = true;
+    //    if (uiModeSelected != UIMode::editMode)
+    //    {
+    //        isolateLastNote();
+    //        repaint();
+    //    }
+    //}
+
+    //else if (altHeld && !modifiers.isAltDown())
+    //{
+    //    altHeld = false;
+    //}
+
+    if (!ctrlHeld && modifiers.isCtrlDown())
+    {
+       ctrlHeld = true;
+    }
+
+    else if (ctrlHeld && !modifiers.isCtrlDown())
+    {
+       ctrlHeld = false;
+    }
+}
+
+void LumatoneKeyboardComponent::keyDownInternal(int boardIndex, int keyIndex, juce::uint8 velocity)
+{
+    if (uiMode == UiMode::None)
+        return;
+
+    auto key = octaveBoards[boardIndex]->keyMiniDisplay[keyIndex];
+    jassert(key != nullptr);
+
+    if (uiMode == UiMode::Controller)
+    {
+        auto keyNum = mappingData->keyCoordToKeyNum(keyIndex, boardIndex);
+        listeners.call(&Listener::handleKeyDown, keyNum);
+    }
+    else switch (key->getType())
+    {
+        case LumatoneKeyType::noteOnNoteOff:
+            //controller->sendKeyNoteOn(boardIndex, keyIndex, velocity);
+            noteOn(key->getMidiChannel(), key->getMidiNumber(), velocity);
+            break;
+        default:
+            break;
+    }
+
+    updateKeyState(boardIndex, keyIndex, true);
+    keysOn.addIfNotAlreadyThere(key);
+};
+
+void LumatoneKeyboardComponent::keyUpInternal(int boardIndex, int keyIndex)
+{
+    if (uiMode == UiMode::None)
+        return;
+
+    auto key = octaveBoards[boardIndex]->keyMiniDisplay[keyIndex];
+    jassert(key != nullptr);
+
+    if (uiMode == UiMode::Controller)
+    {
+        listeners.call(&Listener::handleKeyUp, mappingData->keyCoordToKeyNum(boardIndex, keyIndex));
+    }
+    else switch (key->getType())
+    {
+    case LumatoneKeyType::noteOnNoteOff:
+        //controller->sendKeyNoteOff(boardIndex, keyIndex);
+        noteOff(key->getMidiChannel(), key->getMidiNumber(), 0);
+        break;
+    default:
+        break;
+    }
+
+    updateKeyState(boardIndex, keyIndex, false);
+    keysOn.removeFirstMatchingValue(key);
+}
+
+void LumatoneKeyboardComponent::noteOnInternal(int midiChannel, int midiNote, juce::uint8 velocity)
+{
+    auto mappedKeyCoords = lumatoneMidiMap.getKeysAssignedToNoteOn(midiChannel, midiNote);
+    for (auto coord : mappedKeyCoords)
+    {
+        if (getMappingData()->isKeyCoordValid(coord))
+        {
+            updateKeyState(coord.boardIndex, coord.keyIndex, true);
+        }
+    }
+}
+
+void LumatoneKeyboardComponent::noteOffInternal(int midiChannel, int midiNote)
+{
+    auto mappedKeyCoords = lumatoneMidiMap.getKeysAssignedToNoteOn(midiChannel, midiNote);
+    for (auto coord : mappedKeyCoords)
+    {
+        if (getMappingData()->isKeyCoordValid(coord))
+        {
+            updateKeyState(coord.boardIndex, coord.keyIndex, false);
+        }
+    }
+}
+
+void LumatoneKeyboardComponent::noteOnInternal(const juce::MidiMessage& msg, int midiChannel, int midiNote, juce::uint8 velocity)
+{
+    LumatoneMidiState::noteOnInternal(msg, midiChannel, midiNote, velocity);
+    noteOnInternal(midiChannel, midiNote, velocity);
+}
+
+void LumatoneKeyboardComponent::noteOffInternal(const juce::MidiMessage& msg, int midiChannel, int midiNote, juce::uint8 velocity)
+{
+    LumatoneMidiState::noteOffInternal(msg, midiChannel, midiNote, velocity);
+    noteOffInternal(midiChannel, midiNote);
+}
+
+// void LumatoneKeyboardComponent::handleNoteOn(LumatoneMidiState* midiState, int midiChannel, int midiNote, juce::uint8 velocity)
+// {
+//     auto mappedKeyCoords = lumatoneMidiMap.getKeysAssignedToNoteOn(midiChannel, midiNote);
+//     for (auto coord : mappedKeyCoords)
+//     {
+//         if (getMappingData()->isKeyCoordValid(coord))
+//         {
+//             updateKeyState(coord.boardIndex, coord.keyIndex, true);
+//         }
+//     }
+// }
+
+// void LumatoneKeyboardComponent::handleNoteOff(LumatoneMidiState* midiState, int midiChannel, int midiNote)
+// {
+//     auto mappedKeyCoords = lumatoneMidiMap.getKeysAssignedToNoteOn(midiChannel, midiNote);
+//     for (auto coord : mappedKeyCoords)
+//     {
+//         if (getMappingData()->isKeyCoordValid(coord))
+//         {
+//             updateKeyState(coord.boardIndex, coord.keyIndex, false);
+//         }
+//     }
+// }
+
+// void LumatoneKeyboardComponent::handleAftertouch(LumatoneMidiState* midiState, int midiChannel, int midiNote, juce::uint8 aftertouch)
+// {
+
+// }
+
+// void LumatoneKeyboardComponent::handleController(LumatoneMidiState* midiState, int midiChannel, int midiNote, juce::uint8 value)
+// {
+
+// }
+
+void LumatoneKeyboardComponent::handleNoteOn(int midiChannel, int midiNote, juce::uint8 velocity)
+{
+    noteOnInternal(midiChannel, midiNote, velocity);
+}
+
+void LumatoneKeyboardComponent::handleNoteOff(int midiChannel, int midiNote)
+{
+    noteOffInternal(midiChannel, midiNote);
+}
diff --git a/Source/lumatone_editor_library/ui/keyboard_component.h b/Source/lumatone_editor_library/ui/keyboard_component.h
new file mode 100644
index 00000000..8d54351f
--- /dev/null
+++ b/Source/lumatone_editor_library/ui/keyboard_component.h
@@ -0,0 +1,251 @@
+/*
+  ==============================================================================
+
+    keyboard_component.h
+    Created: 24 Jul 2023 9:52:28pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#ifndef LUMATONE_KEYBOARD_COMPONENT_H
+#define LUMATONE_KEYBOARD_COMPONENT_H
+
+#include <JuceHeader.h>
+
+#include "key_component.h"
+
+#include "../data/application_state.h"
+#include "../mapping/lumatone_output_map.h"
+#include "../midi/lumatone_midi_state.h"
+#include "../listeners/editor_listener.h"
+#include "../listeners/midi_listener.h"
+
+#include "../graphics/lumatone_assets.h"
+#include "../graphics/lumatone_render.h"
+
+//==============================================================================
+/*
+*/
+class LumatoneKeyboardComponent : public juce::Component,
+                                  public juce::KeyListener,
+                                  public LumatoneApplicationState,
+                                  public LumatoneMidiState,
+                                  public LumatoneEditor::EditorListener,
+                                  public LumatoneEditor::MidiListener
+{
+public: 
+
+    enum class UiMode
+    {
+        None,           // Do not interact
+        Controller,     // Only send signals about keys pressed
+        Perform         // Send MIDI based on layout    
+    };
+
+public:
+    class Listener
+    {
+    public:
+        /*
+            Callback for virtual key pressed.
+        */
+        virtual void handleKeyDown(int keyNum) {}
+
+        /*
+            Callback for virtual key released.
+        */
+        virtual void handleKeyUp(int keyNum) {}
+
+        /*
+            Callback for virtual key dragged.
+        */
+        virtual void handleKeyHold(int key, float xDistance, float yDistance) {}
+    };
+
+public:
+    LumatoneKeyboardComponent(const LumatoneApplicationState& stateIn);
+    ~LumatoneKeyboardComponent() override;
+
+    void paint (juce::Graphics&) override;
+    void resized() override;
+
+    void resetOctaveSize(bool resetState = true);
+
+    LumatoneComponentRenderMode getRenderMode() const { return renderMode; }
+    void setRenderMode(LumatoneComponentRenderMode modeIn);
+
+    LumatoneKeyboardComponent::UiMode getUiMode() const { return uiMode; }
+    void setUiMode(LumatoneKeyboardComponent::UiMode modeIn);
+
+public:
+    // LumatoneEditor::EditorListener Implementation
+    void completeMappingLoaded(LumatoneLayout mappingData) override;
+    void boardChanged(LumatoneBoard boardData) override;
+    void contextChanged(LumatoneContext* newOrEmptyContext) override; 
+    void keyChanged(int boardIndex, int keyIndex, LumatoneKey lumatoneKey) override;
+    void keyConfigChanged(int boardIndex, int keyIndex, LumatoneKey keyData) override;
+    void keyColourChanged(int octaveNumber, int keyNumber, juce::Colour keyColour) override;
+    void selectionChanged(juce::Array<MappedLumatoneKey> selection) override;
+private:
+
+    void updateKeyColour(int boardIndex, int keyIndex, const juce::Colour& colour);
+    void resetLayoutState(const LumatoneLayout* optionalLayout=nullptr);
+
+    void keyUpdateCallback(int boardIndex, int keyIndex, const LumatoneKey& keyData, bool doRepaint=true);
+    void mappingUpdateCallback();
+
+public:
+    // Playing mode methods
+    
+    void clearHeldNotes();
+
+    void sustainStarted();
+    void sustainEnded();
+
+    void lumatoneKeyDown(int boardIndex, int keyIndex);
+    void lumatoneKeyUp(int boardIndex, int keyIndex);
+
+private:
+    // Playing mode implementations
+    void updateKeyState(int boardIndex, int keyIndex, bool keyIsDown);
+
+protected:
+    juce::ListenerList<LumatoneKeyboardComponent::Listener> listeners;
+public:
+    void addListener(LumatoneKeyboardComponent::Listener* listenerIn) { listeners.add(listenerIn); }
+    void removeListener(LumatoneKeyboardComponent::Listener* listenerIn) { listeners.remove(listenerIn); }
+
+protected:
+    // juce::Component UI implementations
+    void mouseMove(const juce::MouseEvent& e) override;
+    void mouseDown(const juce::MouseEvent& e) override;
+    void mouseUp(const juce::MouseEvent& e) override;
+    void mouseDrag(const juce::MouseEvent& e) override;
+
+private:
+    bool keyStateChanged(bool isKeyDown) override;
+    bool keyPressed(const juce::KeyPress& key, juce::Component* originatingComponent) override;
+    void modifierKeysChanged(const juce::ModifierKeys& modifiers) override;
+
+private:
+    // Private implementations of other methods
+
+    void keyDownInternal(int boardIndex, int keyIndex, juce::uint8 velocity);
+    void keyUpInternal(int boardIndex, int keyIndex);
+
+    void noteOnInternal(int midiChannel, int midiNote, juce::uint8 velocity);
+    void noteOffInternal(int midiChannel, int midiNote);
+
+private:
+    // LumatoneMidiState implementations (note callbacks)
+    void noteOnInternal(const juce::MidiMessage& msg, int midiChannel, int midiNote, juce::uint8 velocity) override;
+    void noteOffInternal(const juce::MidiMessage& msg, int midiChannel, int midiNote, juce::uint8 velocity) override;
+
+private:
+    // LumatoneMidiState::Listener implementations
+
+    void handleNoteOn(int midiChannel, int midiNote, juce::uint8 velocity) override;
+    void handleNoteOff(int midiChannel, int midiNote) override;
+    void handleAftertouch(int midiChannel, int midiNote, juce::uint8 aftertouch) override { }
+    void handleController(int midiChannel, int midiNote, juce::uint8 value) override { }
+
+
+private:
+    LumatoneKeyDisplay* getKeyFromMouseEvent(const juce::MouseEvent& e);
+
+    void rerender();
+
+private:
+
+    struct OctaveBoard
+    {
+        juce::OwnedArray<LumatoneKeyDisplay> keyMiniDisplay;
+        int leftPos;
+        int rightPos;
+    };
+
+    juce::OwnedArray<OctaveBoard> octaveBoards;
+
+    int currentOctaveSize = 0;
+    int currentSetSelection;
+
+    LumatoneComponentRenderMode renderMode;
+
+    LumatoneRender      lumatoneRender;
+
+    LumatoneOutputMap   lumatoneMidiMap;
+
+    LumatoneKeyboardComponent::UiMode uiMode = LumatoneKeyboardComponent::UiMode::Perform;
+
+    // std::unique_ptr<juce::Label> lblFirmwareVersion;
+
+    //==============================================================================
+    // UI Data
+
+    juce::MidiKeyboardState* realtimeKeyboardState = nullptr;
+
+    LumatoneKeyDisplay* lastMouseKeyDown = nullptr;
+    LumatoneKeyDisplay* lastMouseKeyOver = nullptr;
+
+    juce::Array<LumatoneKeyCoord> keysOverPerMouse;
+    juce::Array<LumatoneKeyCoord> keysDownPerMouse; // future compatibility with touchpad
+
+    juce::Array<LumatoneKeyDisplay*> keysOn;
+
+    bool shiftHeld = false;
+    bool altHeld = false;
+    bool ctrlHeld = false;
+
+    //bool rightHeld = false;
+    //bool upHeld = false;
+    //bool downHeld = false;
+    //bool leftHeld = false;
+
+    //==============================================================================
+    // Style helpers
+
+    int currentWidth = 0;
+    int currentHeight = 0;
+
+    juce::Rectangle<int> lumatoneBounds;
+    int octaveLineY = 0;
+
+    int keyWidth = 0;
+    int keyHeight = 0;
+
+    juce::Array<juce::Point<float>> keyCentres;
+
+    juce::Image lumatoneGraphic;
+    juce::Image keyShapeGraphic;
+    juce::Image keyShadowGraphic;
+
+    juce::Image currentRender;
+
+    //==============================================================================
+    // Position and sizing constants in reference to parent bounds
+
+    const float imageAspect = 2.498233f;
+    const float imageY      = 1.0f / 7.0f;
+    const float imageHeight = 5.0f / 7.0f;
+
+    //const float saveLoadH           = 0.0537634f;
+
+    const float octaveLineYRatio    = 0.0236559f;
+
+    const float keyW = 0.027352f;
+    const float keyH = 0.07307f;
+
+    //[/UserVariables]
+
+    //==============================================================================
+    std::unique_ptr<juce::TextButton> btnLoadFile;
+    std::unique_ptr<juce::TextButton> btnSaveFile;
+    std::unique_ptr<juce::TextButton> buttonReceive;
+
+
+    //==============================================================================
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (LumatoneKeyboardComponent)
+};
+
+#endif LUMATONE_KEYBOARD_COMPONENT_H
diff --git a/TerpstraSysEx.jucer b/TerpstraSysEx.jucer
index 67e27292..721ca126 100644
--- a/TerpstraSysEx.jucer
+++ b/TerpstraSysEx.jucer
@@ -61,320 +61,430 @@
         <FILE id="eBxs0Y" name="fr-ca.txt" compile="0" resource="1" file="BinaryData/Localisation/fr-ca.txt"/>
       </GROUP>
     </GROUP>
-    <GROUP id="{33698847-1685-930C-FEE9-83E0329F8EB4}" name="Source">
-      <GROUP id="{7EEA789B-1AC4-0E56-A989-8278A28D77FB}" name="actions">
-        <FILE id="rAnRw4" name="edit_actions.cpp" compile="1" resource="0"
-              file="Source/actions/edit_actions.cpp"/>
-        <FILE id="MavPSX" name="edit_actions.h" compile="0" resource="0" file="Source/actions/edit_actions.h"/>
-        <FILE id="wgTY5f" name="lumatone_action.h" compile="0" resource="0"
-              file="Source/actions/lumatone_action.h"/>
-      </GROUP>
-      <GROUP id="{1D045154-85AC-9B69-9047-6C814D640D8F}" name="color">
-        <FILE id="pcaFso" name="adjust_layout_colour.cpp" compile="1" resource="0"
-              file="Source/color/adjust_layout_colour.cpp"/>
-        <FILE id="Kh1Cdz" name="adjust_layout_colour.h" compile="0" resource="0"
-              file="Source/color/adjust_layout_colour.h"/>
-        <FILE id="U06owE" name="colour_model.cpp" compile="1" resource="0"
-              file="Source/color/colour_model.cpp"/>
-        <FILE id="N3OzGK" name="colour_model.h" compile="0" resource="0" file="Source/color/colour_model.h"/>
-        <FILE id="xj4lgg" name="interpolation.h" compile="0" resource="0" file="Source/color/interpolation.h"/>
-      </GROUP>
-      <GROUP id="{12905A26-E132-0B48-04A4-096652E69DBF}" name="data">
-        <FILE id="IZcOQ4" name="lumatone_board.cpp" compile="1" resource="0"
-              file="Source/data/lumatone_board.cpp"/>
-        <FILE id="EHGftb" name="lumatone_board.h" compile="0" resource="0"
-              file="Source/data/lumatone_board.h"/>
-        <FILE id="Z4QVPN" name="lumatone_key.cpp" compile="1" resource="0"
-              file="Source/data/lumatone_key.cpp"/>
-        <FILE id="tND8zh" name="lumatone_key.h" compile="0" resource="0" file="Source/data/lumatone_key.h"/>
-        <FILE id="kNhQbb" name="lumatone_layout.cpp" compile="1" resource="0"
-              file="Source/data/lumatone_layout.cpp"/>
-        <FILE id="m1tEwg" name="lumatone_layout.h" compile="0" resource="0"
-              file="Source/data/lumatone_layout.h"/>
-      </GROUP>
-      <GROUP id="{A4A6D450-9F77-B480-883D-E006C438C4CC}" name="HajuLib">
-        <FILE id="jB5kM3" name="HajuErrorVisualizer.cpp" compile="1" resource="0"
-              file="Source/HajuLib/HajuErrorVisualizer.cpp"/>
-        <FILE id="XP7yug" name="HajuErrorVisualizer.h" compile="0" resource="0"
-              file="Source/HajuLib/HajuErrorVisualizer.h"/>
-        <FILE id="uQhrjd" name="HajuMidiDriver.cpp" compile="1" resource="0"
-              file="Source/HajuLib/HajuMidiDriver.cpp"/>
-        <FILE id="fDRwAt" name="HajuMidiDriver.h" compile="0" resource="0"
-              file="Source/HajuLib/HajuMidiDriver.h"/>
+    <GROUP id="{0C0C01A7-7D12-68B9-2CA8-9F3D2FF41CF7}" name="Libraries">
+      <GROUP id="{96667A4F-E44D-2DFC-0749-E88CB35C7C55}" name="mac">
+        <GROUP id="{693844E0-4D97-DCC2-79BD-F8AB2272C2C9}" name="include">
+          <FILE id="aPeFIJ" name="gcrypt.h" compile="0" resource="0" file="Libraries/mac/include/gcrypt.h"/>
+          <FILE id="zM4rN7" name="gpg-error.h" compile="0" resource="0" file="Libraries/mac/include/gpg-error.h"/>
+          <FILE id="xQedbr" name="gpgrt.h" compile="0" resource="0" file="Libraries/mac/include/gpgrt.h"/>
+          <FILE id="kwteHa" name="libssh2.h" compile="0" resource="0" file="Libraries/mac/include/libssh2.h"/>
+          <FILE id="arppeD" name="libssh2_publickey.h" compile="0" resource="0"
+                file="Libraries/mac/include/libssh2_publickey.h"/>
+          <FILE id="KxdO0a" name="libssh2_sftp.h" compile="0" resource="0" file="Libraries/mac/include/libssh2_sftp.h"/>
+        </GROUP>
+        <GROUP id="{3346AA41-2639-B63D-7501-7E199F898ABF}" name="lib">
+          <FILE id="Gu3FVA" name="libgcrypt.20.dylib" compile="0" resource="0"
+                file="Libraries/mac/lib/libgcrypt.20.dylib" xcodeResource="1"/>
+          <FILE id="KP2wfq" name="libgpg-error.0.dylib" compile="0" resource="0"
+                file="Libraries/mac/lib/libgpg-error.0.dylib" xcodeResource="1"/>
+          <FILE id="VpPlIs" name="libssh2.1.dylib" compile="0" resource="0" file="Libraries/mac/lib/libssh2.1.dylib"
+                xcodeResource="1"/>
+        </GROUP>
       </GROUP>
-      <GROUP id="{A494C101-F32B-2EF2-029B-BC89392A79E4}" name="hex">
-        <FILE id="RffZMX" name="hex_field.cpp" compile="1" resource="0" file="Source/hex/hex_field.cpp"/>
-        <FILE id="SWJKW0" name="hex_field.h" compile="0" resource="0" file="Source/hex/hex_field.h"/>
-        <FILE id="Y1UPAR" name="lumatone_hex_map.cpp" compile="1" resource="0"
-              file="Source/hex/lumatone_hex_map.cpp"/>
-        <FILE id="tEGDhZ" name="lumatone_hex_map.h" compile="0" resource="0"
-              file="Source/hex/lumatone_hex_map.h"/>
+      <GROUP id="{2DB20667-3258-BE07-5618-CD9A56DD134A}" name="win64">
+        <GROUP id="{05820B0E-C8E5-E19B-471F-247617449AE6}" name="bin">
+          <FILE id="xCIYax" name="libssh2-x64.dll" compile="0" resource="0" file="Libraries/win64/bin/libssh2-x64.dll"/>
+        </GROUP>
+        <GROUP id="{E4C5D036-9389-7978-DAAF-A03754BDAF29}" name="include">
+          <FILE id="SlWVHi" name="libssh2.h" compile="0" resource="0" file="Libraries/win64/include/libssh2.h"/>
+          <FILE id="jUA5LG" name="libssh2_publickey.h" compile="0" resource="0"
+                file="Libraries/win64/include/libssh2_publickey.h"/>
+          <FILE id="YuZ6ua" name="libssh2_sftp.h" compile="0" resource="0" file="Libraries/win64/include/libssh2_sftp.h"/>
+        </GROUP>
+        <GROUP id="{30543A0A-F95B-91EE-80C4-CA2AB549CFB0}" name="lib">
+          <FILE id="IB1QJD" name="libssh2.a" compile="0" resource="0" file="Libraries/win64/lib/libssh2.a"/>
+          <FILE id="lQ8Boj" name="libssh2.dll.a" compile="0" resource="0" file="Libraries/win64/lib/libssh2.dll.a"/>
+        </GROUP>
       </GROUP>
-      <GROUP id="{C95FA357-E04E-B9A8-0904-5DC460C3478E}" name="ImageResampling">
-        <FILE id="ZPQRHz" name="ImageResampler.h" compile="0" resource="0"
-              file="Source/ImageResampling/ImageResampler.h"/>
-        <FILE id="TcNAij" name="resampler.cpp" compile="1" resource="0" file="Source/ImageResampling/resampler.cpp"/>
-        <FILE id="NG7LI4" name="resampler.h" compile="0" resource="0" file="Source/ImageResampling/resampler.h"/>
+    </GROUP>
+    <GROUP id="{33698847-1685-930C-FEE9-83E0329F8EB4}" name="Source">
+      <GROUP id="{44C62B43-EDA3-B60F-2047-61066ED1EF4A}" name="lumatone_editor_library">
+        <GROUP id="{24326BB7-031F-62B8-7731-713624ECB8B6}" name="actions">
+          <FILE id="ymNkG6" name="edit_actions.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/actions/edit_actions.cpp"/>
+          <FILE id="p9E88t" name="edit_actions.h" compile="0" resource="0" file="Source/lumatone_editor_library/actions/edit_actions.h"/>
+          <FILE id="t3lENB" name="lumatone_action.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/actions/lumatone_action.cpp"/>
+          <FILE id="rnnkhh" name="lumatone_action.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/actions/lumatone_action.h"/>
+        </GROUP>
+        <GROUP id="{06D1B684-00AD-A347-C24E-E995E2EC1E69}" name="assets">
+          <GROUP id="{FE288191-29F8-ACE9-119C-50B8A0DC8DBB}" name="colours">
+            <FILE id="EbsVHt" name="model.json" compile="0" resource="1" file="Source/lumatone_editor_library/assets/colours/model.json"/>
+          </GROUP>
+          <GROUP id="{48A0E987-8420-2ABC-E271-EF40FC8730CA}" name="png">
+            <FILE id="SKkxQE" name="KeyboardBase.png" compile="0" resource="1"
+                  file="Source/lumatone_editor_library/assets/png/KeyboardBase.png"/>
+            <FILE id="uBmuLa" name="KeyboardBase@2x.png" compile="0" resource="1"
+                  file="Source/lumatone_editor_library/assets/png/KeyboardBase@2x.png"/>
+            <FILE id="jHfNPX" name="KeyboardBase@4x.png" compile="0" resource="1"
+                  file="Source/lumatone_editor_library/assets/png/KeyboardBase@4x.png"/>
+            <FILE id="qY2PUa" name="KeyboardBase@8x.png" compile="0" resource="1"
+                  file="Source/lumatone_editor_library/assets/png/KeyboardBase@8x.png"/>
+            <FILE id="e63Vln" name="KeyShadow.png" compile="0" resource="1" file="Source/lumatone_editor_library/assets/png/KeyShadow.png"/>
+            <FILE id="MX5Ya0" name="KeyShadow@2x.png" compile="0" resource="1"
+                  file="Source/lumatone_editor_library/assets/png/KeyShadow@2x.png"/>
+            <FILE id="Ib7Wi4" name="KeyShadow@4x.png" compile="0" resource="1"
+                  file="Source/lumatone_editor_library/assets/png/KeyShadow@4x.png"/>
+            <FILE id="byRWib" name="KeyShadow@8x.png" compile="0" resource="1"
+                  file="Source/lumatone_editor_library/assets/png/KeyShadow@8x.png"/>
+            <FILE id="vx9SUi" name="KeyShadow@16x.png" compile="0" resource="1"
+                  file="Source/lumatone_editor_library/assets/png/KeyShadow@16x.png"/>
+            <FILE id="mhI2pr" name="KeyShape.png" compile="0" resource="1" file="Source/lumatone_editor_library/assets/png/KeyShape.png"/>
+            <FILE id="oeuefL" name="KeyShape@2x.png" compile="0" resource="1" file="Source/lumatone_editor_library/assets/png/KeyShape@2x.png"/>
+            <FILE id="eiflJk" name="KeyShape@4x.png" compile="0" resource="1" file="Source/lumatone_editor_library/assets/png/KeyShape@4x.png"/>
+            <FILE id="ey6iDv" name="KeyShape@8x.png" compile="0" resource="1" file="Source/lumatone_editor_library/assets/png/KeyShape@8x.png"/>
+            <FILE id="KUYYwB" name="KeyShape@16.png" compile="0" resource="1" file="Source/lumatone_editor_library/assets/png/KeyShape@16.png"/>
+          </GROUP>
+        </GROUP>
+        <GROUP id="{64FC3E7B-531F-24C6-7E02-8D53ED263C4C}" name="color">
+          <FILE id="UkIBZ9" name="adjust_layout_colour.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/color/adjust_layout_colour.cpp"/>
+          <FILE id="N1cXCZ" name="adjust_layout_colour.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/color/adjust_layout_colour.h"/>
+          <FILE id="uEMVNv" name="colour_model.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/color/colour_model.cpp"/>
+          <FILE id="tcsOVf" name="colour_model.h" compile="0" resource="0" file="Source/lumatone_editor_library/color/colour_model.h"/>
+          <FILE id="ffHPbR" name="colour_selection_broadcaster.h" compile="0"
+                resource="0" file="Source/lumatone_editor_library/color/colour_selection_broadcaster.h"/>
+          <FILE id="cj77gp" name="interpolation.h" compile="0" resource="0" file="Source/lumatone_editor_library/color/interpolation.h"/>
+        </GROUP>
+        <GROUP id="{50B73760-6D4B-B425-E9A4-AEE2E80979F5}" name="data">
+          <FILE id="UlnDpY" name="application_state.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/data/application_state.cpp"/>
+          <FILE id="bdm7p7" name="application_state.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/data/application_state.h"/>
+          <FILE id="JgTzWP" name="lumatone_board.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/data/lumatone_board.cpp"/>
+          <FILE id="FYu11Z" name="lumatone_board.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/data/lumatone_board.h"/>
+          <FILE id="YR4yS9" name="lumatone_context.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/data/lumatone_context.cpp"/>
+          <FILE id="X5CMyu" name="lumatone_context.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/data/lumatone_context.h"/>
+          <FILE id="a7hNU7" name="lumatone_editor_common.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/data/lumatone_editor_common.h"/>
+          <FILE id="dnAJon" name="lumatone_key.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/data/lumatone_key.cpp"/>
+          <FILE id="nVcIlN" name="lumatone_key.h" compile="0" resource="0" file="Source/lumatone_editor_library/data/lumatone_key.h"/>
+          <FILE id="n4HnpS" name="lumatone_layout.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/data/lumatone_layout.cpp"/>
+          <FILE id="LmU9BT" name="lumatone_layout.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/data/lumatone_layout.h"/>
+          <FILE id="mICVjB" name="lumatone_state.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/data/lumatone_state.cpp"/>
+          <FILE id="enWwUC" name="lumatone_state.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/data/lumatone_state.h"/>
+          <FILE id="ARZAgX" name="state_base.cpp" compile="1" resource="0" file="Source/lumatone_editor_library/data/state_base.cpp"/>
+          <FILE id="zZPMqd" name="state_base.h" compile="0" resource="0" file="Source/lumatone_editor_library/data/state_base.h"/>
+        </GROUP>
+        <GROUP id="{C04A9A0D-D138-42D7-4FE6-0E199011927B}" name="device">
+          <FILE id="xvZvHv" name="activity_monitor.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/device/activity_monitor.cpp"/>
+          <FILE id="cwD3L1" name="activity_monitor.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/device/activity_monitor.h"/>
+          <FILE id="r2Azxx" name="key_update_buffer.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/device/key_update_buffer.cpp"/>
+          <FILE id="Nv8qoI" name="key_update_buffer.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/device/key_update_buffer.h"/>
+          <FILE id="Yr4KfI" name="lumatone_controller.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/device/lumatone_controller.cpp"/>
+          <FILE id="WcnZCR" name="lumatone_controller.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/device/lumatone_controller.h"/>
+          <FILE id="AZ0KHL" name="lumatone_event_manager.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/device/lumatone_event_manager.cpp"/>
+          <FILE id="qv521U" name="lumatone_event_manager.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/device/lumatone_event_manager.h"/>
+        </GROUP>
+        <GROUP id="{1AC0CB3C-7412-47B8-EAAE-9F578BA55D8E}" name="graphics">
+          <GROUP id="{2BBC2CF1-B9F4-7EDC-BCA0-B5F73E23DD8C}" name="resampler">
+            <FILE id="J0sxxr" name="image_resampler.h" compile="0" resource="0"
+                  file="Source/lumatone_editor_library/graphics/resampler/image_resampler.h"/>
+            <FILE id="QLTyGy" name="resampler.cpp" compile="1" resource="0" file="Source/lumatone_editor_library/graphics/resampler/resampler.cpp"/>
+            <FILE id="nJTGQY" name="resampler.h" compile="0" resource="0" file="Source/lumatone_editor_library/graphics/resampler/resampler.h"/>
+          </GROUP>
+          <FILE id="yG2bIa" name="lumatone_assets.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/graphics/lumatone_assets.h"/>
+          <FILE id="gbALql" name="lumatone_render.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/graphics/lumatone_render.cpp"/>
+          <FILE id="zDdCgn" name="lumatone_render.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/graphics/lumatone_render.h"/>
+          <FILE id="c3QbcP" name="view_constants.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/graphics/view_constants.h"/>
+        </GROUP>
+        <GROUP id="{38D287EA-E655-52D2-E58C-9E35BBE919F5}" name="hex">
+          <FILE id="jJ5lqD" name="hex_field.cpp" compile="1" resource="0" file="Source/lumatone_editor_library/hex/hex_field.cpp"/>
+          <FILE id="MrJqtx" name="hex_field.h" compile="0" resource="0" file="Source/lumatone_editor_library/hex/hex_field.h"/>
+        </GROUP>
+        <GROUP id="{27D3A6DA-3471-6606-C732-46761A8FEE5B}" name="listeners">
+          <FILE id="ibOTYD" name="editor_listener.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/listeners/editor_listener.h"/>
+          <FILE id="LIHPwk" name="firmware_listener.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/listeners/firmware_listener.h"/>
+          <FILE id="YKDn2b" name="midi_listener.h" compile="0" resource="0" file="Source/lumatone_editor_library/listeners/midi_listener.h"/>
+          <FILE id="ivtS5d" name="status_listener.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/listeners/status_listener.h"/>
+        </GROUP>
+        <GROUP id="{0EDFA622-2F2E-FE21-78D0-E6CAA4FA6FA5}" name="lumatone_midi_driver">
+          <FILE id="NSrnV8" name="firmware_definitions.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/lumatone_midi_driver/firmware_definitions.h"/>
+          <FILE id="HlVp6z" name="firmware_driver_listener.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/lumatone_midi_driver/firmware_driver_listener.h"/>
+          <FILE id="JIeL9l" name="firmware_support.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/lumatone_midi_driver/firmware_support.h"/>
+          <FILE id="UdpxOW" name="firmware_sysex.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/lumatone_midi_driver/firmware_sysex.cpp"/>
+          <FILE id="Ojd03e" name="firmware_sysex.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/lumatone_midi_driver/firmware_sysex.h"/>
+          <FILE id="pUlJcN" name="firmware_types.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/lumatone_midi_driver/firmware_types.h"/>
+          <FILE id="EhfQFF" name="lumatone_midi_driver.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/lumatone_midi_driver/lumatone_midi_driver.cpp"/>
+          <FILE id="OnfFFj" name="lumatone_midi_driver.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/lumatone_midi_driver/lumatone_midi_driver.h"/>
+          <FILE id="SAmqbR" name="midi_driver.cpp" compile="1" resource="0" file="Source/lumatone_editor_library/lumatone_midi_driver/midi_driver.cpp"/>
+          <FILE id="bbO1i7" name="midi_driver.h" compile="0" resource="0" file="Source/lumatone_editor_library/lumatone_midi_driver/midi_driver.h"/>
+        </GROUP>
+        <GROUP id="{9C1252F6-CF54-2E43-BAC8-EFCEC0920B72}" name="mapping">
+          <FILE id="h4qhsf" name="lumatone_geometry.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/mapping/lumatone_geometry.cpp"/>
+          <FILE id="UVi1f5" name="lumatone_geometry.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/mapping/lumatone_geometry.h"/>
+          <FILE id="NSArud" name="lumatone_hex_map.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/mapping/lumatone_hex_map.cpp"/>
+          <FILE id="VYLYXE" name="lumatone_hex_map.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/mapping/lumatone_hex_map.h"/>
+          <FILE id="tSZRjY" name="lumatone_output_map.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/mapping/lumatone_output_map.cpp"/>
+          <FILE id="alwRRC" name="lumatone_output_map.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/mapping/lumatone_output_map.h"/>
+          <FILE id="t2D2ja" name="lumatone_tiling.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/mapping/lumatone_tiling.cpp"/>
+          <FILE id="Ub5t8a" name="lumatone_tiling.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/mapping/lumatone_tiling.h"/>
+        </GROUP>
+        <GROUP id="{4BDC0C9C-4FBC-4B73-B149-79B0B1A82ABD}" name="midi">
+          <FILE id="MH4hq7" name="lumatone_midi_manager.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/midi/lumatone_midi_manager.cpp"/>
+          <FILE id="HRTwGL" name="lumatone_midi_manager.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/midi/lumatone_midi_manager.h"/>
+          <FILE id="AMiNs6" name="lumatone_midi_state.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/midi/lumatone_midi_state.cpp"/>
+          <FILE id="aHacxK" name="lumatone_midi_state.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/midi/lumatone_midi_state.h"/>
+        </GROUP>
+        <GROUP id="{8859E077-3EA5-F12B-AF0D-DCFB54DF3F82}" name="palettes">
+          <FILE id="eTR19x" name="colour_edit_textbox.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/palettes/colour_edit_textbox.cpp"/>
+          <FILE id="hRCJ3T" name="colour_edit_textbox.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/palettes/colour_edit_textbox.h"/>
+          <FILE id="Sdg1Ir" name="colour_palette_component.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/palettes/colour_palette_component.cpp"/>
+          <FILE id="VKvEwq" name="colour_palette_component.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/palettes/colour_palette_component.h"/>
+          <FILE id="oRtRDD" name="colour_palette_file.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/palettes/colour_palette_file.h"/>
+          <FILE id="MUxXl0" name="colour_palette_window.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/palettes/colour_palette_window.cpp"/>
+          <FILE id="NfMI7q" name="colour_palette_window.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/palettes/colour_palette_window.h"/>
+          <FILE id="c6Drft" name="colour_picker_panel.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/palettes/colour_picker_panel.h"/>
+          <FILE id="IZE3lE" name="colour_selection_broadcaster.h" compile="0"
+                resource="0" file="Source/lumatone_editor_library/palettes/colour_selection_broadcaster.h"/>
+          <FILE id="SPq6tv" name="colour_selection_group.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/palettes/colour_selection_group.h"/>
+          <FILE id="SHADjT" name="colour_view_component.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/palettes/colour_view_component.cpp"/>
+          <FILE id="u2jCKR" name="colour_view_component.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/palettes/colour_view_component.h"/>
+          <FILE id="vhL7UR" name="hex_group_palette.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/palettes/hex_group_palette.h"/>
+          <FILE id="lJJ0O2" name="palette_base.h" compile="0" resource="0" file="Source/lumatone_editor_library/palettes/palette_base.h"/>
+          <FILE id="ZpsZN6" name="palette_edit_panel.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/palettes/palette_edit_panel.h"/>
+          <FILE id="aqQkOU" name="palette_library.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/palettes/palette_library.h"/>
+          <FILE id="eu4alZ" name="palette_selection_panel.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/palettes/palette_selection_panel.h"/>
+          <FILE id="CHSP62" name="polygon_palette.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/palettes/polygon_palette.h"/>
+        </GROUP>
+        <GROUP id="{75CBBAA3-5116-905A-C7C8-FB98089DB8A3}" name="ui">
+          <FILE id="nl9xuw" name="key_component.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/ui/key_component.cpp"/>
+          <FILE id="Tn2WXN" name="key_component.h" compile="0" resource="0" file="Source/lumatone_editor_library/ui/key_component.h"/>
+          <FILE id="OiywlA" name="keyboard_component.cpp" compile="1" resource="0"
+                file="Source/lumatone_editor_library/ui/keyboard_component.cpp"/>
+          <FILE id="IlcF3J" name="keyboard_component.h" compile="0" resource="0"
+                file="Source/lumatone_editor_library/ui/keyboard_component.h"/>
+        </GROUP>
       </GROUP>
-      <GROUP id="{B5CA3401-0109-BB5C-61F8-E7A6E2BF63BB}" name="ScaleStructureController">
-        <FILE id="m8L2FW" name="Common.h" compile="0" resource="0" file="Source/ScaleStructureController/Common.h"/>
-        <FILE id="AEPSIS" name="GroupHandle.cpp" compile="1" resource="0" file="Source/ScaleStructureController/GroupHandle.cpp"/>
-        <FILE id="ipxL0w" name="GroupHandle.h" compile="0" resource="0" file="Source/ScaleStructureController/GroupHandle.h"/>
-        <FILE id="EXBtwL" name="GroupingCircle.cpp" compile="1" resource="0"
+      <GROUP id="{6F8FAAD4-1A2F-4012-E750-483B1C0D731D}" name="ScaleStructureController">
+        <FILE id="CbPdpK" name="Common.h" compile="0" resource="0" file="Source/ScaleStructureController/Common.h"/>
+        <FILE id="xWtVZT" name="GroupHandle.cpp" compile="1" resource="0" file="Source/ScaleStructureController/GroupHandle.cpp"/>
+        <FILE id="gzZmzc" name="GroupHandle.h" compile="0" resource="0" file="Source/ScaleStructureController/GroupHandle.h"/>
+        <FILE id="NYQLjV" name="GroupingCircle.cpp" compile="1" resource="0"
               file="Source/ScaleStructureController/GroupingCircle.cpp"/>
-        <FILE id="i5mbLr" name="GroupingCircle.h" compile="0" resource="0"
+        <FILE id="JMgBs7" name="GroupingCircle.h" compile="0" resource="0"
               file="Source/ScaleStructureController/GroupingCircle.h"/>
-        <FILE id="cB46BS" name="NoteNames.cpp" compile="1" resource="0" file="Source/ScaleStructureController/NoteNames.cpp"/>
-        <FILE id="JAsBNJ" name="NoteNames.h" compile="0" resource="0" file="Source/ScaleStructureController/NoteNames.h"/>
-        <FILE id="pfxDQp" name="NumberSelector.cpp" compile="1" resource="0"
+        <FILE id="ImLHun" name="NoteNames.cpp" compile="1" resource="0" file="Source/ScaleStructureController/NoteNames.cpp"/>
+        <FILE id="HScSWq" name="NoteNames.h" compile="0" resource="0" file="Source/ScaleStructureController/NoteNames.h"/>
+        <FILE id="Atzr6Z" name="NumberSelector.cpp" compile="1" resource="0"
               file="Source/ScaleStructureController/NumberSelector.cpp"/>
-        <FILE id="iynARj" name="NumberSelector.h" compile="0" resource="0"
+        <FILE id="EprTKP" name="NumberSelector.h" compile="0" resource="0"
               file="Source/ScaleStructureController/NumberSelector.h"/>
-        <FILE id="dCqrAw" name="ScaleDesignWindow.cpp" compile="1" resource="0"
+        <FILE id="grlzpX" name="ScaleDesignWindow.cpp" compile="1" resource="0"
               file="Source/ScaleStructureController/ScaleDesignWindow.cpp"/>
-        <FILE id="VlAnnp" name="ScaleDesignWindow.h" compile="0" resource="0"
+        <FILE id="qqAt65" name="ScaleDesignWindow.h" compile="0" resource="0"
               file="Source/ScaleStructureController/ScaleDesignWindow.h"/>
-        <FILE id="e5aG4E" name="ScaleMath.h" compile="0" resource="0" file="Source/ScaleStructureController/ScaleMath.h"/>
-        <FILE id="SP6KgL" name="ScaleStructure.cpp" compile="1" resource="0"
+        <FILE id="akCn4i" name="ScaleMath.h" compile="0" resource="0" file="Source/ScaleStructureController/ScaleMath.h"/>
+        <FILE id="QvsbaP" name="ScaleStructure.cpp" compile="1" resource="0"
               file="Source/ScaleStructureController/ScaleStructure.cpp"/>
-        <FILE id="JtjH2F" name="ScaleStructure.h" compile="0" resource="0"
+        <FILE id="Hswn8T" name="ScaleStructure.h" compile="0" resource="0"
               file="Source/ScaleStructureController/ScaleStructure.h"/>
-        <FILE id="nA9e3t" name="ScaleStructureComponent.cpp" compile="1" resource="0"
+        <FILE id="kdBMUh" name="ScaleStructureComponent.cpp" compile="1" resource="0"
               file="Source/ScaleStructureController/ScaleStructureComponent.cpp"/>
-        <FILE id="kBv7xs" name="ScaleStructureComponent.h" compile="0" resource="0"
+        <FILE id="aoW708" name="ScaleStructureComponent.h" compile="0" resource="0"
               file="Source/ScaleStructureController/ScaleStructureComponent.h"/>
-        <FILE id="kTjDEH" name="Symmetry.h" compile="0" resource="0" file="Source/ScaleStructureController/Symmetry.h"/>
-        <FILE id="FujxfP" name="TransparentDropDown.h" compile="0" resource="0"
+        <FILE id="ywyZB8" name="Symmetry.h" compile="0" resource="0" file="Source/ScaleStructureController/Symmetry.h"/>
+        <FILE id="yGio6F" name="TransparentDropDown.h" compile="0" resource="0"
               file="Source/ScaleStructureController/TransparentDropDown.h"/>
       </GROUP>
-      <GROUP id="{62488EF3-6E09-A1A5-7CF7-AB8011E1095D}" name="Settings">
-        <FILE id="F0sbo5" name="CalibrationDlg.cpp" compile="1" resource="0"
+      <GROUP id="{646C1567-C203-D498-AEA7-A578807A4C57}" name="Settings">
+        <FILE id="WPkMHP" name="CalibrationDlg.cpp" compile="1" resource="0"
               file="Source/Settings/CalibrationDlg.cpp"/>
-        <FILE id="t47pnO" name="CalibrationDlg.h" compile="0" resource="0"
+        <FILE id="XQ6XCU" name="CalibrationDlg.h" compile="0" resource="0"
               file="Source/Settings/CalibrationDlg.h"/>
-        <FILE id="oVJzIf" name="FirmwareDlg.cpp" compile="1" resource="0" file="Source/Settings/FirmwareDlg.cpp"/>
-        <FILE id="dUmhnv" name="FirmwareDlg.h" compile="0" resource="0" file="Source/Settings/FirmwareDlg.h"/>
-        <FILE id="Xlifi9" name="MidiSettingsDlg.cpp" compile="1" resource="0"
+        <FILE id="xjY96Q" name="FirmwareDlg.cpp" compile="1" resource="0" file="Source/Settings/FirmwareDlg.cpp"/>
+        <FILE id="Hoq5bx" name="FirmwareDlg.h" compile="0" resource="0" file="Source/Settings/FirmwareDlg.h"/>
+        <FILE id="LjfJrt" name="MidiSettingsDlg.cpp" compile="1" resource="0"
               file="Source/Settings/MidiSettingsDlg.cpp"/>
-        <FILE id="QaobwE" name="MidiSettingsDlg.h" compile="0" resource="0"
+        <FILE id="tdvlDE" name="MidiSettingsDlg.h" compile="0" resource="0"
               file="Source/Settings/MidiSettingsDlg.h"/>
-        <FILE id="NL4034" name="PresetSettingsDlg.cpp" compile="1" resource="0"
+        <FILE id="Vzgaip" name="PresetSettingsDlg.cpp" compile="1" resource="0"
               file="Source/Settings/PresetSettingsDlg.cpp"/>
-        <FILE id="PUXXD6" name="PresetSettingsDlg.h" compile="0" resource="0"
+        <FILE id="vU7TbL" name="PresetSettingsDlg.h" compile="0" resource="0"
               file="Source/Settings/PresetSettingsDlg.h"/>
-        <FILE id="nDt1jq" name="SettingsContainer.cpp" compile="1" resource="0"
+        <FILE id="j0CBwT" name="SettingsContainer.cpp" compile="1" resource="0"
               file="Source/Settings/SettingsContainer.cpp"/>
-        <FILE id="oHn8Gq" name="SettingsContainer.h" compile="0" resource="0"
+        <FILE id="AcQQ4J" name="SettingsContainer.h" compile="0" resource="0"
               file="Source/Settings/SettingsContainer.h"/>
-        <FILE id="Dxbmsd" name="WheelsCalibrationComponent.h" compile="0" resource="0"
+        <FILE id="iolSKC" name="WheelsCalibrationComponent.h" compile="0" resource="0"
               file="Source/Settings/WheelsCalibrationComponent.h"/>
       </GROUP>
-      <GROUP id="{9C329A47-D40D-287C-97B4-C6161503494B}" name="tuning">
-        <FILE id="TWWNJL" name="Interval.h" compile="0" resource="0" file="Source/tuning/Interval.h"/>
-        <FILE id="wRSHSF" name="NotationDefinition.cpp" compile="1" resource="0"
+      <GROUP id="{21C8A7A4-D87B-16EA-CFD0-2559971D6FB7}" name="tuning">
+        <FILE id="VuNbGw" name="Interval.h" compile="0" resource="0" file="Source/tuning/Interval.h"/>
+        <FILE id="ibzrYD" name="NotationDefinition.cpp" compile="1" resource="0"
               file="Source/tuning/NotationDefinition.cpp"/>
-        <FILE id="SCbbmC" name="NotationDefinition.h" compile="0" resource="0"
+        <FILE id="UvQkga" name="NotationDefinition.h" compile="0" resource="0"
               file="Source/tuning/NotationDefinition.h"/>
-        <FILE id="IbqPJ0" name="NotationTable.cpp" compile="1" resource="0"
+        <FILE id="zbtSGM" name="NotationTable.cpp" compile="1" resource="0"
               file="Source/tuning/NotationTable.cpp"/>
-        <FILE id="VYuRwS" name="NotationTable.h" compile="0" resource="0" file="Source/tuning/NotationTable.h"/>
-        <FILE id="DcpzTk" name="TuningDefinition.cpp" compile="1" resource="0"
+        <FILE id="ZEcPqw" name="NotationTable.h" compile="0" resource="0" file="Source/tuning/NotationTable.h"/>
+        <FILE id="nSkSqV" name="TuningDefinition.cpp" compile="1" resource="0"
               file="Source/tuning/TuningDefinition.cpp"/>
-        <FILE id="CulJHQ" name="TuningDefinition.h" compile="0" resource="0"
+        <FILE id="Iuolp5" name="TuningDefinition.h" compile="0" resource="0"
               file="Source/tuning/TuningDefinition.h"/>
-        <FILE id="pKv4Ei" name="TuningTable.cpp" compile="1" resource="0" file="Source/tuning/TuningTable.cpp"/>
-        <FILE id="thzIk5" name="TuningTable.h" compile="0" resource="0" file="Source/tuning/TuningTable.h"/>
+        <FILE id="SG0zUw" name="TuningTable.cpp" compile="1" resource="0" file="Source/tuning/TuningTable.cpp"/>
+        <FILE id="x9HcnB" name="TuningTable.h" compile="0" resource="0" file="Source/tuning/TuningTable.h"/>
       </GROUP>
-      <FILE id="i3lnlL" name="key_update_buffer.cpp" compile="1" resource="0"
-            file="Source/key_update_buffer.cpp"/>
-      <FILE id="sPQ3wT" name="key_update_buffer.h" compile="0" resource="0"
-            file="Source/key_update_buffer.h"/>
-      <FILE id="JdAwbS" name="lumatone_render.h" compile="0" resource="0"
-            file="Source/lumatone_render.h"/>
-      <FILE id="vms2bU" name="lumatone_render.cpp" compile="1" resource="0"
-            file="Source/lumatone_render.cpp"/>
-      <FILE id="d788XW" name="AllKeysOverview.cpp" compile="1" resource="0"
-            file="Source/AllKeysOverview.cpp"/>
-      <FILE id="LDrzLN" name="AllKeysOverview.h" compile="0" resource="0"
-            file="Source/AllKeysOverview.h"/>
-      <FILE id="Frw1Uo" name="ApplicationListeners.h" compile="0" resource="0"
-            file="Source/ApplicationListeners.h"/>
-      <FILE id="CsrDEr" name="ColourEditComponent.cpp" compile="1" resource="0"
-            file="Source/ColourEditComponent.cpp"/>
-      <FILE id="AwdseN" name="ColourEditComponent.h" compile="0" resource="0"
-            file="Source/ColourEditComponent.h"/>
-      <FILE id="GGwK1H" name="ColourPaletteComponent.cpp" compile="1" resource="0"
-            file="Source/ColourPaletteComponent.cpp"/>
-      <FILE id="Ily2NE" name="ColourPaletteComponent.h" compile="0" resource="0"
-            file="Source/ColourPaletteComponent.h"/>
-      <FILE id="dckzdX" name="ColourPaletteDataStructure.h" compile="0" resource="0"
-            file="Source/ColourPaletteDataStructure.h"/>
-      <FILE id="xwz16Q" name="ColourPaletteWindow.cpp" compile="1" resource="0"
-            file="Source/ColourPaletteWindow.cpp"/>
-      <FILE id="iRIncY" name="ColourPaletteWindow.h" compile="0" resource="0"
-            file="Source/ColourPaletteWindow.h"/>
-      <FILE id="cjUdqW" name="ColourSelectionGroup.h" compile="0" resource="0"
-            file="Source/ColourSelectionGroup.h"/>
-      <FILE id="JJwE2m" name="ColourSelectionPanels.h" compile="0" resource="0"
-            file="Source/ColourSelectionPanels.h"/>
-      <FILE id="D9oKfn" name="CurvesArea.cpp" compile="1" resource="0" file="Source/CurvesArea.cpp"/>
-      <FILE id="NWU04N" name="CurvesArea.h" compile="0" resource="0" file="Source/CurvesArea.h"/>
-      <FILE id="LE80FJ" name="DeviceActivityMonitor.cpp" compile="1" resource="0"
-            file="Source/DeviceActivityMonitor.cpp"/>
-      <FILE id="cyHDSw" name="DeviceActivityMonitor.h" compile="0" resource="0"
-            file="Source/DeviceActivityMonitor.h"/>
-      <FILE id="VtNBMK" name="FileBrowserComponent.h" compile="0" resource="0"
+      <FILE id="R9fpSq" name="CurvesArea.cpp" compile="1" resource="0" file="Source/CurvesArea.cpp"/>
+      <FILE id="TLyIga" name="CurvesArea.h" compile="0" resource="0" file="Source/CurvesArea.h"/>
+      <FILE id="eQune0" name="FileBrowserComponent.h" compile="0" resource="0"
             file="Source/FileBrowserComponent.h"/>
-      <FILE id="AsBwPh" name="FirmwareTransfer.cpp" compile="1" resource="0"
+      <FILE id="dX1PVZ" name="FirmwareTransfer.cpp" compile="1" resource="0"
             file="Source/FirmwareTransfer.cpp"/>
-      <FILE id="KxvKbd" name="FirmwareTransfer.h" compile="0" resource="0"
+      <FILE id="VL72Up" name="FirmwareTransfer.h" compile="0" resource="0"
             file="Source/FirmwareTransfer.h"/>
-      <FILE id="aU7hRG" name="GeneralOptionsDlg.cpp" compile="1" resource="0"
+      <FILE id="Nki1Yj" name="GeneralOptionsDlg.cpp" compile="1" resource="0"
             file="Source/GeneralOptionsDlg.cpp"/>
-      <FILE id="sB2A1W" name="GeneralOptionsDlg.h" compile="0" resource="0"
+      <FILE id="zVOvik" name="GeneralOptionsDlg.h" compile="0" resource="0"
             file="Source/GeneralOptionsDlg.h"/>
-      <FILE id="DmQl6Y" name="GlobalSettingsArea.cpp" compile="1" resource="0"
+      <FILE id="BI0zR0" name="GlobalSettingsArea.cpp" compile="1" resource="0"
             file="Source/GlobalSettingsArea.cpp"/>
-      <FILE id="q1i0fL" name="GlobalSettingsArea.h" compile="0" resource="0"
+      <FILE id="C3xCOu" name="GlobalSettingsArea.h" compile="0" resource="0"
             file="Source/GlobalSettingsArea.h"/>
-      <FILE id="eRoaDk" name="HexagonPalette.h" compile="0" resource="0"
-            file="Source/HexagonPalette.h"/>
-      <FILE id="J2QfqA" name="IncrMidiNotesMapping.cpp" compile="1" resource="0"
+      <FILE id="uwAZUy" name="IncrMidiNotesMapping.cpp" compile="1" resource="0"
             file="Source/IncrMidiNotesMapping.cpp"/>
-      <FILE id="YO2lj4" name="IncrMidiNotesMapping.h" compile="0" resource="0"
+      <FILE id="gY5lPo" name="IncrMidiNotesMapping.h" compile="0" resource="0"
             file="Source/IncrMidiNotesMapping.h"/>
-      <FILE id="wWKPh7" name="IsomorphicMassAssign.cpp" compile="1" resource="0"
+      <FILE id="wqQJ7O" name="IsomorphicMassAssign.cpp" compile="1" resource="0"
             file="Source/IsomorphicMassAssign.cpp"/>
-      <FILE id="rVGTtm" name="IsomorphicMassAssign.h" compile="0" resource="0"
+      <FILE id="ldBHOf" name="IsomorphicMassAssign.h" compile="0" resource="0"
             file="Source/IsomorphicMassAssign.h"/>
-      <FILE id="ejxAEJ" name="KBMForOneChannel.cpp" compile="1" resource="0"
+      <FILE id="nlTNNq" name="KBMForOneChannel.cpp" compile="1" resource="0"
             file="Source/KBMForOneChannel.cpp"/>
-      <FILE id="Atd8z3" name="KBMForOneChannel.h" compile="0" resource="0"
+      <FILE id="OGQiwz" name="KBMForOneChannel.h" compile="0" resource="0"
             file="Source/KBMForOneChannel.h"/>
-      <FILE id="dsdZQU" name="KBMMappingDataStructure.cpp" compile="1" resource="0"
+      <FILE id="hygWNm" name="KBMMappingDataStructure.cpp" compile="1" resource="0"
             file="Source/KBMMappingDataStructure.cpp"/>
-      <FILE id="ct92Q9" name="KBMMappingDataStructure.h" compile="0" resource="0"
+      <FILE id="vmBpHP" name="KBMMappingDataStructure.h" compile="0" resource="0"
             file="Source/KBMMappingDataStructure.h"/>
-      <FILE id="kqnDIp" name="KBMMappingDlg.cpp" compile="1" resource="0"
+      <FILE id="ewVckJ" name="KBMMappingDlg.cpp" compile="1" resource="0"
             file="Source/KBMMappingDlg.cpp"/>
-      <FILE id="Ts6ijJ" name="KBMMappingDlg.h" compile="0" resource="0" file="Source/KBMMappingDlg.h"/>
-      <FILE id="cIJwEr" name="LocalisationMap.h" compile="0" resource="0"
+      <FILE id="y7rPEZ" name="KBMMappingDlg.h" compile="0" resource="0" file="Source/KBMMappingDlg.h"/>
+      <FILE id="lIexvu" name="LocalisationMap.h" compile="0" resource="0"
             file="Source/LocalisationMap.h"/>
-      <FILE id="fnINd7" name="lumatone_assets.h" compile="0" resource="0"
-            file="Source/lumatone_assets.h"/>
-      <FILE id="nUZ9UY" name="lumatone_editor_common.h" compile="0" resource="0"
-            file="Source/lumatone_editor_common.h"/>
-      <FILE id="MEnhys" name="lumatone_geometry.cpp" compile="1" resource="0"
-            file="Source/lumatone_geometry.cpp"/>
-      <FILE id="ROfamL" name="lumatone_geometry.h" compile="0" resource="0"
-            file="Source/lumatone_geometry.h"/>
-      <FILE id="hCxDz8" name="lumatone_tiling.cpp" compile="1" resource="0"
-            file="Source/lumatone_tiling.cpp"/>
-      <FILE id="lLLfrS" name="lumatone_tiling.h" compile="0" resource="0"
-            file="Source/lumatone_tiling.h"/>
-      <FILE id="aFj8dS" name="LumatoneController.cpp" compile="1" resource="0"
-            file="Source/LumatoneController.cpp"/>
-      <FILE id="mTSq9h" name="LumatoneController.h" compile="0" resource="0"
-            file="Source/LumatoneController.h"/>
-      <FILE id="Lo0rpa" name="LumatoneEditorFonts.h" compile="0" resource="0"
+      <FILE id="glU1cb" name="LumatoneEditorFontLibrary.h" compile="0" resource="0"
+            file="Source/LumatoneEditorFontLibrary.h"/>
+      <FILE id="PvAAH4" name="LumatoneEditorFonts.h" compile="0" resource="0"
             file="Source/LumatoneEditorFonts.h"/>
-      <FILE id="OVdGTf" name="LumatoneEditorLookAndFeel.h" compile="0" resource="0"
+      <FILE id="gotHIX" name="LumatoneEditorLookAndFeel.h" compile="0" resource="0"
             file="Source/LumatoneEditorLookAndFeel.h"/>
-      <FILE id="SNtvru" name="LumatoneEditorStyleCommon.h" compile="0" resource="0"
+      <FILE id="pFy8VU" name="LumatoneEditorState.cpp" compile="1" resource="0"
+            file="Source/LumatoneEditorState.cpp"/>
+      <FILE id="OwlG1w" name="LumatoneEditorState.h" compile="0" resource="0"
+            file="Source/LumatoneEditorState.h"/>
+      <FILE id="zPWPVe" name="LumatoneEditorStyleCommon.h" compile="0" resource="0"
             file="Source/LumatoneEditorStyleCommon.h"/>
-      <FILE id="W0vCWm" name="LumatoneFirmwareDefinitions.h" compile="0"
-            resource="0" file="Source/LumatoneFirmwareDefinitions.h"/>
-      <FILE id="la7kwE" name="LumatoneMenu.cpp" compile="1" resource="0"
+      <FILE id="Bh7wLr" name="LumatoneMenu.cpp" compile="1" resource="0"
             file="Source/LumatoneMenu.cpp"/>
-      <FILE id="Zm46ah" name="LumatoneMenu.h" compile="0" resource="0" file="Source/LumatoneMenu.h"/>
-      <FILE id="G18fal" name="Main.cpp" compile="1" resource="0" file="Source/Main.cpp"/>
-      <FILE id="tpke2x" name="Main.h" compile="0" resource="0" file="Source/Main.h"/>
-      <FILE id="jGlCsz" name="MainComponent.cpp" compile="1" resource="0"
+      <FILE id="zeGK0v" name="LumatoneMenu.h" compile="0" resource="0" file="Source/LumatoneMenu.h"/>
+      <FILE id="UJurQm" name="Main.cpp" compile="1" resource="0" file="Source/Main.cpp"/>
+      <FILE id="cqEnzY" name="Main.h" compile="0" resource="0" file="Source/Main.h"/>
+      <FILE id="bI9Zx0" name="MainComponent.cpp" compile="1" resource="0"
             file="Source/MainComponent.cpp"/>
-      <FILE id="qwNz7J" name="MainComponent.h" compile="0" resource="0" file="Source/MainComponent.h"/>
-      <FILE id="yNlGIh" name="MainWindow.cpp" compile="1" resource="0" file="Source/MainWindow.cpp"/>
-      <FILE id="yJNScD" name="MainWindow.h" compile="0" resource="0" file="Source/MainWindow.h"/>
-      <FILE id="ZvlUd0" name="MappingLogic.cpp" compile="1" resource="0"
+      <FILE id="tO1zIE" name="MainComponent.h" compile="0" resource="0" file="Source/MainComponent.h"/>
+      <FILE id="eQWN0K" name="MainWindow.cpp" compile="1" resource="0" file="Source/MainWindow.cpp"/>
+      <FILE id="ykjjR6" name="MainWindow.h" compile="0" resource="0" file="Source/MainWindow.h"/>
+      <FILE id="dsSzg0" name="MappingLogic.cpp" compile="1" resource="0"
             file="Source/MappingLogic.cpp"/>
-      <FILE id="iuiBef" name="MappingLogic.h" compile="0" resource="0" file="Source/MappingLogic.h"/>
-      <FILE id="YYLKyf" name="MidiEditArea.cpp" compile="1" resource="0"
+      <FILE id="Hx6swZ" name="MappingLogic.h" compile="0" resource="0" file="Source/MappingLogic.h"/>
+      <FILE id="i9IoXR" name="MidiEditArea.cpp" compile="1" resource="0"
             file="Source/MidiEditArea.cpp"/>
-      <FILE id="LjQFMx" name="MidiEditArea.h" compile="0" resource="0" file="Source/MidiEditArea.h"/>
-      <FILE id="ucFKGd" name="NoteEditArea.cpp" compile="1" resource="0"
+      <FILE id="CxWa2B" name="MidiEditArea.h" compile="0" resource="0" file="Source/MidiEditArea.h"/>
+      <FILE id="fdUtxE" name="KeyEditComponent.h" compile="0" resource="0"
+            file="Source/KeyEditComponent.h"/>
+      <FILE id="Stimwh" name="KeyEditComponent.cpp" compile="1" resource="0"
+            file="Source/KeyEditComponent.cpp"/>
+      <FILE id="Fgfs8d" name="NoteEditArea.cpp" compile="1" resource="0"
             file="Source/NoteEditArea.cpp"/>
-      <FILE id="PQqXEj" name="NoteEditArea.h" compile="0" resource="0" file="Source/NoteEditArea.h"/>
-      <FILE id="IHQ2GZ" name="NoteOnOffVelocityCurveDialog.cpp" compile="1"
+      <FILE id="zaOhaQ" name="NoteEditArea.h" compile="0" resource="0" file="Source/NoteEditArea.h"/>
+      <FILE id="iHjKwE" name="NoteOnOffVelocityCurveDialog.cpp" compile="1"
             resource="0" file="Source/NoteOnOffVelocityCurveDialog.cpp"/>
-      <FILE id="nUiT63" name="NoteOnOffVelocityCurveDialog.h" compile="0"
+      <FILE id="lQ3LQr" name="NoteOnOffVelocityCurveDialog.h" compile="0"
             resource="0" file="Source/NoteOnOffVelocityCurveDialog.h"/>
-      <FILE id="WMqCR6" name="Palette.h" compile="0" resource="0" file="Source/Palette.h"/>
-      <FILE id="DdslHa" name="PedalSensitivityDlg.cpp" compile="1" resource="0"
+      <FILE id="sNL7U3" name="PedalSensitivityDlg.cpp" compile="1" resource="0"
             file="Source/PedalSensitivityDlg.cpp"/>
-      <FILE id="mqP9eM" name="PedalSensitivityDlg.h" compile="0" resource="0"
+      <FILE id="yvs4m0" name="PedalSensitivityDlg.h" compile="0" resource="0"
             file="Source/PedalSensitivityDlg.h"/>
-      <FILE id="P5AG5a" name="PolygonPalette.h" compile="0" resource="0"
-            file="Source/PolygonPalette.h"/>
-      <FILE id="jicDur" name="SingleNoteAssign.cpp" compile="1" resource="0"
+      <FILE id="vNzcnM" name="SingleNoteAssign.cpp" compile="1" resource="0"
             file="Source/SingleNoteAssign.cpp"/>
-      <FILE id="qIYpWi" name="SingleNoteAssign.h" compile="0" resource="0"
+      <FILE id="NmQsyP" name="SingleNoteAssign.h" compile="0" resource="0"
             file="Source/SingleNoteAssign.h"/>
-      <FILE id="bKGAAH" name="TerpstraMidiDriver.cpp" compile="1" resource="0"
-            file="Source/TerpstraMidiDriver.cpp"/>
-      <FILE id="I4wBJA" name="TerpstraMidiDriver.h" compile="0" resource="0"
-            file="Source/TerpstraMidiDriver.h"/>
-      <FILE id="PrFbKB" name="VelocityCurveComponents.cpp" compile="1" resource="0"
+      <FILE id="tsxOTJ" name="VelocityCurveComponents.cpp" compile="1" resource="0"
             file="Source/VelocityCurveComponents.cpp"/>
-      <FILE id="PA8UlX" name="VelocityCurveComponents.h" compile="0" resource="0"
+      <FILE id="mS0FRf" name="VelocityCurveComponents.h" compile="0" resource="0"
             file="Source/VelocityCurveComponents.h"/>
-      <FILE id="kAAmJS" name="VelocityCurveDlgBase.cpp" compile="1" resource="0"
+      <FILE id="JF7pfY" name="VelocityCurveDlgBase.cpp" compile="1" resource="0"
             file="Source/VelocityCurveDlgBase.cpp"/>
-      <FILE id="JLtl8O" name="VelocityCurveDlgBase.h" compile="0" resource="0"
+      <FILE id="mGVvof" name="VelocityCurveDlgBase.h" compile="0" resource="0"
             file="Source/VelocityCurveDlgBase.h"/>
-      <FILE id="a653Oh" name="VelocityCurveEditStrategy.cpp" compile="1"
+      <FILE id="N3KSIv" name="VelocityCurveEditStrategy.cpp" compile="1"
             resource="0" file="Source/VelocityCurveEditStrategy.cpp"/>
-      <FILE id="ueMwkP" name="VelocityCurveEditStrategy.h" compile="0" resource="0"
+      <FILE id="HAnXtZ" name="VelocityCurveEditStrategy.h" compile="0" resource="0"
             file="Source/VelocityCurveEditStrategy.h"/>
-      <FILE id="hupPGF" name="ViewComponents.cpp" compile="1" resource="0"
-            file="Source/ViewComponents.cpp"/>
-      <FILE id="XlATkf" name="ViewComponents.h" compile="0" resource="0"
-            file="Source/ViewComponents.h"/>
-      <FILE id="NIOqcZ" name="ViewConstants.h" compile="0" resource="0" file="Source/ViewConstants.h"/>
-    </GROUP>
-    <GROUP id="{0C0C01A7-7D12-68B9-2CA8-9F3D2FF41CF7}" name="Libraries">
-      <GROUP id="{96667A4F-E44D-2DFC-0749-E88CB35C7C55}" name="mac">
-        <GROUP id="{693844E0-4D97-DCC2-79BD-F8AB2272C2C9}" name="include">
-          <FILE id="aPeFIJ" name="gcrypt.h" compile="0" resource="0" file="Libraries/mac/include/gcrypt.h"/>
-          <FILE id="zM4rN7" name="gpg-error.h" compile="0" resource="0" file="Libraries/mac/include/gpg-error.h"/>
-          <FILE id="xQedbr" name="gpgrt.h" compile="0" resource="0" file="Libraries/mac/include/gpgrt.h"/>
-          <FILE id="kwteHa" name="libssh2.h" compile="0" resource="0" file="Libraries/mac/include/libssh2.h"/>
-          <FILE id="arppeD" name="libssh2_publickey.h" compile="0" resource="0"
-                file="Libraries/mac/include/libssh2_publickey.h"/>
-          <FILE id="KxdO0a" name="libssh2_sftp.h" compile="0" resource="0" file="Libraries/mac/include/libssh2_sftp.h"/>
-        </GROUP>
-        <GROUP id="{3346AA41-2639-B63D-7501-7E199F898ABF}" name="lib">
-          <FILE id="Gu3FVA" name="libgcrypt.20.dylib" compile="0" resource="0"
-                file="Libraries/mac/lib/libgcrypt.20.dylib" xcodeResource="1"/>
-          <FILE id="KP2wfq" name="libgpg-error.0.dylib" compile="0" resource="0"
-                file="Libraries/mac/lib/libgpg-error.0.dylib" xcodeResource="1"/>
-          <FILE id="VpPlIs" name="libssh2.1.dylib" compile="0" resource="0" file="Libraries/mac/lib/libssh2.1.dylib"
-                xcodeResource="1"/>
-        </GROUP>
-      </GROUP>
-      <GROUP id="{2DB20667-3258-BE07-5618-CD9A56DD134A}" name="win64">
-        <GROUP id="{05820B0E-C8E5-E19B-471F-247617449AE6}" name="bin">
-          <FILE id="xCIYax" name="libssh2-x64.dll" compile="0" resource="0" file="Libraries/win64/bin/libssh2-x64.dll"/>
-        </GROUP>
-        <GROUP id="{E4C5D036-9389-7978-DAAF-A03754BDAF29}" name="include">
-          <FILE id="SlWVHi" name="libssh2.h" compile="0" resource="0" file="Libraries/win64/include/libssh2.h"/>
-          <FILE id="jUA5LG" name="libssh2_publickey.h" compile="0" resource="0"
-                file="Libraries/win64/include/libssh2_publickey.h"/>
-          <FILE id="YuZ6ua" name="libssh2_sftp.h" compile="0" resource="0" file="Libraries/win64/include/libssh2_sftp.h"/>
-        </GROUP>
-        <GROUP id="{30543A0A-F95B-91EE-80C4-CA2AB549CFB0}" name="lib">
-          <FILE id="IB1QJD" name="libssh2.a" compile="0" resource="0" file="Libraries/win64/lib/libssh2.a"/>
-          <FILE id="lQ8Boj" name="libssh2.dll.a" compile="0" resource="0" file="Libraries/win64/lib/libssh2.dll.a"/>
-        </GROUP>
-      </GROUP>
     </GROUP>
   </MAINGROUP>
   <EXPORTFORMATS>
@@ -395,6 +505,7 @@
         <MODULEPATH id="juce_audio_devices" path="..\..\JUCE\modules"/>
         <MODULEPATH id="juce_audio_basics" path="..\..\JUCE\modules"/>
         <MODULEPATH id="juce_opengl" path="../../juce-framework/JUCE/modules"/>
+        <MODULEPATH id="juce_audio_processors" path="../../juce-framework/JUCE/modules"/>
       </MODULEPATHS>
     </LINUX_MAKE>
     <XCODE_MAC targetFolder="Builds/MacOSX" bigIcon="yjLw0u" hardenedRuntime="1"
@@ -418,6 +529,7 @@
         <MODULEPATH id="juce_audio_devices" path="..\..\JUCE\modules"/>
         <MODULEPATH id="juce_audio_basics" path="../JUCE/modules"/>
         <MODULEPATH id="juce_opengl" path="../../juce-framework/JUCE/modules"/>
+        <MODULEPATH id="juce_audio_processors" path="../../juce-framework/JUCE/modules"/>
       </MODULEPATHS>
     </XCODE_MAC>
     <VS2017 targetFolder="Builds/VisualStudio2017" smallIcon="fwSyLL" bigIcon="yjLw0u"
@@ -438,6 +550,7 @@
         <MODULEPATH id="juce_audio_devices" path="..\..\JUCE\modules"/>
         <MODULEPATH id="juce_audio_basics" path="..\..\JUCE\modules"/>
         <MODULEPATH id="juce_opengl" path="../../juce-framework/JUCE/modules"/>
+        <MODULEPATH id="juce_audio_processors" path="../../juce-framework/JUCE/modules"/>
       </MODULEPATHS>
     </VS2017>
     <VS2019 targetFolder="Builds/VisualStudio2019" externalLibraries="libssh2.dll.a"
@@ -458,6 +571,7 @@
         <MODULEPATH id="juce_audio_devices"/>
         <MODULEPATH id="juce_audio_basics"/>
         <MODULEPATH id="juce_opengl" path="../../juce-framework/JUCE/modules"/>
+        <MODULEPATH id="juce_audio_processors" path="../../juce-framework/JUCE/modules"/>
       </MODULEPATHS>
     </VS2019>
     <VS2022 targetFolder="Builds/VisualStudio2022" extraDefs="SERVERHOST=&quot;192.168.7.2&quot;"
@@ -478,12 +592,14 @@
         <MODULEPATH id="juce_gui_basics" path="P:\Programming-Projects\juce-framework\JUCE\modules"/>
         <MODULEPATH id="juce_gui_extra" path="P:\Programming-Projects\juce-framework\JUCE\modules"/>
         <MODULEPATH id="juce_opengl" path="../../juce-framework/JUCE/modules"/>
+        <MODULEPATH id="juce_audio_processors" path="../../juce-framework/JUCE/modules"/>
       </MODULEPATHS>
     </VS2022>
   </EXPORTFORMATS>
   <MODULES>
     <MODULES id="juce_audio_basics" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
     <MODULES id="juce_audio_devices" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
+    <MODULE id="juce_audio_processors" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
     <MODULES id="juce_core" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
     <MODULES id="juce_data_structures" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
     <MODULES id="juce_events" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>