wip

16 files changed, 502 insertions, 489 deletions

diff --git a/fluid/panels/codeview_panel.cxx b/fluid/panels/codeview_panel.cxx
index 728ee986c..37e8b873f 100644
--- a/fluid/panels/codeview_panel.cxx
+++ b/fluid/panels/codeview_panel.cxx
@@ -171,7 +171,7 @@ void update_codeview_cb(class Fl_Button*, void*) {
     }
 
     if (cv_project->visible_r()) {
-      fld::io::write_file(Fluid.proj, cv_design_filename, false, true);
+      write_file(Fluid.proj, cv_design_filename, false, true);
       int top = cv_project->top_line();
       cv_project->buffer()->loadfile(cv_design_filename);
       cv_project->scroll(top, 0);
@@ -181,7 +181,7 @@ void update_codeview_cb(class Fl_Button*, void*) {
       fl_strlcpy(fn, Fluid.get_tmpdir(), FL_PATH_MAX);
       fl_strlcat(fn, "strings", FL_PATH_MAX);
       fl_filename_setext(fn, FL_PATH_MAX, exts[(int)(Fluid.proj.i18n.type)]);
-      fld::io::write_strings(Fluid.proj, fn);
+      write_strings(Fluid.proj, fn);
       int top = cv_strings->top_line();
       cv_strings->buffer()->loadfile(fn);
       cv_strings->scroll(top, 0);
@@ -194,7 +194,7 @@ void update_codeview_cb(class Fl_Button*, void*) {
       Fluid.proj.set_header_file_name(cv_header_filename);
 
       // generate the code and load the files
-      fld::io::Code_Writer f(Fluid.proj);
+      Code_Writer f(Fluid.proj);
       // generate files
       if (f.write_code(cv_source_filename, cv_header_filename, true))
       {
@@ -271,13 +271,13 @@ Fl_Tabs *cv_tab=(Fl_Tabs *)0;
 
 Fl_Group *cv_source_tab=(Fl_Group *)0;
 
-fld::widget::Code_Viewer *cv_source=(fld::widget::Code_Viewer *)0;
+Code_Viewer *cv_source=(Code_Viewer *)0;
 
-fld::widget::Code_Viewer *cv_header=(fld::widget::Code_Viewer *)0;
+Code_Viewer *cv_header=(Code_Viewer *)0;
 
-fld::widget::Text_Viewer *cv_strings=(fld::widget::Text_Viewer *)0;
+Text_Viewer *cv_strings=(Text_Viewer *)0;
 
-fld::widget::Text_Viewer *cv_project=(fld::widget::Text_Viewer *)0;
+Text_Viewer *cv_project=(Text_Viewer *)0;
 
 Fl_Group *cv_find_row=(Fl_Group *)0;
 
@@ -406,7 +406,7 @@ Fl_Double_Window* make_codeview() {
       cv_tab->callback((Fl_Callback*)update_codeview_position_cb);
       { cv_source_tab = new Fl_Group(10, 35, 500, 415, "Source");
         cv_source_tab->labelsize(13);
-        { fld::widget::Code_Viewer* o = cv_source = new fld::widget::Code_Viewer(10, 40, 500, 410);
+        { Code_Viewer* o = cv_source = new Code_Viewer(10, 40, 500, 410);
           cv_source->box(FL_DOWN_FRAME);
           cv_source->color(FL_BACKGROUND2_COLOR);
           cv_source->selection_color(FL_SELECTION_COLOR);
@@ -421,14 +421,14 @@ Fl_Double_Window* make_codeview() {
           Fl_Group::current()->resizable(cv_source);
           o->linenumber_width(60);
           o->linenumber_size(o->Fl_Text_Display::textsize());
-        } // fld::widget::Code_Viewer* cv_source
+        } // Code_Viewer* cv_source
         cv_source_tab->end();
         Fl_Group::current()->resizable(cv_source_tab);
       } // Fl_Group* cv_source_tab
       { Fl_Group* o = new Fl_Group(10, 35, 500, 415, "Header");
         o->labelsize(13);
         o->hide();
-        { fld::widget::Code_Viewer* o = cv_header = new fld::widget::Code_Viewer(10, 40, 500, 410);
+        { Code_Viewer* o = cv_header = new Code_Viewer(10, 40, 500, 410);
           cv_header->box(FL_DOWN_FRAME);
           cv_header->color(FL_BACKGROUND2_COLOR);
           cv_header->selection_color(FL_SELECTION_COLOR);
@@ -443,13 +443,13 @@ Fl_Double_Window* make_codeview() {
           Fl_Group::current()->resizable(cv_header);
           o->linenumber_width(60);
           o->linenumber_size(o->Fl_Text_Display::textsize());
-        } // fld::widget::Code_Viewer* cv_header
+        } // Code_Viewer* cv_header
         o->end();
       } // Fl_Group* o
       { Fl_Group* o = new Fl_Group(10, 35, 500, 415, "Strings");
         o->labelsize(13);
         o->hide();
-        { fld::widget::Text_Viewer* o = cv_strings = new fld::widget::Text_Viewer(10, 40, 500, 410);
+        { Text_Viewer* o = cv_strings = new Text_Viewer(10, 40, 500, 410);
           cv_strings->box(FL_DOWN_FRAME);
           cv_strings->color(FL_BACKGROUND2_COLOR);
           cv_strings->selection_color(FL_SELECTION_COLOR);
@@ -464,13 +464,13 @@ Fl_Double_Window* make_codeview() {
           Fl_Group::current()->resizable(cv_strings);
           o->linenumber_width(60);
           o->linenumber_size(o->Fl_Text_Display::textsize());
-        } // fld::widget::Text_Viewer* cv_strings
+        } // Text_Viewer* cv_strings
         o->end();
       } // Fl_Group* o
       { Fl_Group* o = new Fl_Group(10, 35, 500, 415, "Project");
         o->labelsize(13);
         o->hide();
-        { fld::widget::Text_Viewer* o = cv_project = new fld::widget::Text_Viewer(10, 40, 500, 410);
+        { Text_Viewer* o = cv_project = new Text_Viewer(10, 40, 500, 410);
           cv_project->box(FL_DOWN_FRAME);
           cv_project->color(FL_BACKGROUND2_COLOR);
           cv_project->selection_color(FL_SELECTION_COLOR);
@@ -485,7 +485,7 @@ Fl_Double_Window* make_codeview() {
           Fl_Group::current()->resizable(cv_project);
           o->linenumber_width(60);
           o->linenumber_size(o->Fl_Text_Display::textsize());
-        } // fld::widget::Text_Viewer* cv_project
+        } // Text_Viewer* cv_project
         o->end();
       } // Fl_Group* o
       cv_tab->end();
diff --git a/fluid/panels/codeview_panel.fl b/fluid/panels/codeview_panel.fl
index 1d5a0cad6..90128afd9 100644
--- a/fluid/panels/codeview_panel.fl
+++ b/fluid/panels/codeview_panel.fl
@@ -48,13 +48,13 @@ decl {\#include <FL/Fl_Button.H>} {private local
 decl {\#include "../src/flstring.h"} {private local
 }
 
-decl {char *cv_source_filename = nullptr;} {private local
+decl {char *cv_source_filename = 0;} {private local
 }
 
-decl {char *cv_header_filename = nullptr;} {private local
+decl {char *cv_header_filename = 0;} {private local
 }
 
-decl {char *cv_design_filename = nullptr;} {private local
+decl {char *cv_design_filename = 0;} {private local
 }
 
 decl {int cv_code_choice;} {public local
@@ -201,7 +201,7 @@ and load those into the Code Viewer widgets.} open return_type void
   }
 
   if (cv_project->visible_r()) {
-    fld::io::write_file(Fluid.proj, cv_design_filename, false, true);
+    write_file(Fluid.proj, cv_design_filename, false, true);
     int top = cv_project->top_line();
     cv_project->buffer()->loadfile(cv_design_filename);
     cv_project->scroll(top, 0);
@@ -211,18 +211,20 @@ and load those into the Code Viewer widgets.} open return_type void
     fl_strlcpy(fn, Fluid.get_tmpdir().c_str(), FL_PATH_MAX);
     fl_strlcat(fn, "strings", FL_PATH_MAX);
     fl_filename_setext(fn, FL_PATH_MAX, exts[static_cast<int>(Fluid.proj.i18n.type)]);
-    fld::io::write_strings(Fluid.proj, fn);
+    write_strings(Fluid.proj, fn);
     int top = cv_strings->top_line();
     cv_strings->buffer()->loadfile(fn);
     cv_strings->scroll(top, 0);
   } else if (cv_source->visible_r() || cv_header->visible_r()) {
-    std::string code_file_name_bak = Fluid.proj.code_file_name;
-    Fluid.proj.code_file_name = cv_source_filename;
-    std::string header_file_name_bak = Fluid.proj.header_file_name;
-    Fluid.proj.header_file_name = cv_header_filename;
+    char code_file_name_bak[FL_PATH_MAX];
+    fl_strlcpy(code_file_name_bak, Fluid.proj.code_file_name(), FL_PATH_MAX);
+    Fluid.proj.set_code_file_name(cv_source_filename);
+    char header_file_name_bak[FL_PATH_MAX];
+    fl_strlcpy(header_file_name_bak, Fluid.proj.header_file_name(), FL_PATH_MAX);
+    Fluid.proj.set_header_file_name(cv_header_filename);
 
     // generate the code and load the files
-    fld::io::Code_Writer f(Fluid.proj);
+    Code_Writer f(Fluid.proj);
     // generate files
     if (f.write_code(cv_source_filename, cv_header_filename, true))
     {
@@ -238,8 +240,8 @@ and load those into the Code Viewer widgets.} open return_type void
       update_codeview_position();
     }
 
-    Fluid.proj.code_file_name = code_file_name_bak;
-    Fluid.proj.header_file_name = header_file_name_bak;
+    Fluid.proj.set_code_file_name(code_file_name_bak);
+    Fluid.proj.set_header_file_name(header_file_name_bak);
   }} {selected
   }
 }
@@ -313,7 +315,7 @@ Function {make_codeview()} {open
           code0 {\#include "widgets/Code_Viewer.h"}
           code1 {o->linenumber_width(60);}
           code2 {o->linenumber_size(o->Fl_Text_Display::textsize());}
-          class {fld::widget::Code_Viewer}
+          class {Code_Viewer}
         }
       }
       Fl_Group {} {
@@ -325,7 +327,7 @@ Function {make_codeview()} {open
           code0 {\#include "widgets/Code_Viewer.h"}
           code1 {o->linenumber_width(60);}
           code2 {o->linenumber_size(o->Fl_Text_Display::textsize());}
-          class {fld::widget::Code_Viewer}
+          class {Code_Viewer}
         }
       }
       Fl_Group {} {
@@ -337,7 +339,7 @@ Function {make_codeview()} {open
           code0 {\#include "widgets/Text_Viewer.h"}
           code1 {o->linenumber_width(60);}
           code2 {o->linenumber_size(o->Fl_Text_Display::textsize());}
-          class {fld::widget::Text_Viewer}
+          class {Text_Viewer}
         }
       }
       Fl_Group {} {
@@ -349,7 +351,7 @@ Function {make_codeview()} {open
           code0 {\#include "widgets/Text_Viewer.h"}
           code1 {o->linenumber_width(60);}
           code2 {o->linenumber_size(o->Fl_Text_Display::textsize());}
-          class {fld::widget::Text_Viewer}
+          class {Text_Viewer}
         }
       }
     }
@@ -362,7 +364,7 @@ Function {make_codeview()} {open
       }
       Fl_Input cv_find_text {
         label {Find:}
-        callback {Fl_Text_Display *e = nullptr;
+        callback {Fl_Text_Display *e = 0;
 if (cv_source->visible_r()) {
   e = cv_source;
 } else if (cv_header->visible_r()) {
@@ -384,7 +386,7 @@ if (e) {
       }
       Fl_Button {} {
         label {<<}
-        callback {Fl_Text_Display *e = nullptr;
+        callback {Fl_Text_Display *e = 0;
 if (cv_source->visible_r()) {
   e = cv_source;
 } else if (cv_header->visible_r()) {
@@ -410,7 +412,7 @@ if (e) {
       }
       Fl_Button {} {
         label {>>}
-        callback {Fl_Text_Display *e = nullptr;
+        callback {Fl_Text_Display *e = 0;
 if (cv_source->visible_r()) {
   e = cv_source;
 } else if (cv_header->visible_r()) {
@@ -437,7 +439,7 @@ if (e) {
       Fl_Button {} {
         label Reveal
         callback {if (codeview_panel && codeview_panel->visible()) {
-  Node *node = nullptr;
+  Node *node = 0;
   if (cv_source->visible_r())
     node = Fluid.proj.tree.find_in_text(0, cv_source->insert_position());
   else if (cv_header->visible_r())
diff --git a/fluid/panels/codeview_panel.h b/fluid/panels/codeview_panel.h
index ba30336df..5c482a54a 100644
--- a/fluid/panels/codeview_panel.h
+++ b/fluid/panels/codeview_panel.h
@@ -34,11 +34,11 @@ extern Fl_Tabs *cv_tab;
 #include <FL/Fl_Group.H>
 extern Fl_Group *cv_source_tab;
 #include "widgets/Code_Viewer.h"
-extern fld::widget::Code_Viewer *cv_source;
-extern fld::widget::Code_Viewer *cv_header;
+extern Code_Viewer *cv_source;
+extern Code_Viewer *cv_header;
 #include "widgets/Text_Viewer.h"
-extern fld::widget::Text_Viewer *cv_strings;
-extern fld::widget::Text_Viewer *cv_project;
+extern Text_Viewer *cv_strings;
+extern Text_Viewer *cv_project;
 extern Fl_Group *cv_find_row;
 #include <FL/Fl_Button.H>
 extern Fl_Button *cv_find_text_case;
diff --git a/fluid/panels/function_panel.cxx b/fluid/panels/function_panel.cxx
index a5aa35f12..3acebb603 100644
--- a/fluid/panels/function_panel.cxx
+++ b/fluid/panels/function_panel.cxx
@@ -78,7 +78,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("CodeBlock"));
         o->image(pixmap[(int)FLD_NODE_TYPE_CodeBlock]);
       } // Fl_Button* o
-      { fld::widget::Bin_Window_Button* o = new fld::widget::Bin_Window_Button(55, 46, 24, 24);
+      { Bin_Window_Button* o = new Bin_Window_Button(55, 46, 24, 24);
         o->tooltip("Widget Class");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -91,7 +91,7 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Widget_Class]);
-      } // fld::widget::Bin_Window_Button* o
+      } // Bin_Window_Button* o
       { Fl_Button* o = new Fl_Button(5, 71, 24, 24);
         o->tooltip("Declaration");
         o->box(FL_THIN_UP_BOX);
@@ -114,7 +114,7 @@ Fl_Window* make_widgetbin() {
     } // Fl_Group* o
     { Fl_Group* o = new Fl_Group(87, 19, 79, 79, "Groups");
       o->labelsize(12);
-      { fld::widget::Bin_Window_Button* o = new fld::widget::Bin_Window_Button(89, 21, 24, 24);
+      { Bin_Window_Button* o = new Bin_Window_Button(89, 21, 24, 24);
         o->tooltip("Window");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -127,8 +127,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Window]);
-      } // fld::widget::Bin_Window_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(114, 21, 24, 24);
+      } // Bin_Window_Button* o
+      { Bin_Button* o = new Bin_Button(114, 21, 24, 24);
         o->tooltip("Group");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -141,8 +141,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Group]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(139, 21, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(139, 21, 24, 24);
         o->tooltip("Pack");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -155,8 +155,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Pack]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(89, 46, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(89, 46, 24, 24);
         o->tooltip("Tabs");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -169,8 +169,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Tabs]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(114, 46, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(114, 46, 24, 24);
         o->tooltip("Scroll");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -183,8 +183,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Scroll]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(139, 46, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(139, 46, 24, 24);
         o->tooltip("Flex");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -197,8 +197,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Flex]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(89, 71, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(89, 71, 24, 24);
         o->tooltip("Tile");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -211,8 +211,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Tile]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(114, 71, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(114, 71, 24, 24);
         o->tooltip("Wizard");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -225,8 +225,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Wizard]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(139, 71, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(139, 71, 24, 24);
         o->tooltip("Grid");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -239,12 +239,12 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Grid]);
-      } // fld::widget::Bin_Button* o
+      } // Bin_Button* o
       o->end();
     } // Fl_Group* o
     { Fl_Group* o = new Fl_Group(171, 19, 54, 79, "Buttons");
       o->labelsize(12);
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(173, 21, 24, 24);
+      { Bin_Button* o = new Bin_Button(173, 21, 24, 24);
         o->tooltip("Button");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -257,8 +257,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Button]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(198, 21, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(198, 21, 24, 24);
         o->tooltip("Return Button");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -271,8 +271,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Return_Button]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(173, 46, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(173, 46, 24, 24);
         o->tooltip("Light Button");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -285,8 +285,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Light_Button]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(198, 46, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(198, 46, 24, 24);
         o->tooltip("Repeat Button");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -299,8 +299,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Repeat_Button]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(173, 71, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(173, 71, 24, 24);
         o->tooltip("Check Button");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -313,8 +313,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Check_Button]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(198, 71, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(198, 71, 24, 24);
         o->tooltip("Round Button");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -327,12 +327,12 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Round_Button]);
-      } // fld::widget::Bin_Button* o
+      } // Bin_Button* o
       o->end();
     } // Fl_Group* o
     { Fl_Group* o = new Fl_Group(230, 19, 104, 79, "Valuators");
       o->labelsize(12);
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(232, 21, 24, 24);
+      { Bin_Button* o = new Bin_Button(232, 21, 24, 24);
         o->tooltip("Slider");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -345,8 +345,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Slider]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(257, 21, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(257, 21, 24, 24);
         o->tooltip("Scroll Bar");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -359,8 +359,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Scrollbar]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(282, 21, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(282, 21, 24, 24);
         o->tooltip("Value Slider");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -373,8 +373,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Value_Slider]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(307, 21, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(307, 21, 24, 24);
         o->tooltip("Value Output");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -387,8 +387,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Value_Output]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(232, 46, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(232, 46, 24, 24);
         o->tooltip("Adjuster");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -401,8 +401,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Adjuster]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(257, 46, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(257, 46, 24, 24);
         o->tooltip("Counter");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -415,8 +415,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Counter]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(282, 46, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(282, 46, 24, 24);
         o->tooltip("Dial");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -429,8 +429,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Dial]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(232, 71, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(232, 71, 24, 24);
         o->tooltip("Roller");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -443,8 +443,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Roller]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(257, 71, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(257, 71, 24, 24);
         o->tooltip("Spinner");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -457,8 +457,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Spinner]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(282, 71, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(282, 71, 24, 24);
         o->tooltip("Value Input");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -471,12 +471,12 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Value_Input]);
-      } // fld::widget::Bin_Button* o
+      } // Bin_Button* o
       o->end();
     } // Fl_Group* o
     { Fl_Group* o = new Fl_Group(339, 19, 54, 79, "Text");
       o->labelsize(12);
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(341, 21, 24, 24);
+      { Bin_Button* o = new Bin_Button(341, 21, 24, 24);
         o->tooltip("Input");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -489,8 +489,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Input]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(366, 21, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(366, 21, 24, 24);
         o->tooltip("Output");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -503,8 +503,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Output]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(341, 46, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(341, 46, 24, 24);
         o->tooltip("Text Edit");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -517,8 +517,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Text_Editor]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(366, 46, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(366, 46, 24, 24);
         o->tooltip("Text Display");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -531,8 +531,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Text_Display]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(341, 71, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(341, 71, 24, 24);
         o->tooltip("File Input");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -545,8 +545,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_File_Input]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(366, 71, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(366, 71, 24, 24);
         o->tooltip("Terminal");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -559,12 +559,12 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Terminal]);
-      } // fld::widget::Bin_Button* o
+      } // Bin_Button* o
       o->end();
     } // Fl_Group* o
     { Fl_Group* o = new Fl_Group(398, 19, 79, 79, "Menus");
       o->labelsize(12);
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(400, 22, 24, 24);
+      { Bin_Button* o = new Bin_Button(400, 22, 24, 24);
         o->tooltip("Input Choice");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -577,8 +577,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Input_Choice]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(425, 21, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(425, 21, 24, 24);
         o->tooltip("Menu Item");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -591,8 +591,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Menu_Item]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(450, 21, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(450, 21, 24, 24);
         o->tooltip("Menu Bar");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -605,8 +605,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Menu_Bar]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(400, 46, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(400, 46, 24, 24);
         o->tooltip("Menu Button");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -619,8 +619,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Menu_Button]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(425, 46, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(425, 46, 24, 24);
         o->tooltip("Checkbox Menu Item");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -633,8 +633,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Checkbox_Menu_Item]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(450, 46, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(450, 46, 24, 24);
         o->tooltip("Sub Menu");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -647,8 +647,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Submenu]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(400, 71, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(400, 71, 24, 24);
         o->tooltip("Choice");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -661,8 +661,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Choice]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(425, 71, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(425, 71, 24, 24);
         o->tooltip("Radio Menu Item");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -675,12 +675,12 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Radio_Menu_Item]);
-      } // fld::widget::Bin_Button* o
+      } // Bin_Button* o
       o->end();
     } // Fl_Group* o
     { Fl_Group* o = new Fl_Group(482, 19, 54, 79, "Browsers");
       o->labelsize(12);
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(484, 21, 24, 24);
+      { Bin_Button* o = new Bin_Button(484, 21, 24, 24);
         o->tooltip("Browser");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -693,8 +693,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Browser]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(509, 21, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(509, 21, 24, 24);
         o->tooltip("Tree");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -707,8 +707,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Tree]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(484, 46, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(484, 46, 24, 24);
         o->tooltip("Check Browser");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -721,8 +721,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Check_Browser]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(509, 46, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(509, 46, 24, 24);
         o->tooltip("Help Browser");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -735,8 +735,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Help_View]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(484, 71, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(484, 71, 24, 24);
         o->tooltip("File Browser");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -749,8 +749,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_File_Browser]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(509, 71, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(509, 71, 24, 24);
         o->tooltip("Table");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -763,12 +763,12 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Table]);
-      } // fld::widget::Bin_Button* o
+      } // Bin_Button* o
       o->end();
     } // Fl_Group* o
     { Fl_Group* o = new Fl_Group(540, 19, 55, 79, "Misc");
       o->labelsize(12);
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(542, 21, 24, 24);
+      { Bin_Button* o = new Bin_Button(542, 21, 24, 24);
         o->tooltip("Box");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -781,8 +781,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Box]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(567, 21, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(567, 21, 24, 24);
         o->tooltip("Clock");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -795,8 +795,8 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Clock]);
-      } // fld::widget::Bin_Button* o
-      { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(542, 46, 24, 24);
+      } // Bin_Button* o
+      { Bin_Button* o = new Bin_Button(542, 46, 24, 24);
         o->tooltip("Progress");
         o->box(FL_THIN_UP_BOX);
         o->color(FL_BACKGROUND_COLOR);
@@ -809,7 +809,7 @@ Fl_Window* make_widgetbin() {
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
         o->image(pixmap[(int)FLD_NODE_TYPE_Progress]);
-      } // fld::widget::Bin_Button* o
+      } // Bin_Button* o
       o->end();
     } // Fl_Group* o
     widgetbin_panel->set_non_modal();
diff --git a/fluid/panels/function_panel.fl b/fluid/panels/function_panel.fl
index 6bb28907e..4e1010c77 100644
--- a/fluid/panels/function_panel.fl
+++ b/fluid/panels/function_panel.fl
@@ -105,7 +105,7 @@ else
         callback type_make_cb
         tooltip {Widget Class} xywh {55 46 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Widget_Class]);}
-        class {fld::widget::Bin_Window_Button}
+        class {Bin_Window_Button}
       }
       Fl_Button {} {
         user_data {"decl"}
@@ -135,63 +135,63 @@ else
         callback type_make_cb
         tooltip Window xywh {89 21 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Window]);}
-        class {fld::widget::Bin_Window_Button}
+        class {Bin_Window_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Group"}
         callback type_make_cb
         tooltip Group xywh {114 21 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Group]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Pack"}
         callback type_make_cb
         tooltip Pack xywh {139 21 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Pack]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Tabs"}
         callback type_make_cb
         tooltip Tabs xywh {89 46 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Tabs]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Scroll"}
         callback type_make_cb
         tooltip Scroll xywh {114 46 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Scroll]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Flex"}
         callback type_make_cb
         tooltip Flex xywh {139 46 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Flex]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Tile"}
         callback type_make_cb
         tooltip Tile xywh {89 71 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Tile]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Wizard"}
         callback type_make_cb
         tooltip Wizard xywh {114 71 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Wizard]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Grid"}
         callback type_make_cb
         tooltip Grid xywh {139 71 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Grid]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
     }
     Fl_Group {} {
@@ -203,42 +203,42 @@ else
         callback type_make_cb
         tooltip Button xywh {173 21 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Button]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Return_Button"}
         callback type_make_cb
         tooltip {Return Button} xywh {198 21 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Return_Button]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Light_Button"}
         callback type_make_cb
         tooltip {Light Button} xywh {173 46 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Light_Button]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Repeat_Button"}
         callback type_make_cb
         tooltip {Repeat Button} xywh {198 46 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Repeat_Button]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Check_Button"}
         callback type_make_cb
         tooltip {Check Button} xywh {173 71 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Check_Button]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Round_Button"}
         callback type_make_cb
         tooltip {Round Button} xywh {198 71 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Round_Button]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
     }
     Fl_Group {} {
@@ -250,70 +250,70 @@ else
         callback type_make_cb
         tooltip Slider xywh {232 21 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Slider]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Scrollbar"}
         callback type_make_cb
         tooltip {Scroll Bar} xywh {257 21 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Scrollbar]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Value_Slider"}
         callback type_make_cb
         tooltip {Value Slider} xywh {282 21 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Value_Slider]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Value_Output"}
         callback type_make_cb
         tooltip {Value Output} xywh {307 21 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Value_Output]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Adjuster"}
         callback type_make_cb
         tooltip Adjuster xywh {232 46 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Adjuster]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Counter"}
         callback type_make_cb
         tooltip Counter xywh {257 46 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Counter]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Dial"}
         callback type_make_cb
         tooltip Dial xywh {282 46 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Dial]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Roller"}
         callback type_make_cb
         tooltip Roller xywh {232 71 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Roller]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Spinner"}
         callback type_make_cb
         tooltip Spinner xywh {257 71 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Spinner]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Value_Input"}
         callback type_make_cb
         tooltip {Value Input} xywh {282 71 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Value_Input]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
     }
     Fl_Group {} {
@@ -325,42 +325,42 @@ else
         callback type_make_cb
         tooltip Input xywh {341 21 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Input]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Output"}
         callback type_make_cb
         tooltip Output xywh {366 21 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Output]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Text_Editor"}
         callback type_make_cb
         tooltip {Text Edit} xywh {341 46 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Text_Editor]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Text_Display"}
         callback type_make_cb
         tooltip {Text Display} xywh {366 46 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Text_Display]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_File_Input"}
         callback type_make_cb
         tooltip {File Input} xywh {341 71 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_File_Input]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Terminal"}
         callback type_make_cb
         tooltip Terminal xywh {366 71 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Terminal]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
     }
     Fl_Group {} {
@@ -372,56 +372,56 @@ else
         callback type_make_cb
         tooltip {Input Choice} xywh {400 22 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Input_Choice]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"menuitem"}
         callback type_make_cb
         tooltip {Menu Item} xywh {425 21 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Menu_Item]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Menu_Bar"}
         callback type_make_cb
         tooltip {Menu Bar} xywh {450 21 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Menu_Bar]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Menu_Button"}
         callback type_make_cb
         tooltip {Menu Button} xywh {400 46 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Menu_Button]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"checkmenuitem"}
         callback type_make_cb
         tooltip {Checkbox Menu Item} xywh {425 46 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Checkbox_Menu_Item]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"submenu"}
         callback type_make_cb
         tooltip {Sub Menu} xywh {450 46 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Submenu]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Choice"}
         callback type_make_cb
         tooltip Choice xywh {400 71 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Choice]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"radiomenuitem"}
         callback type_make_cb
         tooltip {Radio Menu Item} xywh {425 71 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Radio_Menu_Item]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
     }
     Fl_Group {} {
@@ -433,42 +433,42 @@ else
         callback type_make_cb
         tooltip Browser xywh {484 21 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Browser]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Tree"}
         callback type_make_cb
         tooltip Tree xywh {509 21 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Tree]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Check_Browser"}
         callback type_make_cb
         tooltip {Check Browser} xywh {484 46 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Check_Browser]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Help_View"}
         callback type_make_cb
         tooltip {Help Browser} xywh {509 46 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Help_View]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_File_Browser"}
         callback type_make_cb
         tooltip {File Browser} xywh {484 71 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_File_Browser]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Table"}
         callback type_make_cb
         tooltip Table xywh {509 71 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Table]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
     }
     Fl_Group {} {
@@ -480,21 +480,21 @@ else
         callback type_make_cb
         tooltip Box xywh {542 21 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Box]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Clock"}
         callback type_make_cb
         tooltip Clock xywh {567 21 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Clock]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Progress"}
         callback type_make_cb
         tooltip Progress xywh {542 46 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Progress]);}
-        class {fld::widget::Bin_Button}
+        class {Bin_Button}
       }
     }
   }
diff --git a/fluid/panels/settings_panel.cxx b/fluid/panels/settings_panel.cxx
index 66df11816..1494bd357 100644
--- a/fluid/panels/settings_panel.cxx
+++ b/fluid/panels/settings_panel.cxx
@@ -544,7 +544,7 @@ Fl_Menu_Button *w_layout_menu=(Fl_Menu_Button *)0;
 
 static void cb_w_layout_menu(Fl_Menu_Button*, void* v) {
   if (v == LOAD) {
-    fld::app::Layout_Suite &suite = (*Fluid.layout_list)[Fluid.layout_list->current_suite()];
+    Layout_Suite &suite = (*Fluid.layout_list)[Fluid.layout_list->current_suite()];
     int i;
     if (suite.storage_ == FLD_TOOL_STORE_INTERNAL) {
       w_layout_menu_rename->deactivate();
@@ -572,25 +572,25 @@ static void cb_w_layout_menu_rename(Fl_Menu_*, void*) {
 }
 
 static void cb_w_layout_menu_storage(Fl_Menu_*, void*) {
-  fld::app::Layout_Suite &suite = (*Fluid.layout_list)[Fluid.layout_list->current_suite()];
+  Layout_Suite &suite = (*Fluid.layout_list)[Fluid.layout_list->current_suite()];
   suite.storage(FLD_TOOL_STORE_INTERNAL);
   Fluid.layout_list->update_dialogs();
 }
 
 static void cb_w_layout_menu_storage1(Fl_Menu_*, void*) {
-  fld::app::Layout_Suite &suite = (*Fluid.layout_list)[Fluid.layout_list->current_suite()];
+  Layout_Suite &suite = (*Fluid.layout_list)[Fluid.layout_list->current_suite()];
   suite.storage(FLD_TOOL_STORE_USER);
   Fluid.layout_list->update_dialogs();
 }
 
 static void cb_w_layout_menu_storage2(Fl_Menu_*, void*) {
-  fld::app::Layout_Suite &suite = (*Fluid.layout_list)[Fluid.layout_list->current_suite()];
+  Layout_Suite &suite = (*Fluid.layout_list)[Fluid.layout_list->current_suite()];
   suite.storage(FLD_TOOL_STORE_PROJECT);
   Fluid.layout_list->update_dialogs();
 }
 
 static void cb_w_layout_menu_storage3(Fl_Menu_*, void*) {
-  fld::app::Layout_Suite &suite = (*Fluid.layout_list)[Fluid.layout_list->current_suite()];
+  Layout_Suite &suite = (*Fluid.layout_list)[Fluid.layout_list->current_suite()];
   suite.storage(FLD_TOOL_STORE_FILE);
   Fluid.layout_list->update_dialogs();
 }
@@ -1122,7 +1122,7 @@ static void cb_Store(Fl_Choice* o, void* v) {
   int selected = w_settings_shell_list_selected;
   if (v == LOAD) {
     if (selected) {
-      fld::Tool_Store ts = g_shell_config->list[selected-1]->storage;
+      Tool_Store ts = g_shell_config->list[selected-1]->storage;
       o->value(o->find_item_with_argument((long)ts));
     } else {
       o->value(o->find_item_with_argument((long)FLD_TOOL_STORE_USER));
@@ -1130,7 +1130,7 @@ static void cb_Store(Fl_Choice* o, void* v) {
   } else {
     if (selected) {
       Fd_Shell_Command *cmd = g_shell_config->list[selected-1];
-      fld::Tool_Store ts = (fld::Tool_Store)(o->mvalue()->argument());
+      Tool_Store ts = (Tool_Store)(o->mvalue()->argument());
       if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
       cmd->storage = ts;
       //w_settings_shell_list->text(selected, cmd->name);
@@ -2447,18 +2447,18 @@ Fl_Choice *w_settings_user_commenttext=(Fl_Choice *)0;
 
 static void cb_Reset(Fl_Button* o, void* v) {
   if (v == LOAD) return;
-  fld::widget::Node_Browser::label_color = 72;
-  fld::widget::Node_Browser::label_font = FL_HELVETICA;
-  fld::widget::Node_Browser::class_color = FL_FOREGROUND_COLOR;
-  fld::widget::Node_Browser::class_font = FL_HELVETICA_BOLD;
-  fld::widget::Node_Browser::func_color = FL_FOREGROUND_COLOR;
-  fld::widget::Node_Browser::func_font = FL_HELVETICA;
-  fld::widget::Node_Browser::name_color = FL_FOREGROUND_COLOR;
-  fld::widget::Node_Browser::name_font = FL_HELVETICA;
-  fld::widget::Node_Browser::code_color = FL_FOREGROUND_COLOR;
-  fld::widget::Node_Browser::code_font = FL_HELVETICA;
-  fld::widget::Node_Browser::comment_color = FL_DARK_GREEN;
-  fld::widget::Node_Browser::comment_font = FL_DARK_GREEN;
+  Node_Browser::label_color = 72;
+  Node_Browser::label_font = FL_HELVETICA;
+  Node_Browser::class_color = FL_FOREGROUND_COLOR;
+  Node_Browser::class_font = FL_HELVETICA_BOLD;
+  Node_Browser::func_color = FL_FOREGROUND_COLOR;
+  Node_Browser::func_font = FL_HELVETICA;
+  Node_Browser::name_color = FL_FOREGROUND_COLOR;
+  Node_Browser::name_font = FL_HELVETICA;
+  Node_Browser::code_color = FL_FOREGROUND_COLOR;
+  Node_Browser::code_font = FL_HELVETICA;
+  Node_Browser::comment_color = FL_DARK_GREEN;
+  Node_Browser::comment_font = FL_DARK_GREEN;
   o->parent()->do_callback(o->parent(), LOAD);
   widget_browser->redraw();
   widget_browser->save_prefs();
@@ -3423,17 +3423,17 @@ Fl_Double_Window* make_settings_window() {
             o->labelfont(1);
             o->labelsize(12);
             o->textsize(11);
-            o->callback((Fl_Callback*)cb_Comments, (void*)(&fld::widget::Node_Browser::label_font));
+            o->callback((Fl_Callback*)cb_Comments, (void*)(&Node_Browser::label_font));
             Fl_Group::current()->resizable(o);
             o->menu(fontmenu);
           } // Fl_Choice* o
           { Fl_Button* o = new Fl_Button(271, 112, 51, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&fld::widget::Node_Browser::label_color));
+            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&Node_Browser::label_color));
           } // Fl_Button* o
           { Fl_Menu_Button* o = new Fl_Menu_Button(322, 112, 18, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&fld::widget::Node_Browser::label_color));
+            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Node_Browser::label_color));
             o->menu(colormenu);
           } // Fl_Menu_Button* o
           o->end();
@@ -3449,17 +3449,17 @@ Fl_Double_Window* make_settings_window() {
             o->labelfont(1);
             o->labelsize(12);
             o->textsize(11);
-            o->callback((Fl_Callback*)cb_Comments, (void*)(&fld::widget::Node_Browser::class_font));
+            o->callback((Fl_Callback*)cb_Comments, (void*)(&Node_Browser::class_font));
             Fl_Group::current()->resizable(o);
             o->menu(fontmenu);
           } // Fl_Choice* o
           { Fl_Button* o = new Fl_Button(271, 137, 51, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&fld::widget::Node_Browser::class_color));
+            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&Node_Browser::class_color));
           } // Fl_Button* o
           { Fl_Menu_Button* o = new Fl_Menu_Button(322, 137, 18, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&fld::widget::Node_Browser::class_color));
+            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Node_Browser::class_color));
             o->menu(colormenu);
           } // Fl_Menu_Button* o
           o->end();
@@ -3475,17 +3475,17 @@ Fl_Double_Window* make_settings_window() {
             o->labelfont(1);
             o->labelsize(12);
             o->textsize(11);
-            o->callback((Fl_Callback*)cb_Comments, (void*)(&fld::widget::Node_Browser::func_font));
+            o->callback((Fl_Callback*)cb_Comments, (void*)(&Node_Browser::func_font));
             Fl_Group::current()->resizable(o);
             o->menu(fontmenu);
           } // Fl_Choice* o
           { Fl_Button* o = new Fl_Button(271, 162, 51, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&fld::widget::Node_Browser::func_color));
+            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&Node_Browser::func_color));
           } // Fl_Button* o
           { Fl_Menu_Button* o = new Fl_Menu_Button(322, 162, 18, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&fld::widget::Node_Browser::func_color));
+            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Node_Browser::func_color));
             o->menu(colormenu);
           } // Fl_Menu_Button* o
           o->end();
@@ -3501,17 +3501,17 @@ Fl_Double_Window* make_settings_window() {
             o->labelfont(1);
             o->labelsize(12);
             o->textsize(11);
-            o->callback((Fl_Callback*)cb_Comments, (void*)(&fld::widget::Node_Browser::name_font));
+            o->callback((Fl_Callback*)cb_Comments, (void*)(&Node_Browser::name_font));
             Fl_Group::current()->resizable(o);
             o->menu(fontmenu);
           } // Fl_Choice* o
           { Fl_Button* o = new Fl_Button(271, 187, 51, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&fld::widget::Node_Browser::name_color));
+            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&Node_Browser::name_color));
           } // Fl_Button* o
           { Fl_Menu_Button* o = new Fl_Menu_Button(322, 187, 18, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&fld::widget::Node_Browser::name_color));
+            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Node_Browser::name_color));
             o->menu(colormenu);
           } // Fl_Menu_Button* o
           o->end();
@@ -3527,17 +3527,17 @@ Fl_Double_Window* make_settings_window() {
             o->labelfont(1);
             o->labelsize(12);
             o->textsize(11);
-            o->callback((Fl_Callback*)cb_Comments, (void*)(&fld::widget::Node_Browser::code_font));
+            o->callback((Fl_Callback*)cb_Comments, (void*)(&Node_Browser::code_font));
             Fl_Group::current()->resizable(o);
             o->menu(fontmenu);
           } // Fl_Choice* o
           { Fl_Button* o = new Fl_Button(271, 212, 51, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&fld::widget::Node_Browser::code_color));
+            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&Node_Browser::code_color));
           } // Fl_Button* o
           { Fl_Menu_Button* o = new Fl_Menu_Button(322, 212, 18, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&fld::widget::Node_Browser::code_color));
+            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Node_Browser::code_color));
             o->menu(colormenu);
           } // Fl_Menu_Button* o
           o->end();
@@ -3553,17 +3553,17 @@ Fl_Double_Window* make_settings_window() {
             w_settings_user_commenttext->labelfont(1);
             w_settings_user_commenttext->labelsize(12);
             w_settings_user_commenttext->textsize(11);
-            w_settings_user_commenttext->callback((Fl_Callback*)cb_Comments, (void*)(&fld::widget::Node_Browser::comment_font));
+            w_settings_user_commenttext->callback((Fl_Callback*)cb_Comments, (void*)(&Node_Browser::comment_font));
             Fl_Group::current()->resizable(w_settings_user_commenttext);
             o->menu(fontmenu);
           } // Fl_Choice* w_settings_user_commenttext
           { Fl_Button* o = new Fl_Button(271, 237, 51, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&fld::widget::Node_Browser::comment_color));
+            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&Node_Browser::comment_color));
           } // Fl_Button* o
           { Fl_Menu_Button* o = new Fl_Menu_Button(322, 237, 18, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&fld::widget::Node_Browser::comment_color));
+            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Node_Browser::comment_color));
             o->menu(colormenu);
           } // Fl_Menu_Button* o
           o->end();
diff --git a/fluid/panels/settings_panel.fl b/fluid/panels/settings_panel.fl
index 86513bafd..00d28e7fd 100644
--- a/fluid/panels/settings_panel.fl
+++ b/fluid/panels/settings_panel.fl
@@ -98,8 +98,6 @@ decl {\#include "../src/flstring.h"} {private global
 decl {\#include <string.h>} {private global
 }
 
-decl {using namespace fld::widget;} {private global
-}
 
 decl {extern struct Fl_Menu_Item *dbmanager_item;} {public local
 }
@@ -500,10 +498,11 @@ an include guard in header file:
 
 if (v == LOAD) return;
 
-std::string old_name = "Copy of ";
-old_name.append(Fluid.layout_list[Fluid.layout_list.current_suite()].name_);
-const char *new_name = fl_input("Enter a name for the new layout:", old_name.c_str());
-if (new_name == nullptr)
+char old_name[256];
+snprintf(old_name, sizeof(old_name), "Copy of %s",
+  Fluid.layout_list[Fluid.layout_list.current_suite()].name_);
+const char *new_name = fl_input("Enter a name for the new layout:", old_name);
+if (new_name == 0)
   return;
 
 Fluid.layout_list.add(new_name);
@@ -512,7 +511,7 @@ Fluid.layout_list.update_dialogs();}
         }
         Fl_Menu_Button w_layout_menu {
           callback {if (v == LOAD) {
-  fld::app::Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
+  Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
   if (suite.storage_ == FLD_TOOL_STORE_INTERNAL) {
     w_layout_menu_rename->deactivate();
     for (int i=1; i<4; i++) w_layout_menu_storage[i]->deactivate();
@@ -530,9 +529,9 @@ Fluid.layout_list.update_dialogs();}
             label {Rename...}
             callback {// Rename the current layout suite
 
-std::string old_name = Fluid.layout_list[Fluid.layout_list.current_suite()].name_;
-const char *new_name = fl_input("Enter a new name for the layout:", old_name.c_str());
-if (new_name == nullptr)
+const char *old_name = Fluid.layout_list[Fluid.layout_list.current_suite()].name_;
+const char *new_name = fl_input("Enter a new name for the layout:", old_name);
+if (new_name == 0)
   return;
 
 Fluid.layout_list.rename(new_name);
@@ -541,28 +540,28 @@ Fluid.layout_list.update_dialogs();}
           }
           MenuItem {w_layout_menu_storage[0]} {
             label {@fd_beaker  FLUID Built-In}
-            callback {fld::app::Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
+            callback {Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
 suite.storage(FLD_TOOL_STORE_INTERNAL);
 Fluid.layout_list.update_dialogs();}
             xywh {0 0 31 20} type Radio deactivate
           }
           MenuItem {w_layout_menu_storage[1]} {
             label {@fd_user  User Preference}
-            callback {fld::app::Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
+            callback {Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
 suite.storage(FLD_TOOL_STORE_USER);
 Fluid.layout_list.update_dialogs();}
             xywh {0 0 31 20} type Radio
           }
           MenuItem {w_layout_menu_storage[2]} {
             label {@fd_project  Store in .fl Project File}
-            callback {fld::app::Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
+            callback {Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
 suite.storage(FLD_TOOL_STORE_PROJECT);
 Fluid.layout_list.update_dialogs();}
             xywh {0 0 31 20} type Radio
           }
           MenuItem {w_layout_menu_storage[3]} {
             label {@fd_file  Store in External File}
-            callback {fld::app::Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
+            callback {Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
 suite.storage(FLD_TOOL_STORE_FILE);
 Fluid.layout_list.update_dialogs();}
             xywh {0 0 31 20} type Radio divider
@@ -591,13 +590,9 @@ Fluid.layout_list.update_dialogs();}
   fnfc.type(Fl_Native_File_Chooser::BROWSE_SAVE_FILE);
   fnfc.options(Fl_Native_File_Chooser::SAVEAS_CONFIRM | Fl_Native_File_Chooser::USE_FILTER_EXT);
   fnfc.filter("FLUID Layouts\\t*.fll\\n");
-  std::string filename = Fluid.layout_list.filename_;
-  fnfc.directory(fl_filename_path_str(filename).c_str());
-  fnfc.preset_file(fl_filename_name_str(filename).c_str());
   if (fnfc.show() != 0) return;
   const char *new_filename = fnfc.filename();
   if (!new_filename) return;
-  Fluid.layout_list.filename_ = new_filename;
   Fluid.layout_list.save(new_filename);}
             xywh {0 0 31 20} divider
             code0 {\#include <FL/Fl_Native_File_Chooser.H>}
@@ -1020,7 +1015,7 @@ if (v==LOAD) {
 } else {
   if (!selected) return;
   int ret = fl_choice("Delete the shell command\\n\\"%s\\"?\\n\\nThis can not be undone.",
-    "Delete", "Cancel", nullptr, g_shell_config->list[selected-1]->name.c_str());
+    "Delete", "Cancel", 0, g_shell_config->list[selected-1]->name.c_str());
   if (ret==1) return;
   if (g_shell_config->at(selected-1)->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
   g_shell_config->remove(selected-1);
@@ -1179,7 +1174,7 @@ if (v == LOAD) {
               callback {int selected = w_settings_shell_list_selected;
 if (v == LOAD) {
   if (selected) {
-    fld::Tool_Store ts = g_shell_config->list[selected-1]->storage;
+    Tool_Store ts = g_shell_config->list[selected-1]->storage;
     o->value(o->find_item_with_argument((long)ts));
   } else {
     o->value(o->find_item_with_argument((long)FLD_TOOL_STORE_USER));
@@ -1187,7 +1182,7 @@ if (v == LOAD) {
 } else {
   if (selected) {
     Fd_Shell_Command *cmd = g_shell_config->list[selected-1];
-    fld::Tool_Store ts = (fld::Tool_Store)(o->mvalue()->argument());
+    Tool_Store ts = (Tool_Store)(o->mvalue()->argument());
     if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
     cmd->storage = ts;
     //w_settings_shell_list->text(selected, cmd->name.c_str());
@@ -1319,7 +1314,7 @@ if (mi) {
     int pos = w_settings_shell_command->insert_position();
     w_settings_shell_command->buffer()->insert(pos, word);
   }
-  w_settings_shell_command->do_callback(w_settings_shell_command, (void*)nullptr);
+  w_settings_shell_command->do_callback(w_settings_shell_command, (void*)0);
 }} open
                 tooltip {a list of text replacements available for the shell script} xywh {318 373 22 22} labelsize 12 textsize 12
               } {
diff --git a/fluid/panels/widget_panel.cxx b/fluid/panels/widget_panel.cxx
index 33720b5ac..d7e4ced55 100644
--- a/fluid/panels/widget_panel.cxx
+++ b/fluid/panels/widget_panel.cxx
@@ -43,7 +43,7 @@ extern void color_common(Fl_Color c);
 extern void color2_common(Fl_Color c);
 extern void textcolor_common(Fl_Color c);
 extern int widget_i;
-extern fld::widget::Formula_Input_Vars widget_vars[];
+extern Formula_Input_Vars widget_vars[];
 extern int numselected;
 extern Fl_Menu_Item boxmenu[];
 extern int haderror;
@@ -91,9 +91,9 @@ static void cb_image_panel_data(Fl_Box* o, void* v) {
 //fl ▲ ----------=~-=-~-~---~-----------~=--~~~-~~=--~-=--=-= ▲ fl//
 }
 
-fld::widget::Formula_Input *image_panel_imagew=(fld::widget::Formula_Input *)0;
+Formula_Input *image_panel_imagew=(Formula_Input *)0;
 
-static void cb_image_panel_imagew(fld::widget::Formula_Input* o, void* v) {
+static void cb_image_panel_imagew(Formula_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~~--~=---~-~=-=~~~-~~- ▼ fl//
   if (v == LOAD) {
       if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
@@ -124,9 +124,9 @@ static void cb_image_panel_imagew(fld::widget::Formula_Input* o, void* v) {
 //fl ▲ ----------~==~=~-~~=~~----------~-~-=-=~~-~=~~-~=~~-~- ▲ fl//
 }
 
-fld::widget::Formula_Input *image_panel_imageh=(fld::widget::Formula_Input *)0;
+Formula_Input *image_panel_imageh=(Formula_Input *)0;
 
-static void cb_image_panel_imageh(fld::widget::Formula_Input* o, void* v) {
+static void cb_image_panel_imageh(Formula_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~-~=-~~-=-=~~~--~----= ▼ fl//
   if (v == LOAD) {
       if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
@@ -233,9 +233,9 @@ static void cb_image_panel_dedata(Fl_Box* o, void* v) {
 //fl ▲ ----------~=~=-~~---=~------------~~=-~~=-=-=~=~--=--~ ▲ fl//
 }
 
-fld::widget::Formula_Input *image_panel_deimagew=(fld::widget::Formula_Input *)0;
+Formula_Input *image_panel_deimagew=(Formula_Input *)0;
 
-static void cb_image_panel_deimagew(fld::widget::Formula_Input* o, void* v) {
+static void cb_image_panel_deimagew(Formula_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~~--=~=~=~=~-=~--=~~=- ▼ fl//
   if (v == LOAD) {
       if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
@@ -266,9 +266,9 @@ static void cb_image_panel_deimagew(fld::widget::Formula_Input* o, void* v) {
 //fl ▲ ----------~=-~--=-=~=~----------~-~-~~--~~-=-==~~==-~= ▲ fl//
 }
 
-fld::widget::Formula_Input *image_panel_deimageh=(fld::widget::Formula_Input *)0;
+Formula_Input *image_panel_deimageh=(Formula_Input *)0;
 
-static void cb_image_panel_deimageh(fld::widget::Formula_Input* o, void* v) {
+static void cb_image_panel_deimageh(Formula_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~~=-=---~-~~-=-=~-~--- ▼ fl//
   if (v == LOAD) {
       if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
@@ -379,7 +379,7 @@ Fl_Double_Window* make_image_panel() {
       } // Fl_Box* image_panel_data
       { Fl_Group* o = new Fl_Group(75, 75, 170, 20);
         o->callback((Fl_Callback*)propagate_load);
-        { image_panel_imagew = new fld::widget::Formula_Input(75, 75, 55, 20, "Width:");
+        { image_panel_imagew = new Formula_Input(75, 75, 55, 20, "Width:");
           image_panel_imagew->tooltip("Scale image to this width in pixel units");
           image_panel_imagew->box(FL_DOWN_BOX);
           image_panel_imagew->color(FL_BACKGROUND2_COLOR);
@@ -392,8 +392,8 @@ Fl_Double_Window* make_image_panel() {
           image_panel_imagew->callback((Fl_Callback*)cb_image_panel_imagew);
           image_panel_imagew->align(Fl_Align(FL_ALIGN_TOP_LEFT));
           image_panel_imagew->when(FL_WHEN_RELEASE);
-        } // fld::widget::Formula_Input* image_panel_imagew
-        { image_panel_imageh = new fld::widget::Formula_Input(135, 75, 55, 20, "Height:");
+        } // Formula_Input* image_panel_imagew
+        { image_panel_imageh = new Formula_Input(135, 75, 55, 20, "Height:");
           image_panel_imageh->tooltip("Scale image to this height in pixel units");
           image_panel_imageh->box(FL_DOWN_BOX);
           image_panel_imageh->color(FL_BACKGROUND2_COLOR);
@@ -406,7 +406,7 @@ Fl_Double_Window* make_image_panel() {
           image_panel_imageh->callback((Fl_Callback*)cb_image_panel_imageh);
           image_panel_imageh->align(Fl_Align(FL_ALIGN_TOP_LEFT));
           image_panel_imageh->when(FL_WHEN_RELEASE);
-        } // fld::widget::Formula_Input* image_panel_imageh
+        } // Formula_Input* image_panel_imageh
         { Fl_Button* o = new Fl_Button(195, 75, 50, 20, "Reset");
           o->tooltip("Reset scale to original size");
           o->labelsize(11);
@@ -455,7 +455,7 @@ Fl_Double_Window* make_image_panel() {
       } // Fl_Box* image_panel_dedata
       { Fl_Group* o = new Fl_Group(75, 215, 170, 20);
         o->callback((Fl_Callback*)propagate_load);
-        { image_panel_deimagew = new fld::widget::Formula_Input(75, 215, 55, 20, "Width:");
+        { image_panel_deimagew = new Formula_Input(75, 215, 55, 20, "Width:");
           image_panel_deimagew->tooltip("Scale image to this width in pixel units");
           image_panel_deimagew->box(FL_DOWN_BOX);
           image_panel_deimagew->color(FL_BACKGROUND2_COLOR);
@@ -468,8 +468,8 @@ Fl_Double_Window* make_image_panel() {
           image_panel_deimagew->callback((Fl_Callback*)cb_image_panel_deimagew);
           image_panel_deimagew->align(Fl_Align(FL_ALIGN_TOP_LEFT));
           image_panel_deimagew->when(FL_WHEN_RELEASE);
-        } // fld::widget::Formula_Input* image_panel_deimagew
-        { image_panel_deimageh = new fld::widget::Formula_Input(135, 215, 55, 20, "Height:");
+        } // Formula_Input* image_panel_deimagew
+        { image_panel_deimageh = new Formula_Input(135, 215, 55, 20, "Height:");
           image_panel_deimageh->tooltip("Scale image to this height in pixel units");
           image_panel_deimageh->box(FL_DOWN_BOX);
           image_panel_deimageh->color(FL_BACKGROUND2_COLOR);
@@ -482,7 +482,7 @@ Fl_Double_Window* make_image_panel() {
           image_panel_deimageh->callback((Fl_Callback*)cb_image_panel_deimageh);
           image_panel_deimageh->align(Fl_Align(FL_ALIGN_TOP_LEFT));
           image_panel_deimageh->when(FL_WHEN_RELEASE);
-        } // fld::widget::Formula_Input* image_panel_deimageh
+        } // Formula_Input* image_panel_deimageh
         { Fl_Button* o = new Fl_Button(195, 215, 50, 20, "Reset");
           o->tooltip("Reset scale to original size");
           o->labelsize(11);
@@ -719,9 +719,9 @@ Fl_Menu_Item menu_1[] = {
  {0,0,0,0,0,0,0,0,0}
 };
 
-fld::widget::Formula_Input *widget_x_input=(fld::widget::Formula_Input *)0;
+Formula_Input *widget_x_input=(Formula_Input *)0;
 
-static void cb_widget_x_input(fld::widget::Formula_Input* o, void* v) {
+static void cb_widget_x_input(Formula_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~~=-~~~~~~=-~-~~----~- ▼ fl//
   if (v == LOAD) {
     if (current_widget->is_true_widget()) {
@@ -753,9 +753,9 @@ static void cb_widget_x_input(fld::widget::Formula_Input* o, void* v) {
 //fl ▲ ----------=~=~--~~-=-~----------~~=~=--~~~-=~=~-=~~==- ▲ fl//
 }
 
-fld::widget::Formula_Input *widget_y_input=(fld::widget::Formula_Input *)0;
+Formula_Input *widget_y_input=(Formula_Input *)0;
 
-static void cb_widget_y_input(fld::widget::Formula_Input* o, void* v) {
+static void cb_widget_y_input(Formula_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~~--~=--~-~=-~=~~~=~~= ▼ fl//
   if (v == LOAD) {
     if (current_widget->is_true_widget()) {
@@ -786,9 +786,9 @@ static void cb_widget_y_input(fld::widget::Formula_Input* o, void* v) {
 //fl ▲ ----------~==--=~=--=-----------~~=~--~~=~-~---=~-=-~= ▲ fl//
 }
 
-fld::widget::Formula_Input *widget_w_input=(fld::widget::Formula_Input *)0;
+Formula_Input *widget_w_input=(Formula_Input *)0;
 
-static void cb_widget_w_input(fld::widget::Formula_Input* o, void* v) {
+static void cb_widget_w_input(Formula_Input* o, void* v) {
 //fl ▼ ---------------------- callback ---=~~--~==-=-~-=-~-=~ ▼ fl//
   if (v == LOAD) {
     if (current_widget->is_true_widget()) {
@@ -819,9 +819,9 @@ static void cb_widget_w_input(fld::widget::Formula_Input* o, void* v) {
 //fl ▲ ----------~=~-=~~--~------------~--~-==-~~~~~==-=--=-= ▲ fl//
 }
 
-fld::widget::Formula_Input *widget_h_input=(fld::widget::Formula_Input *)0;
+Formula_Input *widget_h_input=(Formula_Input *)0;
 
-static void cb_widget_h_input(fld::widget::Formula_Input* o, void* v) {
+static void cb_widget_h_input(Formula_Input* o, void* v) {
 //fl ▼ ---------------------- callback -~-=-==~--~=-~--=----- ▼ fl//
   if (v == LOAD) {
     if (current_widget->is_true_widget()) {
@@ -2342,9 +2342,9 @@ static void cb_wComment(Fl_Text_Editor* o, void* v) {
 //fl ▲ ----------=~---~~-=--~----------~~-~--=~~~-~~==~~=~~~- ▲ fl//
 }
 
-fld::widget::Code_Editor *wCallback=(fld::widget::Code_Editor *)0;
+Code_Editor *wCallback=(Code_Editor *)0;
 
-static void cb_wCallback(fld::widget::Code_Editor* o, void* v) {
+static void cb_wCallback(Code_Editor* o, void* v) {
 //fl ▼ ---------------------- callback ~--~-~-~~-=~~-~=~=-~~= ▼ fl//
   if (v == LOAD) {
       const char *cbtext = current_widget->callback();
@@ -2563,9 +2563,6 @@ Fl_Menu_Item menu_7[] = {
  {"binary: unsigned char[]", 0,  0, (void*)(0), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
  {"text: const char*", 0,  0, (void*)(1), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
  {"compressed: unsigned char[]", 0,  0, (void*)(2), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
- {"binary: std::vector<uint8_t>", 0,  0, (void*)(3), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
- {"text: std::string", 0,  0, (void*)(4), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
- {"compressed: std::vector<uint8_t>", 0,  0, (void*)(5), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
@@ -3202,7 +3199,7 @@ static void cb_1b(Fl_Tile* o, void* v) {
 //fl ▲ ----------=~-=~--~~=~=-----------~~----=--~=~~-~-----= ▲ fl//
 }
 
-static void cb_Declaration(fld::widget::Code_Editor* o, void* v) {
+static void cb_Declaration(Code_Editor* o, void* v) {
 //fl ▼ ---------------------- callback ---==--~~-=-=-~=----=- ▼ fl//
   if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Decl)) return;
   Decl_Node* nd = (Decl_Node*)current_node;
@@ -3331,7 +3328,7 @@ static void cb_code_tabs(Fl_Tabs* o, void* v) {
 
 Fl_Group *code_tabs_main=(Fl_Group *)0;
 
-static void cb_1c(fld::widget::Code_Editor* o, void* v) {
+static void cb_1c(Code_Editor* o, void* v) {
 //fl ▼ ---------------------- callback ~-=--~=~~==~=~=~-~--=~ ▼ fl//
   if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Code)) return;
   Code_Node* nd = (Code_Node*)current_node;
@@ -3454,7 +3451,7 @@ static void cb_1f(Fl_Tile* o, void* v) {
 //fl ▲ ----------=~~=~~-~---~-----------~~----=--~=~~-~-----= ▲ fl//
 }
 
-static void cb_Function(fld::widget::Code_Editor* o, void* v) {
+static void cb_Function(Code_Editor* o, void* v) {
 //fl ▼ ---------------------- callback --=~=----~=~~-=~-==--~ ▼ fl//
   if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Function)) return;
   Function_Node* nd = (Function_Node*)current_node;
@@ -3478,7 +3475,7 @@ static void cb_Function(fld::widget::Code_Editor* o, void* v) {
 //fl ▲ ----------=~=~=-=--~=~-----------~=-=~~~~~-=~~~=-=-~-- ▲ fl//
 }
 
-static void cb_Return(fld::widget::Code_Editor* o, void* v) {
+static void cb_Return(Code_Editor* o, void* v) {
 //fl ▼ ---------------------- callback -~=--~-~=~=~~~---=~~=~ ▼ fl//
   if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Function)) return;
   Function_Node* nd = (Function_Node*)current_node;
@@ -3708,7 +3705,7 @@ Fl_Double_Window* make_widget_panel() {
             o->labelsize(11);
             o->callback((Fl_Callback*)position_group_cb);
             o->align(Fl_Align(FL_ALIGN_LEFT));
-            { widget_x_input = new fld::widget::Formula_Input(95, 150, 55, 20, "X:");
+            { widget_x_input = new Formula_Input(95, 150, 55, 20, "X:");
               widget_x_input->tooltip("The X position of the widget as a number or formula.\nFormulas can be simple "
 "math, including the variables\nx, px, sx, cx, and i");
               widget_x_input->box(FL_DOWN_BOX);
@@ -3722,8 +3719,8 @@ Fl_Double_Window* make_widget_panel() {
               widget_x_input->callback((Fl_Callback*)cb_widget_x_input);
               widget_x_input->align(Fl_Align(FL_ALIGN_TOP_LEFT));
               widget_x_input->when(FL_WHEN_RELEASE);
-            } // fld::widget::Formula_Input* widget_x_input
-            { widget_y_input = new fld::widget::Formula_Input(155, 150, 55, 20, "Y:");
+            } // Formula_Input* widget_x_input
+            { widget_y_input = new Formula_Input(155, 150, 55, 20, "Y:");
               widget_y_input->tooltip("The Y position of the widget as a number or formula.\nFormulas can be simple "
 "math, including the variables\ny, py, sy, cy, and i");
               widget_y_input->box(FL_DOWN_BOX);
@@ -3737,8 +3734,8 @@ Fl_Double_Window* make_widget_panel() {
               widget_y_input->callback((Fl_Callback*)cb_widget_y_input);
               widget_y_input->align(Fl_Align(FL_ALIGN_TOP_LEFT));
               widget_y_input->when(FL_WHEN_RELEASE);
-            } // fld::widget::Formula_Input* widget_y_input
-            { widget_w_input = new fld::widget::Formula_Input(215, 150, 55, 20, "Width:");
+            } // Formula_Input* widget_y_input
+            { widget_w_input = new Formula_Input(215, 150, 55, 20, "Width:");
               widget_w_input->tooltip("The width of the widget as a number or formula.\nFormulas can be simple math,"
 " including the variables\nw, pw, sw, cw, and i");
               widget_w_input->box(FL_DOWN_BOX);
@@ -3752,8 +3749,8 @@ Fl_Double_Window* make_widget_panel() {
               widget_w_input->callback((Fl_Callback*)cb_widget_w_input);
               widget_w_input->align(Fl_Align(FL_ALIGN_TOP_LEFT));
               widget_w_input->when(FL_WHEN_RELEASE);
-            } // fld::widget::Formula_Input* widget_w_input
-            { widget_h_input = new fld::widget::Formula_Input(275, 150, 55, 20, "Height:");
+            } // Formula_Input* widget_w_input
+            { widget_h_input = new Formula_Input(275, 150, 55, 20, "Height:");
               widget_h_input->tooltip("The height of the widget as a number or formula.\nFormulas can be simple math"
 ", including the variables\nh, ph, sh, ch, and i");
               widget_h_input->box(FL_DOWN_BOX);
@@ -3767,7 +3764,7 @@ Fl_Double_Window* make_widget_panel() {
               widget_h_input->callback((Fl_Callback*)cb_widget_h_input);
               widget_h_input->align(Fl_Align(FL_ALIGN_TOP_LEFT));
               widget_h_input->when(FL_WHEN_RELEASE);
-            } // fld::widget::Formula_Input* widget_h_input
+            } // Formula_Input* widget_h_input
             { Fl_Choice* o = new Fl_Choice(335, 150, 64, 20, "Children:");
               o->tooltip("When instantiating a widget class, the children can either be fixed in their "
 "original position, automatically be repositioned, or both repsositioned and re"
@@ -4371,7 +4368,7 @@ Fl_Double_Window* make_widget_panel() {
             } // Fl_Group* o
             { Fl_Group* o = new Fl_Group(95, 223, 310, 82);
               o->box(FL_FLAT_BOX);
-              { wCallback = new fld::widget::Code_Editor(95, 225, 310, 80, "Callback:");
+              { wCallback = new Code_Editor(95, 225, 310, 80, "Callback:");
                 wCallback->tooltip("The callback function or code for the widget. Use the variable name \'o\' to "
 "access the Widget pointer and \'v\' to access the user value.");
                 wCallback->box(FL_DOWN_BOX);
@@ -4387,7 +4384,7 @@ Fl_Double_Window* make_widget_panel() {
                 wCallback->align(Fl_Align(FL_ALIGN_LEFT));
                 wCallback->when(FL_WHEN_RELEASE);
                 Fl_Group::current()->resizable(wCallback);
-              } // fld::widget::Code_Editor* wCallback
+              } // Code_Editor* wCallback
               o->end();
             } // Fl_Group* o
             o->end();
@@ -4825,7 +4822,7 @@ Fl_Double_Window* make_widget_panel() {
               o->labelsize(11);
               o->callback((Fl_Callback*)propagate_load);
               o->align(Fl_Align(FL_ALIGN_LEFT));
-              { fld::widget::Code_Editor* o = new fld::widget::Code_Editor(95, 75, 310, 100, "Declaration:");
+              { Code_Editor* o = new Code_Editor(95, 75, 310, 100, "Declaration:");
                 o->tooltip("a declaration: `int x;`, an external symbol: `extern int foo();`,\na `#` dire"
 "ctive: `#include <foo.h>`, a typedef `typedef char byte;`,\n or a `using` stat"
 "ement, etc.");
@@ -4842,7 +4839,7 @@ Fl_Double_Window* make_widget_panel() {
                 o->when(FL_WHEN_RELEASE);
                 Fl_Group::current()->resizable(o);
                 o->add_key_binding(FL_Tab, 0, use_tab_navigation);
-              } // fld::widget::Code_Editor* o
+              } // Code_Editor* o
               o->end();
             } // Fl_Group* o
             { Fl_Group* o = new Fl_Group(15, 180, 390, 105);
@@ -4924,7 +4921,7 @@ Fl_Double_Window* make_widget_panel() {
         { code_tabs_main = new Fl_Group(10, 30, 400, 330, "Code");
           code_tabs_main->labelsize(11);
           code_tabs_main->callback((Fl_Callback*)propagate_load);
-          { fld::widget::Code_Editor* o = new fld::widget::Code_Editor(15, 40, 390, 315);
+          { Code_Editor* o = new Code_Editor(15, 40, 390, 315);
             o->box(FL_DOWN_BOX);
             o->color(FL_BACKGROUND2_COLOR);
             o->selection_color(FL_SELECTION_COLOR);
@@ -4940,7 +4937,7 @@ Fl_Double_Window* make_widget_panel() {
             Fl_Group::current()->resizable(o);
             o->linenumber_width(60);
 o->linenumber_size(o->Fl_Text_Display::textsize());
-          } // fld::widget::Code_Editor* o
+          } // Code_Editor* o
           code_tabs_main->end();
           Fl_Group::current()->resizable(code_tabs_main);
         } // Fl_Group* code_tabs_main
@@ -4998,7 +4995,7 @@ o->linenumber_size(o->Fl_Text_Display::textsize());
               o->labelsize(11);
               o->callback((Fl_Callback*)propagate_load);
               o->align(Fl_Align(FL_ALIGN_LEFT));
-              { fld::widget::Code_Editor* o = new fld::widget::Code_Editor(95, 100, 310, 50, "Function\nName and\nArgs:");
+              { Code_Editor* o = new Code_Editor(95, 100, 310, 50, "Function\nName and\nArgs:");
                 o->tooltip("function name and args, or blank for `main(..)`");
                 o->box(FL_DOWN_FRAME);
                 o->color(FL_BACKGROUND2_COLOR);
@@ -5013,7 +5010,7 @@ o->linenumber_size(o->Fl_Text_Display::textsize());
                 o->when(FL_WHEN_RELEASE);
                 Fl_Group::current()->resizable(o);
                 o->add_key_binding(FL_Tab, 0, use_tab_navigation);
-              } // fld::widget::Code_Editor* o
+              } // Code_Editor* o
               o->end();
             } // Fl_Group* o
             { Fl_Group* o = new Fl_Group(15, 155, 390, 60);
@@ -5022,7 +5019,7 @@ o->linenumber_size(o->Fl_Text_Display::textsize());
               o->labelsize(11);
               o->callback((Fl_Callback*)propagate_load);
               o->align(Fl_Align(FL_ALIGN_LEFT));
-              { fld::widget::Code_Editor* o = new fld::widget::Code_Editor(95, 160, 310, 50, "Return Type:");
+              { Code_Editor* o = new Code_Editor(95, 160, 310, 50, "Return Type:");
                 o->tooltip("return type, or blank to return outermost widget");
                 o->box(FL_DOWN_FRAME);
                 o->color(FL_BACKGROUND2_COLOR);
@@ -5037,7 +5034,7 @@ o->linenumber_size(o->Fl_Text_Display::textsize());
                 o->when(FL_WHEN_RELEASE);
                 Fl_Group::current()->resizable(o);
                 o->add_key_binding(FL_Tab, 0, use_tab_navigation);
-              } // fld::widget::Code_Editor* o
+              } // Code_Editor* o
               o->end();
             } // Fl_Group* o
             { Fl_Group* o = new Fl_Group(15, 215, 390, 105);
diff --git a/fluid/panels/widget_panel.fl b/fluid/panels/widget_panel.fl
index 0fb788ff2..a98916654 100644
--- a/fluid/panels/widget_panel.fl
+++ b/fluid/panels/widget_panel.fl
@@ -84,7 +84,7 @@ decl {\#include <ctype.h>} {uid 43de private global
 decl {\#include <stdlib.h>    // free()} {uid 053c private global
 }
 
-decl {\#include <functional>    // std::function} {uid 29a1 private global
+decl {\#include <string.h>} {uid 29a1 private global
 }
 
 decl {\#define ZERO_ENTRY 1000} {uid e18b private global
@@ -99,7 +99,7 @@ extern void color_common(Fl_Color c);
 extern void color2_common(Fl_Color c);
 extern void textcolor_common(Fl_Color c);
 extern int widget_i;
-extern fld::widget::Formula_Input_Vars widget_vars[];} {uid 81c9 private global
+extern Formula_Input_Vars widget_vars[];} {uid 81c9 private global
 }
 
 decl {extern int numselected;
@@ -116,32 +116,34 @@ Function {use_tab_navigation(int, Fl_Text_Editor*)} {uid 42b9
   }
 }
 
-Function {update_current(Fl_Input* o, void *v,
-  std::function<std::string()> getter,
-  std::function<void(std::string)> setter)} {uid a6e0 open private return_type void
+Function {update_current_input(Fl_Input* o, void *v,
+  const char *cur_val, void (*setter_fn)(void*, const char*), void *nd)} {uid a6e0 open private return_type void
 } {
   code {if (v == LOAD) {
-  o->value( getter().c_str() );
+  o->value(cur_val ? cur_val : "");
 } else {
-  std::string v = o->value();
-  if (v != getter()) {
-    setter(v);
+  const char *nv = o->value();
+  if (!cur_val) cur_val = "";
+  if (!nv) nv = "";
+  if (strcmp(nv, cur_val) != 0) {
+    setter_fn(nd, nv);
     Fluid.proj.set_modflag(1);
   }
 }} {uid e438
   }
 }
 
-Function {update_current(Fl_Text_Editor* o, void *v,
-  std::function<std::string()> getter,
-  std::function<void(std::string)> setter)} {uid 7c05 open private return_type void
+Function {update_current_editor(Fl_Text_Editor* o, void *v,
+  const char *cur_val, void (*setter_fn)(void*, const char*), void *nd)} {uid 7c05 open private return_type void
 } {
   code {if (v == LOAD) {
-  o->buffer()->text( getter().c_str() );
+  o->buffer()->text(cur_val ? cur_val : "");
 } else {
-  std::string v = o->buffer()->text();
-  if (v != getter()) {
-    setter(v);
+  const char *nv = o->buffer()->text();
+  if (!cur_val) cur_val = "";
+  if (!nv) nv = "";
+  if (strcmp(nv, cur_val) != 0) {
+    setter_fn(nd, nv);
     Fluid.proj.set_modflag(1);
   }
 }} {uid c364
@@ -217,7 +219,7 @@ Function {make_image_panel()} {uid b832
     if (mod) Fluid.proj.set_modflag(1);
   }}
           tooltip {Scale image to this width in pixel units} xywh {75 75 55 20} labelsize 11 align 5 textsize 11
-          class {fld::widget::Formula_Input}
+          class {Formula_Input}
         }
         Fl_Input image_panel_imageh {uid e676
           label {Height:}
@@ -247,7 +249,7 @@ Function {make_image_panel()} {uid b832
     if (mod) Fluid.proj.set_modflag(1);
   }}
           tooltip {Scale image to this height in pixel units} xywh {135 75 55 20} labelsize 11 align 5 textsize 11
-          class {fld::widget::Formula_Input}
+          class {Formula_Input}
         }
         Fl_Button {} {uid 4df5
           label Reset
@@ -367,7 +369,7 @@ Function {make_image_panel()} {uid b832
     if (mod) Fluid.proj.set_modflag(1);
   }}
           tooltip {Scale image to this width in pixel units} xywh {75 215 55 20} labelsize 11 align 5 textsize 11
-          class {fld::widget::Formula_Input}
+          class {Formula_Input}
         }
         Fl_Input image_panel_deimageh {uid c6c4
           label {Height:}
@@ -397,7 +399,7 @@ Function {make_image_panel()} {uid b832
     if (mod) Fluid.proj.set_modflag(1);
   }}
           tooltip {Scale image to this height in pixel units} xywh {135 215 55 20} labelsize 11 align 5 textsize 11
-          class {fld::widget::Formula_Input}
+          class {Formula_Input}
         }
         Fl_Button {} {uid a381
           label Reset
@@ -850,7 +852,7 @@ Use Ctrl-J for newlines.} xywh {95 40 190 20} labelfont 1 labelsize 11 when 15 t
               tooltip {The X position of the widget as a number or formula.
 Formulas can be simple math, including the variables
 x, px, sx, cx, and i} xywh {95 150 55 20} labelsize 11 align 5 textsize 11
-              class {fld::widget::Formula_Input}
+              class {Formula_Input}
             }
             Fl_Input widget_y_input {uid 5985
               label {Y:}
@@ -883,7 +885,7 @@ x, px, sx, cx, and i} xywh {95 150 55 20} labelsize 11 align 5 textsize 11
               tooltip {The Y position of the widget as a number or formula.
 Formulas can be simple math, including the variables
 y, py, sy, cy, and i} xywh {155 150 55 20} labelsize 11 align 5 textsize 11
-              class {fld::widget::Formula_Input}
+              class {Formula_Input}
             }
             Fl_Input widget_w_input {uid 2e88
               label {Width:}
@@ -916,7 +918,7 @@ y, py, sy, cy, and i} xywh {155 150 55 20} labelsize 11 align 5 textsize 11
               tooltip {The width of the widget as a number or formula.
 Formulas can be simple math, including the variables
 w, pw, sw, cw, and i} xywh {215 150 55 20} labelsize 11 align 5 textsize 11
-              class {fld::widget::Formula_Input}
+              class {Formula_Input}
             }
             Fl_Input widget_h_input {uid 2382
               label {Height:}
@@ -949,7 +951,7 @@ w, pw, sw, cw, and i} xywh {215 150 55 20} labelsize 11 align 5 textsize 11
               tooltip {The height of the widget as a number or formula.
 Formulas can be simple math, including the variables
 h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
-              class {fld::widget::Formula_Input}
+              class {Formula_Input}
             }
             Fl_Choice {} {uid 4f6a
               label {Children:}
@@ -2495,7 +2497,7 @@ wCallback->do_callback(wCallback, v);} open
   }}
                 tooltip {The callback function or code for the widget. Use the variable name 'o' to access the Widget pointer and 'v' to access the user value.} xywh {95 225 310 80} box DOWN_BOX labelfont 1 labelsize 11 align 4 textfont 4 textsize 11 resizable
                 code0 {\#include "widgets/Code_Editor.h"}
-                class {fld::widget::Code_Editor}
+                class {Code_Editor}
               }
             }
           }
@@ -2737,21 +2739,6 @@ if (v == LOAD) {
                 user_data 2 user_data_type long
                 xywh {10 10 100 20} labelsize 11
               }
-              MenuItem {} {uid a638
-                label {binary: std::vector<uint8_t>}
-                user_data 3 user_data_type long
-                xywh {10 10 100 20} labelsize 11
-              }
-              MenuItem {} {uid c0e7
-                label {text: std::string}
-                user_data 4 user_data_type long
-                xywh {10 10 100 20} labelsize 11
-              }
-              MenuItem {} {uid 8d7a
-                label {compressed: std::vector<uint8_t>}
-                user_data 5 user_data_type long
-                xywh {10 10 100 20} labelsize 11
-              }
             }
             Fl_Box {} {uid 4a0a
               xywh {363 75 42 20} resizable
@@ -2781,10 +2768,18 @@ if (v == LOAD) {
             label {Filename:}
             callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Data)) return;
 Data_Node* nd = (Data_Node*)current_node;
-update_current(o, v,
-  [nd](){return nd->filename();},
-  [nd](std::string s){nd->filename(s);}
-);}
+if (v == LOAD) {
+  o->value(nd->filename() ? nd->filename() : "");
+} else {
+  const char *nv = o->value();
+  const char *cur = nd->filename();
+  if (!cur) cur = "";
+  if (!nv) nv = "";
+  if (strcmp(nv, cur) != 0) {
+    nd->filename(nv);
+    Fluid.proj.set_modflag(1);
+  }
+}}
             tooltip {name and path of file that will be inlined} xywh {95 125 270 20} labelfont 1 labelsize 11 align 132 textfont 4 textsize 11 resizable
           }
           Fl_Button {} {uid a0fe
@@ -3196,10 +3191,18 @@ if (v == LOAD) {
             label {End Code:}
             callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_DeclBlock)) return;
 DeclBlock_Node* nd = (DeclBlock_Node*)current_node;
-update_current(o, v,
-  [nd](){return nd->end_code();},
-  [nd](std::string s){nd->end_code(s);}
-);}
+if (v == LOAD) {
+  o->value(nd->end_code() ? nd->end_code() : "");
+} else {
+  const char *nv = o->value();
+  const char *cur = nd->end_code();
+  if (!cur) cur = "";
+  if (!nv) nv = "";
+  if (strcmp(nv, cur) != 0) {
+    nd->end_code(nv);
+    Fluid.proj.set_modflag(1);
+  }
+}}
             tooltip {`\#endif` or similar declaration code block} xywh {95 75 305 20} labelfont 1 labelsize 11 textfont 4 textsize 11
           }
           Fl_Group {} {uid 9b63
@@ -3456,7 +3459,7 @@ a `\#` directive: `\#include <foo.h>`, a typedef `typedef char byte;`,
  or a `using` statement, etc.} xywh {95 75 310 100} labelfont 1 labelsize 11 align 132 textsize 11 resizable
                 code0 {\#include "widgets/Code_Editor.h"}
                 code1 {o->add_key_binding(FL_Tab, 0, use_tab_navigation);}
-                class {fld::widget::Code_Editor}
+                class {Code_Editor}
               }
             }
             Fl_Group {} {uid 160e
@@ -3525,10 +3528,18 @@ if (v == LOAD) {
             label {End Code:}
             callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_CodeBlock)) return;
 CodeBlock_Node* nd = (CodeBlock_Node*)current_node;
-update_current(o, v,
-  [nd](){return nd->end_code();},
-  [nd](std::string s){nd->end_code(s);}
-);}
+if (v == LOAD) {
+  o->value(nd->end_code() ? nd->end_code() : "");
+} else {
+  const char *nv = o->value();
+  const char *cur = nd->end_code();
+  if (!cur) cur = "";
+  if (!nv) nv = "";
+  if (strcmp(nv, cur) != 0) {
+    nd->end_code(nv);
+    Fluid.proj.set_modflag(1);
+  }
+}}
             tooltip {condition end: `while (x==1);`, or empty} xywh {95 75 305 20} labelfont 1 labelsize 11 textfont 4 textsize 11
           }
           Fl_Text_Editor {} {uid 13f0
@@ -3595,7 +3606,7 @@ Code_Node* nd = (Code_Node*)current_node;
             code1 {\#include "widgets/Code_Editor.h"}
             code2 {o->linenumber_width(60);
 o->linenumber_size(o->Fl_Text_Display::textsize());}
-            class {fld::widget::Code_Editor}
+            class {Code_Editor}
           }
         }
       }
@@ -3743,7 +3754,7 @@ if (v == LOAD) {
                 tooltip {function name and args, or blank for `main(..)`} xywh {95 100 310 50} labelfont 1 labelsize 11 align 132 textsize 11 resizable
                 code0 {\#include "widgets/Code_Editor.h"}
                 code1 {o->add_key_binding(FL_Tab, 0, use_tab_navigation);}
-                class {fld::widget::Code_Editor}
+                class {Code_Editor}
               }
             }
             Fl_Group {} {uid 3cb7
@@ -3754,14 +3765,22 @@ if (v == LOAD) {
                 label {Return Type:}
                 callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Function)) return;
 Function_Node* nd = (Function_Node*)current_node;
-update_current(o, v,
-  [nd](){return nd->return_type();},
-  [nd](std::string s){nd->return_type(s);}
-);}
+if (v == LOAD) {
+  o->buffer()->text(nd->return_type() ? nd->return_type() : "");
+} else {
+  const char *nv = o->buffer()->text();
+  const char *cur = nd->return_type();
+  if (!cur) cur = "";
+  if (!nv) nv = "";
+  if (strcmp(nv, cur) != 0) {
+    nd->return_type(nv);
+    Fluid.proj.set_modflag(1);
+  }
+}}
                 tooltip {return type, or blank to return outermost widget} xywh {95 160 310 50} labelfont 1 labelsize 11 align 132 textsize 11 resizable
                 code0 {\#include "widgets/Code_Editor.h"}
                 code1 {o->add_key_binding(FL_Tab, 0, use_tab_navigation);}
-                class {fld::widget::Code_Editor}
+                class {Code_Editor}
               }
             }
             Fl_Group {} {uid 01de
diff --git a/fluid/panels/widget_panel.h b/fluid/panels/widget_panel.h
index 98d1066b7..48462350d 100644
--- a/fluid/panels/widget_panel.h
+++ b/fluid/panels/widget_panel.h
@@ -31,14 +31,14 @@ extern Fl_Group *image_panel_imagegroup;
 #include <FL/Fl_Box.H>
 #include <FL/Fl_Shared_Image.H>
 extern Fl_Box *image_panel_data;
-extern fld::widget::Formula_Input *image_panel_imagew;
-extern fld::widget::Formula_Input *image_panel_imageh;
+extern Formula_Input *image_panel_imagew;
+extern Formula_Input *image_panel_imageh;
 #include <FL/Fl_Button.H>
 #include <FL/Fl_Check_Button.H>
 extern Fl_Group *image_panel_deimagegroup;
 extern Fl_Box *image_panel_dedata;
-extern fld::widget::Formula_Input *image_panel_deimagew;
-extern fld::widget::Formula_Input *image_panel_deimageh;
+extern Formula_Input *image_panel_deimagew;
+extern Formula_Input *image_panel_deimageh;
 extern Fl_Button *image_panel_close;
 Fl_Double_Window* make_image_panel();
 void run_image_panel();
@@ -61,10 +61,10 @@ extern void align_cb(Fl_Button*, void*);
 extern void align_text_image_cb(Fl_Choice*, void*);
 extern void align_position_cb(Fl_Choice*, void*);
 extern void position_group_cb(Fl_Group*, void*);
-extern fld::widget::Formula_Input *widget_x_input;
-extern fld::widget::Formula_Input *widget_y_input;
-extern fld::widget::Formula_Input *widget_w_input;
-extern fld::widget::Formula_Input *widget_h_input;
+extern Formula_Input *widget_x_input;
+extern Formula_Input *widget_y_input;
+extern Formula_Input *widget_w_input;
+extern Formula_Input *widget_h_input;
 extern Fl_Group *wp_gui_flexp;
 #include <FL/Fl_Value_Input.H>
 extern Fl_Value_Input *widget_flex_size;
@@ -100,7 +100,7 @@ extern Fl_Input *v_input[4];
 #include <FL/Fl_Text_Editor.H>
 extern Fl_Text_Editor *wComment;
 #include "widgets/Code_Editor.h"
-extern fld::widget::Code_Editor *wCallback;
+extern Code_Editor *wCallback;
 extern Fl_Group *wp_cpp_callback;
 extern Fl_Menu_Item whenmenu[];
 #include <FL/Fl_Input_Choice.H>
diff --git a/fluid/panels/widget_panel/Grid_Child_Tab.cxx b/fluid/panels/widget_panel/Grid_Child_Tab.cxx
index 674b17bd7..a1d72b9f6 100644
--- a/fluid/panels/widget_panel/Grid_Child_Tab.cxx
+++ b/fluid/panels/widget_panel/Grid_Child_Tab.cxx
@@ -6,11 +6,11 @@
 #include "nodes/Grid_Node.h"
 extern Grid_Child_Tab *widget_tab_grid_child;
 
-void Grid_Child_Tab::cb_widget_grid_row_input_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_widget_grid_row_input_i(Formula_Input* o, void* v) {
   grid_child_cb(o, v, 8);
     if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
 }
-void Grid_Child_Tab::cb_widget_grid_row_input(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_widget_grid_row_input(Formula_Input* o, void* v) {
   ((Grid_Child_Tab*)(o->parent()->parent()))->cb_widget_grid_row_input_i(o,v);
 }
 
@@ -34,11 +34,11 @@ void Grid_Child_Tab::cb_1(Fl_Button* o, void* v) {
   ((Grid_Child_Tab*)(o->parent()->parent()->parent()))->cb_1_i(o,v);
 }
 
-void Grid_Child_Tab::cb_widget_grid_col_input_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_widget_grid_col_input_i(Formula_Input* o, void* v) {
   grid_child_cb(o, v, 9);
     if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
 }
-void Grid_Child_Tab::cb_widget_grid_col_input(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_widget_grid_col_input(Formula_Input* o, void* v) {
   ((Grid_Child_Tab*)(o->parent()->parent()))->cb_widget_grid_col_input_i(o,v);
 }
 
@@ -174,25 +174,25 @@ Fl_Menu_Item Grid_Child_Tab::menu_Vertical[] = {
  {0,0,0,0,0,0,0,0,0}
 };
 
-void Grid_Child_Tab::cb_Width_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_Width_i(Formula_Input* o, void* v) {
   grid_child_cb(o, v, 12);
 }
-void Grid_Child_Tab::cb_Width(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_Width(Formula_Input* o, void* v) {
   ((Grid_Child_Tab*)(o->parent()->parent()))->cb_Width_i(o,v);
 }
 
-void Grid_Child_Tab::cb_Height_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_Height_i(Formula_Input* o, void* v) {
   grid_child_cb(o, v, 13);
 }
-void Grid_Child_Tab::cb_Height(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_Height(Formula_Input* o, void* v) {
   ((Grid_Child_Tab*)(o->parent()->parent()))->cb_Height_i(o,v);
 }
 
-void Grid_Child_Tab::cb_widget_grid_rowspan_input_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_widget_grid_rowspan_input_i(Formula_Input* o, void* v) {
   grid_child_cb(o, v, 10);
     if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
 }
-void Grid_Child_Tab::cb_widget_grid_rowspan_input(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_widget_grid_rowspan_input(Formula_Input* o, void* v) {
   ((Grid_Child_Tab*)(o->parent()->parent()))->cb_widget_grid_rowspan_input_i(o,v);
 }
 
@@ -216,11 +216,11 @@ void Grid_Child_Tab::cb_5(Fl_Button* o, void* v) {
   ((Grid_Child_Tab*)(o->parent()->parent()->parent()))->cb_5_i(o,v);
 }
 
-void Grid_Child_Tab::cb_widget_grid_colspan_input_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_widget_grid_colspan_input_i(Formula_Input* o, void* v) {
   grid_child_cb(o, v, 11);
     if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
 }
-void Grid_Child_Tab::cb_widget_grid_colspan_input(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_widget_grid_colspan_input(Formula_Input* o, void* v) {
   ((Grid_Child_Tab*)(o->parent()->parent()))->cb_widget_grid_colspan_input_i(o,v);
 }
 
@@ -255,7 +255,7 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
     o->labelsize(11);
     o->callback((Fl_Callback*)propagate_load);
     o->align(Fl_Align(FL_ALIGN_LEFT));
-    { widget_grid_row_input = new fld::widget::Formula_Input(85, 30, 40, 20, "Row:");
+    { widget_grid_row_input = new Formula_Input(85, 30, 40, 20, "Row:");
       widget_grid_row_input->box(FL_DOWN_BOX);
       widget_grid_row_input->color(FL_BACKGROUND2_COLOR);
       widget_grid_row_input->selection_color(FL_SELECTION_COLOR);
@@ -267,7 +267,7 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
       widget_grid_row_input->callback((Fl_Callback*)cb_widget_grid_row_input);
       widget_grid_row_input->align(Fl_Align(FL_ALIGN_TOP_LEFT));
       widget_grid_row_input->when(FL_WHEN_RELEASE);
-    } // fld::widget::Formula_Input* widget_grid_row_input
+    } // Formula_Input* widget_grid_row_input
     { Fl_Group* o = new Fl_Group(125, 30, 30, 20);
       { Fl_Button* o = new Fl_Button(125, 30, 15, 20, "-");
         o->compact(1);
@@ -283,7 +283,7 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
       } // Fl_Button* o
       o->end();
     } // Fl_Group* o
-    { widget_grid_col_input = new fld::widget::Formula_Input(165, 30, 40, 20, "Column:");
+    { widget_grid_col_input = new Formula_Input(165, 30, 40, 20, "Column:");
       widget_grid_col_input->box(FL_DOWN_BOX);
       widget_grid_col_input->color(FL_BACKGROUND2_COLOR);
       widget_grid_col_input->selection_color(FL_SELECTION_COLOR);
@@ -295,7 +295,7 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
       widget_grid_col_input->callback((Fl_Callback*)cb_widget_grid_col_input);
       widget_grid_col_input->align(Fl_Align(FL_ALIGN_TOP_LEFT));
       widget_grid_col_input->when(FL_WHEN_RELEASE);
-    } // fld::widget::Formula_Input* widget_grid_col_input
+    } // Formula_Input* widget_grid_col_input
     { Fl_Group* o = new Fl_Group(205, 30, 30, 20);
       { Fl_Button* o = new Fl_Button(205, 30, 15, 20, "-");
         o->compact(1);
@@ -359,7 +359,7 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
     wp_gridc_size->labelsize(11);
     wp_gridc_size->callback((Fl_Callback*)propagate_load);
     wp_gridc_size->align(Fl_Align(FL_ALIGN_LEFT));
-    { fld::widget::Formula_Input* o = new fld::widget::Formula_Input(85, 105, 55, 20, "Width:");
+    { Formula_Input* o = new Formula_Input(85, 105, 55, 20, "Width:");
       o->box(FL_DOWN_BOX);
       o->color(FL_BACKGROUND2_COLOR);
       o->selection_color(FL_SELECTION_COLOR);
@@ -371,8 +371,8 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
       o->callback((Fl_Callback*)cb_Width);
       o->align(Fl_Align(FL_ALIGN_TOP_LEFT));
       o->when(FL_WHEN_RELEASE);
-    } // fld::widget::Formula_Input* o
-    { fld::widget::Formula_Input* o = new fld::widget::Formula_Input(145, 105, 55, 20, "Height:");
+    } // Formula_Input* o
+    { Formula_Input* o = new Formula_Input(145, 105, 55, 20, "Height:");
       o->box(FL_DOWN_BOX);
       o->color(FL_BACKGROUND2_COLOR);
       o->selection_color(FL_SELECTION_COLOR);
@@ -384,7 +384,7 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
       o->callback((Fl_Callback*)cb_Height);
       o->align(Fl_Align(FL_ALIGN_TOP_LEFT));
       o->when(FL_WHEN_RELEASE);
-    } // fld::widget::Formula_Input* o
+    } // Formula_Input* o
     { Fl_Box* o = new Fl_Box(385, 105, 1, 20);
       o->hide();
       Fl_Group::current()->resizable(o);
@@ -396,7 +396,7 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
     o->labelsize(11);
     o->callback((Fl_Callback*)propagate_load);
     o->align(Fl_Align(FL_ALIGN_LEFT));
-    { widget_grid_rowspan_input = new fld::widget::Formula_Input(85, 140, 40, 20, "Row Span:");
+    { widget_grid_rowspan_input = new Formula_Input(85, 140, 40, 20, "Row Span:");
       widget_grid_rowspan_input->box(FL_DOWN_BOX);
       widget_grid_rowspan_input->color(FL_BACKGROUND2_COLOR);
       widget_grid_rowspan_input->selection_color(FL_SELECTION_COLOR);
@@ -408,7 +408,7 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
       widget_grid_rowspan_input->callback((Fl_Callback*)cb_widget_grid_rowspan_input);
       widget_grid_rowspan_input->align(Fl_Align(FL_ALIGN_TOP_LEFT));
       widget_grid_rowspan_input->when(FL_WHEN_RELEASE);
-    } // fld::widget::Formula_Input* widget_grid_rowspan_input
+    } // Formula_Input* widget_grid_rowspan_input
     { Fl_Group* o = new Fl_Group(125, 140, 30, 20);
       { Fl_Button* o = new Fl_Button(125, 140, 15, 20, "-");
         o->compact(1);
@@ -424,7 +424,7 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
       } // Fl_Button* o
       o->end();
     } // Fl_Group* o
-    { widget_grid_colspan_input = new fld::widget::Formula_Input(165, 140, 40, 20, "Col. Span:");
+    { widget_grid_colspan_input = new Formula_Input(165, 140, 40, 20, "Col. Span:");
       widget_grid_colspan_input->box(FL_DOWN_BOX);
       widget_grid_colspan_input->color(FL_BACKGROUND2_COLOR);
       widget_grid_colspan_input->selection_color(FL_SELECTION_COLOR);
@@ -436,7 +436,7 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
       widget_grid_colspan_input->callback((Fl_Callback*)cb_widget_grid_colspan_input);
       widget_grid_colspan_input->align(Fl_Align(FL_ALIGN_TOP_LEFT));
       widget_grid_colspan_input->when(FL_WHEN_RELEASE);
-    } // fld::widget::Formula_Input* widget_grid_colspan_input
+    } // Formula_Input* widget_grid_colspan_input
     { Fl_Group* o = new Fl_Group(205, 140, 30, 20);
       { Fl_Button* o = new Fl_Button(205, 140, 15, 20, "-");
         o->compact(1);
@@ -467,7 +467,7 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
   resize(X, Y, W, H);
 }
 
-void Grid_Child_Tab::grid_child_cb(fld::widget::Formula_Input* i, void* v, int what) {
+void Grid_Child_Tab::grid_child_cb(Formula_Input* i, void* v, int what) {
   if (   !current_widget
         || !current_widget->parent
         || !current_widget->parent->is_a(FLD_NODE_TYPE_Grid))
diff --git a/fluid/panels/widget_panel/Grid_Child_Tab.fl b/fluid/panels/widget_panel/Grid_Child_Tab.fl
index 4bd3744d6..dc6b0a5e7 100644
--- a/fluid/panels/widget_panel/Grid_Child_Tab.fl
+++ b/fluid/panels/widget_panel/Grid_Child_Tab.fl
@@ -33,7 +33,7 @@ widget_class Grid_Child_Tab {
       callback {grid_child_cb(o, v, 8);
   if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);}
       xywh {85 30 40 20} labelsize 11 align 5 textsize 11
-      class {fld::widget::Formula_Input}
+      class {Formula_Input}
     }
     Fl_Group {} {open
       xywh {125 30 30 20}
@@ -62,7 +62,7 @@ widget_class Grid_Child_Tab {
       callback {grid_child_cb(o, v, 9);
   if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);}
       xywh {165 30 40 20} labelsize 11 align 5 textsize 11
-      class {fld::widget::Formula_Input}
+      class {Formula_Input}
     }
     Fl_Group {} {open
       xywh {205 30 30 20}
@@ -243,13 +243,13 @@ widget_class Grid_Child_Tab {
       label {Width:}
       callback {grid_child_cb(o, v, 12);}
       xywh {85 105 55 20} labelsize 11 align 5 textsize 11
-      class {fld::widget::Formula_Input}
+      class {Formula_Input}
     }
     Fl_Input {} {
       label {Height:}
       callback {grid_child_cb(o, v, 13);}
       xywh {145 105 55 20} labelsize 11 align 5 textsize 11
-      class {fld::widget::Formula_Input}
+      class {Formula_Input}
     }
     Fl_Box {} {
       xywh {385 105 1 20} hide resizable
@@ -265,7 +265,7 @@ widget_class Grid_Child_Tab {
       callback {grid_child_cb(o, v, 10);
   if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);}
       xywh {85 140 40 20} labelsize 11 align 5 textsize 11
-      class {fld::widget::Formula_Input}
+      class {Formula_Input}
     }
     Fl_Group {} {open
       xywh {125 140 30 20}
@@ -294,7 +294,7 @@ widget_class Grid_Child_Tab {
       callback {grid_child_cb(o, v, 11);
   if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);}
       xywh {165 140 40 20} labelsize 11 align 5 textsize 11
-      class {fld::widget::Formula_Input}
+      class {Formula_Input}
     }
     Fl_Group {} {open
       xywh {205 140 30 20}
@@ -325,7 +325,7 @@ widget_class Grid_Child_Tab {
   Fl_Box {} {
     xywh {85 320 300 5} labelsize 11 hide resizable
   }
-  Function {grid_child_cb(fld::widget::Formula_Input* i, void* v, int what)} {open return_type void
+  Function {grid_child_cb(Formula_Input* i, void* v, int what)} {open return_type void
   } {
     code {if (   !current_widget
       || !current_widget->parent
diff --git a/fluid/panels/widget_panel/Grid_Child_Tab.h b/fluid/panels/widget_panel/Grid_Child_Tab.h
index 93cfda78b..6970c69bd 100644
--- a/fluid/panels/widget_panel/Grid_Child_Tab.h
+++ b/fluid/panels/widget_panel/Grid_Child_Tab.h
@@ -13,19 +13,19 @@ extern void propagate_load(Fl_Group*, void*);
 class Grid_Child_Tab : public Fl_Group {
 public:
   Grid_Child_Tab(int X, int Y, int W, int H, const char *L = 0);
-  fld::widget::Formula_Input *widget_grid_row_input;
+  Formula_Input *widget_grid_row_input;
 private:
-  inline void cb_widget_grid_row_input_i(fld::widget::Formula_Input*, void*);
-  static void cb_widget_grid_row_input(fld::widget::Formula_Input*, void*);
+  inline void cb_widget_grid_row_input_i(Formula_Input*, void*);
+  static void cb_widget_grid_row_input(Formula_Input*, void*);
   inline void cb__i(Fl_Button*, void*);
   static void cb_(Fl_Button*, void*);
   inline void cb_1_i(Fl_Button*, void*);
   static void cb_1(Fl_Button*, void*);
 public:
-  fld::widget::Formula_Input *widget_grid_col_input;
+  Formula_Input *widget_grid_col_input;
 private:
-  inline void cb_widget_grid_col_input_i(fld::widget::Formula_Input*, void*);
-  static void cb_widget_grid_col_input(fld::widget::Formula_Input*, void*);
+  inline void cb_widget_grid_col_input_i(Formula_Input*, void*);
+  static void cb_widget_grid_col_input(Formula_Input*, void*);
   inline void cb_2_i(Fl_Button*, void*);
   static void cb_2(Fl_Button*, void*);
   inline void cb_3_i(Fl_Button*, void*);
@@ -51,29 +51,29 @@ private:
 public:
   Fl_Group *wp_gridc_size;
 private:
-  inline void cb_Width_i(fld::widget::Formula_Input*, void*);
-  static void cb_Width(fld::widget::Formula_Input*, void*);
-  inline void cb_Height_i(fld::widget::Formula_Input*, void*);
-  static void cb_Height(fld::widget::Formula_Input*, void*);
+  inline void cb_Width_i(Formula_Input*, void*);
+  static void cb_Width(Formula_Input*, void*);
+  inline void cb_Height_i(Formula_Input*, void*);
+  static void cb_Height(Formula_Input*, void*);
 public:
-  fld::widget::Formula_Input *widget_grid_rowspan_input;
+  Formula_Input *widget_grid_rowspan_input;
 private:
-  inline void cb_widget_grid_rowspan_input_i(fld::widget::Formula_Input*, void*);
-  static void cb_widget_grid_rowspan_input(fld::widget::Formula_Input*, void*);
+  inline void cb_widget_grid_rowspan_input_i(Formula_Input*, void*);
+  static void cb_widget_grid_rowspan_input(Formula_Input*, void*);
   inline void cb_4_i(Fl_Button*, void*);
   static void cb_4(Fl_Button*, void*);
   inline void cb_5_i(Fl_Button*, void*);
   static void cb_5(Fl_Button*, void*);
 public:
-  fld::widget::Formula_Input *widget_grid_colspan_input;
+  Formula_Input *widget_grid_colspan_input;
 private:
-  inline void cb_widget_grid_colspan_input_i(fld::widget::Formula_Input*, void*);
-  static void cb_widget_grid_colspan_input(fld::widget::Formula_Input*, void*);
+  inline void cb_widget_grid_colspan_input_i(Formula_Input*, void*);
+  static void cb_widget_grid_colspan_input(Formula_Input*, void*);
   inline void cb_6_i(Fl_Button*, void*);
   static void cb_6(Fl_Button*, void*);
   inline void cb_7_i(Fl_Button*, void*);
   static void cb_7(Fl_Button*, void*);
 public:
-  void grid_child_cb(fld::widget::Formula_Input* i, void* v, int what);
+  void grid_child_cb(Formula_Input* i, void* v, int what);
 };
 #endif
diff --git a/fluid/panels/widget_panel/Grid_Tab.cxx b/fluid/panels/widget_panel/Grid_Tab.cxx
index 4730f0789..2540d95a5 100644
--- a/fluid/panels/widget_panel/Grid_Tab.cxx
+++ b/fluid/panels/widget_panel/Grid_Tab.cxx
@@ -6,7 +6,7 @@
 #include "nodes/Grid_Node.h"
 extern Grid_Tab *widget_tab_grid;
 
-void Grid_Tab::cb_widget_grid_rows_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_widget_grid_rows_i(Formula_Input* o, void* v) {
   // grid_rows_cb
   Fl_Grid *grid = Grid_Node::selected();
   if (!grid) return;
@@ -31,7 +31,7 @@ void Grid_Tab::cb_widget_grid_rows_i(fld::widget::Formula_Input* o, void* v) {
     }
   }
 }
-void Grid_Tab::cb_widget_grid_rows(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_widget_grid_rows(Formula_Input* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()))->cb_widget_grid_rows_i(o,v);
 }
 
@@ -55,7 +55,7 @@ void Grid_Tab::cb_1(Fl_Button* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()->parent()))->cb_1_i(o,v);
 }
 
-void Grid_Tab::cb_widget_grid_cols_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_widget_grid_cols_i(Formula_Input* o, void* v) {
   // grid_rows_cb
   Fl_Grid *grid = Grid_Node::selected();
   if (!grid) return;
@@ -80,7 +80,7 @@ void Grid_Tab::cb_widget_grid_cols_i(fld::widget::Formula_Input* o, void* v) {
     }
   }
 }
-void Grid_Tab::cb_widget_grid_cols(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_widget_grid_cols(Formula_Input* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()))->cb_widget_grid_cols_i(o,v);
 }
 
@@ -250,7 +250,7 @@ void Grid_Tab::cb_Row1(Fl_Group* o, void* v) {
   ((Grid_Tab*)(o->parent()))->cb_Row1_i(o,v);
 }
 
-void Grid_Tab::cb_widget_grid_curr_row_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_widget_grid_curr_row_i(Formula_Input* o, void* v) {
   Fl_Grid *grid = Grid_Node::selected();
   if (!grid) return;
   int r = o->value(), old_r = r;
@@ -263,7 +263,7 @@ void Grid_Tab::cb_widget_grid_curr_row_i(fld::widget::Formula_Input* o, void* v)
     widget_grid_curr_row_attributes->do_callback(widget_grid_curr_row_attributes, LOAD);
   }
 }
-void Grid_Tab::cb_widget_grid_curr_row(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_widget_grid_curr_row(Formula_Input* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()))->cb_widget_grid_curr_row_i(o,v);
 }
 
@@ -287,7 +287,7 @@ void Grid_Tab::cb_5(Fl_Button* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()->parent()))->cb_5_i(o,v);
 }
 
-void Grid_Tab::cb_Height_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Height_i(Formula_Input* o, void* v) {
   Fl_Grid *grid = Grid_Node::selected();
   if (!grid) return;
   int r = widget_grid_curr_row->value();
@@ -304,11 +304,11 @@ void Grid_Tab::cb_Height_i(fld::widget::Formula_Input* o, void* v) {
     }
   }
 }
-void Grid_Tab::cb_Height(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Height(Formula_Input* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()->parent()))->cb_Height_i(o,v);
 }
 
-void Grid_Tab::cb_Weight_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Weight_i(Formula_Input* o, void* v) {
   Fl_Grid *grid = Grid_Node::selected();
   if (!grid) return;
   int r = widget_grid_curr_row->value();
@@ -325,11 +325,11 @@ void Grid_Tab::cb_Weight_i(fld::widget::Formula_Input* o, void* v) {
     }
   }
 }
-void Grid_Tab::cb_Weight(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Weight(Formula_Input* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()->parent()))->cb_Weight_i(o,v);
 }
 
-void Grid_Tab::cb_Gap_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Gap_i(Formula_Input* o, void* v) {
   Fl_Grid *grid = Grid_Node::selected();
   if (!grid) return;
   int r = widget_grid_curr_row->value();
@@ -346,11 +346,11 @@ void Grid_Tab::cb_Gap_i(fld::widget::Formula_Input* o, void* v) {
     }
   }
 }
-void Grid_Tab::cb_Gap(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Gap(Formula_Input* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()->parent()))->cb_Gap_i(o,v);
 }
 
-void Grid_Tab::cb_widget_grid_curr_col_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_widget_grid_curr_col_i(Formula_Input* o, void* v) {
   Fl_Grid *grid = Grid_Node::selected();
   if (!grid) return;
   int c = o->value(), old_c = c;
@@ -363,7 +363,7 @@ void Grid_Tab::cb_widget_grid_curr_col_i(fld::widget::Formula_Input* o, void* v)
     widget_grid_curr_col_attributes->do_callback(widget_grid_curr_col_attributes, LOAD);
   }
 }
-void Grid_Tab::cb_widget_grid_curr_col(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_widget_grid_curr_col(Formula_Input* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()))->cb_widget_grid_curr_col_i(o,v);
 }
 
@@ -387,7 +387,7 @@ void Grid_Tab::cb_7(Fl_Button* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()->parent()))->cb_7_i(o,v);
 }
 
-void Grid_Tab::cb_Width_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Width_i(Formula_Input* o, void* v) {
   Fl_Grid *grid = Grid_Node::selected();
   if (!grid) return;
   int c = widget_grid_curr_col->value();
@@ -404,11 +404,11 @@ void Grid_Tab::cb_Width_i(fld::widget::Formula_Input* o, void* v) {
     }
   }
 }
-void Grid_Tab::cb_Width(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Width(Formula_Input* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()->parent()))->cb_Width_i(o,v);
 }
 
-void Grid_Tab::cb_Weight1_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Weight1_i(Formula_Input* o, void* v) {
   Fl_Grid *grid = Grid_Node::selected();
   if (!grid) return;
   int c = widget_grid_curr_col->value();
@@ -425,11 +425,11 @@ void Grid_Tab::cb_Weight1_i(fld::widget::Formula_Input* o, void* v) {
     }
   }
 }
-void Grid_Tab::cb_Weight1(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Weight1(Formula_Input* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()->parent()))->cb_Weight1_i(o,v);
 }
 
-void Grid_Tab::cb_Gap1_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Gap1_i(Formula_Input* o, void* v) {
   Fl_Grid *grid = Grid_Node::selected();
   if (!grid) return;
   int c = widget_grid_curr_col->value();
@@ -446,7 +446,7 @@ void Grid_Tab::cb_Gap1_i(fld::widget::Formula_Input* o, void* v) {
     }
   }
 }
-void Grid_Tab::cb_Gap1(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Gap1(Formula_Input* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()->parent()))->cb_Gap1_i(o,v);
 }
 
@@ -460,7 +460,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
     o->labelsize(11);
     o->callback((Fl_Callback*)propagate_load);
     o->align(Fl_Align(FL_ALIGN_LEFT));
-    { widget_grid_rows = new fld::widget::Formula_Input(85, 30, 40, 20, "Rows:");
+    { widget_grid_rows = new Formula_Input(85, 30, 40, 20, "Rows:");
       widget_grid_rows->tooltip("Number of horizontal rows in the Grid group");
       widget_grid_rows->box(FL_DOWN_BOX);
       widget_grid_rows->color(FL_BACKGROUND2_COLOR);
@@ -473,7 +473,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
       widget_grid_rows->callback((Fl_Callback*)cb_widget_grid_rows);
       widget_grid_rows->align(Fl_Align(FL_ALIGN_TOP_LEFT));
       widget_grid_rows->when(FL_WHEN_RELEASE);
-    } // fld::widget::Formula_Input* widget_grid_rows
+    } // Formula_Input* widget_grid_rows
     { Fl_Group* o = new Fl_Group(125, 30, 30, 20);
       { Fl_Button* o = new Fl_Button(125, 30, 15, 20, "-");
         o->compact(1);
@@ -489,7 +489,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
       } // Fl_Button* o
       o->end();
     } // Fl_Group* o
-    { widget_grid_cols = new fld::widget::Formula_Input(165, 30, 40, 20, "Columns:");
+    { widget_grid_cols = new Formula_Input(165, 30, 40, 20, "Columns:");
       widget_grid_cols->tooltip("Number of vertical columns in the Grid group");
       widget_grid_cols->box(FL_DOWN_BOX);
       widget_grid_cols->color(FL_BACKGROUND2_COLOR);
@@ -502,7 +502,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
       widget_grid_cols->callback((Fl_Callback*)cb_widget_grid_cols);
       widget_grid_cols->align(Fl_Align(FL_ALIGN_TOP_LEFT));
       widget_grid_cols->when(FL_WHEN_RELEASE);
-    } // fld::widget::Formula_Input* widget_grid_cols
+    } // Formula_Input* widget_grid_cols
     { Fl_Group* o = new Fl_Group(205, 30, 30, 20);
       { Fl_Button* o = new Fl_Button(205, 30, 15, 20, "-");
         o->compact(1);
@@ -602,7 +602,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
     o->labelsize(11);
     o->callback((Fl_Callback*)cb_Row1);
     o->align(Fl_Align(FL_ALIGN_LEFT));
-    { widget_grid_curr_row = new fld::widget::Formula_Input(85, 145, 40, 20, "Index");
+    { widget_grid_curr_row = new Formula_Input(85, 145, 40, 20, "Index");
       widget_grid_curr_row->box(FL_DOWN_BOX);
       widget_grid_curr_row->color(FL_BACKGROUND2_COLOR);
       widget_grid_curr_row->selection_color(FL_SELECTION_COLOR);
@@ -614,7 +614,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
       widget_grid_curr_row->callback((Fl_Callback*)cb_widget_grid_curr_row);
       widget_grid_curr_row->align(Fl_Align(FL_ALIGN_TOP_LEFT));
       widget_grid_curr_row->when(FL_WHEN_RELEASE);
-    } // fld::widget::Formula_Input* widget_grid_curr_row
+    } // Formula_Input* widget_grid_curr_row
     { Fl_Group* o = new Fl_Group(125, 145, 30, 20);
       o->callback((Fl_Callback*)propagate_load);
       { Fl_Button* o = new Fl_Button(125, 145, 15, 20, "-");
@@ -636,7 +636,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
     } // Fl_Box* o
     { widget_grid_curr_row_attributes = new Fl_Group(170, 145, 175, 20);
       widget_grid_curr_row_attributes->callback((Fl_Callback*)propagate_load);
-      { fld::widget::Formula_Input* o = new fld::widget::Formula_Input(170, 145, 55, 20, "Height:");
+      { Formula_Input* o = new Formula_Input(170, 145, 55, 20, "Height:");
         o->box(FL_DOWN_BOX);
         o->color(FL_BACKGROUND2_COLOR);
         o->selection_color(FL_SELECTION_COLOR);
@@ -648,8 +648,8 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
         o->callback((Fl_Callback*)cb_Height);
         o->align(Fl_Align(FL_ALIGN_TOP_LEFT));
         o->when(FL_WHEN_RELEASE);
-      } // fld::widget::Formula_Input* o
-      { fld::widget::Formula_Input* o = new fld::widget::Formula_Input(230, 145, 55, 20, "Weight:");
+      } // Formula_Input* o
+      { Formula_Input* o = new Formula_Input(230, 145, 55, 20, "Weight:");
         o->box(FL_DOWN_BOX);
         o->color(FL_BACKGROUND2_COLOR);
         o->selection_color(FL_SELECTION_COLOR);
@@ -661,8 +661,8 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
         o->callback((Fl_Callback*)cb_Weight);
         o->align(Fl_Align(FL_ALIGN_TOP_LEFT));
         o->when(FL_WHEN_RELEASE);
-      } // fld::widget::Formula_Input* o
-      { fld::widget::Formula_Input* o = new fld::widget::Formula_Input(290, 145, 55, 20, "Gap:");
+      } // Formula_Input* o
+      { Formula_Input* o = new Formula_Input(290, 145, 55, 20, "Gap:");
         o->box(FL_DOWN_BOX);
         o->color(FL_BACKGROUND2_COLOR);
         o->selection_color(FL_SELECTION_COLOR);
@@ -674,7 +674,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
         o->callback((Fl_Callback*)cb_Gap);
         o->align(Fl_Align(FL_ALIGN_TOP_LEFT));
         o->when(FL_WHEN_RELEASE);
-      } // fld::widget::Formula_Input* o
+      } // Formula_Input* o
       widget_grid_curr_row_attributes->end();
     } // Fl_Group* widget_grid_curr_row_attributes
     { Fl_Box* o = new Fl_Box(390, 145, 1, 20);
@@ -688,7 +688,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
     o->labelsize(11);
     o->callback((Fl_Callback*)propagate_load);
     o->align(Fl_Align(FL_ALIGN_LEFT));
-    { widget_grid_curr_col = new fld::widget::Formula_Input(85, 180, 40, 20, "Index");
+    { widget_grid_curr_col = new Formula_Input(85, 180, 40, 20, "Index");
       widget_grid_curr_col->box(FL_DOWN_BOX);
       widget_grid_curr_col->color(FL_BACKGROUND2_COLOR);
       widget_grid_curr_col->selection_color(FL_SELECTION_COLOR);
@@ -700,7 +700,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
       widget_grid_curr_col->callback((Fl_Callback*)cb_widget_grid_curr_col);
       widget_grid_curr_col->align(Fl_Align(FL_ALIGN_TOP_LEFT));
       widget_grid_curr_col->when(FL_WHEN_RELEASE);
-    } // fld::widget::Formula_Input* widget_grid_curr_col
+    } // Formula_Input* widget_grid_curr_col
     { Fl_Group* o = new Fl_Group(125, 180, 30, 20);
       { Fl_Button* o = new Fl_Button(125, 180, 15, 20, "-");
         o->compact(1);
@@ -721,7 +721,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
     } // Fl_Box* o
     { widget_grid_curr_col_attributes = new Fl_Group(170, 180, 175, 20);
       widget_grid_curr_col_attributes->callback((Fl_Callback*)propagate_load);
-      { fld::widget::Formula_Input* o = new fld::widget::Formula_Input(170, 180, 55, 20, "Width:");
+      { Formula_Input* o = new Formula_Input(170, 180, 55, 20, "Width:");
         o->box(FL_DOWN_BOX);
         o->color(FL_BACKGROUND2_COLOR);
         o->selection_color(FL_SELECTION_COLOR);
@@ -733,8 +733,8 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
         o->callback((Fl_Callback*)cb_Width);
         o->align(Fl_Align(FL_ALIGN_TOP_LEFT));
         o->when(FL_WHEN_RELEASE);
-      } // fld::widget::Formula_Input* o
-      { fld::widget::Formula_Input* o = new fld::widget::Formula_Input(230, 180, 55, 20, "Weight:");
+      } // Formula_Input* o
+      { Formula_Input* o = new Formula_Input(230, 180, 55, 20, "Weight:");
         o->box(FL_DOWN_BOX);
         o->color(FL_BACKGROUND2_COLOR);
         o->selection_color(FL_SELECTION_COLOR);
@@ -746,8 +746,8 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
         o->callback((Fl_Callback*)cb_Weight1);
         o->align(Fl_Align(FL_ALIGN_TOP_LEFT));
         o->when(FL_WHEN_RELEASE);
-      } // fld::widget::Formula_Input* o
-      { fld::widget::Formula_Input* o = new fld::widget::Formula_Input(290, 180, 55, 20, "Gap:");
+      } // Formula_Input* o
+      { Formula_Input* o = new Formula_Input(290, 180, 55, 20, "Gap:");
         o->box(FL_DOWN_BOX);
         o->color(FL_BACKGROUND2_COLOR);
         o->selection_color(FL_SELECTION_COLOR);
@@ -759,7 +759,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
         o->callback((Fl_Callback*)cb_Gap1);
         o->align(Fl_Align(FL_ALIGN_TOP_LEFT));
         o->when(FL_WHEN_RELEASE);
-      } // fld::widget::Formula_Input* o
+      } // Formula_Input* o
       widget_grid_curr_col_attributes->end();
     } // Fl_Group* widget_grid_curr_col_attributes
     { Fl_Box* o = new Fl_Box(390, 180, 1, 20);
diff --git a/fluid/panels/widget_panel/Grid_Tab.fl b/fluid/panels/widget_panel/Grid_Tab.fl
index 422ddf789..231d67361 100644
--- a/fluid/panels/widget_panel/Grid_Tab.fl
+++ b/fluid/panels/widget_panel/Grid_Tab.fl
@@ -54,7 +54,7 @@ if (v == LOAD) {
   }
 }}
       tooltip {Number of horizontal rows in the Grid group} xywh {85 30 40 20} labelsize 11 align 5 textsize 11
-      class {fld::widget::Formula_Input}
+      class {Formula_Input}
     }
     Fl_Group {} {open
       xywh {125 30 30 20}
@@ -104,7 +104,7 @@ if (v == LOAD) {
   }
 }}
       tooltip {Number of vertical columns in the Grid group} xywh {165 30 40 20} labelsize 11 align 5 textsize 11
-      class {fld::widget::Formula_Input}
+      class {Formula_Input}
     }
     Fl_Group {} {open
       xywh {205 30 30 20}
@@ -296,7 +296,7 @@ if (v == LOAD) {
   widget_grid_curr_row_attributes->do_callback(widget_grid_curr_row_attributes, LOAD);
 }}
       xywh {85 145 40 20} labelsize 11 align 5 textsize 11
-      class {fld::widget::Formula_Input}
+      class {Formula_Input}
     }
     Fl_Group {} {
       callback propagate_load open
@@ -347,7 +347,7 @@ if (v == LOAD) {
   }
 }}
         xywh {170 145 55 20} labelsize 11 align 5 textsize 11
-        class {fld::widget::Formula_Input}
+        class {Formula_Input}
       }
       Fl_Input {} {
         label {Weight:}
@@ -367,7 +367,7 @@ if (v == LOAD) {
   }
 }}
         xywh {230 145 55 20} labelsize 11 align 5 textsize 11
-        class {fld::widget::Formula_Input}
+        class {Formula_Input}
       }
       Fl_Input {} {
         label {Gap:}
@@ -387,7 +387,7 @@ if (v == LOAD) {
   }
 }}
         xywh {290 145 55 20} labelsize 11 align 5 textsize 11
-        class {fld::widget::Formula_Input}
+        class {Formula_Input}
       }
     }
     Fl_Box {} {
@@ -413,7 +413,7 @@ if (v == LOAD) {
   widget_grid_curr_col_attributes->do_callback(widget_grid_curr_col_attributes, LOAD);
 }}
       xywh {85 180 40 20} labelsize 11 align 5 textsize 11
-      class {fld::widget::Formula_Input}
+      class {Formula_Input}
     }
     Fl_Group {} {open
       xywh {125 180 30 20}
@@ -463,7 +463,7 @@ if (v == LOAD) {
   }
 }}
         xywh {170 180 55 20} labelsize 11 align 5 textsize 11
-        class {fld::widget::Formula_Input}
+        class {Formula_Input}
       }
       Fl_Input {} {
         label {Weight:}
@@ -483,7 +483,7 @@ if (v == LOAD) {
   }
 }}
         xywh {230 180 55 20} labelsize 11 align 5 textsize 11
-        class {fld::widget::Formula_Input}
+        class {Formula_Input}
       }
       Fl_Input {} {
         label {Gap:}
@@ -503,7 +503,7 @@ if (v == LOAD) {
   }
 }}
         xywh {290 180 55 20} labelsize 11 align 5 textsize 11
-        class {fld::widget::Formula_Input}
+        class {Formula_Input}
       }
     }
     Fl_Box {} {
diff --git a/fluid/panels/widget_panel/Grid_Tab.h b/fluid/panels/widget_panel/Grid_Tab.h
index 4b06a9e43..c562f345a 100644
--- a/fluid/panels/widget_panel/Grid_Tab.h
+++ b/fluid/panels/widget_panel/Grid_Tab.h
@@ -13,19 +13,19 @@ extern void propagate_load(Fl_Group*, void*);
 class Grid_Tab : public Fl_Group {
 public:
   Grid_Tab(int X, int Y, int W, int H, const char *L = 0);
-  fld::widget::Formula_Input *widget_grid_rows;
+  Formula_Input *widget_grid_rows;
 private:
-  inline void cb_widget_grid_rows_i(fld::widget::Formula_Input*, void*);
-  static void cb_widget_grid_rows(fld::widget::Formula_Input*, void*);
+  inline void cb_widget_grid_rows_i(Formula_Input*, void*);
+  static void cb_widget_grid_rows(Formula_Input*, void*);
   inline void cb__i(Fl_Button*, void*);
   static void cb_(Fl_Button*, void*);
   inline void cb_1_i(Fl_Button*, void*);
   static void cb_1(Fl_Button*, void*);
 public:
-  fld::widget::Formula_Input *widget_grid_cols;
+  Formula_Input *widget_grid_cols;
 private:
-  inline void cb_widget_grid_cols_i(fld::widget::Formula_Input*, void*);
-  static void cb_widget_grid_cols(fld::widget::Formula_Input*, void*);
+  inline void cb_widget_grid_cols_i(Formula_Input*, void*);
+  static void cb_widget_grid_cols(Formula_Input*, void*);
   inline void cb_2_i(Fl_Button*, void*);
   static void cb_2(Fl_Button*, void*);
   inline void cb_3_i(Fl_Button*, void*);
@@ -51,10 +51,10 @@ private:
   inline void cb_Row1_i(Fl_Group*, void*);
   static void cb_Row1(Fl_Group*, void*);
 public:
-  fld::widget::Formula_Input *widget_grid_curr_row;
+  Formula_Input *widget_grid_curr_row;
 private:
-  inline void cb_widget_grid_curr_row_i(fld::widget::Formula_Input*, void*);
-  static void cb_widget_grid_curr_row(fld::widget::Formula_Input*, void*);
+  inline void cb_widget_grid_curr_row_i(Formula_Input*, void*);
+  static void cb_widget_grid_curr_row(Formula_Input*, void*);
   inline void cb_4_i(Fl_Button*, void*);
   static void cb_4(Fl_Button*, void*);
   inline void cb_5_i(Fl_Button*, void*);
@@ -62,17 +62,17 @@ private:
 public:
   Fl_Group *widget_grid_curr_row_attributes;
 private:
-  inline void cb_Height_i(fld::widget::Formula_Input*, void*);
-  static void cb_Height(fld::widget::Formula_Input*, void*);
-  inline void cb_Weight_i(fld::widget::Formula_Input*, void*);
-  static void cb_Weight(fld::widget::Formula_Input*, void*);
-  inline void cb_Gap_i(fld::widget::Formula_Input*, void*);
-  static void cb_Gap(fld::widget::Formula_Input*, void*);
+  inline void cb_Height_i(Formula_Input*, void*);
+  static void cb_Height(Formula_Input*, void*);
+  inline void cb_Weight_i(Formula_Input*, void*);
+  static void cb_Weight(Formula_Input*, void*);
+  inline void cb_Gap_i(Formula_Input*, void*);
+  static void cb_Gap(Formula_Input*, void*);
 public:
-  fld::widget::Formula_Input *widget_grid_curr_col;
+  Formula_Input *widget_grid_curr_col;
 private:
-  inline void cb_widget_grid_curr_col_i(fld::widget::Formula_Input*, void*);
-  static void cb_widget_grid_curr_col(fld::widget::Formula_Input*, void*);
+  inline void cb_widget_grid_curr_col_i(Formula_Input*, void*);
+  static void cb_widget_grid_curr_col(Formula_Input*, void*);
   inline void cb_6_i(Fl_Button*, void*);
   static void cb_6(Fl_Button*, void*);
   inline void cb_7_i(Fl_Button*, void*);
@@ -80,11 +80,11 @@ private:
 public:
   Fl_Group *widget_grid_curr_col_attributes;
 private:
-  inline void cb_Width_i(fld::widget::Formula_Input*, void*);
-  static void cb_Width(fld::widget::Formula_Input*, void*);
-  inline void cb_Weight1_i(fld::widget::Formula_Input*, void*);
-  static void cb_Weight1(fld::widget::Formula_Input*, void*);
-  inline void cb_Gap1_i(fld::widget::Formula_Input*, void*);
-  static void cb_Gap1(fld::widget::Formula_Input*, void*);
+  inline void cb_Width_i(Formula_Input*, void*);
+  static void cb_Width(Formula_Input*, void*);
+  inline void cb_Weight1_i(Formula_Input*, void*);
+  static void cb_Weight1(Formula_Input*, void*);
+  inline void cb_Gap1_i(Formula_Input*, void*);
+  static void cb_Gap1(Formula_Input*, void*);
 };
 #endif