From 28bc0bed137d258cb4db5906175f44a6bd22c90d Mon Sep 17 00:00:00 2001
From: asb2m10 <asb2m10@gmail.com>
Date: Sun, 4 Aug 2024 15:10:03 -0400
Subject: [PATCH] Force focus order

---
 Source/GlobalEditor.cpp   | 105 ++++++++++++++--------
 Source/GlobalEditor.h     |   2 +-
 Source/OperatorEditor.cpp |  79 +++++++++++------
 Source/OperatorEditor.h   |   2 +-
 Source/ParamDialog.cpp    | 181 ++++++++++++++++++++++----------------
 Source/ParamDialog.h      |   2 +-
 Source/PluginParam.cpp    |   2 +
 7 files changed, 227 insertions(+), 146 deletions(-)

diff --git a/Source/GlobalEditor.cpp b/Source/GlobalEditor.cpp
index d0ac83a2..fc62e594 100644
--- a/Source/GlobalEditor.cpp
+++ b/Source/GlobalEditor.cpp
@@ -7,7 +7,7 @@
   the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
   and re-saved.
 
-  Created with Projucer version: 6.0.7
+  Created with Projucer version: 7.0.9
 
   ------------------------------------------------------------------------------
 
@@ -40,7 +40,7 @@ class MidiMonitor : public Component {
     int imageHeight2;
     int imageWidth;
 
-    SharedResourcePointer<DXLookNFeel> lookAndFeel; 
+    SharedResourcePointer<DXLookNFeel> lookAndFeel;
 public:
     MidiMonitor(SysexComm *sysexComm) {
         midi = sysexComm;
@@ -95,7 +95,7 @@ class AboutBox : public DialogWindow {
         surge->setColour(HyperlinkButton::ColourIds::textColourId, Colour(0xFF4ea097));
         surge->setJustificationType(Justification::left);
         surge->setBounds(18, 458, getWidth() - 36, 30);
-        
+
         // create a new Component to hold ''dexed'' and ''surge'' as subcomponents
         // and set this holder Component as the content component of the DialogWindow
         Component* holder = new Component();
@@ -135,6 +135,7 @@ GlobalEditor::GlobalEditor ()
 
     lfoSpeed.reset (new juce::Slider ("lfoSpeed"));
     addAndMakeVisible (lfoSpeed.get());
+    lfoSpeed->setExplicitFocusOrder (14);
     lfoSpeed->setRange (0, 99, 1);
     lfoSpeed->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     lfoSpeed->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -144,6 +145,7 @@ GlobalEditor::GlobalEditor ()
 
     lfoAmDepth.reset (new juce::Slider ("lfoAmDepth"));
     addAndMakeVisible (lfoAmDepth.get());
+    lfoAmDepth->setExplicitFocusOrder (19);
     lfoAmDepth->setRange (0, 99, 1);
     lfoAmDepth->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     lfoAmDepth->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -153,6 +155,7 @@ GlobalEditor::GlobalEditor ()
 
     lfoPitchDepth.reset (new juce::Slider ("lfoPitchDepth"));
     addAndMakeVisible (lfoPitchDepth.get());
+    lfoPitchDepth->setExplicitFocusOrder (18);
     lfoPitchDepth->setRange (0, 99, 1);
     lfoPitchDepth->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     lfoPitchDepth->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -162,6 +165,7 @@ GlobalEditor::GlobalEditor ()
 
     lfoDelay.reset (new juce::Slider ("lfoDelay"));
     addAndMakeVisible (lfoDelay.get());
+    lfoDelay->setExplicitFocusOrder (15);
     lfoDelay->setRange (0, 99, 1);
     lfoDelay->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     lfoDelay->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -171,6 +175,7 @@ GlobalEditor::GlobalEditor ()
 
     cutoff.reset (new juce::Slider ("cutoff"));
     addAndMakeVisible (cutoff.get());
+    cutoff->setExplicitFocusOrder (6);
     cutoff->setRange (0, 1, 0);
     cutoff->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     cutoff->setTextBoxStyle (juce::Slider::NoTextBox, true, 80, 20);
@@ -180,6 +185,7 @@ GlobalEditor::GlobalEditor ()
 
     reso.reset (new juce::Slider ("reso"));
     addAndMakeVisible (reso.get());
+    reso->setExplicitFocusOrder (7);
     reso->setRange (0, 1, 0);
     reso->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     reso->setTextBoxStyle (juce::Slider::NoTextBox, true, 80, 20);
@@ -189,6 +195,7 @@ GlobalEditor::GlobalEditor ()
 
     pitchRate2.reset (new juce::Slider ("pitchRate2"));
     addAndMakeVisible (pitchRate2.get());
+    pitchRate2->setExplicitFocusOrder (24);
     pitchRate2->setRange (0, 99, 1);
     pitchRate2->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     pitchRate2->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -198,6 +205,7 @@ GlobalEditor::GlobalEditor ()
 
     pitchRate3.reset (new juce::Slider ("pitchRate3"));
     addAndMakeVisible (pitchRate3.get());
+    pitchRate3->setExplicitFocusOrder (26);
     pitchRate3->setRange (0, 99, 1);
     pitchRate3->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     pitchRate3->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -207,6 +215,7 @@ GlobalEditor::GlobalEditor ()
 
     pitchRate4.reset (new juce::Slider ("pitchRate4"));
     addAndMakeVisible (pitchRate4.get());
+    pitchRate4->setExplicitFocusOrder (28);
     pitchRate4->setRange (0, 99, 1);
     pitchRate4->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     pitchRate4->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -216,6 +225,7 @@ GlobalEditor::GlobalEditor ()
 
     pitchRate1.reset (new juce::Slider ("pitchRate1"));
     addAndMakeVisible (pitchRate1.get());
+    pitchRate1->setExplicitFocusOrder (22);
     pitchRate1->setRange (0, 99, 1);
     pitchRate1->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     pitchRate1->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -225,6 +235,7 @@ GlobalEditor::GlobalEditor ()
 
     pitchLevel2.reset (new juce::Slider ("pitchLevel2"));
     addAndMakeVisible (pitchLevel2.get());
+    pitchLevel2->setExplicitFocusOrder (23);
     pitchLevel2->setRange (0, 99, 1);
     pitchLevel2->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     pitchLevel2->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -234,6 +245,7 @@ GlobalEditor::GlobalEditor ()
 
     pitchLevel3.reset (new juce::Slider ("pitchLevel3"));
     addAndMakeVisible (pitchLevel3.get());
+    pitchLevel3->setExplicitFocusOrder (25);
     pitchLevel3->setRange (0, 99, 1);
     pitchLevel3->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     pitchLevel3->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -243,6 +255,7 @@ GlobalEditor::GlobalEditor ()
 
     pitchLevel4.reset (new juce::Slider ("pitchLevel4"));
     addAndMakeVisible (pitchLevel4.get());
+    pitchLevel4->setExplicitFocusOrder (27);
     pitchLevel4->setRange (0, 99, 1);
     pitchLevel4->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     pitchLevel4->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -252,6 +265,7 @@ GlobalEditor::GlobalEditor ()
 
     pitchLevel1.reset (new juce::Slider ("pitchLevel1"));
     addAndMakeVisible (pitchLevel1.get());
+    pitchLevel1->setExplicitFocusOrder (21);
     pitchLevel1->setRange (0, 99, 1);
     pitchLevel1->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     pitchLevel1->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -261,6 +275,7 @@ GlobalEditor::GlobalEditor ()
 
     transpose.reset (new juce::Slider ("transpose"));
     addAndMakeVisible (transpose.get());
+    transpose->setExplicitFocusOrder (9);
     transpose->setRange (0, 48, 1);
     transpose->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     transpose->setTextBoxStyle (juce::Slider::NoTextBox, true, 80, 20);
@@ -270,6 +285,7 @@ GlobalEditor::GlobalEditor ()
 
     oscSync.reset (new juce::ToggleButton ("oscSync"));
     addAndMakeVisible (oscSync.get());
+    oscSync->setExplicitFocusOrder (20);
     oscSync->setButtonText (juce::String());
     oscSync->addListener (this);
 
@@ -277,6 +293,7 @@ GlobalEditor::GlobalEditor ()
 
     pitchModSens.reset (new juce::Slider ("pitchModSens"));
     addAndMakeVisible (pitchModSens.get());
+    pitchModSens->setExplicitFocusOrder (17);
     pitchModSens->setRange (0, 7, 1);
     pitchModSens->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     pitchModSens->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -286,6 +303,7 @@ GlobalEditor::GlobalEditor ()
 
     lfoSync.reset (new juce::ToggleButton ("lfoSync"));
     addAndMakeVisible (lfoSync.get());
+    lfoSync->setExplicitFocusOrder (16);
     lfoSync->setButtonText (juce::String());
     lfoSync->addListener (this);
 
@@ -305,6 +323,7 @@ GlobalEditor::GlobalEditor ()
 
     feedback.reset (new juce::Slider ("feedback"));
     addAndMakeVisible (feedback.get());
+    feedback->setExplicitFocusOrder (12);
     feedback->setRange (0, 7, 1);
     feedback->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     feedback->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -314,6 +333,7 @@ GlobalEditor::GlobalEditor ()
 
     algo.reset (new juce::Slider ("algo"));
     addAndMakeVisible (algo.get());
+    algo->setExplicitFocusOrder (11);
     algo->setRange (1, 32, 1);
     algo->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     algo->setTextBoxStyle (juce::Slider::NoTextBox, true, 80, 20);
@@ -329,6 +349,7 @@ GlobalEditor::GlobalEditor ()
 
     output.reset (new juce::Slider ("output"));
     addAndMakeVisible (output.get());
+    output->setExplicitFocusOrder (8);
     output->setRange (0, 1, 0);
     output->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     output->setTextBoxStyle (juce::Slider::NoTextBox, true, 80, 20);
@@ -336,9 +357,7 @@ GlobalEditor::GlobalEditor ()
 
     output->setBounds (157, 60, 34, 34);
 
-    //vuOutput.reset (new VuMeter());
-    //vuOutput.reset(new VuMeterMain(6));
-    vuOutput.reset(new VuMeterOutput);
+    vuOutput.reset (new VuMeterOutput ());
     addAndMakeVisible (vuOutput.get());
     vuOutput->setName ("vuOutput");
 
@@ -346,34 +365,39 @@ GlobalEditor::GlobalEditor ()
 
     initButton.reset (new juce::TextButton ("initButton"));
     addAndMakeVisible (initButton.get());
-    initButton->setButtonText (translate("INIT"));
+    initButton->setExplicitFocusOrder (3);
+    initButton->setButtonText (TRANS ("INIT"));
     initButton->addListener (this);
 
     initButton->setBounds (100, 111, 50, 30);
 
     parmButton.reset (new juce::TextButton ("parmButton"));
     addAndMakeVisible (parmButton.get());
-    parmButton->setButtonText (translate("PARM"));
+    parmButton->setExplicitFocusOrder (2);
+    parmButton->setButtonText (TRANS ("PARM"));
     parmButton->addListener (this);
 
     parmButton->setBounds (52, 111, 50, 30);
 
     cartButton.reset (new juce::TextButton ("cartButton"));
     addAndMakeVisible (cartButton.get());
-    cartButton->setButtonText (translate("CART"));
+    cartButton->setExplicitFocusOrder (1);
+    cartButton->setButtonText (TRANS ("CART"));
     cartButton->addListener (this);
 
     cartButton->setBounds (3, 111, 50, 30);
 
     storeButton.reset (new juce::TextButton ("storeButton"));
     addAndMakeVisible (storeButton.get());
-    storeButton->setButtonText (translate("STORE"));
+    storeButton->setExplicitFocusOrder (4);
+    storeButton->setButtonText (TRANS ("STORE"));
     storeButton->addListener (this);
 
     storeButton->setBounds (270, 109, 50, 30);
 
     monoMode.reset (new juce::ToggleButton ("monoMode"));
     addAndMakeVisible (monoMode.get());
+    monoMode->setExplicitFocusOrder (10);
     monoMode->setButtonText (juce::String());
     monoMode->addListener (this);
 
@@ -381,6 +405,7 @@ GlobalEditor::GlobalEditor ()
 
     lfoType.reset (new ComboBoxImage());
     addAndMakeVisible (lfoType.get());
+    lfoType->setExplicitFocusOrder (13);
     lfoType->setName ("lfoType");
 
     lfoType->setBounds (583, 8, 36, 26);
@@ -404,6 +429,7 @@ GlobalEditor::GlobalEditor ()
 
     tune.reset (new juce::Slider ("tune"));
     addAndMakeVisible (tune.get());
+    tune->setExplicitFocusOrder (5);
     tune->setRange (0, 1, 0);
     tune->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     tune->setTextBoxStyle (juce::Slider::NoTextBox, true, 80, 20);
@@ -791,86 +817,86 @@ BEGIN_JUCER_METADATA
                  fixedSize="1" initialWidth="864" initialHeight="144">
   <BACKGROUND backgroundColour="ffffff"/>
   <SLIDER name="lfoSpeed" id="b10eaf327ab3bff5" memberName="lfoSpeed" virtualName=""
-          explicitFocusOrder="0" pos="564 50 34 34" min="0.0" max="99.0"
+          explicitFocusOrder="14" pos="564 50 34 34" min="0.0" max="99.0"
           int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox" textBoxEditable="1"
           textBoxWidth="80" textBoxHeight="20" skewFactor="1.0" needsCallback="1"/>
   <SLIDER name="lfoAmDepth" id="3e95a6206fa4a891" memberName="lfoAmDepth"
-          virtualName="" explicitFocusOrder="0" pos="686 50 34 34" min="0.0"
+          virtualName="" explicitFocusOrder="19" pos="686 50 34 34" min="0.0"
           max="99.0" int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <SLIDER name="lfoPitchDepth" id="6ead769ca786c813" memberName="lfoPitchDepth"
-          virtualName="" explicitFocusOrder="0" pos="646 50 34 34" min="0.0"
+          virtualName="" explicitFocusOrder="18" pos="646 50 34 34" min="0.0"
           max="99.0" int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <SLIDER name="lfoDelay" id="1fce68dc81619ef5" memberName="lfoDelay" virtualName=""
-          explicitFocusOrder="0" pos="603 50 34 34" min="0.0" max="99.0"
+          explicitFocusOrder="15" pos="603 50 34 34" min="0.0" max="99.0"
           int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox" textBoxEditable="1"
           textBoxWidth="80" textBoxHeight="20" skewFactor="1.0" needsCallback="1"/>
   <SLIDER name="cutoff" id="40531f16bb0bd225" memberName="cutoff" virtualName=""
-          explicitFocusOrder="0" pos="234 9 34 34" min="0.0" max="1.0"
+          explicitFocusOrder="6" pos="234 9 34 34" min="0.0" max="1.0"
           int="0.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox" textBoxEditable="0"
           textBoxWidth="80" textBoxHeight="20" skewFactor="1.0" needsCallback="1"/>
   <SLIDER name="reso" id="c8c13464e81a8d83" memberName="reso" virtualName=""
-          explicitFocusOrder="0" pos="278 9 34 34" min="0.0" max="1.0"
+          explicitFocusOrder="7" pos="278 9 34 34" min="0.0" max="1.0"
           int="0.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox" textBoxEditable="0"
           textBoxWidth="80" textBoxHeight="20" skewFactor="1.0" needsCallback="1"/>
   <SLIDER name="pitchRate2" id="73f386b3c91d3de4" memberName="pitchRate2"
-          virtualName="" explicitFocusOrder="0" pos="767 96 34 34" min="0.0"
+          virtualName="" explicitFocusOrder="24" pos="767 96 34 34" min="0.0"
           max="99.0" int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <SLIDER name="pitchRate3" id="187c25b24413fccf" memberName="pitchRate3"
-          virtualName="" explicitFocusOrder="0" pos="795 96 35 34" min="0.0"
+          virtualName="" explicitFocusOrder="26" pos="795 96 35 34" min="0.0"
           max="99.0" int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <SLIDER name="pitchRate4" id="1aeb2a8fbbcbeaab" memberName="pitchRate4"
-          virtualName="" explicitFocusOrder="0" pos="823 96 34 34" min="0.0"
+          virtualName="" explicitFocusOrder="28" pos="823 96 34 34" min="0.0"
           max="99.0" int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <SLIDER name="pitchRate1" id="419d613b3fb9604e" memberName="pitchRate1"
-          virtualName="" explicitFocusOrder="0" pos="739 96 34 34" min="0.0"
+          virtualName="" explicitFocusOrder="22" pos="739 96 34 34" min="0.0"
           max="99.0" int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <SLIDER name="pitchLevel2" id="3a355ad2221887d9" memberName="pitchLevel2"
-          virtualName="" explicitFocusOrder="0" pos="767 57 34 34" min="0.0"
+          virtualName="" explicitFocusOrder="23" pos="767 57 34 34" min="0.0"
           max="99.0" int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <SLIDER name="pitchLevel3" id="5c5d782e8a7f3ad7" memberName="pitchLevel3"
-          virtualName="" explicitFocusOrder="0" pos="795 56 34 34" min="0.0"
+          virtualName="" explicitFocusOrder="25" pos="795 56 34 34" min="0.0"
           max="99.0" int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <SLIDER name="pitchLevel4" id="eb900b141fbad8ff" memberName="pitchLevel4"
-          virtualName="" explicitFocusOrder="0" pos="823 56 34 34" min="0.0"
+          virtualName="" explicitFocusOrder="27" pos="823 56 34 34" min="0.0"
           max="99.0" int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <SLIDER name="pitchLevel1" id="344cbe26ec9fa128" memberName="pitchLevel1"
-          virtualName="" explicitFocusOrder="0" pos="739 57 34 34" min="0.0"
+          virtualName="" explicitFocusOrder="21" pos="739 57 34 34" min="0.0"
           max="99.0" int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <SLIDER name="transpose" id="7d1266b1c1534947" memberName="transpose"
-          virtualName="" explicitFocusOrder="0" pos="202 60 34 34" min="0.0"
+          virtualName="" explicitFocusOrder="9" pos="202 60 34 34" min="0.0"
           max="48.0" int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox"
           textBoxEditable="0" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <TOGGLEBUTTON name="oscSync" id="8f3fe641537cd00" memberName="oscSync" virtualName=""
-                explicitFocusOrder="0" pos="650 96 48 26" buttonText="" connectedEdges="0"
+                explicitFocusOrder="20" pos="650 96 48 26" buttonText="" connectedEdges="0"
                 needsCallback="1" radioGroupId="0" state="0"/>
   <SLIDER name="pitchModSens" id="904f73df85a9f886" memberName="pitchModSens"
-          virtualName="" explicitFocusOrder="0" pos="666 5 34 34" min="0.0"
+          virtualName="" explicitFocusOrder="17" pos="666 5 34 34" min="0.0"
           max="7.0" int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <TOGGLEBUTTON name="lfoSync" id="ff92bb0a5a4f7187" memberName="lfoSync" virtualName=""
-                explicitFocusOrder="0" pos="565 96 48 26" buttonText="" connectedEdges="0"
+                explicitFocusOrder="16" pos="565 96 48 26" buttonText="" connectedEdges="0"
                 needsCallback="1" radioGroupId="0" state="0"/>
   <GENERICCOMPONENT name="pitchEnvDisplay" id="9ddaae8ef924a038" memberName="pitchEnvDisplay"
                     virtualName="" explicitFocusOrder="0" pos="751 10 93 30" class="PitchEnvDisplay"
@@ -879,39 +905,40 @@ BEGIN_JUCER_METADATA
                     virtualName="" explicitFocusOrder="0" pos="335 30 152 91" class="AlgoDisplay"
                     params=""/>
   <SLIDER name="feedback" id="4fac1940c29ab8c" memberName="feedback" virtualName=""
-          explicitFocusOrder="0" pos="501 81 34 34" min="0.0" max="7.0"
+          explicitFocusOrder="12" pos="501 81 34 34" min="0.0" max="7.0"
           int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox" textBoxEditable="1"
           textBoxWidth="80" textBoxHeight="20" skewFactor="1.0" needsCallback="1"/>
   <SLIDER name="algo" id="8a226ddf9bbff752" memberName="algo" virtualName=""
-          explicitFocusOrder="0" pos="501 22 34 34" min="1.0" max="32.0"
+          explicitFocusOrder="11" pos="501 22 34 34" min="1.0" max="32.0"
           int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox" textBoxEditable="0"
           textBoxWidth="80" textBoxHeight="20" skewFactor="1.0" needsCallback="1"/>
   <GENERICCOMPONENT name="lcdDisplay" id="30c7bb8f114cbbe3" memberName="lcdDisplay"
                     virtualName="" explicitFocusOrder="0" pos="6 87 140 13" class="LcdDisplay"
                     params=""/>
   <SLIDER name="output" id="7697fdd54fd1593e" memberName="output" virtualName=""
-          explicitFocusOrder="0" pos="157 60 34 34" min="0.0" max="1.0"
+          explicitFocusOrder="8" pos="157 60 34 34" min="0.0" max="1.0"
           int="0.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox" textBoxEditable="0"
           textBoxWidth="80" textBoxHeight="20" skewFactor="1.0" needsCallback="1"/>
   <GENERICCOMPONENT name="vuOutput" id="dac75af912267f51" memberName="vuOutput" virtualName=""
-                    explicitFocusOrder="0" pos="6 103 140 8" class="VuMeterOutput" params=""/>
+                    explicitFocusOrder="0" pos="6 103 140 8" class="VuMeterOutput"
+                    params=""/>
   <TEXTBUTTON name="initButton" id="92b278163c42e21d" memberName="initButton"
-              virtualName="" explicitFocusOrder="0" pos="100 111 50 30" buttonText="INIT"
+              virtualName="" explicitFocusOrder="3" pos="100 111 50 30" buttonText="INIT"
               connectedEdges="0" needsCallback="1" radioGroupId="0"/>
   <TEXTBUTTON name="parmButton" id="d5cd6260b34be817" memberName="parmButton"
-              virtualName="" explicitFocusOrder="0" pos="52 111 50 30" buttonText="PARM"
+              virtualName="" explicitFocusOrder="2" pos="52 111 50 30" buttonText="PARM"
               connectedEdges="0" needsCallback="1" radioGroupId="0"/>
   <TEXTBUTTON name="cartButton" id="465a101c3a0e744" memberName="cartButton"
-              virtualName="" explicitFocusOrder="0" pos="3 111 50 30" buttonText="CART"
+              virtualName="" explicitFocusOrder="1" pos="3 111 50 30" buttonText="CART"
               connectedEdges="0" needsCallback="1" radioGroupId="0"/>
   <TEXTBUTTON name="storeButton" id="a94bec26832eb58b" memberName="storeButton"
-              virtualName="" explicitFocusOrder="0" pos="270 109 50 30" buttonText="STORE"
+              virtualName="" explicitFocusOrder="4" pos="270 109 50 30" buttonText="STORE"
               connectedEdges="0" needsCallback="1" radioGroupId="0"/>
   <TOGGLEBUTTON name="monoMode" id="e683d8cbe286367b" memberName="monoMode" virtualName=""
-                explicitFocusOrder="0" pos="249 65 48 26" buttonText="" connectedEdges="0"
+                explicitFocusOrder="10" pos="249 65 48 26" buttonText="" connectedEdges="0"
                 needsCallback="1" radioGroupId="0" state="0"/>
   <GENERICCOMPONENT name="lfoType" id="62f61dda9f76c8f" memberName="lfoType" virtualName=""
-                    explicitFocusOrder="0" pos="583 8 36 26" class="ComboBoxImage"
+                    explicitFocusOrder="13" pos="583 8 36 26" class="ComboBoxImage"
                     params=""/>
   <GENERICCOMPONENT name="programSelector" id="990bbcccae72dbe6" memberName="programSelector"
                     virtualName="" explicitFocusOrder="0" pos="153 115 112 18" class="ProgramSelector"
@@ -923,7 +950,7 @@ BEGIN_JUCER_METADATA
                opacityOver="1.0" colourOver="0" resourceDown="" opacityDown="1.0"
                colourDown="0"/>
   <SLIDER name="tune" id="d22c34aa3363a28a" memberName="tune" virtualName=""
-          explicitFocusOrder="0" pos="190 9 34 34" min="0.0" max="1.0"
+          explicitFocusOrder="5" pos="190 9 34 34" min="0.0" max="1.0"
           int="0.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox" textBoxEditable="0"
           textBoxWidth="80" textBoxHeight="20" skewFactor="1.0" needsCallback="1"/>
 </JUCER_COMPONENT>
diff --git a/Source/GlobalEditor.h b/Source/GlobalEditor.h
index 65b59b43..232ef68c 100644
--- a/Source/GlobalEditor.h
+++ b/Source/GlobalEditor.h
@@ -7,7 +7,7 @@
   the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
   and re-saved.
 
-  Created with Projucer version: 6.0.7
+  Created with Projucer version: 7.0.9
 
   ------------------------------------------------------------------------------
 
diff --git a/Source/OperatorEditor.cpp b/Source/OperatorEditor.cpp
index 9f82e6d9..d2270849 100644
--- a/Source/OperatorEditor.cpp
+++ b/Source/OperatorEditor.cpp
@@ -7,7 +7,7 @@
   the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
   and re-saved.
 
-  Created with Projucer version: 6.0.1
+  Created with Projucer version: 7.0.9
 
   ------------------------------------------------------------------------------
 
@@ -19,7 +19,7 @@
 
 //[Headers] You can add your own extra header files here...
 //[/Headers]
-#include "VUMeter.h"
+
 #include "OperatorEditor.h"
 
 
@@ -52,6 +52,7 @@ OperatorEditor::OperatorEditor ()
 
     s_egl1.reset (new juce::Slider ("egl1"));
     addAndMakeVisible (s_egl1.get());
+    s_egl1->setExplicitFocusOrder (4);
     s_egl1->setRange (0, 99, 1);
     s_egl1->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     s_egl1->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -61,15 +62,17 @@ OperatorEditor::OperatorEditor ()
 
     s_egl2.reset (new juce::Slider ("egl2"));
     addAndMakeVisible (s_egl2.get());
+    s_egl2->setExplicitFocusOrder (6);
     s_egl2->setRange (0, 99, 1);
     s_egl2->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     s_egl2->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
     s_egl2->addListener (this);
 
-    s_egl2->setBounds (33, 129, 34, 34);
+    s_egl2->setBounds (33, 128, 34, 34);
 
     s_egl3.reset (new juce::Slider ("egl3"));
     addAndMakeVisible (s_egl3.get());
+    s_egl3->setExplicitFocusOrder (8);
     s_egl3->setRange (0, 99, 1);
     s_egl3->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     s_egl3->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -79,6 +82,7 @@ OperatorEditor::OperatorEditor ()
 
     s_egl4.reset (new juce::Slider ("egl4"));
     addAndMakeVisible (s_egl4.get());
+    s_egl4->setExplicitFocusOrder (10);
     s_egl4->setRange (0, 99, 1);
     s_egl4->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     s_egl4->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -88,6 +92,7 @@ OperatorEditor::OperatorEditor ()
 
     s_egv1.reset (new juce::Slider ("egr1"));
     addAndMakeVisible (s_egv1.get());
+    s_egv1->setExplicitFocusOrder (5);
     s_egv1->setRange (0, 99, 1);
     s_egv1->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     s_egv1->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -97,6 +102,7 @@ OperatorEditor::OperatorEditor ()
 
     s_egv2.reset (new juce::Slider ("egr3"));
     addAndMakeVisible (s_egv2.get());
+    s_egv2->setExplicitFocusOrder (7);
     s_egv2->setRange (0, 99, 1);
     s_egv2->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     s_egv2->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -106,6 +112,7 @@ OperatorEditor::OperatorEditor ()
 
     s_egv3.reset (new juce::Slider ("egr3"));
     addAndMakeVisible (s_egv3.get());
+    s_egv3->setExplicitFocusOrder (9);
     s_egv3->setRange (0, 99, 1);
     s_egv3->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     s_egv3->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -115,6 +122,7 @@ OperatorEditor::OperatorEditor ()
 
     s_egv4.reset (new juce::Slider ("egr4"));
     addAndMakeVisible (s_egv4.get());
+    s_egv4->setExplicitFocusOrder (11);
     s_egv4->setRange (0, 99, 1);
     s_egv4->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     s_egv4->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -124,6 +132,7 @@ OperatorEditor::OperatorEditor ()
 
     opLevel.reset (new juce::Slider ("opLevel"));
     addAndMakeVisible (opLevel.get());
+    opLevel->setExplicitFocusOrder (15);
     opLevel->setRange (0, 99, 1);
     opLevel->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     opLevel->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -133,6 +142,7 @@ OperatorEditor::OperatorEditor ()
 
     opFine.reset (new juce::Slider ("opFine"));
     addAndMakeVisible (opFine.get());
+    opFine->setExplicitFocusOrder (3);
     opFine->setRange (0, 99, 1);
     opFine->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     opFine->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -142,6 +152,7 @@ OperatorEditor::OperatorEditor ()
 
     opCoarse.reset (new juce::Slider ("opCoarse"));
     addAndMakeVisible (opCoarse.get());
+    opCoarse->setExplicitFocusOrder (2);
     opCoarse->setRange (0, 31, 1);
     opCoarse->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     opCoarse->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -150,7 +161,7 @@ OperatorEditor::OperatorEditor ()
     opCoarse->setBounds (43, 24, 34, 34);
 
     khzDisplay.reset (new juce::Label ("khz",
-                                       translate("1,000 kHz")));
+                                       TRANS ("1,000 kHz")));
     addAndMakeVisible (khzDisplay.get());
     khzDisplay->setFont (juce::Font (12.60f, juce::Font::plain).withTypefaceStyle ("Regular"));
     khzDisplay->setJustificationType (juce::Justification::centred);
@@ -165,6 +176,7 @@ OperatorEditor::OperatorEditor ()
 
     detune.reset (new juce::Slider ("detune"));
     addAndMakeVisible (detune.get());
+    detune->setExplicitFocusOrder (1);
     detune->setRange (-7, 7, 1);
     detune->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     detune->setTextBoxStyle (juce::Slider::NoTextBox, true, 80, 20);
@@ -180,7 +192,8 @@ OperatorEditor::OperatorEditor ()
 
     sclLeftLevel.reset (new juce::Slider ("sclLeftLevel"));
     addAndMakeVisible (sclLeftLevel.get());
-    sclLeftLevel->setTooltip (translate("Keyboard Scale Level Left Depth "));
+    sclLeftLevel->setTooltip (TRANS ("Keyboard Scale Level Left Depth "));
+    sclLeftLevel->setExplicitFocusOrder (16);
     sclLeftLevel->setRange (0, 99, 1);
     sclLeftLevel->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     sclLeftLevel->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -190,7 +203,8 @@ OperatorEditor::OperatorEditor ()
 
     sclRightLevel.reset (new juce::Slider ("sclRightLevel"));
     addAndMakeVisible (sclRightLevel.get());
-    sclRightLevel->setTooltip (translate("Keyboard Scale Level Right Depth "));
+    sclRightLevel->setTooltip (TRANS ("Keyboard Scale Level Right Depth "));
+    sclRightLevel->setExplicitFocusOrder (18);
     sclRightLevel->setRange (0, 99, 1);
     sclRightLevel->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     sclRightLevel->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -200,7 +214,8 @@ OperatorEditor::OperatorEditor ()
 
     sclLvlBrkPt.reset (new juce::Slider ("sclLvlBrkPt"));
     addAndMakeVisible (sclLvlBrkPt.get());
-    sclLvlBrkPt->setTooltip (translate("Scale Level Breakpoint"));
+    sclLvlBrkPt->setTooltip (TRANS ("Scale Level Breakpoint"));
+    sclLvlBrkPt->setExplicitFocusOrder (17);
     sclLvlBrkPt->setRange (0, 99, 1);
     sclLvlBrkPt->setSliderStyle (juce::Slider::LinearHorizontal);
     sclLvlBrkPt->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -210,7 +225,8 @@ OperatorEditor::OperatorEditor ()
 
     sclRateScaling.reset (new juce::Slider ("sclRateScaling"));
     addAndMakeVisible (sclRateScaling.get());
-    sclRateScaling->setTooltip (translate("Keyboard Rate Scaling"));
+    sclRateScaling->setTooltip (TRANS ("Keyboard Rate Scaling"));
+    sclRateScaling->setExplicitFocusOrder (20);
     sclRateScaling->setRange (0, 7, 1);
     sclRateScaling->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     sclRateScaling->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -220,6 +236,7 @@ OperatorEditor::OperatorEditor ()
 
     keyVelSens.reset (new juce::Slider ("keyVelSens"));
     addAndMakeVisible (keyVelSens.get());
+    keyVelSens->setExplicitFocusOrder (14);
     keyVelSens->setRange (0, 7, 1);
     keyVelSens->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     keyVelSens->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -229,6 +246,7 @@ OperatorEditor::OperatorEditor ()
 
     ampModSens.reset (new juce::Slider ("ampModSens"));
     addAndMakeVisible (ampModSens.get());
+    ampModSens->setExplicitFocusOrder (13);
     ampModSens->setRange (0, 3, 1);
     ampModSens->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     ampModSens->setTextBoxStyle (juce::Slider::NoTextBox, false, 80, 20);
@@ -244,6 +262,7 @@ OperatorEditor::OperatorEditor ()
 
     opMode.reset (new juce::ToggleButton ("opMode"));
     addAndMakeVisible (opMode.get());
+    opMode->setExplicitFocusOrder (12);
     opMode->setButtonText (juce::String());
     opMode->addListener (this);
 
@@ -251,12 +270,14 @@ OperatorEditor::OperatorEditor ()
 
     kbdLeftCurve.reset (new ComboBoxImage());
     addAndMakeVisible (kbdLeftCurve.get());
+    kbdLeftCurve->setExplicitFocusOrder (19);
     kbdLeftCurve->setName ("kbdLeftCurve");
 
     kbdLeftCurve->setBounds (128, 170, 36, 26);
 
     kbdRightCurve.reset (new ComboBoxImage());
     addAndMakeVisible (kbdRightCurve.get());
+    kbdRightCurve->setExplicitFocusOrder (21);
     kbdRightCurve->setName ("kbdRightCurve");
 
     kbdRightCurve->setBounds (240, 170, 36, 26);
@@ -619,47 +640,47 @@ BEGIN_JUCER_METADATA
                  fixedSize="1" initialWidth="287" initialHeight="218">
   <BACKGROUND backgroundColour="ffffff"/>
   <SLIDER name="egl1" id="dc070cc41347df47" memberName="s_egl1" virtualName=""
-          explicitFocusOrder="0" pos="5 128 34 34" min="0.0" max="99.0"
+          explicitFocusOrder="4" pos="5 128 34 34" min="0.0" max="99.0"
           int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox" textBoxEditable="1"
           textBoxWidth="80" textBoxHeight="20" skewFactor="1.0" needsCallback="1"/>
   <SLIDER name="egl2" id="66f5195e9c374029" memberName="s_egl2" virtualName=""
-          explicitFocusOrder="0" pos="33 129 34 34" min="0.0" max="99.0"
+          explicitFocusOrder="6" pos="33 128 34 34" min="0.0" max="99.0"
           int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox" textBoxEditable="1"
           textBoxWidth="80" textBoxHeight="20" skewFactor="1.0" needsCallback="1"/>
   <SLIDER name="egl3" id="9d57bd53203dcdb4" memberName="s_egl3" virtualName=""
-          explicitFocusOrder="0" pos="61 128 34 34" min="0.0" max="99.0"
+          explicitFocusOrder="8" pos="61 128 34 34" min="0.0" max="99.0"
           int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox" textBoxEditable="1"
           textBoxWidth="80" textBoxHeight="20" skewFactor="1.0" needsCallback="1"/>
   <SLIDER name="egl4" id="4f7c3ece3ea2cf9c" memberName="s_egl4" virtualName=""
-          explicitFocusOrder="0" pos="89 128 34 34" min="0.0" max="99.0"
+          explicitFocusOrder="10" pos="89 128 34 34" min="0.0" max="99.0"
           int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox" textBoxEditable="1"
           textBoxWidth="80" textBoxHeight="20" skewFactor="1.0" needsCallback="1"/>
   <SLIDER name="egr1" id="2ca8137d80da46fb" memberName="s_egv1" virtualName=""
-          explicitFocusOrder="0" pos="5 169 34 34" min="0.0" max="99.0"
+          explicitFocusOrder="5" pos="5 169 34 34" min="0.0" max="99.0"
           int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox" textBoxEditable="1"
           textBoxWidth="80" textBoxHeight="20" skewFactor="1.0" needsCallback="1"/>
   <SLIDER name="egr3" id="4ad6d0c532d15973" memberName="s_egv2" virtualName=""
-          explicitFocusOrder="0" pos="33 169 34 34" min="0.0" max="99.0"
+          explicitFocusOrder="7" pos="33 169 34 34" min="0.0" max="99.0"
           int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox" textBoxEditable="1"
           textBoxWidth="80" textBoxHeight="20" skewFactor="1.0" needsCallback="1"/>
   <SLIDER name="egr3" id="8a2027f9ede16b4f" memberName="s_egv3" virtualName=""
-          explicitFocusOrder="0" pos="61 169 34 34" min="0.0" max="99.0"
+          explicitFocusOrder="9" pos="61 169 34 34" min="0.0" max="99.0"
           int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox" textBoxEditable="1"
           textBoxWidth="80" textBoxHeight="20" skewFactor="1.0" needsCallback="1"/>
   <SLIDER name="egr4" id="8c04f1c943d837e8" memberName="s_egv4" virtualName=""
-          explicitFocusOrder="0" pos="89 169 34 34" min="0.0" max="99.0"
+          explicitFocusOrder="11" pos="89 169 34 34" min="0.0" max="99.0"
           int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox" textBoxEditable="1"
           textBoxWidth="80" textBoxHeight="20" skewFactor="1.0" needsCallback="1"/>
   <SLIDER name="opLevel" id="f8521c8214fb8993" memberName="opLevel" virtualName=""
-          explicitFocusOrder="0" pos="245 76 34 34" min="0.0" max="99.0"
+          explicitFocusOrder="15" pos="245 76 34 34" min="0.0" max="99.0"
           int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox" textBoxEditable="1"
           textBoxWidth="80" textBoxHeight="20" skewFactor="1.0" needsCallback="1"/>
   <SLIDER name="opFine" id="e445aa61bd6cddcb" memberName="opFine" virtualName=""
-          explicitFocusOrder="0" pos="78 24 34 34" min="0.0" max="99.0"
+          explicitFocusOrder="3" pos="78 24 34 34" min="0.0" max="99.0"
           int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox" textBoxEditable="1"
           textBoxWidth="80" textBoxHeight="20" skewFactor="1.0" needsCallback="1"/>
   <SLIDER name="opCoarse" id="4eec63d30d7488d2" memberName="opCoarse" virtualName=""
-          explicitFocusOrder="0" pos="43 24 34 34" min="0.0" max="31.0"
+          explicitFocusOrder="2" pos="43 24 34 34" min="0.0" max="31.0"
           int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox" textBoxEditable="1"
           textBoxWidth="80" textBoxHeight="20" skewFactor="1.0" needsCallback="1"/>
   <LABEL name="khz" id="eb961eed8902a6fc" memberName="khzDisplay" virtualName=""
@@ -669,52 +690,52 @@ BEGIN_JUCER_METADATA
          fontname="Default font" fontsize="12.6" kerning="0.0" bold="0"
          italic="0" justification="36"/>
   <SLIDER name="detune" id="f093ec8defca2fc2" memberName="detune" virtualName=""
-          explicitFocusOrder="0" pos="6 24 34 34" min="-7.0" max="7.0"
+          explicitFocusOrder="1" pos="6 24 34 34" min="-7.0" max="7.0"
           int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox" textBoxEditable="0"
           textBoxWidth="80" textBoxHeight="20" skewFactor="1.0" needsCallback="1"/>
   <GENERICCOMPONENT name="envDisplay" id="b18856de924c6340" memberName="envDisplay"
                     virtualName="" explicitFocusOrder="0" pos="16 83 94 30" class="EnvDisplay"
                     params=""/>
   <SLIDER name="sclLeftLevel" id="bd6f338ae68e454f" memberName="sclLeftLevel"
-          virtualName="" explicitFocusOrder="0" pos="131 115 34 34" tooltip="Keyboard Scale Level Left Depth "
+          virtualName="" explicitFocusOrder="16" pos="131 115 34 34" tooltip="Keyboard Scale Level Left Depth "
           min="0.0" max="99.0" int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <SLIDER name="sclRightLevel" id="b9e23ed5187fc7e5" memberName="sclRightLevel"
-          virtualName="" explicitFocusOrder="0" pos="241 115 34 34" tooltip="Keyboard Scale Level Right Depth "
+          virtualName="" explicitFocusOrder="18" pos="241 115 34 34" tooltip="Keyboard Scale Level Right Depth "
           min="0.0" max="99.0" int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <SLIDER name="sclLvlBrkPt" id="c563ac3116923bbc" memberName="sclLvlBrkPt"
-          virtualName="" explicitFocusOrder="0" pos="178 130 54 24" tooltip="Scale Level Breakpoint"
+          virtualName="" explicitFocusOrder="17" pos="178 130 54 24" tooltip="Scale Level Breakpoint"
           min="0.0" max="99.0" int="1.0" style="LinearHorizontal" textBoxPos="NoTextBox"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <SLIDER name="sclRateScaling" id="f0d17c8e09aa4c49" memberName="sclRateScaling"
-          virtualName="" explicitFocusOrder="0" pos="186 179 34 34" tooltip="Keyboard Rate Scaling"
+          virtualName="" explicitFocusOrder="20" pos="186 179 34 34" tooltip="Keyboard Rate Scaling"
           min="0.0" max="7.0" int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <SLIDER name="keyVelSens" id="21795d045d07602b" memberName="keyVelSens"
-          virtualName="" explicitFocusOrder="0" pos="204 76 34 34" min="0.0"
+          virtualName="" explicitFocusOrder="14" pos="204 76 34 34" min="0.0"
           max="7.0" int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <SLIDER name="ampModSens" id="634ceaa7b0f81a6c" memberName="ampModSens"
-          virtualName="" explicitFocusOrder="0" pos="140 76 34 34" min="0.0"
+          virtualName="" explicitFocusOrder="13" pos="140 76 34 34" min="0.0"
           max="3.0" int="1.0" style="RotaryVerticalDrag" textBoxPos="NoTextBox"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <GENERICCOMPONENT name="vu" id="6f952594ea99dc1e" memberName="vu" virtualName=""
                     explicitFocusOrder="0" pos="132 52 140 8" class="VuMeter" params=""/>
   <TOGGLEBUTTON name="opMode" id="15db8e5c9dd13966" memberName="opMode" virtualName=""
-                explicitFocusOrder="0" pos="146 19 48 26" buttonText="" connectedEdges="0"
+                explicitFocusOrder="12" pos="146 19 48 26" buttonText="" connectedEdges="0"
                 needsCallback="1" radioGroupId="0" state="0"/>
   <GENERICCOMPONENT name="kbdLeftCurve" id="ee4e60dfcd6cb790" memberName="kbdLeftCurve"
-                    virtualName="" explicitFocusOrder="0" pos="128 170 36 26" class="ComboBoxImage"
+                    virtualName="" explicitFocusOrder="19" pos="128 170 36 26" class="ComboBoxImage"
                     params=""/>
   <GENERICCOMPONENT name="kbdRightCurve" id="f5ca44d67593488a" memberName="kbdRightCurve"
-                    virtualName="" explicitFocusOrder="0" pos="240 170 36 26" class="ComboBoxImage"
+                    virtualName="" explicitFocusOrder="21" pos="240 170 36 26" class="ComboBoxImage"
                     params=""/>
 </JUCER_COMPONENT>
 
diff --git a/Source/OperatorEditor.h b/Source/OperatorEditor.h
index 0b3b07df..630e94e2 100644
--- a/Source/OperatorEditor.h
+++ b/Source/OperatorEditor.h
@@ -7,7 +7,7 @@
   the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
   and re-saved.
 
-  Created with Projucer version: 6.0.1
+  Created with Projucer version: 7.0.9
 
   ------------------------------------------------------------------------------
 
diff --git a/Source/ParamDialog.cpp b/Source/ParamDialog.cpp
index 1eb24442..9d48222a 100644
--- a/Source/ParamDialog.cpp
+++ b/Source/ParamDialog.cpp
@@ -7,7 +7,7 @@
   the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
   and re-saved.
 
-  Created with Projucer version: 6.0.7
+  Created with Projucer version: 7.0.9
 
   ------------------------------------------------------------------------------
 
@@ -35,6 +35,7 @@ ParamDialog::ParamDialog ()
 
     pitchRangeDn.reset (new juce::Slider ("pitchRangeDn"));
     addAndMakeVisible (pitchRangeDn.get());
+    pitchRangeDn->setExplicitFocusOrder (2);
     pitchRangeDn->setRange (0, 48, 1);
     pitchRangeDn->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     pitchRangeDn->setTextBoxStyle (juce::Slider::TextBoxLeft, false, 80, 20);
@@ -44,6 +45,7 @@ ParamDialog::ParamDialog ()
 
     pitchStep.reset (new juce::Slider ("pitchStep"));
     addAndMakeVisible (pitchStep.get());
+    pitchStep->setExplicitFocusOrder (3);
     pitchStep->setRange (0, 12, 1);
     pitchStep->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     pitchStep->setTextBoxStyle (juce::Slider::TextBoxLeft, false, 80, 20);
@@ -53,26 +55,29 @@ ParamDialog::ParamDialog ()
 
     sysexIn.reset (new juce::ComboBox ("sysexIn"));
     addAndMakeVisible (sysexIn.get());
+    sysexIn->setExplicitFocusOrder (7);
     sysexIn->setEditableText (false);
     sysexIn->setJustificationType (juce::Justification::centredLeft);
     sysexIn->setTextWhenNothingSelected (juce::String());
-    sysexIn->setTextWhenNoChoicesAvailable (translate("(no choices)"));
+    sysexIn->setTextWhenNoChoicesAvailable (TRANS ("(no choices)"));
     sysexIn->addListener (this);
 
     sysexIn->setBounds (104, 244, 224, 24);
 
     sysexOut.reset (new juce::ComboBox ("sysexOut"));
     addAndMakeVisible (sysexOut.get());
+    sysexOut->setExplicitFocusOrder (8);
     sysexOut->setEditableText (false);
     sysexOut->setJustificationType (juce::Justification::centredLeft);
     sysexOut->setTextWhenNothingSelected (juce::String());
-    sysexOut->setTextWhenNoChoicesAvailable (translate("(no choices)"));
+    sysexOut->setTextWhenNoChoicesAvailable (TRANS ("(no choices)"));
     sysexOut->addListener (this);
 
     sysexOut->setBounds (104, 280, 224, 24);
 
     sysexChl.reset (new juce::Slider ("sysexChl"));
     addAndMakeVisible (sysexChl.get());
+    sysexChl->setExplicitFocusOrder (9);
     sysexChl->setRange (1, 16, 1);
     sysexChl->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     sysexChl->setTextBoxStyle (juce::Slider::TextBoxLeft, false, 80, 20);
@@ -82,19 +87,21 @@ ParamDialog::ParamDialog ()
 
     engineReso.reset (new juce::ComboBox ("new combo box"));
     addAndMakeVisible (engineReso.get());
+    engineReso->setExplicitFocusOrder (6);
     engineReso->setEditableText (false);
     engineReso->setJustificationType (juce::Justification::centredLeft);
     engineReso->setTextWhenNothingSelected (juce::String());
-    engineReso->setTextWhenNoChoicesAvailable (translate("(no choices)"));
-    engineReso->addItem (translate("Modern (24-bit)"), 1);
-    engineReso->addItem (translate("Mark I"), 2);
-    engineReso->addItem (translate("OPL Series"), 3);
+    engineReso->setTextWhenNoChoicesAvailable (TRANS ("(no choices)"));
+    engineReso->addItem (TRANS ("Modern (24-bit)"), 1);
+    engineReso->addItem (TRANS ("Mark I"), 2);
+    engineReso->addItem (TRANS ("OPL Series"), 3);
     engineReso->addListener (this);
 
     engineReso->setBounds (160, 188, 168, 24);
 
     showKeyboard.reset (new LightedToggleButton ("showKeyboard"));
     addAndMakeVisible (showKeyboard.get());
+    showKeyboard->setExplicitFocusOrder (4);
     showKeyboard->setButtonText (juce::String());
     showKeyboard->addListener (this);
 
@@ -102,6 +109,7 @@ ParamDialog::ParamDialog ()
 
     whlRange.reset (new juce::Slider ("whlRange"));
     addAndMakeVisible (whlRange.get());
+    whlRange->setExplicitFocusOrder (10);
     whlRange->setRange (0, 99, 1);
     whlRange->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     whlRange->setTextBoxStyle (juce::Slider::TextBoxLeft, false, 80, 20);
@@ -111,6 +119,7 @@ ParamDialog::ParamDialog ()
 
     ftRange.reset (new juce::Slider ("ftRange"));
     addAndMakeVisible (ftRange.get());
+    ftRange->setExplicitFocusOrder (14);
     ftRange->setRange (0, 99, 1);
     ftRange->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     ftRange->setTextBoxStyle (juce::Slider::TextBoxLeft, false, 80, 20);
@@ -120,6 +129,7 @@ ParamDialog::ParamDialog ()
 
     brRange.reset (new juce::Slider ("brRange"));
     addAndMakeVisible (brRange.get());
+    brRange->setExplicitFocusOrder (18);
     brRange->setRange (0, 99, 1);
     brRange->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     brRange->setTextBoxStyle (juce::Slider::TextBoxLeft, false, 80, 20);
@@ -129,6 +139,7 @@ ParamDialog::ParamDialog ()
 
     atRange.reset (new juce::Slider ("atRange"));
     addAndMakeVisible (atRange.get());
+    atRange->setExplicitFocusOrder (22);
     atRange->setRange (0, 99, 1);
     atRange->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     atRange->setTextBoxStyle (juce::Slider::TextBoxLeft, false, 80, 20);
@@ -138,6 +149,7 @@ ParamDialog::ParamDialog ()
 
     whlEg.reset (new LightedToggleButton ("whlEg"));
     addAndMakeVisible (whlEg.get());
+    whlEg->setExplicitFocusOrder (13);
     whlEg->setButtonText (juce::String());
     whlEg->addListener (this);
 
@@ -145,6 +157,7 @@ ParamDialog::ParamDialog ()
 
     ftEg.reset (new LightedToggleButton ("ftEg"));
     addAndMakeVisible (ftEg.get());
+    ftEg->setExplicitFocusOrder (17);
     ftEg->setButtonText (juce::String());
     ftEg->addListener (this);
 
@@ -152,6 +165,7 @@ ParamDialog::ParamDialog ()
 
     brEg.reset (new LightedToggleButton ("brEg"));
     addAndMakeVisible (brEg.get());
+    brEg->setExplicitFocusOrder (21);
     brEg->setButtonText (juce::String());
     brEg->addListener (this);
 
@@ -159,6 +173,7 @@ ParamDialog::ParamDialog ()
 
     atEg.reset (new LightedToggleButton ("atEg"));
     addAndMakeVisible (atEg.get());
+    atEg->setExplicitFocusOrder (25);
     atEg->setButtonText (juce::String());
     atEg->addListener (this);
 
@@ -166,6 +181,7 @@ ParamDialog::ParamDialog ()
 
     whlAmp.reset (new LightedToggleButton ("whlAmp"));
     addAndMakeVisible (whlAmp.get());
+    whlAmp->setExplicitFocusOrder (12);
     whlAmp->setButtonText (juce::String());
     whlAmp->addListener (this);
 
@@ -173,6 +189,7 @@ ParamDialog::ParamDialog ()
 
     ftAmp.reset (new LightedToggleButton ("ftAmp"));
     addAndMakeVisible (ftAmp.get());
+    ftAmp->setExplicitFocusOrder (16);
     ftAmp->setButtonText (juce::String());
     ftAmp->addListener (this);
 
@@ -180,6 +197,7 @@ ParamDialog::ParamDialog ()
 
     brAmp.reset (new LightedToggleButton ("brAmp"));
     addAndMakeVisible (brAmp.get());
+    brAmp->setExplicitFocusOrder (20);
     brAmp->setButtonText (juce::String());
     brAmp->addListener (this);
 
@@ -187,6 +205,7 @@ ParamDialog::ParamDialog ()
 
     atAmp.reset (new LightedToggleButton ("atAmp"));
     addAndMakeVisible (atAmp.get());
+    atAmp->setExplicitFocusOrder (24);
     atAmp->setButtonText (juce::String());
     atAmp->addListener (this);
 
@@ -194,6 +213,7 @@ ParamDialog::ParamDialog ()
 
     whlPitch.reset (new LightedToggleButton ("whlPitch"));
     addAndMakeVisible (whlPitch.get());
+    whlPitch->setExplicitFocusOrder (11);
     whlPitch->setButtonText (juce::String());
     whlPitch->addListener (this);
 
@@ -201,6 +221,7 @@ ParamDialog::ParamDialog ()
 
     ftPitch.reset (new LightedToggleButton ("ftPitch"));
     addAndMakeVisible (ftPitch.get());
+    ftPitch->setExplicitFocusOrder (15);
     ftPitch->setButtonText (juce::String());
     ftPitch->addListener (this);
 
@@ -208,6 +229,7 @@ ParamDialog::ParamDialog ()
 
     brPitch.reset (new LightedToggleButton ("brPitch"));
     addAndMakeVisible (brPitch.get());
+    brPitch->setExplicitFocusOrder (19);
     brPitch->setButtonText (juce::String());
     brPitch->addListener (this);
 
@@ -215,6 +237,7 @@ ParamDialog::ParamDialog ()
 
     atPitch.reset (new LightedToggleButton ("atPitch"));
     addAndMakeVisible (atPitch.get());
+    atPitch->setExplicitFocusOrder (23);
     atPitch->setButtonText (juce::String());
     atPitch->addListener (this);
 
@@ -222,42 +245,48 @@ ParamDialog::ParamDialog ()
 
     sclButton.reset (new juce::TextButton ("scl button"));
     addAndMakeVisible (sclButton.get());
-    sclButton->setButtonText (translate("SCL"));
+    sclButton->setExplicitFocusOrder (26);
+    sclButton->setButtonText (TRANS ("SCL"));
     sclButton->addListener (this);
 
     sclButton->setBounds (448, 205, 56, 30);
 
     kbmButton.reset (new juce::TextButton ("kbm button"));
     addAndMakeVisible (kbmButton.get());
-    kbmButton->setButtonText (translate("KBM"));
+    kbmButton->setExplicitFocusOrder (27);
+    kbmButton->setButtonText (TRANS ("KBM"));
     kbmButton->addListener (this);
 
     kbmButton->setBounds (512, 205, 56, 30);
 
     showTunButton.reset (new juce::TextButton ("show tuning button"));
     addAndMakeVisible (showTunButton.get());
-    showTunButton->setButtonText (translate("Show"));
+    showTunButton->setExplicitFocusOrder (28);
+    showTunButton->setButtonText (TRANS ("Show"));
     showTunButton->addListener (this);
 
     showTunButton->setBounds (576, 205, 48, 30);
 
     resetTuningButton.reset (new juce::TextButton ("reset tuning button"));
     addAndMakeVisible (resetTuningButton.get());
-    resetTuningButton->setButtonText (translate("Reset"));
+    resetTuningButton->setExplicitFocusOrder (29);
+    resetTuningButton->setButtonText (TRANS ("Reset"));
     resetTuningButton->addListener (this);
 
     resetTuningButton->setBounds (632, 205, 48, 30);
 
     transposeScale.reset (new LightedToggleButton ("transposeScale"));
     addAndMakeVisible (transposeScale.get());
+    transposeScale->setExplicitFocusOrder (30);
     transposeScale->setButtonText (juce::String());
     transposeScale->addListener (this);
-    transposeScale->setToggleState (true, dontSendNotification);
+    transposeScale->setToggleState (true, juce::dontSendNotification);
 
     transposeScale->setBounds (592, 240, 56, 30);
 
     mpePBRange.reset (new juce::Slider ("mpePBRange"));
     addAndMakeVisible (mpePBRange.get());
+    mpePBRange->setExplicitFocusOrder (32);
     mpePBRange->setRange (0, 96, 1);
     mpePBRange->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     mpePBRange->setTextBoxStyle (juce::Slider::TextBoxLeft, false, 80, 20);
@@ -267,6 +296,7 @@ ParamDialog::ParamDialog ()
 
     mpeEnabled.reset (new LightedToggleButton ("mpeEnabled"));
     addAndMakeVisible (mpeEnabled.get());
+    mpeEnabled->setExplicitFocusOrder (31);
     mpeEnabled->setButtonText (juce::String());
     mpeEnabled->addListener (this);
 
@@ -284,6 +314,7 @@ ParamDialog::ParamDialog ()
 
     pitchRangeUp.reset (new juce::Slider ("pitchRangeUp"));
     addAndMakeVisible (pitchRangeUp.get());
+    pitchRangeUp->setExplicitFocusOrder (1);
     pitchRangeUp->setRange (0, 48, 1);
     pitchRangeUp->setSliderStyle (juce::Slider::RotaryVerticalDrag);
     pitchRangeUp->setTextBoxStyle (juce::Slider::TextBoxLeft, false, 80, 20);
@@ -293,17 +324,17 @@ ParamDialog::ParamDialog ()
 
     scalingFactor.reset (new juce::ComboBox ("scalingFactor"));
     addAndMakeVisible (scalingFactor.get());
+    scalingFactor->setExplicitFocusOrder (5);
     scalingFactor->setEditableText (false);
     scalingFactor->setJustificationType (juce::Justification::centredLeft);
     scalingFactor->setTextWhenNothingSelected (juce::String());
-    scalingFactor->setTextWhenNoChoicesAvailable (translate("(no choices)"));
-    scalingFactor->addItem (translate("100 %"), 1);
-    scalingFactor->addItem (translate("125 %"), 2);
-    scalingFactor->addItem (translate("150 %"), 3);
-    scalingFactor->addItem(translate("200 %"), 4);
-    scalingFactor->addItem(translate("300 %"), 5);
-    scalingFactor->addItem(translate("400 %"), 6);
-    scalingFactor->addSeparator();
+    scalingFactor->setTextWhenNoChoicesAvailable (TRANS ("(no choices)"));
+    scalingFactor->addItem (TRANS ("100 %"), 1);
+    scalingFactor->addItem (TRANS ("125 %"), 2);
+    scalingFactor->addItem (TRANS ("150 %"), 3);
+    scalingFactor->addItem (TRANS ("200 %"), 4);
+    scalingFactor->addItem (TRANS ("300 %"), 5);
+    scalingFactor->addItem (TRANS ("400 %"), 6);
     scalingFactor->addListener (this);
 
     scalingFactor->setBounds (236, 136, 90, 24);
@@ -389,7 +420,7 @@ void ParamDialog::paint (juce::Graphics& g)
 
     {
         int x = 20, y = 16, width = 276, height = 23;
-        juce::String text (translate("Pitch Bend Range"));
+        juce::String text (TRANS ("Pitch Bend Range"));
         juce::Colour fillColour = juce::Colours::white;
         //[UserPaintCustomArguments] Customize the painting arguments here..
         //[/UserPaintCustomArguments]
@@ -401,7 +432,7 @@ void ParamDialog::paint (juce::Graphics& g)
 
     {
         int x = 20, y = 56, width = 276, height = 23;
-        juce::String text (translate("Pitch Bend Step"));
+        juce::String text (TRANS ("Pitch Bend Step"));
         juce::Colour fillColour = juce::Colours::white;
         //[UserPaintCustomArguments] Customize the painting arguments here..
         //[/UserPaintCustomArguments]
@@ -413,7 +444,7 @@ void ParamDialog::paint (juce::Graphics& g)
 
     {
         int x = 20, y = 318, width = 245, height = 23;
-        juce::String text (translate("DX7 Channel"));
+        juce::String text (TRANS ("DX7 Channel"));
         juce::Colour fillColour = juce::Colours::white;
         //[UserPaintCustomArguments] Customize the painting arguments here..
         //[/UserPaintCustomArguments]
@@ -425,7 +456,7 @@ void ParamDialog::paint (juce::Graphics& g)
 
     {
         int x = 20, y = 190, width = 276, height = 23;
-        juce::String text (translate("Engine Resolution"));
+        juce::String text (TRANS ("Engine Resolution"));
         juce::Colour fillColour = juce::Colours::white;
         //[UserPaintCustomArguments] Customize the painting arguments here..
         //[/UserPaintCustomArguments]
@@ -455,7 +486,7 @@ void ParamDialog::paint (juce::Graphics& g)
 
     {
         int x = 20, y = 96, width = 276, height = 23;
-        juce::String text (translate("Show Keyboard"));
+        juce::String text (TRANS ("Show Keyboard"));
         juce::Colour fillColour = juce::Colours::white;
         //[UserPaintCustomArguments] Customize the painting arguments here..
         //[/UserPaintCustomArguments]
@@ -476,7 +507,7 @@ void ParamDialog::paint (juce::Graphics& g)
 
     {
         int x = 368, y = 16, width = 276, height = 23;
-        juce::String text (translate("Wheel"));
+        juce::String text (TRANS ("Wheel"));
         juce::Colour fillColour = juce::Colours::white;
         //[UserPaintCustomArguments] Customize the painting arguments here..
         //[/UserPaintCustomArguments]
@@ -488,7 +519,7 @@ void ParamDialog::paint (juce::Graphics& g)
 
     {
         int x = 368, y = 96, width = 276, height = 23;
-        juce::String text (translate("Breath"));
+        juce::String text (TRANS ("Breath"));
         juce::Colour fillColour = juce::Colours::white;
         //[UserPaintCustomArguments] Customize the painting arguments here..
         //[/UserPaintCustomArguments]
@@ -500,7 +531,7 @@ void ParamDialog::paint (juce::Graphics& g)
 
     {
         int x = 368, y = 56, width = 276, height = 23;
-        juce::String text (translate("Foot"));
+        juce::String text (TRANS ("Foot"));
         juce::Colour fillColour = juce::Colours::white;
         //[UserPaintCustomArguments] Customize the painting arguments here..
         //[/UserPaintCustomArguments]
@@ -512,7 +543,7 @@ void ParamDialog::paint (juce::Graphics& g)
 
     {
         int x = 368, y = 136, width = 276, height = 23;
-        juce::String text (translate("After Touch"));
+        juce::String text (TRANS ("After Touch"));
         juce::Colour fillColour = juce::Colours::white;
         //[UserPaintCustomArguments] Customize the painting arguments here..
         //[/UserPaintCustomArguments]
@@ -524,7 +555,7 @@ void ParamDialog::paint (juce::Graphics& g)
 
     {
         int x = 528, y = 163, width = 48, height = 23;
-        juce::String text (translate("PITCH"));
+        juce::String text (TRANS ("PITCH"));
         juce::Colour fillColour = juce::Colours::white;
         //[UserPaintCustomArguments] Customize the painting arguments here..
         //[/UserPaintCustomArguments]
@@ -536,7 +567,7 @@ void ParamDialog::paint (juce::Graphics& g)
 
     {
         int x = 584, y = 163, width = 48, height = 23;
-        juce::String text (translate("AMP"));
+        juce::String text (TRANS ("AMP"));
         juce::Colour fillColour = juce::Colours::white;
         //[UserPaintCustomArguments] Customize the painting arguments here..
         //[/UserPaintCustomArguments]
@@ -548,7 +579,7 @@ void ParamDialog::paint (juce::Graphics& g)
 
     {
         int x = 640, y = 163, width = 48, height = 23;
-        juce::String text (translate("EG BIAS"));
+        juce::String text (TRANS ("EG BIAS"));
         juce::Colour fillColour = juce::Colours::white;
         //[UserPaintCustomArguments] Customize the painting arguments here..
         //[/UserPaintCustomArguments]
@@ -569,7 +600,7 @@ void ParamDialog::paint (juce::Graphics& g)
 
     {
         int x = 371, y = 208, width = 276, height = 25;
-        juce::String text (translate("Tuning"));
+        juce::String text (TRANS ("Tuning"));
         juce::Colour fillColour = juce::Colours::white;
         //[UserPaintCustomArguments] Customize the painting arguments here..
         //[/UserPaintCustomArguments]
@@ -581,7 +612,7 @@ void ParamDialog::paint (juce::Graphics& g)
 
     {
         int x = 371, y = 242, width = 157, height = 25;
-        juce::String text (translate("Transposition 12 as:"));
+        juce::String text (TRANS ("Transposition 12 as:"));
         juce::Colour fillColour = juce::Colours::white;
         //[UserPaintCustomArguments] Customize the painting arguments here..
         //[/UserPaintCustomArguments]
@@ -602,7 +633,7 @@ void ParamDialog::paint (juce::Graphics& g)
 
     {
         int x = 371, y = 290, width = 276, height = 27;
-        juce::String text (translate("MPE"));
+        juce::String text (TRANS ("MPE"));
         juce::Colour fillColour = juce::Colours::white;
         //[UserPaintCustomArguments] Customize the painting arguments here..
         //[/UserPaintCustomArguments]
@@ -614,7 +645,7 @@ void ParamDialog::paint (juce::Graphics& g)
 
     {
         int x = 528, y = 290, width = 119, height = 27;
-        juce::String text (translate("Bend Range"));
+        juce::String text (TRANS ("Bend Range"));
         juce::Colour fillColour = juce::Colours::white;
         //[UserPaintCustomArguments] Customize the painting arguments here..
         //[/UserPaintCustomArguments]
@@ -626,7 +657,7 @@ void ParamDialog::paint (juce::Graphics& g)
 
     {
         int x = 555, y = 242, width = 37, height = 25;
-        juce::String text (translate("12"));
+        juce::String text (TRANS ("12"));
         juce::Colour fillColour = juce::Colours::white;
         //[UserPaintCustomArguments] Customize the painting arguments here..
         //[/UserPaintCustomArguments]
@@ -638,7 +669,7 @@ void ParamDialog::paint (juce::Graphics& g)
 
     {
         int x = 659, y = 242, width = 45, height = 25;
-        juce::String text (translate("SCL"));
+        juce::String text (TRANS ("SCL"));
         juce::Colour fillColour = juce::Colours::white;
         //[UserPaintCustomArguments] Customize the painting arguments here..
         //[/UserPaintCustomArguments]
@@ -650,7 +681,7 @@ void ParamDialog::paint (juce::Graphics& g)
 
     {
         int x = 147, y = 16, width = 20, height = 23;
-        juce::String text (translate("up"));
+        juce::String text (TRANS ("up"));
         juce::Colour fillColour = juce::Colours::white;
         //[UserPaintCustomArguments] Customize the painting arguments here..
         //[/UserPaintCustomArguments]
@@ -662,7 +693,7 @@ void ParamDialog::paint (juce::Graphics& g)
 
     {
         int x = 240, y = 16, width = 20, height = 23;
-        juce::String text (translate("dn"));
+        juce::String text (TRANS ("dn"));
         juce::Colour fillColour = juce::Colours::white;
         //[UserPaintCustomArguments] Customize the painting arguments here..
         //[/UserPaintCustomArguments]
@@ -674,7 +705,7 @@ void ParamDialog::paint (juce::Graphics& g)
 
     {
         int x = 20, y = 136, width = 276, height = 23;
-        juce::String text (translate("UI Scaling"));
+        juce::String text (TRANS ("UI Scaling"));
         juce::Colour fillColour = juce::Colours::white;
         //[UserPaintCustomArguments] Customize the painting arguments here..
         //[/UserPaintCustomArguments]
@@ -1188,113 +1219,113 @@ BEGIN_JUCER_METADATA
           italic="0" justification="33"/>
   </BACKGROUND>
   <SLIDER name="pitchRangeDn" id="7409be5a8dfaa91" memberName="pitchRangeDn"
-          virtualName="" explicitFocusOrder="0" pos="264 16 72 24" min="0.0"
+          virtualName="" explicitFocusOrder="2" pos="264 16 72 24" min="0.0"
           max="48.0" int="1.0" style="RotaryVerticalDrag" textBoxPos="TextBoxLeft"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <SLIDER name="pitchStep" id="b86af4b792e768ca" memberName="pitchStep"
-          virtualName="" explicitFocusOrder="0" pos="264 56 72 24" min="0.0"
+          virtualName="" explicitFocusOrder="3" pos="264 56 72 24" min="0.0"
           max="12.0" int="1.0" style="RotaryVerticalDrag" textBoxPos="TextBoxLeft"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <COMBOBOX name="sysexIn" id="3750642d8b5be11" memberName="sysexIn" virtualName=""
-            explicitFocusOrder="0" pos="104 244 224 24" editable="0" layout="33"
+            explicitFocusOrder="7" pos="104 244 224 24" editable="0" layout="33"
             items="" textWhenNonSelected="" textWhenNoItems="(no choices)"/>
   <COMBOBOX name="sysexOut" id="44730115841c2214" memberName="sysexOut" virtualName=""
-            explicitFocusOrder="0" pos="104 280 224 24" editable="0" layout="33"
+            explicitFocusOrder="8" pos="104 280 224 24" editable="0" layout="33"
             items="" textWhenNonSelected="" textWhenNoItems="(no choices)"/>
   <SLIDER name="sysexChl" id="7fdc8830f90a7c86" memberName="sysexChl" virtualName=""
-          explicitFocusOrder="0" pos="264 316 72 24" min="1.0" max="16.0"
+          explicitFocusOrder="9" pos="264 316 72 24" min="1.0" max="16.0"
           int="1.0" style="RotaryVerticalDrag" textBoxPos="TextBoxLeft"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <COMBOBOX name="new combo box" id="4087ff978c3d9e8d" memberName="engineReso"
-            virtualName="" explicitFocusOrder="0" pos="160 188 168 24" editable="0"
+            virtualName="" explicitFocusOrder="6" pos="160 188 168 24" editable="0"
             layout="33" items="Modern (24-bit)&#10;Mark I&#10;OPL Series"
             textWhenNonSelected="" textWhenNoItems="(no choices)"/>
   <TOGGLEBUTTON name="showKeyboard" id="c963d2cb8e49ffd7" memberName="showKeyboard"
-                virtualName="LightedToggleButton" explicitFocusOrder="0" pos="264 96 56 24"
+                virtualName="LightedToggleButton" explicitFocusOrder="4" pos="264 96 56 24"
                 buttonText="" connectedEdges="0" needsCallback="1" radioGroupId="0"
                 state="0"/>
   <SLIDER name="whlRange" id="3d6522f5f581e580" memberName="whlRange" virtualName=""
-          explicitFocusOrder="0" pos="448 16 72 24" min="0.0" max="99.0"
+          explicitFocusOrder="10" pos="448 16 72 24" min="0.0" max="99.0"
           int="1.0" style="RotaryVerticalDrag" textBoxPos="TextBoxLeft"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <SLIDER name="ftRange" id="cf553f74c3fb0d12" memberName="ftRange" virtualName=""
-          explicitFocusOrder="0" pos="448 56 72 24" min="0.0" max="99.0"
+          explicitFocusOrder="14" pos="448 56 72 24" min="0.0" max="99.0"
           int="1.0" style="RotaryVerticalDrag" textBoxPos="TextBoxLeft"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <SLIDER name="brRange" id="c4aa6814f75016a7" memberName="brRange" virtualName=""
-          explicitFocusOrder="0" pos="448 96 72 24" min="0.0" max="99.0"
+          explicitFocusOrder="18" pos="448 96 72 24" min="0.0" max="99.0"
           int="1.0" style="RotaryVerticalDrag" textBoxPos="TextBoxLeft"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <SLIDER name="atRange" id="d0aa1ebb24284577" memberName="atRange" virtualName=""
-          explicitFocusOrder="0" pos="448 136 72 24" min="0.0" max="99.0"
+          explicitFocusOrder="22" pos="448 136 72 24" min="0.0" max="99.0"
           int="1.0" style="RotaryVerticalDrag" textBoxPos="TextBoxLeft"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <TOGGLEBUTTON name="whlEg" id="d8242ae592c912a" memberName="whlEg" virtualName="LightedToggleButton"
-                explicitFocusOrder="0" pos="640 16 56 24" buttonText="" connectedEdges="0"
+                explicitFocusOrder="13" pos="640 16 56 24" buttonText="" connectedEdges="0"
                 needsCallback="1" radioGroupId="0" state="0"/>
   <TOGGLEBUTTON name="ftEg" id="69d816607bd71cb0" memberName="ftEg" virtualName="LightedToggleButton"
-                explicitFocusOrder="0" pos="640 56 56 24" buttonText="" connectedEdges="0"
+                explicitFocusOrder="17" pos="640 56 56 24" buttonText="" connectedEdges="0"
                 needsCallback="1" radioGroupId="0" state="0"/>
   <TOGGLEBUTTON name="brEg" id="ba89ae54d676983f" memberName="brEg" virtualName="LightedToggleButton"
-                explicitFocusOrder="0" pos="640 96 56 24" buttonText="" connectedEdges="0"
+                explicitFocusOrder="21" pos="640 96 56 24" buttonText="" connectedEdges="0"
                 needsCallback="1" radioGroupId="0" state="0"/>
   <TOGGLEBUTTON name="atEg" id="371934a58ce5f1bc" memberName="atEg" virtualName="LightedToggleButton"
-                explicitFocusOrder="0" pos="640 136 56 24" buttonText="" connectedEdges="0"
+                explicitFocusOrder="25" pos="640 136 56 24" buttonText="" connectedEdges="0"
                 needsCallback="1" radioGroupId="0" state="0"/>
   <TOGGLEBUTTON name="whlAmp" id="3d4e46e63c3ddd86" memberName="whlAmp" virtualName="LightedToggleButton"
-                explicitFocusOrder="0" pos="584 16 56 24" buttonText="" connectedEdges="0"
+                explicitFocusOrder="12" pos="584 16 56 24" buttonText="" connectedEdges="0"
                 needsCallback="1" radioGroupId="0" state="0"/>
   <TOGGLEBUTTON name="ftAmp" id="f631892e209b094a" memberName="ftAmp" virtualName="LightedToggleButton"
-                explicitFocusOrder="0" pos="584 56 56 24" buttonText="" connectedEdges="0"
+                explicitFocusOrder="16" pos="584 56 56 24" buttonText="" connectedEdges="0"
                 needsCallback="1" radioGroupId="0" state="0"/>
   <TOGGLEBUTTON name="brAmp" id="d0a68d37220638f1" memberName="brAmp" virtualName="LightedToggleButton"
-                explicitFocusOrder="0" pos="584 96 56 24" buttonText="" connectedEdges="0"
+                explicitFocusOrder="20" pos="584 96 56 24" buttonText="" connectedEdges="0"
                 needsCallback="1" radioGroupId="0" state="0"/>
   <TOGGLEBUTTON name="atAmp" id="4220c7b22e7845ea" memberName="atAmp" virtualName="LightedToggleButton"
-                explicitFocusOrder="0" pos="584 136 56 24" buttonText="" connectedEdges="0"
+                explicitFocusOrder="24" pos="584 136 56 24" buttonText="" connectedEdges="0"
                 needsCallback="1" radioGroupId="0" state="0"/>
   <TOGGLEBUTTON name="whlPitch" id="b7a626ec1e45af16" memberName="whlPitch" virtualName="LightedToggleButton"
-                explicitFocusOrder="0" pos="528 16 56 24" buttonText="" connectedEdges="0"
+                explicitFocusOrder="11" pos="528 16 56 24" buttonText="" connectedEdges="0"
                 needsCallback="1" radioGroupId="0" state="0"/>
   <TOGGLEBUTTON name="ftPitch" id="1acedf6f16a5a3" memberName="ftPitch" virtualName="LightedToggleButton"
-                explicitFocusOrder="0" pos="528 56 56 24" buttonText="" connectedEdges="0"
+                explicitFocusOrder="15" pos="528 56 56 24" buttonText="" connectedEdges="0"
                 needsCallback="1" radioGroupId="0" state="0"/>
   <TOGGLEBUTTON name="brPitch" id="23fa82533e004b96" memberName="brPitch" virtualName="LightedToggleButton"
-                explicitFocusOrder="0" pos="528 96 56 24" buttonText="" connectedEdges="0"
+                explicitFocusOrder="19" pos="528 96 56 24" buttonText="" connectedEdges="0"
                 needsCallback="1" radioGroupId="0" state="0"/>
   <TOGGLEBUTTON name="atPitch" id="43805c6a4673e291" memberName="atPitch" virtualName="LightedToggleButton"
-                explicitFocusOrder="0" pos="528 136 56 24" buttonText="" connectedEdges="0"
+                explicitFocusOrder="23" pos="528 136 56 24" buttonText="" connectedEdges="0"
                 needsCallback="1" radioGroupId="0" state="0"/>
   <TEXTBUTTON name="scl button" id="7a6b689f406ae37d" memberName="sclButton"
-              virtualName="" explicitFocusOrder="0" pos="448 205 56 30" buttonText="SCL"
+              virtualName="" explicitFocusOrder="26" pos="448 205 56 30" buttonText="SCL"
               connectedEdges="0" needsCallback="1" radioGroupId="0"/>
   <TEXTBUTTON name="kbm button" id="181d5b67bc897076" memberName="kbmButton"
-              virtualName="" explicitFocusOrder="0" pos="512 205 56 30" buttonText="KBM"
+              virtualName="" explicitFocusOrder="27" pos="512 205 56 30" buttonText="KBM"
               connectedEdges="0" needsCallback="1" radioGroupId="0"/>
   <TEXTBUTTON name="show tuning button" id="565d5c630087f71" memberName="showTunButton"
-              virtualName="" explicitFocusOrder="0" pos="576 205 48 30" buttonText="Show"
+              virtualName="" explicitFocusOrder="28" pos="576 205 48 30" buttonText="Show"
               connectedEdges="0" needsCallback="1" radioGroupId="0"/>
   <TEXTBUTTON name="reset tuning button" id="44a4ec0c1d200987" memberName="resetTuningButton"
-              virtualName="" explicitFocusOrder="0" pos="632 205 48 30" buttonText="Reset"
+              virtualName="" explicitFocusOrder="29" pos="632 205 48 30" buttonText="Reset"
               connectedEdges="0" needsCallback="1" radioGroupId="0"/>
   <TOGGLEBUTTON name="transposeScale" id="9d4dd65775ed9e38" memberName="transposeScale"
-                virtualName="LightedToggleButton" explicitFocusOrder="0" pos="592 240 56 30"
+                virtualName="LightedToggleButton" explicitFocusOrder="30" pos="592 240 56 30"
                 buttonText="" connectedEdges="0" needsCallback="1" radioGroupId="0"
                 state="1"/>
   <SLIDER name="mpePBRange" id="a13948d1cc74a51a" memberName="mpePBRange"
-          virtualName="" explicitFocusOrder="0" pos="616 291 72 24" min="0.0"
+          virtualName="" explicitFocusOrder="32" pos="616 291 72 24" min="0.0"
           max="96.0" int="1.0" style="RotaryVerticalDrag" textBoxPos="TextBoxLeft"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <TOGGLEBUTTON name="mpeEnabled" id="e1a11d0372879dd8" memberName="mpeEnabled"
-                virtualName="LightedToggleButton" explicitFocusOrder="0" pos="448 288 56 30"
+                virtualName="LightedToggleButton" explicitFocusOrder="31" pos="448 288 56 30"
                 buttonText="" connectedEdges="0" needsCallback="1" radioGroupId="0"
                 state="0"/>
   <IMAGEBUTTON name="new button" id="1c9edab9992cbeef" memberName="transposeHelp"
@@ -1304,14 +1335,14 @@ BEGIN_JUCER_METADATA
                colourNormal="0" resourceOver="" opacityOver="1.0" colourOver="0"
                resourceDown="" opacityDown="1.0" colourDown="0"/>
   <SLIDER name="pitchRangeUp" id="56a2aeddd2444bea" memberName="pitchRangeUp"
-          virtualName="" explicitFocusOrder="0" pos="168 16 72 24" min="0.0"
+          virtualName="" explicitFocusOrder="1" pos="168 16 72 24" min="0.0"
           max="48.0" int="1.0" style="RotaryVerticalDrag" textBoxPos="TextBoxLeft"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <COMBOBOX name="scalingFactor" id="843af1bae988d4d6" memberName="scalingFactor"
-            virtualName="" explicitFocusOrder="0" pos="236 136 90 24" editable="0"
-            layout="33" items="100 %&#10;125 %&#10;150 %&#10;" textWhenNonSelected=""
-            textWhenNoItems="(no choices)"/>
+            virtualName="" explicitFocusOrder="5" pos="236 136 90 24" editable="0"
+            layout="33" items="100 %&#10;125 %&#10;150 %&#10;200 %&#10;300 %&#10;400 %"
+            textWhenNonSelected="" textWhenNoItems="(no choices)"/>
 </JUCER_COMPONENT>
 
 END_JUCER_METADATA
diff --git a/Source/ParamDialog.h b/Source/ParamDialog.h
index fe918af9..8b322305 100644
--- a/Source/ParamDialog.h
+++ b/Source/ParamDialog.h
@@ -7,7 +7,7 @@
   the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
   and re-saved.
 
-  Created with Projucer version: 6.0.7
+  Created with Projucer version: 7.0.9
 
   ------------------------------------------------------------------------------
 
diff --git a/Source/PluginParam.cpp b/Source/PluginParam.cpp
index c3461e81..4d1635d7 100644
--- a/Source/PluginParam.cpp
+++ b/Source/PluginParam.cpp
@@ -243,6 +243,8 @@ void Ctrl::bind(Slider *s) {
     s->addListener(this);
     s->addMouseListener(this, true);
     s->setVelocityModeParameters (0.1, 1, 0.05, 1, ModifierKeys::shiftModifier);
+    s->textFromValueFunction = [this](double value) { return this->label + this->getValueDisplay(); };
+    s->setWantsKeyboardFocus(true);
 }
 
 void Ctrl::bind(Button *b) {