diff --git a/fluid/Fl_Menu_Type.cxx b/fluid/Fl_Menu_Type.cxx
index f5182272e..1b1c76de3 100644
--- a/fluid/Fl_Menu_Type.cxx
+++ b/fluid/Fl_Menu_Type.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Menu_Type.cxx,v 1.16.2.12 2001/01/22 15:13:38 easysw Exp $"
+// "$Id: Fl_Menu_Type.cxx,v 1.16.2.12.2.1 2001/09/29 03:36:27 easysw Exp $"
 //
 // Menu item code for the Fast Light Tool Kit (FLTK).
 //
@@ -412,8 +412,8 @@ Fl_Menu_Bar_Type Fl_Menu_Bar_type;
 #include <FL/fl_draw.H>
 
 void Shortcut_Button::draw() {
-  if (value()) draw_box(FL_THIN_DOWN_BOX, (Fl_Color)9);
-  else draw_box(FL_THIN_UP_BOX, FL_WHITE);
+  if (value()) draw_box(FL_DOWN_BOX, (Fl_Color)9);
+  else draw_box(FL_UP_BOX, FL_WHITE);
   fl_font(FL_HELVETICA,14); fl_color(FL_BLACK);
   fl_draw(fl_shortcut_label(svalue),x()+6,y(),w(),h(),FL_ALIGN_LEFT);
 }
@@ -460,5 +460,5 @@ void shortcut_in_cb(Shortcut_Button* i, void* v) {
 }
 
 //
-// End of "$Id: Fl_Menu_Type.cxx,v 1.16.2.12 2001/01/22 15:13:38 easysw Exp $".
+// End of "$Id: Fl_Menu_Type.cxx,v 1.16.2.12.2.1 2001/09/29 03:36:27 easysw Exp $".
 //
diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx
index ff2ae57ba..ea294a028 100644
--- a/fluid/Fl_Widget_Type.cxx
+++ b/fluid/Fl_Widget_Type.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.1 2001/08/04 16:56:02 easysw Exp $"
+// "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.2 2001/09/29 03:36:27 easysw Exp $"
 //
 // Widget type code for the Fast Light Tool Kit (FLTK).
 //
@@ -244,12 +244,12 @@ void name_cb(Fl_Input* o, void *v) {
     if (numselected != 1) {
       static char buf[16];
       sprintf(buf,"(%d widgets)",numselected);
-      ((Fl_Window*)(o->parent()))->label(buf);
+      ((Fl_Window*)(o->parent()->parent()->parent()))->label(buf);
       o->hide();
     } else {
       o->static_value(current_widget->name());
       o->show();
-      ((Fl_Window*)(o->parent()))->label(current_widget->title());
+      ((Fl_Window*)(o->parent()->parent()->parent()))->label(current_widget->title());
     }
   } else {
     if (numselected == 1) {
@@ -257,7 +257,7 @@ void name_cb(Fl_Input* o, void *v) {
       // I don't update window title, as it probably is being closed
       // and wm2 (a window manager) barfs if you retitle and then
       // hide a window:
-      // ((Fl_Window*)(o->parent()))->label(current_widget->title());
+      // ((Fl_Window*)(o->parent()->parent()->parent()))->label(current_widget->title());
     }
   }
 }
@@ -285,14 +285,112 @@ void label_cb(Fl_Input* i, void *v) {
       oldlabel = (char*)realloc(oldlabel,oldlabellen);
     }
     strcpy(oldlabel,i->value());
-    if (current_widget->image) i->deactivate();
-    else i->activate();
   } else {
     for (Fl_Type *o = Fl_Type::first; o; o = o->next)
       if (o->selected && o->is_widget()) o->label(i->value());
   }
 }
 
+static Fl_Input *image_input;
+
+void image_cb(Fl_Input* i, void *v) {
+  if (v == LOAD) {
+    image_input = i;
+//    i->static_value(current_widget->label());
+  } else {
+//    for (Fl_Type *o = Fl_Type::first; o; o = o->next)
+//      if (o->selected && o->is_widget()) o->label(i->value());
+  }
+}
+
+void image_browse_cb(Fl_Button* b, void *v) {
+  if (v != LOAD) {
+  }
+}
+
+static Fl_Input *inactive_input;
+
+void inactive_cb(Fl_Input* i, void *v) {
+  if (v == LOAD) {
+    inactive_input = i;
+//    i->static_value(current_widget->label());
+  } else {
+//    for (Fl_Type *o = Fl_Type::first; o; o = o->next)
+//      if (o->selected && o->is_widget()) o->label(i->value());
+  }
+}
+
+void inactive_browse_cb(Fl_Button* b, void *v) {
+  if (v != LOAD) {
+  }
+}
+
+Fl_Value_Input *x_input, *y_input, *w_input, *h_input;
+
+void x_cb(Fl_Value_Input *i, void *v) {
+  if (v == LOAD) {
+    x_input = i;
+    if (current_widget->is_widget()) {
+      i->value(((Fl_Widget_Type *)current_widget)->o->x());
+      x_input->activate();
+    } else x_input->deactivate();
+  } else {
+    for (Fl_Type *o = Fl_Type::first; o; o = o->next)
+      if (o->selected && o->is_widget()) {
+        Fl_Widget *w = ((Fl_Widget_Type *)o)->o;
+	w->resize((int)i->value(), w->y(), w->w(), w->h());
+      }
+  }
+}
+
+void y_cb(Fl_Value_Input *i, void *v) {
+  if (v == LOAD) {
+    y_input = i;
+    if (current_widget->is_widget()) {
+      i->value(((Fl_Widget_Type *)current_widget)->o->y());
+      y_input->activate();
+    } else y_input->deactivate();
+  } else {
+    for (Fl_Type *o = Fl_Type::first; o; o = o->next)
+      if (o->selected && o->is_widget()) {
+        Fl_Widget *w = ((Fl_Widget_Type *)o)->o;
+	w->resize(w->x(), (int)i->value(), w->w(), w->h());
+      }
+  }
+}
+
+void w_cb(Fl_Value_Input *i, void *v) {
+  if (v == LOAD) {
+    w_input = i;
+    if (current_widget->is_widget()) {
+      i->value(((Fl_Widget_Type *)current_widget)->o->w());
+      w_input->activate();
+    } else w_input->deactivate();
+  } else {
+    for (Fl_Type *o = Fl_Type::first; o; o = o->next)
+      if (o->selected && o->is_widget()) {
+        Fl_Widget *w = ((Fl_Widget_Type *)o)->o;
+	w->resize(w->x(), w->y(), (int)i->value(), w->h());
+      }
+  }
+}
+
+void h_cb(Fl_Value_Input *i, void *v) {
+  if (v == LOAD) {
+    h_input = i;
+    if (current_widget->is_widget()) {
+      i->value(((Fl_Widget_Type *)current_widget)->o->h());
+      h_input->activate();
+    } else h_input->deactivate();
+  } else {
+    for (Fl_Type *o = Fl_Type::first; o; o = o->next)
+      if (o->selected && o->is_widget()) {
+        Fl_Widget *w = ((Fl_Widget_Type *)o)->o;
+	w->resize(w->x(), w->y(), w->w(), (int)i->value());
+      }
+  }
+}
+
 ////////////////////////////////////////////////////////////////
 
 // turn number to string or string to number for saving to file:
@@ -377,7 +475,7 @@ int boxnumber(const char *i) {
 
 void box_cb(Fl_Choice* i, void *v) {
   if (v == LOAD) {
-    if (current_widget->is_menu_item()) {i->hide(); return;} else i->show();
+    if (current_widget->is_menu_item()) {i->deactivate(); return;} else i->activate();
     int n = current_widget->o->box(); if (!n) n = ZERO_ENTRY;
     for (int j = 0; j < int(sizeof(boxmenu)/sizeof(*boxmenu)); j++)
       if (boxmenu[j].argument() == n) {i->value(j); break;}
@@ -403,9 +501,9 @@ void down_box_cb(Fl_Choice* i, void *v) {
     else if (current_widget->is_menu_button())
       n = ((Fl_Menu_*)(current_widget->o))->down_box();
     else {
-      i->hide(); return;
+      i->deactivate(); return;
     }
-    i->show();
+    i->activate();
     if (!n) n = ZERO_ENTRY;
     for (int j = 0; j < int(sizeof(boxmenu)/sizeof(*boxmenu)); j++)
       if (boxmenu[j].argument() == n) {i->value(j); break;}
@@ -448,7 +546,7 @@ static Fl_Menu_Item whensymbolmenu[] = {
 
 void when_cb(Fl_Choice* i, void *v) {
   if (v == LOAD) {
-    if (current_widget->is_menu_item()) {i->hide(); return;} else i->show();
+    if (current_widget->is_menu_item()) {i->deactivate(); return;} else i->activate();
     int n = current_widget->o->when() & (~FL_WHEN_NOT_CHANGED);
     if (!n) n = ZERO_ENTRY;
     for (int j = 0; j < int(sizeof(whenmenu)/sizeof(*whenmenu)); j++)
@@ -468,7 +566,7 @@ void when_cb(Fl_Choice* i, void *v) {
 
 void when_button_cb(Fl_Light_Button* i, void *v) {
   if (v == LOAD) {
-    if (current_widget->is_menu_item()) {i->hide(); return;} else i->show();
+    if (current_widget->is_menu_item()) {i->deactivate(); return;} else i->activate();
     i->value(current_widget->o->when()&FL_WHEN_NOT_CHANGED);
   } else {
     int n = i->value() ? FL_WHEN_NOT_CHANGED : 0;
@@ -508,9 +606,9 @@ void Fl_Widget_Type::resizable(uchar v) {
 
 void resizable_cb(Fl_Light_Button* i,void* v) {
   if (v == LOAD) {
-    if (current_widget->is_menu_item()) {i->hide(); return;}
-    if (numselected > 1) {i->hide(); return;}
-    i->show();
+    if (current_widget->is_menu_item()) {i->deactivate(); return;}
+    if (numselected > 1) {i->deactivate(); return;}
+    i->activate();
     i->value(current_widget->resizable());
   } else {
     current_widget->resizable(i->value());
@@ -519,10 +617,10 @@ void resizable_cb(Fl_Light_Button* i,void* v) {
 
 void hotspot_cb(Fl_Light_Button* i,void* v) {
   if (v == LOAD) {
-    if (numselected > 1) {i->hide(); return;}
+    if (numselected > 1) {i->deactivate(); return;}
     if (current_widget->is_menu_item()) i->label("divider");
     else i->label("hotspot");
-    i->show();
+    i->activate();
     i->value(current_widget->hotspot());
   } else {
     current_widget->hotspot(i->value());
@@ -542,8 +640,8 @@ void hotspot_cb(Fl_Light_Button* i,void* v) {
 void visible_cb(Fl_Light_Button* i, void* v) {
   if (v == LOAD) {
     i->value(current_widget->o->visible());
-    if (current_widget->is_window()) i->hide();
-    else i->show();
+    if (current_widget->is_window()) i->deactivate();
+    else i->activate();
   } else {
     int n = i->value();
     for (Fl_Type *o = Fl_Type::first; o; o = o->next)
@@ -558,8 +656,8 @@ void visible_cb(Fl_Light_Button* i, void* v) {
 void active_cb(Fl_Light_Button* i, void* v) {
   if (v == LOAD) {
     i->value(current_widget->o->active());
-    if (current_widget->is_window()) i->hide();
-    else i->show();
+    if (current_widget->is_window()) i->deactivate();
+    else i->activate();
   } else {
     int n = i->value();
     for (Fl_Type *o = Fl_Type::first; o; o = o->next)
@@ -688,7 +786,7 @@ void labeltype_cb(Fl_Choice* i, void *v) {
 void color_cb(Fl_Button* i, void *v) {
   Fl_Color c = current_widget->o->color();
   if (v == LOAD) {
-    if (current_widget->is_menu_item()) {i->hide(); return;} else i->show();
+    if (current_widget->is_menu_item()) {i->deactivate(); return;} else i->activate();
   } else {
     Fl_Color d = fl_show_colormap(c);
     if (d == c) return;
@@ -705,7 +803,7 @@ void color_cb(Fl_Button* i, void *v) {
 void color2_cb(Fl_Button* i, void *v) {
   Fl_Color c = current_widget->o->selection_color();
   if (v == LOAD) {
-    if (current_widget->is_menu_item()) {i->hide(); return;} else i->show();
+    if (current_widget->is_menu_item()) {i->deactivate(); return;} else i->activate();
   } else {
     Fl_Color d = fl_show_colormap(c);
     if (d == c) return;
@@ -761,7 +859,7 @@ static Fl_Menu_Item alignmenu[] = {
 void align_cb(Fl_Button* i, void *v) {
   int b = int(long(i->user_data()));
   if (v == LOAD) {
-    if (current_widget->is_menu_item()) {i->hide(); return;} else i->show();
+    if (current_widget->is_menu_item()) {i->deactivate(); return;} else i->activate();
     i->value(current_widget->o->align() & b);
   } else {
     for (Fl_Type *o = Fl_Type::first; o; o = o->next)
@@ -859,7 +957,7 @@ void v_input_cb(Fl_Input* i, void* v) {
 
 void subclass_cb(Fl_Input* i, void* v) {
   if (v == LOAD) {
-    if (current_widget->is_menu_item()) {i->hide(); return;} else i->show();
+    if (current_widget->is_menu_item()) {i->deactivate(); return;} else i->activate();
     i->static_value(current_widget->subclass());
   } else {
     const char *c = i->value();
@@ -881,8 +979,8 @@ int Fl_Widget_Type::textstuff(int, Fl_Font&, int&, Fl_Color&) {return 0;}
 void textfont_cb(Fl_Choice* i, void* v) {
   Fl_Font n; int s; Fl_Color c;
   if (v == LOAD) {
-    if (!current_widget->textstuff(0,n,s,c)) {i->hide(); return;}
-    i->show();
+    if (!current_widget->textstuff(0,n,s,c)) {i->deactivate(); return;}
+    i->activate();
     if (n > 15) n = FL_HELVETICA;
     i->value(n);
   } else {
@@ -899,8 +997,8 @@ void textfont_cb(Fl_Choice* i, void* v) {
 void textsize_cb(Fl_Value_Input* i, void* v) {
   Fl_Font n; int s; Fl_Color c;
   if (v == LOAD) {
-    if (!current_widget->textstuff(0,n,s,c)) {i->hide(); return;}
-    i->show();
+    if (!current_widget->textstuff(0,n,s,c)) {i->deactivate(); return;}
+    i->activate();
   } else {
     s = int(i->value());
     if (s <= 0) s = FL_NORMAL_SIZE;
@@ -917,8 +1015,8 @@ void textsize_cb(Fl_Value_Input* i, void* v) {
 void textcolor_cb(Fl_Button* i, void* v) {
   Fl_Font n; int s; Fl_Color c;
   if (v == LOAD) {
-    if (!current_widget->textstuff(0,n,s,c)) {i->hide(); return;}
-    i->show();
+    if (!current_widget->textstuff(0,n,s,c)) {i->deactivate(); return;}
+    i->activate();
   } else {
     c = i->color();
     Fl_Color d = fl_show_colormap(c);
@@ -938,8 +1036,8 @@ void textcolor_cb(Fl_Button* i, void* v) {
 
 void slider_size_cb(Fl_Value_Input* i, void* v) {
   if (v == LOAD) {
-    if (current_widget->is_valuator()!=2) {i->hide(); return;}
-    i->show();
+    if (current_widget->is_valuator()!=2) {i->deactivate(); return;}
+    i->activate();
     i->value(((Fl_Slider*)(current_widget->o))->slider_size());
   } else {
     double n = i->value();
@@ -956,8 +1054,8 @@ void slider_size_cb(Fl_Value_Input* i, void* v) {
 
 void min_cb(Fl_Value_Input* i, void* v) {
   if (v == LOAD) {
-    if (!current_widget->is_valuator()) {i->hide(); return;}
-    i->show();
+    if (!current_widget->is_valuator()) {i->deactivate(); return;}
+    i->activate();
     i->value(((Fl_Valuator*)(current_widget->o))->minimum());
   } else {
     double n = i->value();
@@ -974,8 +1072,8 @@ void min_cb(Fl_Value_Input* i, void* v) {
 
 void max_cb(Fl_Value_Input* i, void* v) {
   if (v == LOAD) {
-    if (!current_widget->is_valuator()) {i->hide(); return;}
-    i->show();
+    if (!current_widget->is_valuator()) {i->deactivate(); return;}
+    i->activate();
     i->value(((Fl_Valuator*)(current_widget->o))->maximum());
   } else {
     double n = i->value();
@@ -992,8 +1090,8 @@ void max_cb(Fl_Value_Input* i, void* v) {
 
 void step_cb(Fl_Value_Input* i, void* v) {
   if (v == LOAD) {
-    if (!current_widget->is_valuator()) {i->hide(); return;}
-    i->show();
+    if (!current_widget->is_valuator()) {i->deactivate(); return;}
+    i->activate();
     i->value(((Fl_Valuator*)(current_widget->o))->step());
   } else {
     double n = i->value();
@@ -1011,13 +1109,13 @@ void step_cb(Fl_Value_Input* i, void* v) {
 void value_cb(Fl_Value_Input* i, void* v) {
   if (v == LOAD) {
     if (current_widget->is_valuator()) {
-      i->show();
+      i->activate();
       i->value(((Fl_Valuator*)(current_widget->o))->value());
     } else if (current_widget->is_button()) {
-      i->show();
+      i->activate();
       i->value(((Fl_Button*)(current_widget->o))->value());
     } else 
-      i->hide();
+      i->deactivate();
   } else {
     double n = i->value();
     for (Fl_Type *o = Fl_Type::first; o; o = o->next)
@@ -1042,7 +1140,7 @@ Fl_Menu_Item *Fl_Widget_Type::subtypes() {return 0;}
 void subtype_cb(Fl_Choice* i, void* v) {
   if (v == LOAD) {
     Fl_Menu_Item* m = current_widget->subtypes();
-    if (!m) {i->hide(); return;}
+    if (!m) {i->deactivate(); return;}
     i->menu(m);
     int j;
     for (j = 0;; j++) {
@@ -1050,7 +1148,7 @@ void subtype_cb(Fl_Choice* i, void* v) {
       if (m[j].argument() == current_widget->o->type()) break;
     }
     i->value(j);
-    i->show();
+    i->activate();
     i->redraw();
   } else {
     int n = int(i->mvalue()->argument());
@@ -1770,5 +1868,5 @@ int Fl_Widget_Type::read_fdesign(const char* name, const char* value) {
 }
 
 //
-// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.1 2001/08/04 16:56:02 easysw Exp $".
+// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.2 2001/09/29 03:36:27 easysw Exp $".
 //
diff --git a/fluid/widget_panel.cxx b/fluid/widget_panel.cxx
index 8a9612a3d..b0d825284 100644
--- a/fluid/widget_panel.cxx
+++ b/fluid/widget_panel.cxx
@@ -1,325 +1,374 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.0008
+// generated by Fast Light User Interface Designer (fluid) version 1.0100
 
 #include "widget_panel.h"
 
+static void cb_(Fl_Tabs* o, void* v) {
+  propagate_load((Fl_Group *)o,v);
+}
+
 Fl_Input *v_input[4]={(Fl_Input *)0};
 
 Fl_Window* make_widget_panel() {
   Fl_Window* w;
-  { Fl_Window* o = new Fl_Window(370, 485);
+  { Fl_Window* o = new Fl_Window(415, 370);
     w = o;
     w->hotspot(o);
-    { Fl_Input* o = new Fl_Input(90, 10, 210, 20, "Name:");
-      o->box(FL_THIN_UP_BOX);
-      o->callback((Fl_Callback*)name_cb);
+    { Fl_Tabs* o = new Fl_Tabs(10, 10, 395, 315);
+      o->callback((Fl_Callback*)cb_);
       o->when(FL_WHEN_NEVER);
-    }
-    { Fl_Light_Button* o = new Fl_Light_Button(300, 10, 60, 20, "public");
-      o->box(FL_THIN_UP_BOX);
-      o->selection_color(1);
-      o->labelsize(10);
-      o->callback((Fl_Callback*)name_public_cb);
-      o->when(FL_WHEN_CHANGED);
-    }
-    { Fl_Input* o = new Fl_Input(90, 35, 170, 20, "Class:");
-      o->box(FL_THIN_UP_BOX);
-      o->textfont(4);
-      o->callback((Fl_Callback*)subclass_cb, (void*)(4));
-      o->when(FL_WHEN_NEVER);
-    }
-    { Fl_Choice* o = new Fl_Choice(260, 35, 100, 20);
-      o->box(FL_THIN_UP_BOX);
-      o->callback((Fl_Callback*)subtype_cb);
-    }
-    { Fl_Input* o = new Fl_Input(90, 60, 270, 20, "Label:");
-      o->box(FL_THIN_UP_BOX);
-      o->callback((Fl_Callback*)label_cb);
-      o->when(FL_WHEN_CHANGED);
-    }
-    { Fl_Choice* o = new Fl_Choice(90, 80, 150, 20, "Label Type:");
-      o->box(FL_THIN_UP_BOX);
-      o->callback((Fl_Callback*)labeltype_cb);
-      o->menu(labeltypemenu);
-    }
-    { Fl_Button* o = new Fl_Button(240, 80, 20, 20, "@-1<-");
-      o->type(1);
-      o->box(FL_THIN_UP_BOX);
-      o->labeltype(FL_SYMBOL_LABEL);
-      o->labelcolor(8);
-      o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_LEFT));
-    }
-    { Fl_Button* o = new Fl_Button(260, 80, 20, 20, "@-1->");
-      o->type(1);
-      o->box(FL_THIN_UP_BOX);
-      o->labeltype(FL_SYMBOL_LABEL);
-      o->labelcolor(8);
-      o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_RIGHT));
-    }
-    { Fl_Button* o = new Fl_Button(280, 80, 20, 20, "@-18");
-      o->type(1);
-      o->box(FL_THIN_UP_BOX);
-      o->labeltype(FL_SYMBOL_LABEL);
-      o->labelcolor(8);
-      o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_TOP));
-    }
-    { Fl_Button* o = new Fl_Button(300, 80, 20, 20, "@-12");
-      o->type(1);
-      o->box(FL_THIN_UP_BOX);
-      o->labeltype(FL_SYMBOL_LABEL);
-      o->labelcolor(8);
-      o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_BOTTOM));
-    }
-    { Fl_Button* o = new Fl_Button(320, 80, 20, 20, "@-3square");
-      o->type(1);
-      o->box(FL_THIN_UP_BOX);
-      o->labeltype(FL_SYMBOL_LABEL);
-      o->labelcolor(8);
-      o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_INSIDE));
-    }
-    { Fl_Button* o = new Fl_Button(340, 80, 20, 10, "wrap");
-      o->type(1);
-      o->box(FL_THIN_UP_BOX);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_WRAP));
-    }
-    { Fl_Button* o = new Fl_Button(340, 90, 20, 10, "clip");
-      o->type(1);
-      o->box(FL_THIN_UP_BOX);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_CLIP));
-    }
-    { Fl_Choice* o = new Fl_Choice(90, 100, 170, 20, "Label Font:");
-      o->box(FL_THIN_UP_BOX);
-      o->callback((Fl_Callback*)labelfont_cb);
-      o->menu(fontmenu);
-    }
-    { Fl_Value_Input* o = new Fl_Value_Input(260, 100, 50, 20);
-      o->box(FL_THIN_UP_BOX);
-      o->maximum(100);
-      o->step(1);
-      o->value(14);
-      o->callback((Fl_Callback*)labelsize_cb);
-    }
-    { Fl_Button* o = new Fl_Button(310, 100, 50, 20, "Label Color");
-      o->box(FL_THIN_UP_BOX);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)labelcolor_cb);
-    }
-    { Fl_Choice* o = new Fl_Choice(90, 125, 220, 20, "Box:");
-      o->box(FL_THIN_UP_BOX);
-      o->callback((Fl_Callback*)box_cb);
-      o->menu(boxmenu);
-    }
-    { Fl_Button* o = new Fl_Button(310, 125, 50, 20, "Color");
-      o->box(FL_THIN_UP_BOX);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)color_cb);
-    }
-    { Fl_Choice* o = new Fl_Choice(90, 145, 220, 20, "Down Box:");
-      o->box(FL_THIN_UP_BOX);
-      o->callback((Fl_Callback*)down_box_cb);
-      o->menu(boxmenu);
-    }
-    { Fl_Button* o = new Fl_Button(310, 145, 50, 20, "Select Color");
-      o->box(FL_THIN_UP_BOX);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)color2_cb);
-    }
-    { Fl_Choice* o = new Fl_Choice(90, 170, 170, 20, "Text Font:");
-      o->box(FL_THIN_UP_BOX);
-      o->callback((Fl_Callback*)textfont_cb);
-      o->hide();
-      o->menu(fontmenu);
-    }
-    { Fl_Input* o = new Fl_Input(90, 170, 170, 20, "xclass:");
-      o->box(FL_THIN_UP_BOX);
-      o->callback((Fl_Callback*)xclass_cb);
-      o->when(FL_WHEN_NEVER);
-    }
-    { Shortcut_Button* o = new Shortcut_Button(90, 170, 270, 20, "Shortcut:");
-      o->box(FL_THIN_UP_BOX);
-      o->color(7);
-      o->selection_color(7);
-      o->callback((Fl_Callback*)shortcut_in_cb);
-      o->align(FL_ALIGN_LEFT);
-    }
-    { Fl_Value_Input* o = new Fl_Value_Input(260, 170, 50, 20);
-      o->box(FL_THIN_UP_BOX);
-      o->maximum(100);
-      o->step(1);
-      o->value(14);
-      o->callback((Fl_Callback*)textsize_cb);
-      o->hide();
-    }
-    { Fl_Button* o = new Fl_Button(310, 170, 50, 20, "Text Color");
-      o->box(FL_THIN_UP_BOX);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)textcolor_cb);
-      o->hide();
-    }
-    { Fl_Value_Input* o = new Fl_Value_Input(40, 205, 60, 20, "Size:");
-      o->box(FL_THIN_UP_BOX);
-      o->labelsize(10);
-      o->step(0.010101);
-      o->callback((Fl_Callback*)slider_size_cb);
-      o->align(FL_ALIGN_TOP_LEFT);
-    }
-    { Fl_Value_Input* o = new Fl_Value_Input(105, 205, 60, 20, "Minimum:");
-      o->box(FL_THIN_UP_BOX);
-      o->labelsize(10);
-      o->callback((Fl_Callback*)min_cb);
-      o->align(FL_ALIGN_TOP_LEFT);
-    }
-    { Fl_Value_Input* o = new Fl_Value_Input(170, 205, 60, 20, "Maximum:");
-      o->box(FL_THIN_UP_BOX);
-      o->labelsize(10);
-      o->value(1);
-      o->callback((Fl_Callback*)max_cb);
-      o->align(FL_ALIGN_TOP_LEFT);
-    }
-    { Fl_Value_Input* o = new Fl_Value_Input(235, 205, 60, 20, "Step:");
-      o->box(FL_THIN_UP_BOX);
-      o->labelsize(10);
-      o->callback((Fl_Callback*)step_cb);
-      o->align(FL_ALIGN_TOP_LEFT);
-    }
-    { Fl_Value_Input* o = new Fl_Value_Input(300, 205, 60, 20, "Value:");
-      o->box(FL_THIN_UP_BOX);
-      o->labelsize(10);
-      o->callback((Fl_Callback*)value_cb);
-      o->align(FL_ALIGN_TOP_LEFT);
-    }
-    { Fl_Group* o = new Fl_Group(20, 230, 340, 20);
-      o->callback((Fl_Callback*)propagate_load);
-      o->align(FL_ALIGN_TOP_LEFT);
-      { Fl_Light_Button* o = new Fl_Light_Button(30, 230, 70, 20, "non_modal");
-        o->box(FL_THIN_UP_BOX);
-        o->selection_color(1);
-        o->labelsize(9);
-        o->callback((Fl_Callback*)non_modal_cb);
-        o->align(132|FL_ALIGN_INSIDE);
+      { Fl_Group* o = new Fl_Group(10, 30, 395, 295, "GUI");
+        o->callback((Fl_Callback*)propagate_load);
+        o->when(FL_WHEN_NEVER);
+        { Fl_Input* o = new Fl_Input(95, 40, 195, 20, "Label:");
+          o->callback((Fl_Callback*)label_cb);
+          o->when(FL_WHEN_CHANGED);
+        }
+        { Fl_Choice* o = new Fl_Choice(290, 40, 105, 20);
+          o->box(FL_THIN_UP_BOX);
+          o->down_box(FL_BORDER_BOX);
+          o->callback((Fl_Callback*)labeltype_cb);
+          o->menu(labeltypemenu);
+        }
+        { Fl_Input* o = new Fl_Input(95, 65, 195, 20, "Image:");
+          o->callback((Fl_Callback*)image_cb);
+          o->when(FL_WHEN_CHANGED);
+        }
+        { Fl_Button* o = new Fl_Button(290, 65, 105, 20, "Browse...");
+          o->callback((Fl_Callback*)image_browse_cb);
+        }
+        { Fl_Input* o = new Fl_Input(95, 90, 195, 20, "Inactive:");
+          o->callback((Fl_Callback*)inactive_cb);
+          o->when(FL_WHEN_CHANGED);
+        }
+        { Fl_Button* o = new Fl_Button(290, 90, 105, 20, "Browse...");
+          o->callback((Fl_Callback*)inactive_browse_cb);
+        }
+        { Fl_Value_Input* o = new Fl_Value_Input(95, 150, 60, 20, "X:");
+          o->labelsize(10);
+          o->maximum(2048);
+          o->step(1);
+          o->callback((Fl_Callback*)x_cb);
+          o->align(FL_ALIGN_TOP_LEFT);
+        }
+        { Fl_Value_Input* o = new Fl_Value_Input(155, 150, 60, 20, "Y:");
+          o->labelsize(10);
+          o->maximum(2048);
+          o->step(1);
+          o->callback((Fl_Callback*)y_cb);
+          o->align(FL_ALIGN_TOP_LEFT);
+        }
+        { Fl_Value_Input* o = new Fl_Value_Input(215, 150, 60, 20, "Width:");
+          o->labelsize(10);
+          o->maximum(2048);
+          o->step(1);
+          o->callback((Fl_Callback*)w_cb);
+          o->align(FL_ALIGN_TOP_LEFT);
+        }
+        { Fl_Value_Input* o = new Fl_Value_Input(275, 150, 60, 20, "Height:");
+          o->labelsize(10);
+          o->maximum(2048);
+          o->step(1);
+          o->callback((Fl_Callback*)h_cb);
+          o->align(FL_ALIGN_TOP_LEFT);
+        }
+        { Fl_Group* o = new Fl_Group(95, 115, 300, 20, "Alignment:");
+          o->callback((Fl_Callback*)propagate_load);
+          o->align(FL_ALIGN_LEFT);
+          { Fl_Button* o = new Fl_Button(95, 115, 40, 20, "clip");
+            o->type(1);
+            o->labelsize(8);
+            o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_CLIP));
+          }
+          { Fl_Button* o = new Fl_Button(135, 115, 40, 20, "wrap");
+            o->type(1);
+            o->labelsize(8);
+            o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_WRAP));
+          }
+          { Fl_Button* o = new Fl_Button(175, 115, 55, 20, "text\nimage");
+            o->type(1);
+            o->labelsize(8);
+            o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_WRAP));
+          }
+          { Fl_Button* o = new Fl_Button(295, 115, 20, 20, "@-1<-");
+            o->type(1);
+            o->labelcolor(8);
+            o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_LEFT));
+          }
+          { Fl_Button* o = new Fl_Button(315, 115, 20, 20, "@-1->");
+            o->type(1);
+            o->labelcolor(8);
+            o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_RIGHT));
+          }
+          { Fl_Button* o = new Fl_Button(335, 115, 20, 20, "@-18");
+            o->type(1);
+            o->labelcolor(8);
+            o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_TOP));
+          }
+          { Fl_Button* o = new Fl_Button(355, 115, 20, 20, "@-12");
+            o->type(1);
+            o->labelcolor(8);
+            o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_BOTTOM));
+          }
+          { Fl_Button* o = new Fl_Button(375, 115, 20, 20, "@-3square");
+            o->type(1);
+            o->labelcolor(8);
+            o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_INSIDE));
+          }
+          o->end();
+        }
+        { Fl_Box* o = new Fl_Box(20, 150, 75, 20, "Position:");
+          o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
+        }
+        { Fl_Box* o = new Fl_Box(20, 185, 75, 20, "Values:");
+          o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
+        }
+        { Fl_Value_Input* o = new Fl_Value_Input(95, 185, 60, 20, "Size:");
+          o->labelsize(10);
+          o->step(0.010101);
+          o->callback((Fl_Callback*)slider_size_cb);
+          o->align(FL_ALIGN_TOP_LEFT);
+        }
+        { Fl_Value_Input* o = new Fl_Value_Input(155, 185, 60, 20, "Minimum:");
+          o->labelsize(10);
+          o->callback((Fl_Callback*)min_cb);
+          o->align(FL_ALIGN_TOP_LEFT);
+        }
+        { Fl_Value_Input* o = new Fl_Value_Input(215, 185, 60, 20, "Maximum:");
+          o->labelsize(10);
+          o->value(1);
+          o->callback((Fl_Callback*)max_cb);
+          o->align(FL_ALIGN_TOP_LEFT);
+        }
+        { Fl_Value_Input* o = new Fl_Value_Input(275, 185, 60, 20, "Step:");
+          o->labelsize(10);
+          o->callback((Fl_Callback*)step_cb);
+          o->align(FL_ALIGN_TOP_LEFT);
+        }
+        { Fl_Value_Input* o = new Fl_Value_Input(335, 185, 60, 20, "Value:");
+          o->labelsize(10);
+          o->callback((Fl_Callback*)value_cb);
+          o->align(FL_ALIGN_TOP_LEFT);
+        }
+        { Shortcut_Button* o = new Shortcut_Button(95, 210, 300, 20, "Shortcut:");
+          o->box(FL_DOWN_BOX);
+          o->color(7);
+          o->selection_color(7);
+          o->callback((Fl_Callback*)shortcut_in_cb);
+          o->align(FL_ALIGN_LEFT);
+        }
+        { Fl_Group* o = new Fl_Group(20, 235, 375, 45);
+          o->callback((Fl_Callback*)propagate_load);
+          o->align(FL_ALIGN_LEFT);
+          { Fl_Light_Button* o = new Fl_Light_Button(210, 235, 60, 20, "Border");
+            o->selection_color(1);
+            o->labelsize(10);
+            o->callback((Fl_Callback*)border_cb);
+          }
+          { Fl_Light_Button* o = new Fl_Light_Button(270, 235, 55, 20, "Modal");
+            o->selection_color(1);
+            o->labelsize(10);
+            o->callback((Fl_Callback*)modal_cb);
+          }
+          { Fl_Light_Button* o = new Fl_Light_Button(325, 235, 70, 20, "Nonmodal");
+            o->selection_color(1);
+            o->labelsize(9);
+            o->callback((Fl_Callback*)non_modal_cb);
+            o->align(132|FL_ALIGN_INSIDE);
+          }
+          { Fl_Box* o = new Fl_Box(20, 260, 75, 20, "Attributes:");
+            o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
+          }
+          { Fl_Light_Button* o = new Fl_Light_Button(95, 260, 70, 20, "Visible");
+            o->selection_color(1);
+            o->labelsize(10);
+            o->callback((Fl_Callback*)visible_cb);
+          }
+          { Fl_Light_Button* o = new Fl_Light_Button(165, 260, 70, 20, "Active");
+            o->selection_color(1);
+            o->labelsize(10);
+            o->callback((Fl_Callback*)active_cb);
+          }
+          { Fl_Light_Button* o = new Fl_Light_Button(235, 260, 70, 20, "Resizable");
+            o->selection_color(1);
+            o->labelsize(10);
+            o->callback((Fl_Callback*)resizable_cb);
+            o->when(FL_WHEN_CHANGED);
+          }
+          { Fl_Light_Button* o = new Fl_Light_Button(305, 260, 70, 20, "Hotspot");
+            o->selection_color(1);
+            o->labelsize(10);
+            o->callback((Fl_Callback*)hotspot_cb);
+            o->when(FL_WHEN_CHANGED);
+          }
+          o->end();
+        }
+        { Fl_Input* o = new Fl_Input(95, 235, 115, 20, "X Class:");
+          o->callback((Fl_Callback*)xclass_cb);
+          o->when(FL_WHEN_NEVER);
+        }
+        new Fl_Input(95, 285, 300, 20, "Tooltip:");
+        o->end();
       }
-      { Fl_Light_Button* o = new Fl_Light_Button(105, 230, 60, 20, "visible");
-        o->box(FL_THIN_UP_BOX);
-        o->selection_color(1);
-        o->labelsize(10);
-        o->callback((Fl_Callback*)visible_cb);
+      { Fl_Group* o = new Fl_Group(10, 30, 395, 295, "Style");
+        o->callback((Fl_Callback*)propagate_load);
+        o->when(FL_WHEN_NEVER);
+        o->hide();
+        { Fl_Choice* o = new Fl_Choice(100, 40, 155, 20, "Label Font:");
+          o->box(FL_THIN_UP_BOX);
+          o->down_box(FL_BORDER_BOX);
+          o->callback((Fl_Callback*)labelfont_cb);
+          o->menu(fontmenu);
+        }
+        { Fl_Value_Input* o = new Fl_Value_Input(255, 40, 50, 20);
+          o->maximum(100);
+          o->step(1);
+          o->value(14);
+          o->callback((Fl_Callback*)labelsize_cb);
+        }
+        { Fl_Button* o = new Fl_Button(305, 40, 90, 20, "Label Color");
+          o->labelsize(8);
+          o->callback((Fl_Callback*)labelcolor_cb);
+        }
+        { Fl_Choice* o = new Fl_Choice(100, 65, 205, 20, "Box:");
+          o->box(FL_THIN_UP_BOX);
+          o->down_box(FL_BORDER_BOX);
+          o->callback((Fl_Callback*)box_cb);
+          o->menu(boxmenu);
+        }
+        { Fl_Button* o = new Fl_Button(305, 65, 90, 20, "Color");
+          o->labelsize(8);
+          o->callback((Fl_Callback*)color_cb);
+        }
+        { Fl_Choice* o = new Fl_Choice(100, 90, 205, 20, "Down Box:");
+          o->box(FL_THIN_UP_BOX);
+          o->down_box(FL_BORDER_BOX);
+          o->callback((Fl_Callback*)down_box_cb);
+          o->menu(boxmenu);
+        }
+        { Fl_Button* o = new Fl_Button(305, 90, 90, 20, "Select Color");
+          o->labelsize(8);
+          o->callback((Fl_Callback*)color2_cb);
+        }
+        { Fl_Choice* o = new Fl_Choice(100, 115, 155, 20, "Text Font:");
+          o->box(FL_DOWN_BOX);
+          o->down_box(FL_BORDER_BOX);
+          o->callback((Fl_Callback*)textfont_cb);
+          o->menu(fontmenu);
+        }
+        { Fl_Value_Input* o = new Fl_Value_Input(255, 115, 50, 20);
+          o->maximum(100);
+          o->step(1);
+          o->value(14);
+          o->callback((Fl_Callback*)textsize_cb);
+        }
+        { Fl_Button* o = new Fl_Button(305, 115, 90, 20, "Text Color");
+          o->labelsize(8);
+          o->callback((Fl_Callback*)textcolor_cb);
+        }
+        o->end();
       }
-      { Fl_Light_Button* o = new Fl_Light_Button(105, 230, 60, 20, "modal");
-        o->box(FL_THIN_UP_BOX);
-        o->selection_color(1);
-        o->labelsize(10);
-        o->callback((Fl_Callback*)modal_cb);
-      }
-      { Fl_Light_Button* o = new Fl_Light_Button(170, 230, 60, 20, "active");
-        o->box(FL_THIN_UP_BOX);
-        o->selection_color(1);
-        o->labelsize(10);
-        o->callback((Fl_Callback*)active_cb);
-      }
-      { Fl_Light_Button* o = new Fl_Light_Button(170, 230, 60, 20, "border");
-        o->box(FL_THIN_UP_BOX);
-        o->selection_color(1);
-        o->labelsize(10);
-        o->callback((Fl_Callback*)border_cb);
-      }
-      { Fl_Light_Button* o = new Fl_Light_Button(235, 230, 60, 20, "resizable");
-        o->box(FL_THIN_UP_BOX);
-        o->selection_color(1);
-        o->labelsize(10);
-        o->callback((Fl_Callback*)resizable_cb);
-        o->when(FL_WHEN_CHANGED);
-      }
-      { Fl_Light_Button* o = new Fl_Light_Button(300, 230, 60, 20, "hotspot");
-        o->box(FL_THIN_UP_BOX);
-        o->selection_color(1);
-        o->labelsize(10);
-        o->callback((Fl_Callback*)hotspot_cb);
-        o->when(FL_WHEN_CHANGED);
+      { Fl_Group* o = new Fl_Group(10, 30, 395, 295, "C++");
+        o->callback((Fl_Callback*)propagate_load);
+        o->when(FL_WHEN_NEVER);
+        o->hide();
+        { Fl_Input* o = new Fl_Input(100, 65, 230, 20, "Name:");
+          o->callback((Fl_Callback*)name_cb);
+          o->when(FL_WHEN_NEVER);
+        }
+        { Fl_Light_Button* o = new Fl_Light_Button(330, 65, 65, 20, "public");
+          o->selection_color(1);
+          o->labelsize(10);
+          o->callback((Fl_Callback*)name_public_cb);
+          o->when(FL_WHEN_CHANGED);
+        }
+        { Fl_Input* o = new Fl_Input(100, 40, 160, 20, "Class:");
+          o->textfont(4);
+          o->callback((Fl_Callback*)subclass_cb, (void*)(4));
+          o->when(FL_WHEN_NEVER);
+        }
+        { Fl_Choice* o = new Fl_Choice(260, 40, 135, 20);
+          o->box(FL_THIN_UP_BOX);
+          o->down_box(FL_BORDER_BOX);
+          o->callback((Fl_Callback*)subtype_cb);
+        }
+        { Fl_Input* o = v_input[0] = new Fl_Input(100, 90, 295, 20, "Extra Code:");
+          o->textfont(4);
+          o->callback((Fl_Callback*)v_input_cb, (void*)(0));
+          o->when(FL_WHEN_NEVER);
+        }
+        { Fl_Input* o = v_input[1] = new Fl_Input(100, 110, 295, 20);
+          o->textfont(4);
+          o->callback((Fl_Callback*)v_input_cb, (void*)(1));
+          o->when(FL_WHEN_NEVER);
+        }
+        { Fl_Input* o = v_input[2] = new Fl_Input(100, 130, 295, 20);
+          o->textfont(4);
+          o->callback((Fl_Callback*)v_input_cb, (void*)(2));
+          o->when(FL_WHEN_NEVER);
+        }
+        { Fl_Input* o = v_input[3] = new Fl_Input(100, 150, 295, 20);
+          o->textfont(4);
+          o->callback((Fl_Callback*)v_input_cb, (void*)(3));
+          o->when(FL_WHEN_NEVER);
+        }
+        { Fl_Box* o = new Fl_Box(20, 175, 75, 20, "Callback:");
+          o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
+        }
+        { Fl_Input* o = new Fl_Input(100, 175, 295, 90);
+          o->type(4);
+          o->textfont(4);
+          o->callback((Fl_Callback*)callback_cb);
+          o->when(FL_WHEN_NEVER);
+        }
+        { Fl_Box* o = new Fl_Box(95, 325, 100, 0, "label");
+          o->hide();
+          o->deactivate();
+        }
+        { Fl_Input* o = new Fl_Input(100, 270, 140, 20, "User Data:");
+          o->textfont(4);
+          o->callback((Fl_Callback*)user_data_cb);
+          o->when(FL_WHEN_NEVER);
+        }
+        { Fl_Input* o = new Fl_Input(100, 295, 140, 20, "Type:");
+          o->textfont(4);
+          o->callback((Fl_Callback*)user_data_type_cb);
+          o->when(FL_WHEN_NEVER);
+        }
+        { Fl_Choice* o = new Fl_Choice(290, 270, 105, 20, "When:");
+          o->box(FL_THIN_UP_BOX);
+          o->down_box(FL_BORDER_BOX);
+          o->callback((Fl_Callback*)when_cb);
+          o->when(FL_WHEN_NEVER);
+          o->menu(whenmenu);
+        }
+        { Fl_Light_Button* o = new Fl_Light_Button(290, 295, 105, 20, "No Change");
+          o->selection_color(1);
+          o->labelsize(10);
+          o->callback((Fl_Callback*)when_button_cb);
+          o->when(FL_WHEN_NEVER);
+        }
+        o->end();
       }
       o->end();
     }
-    { Fl_Input* o = v_input[0] = new Fl_Input(90, 260, 270, 20, "Extra Code:");
-      o->box(FL_THIN_UP_BOX);
-      o->textfont(4);
-      o->callback((Fl_Callback*)v_input_cb, (void*)(0));
-      o->when(FL_WHEN_NEVER);
-    }
-    { Fl_Input* o = v_input[1] = new Fl_Input(90, 280, 270, 20);
-      o->box(FL_THIN_UP_BOX);
-      o->textfont(4);
-      o->callback((Fl_Callback*)v_input_cb, (void*)(1));
-      o->when(FL_WHEN_NEVER);
-    }
-    { Fl_Input* o = v_input[2] = new Fl_Input(90, 300, 270, 20);
-      o->box(FL_THIN_UP_BOX);
-      o->textfont(4);
-      o->callback((Fl_Callback*)v_input_cb, (void*)(2));
-      o->when(FL_WHEN_NEVER);
-    }
-    { Fl_Input* o = v_input[3] = new Fl_Input(90, 320, 270, 20);
-      o->box(FL_THIN_UP_BOX);
-      o->textfont(4);
-      o->callback((Fl_Callback*)v_input_cb, (void*)(3));
-      o->when(FL_WHEN_NEVER);
-    }
-    { Fl_Box* o = new Fl_Box(0, 350, 90, 20, "Callback:");
-      o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
-    }
-    { Fl_Input* o = new Fl_Input(90, 350, 270, 50);
-      o->type(4);
-      o->box(FL_THIN_UP_BOX);
-      o->textfont(4);
-      o->callback((Fl_Callback*)callback_cb);
-      o->when(FL_WHEN_NEVER);
-    }
-    { Fl_Box* o = new Fl_Box(90, 370, 100, 30, "label");
-      o->hide();
-      o->deactivate();
-      Fl_Group::current()->resizable(o);
-    }
-    { Fl_Input* o = new Fl_Input(90, 400, 170, 20, "user_data:");
-      o->box(FL_THIN_UP_BOX);
-      o->textfont(4);
-      o->callback((Fl_Callback*)user_data_cb);
-      o->when(FL_WHEN_NEVER);
-    }
-    { Fl_Input* o = new Fl_Input(300, 400, 60, 20, "Type:");
-      o->box(FL_THIN_UP_BOX);
-      o->textfont(4);
-      o->callback((Fl_Callback*)user_data_type_cb);
-      o->when(FL_WHEN_NEVER);
-    }
-    { Fl_Choice* o = new Fl_Choice(90, 420, 100, 20, "When:");
-      o->box(FL_THIN_UP_BOX);
-      o->callback((Fl_Callback*)when_cb);
-      o->when(FL_WHEN_NEVER);
-      o->menu(whenmenu);
-    }
-    { Fl_Light_Button* o = new Fl_Light_Button(190, 420, 70, 20, "no change");
-      o->box(FL_THIN_UP_BOX);
-      o->selection_color(1);
-      o->labelsize(10);
-      o->callback((Fl_Callback*)when_button_cb);
-      o->when(FL_WHEN_NEVER);
-    }
-    { Fl_Group* o = new Fl_Group(10, 450, 350, 25);
-      { Fl_Button* o = new Fl_Button(25, 450, 80, 25, "no &overlay");
+    { Fl_Group* o = new Fl_Group(10, 335, 395, 25);
+      { Fl_Button* o = new Fl_Button(50, 335, 100, 25, "No &Overlay");
         o->labelcolor(1);
         o->callback((Fl_Callback*)overlay_cb);
       }
-      { Fl_Button* o = new Fl_Button(110, 450, 80, 25, "Revert");
+      { Fl_Button* o = new Fl_Button(155, 335, 80, 25, "Revert");
         o->callback((Fl_Callback*)revert_cb);
       }
-      { Fl_Button* o = new Fl_Button(280, 450, 80, 25, "Cancel");
+      { Fl_Button* o = new Fl_Button(325, 335, 80, 25, "Cancel");
         o->callback((Fl_Callback*)cancel_cb);
       }
-      { Fl_Return_Button* o = new Fl_Return_Button(195, 450, 80, 25, "OK");
+      { Fl_Return_Button* o = new Fl_Return_Button(240, 335, 80, 25, "OK");
         o->callback((Fl_Callback*)ok_cb);
       }
       o->end();
     }
     o->end();
+    o->resizable(o);
   }
   return w;
 }
diff --git a/fluid/widget_panel.fl b/fluid/widget_panel.fl
index a72c6addc..6981609b3 100644
--- a/fluid/widget_panel.fl
+++ b/fluid/widget_panel.fl
@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0008 
+version 1.0100 
 header_name {.h} 
 code_name {.cxx} 
 gridx 5 
@@ -8,292 +8,383 @@ snap 3
 Function {make_widget_panel()} {open
 } {
   Fl_Window {} {open
-    xywh {728 171 370 485} resizable hotspot visible
+    xywh {46 61 415 370} resizable hotspot visible
   } {
-    Fl_Input {} {
-      label {Name:}
-      callback name_cb
-      xywh {90 10 210 20} box THIN_UP_BOX when 0
-    }
-    Fl_Light_Button {} {
-      label public
-      callback name_public_cb
-      xywh {300 10 60 20} box THIN_UP_BOX selection_color 1 labelsize 10 when 1
-    }
-    Fl_Input {} {
-      label {Class:}
-      user_data 4
-      callback subclass_cb
-      xywh {90 35 170 20} box THIN_UP_BOX when 0 textfont 4
-    }
-    Fl_Choice {} {
-      callback subtype_cb
-      xywh {260 35 100 20} box THIN_UP_BOX
-    } {}
-    Fl_Input {} {
-      label {Label:}
-      callback label_cb
-      xywh {90 60 270 20} box THIN_UP_BOX when 1
-    }
-    Fl_Choice {} {
-      label {Label Type:}
-      callback labeltype_cb
-      xywh {90 80 150 20} box THIN_UP_BOX
-      code0 {extern Fl_Menu_Item labeltypemenu[];}
-      code1 {o->menu(labeltypemenu);}
-    } {}
-    Fl_Button {} {
-      label {@-1<-}
-      user_data FL_ALIGN_LEFT
-      callback align_cb
-      xywh {240 80 20 20} type Toggle box THIN_UP_BOX labeltype SYMBOL_LABEL labelcolor 8
-    }
-    Fl_Button {} {
-      label {@-1->}
-      user_data FL_ALIGN_RIGHT
-      callback align_cb
-      xywh {260 80 20 20} type Toggle box THIN_UP_BOX labeltype SYMBOL_LABEL labelcolor 8
-    }
-    Fl_Button {} {
-      label {@-18}
-      user_data FL_ALIGN_TOP
-      callback align_cb
-      xywh {280 80 20 20} type Toggle box THIN_UP_BOX labeltype SYMBOL_LABEL labelcolor 8
-    }
-    Fl_Button {} {
-      label {@-12}
-      user_data FL_ALIGN_BOTTOM
-      callback align_cb
-      xywh {300 80 20 20} type Toggle box THIN_UP_BOX labeltype SYMBOL_LABEL labelcolor 8
-    }
-    Fl_Button {} {
-      label {@-3square}
-      user_data FL_ALIGN_INSIDE
-      callback align_cb
-      xywh {320 80 20 20} type Toggle box THIN_UP_BOX labeltype SYMBOL_LABEL labelcolor 8
-    }
-    Fl_Button {} {
-      label wrap
-      user_data FL_ALIGN_WRAP
-      callback align_cb
-      xywh {340 80 20 10} type Toggle box THIN_UP_BOX labelsize 8
-    }
-    Fl_Button {} {
-      label clip
-      user_data FL_ALIGN_CLIP
-      callback align_cb
-      xywh {340 90 20 10} type Toggle box THIN_UP_BOX labelsize 8
-    }
-    Fl_Choice {} {
-      label {Label Font:}
-      callback labelfont_cb
-      xywh {90 100 170 20} box THIN_UP_BOX
-      code0 {extern Fl_Menu_Item fontmenu[];}
-      code1 {o->menu(fontmenu);}
-    } {}
-    Fl_Value_Input {} {
-      callback labelsize_cb
-      xywh {260 100 50 20} box THIN_UP_BOX maximum 100 step 1 value 14
-    }
-    Fl_Button {} {
-      label {Label Color}
-      callback labelcolor_cb
-      xywh {310 100 50 20} box THIN_UP_BOX labelsize 8
-    }
-    Fl_Choice {} {
-      label {Box:}
-      callback box_cb
-      xywh {90 125 220 20} box THIN_UP_BOX
-      code0 {extern Fl_Menu_Item boxmenu[];}
-      code1 {o->menu(boxmenu);}
-    } {}
-    Fl_Button {} {
-      label Color
-      callback color_cb
-      xywh {310 125 50 20} box THIN_UP_BOX labelsize 8
-    }
-    Fl_Choice {} {
-      label {Down Box:}
-      callback down_box_cb
-      xywh {90 145 220 20} box THIN_UP_BOX
-      code0 {extern Fl_Menu_Item boxmenu[];}
-      code1 {o->menu(boxmenu);}
-    } {}
-    Fl_Button {} {
-      label {Select Color}
-      callback color2_cb
-      xywh {310 145 50 20} box THIN_UP_BOX labelsize 8
-    }
-    Fl_Choice {} {
-      label {Text Font:}
-      callback textfont_cb
-      xywh {90 170 170 20} box THIN_UP_BOX hide
-      code0 {extern Fl_Menu_Item fontmenu[];}
-      code1 {o->menu(fontmenu);}
-    } {}
-    Fl_Input {} {
-      label {xclass:}
-      callback xclass_cb
-      xywh {90 170 170 20} box THIN_UP_BOX when 0
-    }
-    Fl_Button {} {
-      label {Shortcut:}
-      callback shortcut_in_cb
-      xywh {90 170 270 20} box THIN_UP_BOX color 7 selection_color 7 align 4
-      code0 {\#include "Shortcut_Button.h"}
-      class Shortcut_Button
-    }
-    Fl_Value_Input {} {
-      callback textsize_cb
-      xywh {260 170 50 20} box THIN_UP_BOX maximum 100 step 1 value 14 hide
-    }
-    Fl_Button {} {
-      label {Text Color}
-      callback textcolor_cb
-      xywh {310 170 50 20} box THIN_UP_BOX labelsize 8 hide
-    }
-    Fl_Value_Input {} {
-      label {Size:}
-      callback slider_size_cb
-      xywh {40 205 60 20} box THIN_UP_BOX labelsize 10 align 5 step 0.010101
-    }
-    Fl_Value_Input {} {
-      label {Minimum:}
-      callback min_cb
-      xywh {105 205 60 20} box THIN_UP_BOX labelsize 10 align 5
-    }
-    Fl_Value_Input {} {
-      label {Maximum:}
-      callback max_cb
-      xywh {170 205 60 20} box THIN_UP_BOX labelsize 10 align 5 value 1
-    }
-    Fl_Value_Input {} {
-      label {Step:}
-      callback step_cb
-      xywh {235 205 60 20} box THIN_UP_BOX labelsize 10 align 5
-    }
-    Fl_Value_Input {} {
-      label {Value:}
-      callback value_cb
-      xywh {300 205 60 20} box THIN_UP_BOX labelsize 10 align 5
-    }
-    Fl_Group {} {
-      callback propagate_load
-      xywh {20 230 340 20} align 5
+    Fl_Tabs {} {
+      callback {propagate_load((Fl_Group *)o,v);} open
+      xywh {10 10 395 315} when 0
     } {
-      Fl_Light_Button {} {
-        label non_modal
-        callback non_modal_cb
-        xywh {30 230 70 20} box THIN_UP_BOX selection_color 1 labelsize 9 align 148
+      Fl_Group {} {
+        label GUI
+        callback propagate_load
+        xywh {10 30 395 295} when 0
+      } {
+        Fl_Input {} {
+          label {Label:}
+          callback label_cb
+          xywh {95 40 195 20} when 1
+        }
+        Fl_Choice {} {
+          callback labeltype_cb open
+          xywh {290 40 105 20} box THIN_UP_BOX down_box BORDER_BOX
+          code0 {extern Fl_Menu_Item labeltypemenu[];}
+          code1 {o->menu(labeltypemenu);}
+        } {}
+        Fl_Input {} {
+          label {Image:}
+          callback image_cb
+          xywh {95 65 195 20} when 1
+        }
+        Fl_Button {} {
+          label {Browse...}
+          callback image_browse_cb
+          xywh {290 65 105 20}
+        }
+        Fl_Input {} {
+          label {Inactive:}
+          callback inactive_cb
+          xywh {95 90 195 20} when 1
+        }
+        Fl_Button {} {
+          label {Browse...}
+          callback inactive_browse_cb
+          xywh {290 90 105 20}
+        }
+        Fl_Value_Input {} {
+          label {X:}
+          callback x_cb selected
+          xywh {95 150 60 20} labelsize 10 align 5 maximum 2048 step 1
+        }
+        Fl_Value_Input {} {
+          label {Y:}
+          callback y_cb selected
+          xywh {155 150 60 20} labelsize 10 align 5 maximum 2048 step 1
+        }
+        Fl_Value_Input {} {
+          label {Width:}
+          callback w_cb selected
+          xywh {215 150 60 20} labelsize 10 align 5 maximum 2048 step 1
+        }
+        Fl_Value_Input {} {
+          label {Height:}
+          callback h_cb selected
+          xywh {275 150 60 20} labelsize 10 align 5 maximum 2048 step 1
+        }
+        Fl_Group {} {
+          label {Alignment:}
+          callback propagate_load
+          xywh {95 115 300 20} align 4
+        } {
+          Fl_Button {} {
+            label clip
+            user_data FL_ALIGN_CLIP
+            callback align_cb
+            xywh {95 115 40 20} type Toggle labelsize 8
+          }
+          Fl_Button {} {
+            label wrap
+            user_data FL_ALIGN_WRAP
+            callback align_cb
+            xywh {135 115 40 20} type Toggle labelsize 8
+          }
+          Fl_Button {} {
+            label {text
+image}
+            user_data FL_ALIGN_WRAP
+            callback align_cb
+            xywh {175 115 55 20} type Toggle labelsize 8
+          }
+          Fl_Button {} {
+            label {@-1<-}
+            user_data FL_ALIGN_LEFT
+            callback align_cb
+            xywh {295 115 20 20} type Toggle labelcolor 8
+          }
+          Fl_Button {} {
+            label {@-1->}
+            user_data FL_ALIGN_RIGHT
+            callback align_cb
+            xywh {315 115 20 20} type Toggle labelcolor 8
+          }
+          Fl_Button {} {
+            label {@-18}
+            user_data FL_ALIGN_TOP
+            callback align_cb
+            xywh {335 115 20 20} type Toggle labelcolor 8
+          }
+          Fl_Button {} {
+            label {@-12}
+            user_data FL_ALIGN_BOTTOM
+            callback align_cb
+            xywh {355 115 20 20} type Toggle labelcolor 8
+          }
+          Fl_Button {} {
+            label {@-3square}
+            user_data FL_ALIGN_INSIDE
+            callback align_cb
+            xywh {375 115 20 20} type Toggle labelcolor 8
+          }
+        }
+        Fl_Box {} {
+          label {Position:}
+          xywh {20 150 75 20} align 24
+        }
+        Fl_Box {} {
+          label {Values:}
+          xywh {20 185 75 20} align 24
+        }
+        Fl_Value_Input {} {
+          label {Size:}
+          callback slider_size_cb
+          xywh {95 185 60 20} labelsize 10 align 5 step 0.010101
+        }
+        Fl_Value_Input {} {
+          label {Minimum:}
+          callback min_cb
+          xywh {155 185 60 20} labelsize 10 align 5
+        }
+        Fl_Value_Input {} {
+          label {Maximum:}
+          callback max_cb
+          xywh {215 185 60 20} labelsize 10 align 5 value 1
+        }
+        Fl_Value_Input {} {
+          label {Step:}
+          callback step_cb
+          xywh {275 185 60 20} labelsize 10 align 5
+        }
+        Fl_Value_Input {} {
+          label {Value:}
+          callback value_cb
+          xywh {335 185 60 20} labelsize 10 align 5
+        }
+        Fl_Button {} {
+          label {Shortcut:}
+          callback shortcut_in_cb
+          xywh {95 210 300 20} box DOWN_BOX color 7 selection_color 7 align 4
+          code0 {\#include "Shortcut_Button.h"}
+          class Shortcut_Button
+        }
+        Fl_Group {} {
+          callback propagate_load open
+          xywh {20 235 375 45} align 4
+        } {
+          Fl_Light_Button {} {
+            label Border
+            callback border_cb
+            xywh {210 235 60 20} selection_color 1 labelsize 10
+          }
+          Fl_Light_Button {} {
+            label Modal
+            callback modal_cb
+            xywh {270 235 55 20} selection_color 1 labelsize 10
+          }
+          Fl_Light_Button {} {
+            label Nonmodal
+            callback non_modal_cb
+            xywh {325 235 70 20} selection_color 1 labelsize 9 align 148
+          }
+          Fl_Box {} {
+            label {Attributes:}
+            xywh {20 260 75 20} align 24
+          }
+          Fl_Light_Button {} {
+            label Visible
+            callback visible_cb
+            xywh {95 260 70 20} selection_color 1 labelsize 10
+          }
+          Fl_Light_Button {} {
+            label Active
+            callback active_cb
+            xywh {165 260 70 20} selection_color 1 labelsize 10
+          }
+          Fl_Light_Button {} {
+            label Resizable
+            callback resizable_cb
+            xywh {235 260 70 20} selection_color 1 labelsize 10 when 1
+          }
+          Fl_Light_Button {} {
+            label Hotspot
+            callback hotspot_cb
+            xywh {305 260 70 20} selection_color 1 labelsize 10 when 1
+          }
+        }
+        Fl_Input {} {
+          label {X Class:}
+          callback xclass_cb
+          xywh {95 235 115 20} when 0
+        }
+        Fl_Input {} {
+          label {Tooltip:}
+          xywh {95 285 300 20}
+        }
       }
-      Fl_Light_Button {} {
-        label visible
-        callback visible_cb
-        xywh {105 230 60 20} box THIN_UP_BOX selection_color 1 labelsize 10
+      Fl_Group {} {
+        label Style
+        callback propagate_load
+        xywh {10 30 395 295} when 0 hide
+      } {
+        Fl_Choice {} {
+          label {Label Font:}
+          callback labelfont_cb open
+          xywh {100 40 155 20} box THIN_UP_BOX down_box BORDER_BOX
+          code0 {extern Fl_Menu_Item fontmenu[];}
+          code1 {o->menu(fontmenu);}
+        } {}
+        Fl_Value_Input {} {
+          callback labelsize_cb
+          xywh {255 40 50 20} maximum 100 step 1 value 14
+        }
+        Fl_Button {} {
+          label {Label Color}
+          callback labelcolor_cb
+          xywh {305 40 90 20} labelsize 8
+        }
+        Fl_Choice {} {
+          label {Box:}
+          callback box_cb open
+          xywh {100 65 205 20} box THIN_UP_BOX down_box BORDER_BOX
+          code0 {extern Fl_Menu_Item boxmenu[];}
+          code1 {o->menu(boxmenu);}
+        } {}
+        Fl_Button {} {
+          label Color
+          callback color_cb
+          xywh {305 65 90 20} labelsize 8
+        }
+        Fl_Choice {} {
+          label {Down Box:}
+          callback down_box_cb open
+          xywh {100 90 205 20} box THIN_UP_BOX down_box BORDER_BOX
+          code0 {extern Fl_Menu_Item boxmenu[];}
+          code1 {o->menu(boxmenu);}
+        } {}
+        Fl_Button {} {
+          label {Select Color}
+          callback color2_cb
+          xywh {305 90 90 20} labelsize 8
+        }
+        Fl_Choice {} {
+          label {Text Font:}
+          callback textfont_cb open
+          xywh {100 115 155 20} box DOWN_BOX down_box BORDER_BOX
+          code0 {extern Fl_Menu_Item fontmenu[];}
+          code1 {o->menu(fontmenu);}
+        } {}
+        Fl_Value_Input {} {
+          callback textsize_cb
+          xywh {255 115 50 20} maximum 100 step 1 value 14
+        }
+        Fl_Button {} {
+          label {Text Color}
+          callback textcolor_cb
+          xywh {305 115 90 20} labelsize 8
+        }
       }
-      Fl_Light_Button {} {
-        label modal
-        callback modal_cb
-        xywh {105 230 60 20} box THIN_UP_BOX selection_color 1 labelsize 10
+      Fl_Group {} {
+        label {C++}
+        callback propagate_load
+        xywh {10 30 395 295} when 0 hide
+      } {
+        Fl_Input {} {
+          label {Name:}
+          callback name_cb
+          xywh {100 65 230 20} when 0
+        }
+        Fl_Light_Button {} {
+          label public
+          callback name_public_cb
+          xywh {330 65 65 20} selection_color 1 labelsize 10 when 1
+        }
+        Fl_Input {} {
+          label {Class:}
+          user_data 4
+          callback subclass_cb
+          xywh {100 40 160 20} when 0 textfont 4
+        }
+        Fl_Choice {} {
+          callback subtype_cb open
+          xywh {260 40 135 20} box THIN_UP_BOX down_box BORDER_BOX
+        } {}
+        Fl_Input {v_input[0]} {
+          label {Extra Code:}
+          user_data 0
+          callback v_input_cb
+          xywh {100 90 295 20} when 0 textfont 4
+        }
+        Fl_Input {v_input[1]} {
+          user_data 1
+          callback v_input_cb
+          xywh {100 110 295 20} when 0 textfont 4
+        }
+        Fl_Input {v_input[2]} {
+          user_data 2
+          callback v_input_cb
+          xywh {100 130 295 20} when 0 textfont 4
+        }
+        Fl_Input {v_input[3]} {
+          user_data 3
+          callback v_input_cb
+          xywh {100 150 295 20} when 0 textfont 4
+        }
+        Fl_Box {} {
+          label {Callback:}
+          xywh {20 175 75 20} align 24
+        }
+        Fl_Input {} {
+          callback callback_cb
+          xywh {100 175 295 90} type Multiline when 0 textfont 4
+        }
+        Fl_Box {} {
+          label label
+          xywh {95 325 100 0} hide deactivate
+        }
+        Fl_Input {} {
+          label {User Data:}
+          callback user_data_cb
+          xywh {100 270 140 20} when 0 textfont 4
+        }
+        Fl_Input {} {
+          label {Type:}
+          callback user_data_type_cb
+          xywh {100 295 140 20} when 0 textfont 4
+        }
+        Fl_Choice {} {
+          label {When:}
+          callback when_cb open
+          xywh {290 270 105 20} box THIN_UP_BOX down_box BORDER_BOX when 0
+          code0 {extern Fl_Menu_Item whenmenu[];}
+          code1 {o->menu(whenmenu);}
+        } {}
+        Fl_Light_Button {} {
+          label {No Change}
+          callback when_button_cb
+          xywh {290 295 105 20} selection_color 1 labelsize 10 when 0
+        }
       }
-      Fl_Light_Button {} {
-        label active
-        callback active_cb
-        xywh {170 230 60 20} box THIN_UP_BOX selection_color 1 labelsize 10
-      }
-      Fl_Light_Button {} {
-        label border
-        callback border_cb
-        xywh {170 230 60 20} box THIN_UP_BOX selection_color 1 labelsize 10
-      }
-      Fl_Light_Button {} {
-        label resizable
-        callback resizable_cb
-        xywh {235 230 60 20} box THIN_UP_BOX selection_color 1 labelsize 10 when 1
-      }
-      Fl_Light_Button {} {
-        label hotspot
-        callback hotspot_cb
-        xywh {300 230 60 20} box THIN_UP_BOX selection_color 1 labelsize 10 when 1
-      }
-    }
-    Fl_Input {v_input[0]} {
-      label {Extra Code:}
-      user_data 0
-      callback v_input_cb
-      xywh {90 260 270 20} box THIN_UP_BOX when 0 textfont 4
-    }
-    Fl_Input {v_input[1]} {
-      user_data 1
-      callback v_input_cb
-      xywh {90 280 270 20} box THIN_UP_BOX when 0 textfont 4
-    }
-    Fl_Input {v_input[2]} {
-      user_data 2
-      callback v_input_cb
-      xywh {90 300 270 20} box THIN_UP_BOX when 0 textfont 4
-    }
-    Fl_Input {v_input[3]} {
-      user_data 3
-      callback v_input_cb
-      xywh {90 320 270 20} box THIN_UP_BOX when 0 textfont 4
-    }
-    Fl_Box {} {
-      label {Callback:}
-      xywh {0 350 90 20} align 24
-    }
-    Fl_Input {} {
-      callback callback_cb
-      xywh {90 350 270 50} type Multiline box THIN_UP_BOX when 0 textfont 4
-    }
-    Fl_Box {} {
-      label label
-      xywh {90 370 100 30} hide deactivate resizable
-    }
-    Fl_Input {} {
-      label {user_data:}
-      callback user_data_cb
-      xywh {90 400 170 20} box THIN_UP_BOX when 0 textfont 4
-    }
-    Fl_Input {} {
-      label {Type:}
-      callback user_data_type_cb
-      xywh {300 400 60 20} box THIN_UP_BOX when 0 textfont 4
-    }
-    Fl_Choice {} {
-      label {When:}
-      callback when_cb
-      xywh {90 420 100 20} box THIN_UP_BOX when 0
-      code0 {extern Fl_Menu_Item whenmenu[];}
-      code1 {o->menu(whenmenu);}
-    } {}
-    Fl_Light_Button {} {
-      label {no change}
-      callback when_button_cb
-      xywh {190 420 70 20} box THIN_UP_BOX selection_color 1 labelsize 10 when 0
     }
     Fl_Group {} {open
-      xywh {10 450 350 25}
+      xywh {10 335 395 25}
     } {
       Fl_Button {} {
-        label {no &overlay}
+        label {No &Overlay}
         callback overlay_cb
-        xywh {25 450 80 25} labelcolor 1
+        xywh {50 335 100 25} labelcolor 1
       }
       Fl_Button {} {
         label Revert
         callback revert_cb
-        xywh {110 450 80 25}
+        xywh {155 335 80 25}
       }
       Fl_Button {} {
         label Cancel
         callback cancel_cb
-        xywh {280 450 80 25}
+        xywh {325 335 80 25}
       }
       Fl_Return_Button {} {
         label OK
-        callback ok_cb selected
-        xywh {195 450 80 25}
+        callback ok_cb
+        xywh {240 335 80 25}
       }
     }
   }
diff --git a/fluid/widget_panel.h b/fluid/widget_panel.h
index 44dd3888e..905a95f96 100644
--- a/fluid/widget_panel.h
+++ b/fluid/widget_panel.h
@@ -1,24 +1,47 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.0008
+// generated by Fast Light User Interface Designer (fluid) version 1.0100
 
 #ifndef widget_panel_h
 #define widget_panel_h
 #include <FL/Fl.H>
 #include <FL/Fl_Window.H>
+#include <FL/Fl_Tabs.H>
+#include <FL/Fl_Group.H>
+extern void propagate_load(Fl_Group*, void*);
 #include <FL/Fl_Input.H>
-extern void name_cb(Fl_Input*, void*);
-#include <FL/Fl_Light_Button.H>
-extern void name_public_cb(Fl_Light_Button*, void*);
-extern void subclass_cb(Fl_Input*, void*);
-#include <FL/Fl_Choice.H>
-extern void subtype_cb(Fl_Choice*, void*);
 extern void label_cb(Fl_Input*, void*);
+#include <FL/Fl_Choice.H>
 extern Fl_Menu_Item labeltypemenu[];
 extern void labeltype_cb(Fl_Choice*, void*);
+extern void image_cb(Fl_Input*, void*);
 #include <FL/Fl_Button.H>
+extern void image_browse_cb(Fl_Button*, void*);
+extern void inactive_cb(Fl_Input*, void*);
+extern void inactive_browse_cb(Fl_Button*, void*);
+#include <FL/Fl_Value_Input.H>
+extern void x_cb(Fl_Value_Input*, void*);
+extern void y_cb(Fl_Value_Input*, void*);
+extern void w_cb(Fl_Value_Input*, void*);
+extern void h_cb(Fl_Value_Input*, void*);
 extern void align_cb(Fl_Button*, void*);
+#include <FL/Fl_Box.H>
+extern void slider_size_cb(Fl_Value_Input*, void*);
+extern void min_cb(Fl_Value_Input*, void*);
+extern void max_cb(Fl_Value_Input*, void*);
+extern void step_cb(Fl_Value_Input*, void*);
+extern void value_cb(Fl_Value_Input*, void*);
+#include "Shortcut_Button.h"
+extern void shortcut_in_cb(Shortcut_Button*, void*);
+#include <FL/Fl_Light_Button.H>
+extern void border_cb(Fl_Light_Button*, void*);
+extern void modal_cb(Fl_Light_Button*, void*);
+extern void non_modal_cb(Fl_Light_Button*, void*);
+extern void visible_cb(Fl_Light_Button*, void*);
+extern void active_cb(Fl_Light_Button*, void*);
+extern void resizable_cb(Fl_Light_Button*, void*);
+extern void hotspot_cb(Fl_Light_Button*, void*);
+extern void xclass_cb(Fl_Input*, void*);
 extern Fl_Menu_Item fontmenu[];
 extern void labelfont_cb(Fl_Choice*, void*);
-#include <FL/Fl_Value_Input.H>
 extern void labelsize_cb(Fl_Value_Input*, void*);
 extern void labelcolor_cb(Fl_Button*, void*);
 extern Fl_Menu_Item boxmenu[];
@@ -27,28 +50,14 @@ extern void color_cb(Fl_Button*, void*);
 extern void down_box_cb(Fl_Choice*, void*);
 extern void color2_cb(Fl_Button*, void*);
 extern void textfont_cb(Fl_Choice*, void*);
-extern void xclass_cb(Fl_Input*, void*);
-#include "Shortcut_Button.h"
-extern void shortcut_in_cb(Shortcut_Button*, void*);
 extern void textsize_cb(Fl_Value_Input*, void*);
 extern void textcolor_cb(Fl_Button*, void*);
-extern void slider_size_cb(Fl_Value_Input*, void*);
-extern void min_cb(Fl_Value_Input*, void*);
-extern void max_cb(Fl_Value_Input*, void*);
-extern void step_cb(Fl_Value_Input*, void*);
-extern void value_cb(Fl_Value_Input*, void*);
-#include <FL/Fl_Group.H>
-extern void propagate_load(Fl_Group*, void*);
-extern void non_modal_cb(Fl_Light_Button*, void*);
-extern void visible_cb(Fl_Light_Button*, void*);
-extern void modal_cb(Fl_Light_Button*, void*);
-extern void active_cb(Fl_Light_Button*, void*);
-extern void border_cb(Fl_Light_Button*, void*);
-extern void resizable_cb(Fl_Light_Button*, void*);
-extern void hotspot_cb(Fl_Light_Button*, void*);
+extern void name_cb(Fl_Input*, void*);
+extern void name_public_cb(Fl_Light_Button*, void*);
+extern void subclass_cb(Fl_Input*, void*);
+extern void subtype_cb(Fl_Choice*, void*);
 extern void v_input_cb(Fl_Input*, void*);
 extern Fl_Input *v_input[4];
-#include <FL/Fl_Box.H>
 extern void callback_cb(Fl_Input*, void*);
 extern void user_data_cb(Fl_Input*, void*);
 extern void user_data_type_cb(Fl_Input*, void*);