diff --git a/CMakeLists.txt b/CMakeLists.txt
index 405eeff60..3f02d8541 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ INCLUDE(FindPkgConfig)
 
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "0")
-SET(VERSION_PATCH "91")
+SET(VERSION_PATCH "92")
 #SET(VERSION_SUFFIX "")
 SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 IF(VERSION_SUFFIX)
diff --git a/README b/README
index 80e38a000..8b87d4e0f 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-LMMS 1.0.2
+LMMS 1.0.92
 ===========
 
 Copyright (c) 2004-2014 by LMMS developers
diff --git a/lmms.rc.in b/lmms.rc.in
index 620a7dfd5..b868263b3 100644
--- a/lmms.rc.in
+++ b/lmms.rc.in
@@ -2,7 +2,7 @@ lmmsicon ICON data/lmms.ico
 #include <windows.h>
 
 VS_VERSION_INFO	VERSIONINFO
-  FILEVERSION	1,0,2,0
+  FILEVERSION	1,0,92,0
   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
   FILEOS	VOS_NT_WINDOWS32
   FILETYPE	VFT_APP
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/UI/ADnoteUI.fl b/plugins/zynaddsubfx/zynaddsubfx/src/UI/ADnoteUI.fl
index cf510f40a..65e20ff6b 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/UI/ADnoteUI.fl
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/UI/ADnoteUI.fl
@@ -64,7 +64,7 @@ class ADvoicelistitem {open : {public Fl_Group}
       } {
         Fl_Value_Slider voicevolume {
           callback {pars->VoicePar[nvoice].PVolume=(int)o->value();}
-          tooltip Volume xywh {90 5 115 20} type {Horz Knob} box NO_BOX labelsize 8 align 5 maximum 127 step 1
+          tooltip Volume xywh {90 5 115 20} type {Horz Knob} box FLAT_BOX labelsize 8 align 5 maximum 127 step 1
           code0 {o->value(pars->VoicePar[nvoice].PVolume);}
         }
         Fl_Check_Button voiceresonanceenabled {
@@ -74,7 +74,7 @@ class ADvoicelistitem {open : {public Fl_Group}
         }
         Fl_Value_Slider voicelfofreq {
           callback {pars->VoicePar[nvoice].FreqLfo->Pintensity=(int)o->value();}
-          tooltip {Frequency LFO amount} xywh {500 5 115 20} type {Horz Knob} box NO_BOX labelsize 8 align 5 maximum 127 step 1
+          tooltip {Frequency LFO amount} xywh {500 5 115 20} type {Horz Knob} box FLAT_BOX labelsize 8 align 5 maximum 127 step 1
           code0 {o->value(pars->VoicePar[nvoice].FreqLfo->Pintensity);}
         }
         Fl_Dial voicepanning {
@@ -97,7 +97,7 @@ class ADvoicelistitem {open : {public Fl_Group}
         Fl_Slider voicedetune {
           callback {pars->VoicePar[nvoice].PDetune=(int)o->value()+8192;
 detunevalueoutput->do_callback();}
-          tooltip {Fine Detune (cents)} xywh {315 5 185 20} type {Horz Knob} box NO_BOX minimum -8192 maximum 8191 step 1
+          tooltip {Fine Detune (cents)} xywh {315 5 185 20} type {Horz Knob} box FLAT_BOX minimum -8192 maximum 8191 step 1
           code0 {o->value(pars->VoicePar[nvoice].PDetune-8192);}
         }
         Fl_Box noiselabel {
@@ -178,7 +178,7 @@ class ADvoiceUI {open : {public Fl_Group}
   } {
     Fl_Window ADnoteVoiceParameters {
       label Voice open
-      xywh {84 305 765 590} type Double box NO_BOX
+      xywh {84 305 765 590} type Double box FLAT_BOX
       class Fl_Group visible
     } {
       Fl_Group voiceparametersgroup {open
@@ -239,7 +239,7 @@ pars->VoicePar[nvoice].PFMCoarseDetune = k*1024+
               Fl_Slider {} {
                 callback {pars->VoicePar[nvoice].PFMDetune=(int)o->value()+8192;
 fmdetunevalueoutput->do_callback();}
-                tooltip {Fine Detune (cents)} xywh {590 245 155 15} type {Horz Knob} box NO_BOX minimum -8192 maximum 8191 step 1
+                tooltip {Fine Detune (cents)} xywh {590 245 155 15} type {Horz Knob} box FLAT_BOX minimum -8192 maximum 8191 step 1
                 code0 {o->value(pars->VoicePar[nvoice].PFMDetune-8192);}
               }
               Fl_Value_Output fmdetunevalueoutput {
@@ -265,13 +265,13 @@ fmdetunevalueoutput->do_callback();} open
               Fl_Value_Slider {} {
                 label Vol
                 callback {pars->VoicePar[nvoice].PFMVolume=(int)o->value();}
-                tooltip Volume xywh {540 80 160 15} type {Horz Knob} box NO_BOX labelsize 11 align 8 maximum 127 step 1
+                tooltip Volume xywh {540 80 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
                 code0 {o->value(pars->VoicePar[nvoice].PFMVolume);}
               }
               Fl_Value_Slider {} {
                 label {V.Sns}
                 callback {pars->VoicePar[nvoice].PFMVelocityScaleFunction=(int) o->value();}
-                tooltip {Velocity Sensing Function (rightmost to disable)} xywh {540 100 160 15} type {Horz Knob} box NO_BOX labelsize 11 align 8 maximum 127 step 1
+                tooltip {Velocity Sensing Function (rightmost to disable)} xywh {540 100 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
                 code0 {o->value(pars->VoicePar[nvoice].PFMVelocityScaleFunction);}
               }
               Fl_Group voiceFMampenvgroup {
@@ -293,7 +293,7 @@ o->redraw();}
               Fl_Value_Slider {} {
                 label {F.Damp}
                 callback {pars->VoicePar[nvoice].PFMVolumeDamp=(int) o->value()+64;}
-                tooltip {Modulator Damp at Higher frequency} xywh {540 120 160 15} type {Horz Knob} box NO_BOX labelsize 11 align 8 minimum -64 maximum 63 step 1
+                tooltip {Modulator Damp at Higher frequency} xywh {540 120 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 minimum -64 maximum 63 step 1
                 code0 {o->value(pars->VoicePar[nvoice].PFMVolumeDamp-64);}
               }
             }
@@ -326,7 +326,7 @@ oscedit=new OscilEditor(pars->VoicePar[nv].FMSmp,fmoscil,NULL,NULL,master);}
                 callback {pars->VoicePar[nvoice].PFMoscilphase=64-(int)o->value();
 oscFM->phase=64-(int) o->value();
 fmoscil->redraw();}
-                xywh {645 415 105 15} type {Horz Knob} box NO_BOX labelsize 10 align 5 minimum -64 maximum 63 step 1
+                xywh {645 415 105 15} type {Horz Knob} box FLAT_BOX labelsize 10 align 5 minimum -64 maximum 63 step 1
                 code0 {o->value(64-pars->VoicePar[nvoice].PFMoscilphase);}
               }
               Fl_Choice {} {
@@ -460,7 +460,7 @@ pars->VoicePar[nvoice].PCoarseDetune = k+
             Fl_Slider {} {
               callback {pars->VoicePar[nvoice].PDetune=(int)o->value()+8192;
 detunevalueoutput->do_callback();}
-              tooltip {Fine Detune (cents)} xywh {58 287 392 13} type {Horz Knob} box NO_BOX minimum -8192 maximum 8191 step 1
+              tooltip {Fine Detune (cents)} xywh {58 287 392 13} type {Horz Knob} box FLAT_BOX minimum -8192 maximum 8191 step 1
               code0 {o->value(pars->VoicePar[nvoice].PDetune-8192);}
             }
             Fl_Value_Output detunevalueoutput {
@@ -521,7 +521,7 @@ oscedit=new OscilEditor(pars->VoicePar[nv].OscilSmp,voiceoscil,NULL,NULL,master)
             callback {pars->VoicePar[nvoice].Poscilphase=64-(int)o->value();
 osc->phase=64-(int) o->value();
 voiceoscil->redraw();}
-            xywh {10 435 65 10} type {Horz Knob} box NO_BOX labelsize 10 align 5 minimum -64 maximum 63 step 1
+            xywh {10 435 65 10} type {Horz Knob} box FLAT_BOX labelsize 10 align 5 minimum -64 maximum 63 step 1
             code0 {o->value(64-pars->VoicePar[nvoice].Poscilphase);}
           }
           Fl_Check_Button {} {
@@ -583,7 +583,7 @@ voiceonbutton->redraw();} open
               label {Frequency Spread}
               callback {pars->VoicePar[nvoice].Unison_frequency_spread=(int)o->value();
 unisonspreadoutput->do_callback();}
-              tooltip {Frequency Spread of the Unison} xywh {95 562 125 13} type {Horz Knob} box NO_BOX labelsize 12 align 1 maximum 127 step 1 value 64
+              tooltip {Frequency Spread of the Unison} xywh {95 562 125 13} type {Horz Knob} box FLAT_BOX labelsize 12 align 1 maximum 127 step 1 value 64
               code0 {o->value(pars->VoicePar[nvoice].Unison_frequency_spread);}
             }
             Fl_Value_Output unisonspreadoutput {
@@ -608,13 +608,13 @@ unisonspreadoutput->do_callback();}
           Fl_Value_Slider {} {
             label Vol
             callback {pars->VoicePar[nvoice].PVolume=(int)o->value();}
-            tooltip Volume xywh {10 60 160 15} type {Horz Knob} box NO_BOX labelsize 11 align 8 maximum 127 step 1
+            tooltip Volume xywh {10 60 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
             code0 {o->value(pars->VoicePar[nvoice].PVolume);}
           }
           Fl_Value_Slider {} {
             label {V.Sns}
             callback {pars->VoicePar[nvoice].PAmpVelocityScaleFunction=(int) o->value();}
-            tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 80 160 15} type {Horz Knob} box NO_BOX labelsize 11 align 8 maximum 127 step 1
+            tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 80 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
             code0 {o->value(pars->VoicePar[nvoice].PAmpVelocityScaleFunction);}
           }
           Fl_Group voiceampenvgroup {
@@ -743,7 +743,7 @@ noiselabel->do_callback();}
           Fl_Value_Slider {} {
             label Delay
             callback {pars->VoicePar[nvoice].PDelay=(int)o->value();}
-            tooltip Volume xywh {120 21 84 12} type {Horz Knob} box NO_BOX labelsize 11 align 5 maximum 127 step 1
+            tooltip Volume xywh {120 21 84 12} type {Horz Knob} box FLAT_BOX labelsize 11 align 5 maximum 127 step 1
             code0 {o->value(pars->VoicePar[nvoice].PDelay);}
           }
         }
@@ -854,7 +854,7 @@ pars->GlobalPar.PCoarseDetune = k+
         Fl_Slider freq {
           callback {pars->GlobalPar.PDetune=(int)o->value()+8192;
 detunevalueoutput->do_callback();}
-          tooltip {Fine Detune (cents)} xywh {60 300 385 15} type {Horz Knob} box NO_BOX minimum -8192 maximum 8191 step 1
+          tooltip {Fine Detune (cents)} xywh {60 300 385 15} type {Horz Knob} box FLAT_BOX minimum -8192 maximum 8191 step 1
           code0 {o->value(pars->GlobalPar.PDetune-8192);}
         }
         Fl_Value_Output detunevalueoutput {
@@ -892,13 +892,13 @@ for (int i=0;i<NUM_VOICES;i++){
         Fl_Value_Slider volume {
           label Vol
           callback {pars->GlobalPar.PVolume=(int)o->value();}
-          tooltip Volume xywh {10 30 160 15} type {Horz Knob} box NO_BOX labelsize 11 align 8 maximum 127 step 1
+          tooltip Volume xywh {10 30 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
           code0 {o->value(pars->GlobalPar.PVolume);}
         }
         Fl_Value_Slider vsns {
           label {V.Sns}
           callback {pars->GlobalPar.PAmpVelocityScaleFunction=(int) o->value();}
-          tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 50 160 15} type {Horz Knob} box NO_BOX labelsize 11 align 8 maximum 127 step 1
+          tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 50 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
           code0 {o->value(pars->GlobalPar.PAmpVelocityScaleFunction);}
         }
         Fl_Dial pan {
@@ -1065,27 +1065,27 @@ ADnoteVoice->redraw();}
     } {
       Fl_Text_Display {} {
         label {No.}
-        xywh {10 15 30 10} box NO_BOX labelfont 1 labelsize 11
+        xywh {10 15 30 10} box FLAT_BOX labelfont 1 labelsize 11
       }
       Fl_Text_Display {} {
         label Vol
-        xywh {145 15 30 10} box NO_BOX labelfont 1 labelsize 11
+        xywh {145 15 30 10} box FLAT_BOX labelfont 1 labelsize 11
       }
       Fl_Text_Display {} {
         label Detune
-        xywh {384 15 25 10} box NO_BOX labelfont 1 labelsize 11
+        xywh {384 15 25 10} box FLAT_BOX labelfont 1 labelsize 11
       }
       Fl_Text_Display {} {
         label Pan
-        xywh {210 15 30 10} box NO_BOX labelfont 1 labelsize 11
+        xywh {210 15 30 10} box FLAT_BOX labelfont 1 labelsize 11
       }
       Fl_Text_Display {} {
         label {Vib. Depth}
-        xywh {560 15 30 10} box NO_BOX labelfont 1 labelsize 11
+        xywh {560 15 30 10} box FLAT_BOX labelfont 1 labelsize 11
       }
       Fl_Text_Display {} {
         label {R.}
-        xywh {245 15 25 10} box NO_BOX labelfont 1 labelsize 11
+        xywh {245 15 25 10} box FLAT_BOX labelfont 1 labelsize 11
       }
       Fl_Button {} {
         label {Hide Voice List}
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/UI/BankUI.fl b/plugins/zynaddsubfx/zynaddsubfx/src/UI/BankUI.fl
index 70c273a27..f29f8c1ff 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/UI/BankUI.fl
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/UI/BankUI.fl
@@ -125,27 +125,27 @@ class BankUI {open : {public BankProcess_}
       } {
         Fl_Pack {} {
           xywh {10 39 150 481} box BORDER_FRAME
-          code0 {o->box(FL_NO_BOX);}
+          code0 {o->box(FL_FLAT_BOX);}
           code1 {for (int i=0;i<32;i++){bs[i]=new BankSlot (0,0,o->w(),15," ");bs[i]->init(i,&what,&slot,&BankProcess_::process,(BankProcess_ *)this,bank,&nselected);};}
         } {}
         Fl_Pack {} {
           xywh {163 39 150 481} box BORDER_FRAME
-          code0 {o->box(FL_NO_BOX);}
+          code0 {o->box(FL_FLAT_BOX);}
           code1 {for (int i=32;i<64;i++){bs[i]=new BankSlot (0,0,o->w(),15," ");bs[i]->init(i,&what,&slot,&BankProcess_::process,(BankProcess_ *)this,bank,&nselected);};}
         } {}
         Fl_Pack {} {
           xywh {316 39 150 481} box BORDER_FRAME
-          code0 {o->box(FL_NO_BOX);}
+          code0 {o->box(FL_FLAT_BOX);}
           code1 {for (int i=64;i<96;i++){bs[i]=new BankSlot (0,0,o->w(),15," ");bs[i]->init(i,&what,&slot,&BankProcess_::process,(BankProcess_ *)this,bank,&nselected);};}
         } {}
         Fl_Pack {} {
           xywh {469 39 150 481} box BORDER_FRAME
-          code0 {o->box(FL_NO_BOX);}
+          code0 {o->box(FL_FLAT_BOX);}
           code1 {for (int i=96;i<128;i++){bs[i]=new BankSlot (0,0,o->w(),15," ");bs[i]->init(i,&what,&slot,&BankProcess_::process,(BankProcess_ *)this,bank,&nselected);};}
         } {}
         Fl_Pack {} {
           xywh {622 39 150 481} box BORDER_FRAME
-          code0 {o->box(FL_NO_BOX);}
+          code0 {o->box(FL_FLAT_BOX);}
           code1 {for (int i=128;i<160;i++){bs[i]=new BankSlot (0,0,o->w(),15," ");bs[i]->init(i,&what,&slot,&BankProcess_::process,(BankProcess_ *)this,bank,&nselected);};}
         } {}
       }
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/UI/MasterUI.fl b/plugins/zynaddsubfx/zynaddsubfx/src/UI/MasterUI.fl
index 0a163a9fa..aea30d6b7 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/UI/MasterUI.fl
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/UI/MasterUI.fl
@@ -315,7 +315,7 @@ class Panellistitem {open : {public Fl_Group}
   Function {make_window()} {open private
   } {
     Fl_Window panellistitem {open
-      private xywh {608 711 100 260} type Double box NO_BOX
+      private xywh {608 711 100 260} type Double box FLAT_BOX
       class Fl_Group visible
     } {
       Fl_Group panellistitemgroup {open
@@ -344,7 +344,7 @@ bankui->show();}
         }
         Fl_Slider partvolume {
           callback {master->part[npart]->setPvolume((int) o->value());}
-          xywh {10 65 30 110} type {Vert Knob} box NO_BOX minimum 127 maximum 0 step 1 value 127
+          xywh {10 65 30 110} type {Vert Knob} box FLAT_BOX minimum 127 maximum 0 step 1 value 127
           code0 {o->value(master->part[npart]->Pvolume);}
         }
         Fl_Dial partpanning {
@@ -1243,7 +1243,7 @@ bankui->show();}
         Fl_Slider partpanning {
           label Pan
           callback {master->part[npart]->setPpanning((int) o->value());}
-          xywh {185 95 145 15} type {Horz Knob} box NO_BOX labelsize 11 maximum 127 step 1 value 64
+          xywh {185 95 145 15} type {Horz Knob} box FLAT_BOX labelsize 11 maximum 127 step 1 value 64
           code0 {o->value(master->part[npart]->Ppanning);}
         }
         Fl_Choice partrcv {
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/UI/OscilGenUI.fl b/plugins/zynaddsubfx/zynaddsubfx/src/UI/OscilGenUI.fl
index a77a041e3..45f3ba534 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/UI/OscilGenUI.fl
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/UI/OscilGenUI.fl
@@ -252,7 +252,7 @@ class Oscilharmonic {: {public Fl_Group}
   Function {make_window()} {open private
   } {
     Fl_Window harmonic {open
-      private xywh {338 259 100 225} type Double box NO_BOX
+      private xywh {338 259 100 225} type Double box FLAT_BOX
       class Fl_Group visible
     } {
       Fl_Slider mag {
@@ -278,7 +278,7 @@ if (cbwidget!=NULL) {
 	applybutton->color(FL_RED);
 	applybutton->redraw();
 };}
-        xywh {0 15 15 115} type {Vert Knob} box NO_BOX selection_color 222 maximum 127 step 1 value 64
+        xywh {0 15 15 115} type {Vert Knob} box FLAT_BOX selection_color 222 maximum 127 step 1 value 64
         code0 {o->value(127-oscil->Phmag[n]);}
         code1 {if (oscil->Phmag[n]==64) o->selection_color(0);}
         class PSlider
@@ -300,7 +300,7 @@ if (cbwidget!=NULL) {
 	applybutton->color(FL_RED);
 	applybutton->redraw();
 };}
-        xywh {0 135 15 75} type {Vert Knob} box NO_BOX selection_color 222 maximum 127 step 1 value 64
+        xywh {0 135 15 75} type {Vert Knob} box FLAT_BOX selection_color 222 maximum 127 step 1 value 64
         code0 {o->value(oscil->Phphase[n]);}
         class PSlider
       }
@@ -397,7 +397,7 @@ if (cbapplywidget!=NULL) {
           callback {oscil->Prand=(int)o->value()+64;
 oscildisplaygroup->redraw();
 oldosc->redraw();}
-          tooltip {Oscilator Phase Randomness: smaller than 0 is "group", larger than 0 is for each harmonic} xywh {140 285 100 10} type {Horz Knob} box NO_BOX labelsize 10 align 5 minimum -64 maximum 63 step 1
+          tooltip {Oscilator Phase Randomness: smaller than 0 is "group", larger than 0 is for each harmonic} xywh {140 285 100 10} type {Horz Knob} box FLAT_BOX labelsize 10 align 5 minimum -64 maximum 63 step 1
           code0 {if (oscil->ADvsPAD) o->hide();}
         }
         Fl_Group {} {open
@@ -982,7 +982,7 @@ redrawoscil();}
         Fl_Slider adhrpar {
           callback {oscil->Padaptiveharmonicspar=(int)o->value();
 redrawoscil();}
-          xywh {670 445 55 10} type {Horz Knob} box NO_BOX maximum 100 step 1 value 50
+          xywh {670 445 55 10} type {Horz Knob} box FLAT_BOX maximum 100 step 1 value 50
         }
       }
       Fl_Group {} {
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/UI/PADnoteUI.fl b/plugins/zynaddsubfx/zynaddsubfx/src/UI/PADnoteUI.fl
index 4cb30dea9..200cd2722 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/UI/PADnoteUI.fl
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/UI/PADnoteUI.fl
@@ -826,7 +826,7 @@ pars->PCoarseDetune = k+
             Fl_Slider detune {
               callback {pars->PDetune=(int)o->value()+8192;
 detunevalueoutput->do_callback();}
-              tooltip {Fine Detune (cents)} xywh {60 295 295 15} type {Horz Knob} box NO_BOX minimum -8192 maximum 8191 step 1
+              tooltip {Fine Detune (cents)} xywh {60 295 295 15} type {Horz Knob} box FLAT_BOX minimum -8192 maximum 8191 step 1
               code0 {o->value(pars->PDetune-8192);}
             }
             Fl_Value_Output detunevalueoutput {
@@ -868,13 +868,13 @@ if (x==0) fixedfreqetdial->deactivate();
             Fl_Value_Slider volume {
               label Vol
               callback {pars->PVolume=(int)o->value();}
-              tooltip Volume xywh {10 50 160 15} type {Horz Knob} box NO_BOX labelsize 11 align 8 maximum 127 step 1
+              tooltip Volume xywh {10 50 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
               code0 {o->value(pars->PVolume);}
             }
             Fl_Value_Slider vsns {
               label {V.Sns}
               callback {pars->PAmpVelocityScaleFunction=(int) o->value();}
-              tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 70 160 15} type {Horz Knob} box NO_BOX labelsize 11 align 8 maximum 127 step 1
+              tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 70 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
               code0 {o->value(pars->PAmpVelocityScaleFunction);}
             }
             Fl_Dial pan {
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/UI/PartUI.fl b/plugins/zynaddsubfx/zynaddsubfx/src/UI/PartUI.fl
index fb6701101..62f24b6c7 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/UI/PartUI.fl
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/UI/PartUI.fl
@@ -47,7 +47,7 @@ class PartSysEffSend {open : {public Fl_Group}
   Function {make_window()} {open private
   } {
     Fl_Window syseffsend {
-      private xywh {589 129 100 100} type Double box NO_BOX
+      private xywh {589 129 100 100} type Double box FLAT_BOX
       class Fl_Group visible
     } {
       Fl_Dial {} {
@@ -88,7 +88,7 @@ class PartKitItem {open : {public Fl_Group}
   Function {make_window()} {open private
   } {
     Fl_Window partkititem {
-      private xywh {473 406 670 100} type Double box NO_BOX
+      private xywh {473 406 670 100} type Double box FLAT_BOX
       class Fl_Group visible
     } {
       Fl_Group partkititemgroup {
@@ -274,7 +274,7 @@ class PartUI {open : {public Fl_Group}
   Function {make_window()} {open private
   } {
     Fl_Window partgroup {open
-      private xywh {688 264 385 180} type Double box NO_BOX
+      private xywh {688 264 385 180} type Double box FLAT_BOX
       class Fl_Group visible
     } {
       Fl_Group partgroupui {open
@@ -452,7 +452,7 @@ if (part->Penabled==0) partgroupui->deactivate();
     }
     Fl_Window ctlwindow {
       label Controllers open
-      private xywh {777 261 500 130} type Double box NO_BOX visible
+      private xywh {777 261 500 130} type Double box FLAT_BOX visible
     } {
       Fl_Check_Button {} {
         label Expr
@@ -635,7 +635,7 @@ else {propta->deactivate();proptb->deactivate();}}
     }
     Fl_Window partfx {
       label {Part's Insert Effects} selected
-      private xywh {554 660 390 145} type Double box NO_BOX visible
+      private xywh {554 660 390 145} type Double box FLAT_BOX visible
     } {
       Fl_Counter inseffnocounter {
         label {FX No.}
@@ -756,7 +756,7 @@ pthread_mutex_unlock(&master->mutex);}
     }
     Fl_Window instrumentkitlist {
       label {Instrument Kit} open
-      xywh {586 566 670 370} type Double box NO_BOX visible
+      xywh {586 566 670 370} type Double box FLAT_BOX visible
     } {
       Fl_Button {} {
         label {Close Window}
@@ -837,7 +837,7 @@ if (part->Pkitmode==0) {
     }
     Fl_Window instrumenteditwindow {
       label {Instrument Edit} open
-      xywh {182 214 395 360} type Double hide
+      xywh {247 621 395 360} type Double box FLAT_BOX visible
     } {
       Fl_Group {} {
         xywh {0 220 395 110} box UP_FRAME
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/UI/SUBnoteUI.fl b/plugins/zynaddsubfx/zynaddsubfx/src/UI/SUBnoteUI.fl
index d7807fc84..a6bbb92cd 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/UI/SUBnoteUI.fl
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/UI/SUBnoteUI.fl
@@ -132,13 +132,13 @@ class SUBnoteUI {open : {public PresetsUI_}
         Fl_Value_Slider vol {
           label Vol
           callback {pars->PVolume=(int)o->value();}
-          tooltip Volume xywh {10 25 140 15} type {Horz Knob} box NO_BOX labelsize 11 align 8 maximum 127 step 1
+          tooltip Volume xywh {10 25 140 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
           code0 {o->value(pars->PVolume);}
         }
         Fl_Value_Slider vsns {
           label {V.Sns}
           callback {pars->PAmpVelocityScaleFunction=(int) o->value();}
-          tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 45 140 15} type {Horz Knob} box NO_BOX labelsize 11 align 8 maximum 127 step 1
+          tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 45 140 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
           code0 {o->value(pars->PAmpVelocityScaleFunction);}
         }
         Fl_Dial pan {
@@ -256,7 +256,7 @@ pars->PCoarseDetune = k+
         Fl_Slider detune {
           callback {pars->PDetune=(int)o->value()+8192;
 detunevalueoutput->do_callback();}
-          tooltip {Fine Detune (cents)} xywh {495 25 230 15} type {Horz Knob} box NO_BOX minimum -8192 maximum 8191 step 1
+          tooltip {Fine Detune (cents)} xywh {495 25 230 15} type {Horz Knob} box FLAT_BOX minimum -8192 maximum 8191 step 1
           code0 {o->value(pars->PDetune-8192);}
         }
         Fl_Value_Output detunevalueoutput {
@@ -334,13 +334,13 @@ bandwidthsettingsui->redraw();}
         Fl_Value_Slider bandwidth {
           label {Band Width}
           callback {pars->Pbandwidth=(int) o->value();}
-          xywh {225 40 115 15} type {Horz Knob} box NO_BOX labelsize 10 align 1 maximum 127 step 1
+          xywh {225 40 115 15} type {Horz Knob} box FLAT_BOX labelsize 10 align 1 maximum 127 step 1
           code0 {o->value(pars->Pbandwidth);}
         }
         Fl_Value_Slider bwidthscale {
           label {B.Width Scale}
           callback {pars->Pbwscale=(int) o->value()+64;}
-          tooltip {How much I increase the BandWidth according to lower/higher harmonics} xywh {345 40 90 15} type {Horz Knob} box NO_BOX labelsize 10 align 1 minimum -64 maximum 63 step 1
+          tooltip {How much I increase the BandWidth according to lower/higher harmonics} xywh {345 40 90 15} type {Horz Knob} box FLAT_BOX labelsize 10 align 1 minimum -64 maximum 63 step 1
           code0 {o->value(pars->Pbwscale-64);}
         }
       }
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/UI/VirKeyboard.fl b/plugins/zynaddsubfx/zynaddsubfx/src/UI/VirKeyboard.fl
index 6bbaa870e..805e00cfc 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/UI/VirKeyboard.fl
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/UI/VirKeyboard.fl
@@ -335,7 +335,7 @@ virkeys->take_focus();}
         label Vel
         callback {virkeys->midivel=(int) o->value();
 virkeys->take_focus();} selected
-        tooltip Velocity xywh {95 105 100 15} type {Horz Knob} box NO_BOX labelsize 10 align 5 minimum 1 maximum 127 step 1
+        tooltip Velocity xywh {95 105 100 15} type {Horz Knob} box FLAT_BOX labelsize 10 align 5 minimum 1 maximum 127 step 1
         code0 {o->value(virkeys->midivel);}
       }
       Fl_Counter {} {