From: Angus Leeming <leeming@lyx.org>
Date: Tue, 12 Mar 2002 14:11:15 +0000 (+0000)
Subject: Ensure all widgets follow the naming scheme.
X-Git-Tag: 1.6.10~19672
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3beb3be67c91519358682fb51ba8958b28b01278;p=lyx.git

Ensure all widgets follow the naming scheme.
This patch is house-keeping only. There are no issues associated with it.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3728 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index f4e75063d9..1a17454c9c 100644
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,36 @@
+2002-03-12  Angus Leeming  <a.leeming@ic.ac.uk>
+
+	* forms/*.fd (except form_filedialog.fd which is v. scary :-():
+	housekeeping changes.
+	1. Ensure that all radio buttons are wrapped up within a group.
+	2. Rename all button_cancel as button_close.
+	3. Ensure that all objects follow the naming scheme outlined in
+	   forms/README
+	   
+	class             | prefix
+	------------------+-------
+	FL_BROWSER        | browser
+	FL_BUTTON         | button
+	FL_PIXMAPBUTTON   | button
+	FL_CHECKBUTTON    | check
+	FL_CHOICE         | choice
+	FL_COUNTER        | counter
+	FL_DIAL           | dial
+	FL_INPUT          | input
+	FL_FRAME          | frame
+	FL_LABELFRAME     | frame
+	FL_ROUND3DBUTTON,
+	RADIO_BUTTON      | radio
+	FL_SLIDER         | slider
+	FL_VALSLIDER      | slider
+	FL_TABFOLDER      | tabfolder
+	FL_TEXT           | text
+
+	The only exceptions to this are objects that are to be converted
+	in the sed scripts. At the moment this applies only to bmtable:
+
+	Convert an FL_BUTTON to a FL_BMTABLE by using prefix "bmtable".
+
 2002-03-11  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
 	* doxygen fixes.
diff --git a/src/frontends/xforms/FormAboutlyx.C b/src/frontends/xforms/FormAboutlyx.C
index f6c1fbaba2..49cb05628b 100644
--- a/src/frontends/xforms/FormAboutlyx.C
+++ b/src/frontends/xforms/FormAboutlyx.C
@@ -58,15 +58,15 @@ void FormAboutlyx::build()
 			    controller().getCredits(ss).str().c_str());
 
 	// stack tabs
-	fl_addto_tabfolder(dialog_->tabbed_folder,_("Copyright and Version"),
+	fl_addto_tabfolder(dialog_->tabfolder,_("Copyright and Version"),
 		       version_->form);
-	fl_addto_tabfolder(dialog_->tabbed_folder,_("License and Warranty"),
+	fl_addto_tabfolder(dialog_->tabfolder,_("License and Warranty"),
 		       license_->form);
-	fl_addto_tabfolder(dialog_->tabbed_folder,_("Credits"),
+	fl_addto_tabfolder(dialog_->tabfolder,_("Credits"),
 		       credits_->form);
 
 	// Manage the cancel/close button
-	bc().setCancel(dialog_->close);
+	bc().setCancel(dialog_->button_close);
 }
 
 
diff --git a/src/frontends/xforms/FormBibitem.C b/src/frontends/xforms/FormBibitem.C
index bebee863ae..856cd3299f 100644
--- a/src/frontends/xforms/FormBibitem.C
+++ b/src/frontends/xforms/FormBibitem.C
@@ -30,25 +30,25 @@ void FormBibitem::build()
 {
 	dialog_.reset(build_bibitem());
 
-	fl_set_input_return(dialog_->key,   FL_RETURN_CHANGED);
-	fl_set_input_return(dialog_->label, FL_RETURN_CHANGED);
+	fl_set_input_return(dialog_->input_key,   FL_RETURN_CHANGED);
+	fl_set_input_return(dialog_->input_label, FL_RETURN_CHANGED);
 
-	setPrehandler(dialog_->key);
-	setPrehandler(dialog_->label);
+	setPrehandler(dialog_->input_key);
+	setPrehandler(dialog_->input_label);
 
         // Manage the ok, apply, restore and cancel/close buttons
 	bc().setOK(dialog_->button_ok);
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 
-	bc().addReadOnly(dialog_->key);
-	bc().addReadOnly(dialog_->label);
+	bc().addReadOnly(dialog_->input_key);
+	bc().addReadOnly(dialog_->input_label);
 }
 
 
 ButtonPolicy::SMInput FormBibitem::input(FL_OBJECT *, long)
 {
 	// minimal validation 
-	if (!compare(fl_get_input(dialog_->key), ""))
+	if (!compare(fl_get_input(dialog_->input_key), ""))
 		return ButtonPolicy::SMI_NOOP;
 
 	return ButtonPolicy::SMI_VALID;
@@ -57,15 +57,15 @@ ButtonPolicy::SMInput FormBibitem::input(FL_OBJECT *, long)
 
 void FormBibitem::update()
 {
-	fl_set_input(dialog_->key,
+	fl_set_input(dialog_->input_key,
 		     controller().params().getContents().c_str());
-	fl_set_input(dialog_->label,
+	fl_set_input(dialog_->input_label,
 		     controller().params().getOptions().c_str());
 }
 
 
 void FormBibitem::apply()
 {
-	controller().params().setContents(fl_get_input(dialog_->key));
-	controller().params().setOptions(fl_get_input(dialog_->label));
+	controller().params().setContents(fl_get_input(dialog_->input_key));
+	controller().params().setOptions(fl_get_input(dialog_->input_label));
 }
diff --git a/src/frontends/xforms/FormBibtex.C b/src/frontends/xforms/FormBibtex.C
index 5719d07b71..2a119d17fd 100644
--- a/src/frontends/xforms/FormBibtex.C
+++ b/src/frontends/xforms/FormBibtex.C
@@ -42,42 +42,42 @@ void FormBibtex::build()
 {
 	dialog_.reset(build_bibtex());
 
-	fl_set_input_return(dialog_->database, FL_RETURN_CHANGED);
-	fl_set_input_return(dialog_->style, FL_RETURN_CHANGED);
+	fl_set_input_return(dialog_->input_database, FL_RETURN_CHANGED);
+	fl_set_input_return(dialog_->input_style, FL_RETURN_CHANGED);
 
-	setPrehandler(dialog_->database);
-	setPrehandler(dialog_->style);
+	setPrehandler(dialog_->input_database);
+	setPrehandler(dialog_->input_style);
 
         // Manage the ok, apply, restore and cancel/close buttons
 	bc().setOK(dialog_->button_ok);
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 
-	bc().addReadOnly(dialog_->database_browse);
-	bc().addReadOnly(dialog_->database);
-	bc().addReadOnly(dialog_->style_browse);
-	bc().addReadOnly(dialog_->style);
-	bc().addReadOnly(dialog_->radio_bibtotoc);
+	bc().addReadOnly(dialog_->button_database_browse);
+	bc().addReadOnly(dialog_->input_database);
+	bc().addReadOnly(dialog_->button_style_browse);
+	bc().addReadOnly(dialog_->input_style);
+	bc().addReadOnly(dialog_->check_bibtotoc);
 
 	// set up the tooltips
 	string str = N_("The database you want to cite from. Insert it without the default extension \".bib\". If you insert it with the browser, LyX strips the extension. Several databases must be separated by a comma: \"natbib, books\".");
-	tooltips().initTooltip(dialog_->database_browse, str);
+	tooltips().initTooltip(dialog_->button_database_browse, str);
 
 	str = N_("Browse your directory for BibTeX stylefiles.");
-	tooltips().initTooltip(dialog_->style_browse, str);
+	tooltips().initTooltip(dialog_->button_style_browse, str);
 
 	str = N_("The BibTeX style to use (only one allowed). Insert it without the default extension \".bst\" and without path. Most of the bibstyles are stored in $TEXMF/bibtex/bst. $TEXMF is the root dir of the local TeX tree. In \"Help->TeX Info\" you can list all installed styles.");
-	tooltips().initTooltip(dialog_->style, str);
+	tooltips().initTooltip(dialog_->input_style, str);
 
 	str = N_("Activate this option if you want the bibliography to appear in the Table of Contents (which doesn't happen by default).");
-	tooltips().initTooltip(dialog_->radio_bibtotoc, str);
+	tooltips().initTooltip(dialog_->check_bibtotoc, str);
 }
 
 
 ButtonPolicy::SMInput FormBibtex::input(FL_OBJECT * ob, long)
 {
-	if (ob == dialog_->database_browse) {
+	if (ob == dialog_->button_database_browse) {
 		// When browsing, take the first file only 
-		string const in_name = fl_get_input(dialog_->database);
+		string const in_name = fl_get_input(dialog_->input_database);
 		string out_name = 
 			controller().Browse("",
 					    "Select Database",
@@ -88,25 +88,25 @@ ButtonPolicy::SMInput FormBibtex::input(FL_OBJECT * ob, long)
 				out_name = in_name + ", " + out_name;
 
 			fl_freeze_form(form()); 
-			fl_set_input(dialog_->database, out_name.c_str());
+			fl_set_input(dialog_->input_database, out_name.c_str());
 			fl_unfreeze_form(form()); 
 		}
 	}
 
-	if (ob == dialog_->style_browse) {
-		string const in_name = fl_get_input(dialog_->style);
+	if (ob == dialog_->button_style_browse) {
+		string const in_name = fl_get_input(dialog_->input_style);
 		string out_name = 
 			controller().Browse(in_name,
 					    "Select BibTeX-Style",
 					    "*.bst| BibTeX Styles (*.bst)");
 		if (!out_name.empty()) {
 			fl_freeze_form(form()); 
-			fl_set_input(dialog_->style, out_name.c_str());
+			fl_set_input(dialog_->input_style, out_name.c_str());
 			fl_unfreeze_form(form()); 
 		}
 	}
   
-	if (!compare(fl_get_input(dialog_->database),"")) {
+	if (!compare(fl_get_input(dialog_->input_database),"")) {
 		return ButtonPolicy::SMI_NOOP;
 	}
 
@@ -116,23 +116,23 @@ ButtonPolicy::SMInput FormBibtex::input(FL_OBJECT * ob, long)
 
 void FormBibtex::update()
 {
-	fl_set_input(dialog_->database,
+	fl_set_input(dialog_->input_database,
 		     controller().params().getContents().c_str());
         string bibtotoc = "bibtotoc";
 	string bibstyle (controller().params().getOptions().c_str());
 	if (prefixIs(bibstyle,bibtotoc)) { // bibtotoc exists?
-		fl_set_button(dialog_->radio_bibtotoc,1);
+		fl_set_button(dialog_->check_bibtotoc,1);
 		if (contains(bibstyle,',')) { // bibstyle exists?
 			bibstyle = split(bibstyle,bibtotoc,',');
 		} else {
 			bibstyle = "";
 		}
 
-		fl_set_input(dialog_->style,bibstyle.c_str());
+		fl_set_input(dialog_->input_style,bibstyle.c_str());
 
 	} else {
-		fl_set_button(dialog_->radio_bibtotoc,0);
-		fl_set_input(dialog_->style,bibstyle.c_str());
+		fl_set_button(dialog_->check_bibtotoc,0);
+		fl_set_input(dialog_->input_style,bibstyle.c_str());
 	}
 }
 
@@ -165,7 +165,7 @@ string const unique_and_no_extensions(string const & str_in)
 
 void FormBibtex::apply()
 {
-	string const db = fl_get_input(dialog_->database);
+	string const db = fl_get_input(dialog_->input_database);
 	if (db.empty()) {
 		// no database -> no bibtex-command and no options!
 		controller().params().setContents("");
@@ -176,13 +176,13 @@ void FormBibtex::apply()
 	controller().params().setContents(unique_and_no_extensions(db));
 
 	// empty is valid!
-	string bibstyle = fl_get_input(dialog_->style);
+	string bibstyle = fl_get_input(dialog_->input_style);
 	if (!bibstyle.empty()) {
 		// save the BibTeX style without any ".bst" extension
 		bibstyle = ChangeExtension(OnlyFilename(bibstyle), "");
 	}
 
-	bool const bibtotoc = fl_get_button(dialog_->radio_bibtotoc);
+	bool const bibtotoc = fl_get_button(dialog_->check_bibtotoc);
 	
 	if (bibtotoc && (!bibstyle.empty())) {
 		// both bibtotoc and style
diff --git a/src/frontends/xforms/FormCitation.C b/src/frontends/xforms/FormCitation.C
index dc6a40a6bc..81f465fd82 100644
--- a/src/frontends/xforms/FormCitation.C
+++ b/src/frontends/xforms/FormCitation.C
@@ -91,13 +91,13 @@ void updateStyle(FD_form_citation * dialog, string command)
 	// Use this to initialise the GUI
 	if (cit == styles.end()) {
 		fl_set_choice(dialog->choice_style, 1);
-		fl_set_button(dialog->button_full_author_list, 0);
-		fl_set_button(dialog->button_force_uppercase, 0);
+		fl_set_button(dialog->check_full_author_list, 0);
+		fl_set_button(dialog->check_force_uppercase, 0);
 	} else {
 		int const i = int(cit - styles.begin());
 		fl_set_choice(dialog->choice_style, i+1);
-		fl_set_button(dialog->button_full_author_list,  cs.full);
-		fl_set_button(dialog->button_force_uppercase, cs.forceUCase);
+		fl_set_button(dialog->check_full_author_list,  cs.full);
+		fl_set_button(dialog->check_force_uppercase, cs.forceUCase);
 	}
 }
 
@@ -116,8 +116,8 @@ void FormCitation::apply()
 		ControlCitation::getCiteStyles();
 
 	int const choice = fl_get_choice(dialog_->choice_style) - 1;
-	bool const full  = fl_get_button(dialog_->button_full_author_list);
-	bool const force = fl_get_button(dialog_->button_force_uppercase);
+	bool const full  = fl_get_button(dialog_->check_full_author_list);
+	bool const force = fl_get_button(dialog_->check_force_uppercase);
 
 	string const command =
 		biblio::getCiteCommand(styles[choice], full, force);
@@ -147,8 +147,8 @@ void FormCitation::build()
 	fl_set_input_return(dialog_->input_before, FL_RETURN_CHANGED);
 	fl_set_input_return(dialog_->input_search, FL_RETURN_END);
 
-	fl_set_button(dialog_->button_search_case, 0);
-	fl_set_button(dialog_->button_search_type, 0);
+	fl_set_button(dialog_->check_search_case, 0);
+	fl_set_button(dialog_->check_search_type, 0);
 
 	setPrehandler(dialog_->input_search);
 	setPrehandler(dialog_->input_before);
@@ -157,7 +157,7 @@ void FormCitation::build()
         // Manage the ok, apply, restore and cancel/close buttons
 	bc().setOK(dialog_->button_ok);
 	bc().setApply(dialog_->button_apply);
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 	bc().setRestore(dialog_->button_restore);
 
 	bc().addReadOnly(dialog_->button_add);
@@ -167,8 +167,8 @@ void FormCitation::build()
 	bc().addReadOnly(dialog_->choice_style);
 	bc().addReadOnly(dialog_->input_before);
 	bc().addReadOnly(dialog_->input_after);
-	bc().addReadOnly(dialog_->button_full_author_list);
-	bc().addReadOnly(dialog_->button_force_uppercase);
+	bc().addReadOnly(dialog_->check_full_author_list);
+	bc().addReadOnly(dialog_->check_force_uppercase);
 
 	//set up the tooltip mechanism
 	string str = N_("Add the selected entry to the current citation reference.");
@@ -196,10 +196,10 @@ void FormCitation::build()
 	tooltips().initTooltip(dialog_->choice_style, str);
 
 	str = N_("Activate if you want to print all authors in a reference with more than three authors, and not \"<First Author> et.al.\" (Natbib).");
-	tooltips().initTooltip(dialog_->button_full_author_list, str);
+	tooltips().initTooltip(dialog_->check_full_author_list, str);
 
 	str = N_("Activate if you want to print the first character of the author name as uppercase (\"Van Gogh\", not \"van Gogh\"). Useful at the beginning of sentences (Natbib).");
-	tooltips().initTooltip(dialog_->button_force_uppercase, str);
+	tooltips().initTooltip(dialog_->check_force_uppercase, str);
 
 	str = N_("Optional text which appears before the citation reference, e.g. \"see <Ref>\"");
 	tooltips().initTooltip(dialog_->input_before, str);
@@ -211,10 +211,10 @@ void FormCitation::build()
 	tooltips().initTooltip(dialog_->input_search, str);
 
 	str = N_("Activate if you want to have case sensitive search: \"bibtex\" finds \"bibtex\", but not \"BibTeX\".");
-	tooltips().initTooltip(dialog_->button_search_case, str);
+	tooltips().initTooltip(dialog_->check_search_case, str);
 
 	str = N_("Activate if you want to enter Regular Expressions.");
-	tooltips().initTooltip(dialog_->button_search_type, str);
+	tooltips().initTooltip(dialog_->check_search_type, str);
 }
 
 
@@ -223,9 +223,9 @@ void FormCitation::findBiblio(biblio::Direction const dir)
 	string const str = fl_get_input(dialog_->input_search);
 	biblio::InfoMap const & theMap = controller().bibkeysInfo();
 	bool const caseSensitive =
-		fl_get_button(dialog_->button_search_case);
+		fl_get_button(dialog_->check_search_case);
 	biblio::Search const type =
-		fl_get_button(dialog_->button_search_type) ?
+		fl_get_button(dialog_->check_search_type) ?
 		biblio::REGEX : biblio::SIMPLE;
 
 	vector<string>::const_iterator start = bibkeys.begin();
@@ -404,8 +404,8 @@ ButtonPolicy::SMInput FormCitation::input(FL_OBJECT * ob, long)
 	} else if (ob == dialog_->input_search) {
 		findBiblio(biblio::FORWARD);
 	} else if (ob == dialog_->choice_style ||
-		   ob == dialog_->button_full_author_list ||
-		   ob == dialog_->button_force_uppercase ||
+		   ob == dialog_->check_full_author_list ||
+		   ob == dialog_->check_force_uppercase ||
 		   ob == dialog_->input_before ||
 		   ob == dialog_->input_after) {
 		activate = ButtonPolicy::SMI_VALID;
@@ -446,8 +446,8 @@ void FormCitation::update()
 	updateStyle(dialog_.get(), controller().params().getCmdName());
 
 	bool const natbib = controller().usingNatbib();
-	setEnabled(dialog_->button_full_author_list, natbib);
-	setEnabled(dialog_->button_force_uppercase, natbib);
+	setEnabled(dialog_->check_full_author_list, natbib);
+	setEnabled(dialog_->check_force_uppercase, natbib);
 	setEnabled(dialog_->choice_style, natbib);
 	
 	// No keys have been selected yet, so...
diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C
index 41fde49c11..3bc95eec64 100644
--- a/src/frontends/xforms/FormDocument.C
+++ b/src/frontends/xforms/FormDocument.C
@@ -72,7 +72,7 @@ void FormDocument::redraw()
 	else
 		return;
 
-	FL_FORM * outer_form = fl_get_active_folder(dialog_->tabbed_folder);
+	FL_FORM * outer_form = fl_get_active_folder(dialog_->tabfolder);
 	if (outer_form && outer_form->visible)
 		fl_redraw_form(outer_form);
 }
@@ -95,7 +95,7 @@ void FormDocument::build()
 	// Manage the restore, ok, apply, restore and cancel/close buttons
 	bc().setOK(dialog_->button_ok);
 	bc().setApply(dialog_->button_apply);
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 	bc().setRestore(dialog_->button_restore);
 	bc().addReadOnly (dialog_->button_save_defaults);
 	bc().addReadOnly (dialog_->button_reset_defaults);
@@ -160,7 +160,6 @@ void FormDocument::build()
 	fl_addto_choice(paper_->choice_foot_skip_units,     units.c_str());
 
 	bc().addReadOnly (paper_->choice_paperpackage);
-	bc().addReadOnly (paper_->group_radio_orientation);
 	bc().addReadOnly (paper_->radio_portrait);
 	bc().addReadOnly (paper_->radio_landscape);
 	bc().addReadOnly (paper_->choice_papersize);
@@ -185,7 +184,7 @@ void FormDocument::build()
 	fl_addto_form(class_->form);
 	combo_doc_class.reset(new Combox(FL_COMBOX_DROPLIST));
 	combo_doc_class->add(obj->x, obj->y, obj->w, obj->h, 400,
-			     dialog_->tabbed_folder);
+			     dialog_->tabfolder);
 	combo_doc_class->shortcut("#C",1);
 	combo_doc_class->setcallback(ComboInputCB, this);
 	fl_end_form();
@@ -245,7 +244,7 @@ void FormDocument::build()
 	fl_addto_form(language_->form);
 	combo_language.reset(new Combox(FL_COMBOX_DROPLIST));
 	combo_language->add(obj->x, obj->y, obj->w, obj->h, 400,
-			    dialog_->tabbed_folder);
+			    dialog_->tabfolder);
 	combo_language->shortcut("#L",1);
 	combo_language->setcallback(ComboInputCB, this);
 	fl_end_form();
@@ -269,12 +268,12 @@ void FormDocument::build()
 	fl_set_input_return(options_->input_float_placement, FL_RETURN_CHANGED);
 	setPrehandler(options_->input_float_placement);
 
-	fl_set_counter_bounds(options_->slider_secnumdepth,-2,5);
-	fl_set_counter_bounds(options_->slider_tocdepth,-1,5);
-	fl_set_counter_step(options_->slider_secnumdepth,1,1);
-	fl_set_counter_step(options_->slider_tocdepth,1,1);
-	fl_set_counter_precision(options_->slider_secnumdepth, 0);
-	fl_set_counter_precision(options_->slider_tocdepth, 0);
+	fl_set_counter_bounds(options_->counter_secnumdepth,-2,5);
+	fl_set_counter_bounds(options_->counter_tocdepth,-1,5);
+	fl_set_counter_step(options_->counter_secnumdepth,1,1);
+	fl_set_counter_step(options_->counter_tocdepth,1,1);
+	fl_set_counter_precision(options_->counter_secnumdepth, 0);
+	fl_set_counter_precision(options_->counter_tocdepth, 0);
 	for (n=0; tex_graphics[n][0]; ++n) {
 		fl_addto_choice(options_->choice_postscript_driver,
 				tex_graphics[n]);
@@ -282,8 +281,8 @@ void FormDocument::build()
 	fl_addto_choice(options_->choice_citation_format,
 			_(" Author-year | Numerical "));
 
-	bc_.addReadOnly (options_->slider_secnumdepth);
-	bc_.addReadOnly (options_->slider_tocdepth);
+	bc_.addReadOnly (options_->counter_secnumdepth);
+	bc_.addReadOnly (options_->counter_tocdepth);
 	bc_.addReadOnly (options_->check_use_amsmath);
 	bc_.addReadOnly (options_->check_use_natbib);
 	bc_.addReadOnly (options_->choice_citation_format);
@@ -300,21 +299,30 @@ void FormDocument::build()
 	setPrehandler(bullets_->input_bullet_latex);
 	fl_set_input_maxchars(bullets_->input_bullet_latex, 80);
 
+	bc_.addReadOnly(bullets_->radio_bullet_depth_1);
+	bc_.addReadOnly(bullets_->radio_bullet_depth_2);
+	bc_.addReadOnly(bullets_->radio_bullet_depth_3);
+	bc_.addReadOnly(bullets_->radio_bullet_depth_4);
+	bc_.addReadOnly(bullets_->radio_bullet_panel_standard);
+	bc_.addReadOnly(bullets_->radio_bullet_panel_maths);
+	bc_.addReadOnly(bullets_->radio_bullet_panel_ding1);
+	bc_.addReadOnly(bullets_->radio_bullet_panel_ding2);
+	bc_.addReadOnly(bullets_->radio_bullet_panel_ding3);
+	bc_.addReadOnly(bullets_->radio_bullet_panel_ding4);
+
 	bc().addReadOnly (bullets_->bmtable_bullet_panel);
 	bc().addReadOnly (bullets_->choice_bullet_size);
 	bc().addReadOnly (bullets_->input_bullet_latex);
-	bc().addReadOnly (bullets_->radio_bullet_depth);
-	bc().addReadOnly (bullets_->radio_bullet_panel);
 
-	fl_addto_tabfolder(dialog_->tabbed_folder,_("Document"),
+	fl_addto_tabfolder(dialog_->tabfolder,_("Document"),
 			   class_->form);
-	fl_addto_tabfolder(dialog_->tabbed_folder,_("Paper"),
+	fl_addto_tabfolder(dialog_->tabfolder,_("Paper"),
 			   paper_->form);
-	fl_addto_tabfolder(dialog_->tabbed_folder,_("Language"),
+	fl_addto_tabfolder(dialog_->tabfolder,_("Language"),
 			   language_->form);
-	fl_addto_tabfolder(dialog_->tabbed_folder,_("Extra"),
+	fl_addto_tabfolder(dialog_->tabfolder,_("Extra"),
 			   options_->form);
-	fbullet = fl_addto_tabfolder(dialog_->tabbed_folder,_("Bullets"),
+	fbullet = fl_addto_tabfolder(dialog_->tabfolder,_("Bullets"),
 				     bullets_->form);
 	if ((XpmVersion < 4) || (XpmVersion == 4 && XpmRevision < 7)) {
 		lyxerr << _("Your version of libXpm is older than 4.7.\n"
@@ -914,12 +922,12 @@ bool FormDocument::options_apply(BufferParams & params)
 	params.use_numerical_citations  =
 		fl_get_choice(options_->choice_citation_format)-1;
 
-	int tmpchar = int(fl_get_counter_value(options_->slider_secnumdepth));
+	int tmpchar = int(fl_get_counter_value(options_->counter_secnumdepth));
 	if (params.secnumdepth != tmpchar)
 		redo = true;
 	params.secnumdepth = tmpchar;
    
-	params.tocdepth = int(fl_get_counter_value(options_->slider_tocdepth));
+	params.tocdepth = int(fl_get_counter_value(options_->counter_tocdepth));
 
 	params.float_placement =
 		fl_get_input(options_->input_float_placement);
@@ -1090,8 +1098,8 @@ void FormDocument::options_update(BufferParams const & params)
 	fl_set_choice(options_->choice_citation_format,
 		      int(params.use_numerical_citations)+1);
 	setEnabled(options_->choice_citation_format, params.use_natbib);
-	fl_set_counter_value(options_->slider_secnumdepth, params.secnumdepth);
-	fl_set_counter_value(options_->slider_tocdepth, params.tocdepth);
+	fl_set_counter_value(options_->counter_secnumdepth, params.secnumdepth);
+	fl_set_counter_value(options_->counter_tocdepth, params.tocdepth);
 	if (!params.float_placement.empty())
 		fl_set_input(options_->input_float_placement,
 			     params.float_placement.c_str());
diff --git a/src/frontends/xforms/FormERT.C b/src/frontends/xforms/FormERT.C
index d418c0629f..37e63c5d46 100644
--- a/src/frontends/xforms/FormERT.C
+++ b/src/frontends/xforms/FormERT.C
@@ -34,7 +34,7 @@ void FormERT::build()
 	// Manage the ok, apply and cancel/close buttons
 	bc().setOK(dialog_->button_ok);
 	bc().setApply(dialog_->button_apply);
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 
 	bc().addReadOnly(dialog_->radio_open);
 	bc().addReadOnly(dialog_->radio_collapsed);
diff --git a/src/frontends/xforms/FormError.C b/src/frontends/xforms/FormError.C
index d8bf9b49cb..cc92b20bba 100644
--- a/src/frontends/xforms/FormError.C
+++ b/src/frontends/xforms/FormError.C
@@ -30,13 +30,13 @@ void FormError::build()
 	dialog_.reset(build_error());
 
         // Manage the cancel/close button
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 }
 
 
 void FormError::update()
 {
 	string const txt = formatted(controller().params(),
-				     dialog_->message->w - 10);
-	fl_set_object_label(dialog_->message, txt.c_str());
+				     dialog_->frame_message->w - 10);
+	fl_set_object_label(dialog_->frame_message, txt.c_str());
 }
diff --git a/src/frontends/xforms/FormExternal.C b/src/frontends/xforms/FormExternal.C
index 2dd336945a..0c1271d476 100644
--- a/src/frontends/xforms/FormExternal.C
+++ b/src/frontends/xforms/FormExternal.C
@@ -57,7 +57,7 @@ void FormExternal::build()
 
 	bc().setOK(dialog_->button_ok);
 	bc().setApply(dialog_->button_apply);
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 
 	bc().addReadOnly(dialog_->input_filename);
 	bc().addReadOnly(dialog_->button_filenamebrowse);
diff --git a/src/frontends/xforms/FormFloat.C b/src/frontends/xforms/FormFloat.C
index 6fbf37a7b0..07b442aa3a 100644
--- a/src/frontends/xforms/FormFloat.C
+++ b/src/frontends/xforms/FormFloat.C
@@ -37,33 +37,33 @@ void FormFloat::build()
 	// Manage the ok, apply and cancel/close buttons
 	bc().setOK(dialog_->button_ok);
 	bc().setApply(dialog_->button_apply);
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 	bc().setRestore(dialog_->button_restore);
 
-	bc().addReadOnly(dialog_->radio_top);
-	bc().addReadOnly(dialog_->radio_bottom);
-	bc().addReadOnly(dialog_->radio_page);
-	bc().addReadOnly(dialog_->radio_here);
-	bc().addReadOnly(dialog_->button_here_definitely);
+	bc().addReadOnly(dialog_->check_top);
+	bc().addReadOnly(dialog_->check_bottom);
+	bc().addReadOnly(dialog_->check_page);
+	bc().addReadOnly(dialog_->check_here);
+	bc().addReadOnly(dialog_->check_here_definitely);
 }
 
 
 void FormFloat::apply()
 {
 	string placement;
-	if (fl_get_button(dialog_->button_here_definitely)) {
+	if (fl_get_button(dialog_->check_here_definitely)) {
 		placement += "H";
 	} else {
-		if (fl_get_button(dialog_->radio_top)) {
+		if (fl_get_button(dialog_->check_top)) {
 			placement += "t";
 		}
-		if (fl_get_button(dialog_->radio_bottom)) {
+		if (fl_get_button(dialog_->check_bottom)) {
 			placement += "b";
 		}
-		if (fl_get_button(dialog_->radio_page)) {
+		if (fl_get_button(dialog_->check_page)) {
 			placement += "p";
 		}
-		if (fl_get_button(dialog_->radio_here)) {
+		if (fl_get_button(dialog_->check_here)) {
 			placement += "h";
 		}
 	}
@@ -97,27 +97,27 @@ void FormFloat::update()
 			here = true;
 		}
 	}
-	fl_set_button(dialog_->radio_top, top);
-	fl_set_button(dialog_->radio_bottom, bottom);
-	fl_set_button(dialog_->radio_page, page);
-	fl_set_button(dialog_->radio_here, here);
-	fl_set_button(dialog_->button_here_definitely, here_definitely);
-	setEnabled(dialog_->button_here_definitely, controller().params().allow_here_definitely);
+	fl_set_button(dialog_->check_top, top);
+	fl_set_button(dialog_->check_bottom, bottom);
+	fl_set_button(dialog_->check_page, page);
+	fl_set_button(dialog_->check_here, here);
+	fl_set_button(dialog_->check_here_definitely, here_definitely);
+	setEnabled(dialog_->check_here_definitely, controller().params().allow_here_definitely);
 }
 
 
 ButtonPolicy::SMInput FormFloat::input(FL_OBJECT * ob, long)
 {
-	if (ob == dialog_->button_here_definitely) {
-		if (fl_get_button(dialog_->button_here_definitely)) {
-			fl_set_button(dialog_->radio_top,    false);
-			fl_set_button(dialog_->radio_bottom, false);
-			fl_set_button(dialog_->radio_page,   false);
-			fl_set_button(dialog_->radio_here,   false);
+	if (ob == dialog_->check_here_definitely) {
+		if (fl_get_button(dialog_->check_here_definitely)) {
+			fl_set_button(dialog_->check_top,    false);
+			fl_set_button(dialog_->check_bottom, false);
+			fl_set_button(dialog_->check_page,   false);
+			fl_set_button(dialog_->check_here,   false);
 		}
 	} else {
-		if (fl_get_button(dialog_->button_here_definitely)) {
-			fl_set_button(dialog_->button_here_definitely, false);
+		if (fl_get_button(dialog_->check_here_definitely)) {
+			fl_set_button(dialog_->check_here_definitely, false);
 		}
 	}
 
diff --git a/src/frontends/xforms/FormGraphics.C b/src/frontends/xforms/FormGraphics.C
index b39f1806c9..badade841f 100644
--- a/src/frontends/xforms/FormGraphics.C
+++ b/src/frontends/xforms/FormGraphics.C
@@ -55,7 +55,7 @@ void FormGraphics::redraw()
 		fl_redraw_form(form());
 	else
 		return;
-	FL_FORM * outer_form = fl_get_active_folder(dialog_->tabFolder);
+	FL_FORM * outer_form = fl_get_active_folder(dialog_->tabfolder);
 	if (outer_form && outer_form->visible)
 		fl_redraw_form(outer_form);
 }
@@ -68,7 +68,7 @@ void FormGraphics::build()
         // Manage the ok, apply, restore and cancel/close buttons
 	bc().setOK(dialog_->button_ok);
 	bc().setApply(dialog_->button_apply);
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 	bc().setRestore(dialog_->button_restore);
 
 	// the file section
@@ -95,8 +95,8 @@ void FormGraphics::build()
 	bc().addReadOnly(file_->button_browse);
 	bc().addReadOnly(file_->check_subcaption);
 	bc().addReadOnly(file_->check_rotate);
-	bc().addReadOnly(file_->button_draft);
-	bc().addReadOnly(file_->button_nounzip);
+	bc().addReadOnly(file_->check_draft);
+	bc().addReadOnly(file_->check_nounzip);
 
 	// the lyxview section
 	lyxview_.reset(build_lyxview());
@@ -138,9 +138,9 @@ void FormGraphics::build()
 	fl_addto_choice(size_->choice_width_units, choice_Length_All.c_str());
 	fl_addto_choice(size_->choice_height_units, choice_Length_All.c_str());
 
-	bc().addReadOnly(size_->button_asis);
-	bc().addReadOnly(size_->button_wh);
-	bc().addReadOnly(size_->button_scale);
+	bc().addReadOnly(size_->radio_asis);
+	bc().addReadOnly(size_->radio_wh);
+	bc().addReadOnly(size_->radio_scale);
 	bc().addReadOnly(size_->check_aspectratio);
 
 	// the bounding box selection
@@ -163,7 +163,7 @@ void FormGraphics::build()
 	string const bb_units = "pt|cm|in";
 	fl_addto_choice(bbox_->choice_bb_units, bb_units.c_str());
 	bc().addReadOnly(bbox_->button_getBB);
-	bc().addReadOnly(bbox_->button_clip);
+	bc().addReadOnly(bbox_->check_clip);
 
 	// the rotate section
 	special_.reset(build_special());
@@ -172,11 +172,11 @@ void FormGraphics::build()
 	setPrehandler(special_->input_special);
 
 	// add the different tabfolders
-	fl_addto_tabfolder(dialog_->tabFolder, _("File"), file_->form);
-	fl_addto_tabfolder(dialog_->tabFolder, _("LyX View"), lyxview_->form);
-	fl_addto_tabfolder(dialog_->tabFolder, _("LaTeX Size"), size_->form);
-	fl_addto_tabfolder(dialog_->tabFolder, _("Bounding Box"), bbox_->form);
-	fl_addto_tabfolder(dialog_->tabFolder, _("Extras"), special_->form);
+	fl_addto_tabfolder(dialog_->tabfolder, _("File"), file_->form);
+	fl_addto_tabfolder(dialog_->tabfolder, _("LyX View"), lyxview_->form);
+	fl_addto_tabfolder(dialog_->tabfolder, _("LaTeX Size"), size_->form);
+	fl_addto_tabfolder(dialog_->tabfolder, _("Bounding Box"), bbox_->form);
+	fl_addto_tabfolder(dialog_->tabfolder, _("Extras"), special_->form);
 	// set the right default unit
 	if (lyxrc.default_papersize < 3)
 	    defaultUnit = "in"; 
@@ -207,8 +207,8 @@ void FormGraphics::apply()
 	    igp.rotateOrigin = fl_get_choice_text(file_->choice_origin);
 	else
 	    igp.rotateOrigin = string();
-	igp.draft = fl_get_button(file_->button_draft);
-	igp.noUnzip = fl_get_button(file_->button_nounzip);
+	igp.draft = fl_get_button(file_->check_draft);
+	igp.noUnzip = fl_get_button(file_->check_nounzip);
 
 	// the lyxview section
 	if (fl_get_button(lyxview_->radio_pref))
@@ -222,9 +222,9 @@ void FormGraphics::apply()
 	else if (fl_get_button(lyxview_->radio_nodisplay))
 	    igp.display = InsetGraphicsParams::NONE;
 
-	if (fl_get_button(lyxview_->button_lyxasis))
+	if (fl_get_button(lyxview_->radio_lyxasis))
 	    igp.lyxsize_type = InsetGraphicsParams::DEFAULT_SIZE;
-	else if (fl_get_button(lyxview_->button_lyxwh))
+	else if (fl_get_button(lyxview_->radio_lyxwh))
 	    igp.lyxsize_type = InsetGraphicsParams::WH;
 	else
 	    igp.lyxsize_type = InsetGraphicsParams::SCALE;
@@ -235,9 +235,9 @@ void FormGraphics::apply()
 	igp.lyxscale = strToInt(getStringFromInput(lyxview_->input_lyxscale));
 
 	// the size section
-	if (fl_get_button(size_->button_asis))
+	if (fl_get_button(size_->radio_asis))
 	    igp.size_type = InsetGraphicsParams::DEFAULT_SIZE;
-	else if (fl_get_button(size_->button_wh))
+	else if (fl_get_button(size_->radio_wh))
 	    igp.size_type = InsetGraphicsParams::WH;
 	else
 	    igp.size_type = InsetGraphicsParams::SCALE;
@@ -275,7 +275,7 @@ void FormGraphics::apply()
 			bbox_->choice_bb_units)+" ");
 	    igp.bb = bb;
 	}
-	igp.clip = fl_get_button(bbox_->button_clip);
+	igp.clip = fl_get_button(bbox_->check_clip);
 
 	// the special section
 	igp.special = getStringFromInput(special_->input_special);
@@ -303,8 +303,8 @@ void FormGraphics::update() {
 		   fl_get_button(file_->check_rotate));
 	setEnabled(file_->choice_origin,
 		   fl_get_button(file_->check_rotate));
-	fl_set_button(file_->button_draft, igp.draft);
-	fl_set_button(file_->button_nounzip, igp.noUnzip);
+	fl_set_button(file_->check_draft, igp.draft);
+	fl_set_button(file_->check_nounzip, igp.noUnzip);
 
 	// the lyxview section
 	switch (igp.display) {
@@ -331,7 +331,7 @@ void FormGraphics::update() {
 	fl_set_input(lyxview_->input_lyxscale, tostr(igp.lyxscale).c_str());
 	switch (igp.lyxsize_type) {
 	    case InsetGraphicsParams::DEFAULT_SIZE: {
-		fl_set_button(lyxview_->button_lyxasis,1);
+		fl_set_button(lyxview_->radio_lyxasis,1);
 		setEnabled(lyxview_->input_lyxwidth, 0);
 		setEnabled(lyxview_->choice_width_lyxwidth, 0);
 		setEnabled(lyxview_->input_lyxheight, 0);
@@ -340,7 +340,7 @@ void FormGraphics::update() {
 		break;
 	    }
 	    case InsetGraphicsParams::WH: {
-		fl_set_button(lyxview_->button_lyxwh, 1);
+		fl_set_button(lyxview_->radio_lyxwh, 1);
 		setEnabled(lyxview_->input_lyxwidth, 1);
 		setEnabled(lyxview_->choice_width_lyxwidth, 1);
 		setEnabled(lyxview_->input_lyxheight, 1);
@@ -349,7 +349,7 @@ void FormGraphics::update() {
 		break;
 	    }
 	    case InsetGraphicsParams::SCALE: {
-		fl_set_button(lyxview_->button_lyxscale, 1);
+		fl_set_button(lyxview_->radio_lyxscale, 1);
 		setEnabled(lyxview_->input_lyxwidth, 0);
 		setEnabled(lyxview_->choice_width_lyxwidth, 0);
 		setEnabled(lyxview_->input_lyxheight, 0);
@@ -368,7 +368,7 @@ void FormGraphics::update() {
 	fl_set_input(size_->input_scale, tostr(igp.scale).c_str());
 	switch (igp.size_type) {
 	    case InsetGraphicsParams::DEFAULT_SIZE: {
-		fl_set_button(size_->button_asis,1);
+		fl_set_button(size_->radio_asis,1);
 		setEnabled(size_->input_width, 0);
 		setEnabled(size_->choice_width_units, 0);
 		setEnabled(size_->input_height, 0);
@@ -378,7 +378,7 @@ void FormGraphics::update() {
 		break;
 	    }
 	    case InsetGraphicsParams::WH: {
-		fl_set_button(size_->button_wh, 1);
+		fl_set_button(size_->radio_wh, 1);
 		setEnabled(size_->input_width, 1);
 		setEnabled(size_->choice_width_units, 1);
 		setEnabled(size_->input_height, 1);
@@ -388,7 +388,7 @@ void FormGraphics::update() {
 		break;
 	    }
 	    case InsetGraphicsParams::SCALE: {
-		fl_set_button(size_->button_scale, 1);
+		fl_set_button(size_->radio_scale, 1);
 		setEnabled(size_->input_width, 0);
 		setEnabled(size_->choice_width_units, 0);
 		setEnabled(size_->input_height, 0);
@@ -440,7 +440,7 @@ void FormGraphics::update() {
 	    updateWidgetsFromLength(bbox_->input_bb_y1,
 	    		bbox_->choice_bb_units,anyLength,"pt");
 	}
-	fl_set_button(bbox_->button_clip, igp.clip);
+	fl_set_button(bbox_->check_clip, igp.clip);
 
 	// the special section
 	fl_set_input(special_->input_special, igp.special.c_str());
@@ -479,19 +479,19 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long)
 			   fl_get_button(file_->check_rotate));
 
 	// the lyxview section
-	} else if (ob == lyxview_->button_lyxasis) {
+	} else if (ob == lyxview_->radio_lyxasis) {
 	    	setEnabled(lyxview_->input_lyxwidth, 0);
 	    	setEnabled(lyxview_->choice_width_lyxwidth, 0);
 	    	setEnabled(lyxview_->input_lyxheight, 0);
 	    	setEnabled(lyxview_->choice_width_lyxheight, 0);
 	    	setEnabled(lyxview_->input_lyxscale, 0);
-	} else if (ob == lyxview_->button_lyxwh) {
+	} else if (ob == lyxview_->radio_lyxwh) {
 	    	setEnabled(lyxview_->input_lyxwidth, 1);
 	    	setEnabled(lyxview_->choice_width_lyxwidth, 1);
 	    	setEnabled(lyxview_->input_lyxheight, 1);
 	    	setEnabled(lyxview_->choice_width_lyxheight, 1);
 	    	setEnabled(lyxview_->input_lyxscale, 0);
-	} else if (ob == lyxview_->button_lyxscale) {
+	} else if (ob == lyxview_->radio_lyxscale) {
 	    	setEnabled(lyxview_->input_lyxwidth, 0);
 	    	setEnabled(lyxview_->choice_width_lyxwidth, 0);
 	    	setEnabled(lyxview_->input_lyxheight, 0);
@@ -513,22 +513,22 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long)
 				lyxview_->choice_width_lyxheight, dummy, defaultUnit);
 	    		string const scale = getStringFromInput(size_->input_scale);
 	    		fl_set_input(lyxview_->input_lyxscale, scale.c_str());
-	    		if (fl_get_button (size_->button_asis) == 1) {
-	    			fl_set_button (lyxview_->button_lyxasis, 1);
+	    		if (fl_get_button (size_->radio_asis) == 1) {
+	    			fl_set_button (lyxview_->radio_lyxasis, 1);
 				setEnabled(lyxview_->input_lyxwidth, 0);
 	    			setEnabled(lyxview_->choice_width_lyxwidth, 0);
 	    			setEnabled(lyxview_->input_lyxheight, 0);
 	    			setEnabled(lyxview_->choice_width_lyxheight, 0);
 	    			setEnabled(lyxview_->input_lyxscale, 0);
-	    		} else if (fl_get_button (size_->button_wh) == 1) {
-	    			fl_set_button (lyxview_->button_lyxwh, 1);
+	    		} else if (fl_get_button (size_->radio_wh) == 1) {
+	    			fl_set_button (lyxview_->radio_lyxwh, 1);
 	    			setEnabled(lyxview_->input_lyxwidth, 1);
 	    			setEnabled(lyxview_->choice_width_lyxwidth, 1);
 	    			setEnabled(lyxview_->input_lyxheight, 1);
 	    			setEnabled(lyxview_->choice_width_lyxheight, 1);
 	    			setEnabled(lyxview_->input_lyxscale, 0);
-	    		} else if (fl_get_button (size_->button_scale) ==1) {
-	    			fl_set_button (lyxview_->button_lyxscale, 1);
+	    		} else if (fl_get_button (size_->radio_scale) ==1) {
+	    			fl_set_button (lyxview_->radio_lyxscale, 1);
 	    			setEnabled(lyxview_->input_lyxwidth, 0);
 	    			setEnabled(lyxview_->choice_width_lyxwidth, 0);
 	    			setEnabled(lyxview_->input_lyxheight, 0);
@@ -566,21 +566,21 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long)
 	    }
 
 	// the size section
-	} else if (ob == size_->button_asis) {
+	} else if (ob == size_->radio_asis) {
 	    	setEnabled(size_->input_width, 0);
 	    	setEnabled(size_->choice_width_units, 0);
 	    	setEnabled(size_->input_height, 0);
 	    	setEnabled(size_->choice_height_units, 0);
 		setEnabled(size_->check_aspectratio, 0);
 	    	setEnabled(size_->input_scale, 0);
-	} else if (ob == size_->button_wh) {
+	} else if (ob == size_->radio_wh) {
 	    	setEnabled(size_->input_width, 1);
 	    	setEnabled(size_->choice_width_units, 1);
 	    	setEnabled(size_->input_height, 1);
 	    	setEnabled(size_->choice_height_units, 1);
 		setEnabled(size_->check_aspectratio, 1);
 	    	setEnabled(size_->input_scale, 0);
-	} else if (ob == size_->button_scale) {
+	} else if (ob == size_->radio_scale) {
 	    	setEnabled(size_->input_width, 0);
 	    	setEnabled(size_->choice_width_units, 0);
 	    	setEnabled(size_->input_height, 0);
@@ -598,24 +598,24 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long)
 		size_->choice_height_units, dummy, defaultUnit);
 	    string const scale = getStringFromInput(lyxview_->input_lyxscale);
 	    fl_set_input(size_->input_scale, scale.c_str());
-	    if (fl_get_button (lyxview_->button_lyxasis) == 1) {
-	    	fl_set_button (size_->button_asis, 1);
+	    if (fl_get_button (lyxview_->radio_lyxasis) == 1) {
+	    	fl_set_button (size_->radio_asis, 1);
 		setEnabled(size_->input_width, 0);
 	    	setEnabled(size_->choice_width_units, 0);
 	    	setEnabled(size_->input_height, 0);
 	    	setEnabled(size_->choice_height_units, 0);
 		setEnabled(size_->check_aspectratio, 0);
 	    	setEnabled(size_->input_scale, 0);
-	    } else if (fl_get_button (lyxview_->button_lyxwh) == 1) {
-	    	fl_set_button (size_->button_wh, 1);
+	    } else if (fl_get_button (lyxview_->radio_lyxwh) == 1) {
+	    	fl_set_button (size_->radio_wh, 1);
 		setEnabled(size_->input_width, 1);
 	    	setEnabled(size_->choice_width_units, 1);
 	    	setEnabled(size_->input_height, 1);
 	    	setEnabled(size_->choice_height_units, 1);
 		setEnabled(size_->check_aspectratio, 1);
 	    	setEnabled(size_->input_scale, 0);
-	    } else if (fl_get_button (lyxview_->button_lyxscale) ==1) {
-	    	fl_set_button (size_->button_scale, 1);
+	    } else if (fl_get_button (lyxview_->radio_lyxscale) ==1) {
+	    	fl_set_button (size_->radio_scale, 1);
 		setEnabled(size_->input_width, 0);
 	    	setEnabled(size_->choice_width_units, 0);
 	    	setEnabled(size_->input_height, 0);
diff --git a/src/frontends/xforms/FormInclude.C b/src/frontends/xforms/FormInclude.C
index c7e44b4673..144f54ce8e 100644
--- a/src/frontends/xforms/FormInclude.C
+++ b/src/frontends/xforms/FormInclude.C
@@ -39,13 +39,13 @@ void FormInclude::build()
 
 	// Manage the ok and cancel buttons
 	bc().setOK(dialog_->button_ok);
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 
 	bc().addReadOnly(dialog_->button_browse);
-	bc().addReadOnly(dialog_->check_verbatim);
+	bc().addReadOnly(dialog_->radio_verbatim);
 	bc().addReadOnly(dialog_->check_typeset);
-	bc().addReadOnly(dialog_->check_useinput);
-	bc().addReadOnly(dialog_->check_useinclude);
+	bc().addReadOnly(dialog_->radio_useinput);
+	bc().addReadOnly(dialog_->radio_useinclude);
 }
 
 
@@ -54,9 +54,9 @@ void FormInclude::update()
 	if (controller().params().noload) {
 		fl_set_input(dialog_->input_filename, "");
 		fl_set_button(dialog_->check_typeset, 0);
-		fl_set_button(dialog_->check_useinput, 0);
-		fl_set_button(dialog_->check_useinclude, 1);
-		fl_set_button(dialog_->check_verbatim, 0);
+		fl_set_button(dialog_->radio_useinput, 0);
+		fl_set_button(dialog_->radio_useinclude, 1);
+		fl_set_button(dialog_->radio_verbatim, 0);
 		fl_set_button(dialog_->check_visiblespace, 0);
 		fl_deactivate_object(dialog_->check_visiblespace);
 		fl_set_object_lcol(dialog_->check_visiblespace, FL_INACTIVE);
@@ -71,10 +71,10 @@ void FormInclude::update()
 	fl_set_button(dialog_->check_typeset,
 		      int(controller().params().noload));
 
-	fl_set_button(dialog_->check_useinput, cmdname == "input");
-	fl_set_button(dialog_->check_useinclude, cmdname == "include");
+	fl_set_button(dialog_->radio_useinput, cmdname == "input");
+	fl_set_button(dialog_->radio_useinclude, cmdname == "include");
 	if (cmdname == "verbatiminput" || cmdname == "verbatiminput*") {
-		fl_set_button(dialog_->check_verbatim, 1);
+		fl_set_button(dialog_->radio_verbatim, 1);
 		fl_set_button(dialog_->check_visiblespace, cmdname == "verbatiminput*");
 		setEnabled(dialog_->check_visiblespace, true);
 	} else {
@@ -83,7 +83,7 @@ void FormInclude::update()
 	}
  
 	if (cmdname.empty())
-		fl_set_button(dialog_->check_useinclude, 1);
+		fl_set_button(dialog_->radio_useinclude, 1);
 }
 
 
@@ -97,11 +97,11 @@ void FormInclude::apply()
 	else
 	    controller().params().cparams.setContents("");
 
-	if (fl_get_button(dialog_->check_useinput))
+	if (fl_get_button(dialog_->radio_useinput))
 		controller().params().flag = InsetInclude::INPUT;
-	else if (fl_get_button(dialog_->check_useinclude))
+	else if (fl_get_button(dialog_->radio_useinclude))
 		controller().params().flag = InsetInclude::INCLUDE;
-	else if (fl_get_button(dialog_->check_verbatim)) {
+	else if (fl_get_button(dialog_->radio_verbatim)) {
 		if (fl_get_button(dialog_->check_visiblespace))
 			controller().params().flag = InsetInclude::VERBAST;
 		else
@@ -116,9 +116,9 @@ ButtonPolicy::SMInput FormInclude::input(FL_OBJECT * ob, long)
 
 	if (ob == dialog_->button_browse) {
 		ControlInclude::Type type;
-		if (fl_get_button(dialog_->check_useinput))
+		if (fl_get_button(dialog_->radio_useinput))
 			type = ControlInclude::INPUT;
-		else if (fl_get_button(dialog_->check_verbatim))
+		else if (fl_get_button(dialog_->radio_verbatim))
 			type = ControlInclude::VERBATIM;
 		else
 			type = ControlInclude::INCLUDE;
@@ -138,11 +138,11 @@ ButtonPolicy::SMInput FormInclude::input(FL_OBJECT * ob, long)
 			action = ButtonPolicy::SMI_NOOP;
 		}
 
-	} else if (ob == dialog_->check_verbatim) {
+	} else if (ob == dialog_->radio_verbatim) {
 		setEnabled(dialog_->check_visiblespace, true);
 
-	} else if (ob == dialog_->check_useinclude ||
-		   ob == dialog_->check_useinput) {
+	} else if (ob == dialog_->radio_useinclude ||
+		   ob == dialog_->radio_useinput) {
 		fl_set_button(dialog_->check_visiblespace, 0);
 		setEnabled(dialog_->check_visiblespace, false);
 
diff --git a/src/frontends/xforms/FormIndex.C b/src/frontends/xforms/FormIndex.C
index 8679e52a59..8412b61434 100644
--- a/src/frontends/xforms/FormIndex.C
+++ b/src/frontends/xforms/FormIndex.C
@@ -35,7 +35,7 @@ void FormIndex::build()
         // Manage the ok, apply, restore and cancel/close buttons
 	bc().setOK(dialog_->button_ok);
 	bc().setApply(dialog_->button_apply);
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 	bc().setRestore(dialog_->button_restore);
 
 	bc().addReadOnly(dialog_->input_key);
diff --git a/src/frontends/xforms/FormMathsBitmap.C b/src/frontends/xforms/FormMathsBitmap.C
index 4ef8548871..faee1fea87 100644
--- a/src/frontends/xforms/FormMathsBitmap.C
+++ b/src/frontends/xforms/FormMathsBitmap.C
@@ -90,15 +90,15 @@ void FormMathsBitmap::build()
 	x_ = (form_->w - 90) / 2;
 	y_ += 10;
 
-	FL_OBJECT * button_cancel =
+	FL_OBJECT * button_close =
 		fl_add_button(FL_NORMAL_BUTTON, x_, y_, 90, 30, idex(_(label)));
-	fl_set_button_shortcut(button_cancel, scex(_(label)), 1);
-	fl_set_object_lsize(button_cancel, FL_NORMAL_SIZE);
-	fl_set_object_callback(button_cancel, C_FormBaseDeprecatedCancelCB, 0);
+	fl_set_button_shortcut(button_close, scex(_(label)), 1);
+	fl_set_object_lsize(button_close, FL_NORMAL_SIZE);
+	fl_set_object_callback(button_close, C_FormBaseDeprecatedCancelCB, 0);
 
 	fl_end_form();
 
-	bc().setCancel(button_cancel);
+	bc().setCancel(button_close);
 }
 
 
diff --git a/src/frontends/xforms/FormMathsDeco.C b/src/frontends/xforms/FormMathsDeco.C
index 85a347edbd..461a15e160 100644
--- a/src/frontends/xforms/FormMathsDeco.C
+++ b/src/frontends/xforms/FormMathsDeco.C
@@ -61,7 +61,7 @@ void FormMathsDeco::build()
 			    deco2_width, deco2_height, deco2_bits);
 	fl_set_bmtable_maxitems(dialog_->bmtable_deco2, 10);
 
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 	bc().addReadOnly(dialog_->bmtable_deco1);
 	bc().addReadOnly(dialog_->bmtable_deco2);
 }
diff --git a/src/frontends/xforms/FormMathsDelim.C b/src/frontends/xforms/FormMathsDelim.C
index b5bb49bac6..f20c3e934e 100644
--- a/src/frontends/xforms/FormMathsDelim.C
+++ b/src/frontends/xforms/FormMathsDelim.C
@@ -70,7 +70,7 @@ void FormMathsDelim::build()
 
 	bc().setOK(dialog_->button_ok);
 	bc().setApply(dialog_->button_apply);
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 
 	bc().addReadOnly(dialog_->bmtable);
 	bc().addReadOnly(dialog_->radio_right);
diff --git a/src/frontends/xforms/FormMathsMatrix.C b/src/frontends/xforms/FormMathsMatrix.C
index 332e03e98e..8be7fd890e 100644
--- a/src/frontends/xforms/FormMathsMatrix.C
+++ b/src/frontends/xforms/FormMathsMatrix.C
@@ -79,7 +79,7 @@ void FormMathsMatrix::build()
 
 	bc().setOK(dialog_->button_ok);
 	bc().setApply(dialog_->button_apply);
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 
 	bc().addReadOnly(dialog_->slider_rows);
 	bc().addReadOnly(dialog_->slider_columns);
diff --git a/src/frontends/xforms/FormMathsSpace.C b/src/frontends/xforms/FormMathsSpace.C
index c8c9e9bb40..19dc369be3 100644
--- a/src/frontends/xforms/FormMathsSpace.C
+++ b/src/frontends/xforms/FormMathsSpace.C
@@ -41,7 +41,7 @@ void FormMathsSpace::build()
 
 	space_ = -1;
 
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 
 	bc().addReadOnly(dialog_->button_thin);
 	bc().addReadOnly(dialog_->button_medium);
diff --git a/src/frontends/xforms/FormMathsStyle.C b/src/frontends/xforms/FormMathsStyle.C
index 5b1f9daa5e..4a9e1e5012 100644
--- a/src/frontends/xforms/FormMathsStyle.C
+++ b/src/frontends/xforms/FormMathsStyle.C
@@ -75,7 +75,7 @@ void FormMathsStyle::build()
 	fl_set_bmtable_maxitems(dialog_->bmtable_font2, 3);
 	bc().addReadOnly(dialog_->bmtable_font2);
 
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 	}
 
 
diff --git a/src/frontends/xforms/FormMinipage.C b/src/frontends/xforms/FormMinipage.C
index 26644846c1..10955696de 100644
--- a/src/frontends/xforms/FormMinipage.C
+++ b/src/frontends/xforms/FormMinipage.C
@@ -41,12 +41,11 @@ void FormMinipage::build()
 	// Manage the ok, apply and cancel/close buttons
 	bc().setOK(dialog_->button_ok);
 	bc().setApply(dialog_->button_apply);
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 	bc().setRestore(dialog_->button_restore);
 
 	bc().addReadOnly(dialog_->input_width);
 	bc().addReadOnly(dialog_->choice_width_units);
-	bc().addReadOnly(dialog_->group_alignment);
 	bc().addReadOnly(dialog_->radio_top);
 	bc().addReadOnly(dialog_->radio_middle);
 	bc().addReadOnly(dialog_->radio_bottom);
diff --git a/src/frontends/xforms/FormParagraph.C b/src/frontends/xforms/FormParagraph.C
index dd5c4bb315..34fcf0467f 100644
--- a/src/frontends/xforms/FormParagraph.C
+++ b/src/frontends/xforms/FormParagraph.C
@@ -156,14 +156,13 @@ void FormParagraph::build()
     // Manage the ok, apply, restore and cancel/close buttons
     bc_.setOK(dialog_->button_ok);
     bc_.setApply(dialog_->button_apply);
-    bc_.setCancel(dialog_->button_cancel);
+    bc_.setCancel(dialog_->button_close);
     bc_.setRestore(dialog_->button_restore);
 
-    bc_.addReadOnly (dialog_->group_radio_alignment);
-    // bc_.addReadOnly (dialog_->radio_align_right);
-    // bc_.addReadOnly (dialog_->radio_align_left);
-    // bc_.addReadOnly (dialog_->radio_align_block);
-    // bc_.addReadOnly (dialog_->radio_align_center);
+    bc_.addReadOnly (dialog_->radio_align_right);
+    bc_.addReadOnly (dialog_->radio_align_left);
+    bc_.addReadOnly (dialog_->radio_align_block);
+    bc_.addReadOnly (dialog_->radio_align_center);
     bc_.addReadOnly (dialog_->check_lines_top);
     bc_.addReadOnly (dialog_->check_lines_bottom);
     bc_.addReadOnly (dialog_->check_pagebreaks_top);
diff --git a/src/frontends/xforms/FormPreamble.C b/src/frontends/xforms/FormPreamble.C
index 154ea4b459..4a88025835 100644
--- a/src/frontends/xforms/FormPreamble.C
+++ b/src/frontends/xforms/FormPreamble.C
@@ -37,7 +37,7 @@ void FormPreamble::build()
 	// Manage the ok, apply and cancel/close buttons
 	bc().setOK(dialog_->button_ok);
 	bc().setApply(dialog_->button_apply);
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 }
 
 
diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index 156a69b11c..1a2dc14586 100644
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -165,7 +165,7 @@ void FormPreferences::build()
 	// Manage the restore, save, apply and cancel/close buttons
 	bc().setOK(dialog_->button_ok);
 	bc().setApply(dialog_->button_apply);
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 	bc().setRestore(dialog_->button_restore);
 
 	// Allow the base class to control messages
diff --git a/src/frontends/xforms/FormPrint.C b/src/frontends/xforms/FormPrint.C
index 859e19f6a7..6bc391a5d3 100644
--- a/src/frontends/xforms/FormPrint.C
+++ b/src/frontends/xforms/FormPrint.C
@@ -53,7 +53,7 @@ void FormPrint::build()
 	// Manage the ok, apply and cancel/close buttons
 	bc().setOK(dialog_->button_ok);
 	bc().setApply(dialog_->button_apply);
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 
 	// allow controlling of input and ok/apply (de)activation
 	fl_set_input_return(dialog_->input_printer,
@@ -132,7 +132,7 @@ void FormPrint::apply()
 			       string(fl_get_input(dialog_->input_file)),
 			       wp, from, to,
 			       static_cast<bool>(order_.getButton()),
-			       !static_cast<bool>(fl_get_button(dialog_->radio_collated)),
+			       !static_cast<bool>(fl_get_button(dialog_->check_collated)),
 			       strToInt(fl_get_input(dialog_->input_count)));
 
 	controller().params() = pp;
diff --git a/src/frontends/xforms/FormRef.C b/src/frontends/xforms/FormRef.C
index 8a0f6f1efa..187139d424 100644
--- a/src/frontends/xforms/FormRef.C
+++ b/src/frontends/xforms/FormRef.C
@@ -55,7 +55,7 @@ void FormRef::build()
 	// Manage the ok and cancel/close buttons
 	bc().setOK(dialog_->button_ok);
 	bc().setApply(dialog_->button_apply);
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 	bc().setRestore(dialog_->button_restore);
 
 	bc().addReadOnly(dialog_->button_update);
diff --git a/src/frontends/xforms/FormSearch.C b/src/frontends/xforms/FormSearch.C
index f01efb6686..f22dccf865 100644
--- a/src/frontends/xforms/FormSearch.C
+++ b/src/frontends/xforms/FormSearch.C
@@ -29,30 +29,32 @@ void FormSearch::build()
 	dialog_.reset(build_search());
 	
 	// Manage the ok, apply and cancel/close buttons
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 	bc().addReadOnly(dialog_->input_replace);
-	bc().addReadOnly(dialog_->replace);
-	bc().addReadOnly(dialog_->replaceall);
+	bc().addReadOnly(dialog_->button_replace);
+	bc().addReadOnly(dialog_->button_replaceall);
 }
 
 
 ButtonPolicy::SMInput FormSearch::input(FL_OBJECT * obj, long)
 {
-	if (obj == dialog_->findnext || obj == dialog_->findprev) {
-		bool const forward = (obj == dialog_->findnext);
+	if (obj == dialog_->button_findnext ||
+	    obj == dialog_->button_findprev) {
+		bool const forward = (obj == dialog_->button_findnext);
 	
 		controller().find(fl_get_input(dialog_->input_search),
-				  fl_get_button(dialog_->casesensitive),
-				  fl_get_button(dialog_->matchword),
+				  fl_get_button(dialog_->check_casesensitive),
+				  fl_get_button(dialog_->check_matchword),
 				  forward);
 
-	} else if (obj == dialog_->replace || obj == dialog_->replaceall) {
-		bool const all = (obj == dialog_->replaceall);
+	} else if (obj == dialog_->button_replace ||
+		   obj == dialog_->button_replaceall) {
+		bool const all = (obj == dialog_->button_replaceall);
 	
 		controller().replace(fl_get_input(dialog_->input_search),
 				     fl_get_input(dialog_->input_replace),
-				     fl_get_button(dialog_->casesensitive),
-				     fl_get_button(dialog_->matchword),
+				     fl_get_button(dialog_->check_casesensitive),
+				     fl_get_button(dialog_->check_matchword),
 				     all);
 	}
    
diff --git a/src/frontends/xforms/FormSendto.C b/src/frontends/xforms/FormSendto.C
index bb4c29969e..39fa5cdae9 100644
--- a/src/frontends/xforms/FormSendto.C
+++ b/src/frontends/xforms/FormSendto.C
@@ -40,7 +40,7 @@ void FormSendto::build()
         // Manage the ok, apply, restore and cancel/close buttons
 	bc().setOK(dialog_->button_ok);
 	bc().setApply(dialog_->button_apply);
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 
 	// Set up the tooltip mechanism
 	string str = N_("Export the buffer to this format before running the command below on it.");
diff --git a/src/frontends/xforms/FormSpellchecker.C b/src/frontends/xforms/FormSpellchecker.C
index 4c00ebc9a8..4f69e7298c 100644
--- a/src/frontends/xforms/FormSpellchecker.C
+++ b/src/frontends/xforms/FormSpellchecker.C
@@ -39,13 +39,13 @@ void FormSpellchecker::build()
 	setPrehandler(dialog_->input);
 
 	// Manage the buttons
-	bc().setCancel(dialog_->done);
-	bc().addReadOnly(dialog_->replace);
-	bc().addReadOnly(dialog_->accept);
-	bc().addReadOnly(dialog_->insert);
-	bc().addReadOnly(dialog_->ignore);
-	bc().addReadOnly(dialog_->start);
-	bc().addReadOnly(dialog_->stop);
+	bc().setCancel(dialog_->button_close);
+	bc().addReadOnly(dialog_->button_replace);
+	bc().addReadOnly(dialog_->button_accept);
+	bc().addReadOnly(dialog_->button_insert);
+	bc().addReadOnly(dialog_->button_ignore);
+	bc().addReadOnly(dialog_->button_start);
+	bc().addReadOnly(dialog_->button_stop);
 	bc().addReadOnly(dialog_->browser);
 }
 
@@ -60,28 +60,28 @@ void FormSpellchecker::update()
 
 ButtonPolicy::SMInput FormSpellchecker::input(FL_OBJECT * obj, long val)
 {
-	if (obj == dialog_->replace) {
+	if (obj == dialog_->button_replace) {
 		string const tmp = getStringFromInput(dialog_->input);
 		controller().replace(tmp);
 
-	} else if (obj == dialog_->start) {
+	} else if (obj == dialog_->button_start) {
 		controller().check();
 		stop(false);
 
-	} else if (obj == dialog_->stop) {
+	} else if (obj == dialog_->button_stop) {
 		controller().stop();
 		stop(true);
 
-	} else if (obj == dialog_->ignore) {
+	} else if (obj == dialog_->button_ignore) {
 		controller().check();
 
-	} else if (obj == dialog_->accept) {
+	} else if (obj == dialog_->button_accept) {
 		controller().ignoreAll();
 
-	} else if (obj == dialog_->insert) {
+	} else if (obj == dialog_->button_insert) {
 		controller().insert();
 
-	} else if (obj == dialog_->options) {
+	} else if (obj == dialog_->button_options) {
 		controller().options();
 
 	} else if (obj == dialog_->browser) {
@@ -144,12 +144,12 @@ void FormSpellchecker::showMessage(const char * msg)
 
 void FormSpellchecker::stop(bool stop)
 {
-	setEnabled(dialog_->start, stop);
-	setEnabled(dialog_->replace, !stop);
-	setEnabled(dialog_->ignore, !stop);
-	setEnabled(dialog_->accept, !stop);
-	setEnabled(dialog_->insert, !stop);
-	setEnabled(dialog_->stop, !stop);
+	setEnabled(dialog_->button_start, stop);
+	setEnabled(dialog_->button_replace, !stop);
+	setEnabled(dialog_->button_ignore, !stop);
+	setEnabled(dialog_->button_accept, !stop);
+	setEnabled(dialog_->button_insert, !stop);
+	setEnabled(dialog_->button_stop, !stop);
 	setEnabled(dialog_->browser, !stop);
 	setEnabled(dialog_->input, !stop);
 }
diff --git a/src/frontends/xforms/FormTabular.C b/src/frontends/xforms/FormTabular.C
index 89bfb5427a..781a2237fb 100644
--- a/src/frontends/xforms/FormTabular.C
+++ b/src/frontends/xforms/FormTabular.C
@@ -56,7 +56,7 @@ void FormTabular::redraw()
 	else
 		return;
 
-	FL_FORM * outer_form = fl_get_active_folder(dialog_->tabFolder);
+	FL_FORM * outer_form = fl_get_active_folder(dialog_->tabfolder);
 	if (outer_form && outer_form->visible)
 		fl_redraw_form(outer_form);
 }
@@ -135,13 +135,13 @@ void FormTabular::build()
 	setPrehandler(cell_options_->input_mcolumn_width);
 	setPrehandler(cell_options_->input_special_multialign);
 
-	fl_addto_tabfolder(dialog_->tabFolder, _("Tabular"),
+	fl_addto_tabfolder(dialog_->tabfolder, _("Tabular"),
 	                   tabular_options_->form);
-	fl_addto_tabfolder(dialog_->tabFolder, _("Column/Row"),
+	fl_addto_tabfolder(dialog_->tabfolder, _("Column/Row"),
 	                   column_options_->form);
-	fl_addto_tabfolder(dialog_->tabFolder, _("Cell"),
+	fl_addto_tabfolder(dialog_->tabfolder, _("Cell"),
 	                   cell_options_->form);
-	fl_addto_tabfolder(dialog_->tabFolder, _("LongTable"),
+	fl_addto_tabfolder(dialog_->tabfolder, _("LongTable"),
 	                   longtable_options_->form);
 
 	// Create the contents of the unit choices
@@ -200,19 +200,19 @@ void FormTabular::update()
 	fl_set_input(dialog_->input_tabular_row, buf);
 	fl_deactivate_object(dialog_->input_tabular_row);
 	if (tabular->IsMultiColumn(cell)) {
-		fl_set_button(cell_options_->radio_multicolumn, 1);
-		fl_set_button(cell_options_->radio_border_top,
+		fl_set_button(cell_options_->check_multicolumn, 1);
+		fl_set_button(cell_options_->check_border_top,
 		              tabular->TopLine(cell)?1:0);
-		setEnabled(cell_options_->radio_border_top, true);
-		fl_set_button(cell_options_->radio_border_bottom,
+		setEnabled(cell_options_->check_border_top, true);
+		fl_set_button(cell_options_->check_border_bottom,
 		              tabular->BottomLine(cell)?1:0);
-		setEnabled(cell_options_->radio_border_bottom, true);
-		fl_set_button(cell_options_->radio_border_left,
+		setEnabled(cell_options_->check_border_bottom, true);
+		fl_set_button(cell_options_->check_border_left,
 		              tabular->LeftLine(cell)?1:0);
-		setEnabled(cell_options_->radio_border_left, true);
-		fl_set_button(cell_options_->radio_border_right,
+		setEnabled(cell_options_->check_border_left, true);
+		fl_set_button(cell_options_->check_border_right,
 		              tabular->RightLine(cell)?1:0);
-		setEnabled(cell_options_->radio_border_right, true);
+		setEnabled(cell_options_->check_border_right, true);
 		pwidth = tabular->GetMColumnPWidth(cell);
 		align = tabular->GetAlignment(cell);
 		if (!pwidth.zero() || (align == LYX_ALIGN_LEFT))
@@ -255,19 +255,19 @@ void FormTabular::update()
 		setEnabled(cell_options_->radio_align_right,  pwidth.zero());
 		setEnabled(cell_options_->radio_align_center, pwidth.zero());
 	} else {
-		fl_set_button(cell_options_->radio_multicolumn, 0);
+		fl_set_button(cell_options_->check_multicolumn, 0);
 
-		fl_set_button(cell_options_->radio_border_top, 0);
-		setEnabled(cell_options_->radio_border_top, false);
+		fl_set_button(cell_options_->check_border_top, 0);
+		setEnabled(cell_options_->check_border_top, false);
 
-		fl_set_button(cell_options_->radio_border_bottom, 0);
-		setEnabled(cell_options_->radio_border_bottom, false);
+		fl_set_button(cell_options_->check_border_bottom, 0);
+		setEnabled(cell_options_->check_border_bottom, false);
 
-		fl_set_button(cell_options_->radio_border_left, 0);
-		setEnabled(cell_options_->radio_border_left, false);
+		fl_set_button(cell_options_->check_border_left, 0);
+		setEnabled(cell_options_->check_border_left, false);
 
-		fl_set_button(cell_options_->radio_border_right, 0);
-		setEnabled(cell_options_->radio_border_right, false);
+		fl_set_button(cell_options_->check_border_right, 0);
+		setEnabled(cell_options_->check_border_right, false);
 
 		fl_set_button(cell_options_->radio_align_left, 0);
 		setEnabled(cell_options_->radio_align_left, false);
@@ -295,25 +295,25 @@ void FormTabular::update()
 		setEnabled(cell_options_->choice_value_mcolumn_width, false);
 	}
 	if (tabular->GetRotateCell(cell))
-		fl_set_button(cell_options_->radio_rotate_cell, 1);
+		fl_set_button(cell_options_->check_rotate_cell, 1);
 	else
-		fl_set_button(cell_options_->radio_rotate_cell, 0);
+		fl_set_button(cell_options_->check_rotate_cell, 0);
 	if (tabular->TopLine(cell, true))
-		fl_set_button(column_options_->radio_border_top, 1);
+		fl_set_button(column_options_->check_border_top, 1);
 	else
-		fl_set_button(column_options_->radio_border_top, 0);
+		fl_set_button(column_options_->check_border_top, 0);
 	if (tabular->BottomLine(cell, true))
-		fl_set_button(column_options_->radio_border_bottom, 1);
+		fl_set_button(column_options_->check_border_bottom, 1);
 	else
-		fl_set_button(column_options_->radio_border_bottom, 0);
+		fl_set_button(column_options_->check_border_bottom, 0);
 	if (tabular->LeftLine(cell, true))
-		fl_set_button(column_options_->radio_border_left, 1);
+		fl_set_button(column_options_->check_border_left, 1);
 	else
-		fl_set_button(column_options_->radio_border_left, 0);
+		fl_set_button(column_options_->check_border_left, 0);
 	if (tabular->RightLine(cell, true))
-		fl_set_button(column_options_->radio_border_right, 1);
+		fl_set_button(column_options_->check_border_right, 1);
 	else
-		fl_set_button(column_options_->radio_border_right, 0);
+		fl_set_button(column_options_->check_border_right, 0);
 	special = tabular->GetAlignSpecial(cell, LyXTabular::SET_SPECIAL_COLUMN);
 	fl_set_input(column_options_->input_special_alignment, special.c_str());
 
@@ -329,14 +329,14 @@ void FormTabular::update()
 	setEnabled(column_options_->input_column_width, !isReadonly);
 	setEnabled(column_options_->choice_value_column_width, !isReadonly);
 
-	setEnabled(cell_options_->radio_useminipage, !pwidth.zero());
+	setEnabled(cell_options_->check_useminipage, !pwidth.zero());
 	if (!pwidth.zero()) {
 		if (tabular->GetUsebox(cell) == 2)
-			fl_set_button(cell_options_->radio_useminipage, 1);
+			fl_set_button(cell_options_->check_useminipage, 1);
 		else
-			fl_set_button(cell_options_->radio_useminipage, 0);
+			fl_set_button(cell_options_->check_useminipage, 0);
 	} else {
-		fl_set_button(cell_options_->radio_useminipage, 0);
+		fl_set_button(cell_options_->check_useminipage, 0);
 	}
 	align = tabular->GetAlignment(cell, true);
 	fl_set_button(column_options_->radio_align_left, 0);
@@ -367,32 +367,32 @@ void FormTabular::update()
 	setEnabled(column_options_->radio_valign_bottom, !pwidth.zero());
 	setEnabled(column_options_->radio_valign_center, !pwidth.zero());
 
-	fl_set_button(tabular_options_->radio_longtable,
+	fl_set_button(tabular_options_->check_longtable,
 	              tabular->IsLongTabular());
 
 	bool const enable = tabular->IsLongTabular();
 	    
-	setEnabled(longtable_options_->radio_lt_firsthead, enable);
+	setEnabled(longtable_options_->check_lt_firsthead, enable);
 	setEnabled(longtable_options_->check_1head_2border_above, enable);
 	setEnabled(longtable_options_->check_1head_2border_below, enable);
 	setEnabled(longtable_options_->check_1head_empty, enable);
-	setEnabled(longtable_options_->radio_lt_head, enable);
+	setEnabled(longtable_options_->check_lt_head, enable);
 	setEnabled(longtable_options_->check_head_2border_above, enable);
 	setEnabled(longtable_options_->check_head_2border_below, enable);
-	setEnabled(longtable_options_->radio_lt_foot, enable);
+	setEnabled(longtable_options_->check_lt_foot, enable);
 	setEnabled(longtable_options_->check_foot_2border_above, enable);
 	setEnabled(longtable_options_->check_foot_2border_below, enable);
-	setEnabled(longtable_options_->radio_lt_lastfoot, enable);
+	setEnabled(longtable_options_->check_lt_lastfoot, enable);
 	setEnabled(longtable_options_->check_lastfoot_2border_above, enable);
 	setEnabled(longtable_options_->check_lastfoot_2border_below, enable);
 	setEnabled(longtable_options_->check_lastfoot_empty, enable);
-	setEnabled(longtable_options_->radio_lt_newpage, enable);
+	setEnabled(longtable_options_->check_lt_newpage, enable);
 
 	if (enable) {
 		LyXTabular::ltType ltt;
 		bool use_empty;
 		bool row_set = tabular->GetRowOfLTHead(row, ltt);
-		fl_set_button(longtable_options_->radio_lt_head, row_set);
+		fl_set_button(longtable_options_->check_lt_head, row_set);
 		if (ltt.set) {
 			fl_set_button(longtable_options_->check_head_2border_above,
 			              ltt.topDL);
@@ -410,7 +410,7 @@ void FormTabular::update()
 		}
 		//
 		row_set = tabular->GetRowOfLTFirstHead(row, ltt);
-		fl_set_button(longtable_options_->radio_lt_firsthead, row_set);
+		fl_set_button(longtable_options_->check_lt_firsthead, row_set);
 		if (ltt.set && (!ltt.empty || !use_empty)) {
 			fl_set_button(longtable_options_->check_1head_2border_above,
 			              ltt.topDL);
@@ -424,12 +424,12 @@ void FormTabular::update()
 			if (use_empty) {
 				fl_set_button(longtable_options_->check_1head_empty,ltt.empty);
 				if (ltt.empty)
-					setEnabled(longtable_options_->radio_lt_firsthead, 0);
+					setEnabled(longtable_options_->check_lt_firsthead, 0);
 			}
 		}
 		//
 		row_set = tabular->GetRowOfLTFoot(row, ltt);
-		fl_set_button(longtable_options_->radio_lt_foot, row_set);
+		fl_set_button(longtable_options_->check_lt_foot, row_set);
 		if (ltt.set) {
 			fl_set_button(longtable_options_->check_foot_2border_above,
 			              ltt.topDL);
@@ -447,7 +447,7 @@ void FormTabular::update()
 		}
 		//
 		row_set = tabular->GetRowOfLTLastFoot(row, ltt);
-		fl_set_button(longtable_options_->radio_lt_lastfoot, row_set);
+		fl_set_button(longtable_options_->check_lt_lastfoot, row_set);
 		if (ltt.set && (!ltt.empty || !use_empty)) {
 			fl_set_button(longtable_options_->check_lastfoot_2border_above,
 			              ltt.topDL);
@@ -462,29 +462,29 @@ void FormTabular::update()
 				fl_set_button(longtable_options_->check_lastfoot_empty,
 				              ltt.empty);
 				if (ltt.empty)
-					setEnabled(longtable_options_->radio_lt_lastfoot, 0);
+					setEnabled(longtable_options_->check_lt_lastfoot, 0);
 			}
 		}
-		fl_set_button(longtable_options_->radio_lt_newpage,
+		fl_set_button(longtable_options_->check_lt_newpage,
 		              tabular->GetLTNewPage(row));
 	} else {
-		fl_set_button(longtable_options_->radio_lt_firsthead, 0);
+		fl_set_button(longtable_options_->check_lt_firsthead, 0);
 		fl_set_button(longtable_options_->check_1head_2border_above, 0);
 		fl_set_button(longtable_options_->check_1head_2border_above, 0);
 		fl_set_button(longtable_options_->check_1head_empty, 0);
-		fl_set_button(longtable_options_->radio_lt_head, 0);
+		fl_set_button(longtable_options_->check_lt_head, 0);
 		fl_set_button(longtable_options_->check_head_2border_above, 0);
 		fl_set_button(longtable_options_->check_head_2border_above, 0);
-		fl_set_button(longtable_options_->radio_lt_foot, 0);
+		fl_set_button(longtable_options_->check_lt_foot, 0);
 		fl_set_button(longtable_options_->check_foot_2border_above, 0);
 		fl_set_button(longtable_options_->check_foot_2border_above, 0);
-		fl_set_button(longtable_options_->radio_lt_lastfoot, 0);
+		fl_set_button(longtable_options_->check_lt_lastfoot, 0);
 		fl_set_button(longtable_options_->check_lastfoot_2border_above, 0);
 		fl_set_button(longtable_options_->check_lastfoot_2border_above, 0);
 		fl_set_button(longtable_options_->check_lastfoot_empty, 0);
-		fl_set_button(longtable_options_->radio_lt_newpage, 0);
+		fl_set_button(longtable_options_->check_lt_newpage, 0);
 	}
-	fl_set_button(tabular_options_->radio_rotate_tabular,
+	fl_set_button(tabular_options_->check_rotate_tabular,
 	              tabular->GetRotateTabular());
 }
 
@@ -602,13 +602,13 @@ bool FormTabular::input(FL_OBJECT * ob, long)
 		num = LyXTabular::SET_ALL_LINES;
 	else if (ob == tabular_options_->button_unset_borders)
 		num = LyXTabular::UNSET_ALL_LINES;
-	else if (ob == column_options_->radio_border_top)
+	else if (ob == column_options_->check_border_top)
 		num = LyXTabular::TOGGLE_LINE_TOP;
-	else if (ob == column_options_->radio_border_bottom)
+	else if (ob == column_options_->check_border_bottom)
 		num = LyXTabular::TOGGLE_LINE_BOTTOM;
-	else if (ob == column_options_->radio_border_left)
+	else if (ob == column_options_->check_border_left)
 		num = LyXTabular::TOGGLE_LINE_LEFT;
-	else if (ob == column_options_->radio_border_right)
+	else if (ob == column_options_->check_border_right)
 		num = LyXTabular::TOGGLE_LINE_RIGHT;
 	else if (ob == column_options_->radio_align_left)
 		num = LyXTabular::ALIGN_LEFT;
@@ -622,45 +622,45 @@ bool FormTabular::input(FL_OBJECT * ob, long)
 		num = LyXTabular::VALIGN_BOTTOM;
 	else if (ob == column_options_->radio_valign_center)
 		num = LyXTabular::VALIGN_CENTER;
-	else if (ob == cell_options_->radio_multicolumn)
+	else if (ob == cell_options_->check_multicolumn)
 		num = LyXTabular::MULTICOLUMN;
-	else if (ob == tabular_options_->radio_longtable) {
-		if (fl_get_button(tabular_options_->radio_longtable))
+	else if (ob == tabular_options_->check_longtable) {
+		if (fl_get_button(tabular_options_->check_longtable))
 		    num = LyXTabular::SET_LONGTABULAR;
 		else
 			num = LyXTabular::UNSET_LONGTABULAR;
-	} else if (ob == tabular_options_->radio_rotate_tabular) {
-		s = fl_get_button(tabular_options_->radio_rotate_tabular);
+	} else if (ob == tabular_options_->check_rotate_tabular) {
+		s = fl_get_button(tabular_options_->check_rotate_tabular);
 		if (s)
 			num = LyXTabular::SET_ROTATE_TABULAR;
 		else
 			num = LyXTabular::UNSET_ROTATE_TABULAR;
-	} else if (ob == cell_options_->radio_rotate_cell) {
-		s = fl_get_button(cell_options_->radio_rotate_cell);
+	} else if (ob == cell_options_->check_rotate_cell) {
+		s = fl_get_button(cell_options_->check_rotate_cell);
 		if (s)
 			num = LyXTabular::SET_ROTATE_CELL;
 		else
 			num = LyXTabular::UNSET_ROTATE_CELL;
-	} else if (ob == cell_options_->radio_useminipage) {
+	} else if (ob == cell_options_->check_useminipage) {
 		num = LyXTabular::SET_USEBOX;
 		special = "2";
-	} else if ((ob == longtable_options_->radio_lt_firsthead) ||
+	} else if ((ob == longtable_options_->check_lt_firsthead) ||
 	           (ob == longtable_options_->check_1head_2border_above) ||
 	           (ob == longtable_options_->check_1head_2border_below) ||
 	           (ob == longtable_options_->check_1head_empty) ||
-	           (ob == longtable_options_->radio_lt_head) ||
+	           (ob == longtable_options_->check_lt_head) ||
 	           (ob == longtable_options_->check_head_2border_above) ||
 	           (ob == longtable_options_->check_head_2border_below) ||
-	           (ob == longtable_options_->radio_lt_foot) ||
+	           (ob == longtable_options_->check_lt_foot) ||
 	           (ob == longtable_options_->check_foot_2border_above) ||
 	           (ob == longtable_options_->check_foot_2border_below) ||
-	           (ob == longtable_options_->radio_lt_lastfoot) ||
+	           (ob == longtable_options_->check_lt_lastfoot) ||
 	           (ob == longtable_options_->check_lastfoot_2border_above) ||
 	           (ob == longtable_options_->check_lastfoot_2border_below) ||
 	           (ob == longtable_options_->check_lastfoot_empty))
 	{
 		num = static_cast<LyXTabular::Feature>(checkLongtableOptions(ob, special));
-	} else if (ob == longtable_options_->radio_lt_newpage) {
+	} else if (ob == longtable_options_->check_lt_newpage) {
 		num = LyXTabular::SET_LTNEWPAGE;
 	} else if (ob == column_options_->input_special_alignment) {
 		special = fl_get_input(column_options_->input_special_alignment);
@@ -668,13 +668,13 @@ bool FormTabular::input(FL_OBJECT * ob, long)
 	} else if (ob == cell_options_->input_special_multialign) {
 		special = fl_get_input(cell_options_->input_special_multialign);
 		num = LyXTabular::SET_SPECIAL_MULTI;
-	} else if (ob == cell_options_->radio_border_top)
+	} else if (ob == cell_options_->check_border_top)
 		num = LyXTabular::M_TOGGLE_LINE_TOP;
-	else if (ob == cell_options_->radio_border_bottom)
+	else if (ob == cell_options_->check_border_bottom)
 		num = LyXTabular::M_TOGGLE_LINE_BOTTOM;
-	else if (ob == cell_options_->radio_border_left)
+	else if (ob == cell_options_->check_border_left)
 		num = LyXTabular::M_TOGGLE_LINE_LEFT;
-	else if (ob == cell_options_->radio_border_right)
+	else if (ob == cell_options_->check_border_right)
 		num = LyXTabular::M_TOGGLE_LINE_RIGHT;
 	else if (ob == cell_options_->radio_align_left)
 		num = LyXTabular::M_ALIGN_LEFT;
@@ -719,24 +719,24 @@ int FormTabular::checkLongtableOptions(FL_OBJECT * ob, string & special)
 	} else {
 		special = "";
 	}
-	if ((ob == longtable_options_->radio_lt_firsthead) ||
+	if ((ob == longtable_options_->check_lt_firsthead) ||
 	    (ob == longtable_options_->check_1head_2border_above) ||
 	    (ob == longtable_options_->check_1head_2border_below) ||
 	    (ob == longtable_options_->check_1head_empty))
 	{
 		return (flag ? LyXTabular::SET_LTFIRSTHEAD :
 		        LyXTabular::UNSET_LTFIRSTHEAD);
-	} else if ((ob == longtable_options_->radio_lt_head) ||
+	} else if ((ob == longtable_options_->check_lt_head) ||
 	           (ob == longtable_options_->check_head_2border_above) ||
 	           (ob == longtable_options_->check_head_2border_below))
 	{
 		return (flag ? LyXTabular::SET_LTHEAD : LyXTabular::UNSET_LTHEAD);
-	} else if ((ob == longtable_options_->radio_lt_foot) ||
+	} else if ((ob == longtable_options_->check_lt_foot) ||
 	           (ob == longtable_options_->check_foot_2border_above) ||
 	           (ob == longtable_options_->check_foot_2border_below))
 	{
 		return (flag ? LyXTabular::SET_LTFOOT : LyXTabular::UNSET_LTFOOT);
-	} else if ((ob == longtable_options_->radio_lt_lastfoot) ||
+	} else if ((ob == longtable_options_->check_lt_lastfoot) ||
 	           (ob == longtable_options_->check_lastfoot_2border_above) ||
 	           (ob == longtable_options_->check_lastfoot_2border_below) ||
 	           (ob == longtable_options_->check_lastfoot_empty))
diff --git a/src/frontends/xforms/FormTabularCreate.C b/src/frontends/xforms/FormTabularCreate.C
index 822f38d0ae..9875d7db82 100644
--- a/src/frontends/xforms/FormTabularCreate.C
+++ b/src/frontends/xforms/FormTabularCreate.C
@@ -44,7 +44,7 @@ void FormTabularCreate::build()
         // Manage the ok, apply and cancel/close buttons
 	bc().setOK(dialog_->button_ok);
 	bc().setApply(dialog_->button_apply);
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 }
 
 
diff --git a/src/frontends/xforms/FormTexinfo.C b/src/frontends/xforms/FormTexinfo.C
index 0e6b9757df..561402f79a 100644
--- a/src/frontends/xforms/FormTexinfo.C
+++ b/src/frontends/xforms/FormTexinfo.C
@@ -36,7 +36,7 @@ void FormTexinfo::build() {
 	// courier medium
 	fl_set_browser_fontstyle(dialog_->browser,FL_FIXED_STYLE);
 	// with Path is default
-	fl_set_button(dialog_->button_fullPath, 1);
+	fl_set_button(dialog_->check_fullpath, 1);
 	updateStyles(ControlTexinfo::cls);
 
 	// set up the tooltips
@@ -50,7 +50,7 @@ void FormTexinfo::build() {
 	tooltips().initTooltip(dialog_->button_texhash, str);
 
 	str = N_("View full path or only file name. Full path is needed to view the contents of a file.");
-	tooltips().initTooltip(dialog_->button_fullPath, str);
+	tooltips().initTooltip(dialog_->check_fullpath, str);
 
 	str = N_("Shows the installed LaTeX Document classes. Remember, that these classes are only available in LyX if a corresponding LyX layout file exists!");
 	tooltips().initTooltip(dialog_->radio_cls, str);
@@ -79,9 +79,9 @@ ButtonPolicy::SMInput FormTexinfo::input(FL_OBJECT * ob, long) {
 		controller().rescanStyles();
 		updateStyles(activeStyle);
 
-	} else if (ob == dialog_->button_fullPath) {
+	} else if (ob == dialog_->check_fullpath) {
 		setEnabled(dialog_->button_view,
-			   fl_get_button(dialog_->button_fullPath));
+			   fl_get_button(dialog_->check_fullpath));
 		updateStyles(activeStyle);
 
 	} else if (ob == dialog_->button_texhash) {
@@ -108,7 +108,7 @@ void FormTexinfo::updateStyles(ControlTexinfo::texFileSuffix whichStyle)
 {
 	fl_clear_browser(dialog_->browser); 
 
-	bool const withFullPath = fl_get_button(dialog_->button_fullPath);
+	bool const withFullPath = fl_get_button(dialog_->check_fullpath);
 
 	string const str = 
 		controller().getContents(whichStyle, withFullPath);
diff --git a/src/frontends/xforms/FormToc.C b/src/frontends/xforms/FormToc.C
index cffdfc48c9..b9e3e9267f 100644
--- a/src/frontends/xforms/FormToc.C
+++ b/src/frontends/xforms/FormToc.C
@@ -42,7 +42,7 @@ void FormToc::build()
 	fl_addto_choice(dialog_->choice_toc_type, choice.c_str());
 
         // Manage the cancel/close button
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 }
 
 
diff --git a/src/frontends/xforms/FormUrl.C b/src/frontends/xforms/FormUrl.C
index 9cfffb616f..994fc9591c 100644
--- a/src/frontends/xforms/FormUrl.C
+++ b/src/frontends/xforms/FormUrl.C
@@ -29,44 +29,44 @@ void FormUrl::build()
 {
 	dialog_.reset(build_url());
 
-	fl_set_input_return(dialog_->name, FL_RETURN_CHANGED);
-	fl_set_input_return(dialog_->url,  FL_RETURN_CHANGED);
+	fl_set_input_return(dialog_->input_name, FL_RETURN_CHANGED);
+	fl_set_input_return(dialog_->input_url,  FL_RETURN_CHANGED);
 
-	setPrehandler(dialog_->name);
-	setPrehandler(dialog_->url);
+	setPrehandler(dialog_->input_name);
+	setPrehandler(dialog_->input_url);
 
         // Manage the ok, apply, restore and cancel/close buttons
 	bc().setOK(dialog_->button_ok);
 	bc().setApply(dialog_->button_apply);
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 	bc().setRestore(dialog_->button_restore);
 
-	bc().addReadOnly(dialog_->name);
-	bc().addReadOnly(dialog_->url);
-	bc().addReadOnly(dialog_->radio_html);
+	bc().addReadOnly(dialog_->input_name);
+	bc().addReadOnly(dialog_->input_url);
+	bc().addReadOnly(dialog_->check_html);
 }
 
 
 void FormUrl::update()
 {
-	fl_set_input(dialog_->url,
+	fl_set_input(dialog_->input_url,
 		     controller().params().getContents().c_str());
-	fl_set_input(dialog_->name,
+	fl_set_input(dialog_->input_name,
 		     controller().params().getOptions().c_str());
 
 	if (controller().params().getCmdName() == "url")
-		fl_set_button(dialog_->radio_html, 0);
+		fl_set_button(dialog_->check_html, 0);
 	else
-		fl_set_button(dialog_->radio_html, 1);
+		fl_set_button(dialog_->check_html, 1);
 }
 
 
 void FormUrl::apply()
 {
-	controller().params().setContents(fl_get_input(dialog_->url));
-	controller().params().setOptions(fl_get_input(dialog_->name));
+	controller().params().setContents(fl_get_input(dialog_->input_url));
+	controller().params().setOptions(fl_get_input(dialog_->input_name));
 
-	if (fl_get_button(dialog_->radio_html))
+	if (fl_get_button(dialog_->check_html))
 		controller().params().setCmdName("htmlurl");
 	else
 		controller().params().setCmdName("url");
diff --git a/src/frontends/xforms/form_aboutlyx.C b/src/frontends/xforms/form_aboutlyx.C
index 3af800144f..59f7b17f48 100644
--- a/src/frontends/xforms/form_aboutlyx.C
+++ b/src/frontends/xforms/form_aboutlyx.C
@@ -27,12 +27,12 @@ FD_form_aboutlyx * FormAboutlyx::build_aboutlyx()
   obj = fl_add_box(FL_UP_BOX, 0, 0, 450, 400, "");
   {
     char const * const dummy = N_("Close|^[");
-    fdui->close = obj = fl_add_button(FL_NORMAL_BUTTON, 320, 360, 120, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 320, 360, 120, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  fdui->tabbed_folder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 10, 20, 430, 330, "");
+  fdui->tabfolder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 10, 20, 430, 330, "");
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
   fl_end_form();
 
diff --git a/src/frontends/xforms/form_aboutlyx.h b/src/frontends/xforms/form_aboutlyx.h
index c70d39c8f4..a118ac7e36 100644
--- a/src/frontends/xforms/form_aboutlyx.h
+++ b/src/frontends/xforms/form_aboutlyx.h
@@ -17,8 +17,8 @@ struct FD_form_aboutlyx {
 	~FD_form_aboutlyx();
 
 	FL_FORM *form;
-	FL_OBJECT *close;
-	FL_OBJECT *tabbed_folder;
+	FL_OBJECT *button_close;
+	FL_OBJECT *tabfolder;
 };
 struct FD_form_tab_version {
 	~FD_form_tab_version();
diff --git a/src/frontends/xforms/form_bibitem.C b/src/frontends/xforms/form_bibitem.C
index d4cb2a397e..e656e0d58f 100644
--- a/src/frontends/xforms/form_bibitem.C
+++ b/src/frontends/xforms/form_bibitem.C
@@ -27,7 +27,7 @@ FD_form_bibitem * FormBibitem::build_bibitem()
   obj = fl_add_box(FL_UP_BOX, 0, 0, 220, 130, "");
   {
     char const * const dummy = N_("Key:|#K");
-    fdui->key = obj = fl_add_input(FL_NORMAL_INPUT, 80, 10, 130, 30, idex(_(dummy)));
+    fdui->input_key = obj = fl_add_input(FL_NORMAL_INPUT, 80, 10, 130, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -37,14 +37,14 @@ FD_form_bibitem * FormBibitem::build_bibitem()
     fl_set_object_callback(obj, C_FormBaseOKCB, 3);
   {
     char const * const dummy = N_("Cancel|^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 120, 90, 90, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 120, 90, 90, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseCancelCB, 2);
   {
     char const * const dummy = N_("Label:|#L");
-    fdui->label = obj = fl_add_input(FL_NORMAL_INPUT, 80, 50, 130, 30, idex(_(dummy)));
+    fdui->input_label = obj = fl_add_input(FL_NORMAL_INPUT, 80, 50, 130, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
diff --git a/src/frontends/xforms/form_bibitem.h b/src/frontends/xforms/form_bibitem.h
index 2a5855e84d..2420f91894 100644
--- a/src/frontends/xforms/form_bibitem.h
+++ b/src/frontends/xforms/form_bibitem.h
@@ -15,10 +15,10 @@ struct FD_form_bibitem {
 	~FD_form_bibitem();
 
 	FL_FORM *form;
-	FL_OBJECT *key;
+	FL_OBJECT *input_key;
 	FL_OBJECT *button_ok;
-	FL_OBJECT *button_cancel;
-	FL_OBJECT *label;
+	FL_OBJECT *button_close;
+	FL_OBJECT *input_label;
 };
 
 #endif /* FD_form_bibitem_h_ */
diff --git a/src/frontends/xforms/form_bibtex.C b/src/frontends/xforms/form_bibtex.C
index 323083324f..0ec2c8fcc9 100644
--- a/src/frontends/xforms/form_bibtex.C
+++ b/src/frontends/xforms/form_bibtex.C
@@ -27,7 +27,7 @@ FD_form_bibtex * FormBibtex::build_bibtex()
   obj = fl_add_box(FL_UP_BOX, 0, 0, 450, 160, "");
   {
     char const * const dummy = N_("Database:|#D");
-    fdui->database = obj = fl_add_input(FL_NORMAL_INPUT, 90, 10, 245, 30, idex(_(dummy)));
+    fdui->input_database = obj = fl_add_input(FL_NORMAL_INPUT, 90, 10, 245, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -37,33 +37,33 @@ FD_form_bibtex * FormBibtex::build_bibtex()
     fl_set_object_callback(obj, C_FormBaseOKCB, 3);
   {
     char const * const dummy = N_("Cancel|^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 350, 120, 90, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 350, 120, 90, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseCancelCB, 2);
   {
     char const * const dummy = N_("Style:|#S");
-    fdui->style = obj = fl_add_input(FL_NORMAL_INPUT, 90, 45, 245, 30, idex(_(dummy)));
+    fdui->input_style = obj = fl_add_input(FL_NORMAL_INPUT, 90, 45, 245, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Browse...|#B");
-    fdui->database_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 10, 100, 29, idex(_(dummy)));
+    fdui->button_database_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 10, 100, 29, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Browse...|#r");
-    fdui->style_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 45, 100, 30, idex(_(dummy)));
+    fdui->button_style_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 45, 100, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Add bibliography to TOC|#A");
-    fdui->radio_bibtotoc = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 90, 80, 30, 30, idex(_(dummy)));
+    fdui->check_bibtotoc = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 90, 80, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
diff --git a/src/frontends/xforms/form_bibtex.h b/src/frontends/xforms/form_bibtex.h
index 4ec2b78783..d7d74ccd8c 100644
--- a/src/frontends/xforms/form_bibtex.h
+++ b/src/frontends/xforms/form_bibtex.h
@@ -15,13 +15,13 @@ struct FD_form_bibtex {
 	~FD_form_bibtex();
 
 	FL_FORM *form;
-	FL_OBJECT *database;
+	FL_OBJECT *input_database;
 	FL_OBJECT *button_ok;
-	FL_OBJECT *button_cancel;
-	FL_OBJECT *style;
-	FL_OBJECT *database_browse;
-	FL_OBJECT *style_browse;
-	FL_OBJECT *radio_bibtotoc;
+	FL_OBJECT *button_close;
+	FL_OBJECT *input_style;
+	FL_OBJECT *button_database_browse;
+	FL_OBJECT *button_style_browse;
+	FL_OBJECT *check_bibtotoc;
 };
 
 #endif /* FD_form_bibtex_h_ */
diff --git a/src/frontends/xforms/form_citation.C b/src/frontends/xforms/form_citation.C
index 3f1cf3aec3..8194a2d5f5 100644
--- a/src/frontends/xforms/form_citation.C
+++ b/src/frontends/xforms/form_citation.C
@@ -24,7 +24,7 @@ FD_form_citation * FormCitation::build_citation()
 
   fdui->form = fl_bgn_form(FL_NO_BOX, 680, 440);
   fdui->form->u_vdata = this;
-  fdui->box = obj = fl_add_box(FL_UP_BOX, 0, 0, 680, 440, "");
+  obj = fl_add_box(FL_UP_BOX, 0, 0, 680, 440, "");
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
   {
     char const * const dummy = N_("Inset keys|#I");
@@ -85,14 +85,14 @@ FD_form_citation * FormCitation::build_citation()
     fl_set_object_resize(obj, FL_RESIZE_NONE);
   {
     char const * const dummy = N_("Regular Expression|#R");
-    fdui->button_search_type = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 385, 90, 30, 30, idex(_(dummy)));
+    fdui->check_search_type = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 385, 90, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
   {
     char const * const dummy = N_("Case sensitive|#C");
-    fdui->button_search_case = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 385, 120, 30, 30, idex(_(dummy)));
+    fdui->check_search_case = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 385, 120, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -128,7 +128,7 @@ FD_form_citation * FormCitation::build_citation()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Full author list|#F");
-    fdui->button_full_author_list = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 375, 240, 30, 30, idex(_(dummy)));
+    fdui->check_full_author_list = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 375, 240, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -136,7 +136,7 @@ FD_form_citation * FormCitation::build_citation()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Upper case|#U");
-    fdui->button_force_uppercase = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 515, 240, 30, 30, idex(_(dummy)));
+    fdui->check_force_uppercase = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 515, 240, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -184,7 +184,7 @@ FD_form_citation * FormCitation::build_citation()
     fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
   {
     char const * const dummy = N_("Cancel|^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 580, 400, 90, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 580, 400, 90, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
diff --git a/src/frontends/xforms/form_citation.h b/src/frontends/xforms/form_citation.h
index 828287e8d6..f9cf6b29d7 100644
--- a/src/frontends/xforms/form_citation.h
+++ b/src/frontends/xforms/form_citation.h
@@ -17,7 +17,6 @@ struct FD_form_citation {
 	~FD_form_citation();
 
 	FL_FORM *form;
-	FL_OBJECT *box;
 	FL_OBJECT *browser_cite;
 	FL_OBJECT *browser_bib;
 	FL_OBJECT *button_add;
@@ -27,20 +26,20 @@ struct FD_form_citation {
 	FL_OBJECT *browser_info;
 	FL_OBJECT *frame_search;
 	FL_OBJECT *input_search;
-	FL_OBJECT *button_search_type;
-	FL_OBJECT *button_search_case;
+	FL_OBJECT *check_search_type;
+	FL_OBJECT *check_search_case;
 	FL_OBJECT *button_previous;
 	FL_OBJECT *button_next;
 	FL_OBJECT *frame_style;
 	FL_OBJECT *choice_style;
-	FL_OBJECT *button_full_author_list;
-	FL_OBJECT *button_force_uppercase;
+	FL_OBJECT *check_full_author_list;
+	FL_OBJECT *check_force_uppercase;
 	FL_OBJECT *input_before;
 	FL_OBJECT *input_after;
 	FL_OBJECT *button_restore;
 	FL_OBJECT *button_ok;
 	FL_OBJECT *button_apply;
-	FL_OBJECT *button_cancel;
+	FL_OBJECT *button_close;
 };
 
 #endif /* FD_form_citation_h_ */
diff --git a/src/frontends/xforms/form_document.C b/src/frontends/xforms/form_document.C
index 7dc99b81ec..e9558e9266 100644
--- a/src/frontends/xforms/form_document.C
+++ b/src/frontends/xforms/form_document.C
@@ -28,11 +28,11 @@ FD_form_tabbed_document * FormDocument::build_tabbed_document()
   fdui->form = fl_bgn_form(FL_NO_BOX, 465, 500);
   fdui->form->u_vdata = this;
   obj = fl_add_box(FL_UP_BOX, 0, 0, 465, 500, "");
-  fdui->tabbed_folder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 20, 15, 435, 365, _("Tabbed folder"));
+  fdui->tabfolder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 20, 15, 435, 365, _("Tabbed folder"));
     fl_set_object_resize(obj, FL_RESIZE_ALL);
   {
     char const * const dummy = N_("Cancel|^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 355, 460, 100, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 355, 460, 100, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -121,8 +121,7 @@ FD_form_doc_paper * FormDocument::build_doc_paper()
     fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 245, 15, 180, 120, _("Orientation"));
-
-  fdui->group_radio_orientation = fl_bgn_group();
+ fl_bgn_group();
   {
     char const * const dummy = N_("Portrait|#r");
     fdui->radio_portrait = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 40, 120, 30, idex(_(dummy)));
@@ -319,8 +318,7 @@ FD_form_doc_class * FormDocument::build_doc_class()
     fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-
-  fdui->group_doc_sides = fl_bgn_group();
+ fl_bgn_group();
   {
     char const * const dummy = N_("One|#n");
     fdui->radio_doc_sides_one = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 300, 30, 120, 30, idex(_(dummy)));
@@ -339,8 +337,7 @@ FD_form_doc_class * FormDocument::build_doc_class()
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
   fl_end_group();
 
-
-  fdui->group_doc_columns = fl_bgn_group();
+ fl_bgn_group();
   {
     char const * const dummy = N_("One|#e");
     fdui->radio_doc_columns_one = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 300, 120, 110, 30, idex(_(dummy)));
@@ -359,8 +356,7 @@ FD_form_doc_class * FormDocument::build_doc_class()
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
   fl_end_group();
 
-
-  fdui->group_doc_sep = fl_bgn_group();
+ fl_bgn_group();
   {
     char const * const dummy = N_("Indent|#I");
     fdui->radio_doc_indent = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 50, 260, 110, 30, idex(_(dummy)));
@@ -483,11 +479,11 @@ FD_form_doc_options * FormDocument::build_doc_options()
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  fdui->slider_secnumdepth = obj = fl_add_counter(FL_SIMPLE_COUNTER, 200, 75, 80, 30, _("Section number depth"));
+  fdui->counter_secnumdepth = obj = fl_add_counter(FL_SIMPLE_COUNTER, 200, 75, 80, 30, _("Section number depth"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_LEFT);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  fdui->slider_tocdepth = obj = fl_add_counter(FL_SIMPLE_COUNTER, 200, 115, 80, 30, _("Table of contents depth"));
+  fdui->counter_tocdepth = obj = fl_add_counter(FL_SIMPLE_COUNTER, 200, 115, 80, 30, _("Table of contents depth"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_LEFT);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
@@ -575,8 +571,7 @@ FD_form_doc_bullet * FormDocument::build_doc_bullet()
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lstyle(obj, FL_FIXED_STYLE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUTBULLETLATEX);
-
-  fdui->radio_bullet_depth = fl_bgn_group();
+ fl_bgn_group();
   {
     char const * const dummy = N_("1|#1");
     fdui->radio_bullet_depth_1 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 150, 35, 55, 30, idex(_(dummy)));
@@ -619,8 +614,7 @@ FD_form_doc_bullet * FormDocument::build_doc_bullet()
   obj = fl_add_text(FL_NORMAL_TEXT, 145, 10, 85, 20, _("Bullet Depth"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-
-  fdui->radio_bullet_panel = fl_bgn_group();
+ fl_bgn_group();
   {
     char const * const dummy = N_("Standard|#S");
     fdui->radio_bullet_panel_standard = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 105, 90, 30, idex(_(dummy)));
@@ -642,6 +636,16 @@ FD_form_doc_bullet * FormDocument::build_doc_bullet()
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_resize(obj, FL_RESIZE_NONE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL2);
+  {
+    char const * const dummy = N_("Ding 1|#D");
+    fdui->radio_bullet_panel_ding1 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 165, 90, 30, idex(_(dummy)));
+    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
+  }
+    fl_set_object_boxtype(obj, FL_UP_BOX);
+    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_resize(obj, FL_RESIZE_NONE);
+    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL6);
   {
     char const * const dummy = N_("Ding 2|#i");
     fdui->radio_bullet_panel_ding2 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 195, 90, 30, idex(_(dummy)));
@@ -672,16 +676,6 @@ FD_form_doc_bullet * FormDocument::build_doc_bullet()
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_resize(obj, FL_RESIZE_NONE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL5);
-  {
-    char const * const dummy = N_("Ding 1|#D");
-    fdui->radio_bullet_panel_ding1 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 165, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_UP_BOX);
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_resize(obj, FL_RESIZE_NONE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL6);
   fl_end_group();
 
   fl_end_form();
diff --git a/src/frontends/xforms/form_document.h b/src/frontends/xforms/form_document.h
index 0f5551da3f..8211d4513e 100644
--- a/src/frontends/xforms/form_document.h
+++ b/src/frontends/xforms/form_document.h
@@ -27,8 +27,8 @@ struct FD_form_tabbed_document {
 	~FD_form_tabbed_document();
 
 	FL_FORM *form;
-	FL_OBJECT *tabbed_folder;
-	FL_OBJECT *button_cancel;
+	FL_OBJECT *tabfolder;
+	FL_OBJECT *button_close;
 	FL_OBJECT *button_apply;
 	FL_OBJECT *button_ok;
 	FL_OBJECT *text_warning;
@@ -45,7 +45,6 @@ struct FD_form_doc_paper {
 	FL_OBJECT *choice_custom_width_units;
 	FL_OBJECT *input_custom_height;
 	FL_OBJECT *choice_custom_height_units;
-	FL_OBJECT *group_radio_orientation;
 	FL_OBJECT *radio_portrait;
 	FL_OBJECT *radio_landscape;
 	FL_OBJECT *check_use_geometry;
@@ -77,13 +76,10 @@ struct FD_form_doc_class {
 	FL_OBJECT *input_doc_extra;
 	FL_OBJECT *input_doc_skip;
 	FL_OBJECT *choice_doc_skip;
-	FL_OBJECT *group_doc_sides;
 	FL_OBJECT *radio_doc_sides_one;
 	FL_OBJECT *radio_doc_sides_two;
-	FL_OBJECT *group_doc_columns;
 	FL_OBJECT *radio_doc_columns_one;
 	FL_OBJECT *radio_doc_columns_two;
-	FL_OBJECT *group_doc_sep;
 	FL_OBJECT *radio_doc_indent;
 	FL_OBJECT *radio_doc_skip;
 	FL_OBJECT *input_doc_spacing;
@@ -104,8 +100,8 @@ struct FD_form_doc_options {
 
 	FL_FORM *form;
 	FL_OBJECT *input_float_placement;
-	FL_OBJECT *slider_secnumdepth;
-	FL_OBJECT *slider_tocdepth;
+	FL_OBJECT *counter_secnumdepth;
+	FL_OBJECT *counter_tocdepth;
 	FL_OBJECT *choice_postscript_driver;
 	FL_OBJECT *check_use_amsmath;
 	FL_OBJECT *check_use_natbib;
@@ -118,18 +114,16 @@ struct FD_form_doc_bullet {
 	FL_OBJECT *bmtable_bullet_panel;
 	FL_OBJECT *choice_bullet_size;
 	FL_OBJECT *input_bullet_latex;
-	FL_OBJECT *radio_bullet_depth;
 	FL_OBJECT *radio_bullet_depth_1;
 	FL_OBJECT *radio_bullet_depth_2;
 	FL_OBJECT *radio_bullet_depth_3;
 	FL_OBJECT *radio_bullet_depth_4;
-	FL_OBJECT *radio_bullet_panel;
 	FL_OBJECT *radio_bullet_panel_standard;
 	FL_OBJECT *radio_bullet_panel_maths;
+	FL_OBJECT *radio_bullet_panel_ding1;
 	FL_OBJECT *radio_bullet_panel_ding2;
 	FL_OBJECT *radio_bullet_panel_ding3;
 	FL_OBJECT *radio_bullet_panel_ding4;
-	FL_OBJECT *radio_bullet_panel_ding1;
 };
 
 #endif /* FD_form_tabbed_document_h_ */
diff --git a/src/frontends/xforms/form_error.C b/src/frontends/xforms/form_error.C
index 04d7c200d2..920c1e95f4 100644
--- a/src/frontends/xforms/form_error.C
+++ b/src/frontends/xforms/form_error.C
@@ -25,11 +25,11 @@ FD_form_error * FormError::build_error()
   fdui->form = fl_bgn_form(FL_NO_BOX, 400, 240);
   fdui->form->u_vdata = this;
   obj = fl_add_box(FL_UP_BOX, 0, 0, 400, 240, "");
-  fdui->message = obj = fl_add_box(FL_FRAME_BOX, 10, 10, 380, 180, "");
+  fdui->frame_message = obj = fl_add_box(FL_FRAME_BOX, 10, 10, 380, 180, "");
     fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast);
   {
     char const * const dummy = N_("Close|^[^M");
-    fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 135, 200, 130, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_RETURN_BUTTON, 135, 200, 130, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_gravity(obj, FL_South, FL_South);
diff --git a/src/frontends/xforms/form_error.h b/src/frontends/xforms/form_error.h
index c87a7e2dd5..d63c8f78ee 100644
--- a/src/frontends/xforms/form_error.h
+++ b/src/frontends/xforms/form_error.h
@@ -13,8 +13,8 @@ struct FD_form_error {
 	~FD_form_error();
 
 	FL_FORM *form;
-	FL_OBJECT *message;
-	FL_OBJECT *button_cancel;
+	FL_OBJECT *frame_message;
+	FL_OBJECT *button_close;
 };
 
 #endif /* FD_form_error_h_ */
diff --git a/src/frontends/xforms/form_ert.C b/src/frontends/xforms/form_ert.C
index 84556085c9..e87777883d 100644
--- a/src/frontends/xforms/form_ert.C
+++ b/src/frontends/xforms/form_ert.C
@@ -28,8 +28,7 @@ FD_form_ert * FormERT::build_ert()
   obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 20, 410, 100, _("Status"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-
-  fdui->group_alignment = fl_bgn_group();
+ fl_bgn_group();
   {
     char const * const dummy = N_("Open|#O");
     fdui->radio_open = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 19, 30, 152, 30, idex(_(dummy)));
@@ -58,7 +57,7 @@ FD_form_ert * FormERT::build_ert()
 
   {
     char const * const dummy = N_("Cancel|^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 330, 130, 90, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 330, 130, 90, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
diff --git a/src/frontends/xforms/form_ert.h b/src/frontends/xforms/form_ert.h
index e3fa171533..893566b01e 100644
--- a/src/frontends/xforms/form_ert.h
+++ b/src/frontends/xforms/form_ert.h
@@ -16,11 +16,10 @@ struct FD_form_ert {
 	~FD_form_ert();
 
 	FL_FORM *form;
-	FL_OBJECT *group_alignment;
 	FL_OBJECT *radio_open;
 	FL_OBJECT *radio_collapsed;
 	FL_OBJECT *radio_inlined;
-	FL_OBJECT *button_cancel;
+	FL_OBJECT *button_close;
 	FL_OBJECT *button_apply;
 	FL_OBJECT *button_ok;
 };
diff --git a/src/frontends/xforms/form_external.C b/src/frontends/xforms/form_external.C
index 6d36f8f528..02c8188421 100644
--- a/src/frontends/xforms/form_external.C
+++ b/src/frontends/xforms/form_external.C
@@ -100,7 +100,7 @@ FD_form_external * FormExternal::build_external()
     fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
   {
     char const * const dummy = N_("Cancel|#C^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 455, 270, 90, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 455, 270, 90, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
diff --git a/src/frontends/xforms/form_external.h b/src/frontends/xforms/form_external.h
index aa475eb307..bc4fd6b370 100644
--- a/src/frontends/xforms/form_external.h
+++ b/src/frontends/xforms/form_external.h
@@ -26,7 +26,7 @@ struct FD_form_external {
 	FL_OBJECT *button_update;
 	FL_OBJECT *button_ok;
 	FL_OBJECT *button_apply;
-	FL_OBJECT *button_cancel;
+	FL_OBJECT *button_close;
 };
 
 #endif /* FD_form_external_h_ */
diff --git a/src/frontends/xforms/form_float.C b/src/frontends/xforms/form_float.C
index f4c073b5d7..ea277eb3a4 100644
--- a/src/frontends/xforms/form_float.C
+++ b/src/frontends/xforms/form_float.C
@@ -31,46 +31,49 @@ FD_form_float * FormFloat::build_float()
     fl_set_object_lstyle(obj, FL_BOLD_STYLE);
   {
     char const * const dummy = N_("Top of the page|#T");
-    fdui->radio_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 30, 152, 30, idex(_(dummy)));
+    fdui->check_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 30, 152, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Bottom of the page|#B");
-    fdui->radio_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 60, 152, 30, idex(_(dummy)));
+    fdui->check_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 60, 152, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Page of floats|#P");
-    fdui->radio_page = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 190, 30, 152, 30, idex(_(dummy)));
+    fdui->check_page = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 190, 30, 152, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Here, if possible|#i");
-    fdui->radio_here = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 190, 60, 152, 30, idex(_(dummy)));
+    fdui->check_here = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 190, 60, 152, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Here, definitely|#H");
-    fdui->button_here_definitely = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 110, 152, 30, idex(_(dummy)));
+    fdui->check_here_definitely = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 110, 152, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
-    char const * const dummy = N_("Cancel|^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 280, 160, 70, 30, idex(_(dummy)));
+    char const * const dummy = N_("Restore|#R");
+    fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 160, 80, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
+    fl_set_object_callback(obj, C_FormBaseRestoreCB, 0);
+  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 120, 160, 70, 30, _("OK"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_callback(obj, C_FormBaseOKCB, 0);
   {
     char const * const dummy = N_("Apply|#A");
     fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 160, 70, 30, idex(_(dummy)));
@@ -78,16 +81,13 @@ FD_form_float * FormFloat::build_float()
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 120, 160, 70, 30, _("OK"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseOKCB, 0);
   {
-    char const * const dummy = N_("Restore|#R");
-    fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 160, 80, 30, idex(_(dummy)));
+    char const * const dummy = N_("Cancel|^[");
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 280, 160, 70, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseRestoreCB, 0);
+    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
   fl_end_form();
 
   fdui->form->fdui = fdui;
diff --git a/src/frontends/xforms/form_float.h b/src/frontends/xforms/form_float.h
index 97820f09f7..4c02b55aee 100644
--- a/src/frontends/xforms/form_float.h
+++ b/src/frontends/xforms/form_float.h
@@ -6,10 +6,10 @@
 
 /** Callbacks, globals and object handlers **/
 extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
 extern  "C" void C_FormBaseRestoreCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
 
 
 /**** Forms and Objects ****/
@@ -17,15 +17,15 @@ struct FD_form_float {
 	~FD_form_float();
 
 	FL_FORM *form;
-	FL_OBJECT *radio_top;
-	FL_OBJECT *radio_bottom;
-	FL_OBJECT *radio_page;
-	FL_OBJECT *radio_here;
-	FL_OBJECT *button_here_definitely;
-	FL_OBJECT *button_cancel;
-	FL_OBJECT *button_apply;
-	FL_OBJECT *button_ok;
+	FL_OBJECT *check_top;
+	FL_OBJECT *check_bottom;
+	FL_OBJECT *check_page;
+	FL_OBJECT *check_here;
+	FL_OBJECT *check_here_definitely;
 	FL_OBJECT *button_restore;
+	FL_OBJECT *button_ok;
+	FL_OBJECT *button_apply;
+	FL_OBJECT *button_close;
 };
 
 #endif /* FD_form_float_h_ */
diff --git a/src/frontends/xforms/form_graphics.C b/src/frontends/xforms/form_graphics.C
index dea86faf11..61dcd9ca66 100644
--- a/src/frontends/xforms/form_graphics.C
+++ b/src/frontends/xforms/form_graphics.C
@@ -26,7 +26,7 @@ FD_form_graphics * FormGraphics::build_graphics()
   fdui->form->u_vdata = this;
   obj = fl_add_box(FL_FLAT_BOX, 0, 0, 510, 345, "");
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  fdui->tabFolder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 5, 5, 500, 270, _("Tabbed folder"));
+  fdui->tabfolder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 5, 5, 500, 270, _("Tabbed folder"));
     fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_resize(obj, FL_RESIZE_ALL);
@@ -43,7 +43,7 @@ FD_form_graphics * FormGraphics::build_graphics()
     fl_set_object_callback(obj, C_FormBaseOKCB, 0);
   {
     char const * const dummy = N_("Cancel|^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 415, 310, 90, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 415, 310, 90, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -137,7 +137,7 @@ FD_form_file * FormGraphics::build_file()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Draft mode|#D");
-    fdui->button_draft = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 195, 30, 30, idex(_(dummy)));
+    fdui->check_draft = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 195, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -153,7 +153,7 @@ FD_form_file * FormGraphics::build_file()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Don't unzip, when exporting to LaTeX|#u");
-    fdui->button_nounzip = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 175, 195, 30, 30, idex(_(dummy)));
+    fdui->check_nounzip = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 175, 195, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -186,11 +186,10 @@ FD_form_size * FormGraphics::build_size()
   obj = fl_add_frame(FL_ENGRAVED_FRAME, 355, 10, 135, 50, "");
   obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 10, 480, 225, _("Output size"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-
-  fdui->radio_size = fl_bgn_group();
+ fl_bgn_group();
   {
     char const * const dummy = N_("Original size|#O");
-    fdui->button_asis = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 25, 30, 30, 30, idex(_(dummy)));
+    fdui->radio_asis = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 25, 30, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
@@ -199,7 +198,7 @@ FD_form_size * FormGraphics::build_size()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Scale|#S");
-    fdui->button_scale = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 25, 80, 30, 30, idex(_(dummy)));
+    fdui->radio_scale = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 25, 80, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
@@ -208,7 +207,7 @@ FD_form_size * FormGraphics::build_size()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Custom|#C");
-    fdui->button_wh = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 25, 130, 30, 30, idex(_(dummy)));
+    fdui->radio_wh = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 25, 130, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
@@ -339,7 +338,7 @@ FD_form_bbox * FormGraphics::build_bbox()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Clip to bounding box|#C");
-    fdui->button_clip = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 200, 30, 30, idex(_(dummy)));
+    fdui->check_clip = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 200, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -414,7 +413,7 @@ FD_form_lyxview * FormGraphics::build_lyxview()
  fl_bgn_group();
   {
     char const * const dummy = N_("Original size|#O");
-    fdui->button_lyxasis = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 25, 30, 30, idex(_(dummy)));
+    fdui->radio_lyxasis = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 25, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
@@ -423,7 +422,7 @@ FD_form_lyxview * FormGraphics::build_lyxview()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Scale|#S");
-    fdui->button_lyxscale = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 90, 30, 30, idex(_(dummy)));
+    fdui->radio_lyxscale = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 90, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
@@ -432,7 +431,7 @@ FD_form_lyxview * FormGraphics::build_lyxview()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Custom|#u");
-    fdui->button_lyxwh = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 155, 30, 30, idex(_(dummy)));
+    fdui->radio_lyxwh = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 155, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
@@ -445,8 +444,7 @@ FD_form_lyxview * FormGraphics::build_lyxview()
   obj = fl_add_text(FL_NORMAL_TEXT, 420, 95, 25, 30, _("%"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-
-  fdui->radio_display = fl_bgn_group();
+ fl_bgn_group();
   {
     char const * const dummy = N_("Default|#f");
     fdui->radio_pref = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 25, 30, 30, idex(_(dummy)));
diff --git a/src/frontends/xforms/form_graphics.h b/src/frontends/xforms/form_graphics.h
index 56c834affb..e2d4330b00 100644
--- a/src/frontends/xforms/form_graphics.h
+++ b/src/frontends/xforms/form_graphics.h
@@ -27,10 +27,10 @@ struct FD_form_graphics {
 	~FD_form_graphics();
 
 	FL_FORM *form;
-	FL_OBJECT *tabFolder;
+	FL_OBJECT *tabfolder;
 	FL_OBJECT *button_restore;
 	FL_OBJECT *button_ok;
-	FL_OBJECT *button_cancel;
+	FL_OBJECT *button_close;
 	FL_OBJECT *button_apply;
 	FL_OBJECT *text_warning;
 };
@@ -44,18 +44,17 @@ struct FD_form_file {
 	FL_OBJECT *input_subcaption;
 	FL_OBJECT *input_rotate_angle;
 	FL_OBJECT *choice_origin;
-	FL_OBJECT *button_draft;
+	FL_OBJECT *check_draft;
 	FL_OBJECT *check_rotate;
-	FL_OBJECT *button_nounzip;
+	FL_OBJECT *check_nounzip;
 };
 struct FD_form_size {
 	~FD_form_size();
 
 	FL_FORM *form;
-	FL_OBJECT *radio_size;
-	FL_OBJECT *button_asis;
-	FL_OBJECT *button_scale;
-	FL_OBJECT *button_wh;
+	FL_OBJECT *radio_asis;
+	FL_OBJECT *radio_scale;
+	FL_OBJECT *radio_wh;
 	FL_OBJECT *input_scale;
 	FL_OBJECT *input_width;
 	FL_OBJECT *choice_width_units;
@@ -74,7 +73,7 @@ struct FD_form_bbox {
 	FL_OBJECT *input_bb_y0;
 	FL_OBJECT *choice_bb_units;
 	FL_OBJECT *button_getBB;
-	FL_OBJECT *button_clip;
+	FL_OBJECT *check_clip;
 };
 struct FD_form_special {
 	~FD_form_special();
@@ -87,10 +86,9 @@ struct FD_form_lyxview {
 
 	FL_FORM *form;
 	FL_OBJECT *input_lyxscale;
-	FL_OBJECT *button_lyxasis;
-	FL_OBJECT *button_lyxscale;
-	FL_OBJECT *button_lyxwh;
-	FL_OBJECT *radio_display;
+	FL_OBJECT *radio_lyxasis;
+	FL_OBJECT *radio_lyxscale;
+	FL_OBJECT *radio_lyxwh;
 	FL_OBJECT *radio_pref;
 	FL_OBJECT *radio_mono;
 	FL_OBJECT *radio_gray;
diff --git a/src/frontends/xforms/form_include.C b/src/frontends/xforms/form_include.C
index ab158d9584..aeaeee9197 100644
--- a/src/frontends/xforms/form_include.C
+++ b/src/frontends/xforms/form_include.C
@@ -44,7 +44,7 @@ FD_form_include * FormInclude::build_include()
     fl_set_object_callback(obj, C_FormBaseOKCB, 0);
   {
     char const * const dummy = N_("Cancel|^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 230, 170, 100, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 230, 170, 100, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -70,11 +70,10 @@ FD_form_include * FormInclude::build_include()
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-
-  fdui->include_grp = fl_bgn_group();
+ fl_bgn_group();
   {
     char const * const dummy = N_("Verbatim|#V");
-    fdui->check_verbatim = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 130, 160, 30, idex(_(dummy)));
+    fdui->radio_verbatim = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 130, 160, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
@@ -82,7 +81,7 @@ FD_form_include * FormInclude::build_include()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Use input|#i");
-    fdui->check_useinput = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 100, 160, 30, idex(_(dummy)));
+    fdui->radio_useinput = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 100, 160, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
@@ -90,7 +89,7 @@ FD_form_include * FormInclude::build_include()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Use include|#U");
-    fdui->check_useinclude = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 70, 160, 30, idex(_(dummy)));
+    fdui->radio_useinclude = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 70, 160, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
diff --git a/src/frontends/xforms/form_include.h b/src/frontends/xforms/form_include.h
index f7585b4adf..f414a8261d 100644
--- a/src/frontends/xforms/form_include.h
+++ b/src/frontends/xforms/form_include.h
@@ -18,14 +18,13 @@ struct FD_form_include {
 	FL_OBJECT *button_browse;
 	FL_OBJECT *check_typeset;
 	FL_OBJECT *button_ok;
-	FL_OBJECT *button_cancel;
+	FL_OBJECT *button_close;
 	FL_OBJECT *button_load;
 	FL_OBJECT *input_filename;
 	FL_OBJECT *check_visiblespace;
-	FL_OBJECT *include_grp;
-	FL_OBJECT *check_verbatim;
-	FL_OBJECT *check_useinput;
-	FL_OBJECT *check_useinclude;
+	FL_OBJECT *radio_verbatim;
+	FL_OBJECT *radio_useinput;
+	FL_OBJECT *radio_useinclude;
 };
 
 #endif /* FD_form_include_h_ */
diff --git a/src/frontends/xforms/form_index.C b/src/frontends/xforms/form_index.C
index 1ee1a363df..a79fa5bb54 100644
--- a/src/frontends/xforms/form_index.C
+++ b/src/frontends/xforms/form_index.C
@@ -54,7 +54,7 @@ FD_form_index * FormIndex::build_index()
     fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
   {
     char const * const dummy = N_("Cancel|^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 410, 60, 100, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 410, 60, 100, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
diff --git a/src/frontends/xforms/form_index.h b/src/frontends/xforms/form_index.h
index ef097e092f..39b0cd1187 100644
--- a/src/frontends/xforms/form_index.h
+++ b/src/frontends/xforms/form_index.h
@@ -21,7 +21,7 @@ struct FD_form_index {
 	FL_OBJECT *button_restore;
 	FL_OBJECT *button_ok;
 	FL_OBJECT *button_apply;
-	FL_OBJECT *button_cancel;
+	FL_OBJECT *button_close;
 };
 
 #endif /* FD_form_index_h_ */
diff --git a/src/frontends/xforms/form_maths_deco.C b/src/frontends/xforms/form_maths_deco.C
index 3914184128..c3260c761f 100644
--- a/src/frontends/xforms/form_maths_deco.C
+++ b/src/frontends/xforms/form_maths_deco.C
@@ -29,7 +29,7 @@ FD_form_maths_deco * FormMathsDeco::build_maths_deco()
   fdui->bmtable_deco1 = obj = fl_add_bmtable(FL_PUSH_BUTTON, 10, 10, 140, 120, "");
     fl_set_object_lcolor(obj, FL_BLUE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 30, 250, 100, 30, _("Close"));
+  fdui->button_close = obj = fl_add_button(FL_RETURN_BUTTON, 30, 250, 100, 30, _("Close"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedCancelCB, 0);
   fdui->bmtable_deco2 = obj = fl_add_bmtable(FL_PUSH_BUTTON, 20, 140, 120, 90, "");
diff --git a/src/frontends/xforms/form_maths_deco.h b/src/frontends/xforms/form_maths_deco.h
index df8b32fa6c..01b4a370df 100644
--- a/src/frontends/xforms/form_maths_deco.h
+++ b/src/frontends/xforms/form_maths_deco.h
@@ -15,7 +15,7 @@ struct FD_form_maths_deco {
 
 	FL_FORM *form;
 	FL_OBJECT *bmtable_deco1;
-	FL_OBJECT *button_cancel;
+	FL_OBJECT *button_close;
 	FL_OBJECT *bmtable_deco2;
 };
 
diff --git a/src/frontends/xforms/form_maths_delim.C b/src/frontends/xforms/form_maths_delim.C
index 85ff8e70d3..f75740758a 100644
--- a/src/frontends/xforms/form_maths_delim.C
+++ b/src/frontends/xforms/form_maths_delim.C
@@ -31,7 +31,7 @@ FD_form_maths_delim * FormMathsDelim::build_maths_delim()
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
     char const * const dummy = N_("Cancel|^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 168, 268, 70, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 168, 268, 70, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -49,8 +49,7 @@ FD_form_maths_delim * FormMathsDelim::build_maths_delim()
   fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 12, 268, 70, 30, _("OK"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedOKCB, 0);
-
-  fdui->lado = fl_bgn_group();
+ fl_bgn_group();
   {
     char const * const dummy = N_("()\nBoth|#B");
     fdui->radio_both = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 80, 8, 80, 30, idex(_(dummy)));
diff --git a/src/frontends/xforms/form_maths_delim.h b/src/frontends/xforms/form_maths_delim.h
index 56a1b09075..9a55967c46 100644
--- a/src/frontends/xforms/form_maths_delim.h
+++ b/src/frontends/xforms/form_maths_delim.h
@@ -17,11 +17,10 @@ struct FD_form_maths_delim {
 
 	FL_FORM *form;
 	FL_OBJECT *bmtable;
-	FL_OBJECT *button_cancel;
+	FL_OBJECT *button_close;
 	FL_OBJECT *button_pix;
 	FL_OBJECT *button_apply;
 	FL_OBJECT *button_ok;
-	FL_OBJECT *lado;
 	FL_OBJECT *radio_both;
 	FL_OBJECT *radio_right;
 	FL_OBJECT *radio_left;
diff --git a/src/frontends/xforms/form_maths_matrix.C b/src/frontends/xforms/form_maths_matrix.C
index 53c52ad519..2d6a8172f7 100644
--- a/src/frontends/xforms/form_maths_matrix.C
+++ b/src/frontends/xforms/form_maths_matrix.C
@@ -68,7 +68,7 @@ FD_form_maths_matrix * FormMathsMatrix::build_maths_matrix()
     fl_set_object_callback(obj, C_FormBaseDeprecatedApplyCB, 0);
   {
     char const * const dummy = N_("Cancel|^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 208, 140, 80, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 208, 140, 80, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
diff --git a/src/frontends/xforms/form_maths_matrix.h b/src/frontends/xforms/form_maths_matrix.h
index 22521a165d..42a199d0da 100644
--- a/src/frontends/xforms/form_maths_matrix.h
+++ b/src/frontends/xforms/form_maths_matrix.h
@@ -22,7 +22,7 @@ struct FD_form_maths_matrix {
 	FL_OBJECT *input_halign;
 	FL_OBJECT *button_ok;
 	FL_OBJECT *button_apply;
-	FL_OBJECT *button_cancel;
+	FL_OBJECT *button_close;
 };
 
 #endif /* FD_form_maths_matrix_h_ */
diff --git a/src/frontends/xforms/form_maths_space.C b/src/frontends/xforms/form_maths_space.C
index 3f2a157730..3c6e9b5523 100644
--- a/src/frontends/xforms/form_maths_space.C
+++ b/src/frontends/xforms/form_maths_space.C
@@ -25,8 +25,7 @@ FD_form_maths_space * FormMathsSpace::build_maths_space()
   fdui->form = fl_bgn_form(FL_NO_BOX, 259, 149);
   fdui->form->u_vdata = this;
   obj = fl_add_box(FL_UP_BOX, 0, 0, 259, 149, "");
-
-  fdui->spaces = fl_bgn_group();
+ fl_bgn_group();
   {
     char const * const dummy = N_("Thin|#T");
     fdui->button_thin = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 10, 120, 30, idex(_(dummy)));
@@ -71,7 +70,7 @@ FD_form_maths_space * FormMathsSpace::build_maths_space()
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 5);
   fl_end_group();
 
-  fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 92, 110, 80, 30, _("Close"));
+  fdui->button_close = obj = fl_add_button(FL_RETURN_BUTTON, 92, 110, 80, 30, _("Close"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedCancelCB, 0);
   fl_end_form();
diff --git a/src/frontends/xforms/form_maths_space.h b/src/frontends/xforms/form_maths_space.h
index 4f36472e6f..21f6b09bd6 100644
--- a/src/frontends/xforms/form_maths_space.h
+++ b/src/frontends/xforms/form_maths_space.h
@@ -14,14 +14,13 @@ struct FD_form_maths_space {
 	~FD_form_maths_space();
 
 	FL_FORM *form;
-	FL_OBJECT *spaces;
 	FL_OBJECT *button_thin;
 	FL_OBJECT *button_medium;
 	FL_OBJECT *button_thick;
 	FL_OBJECT *button_negative;
 	FL_OBJECT *button_quadratin;
 	FL_OBJECT *button_twoquadratin;
-	FL_OBJECT *button_cancel;
+	FL_OBJECT *button_close;
 };
 
 #endif /* FD_form_maths_space_h_ */
diff --git a/src/frontends/xforms/form_maths_style.C b/src/frontends/xforms/form_maths_style.C
index 5142e85566..cff4cf6b84 100644
--- a/src/frontends/xforms/form_maths_style.C
+++ b/src/frontends/xforms/form_maths_style.C
@@ -32,7 +32,7 @@ FD_form_maths_style * FormMathsStyle::build_maths_style()
   fdui->bmtable_style1 = obj = fl_add_bmtable(FL_PUSH_BUTTON, 8, 10, 60, 60, "");
     fl_set_object_lcolor(obj, FL_BLUE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 90, 206, 80, 30, _("Close"));
+  fdui->button_close = obj = fl_add_button(FL_RETURN_BUTTON, 90, 206, 80, 30, _("Close"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedCancelCB, 0);
   fdui->bmtable_style2 = obj = fl_add_bmtable(FL_PUSH_BUTTON, 8, 70, 60, 120, "");
diff --git a/src/frontends/xforms/form_maths_style.h b/src/frontends/xforms/form_maths_style.h
index 414c3e76fb..856dfe0799 100644
--- a/src/frontends/xforms/form_maths_style.h
+++ b/src/frontends/xforms/form_maths_style.h
@@ -16,7 +16,7 @@ struct FD_form_maths_style {
 	FL_FORM *form;
 	FL_OBJECT *bmtable_font2;
 	FL_OBJECT *bmtable_style1;
-	FL_OBJECT *button_cancel;
+	FL_OBJECT *button_close;
 	FL_OBJECT *bmtable_style2;
 	FL_OBJECT *bmtable_font1;
 	FL_OBJECT *button_reset;
diff --git a/src/frontends/xforms/form_minipage.C b/src/frontends/xforms/form_minipage.C
index 427dbdcfcf..a10069a08a 100644
--- a/src/frontends/xforms/form_minipage.C
+++ b/src/frontends/xforms/form_minipage.C
@@ -37,8 +37,7 @@ FD_form_minipage * FormMinipage::build_minipage()
   fdui->choice_width_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 150, 30, 60, 30, "");
     fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-
-  fdui->group_alignment = fl_bgn_group();
+ fl_bgn_group();
   {
     char const * const dummy = N_("Top|#T");
     fdui->radio_top = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 249, 30, 152, 30, idex(_(dummy)));
@@ -67,7 +66,7 @@ FD_form_minipage * FormMinipage::build_minipage()
 
   {
     char const * const dummy = N_("Cancel|^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 330, 130, 90, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 330, 130, 90, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
diff --git a/src/frontends/xforms/form_minipage.h b/src/frontends/xforms/form_minipage.h
index a7f45190a3..f754489a2c 100644
--- a/src/frontends/xforms/form_minipage.h
+++ b/src/frontends/xforms/form_minipage.h
@@ -19,11 +19,10 @@ struct FD_form_minipage {
 	FL_FORM *form;
 	FL_OBJECT *input_width;
 	FL_OBJECT *choice_width_units;
-	FL_OBJECT *group_alignment;
 	FL_OBJECT *radio_top;
 	FL_OBJECT *radio_middle;
 	FL_OBJECT *radio_bottom;
-	FL_OBJECT *button_cancel;
+	FL_OBJECT *button_close;
 	FL_OBJECT *button_apply;
 	FL_OBJECT *button_ok;
 	FL_OBJECT *button_restore;
diff --git a/src/frontends/xforms/form_paragraph.C b/src/frontends/xforms/form_paragraph.C
index 07921e840d..db47c93bc5 100644
--- a/src/frontends/xforms/form_paragraph.C
+++ b/src/frontends/xforms/form_paragraph.C
@@ -28,8 +28,7 @@ FD_form_paragraph * FormParagraph::build_paragraph()
   obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 20, 220, 75, _("Alignment"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-
-  fdui->group_radio_alignment = fl_bgn_group();
+ fl_bgn_group();
   {
     char const * const dummy = N_("Right|#R");
     fdui->radio_align_right = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 30, 80, 30, idex(_(dummy)));
@@ -191,7 +190,7 @@ FD_form_paragraph * FormParagraph::build_paragraph()
     fl_set_object_callback(obj, C_FormBaseDeprecatedApplyCB, 0);
   {
     char const * const dummy = N_("Cancel|^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 400, 360, 90, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 400, 360, 90, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
diff --git a/src/frontends/xforms/form_paragraph.h b/src/frontends/xforms/form_paragraph.h
index 443c54fc5c..d4c4819ae9 100644
--- a/src/frontends/xforms/form_paragraph.h
+++ b/src/frontends/xforms/form_paragraph.h
@@ -17,7 +17,6 @@ struct FD_form_paragraph {
 	~FD_form_paragraph();
 
 	FL_FORM *form;
-	FL_OBJECT *group_radio_alignment;
 	FL_OBJECT *radio_align_right;
 	FL_OBJECT *radio_align_left;
 	FL_OBJECT *radio_align_block;
@@ -39,7 +38,7 @@ struct FD_form_paragraph {
 	FL_OBJECT *button_restore;
 	FL_OBJECT *button_ok;
 	FL_OBJECT *button_apply;
-	FL_OBJECT *button_cancel;
+	FL_OBJECT *button_close;
 	FL_OBJECT *text_warning;
 	FL_OBJECT *choice_value_space_above;
 	FL_OBJECT *choice_value_space_below;
diff --git a/src/frontends/xforms/form_preamble.C b/src/frontends/xforms/form_preamble.C
index 39502e2df8..fe25888c08 100644
--- a/src/frontends/xforms/form_preamble.C
+++ b/src/frontends/xforms/form_preamble.C
@@ -43,7 +43,7 @@ FD_form_preamble * FormPreamble::build_preamble()
     fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
   {
     char const * const dummy = N_("Cancel|^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 270, 380, 100, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 270, 380, 100, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
diff --git a/src/frontends/xforms/form_preamble.h b/src/frontends/xforms/form_preamble.h
index 6e826d0ddb..d54d36df9d 100644
--- a/src/frontends/xforms/form_preamble.h
+++ b/src/frontends/xforms/form_preamble.h
@@ -18,7 +18,7 @@ struct FD_form_preamble {
 	FL_FORM *form;
 	FL_OBJECT *button_ok;
 	FL_OBJECT *button_apply;
-	FL_OBJECT *button_cancel;
+	FL_OBJECT *button_close;
 	FL_OBJECT *input_preamble;
 };
 
diff --git a/src/frontends/xforms/form_preferences.C b/src/frontends/xforms/form_preferences.C
index 69bfa2dc55..6695a1f999 100644
--- a/src/frontends/xforms/form_preferences.C
+++ b/src/frontends/xforms/form_preferences.C
@@ -48,7 +48,7 @@ FD_form_preferences * FormPreferences::build_preferences()
     fl_set_object_callback(obj, C_FormBaseDeprecatedApplyCB, 0);
   {
     char const * const dummy = N_("Cancel|^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 370, 390, 90, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 370, 390, 90, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -333,8 +333,7 @@ FD_form_colors * FormPreferences::build_colors()
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
     fl_set_slider_size(obj, 0.15);
-
-  fdui->group_radio_printto = fl_bgn_group();
+ fl_bgn_group();
   fdui->radio_hsv = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 250, 220, 30, 30, _("HSV"));
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
@@ -450,8 +449,7 @@ FD_form_lnf_misc * FormPreferences::build_lnf_misc()
     fl_set_counter_bounds(obj, 0, 1200);
     fl_set_counter_value(obj, 300);
     fl_set_counter_step(obj, 1, 1);
-
-  fdui->radio_button_group_display = fl_bgn_group();
+ fl_bgn_group();
   {
     char const * const dummy = N_("in Monochrome|#M");
     fdui->radio_display_monochrome = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 285, 35, 30, 30, idex(_(dummy)));
diff --git a/src/frontends/xforms/form_preferences.h b/src/frontends/xforms/form_preferences.h
index 982a8e096a..56b105a983 100644
--- a/src/frontends/xforms/form_preferences.h
+++ b/src/frontends/xforms/form_preferences.h
@@ -45,7 +45,7 @@ struct FD_form_preferences {
 	FL_OBJECT *button_restore;
 	FL_OBJECT *button_ok;
 	FL_OBJECT *button_apply;
-	FL_OBJECT *button_cancel;
+	FL_OBJECT *button_close;
 	FL_OBJECT *text_warning;
 };
 struct FD_form_inner_tab {
@@ -100,7 +100,6 @@ struct FD_form_colors {
 	FL_OBJECT *slider_red;
 	FL_OBJECT *slider_green;
 	FL_OBJECT *slider_blue;
-	FL_OBJECT *group_radio_printto;
 	FL_OBJECT *radio_hsv;
 	FL_OBJECT *radio_rgb;
 	FL_OBJECT *text_color_values;
@@ -120,7 +119,6 @@ struct FD_form_lnf_misc {
 	FL_OBJECT *check_dialogs_iconify_with_main;
 	FL_OBJECT *counter_wm_jump;
 	FL_OBJECT *counter_autosave;
-	FL_OBJECT *radio_button_group_display;
 	FL_OBJECT *radio_display_monochrome;
 	FL_OBJECT *radio_display_grayscale;
 	FL_OBJECT *radio_display_color;
diff --git a/src/frontends/xforms/form_print.C b/src/frontends/xforms/form_print.C
index 4a256fa13f..3db941be53 100644
--- a/src/frontends/xforms/form_print.C
+++ b/src/frontends/xforms/form_print.C
@@ -31,8 +31,7 @@ FD_form_print * FormPrint::build_print()
   fdui->input_file = obj = fl_add_input(FL_NORMAL_INPUT, 90, 265, 230, 30, "");
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-
-  fdui->group_radio_printto = fl_bgn_group();
+ fl_bgn_group();
   {
     char const * const dummy = N_("Printer|#P");
     fdui->radio_printer = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 225, 80, 30, idex(_(dummy)));
@@ -63,13 +62,12 @@ FD_form_print * FormPrint::build_print()
     fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
   {
     char const * const dummy = N_("Cancel|^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 230, 350, 100, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 230, 350, 100, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-
-  fdui->group_radio_pages = fl_bgn_group();
+ fl_bgn_group();
   {
     char const * const dummy = N_("All Pages|#G");
     fdui->radio_all_pages = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 30, 160, 30, idex(_(dummy)));
@@ -96,8 +94,7 @@ FD_form_print * FormPrint::build_print()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fl_end_group();
 
-
-  fdui->group_radio_order = fl_bgn_group();
+ fl_bgn_group();
   {
     char const * const dummy = N_("Normal Order|#N");
     fdui->radio_order_normal = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 180, 30, 150, 30, idex(_(dummy)));
@@ -126,7 +123,7 @@ FD_form_print * FormPrint::build_print()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Collated|#C");
-    fdui->radio_collated = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 180, 115, 140, 30, idex(_(dummy)));
+    fdui->check_collated = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 180, 115, 140, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
diff --git a/src/frontends/xforms/form_print.h b/src/frontends/xforms/form_print.h
index eda70ba0d4..4e6fdd7374 100644
--- a/src/frontends/xforms/form_print.h
+++ b/src/frontends/xforms/form_print.h
@@ -18,22 +18,19 @@ struct FD_form_print {
 	FL_FORM *form;
 	FL_OBJECT *input_printer;
 	FL_OBJECT *input_file;
-	FL_OBJECT *group_radio_printto;
 	FL_OBJECT *radio_printer;
 	FL_OBJECT *radio_file;
 	FL_OBJECT *button_ok;
 	FL_OBJECT *button_apply;
-	FL_OBJECT *button_cancel;
-	FL_OBJECT *group_radio_pages;
+	FL_OBJECT *button_close;
 	FL_OBJECT *radio_all_pages;
 	FL_OBJECT *radio_odd_pages;
 	FL_OBJECT *radio_even_pages;
-	FL_OBJECT *group_radio_order;
 	FL_OBJECT *radio_order_normal;
 	FL_OBJECT *radio_order_reverse;
 	FL_OBJECT *input_from_page;
 	FL_OBJECT *input_count;
-	FL_OBJECT *radio_collated;
+	FL_OBJECT *check_collated;
 	FL_OBJECT *input_to_page;
 	FL_OBJECT *button_browse;
 };
diff --git a/src/frontends/xforms/form_ref.C b/src/frontends/xforms/form_ref.C
index 0986d4d944..50e912578f 100644
--- a/src/frontends/xforms/form_ref.C
+++ b/src/frontends/xforms/form_ref.C
@@ -88,7 +88,7 @@ FD_form_ref * FormRef::build_ref()
     fl_set_object_callback(obj, C_FormBaseOKCB, 0);
   {
     char const * const dummy = N_("Cancel|^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 430, 340, 90, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 430, 340, 90, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
diff --git a/src/frontends/xforms/form_ref.h b/src/frontends/xforms/form_ref.h
index 2f0f16a024..e7d9fa83f2 100644
--- a/src/frontends/xforms/form_ref.h
+++ b/src/frontends/xforms/form_ref.h
@@ -27,7 +27,7 @@ struct FD_form_ref {
 	FL_OBJECT *button_go;
 	FL_OBJECT *button_restore;
 	FL_OBJECT *button_ok;
-	FL_OBJECT *button_cancel;
+	FL_OBJECT *button_close;
 	FL_OBJECT *button_apply;
 };
 
diff --git a/src/frontends/xforms/form_search.C b/src/frontends/xforms/form_search.C
index d08dd3c14e..8b68e191e4 100644
--- a/src/frontends/xforms/form_search.C
+++ b/src/frontends/xforms/form_search.C
@@ -47,7 +47,7 @@ FD_form_search * FormSearch::build_search()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Forwards >|#F^s");
-    fdui->findnext = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 80, 90, 30, idex(_(dummy)));
+    fdui->button_findnext = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 80, 90, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -55,7 +55,7 @@ FD_form_search * FormSearch::build_search()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_(" < Backwards|#B^r");
-    fdui->findprev = obj = fl_add_button(FL_NORMAL_BUTTON, 110, 80, 90, 30, idex(_(dummy)));
+    fdui->button_findprev = obj = fl_add_button(FL_NORMAL_BUTTON, 110, 80, 90, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -63,7 +63,7 @@ FD_form_search * FormSearch::build_search()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Replace|#R#r");
-    fdui->replace = obj = fl_add_button(FL_NORMAL_BUTTON, 110, 120, 90, 30, idex(_(dummy)));
+    fdui->button_replace = obj = fl_add_button(FL_NORMAL_BUTTON, 110, 120, 90, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -71,7 +71,7 @@ FD_form_search * FormSearch::build_search()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Close|^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 350, 120, 80, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 350, 120, 80, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -79,21 +79,21 @@ FD_form_search * FormSearch::build_search()
     fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
   {
     char const * const dummy = N_("Case sensitive|#s#S");
-    fdui->casesensitive = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 300, 20, 150, 30, idex(_(dummy)));
+    fdui->check_casesensitive = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 300, 20, 150, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Match word|#M#m");
-    fdui->matchword = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 300, 50, 150, 30, idex(_(dummy)));
+    fdui->check_matchword = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 300, 50, 150, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Replace All|#A#a");
-    fdui->replaceall = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 120, 90, 30, idex(_(dummy)));
+    fdui->button_replaceall = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 120, 90, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
diff --git a/src/frontends/xforms/form_search.h b/src/frontends/xforms/form_search.h
index 4147005583..b5d3bcf8b9 100644
--- a/src/frontends/xforms/form_search.h
+++ b/src/frontends/xforms/form_search.h
@@ -16,13 +16,13 @@ struct FD_form_search {
 	FL_FORM *form;
 	FL_OBJECT *input_search;
 	FL_OBJECT *input_replace;
-	FL_OBJECT *findnext;
-	FL_OBJECT *findprev;
-	FL_OBJECT *replace;
-	FL_OBJECT *button_cancel;
-	FL_OBJECT *casesensitive;
-	FL_OBJECT *matchword;
-	FL_OBJECT *replaceall;
+	FL_OBJECT *button_findnext;
+	FL_OBJECT *button_findprev;
+	FL_OBJECT *button_replace;
+	FL_OBJECT *button_close;
+	FL_OBJECT *check_casesensitive;
+	FL_OBJECT *check_matchword;
+	FL_OBJECT *button_replaceall;
 };
 
 #endif /* FD_form_search_h_ */
diff --git a/src/frontends/xforms/form_sendto.C b/src/frontends/xforms/form_sendto.C
index 5d553f7008..51b581d623 100644
--- a/src/frontends/xforms/form_sendto.C
+++ b/src/frontends/xforms/form_sendto.C
@@ -57,7 +57,7 @@ FD_form_sendto * FormSendto::build_sendto()
     fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
   {
     char const * const dummy = N_("Cancel|^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 255, 370, 90, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 255, 370, 90, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
diff --git a/src/frontends/xforms/form_sendto.h b/src/frontends/xforms/form_sendto.h
index e7e48f9f01..457aa2bd64 100644
--- a/src/frontends/xforms/form_sendto.h
+++ b/src/frontends/xforms/form_sendto.h
@@ -20,7 +20,7 @@ struct FD_form_sendto {
 	FL_OBJECT *input_command;
 	FL_OBJECT *button_ok;
 	FL_OBJECT *button_apply;
-	FL_OBJECT *button_cancel;
+	FL_OBJECT *button_close;
 };
 
 #endif /* FD_form_sendto_h_ */
diff --git a/src/frontends/xforms/form_spellchecker.C b/src/frontends/xforms/form_spellchecker.C
index 6892eed544..377db38dad 100644
--- a/src/frontends/xforms/form_spellchecker.C
+++ b/src/frontends/xforms/form_spellchecker.C
@@ -40,49 +40,49 @@ FD_form_spellchecker * FormSpellchecker::build_spellchecker()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Spellchecker Options...|#O");
-    fdui->options = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 210, 220, 30, idex(_(dummy)));
+    fdui->button_options = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 210, 220, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Start spellchecking|#S");
-    fdui->start = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 10, 220, 30, idex(_(dummy)));
+    fdui->button_start = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 10, 220, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Insert in personal dictionary|#I");
-    fdui->insert = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 50, 220, 30, idex(_(dummy)));
+    fdui->button_insert = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 50, 220, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Ignore word|#g");
-    fdui->ignore = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 110, 220, 30, idex(_(dummy)));
+    fdui->button_ignore = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 110, 220, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Accept word in this session|#A");
-    fdui->accept = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 80, 220, 30, idex(_(dummy)));
+    fdui->button_accept = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 80, 220, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Stop spellchecking|#T");
-    fdui->stop = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 180, 220, 30, idex(_(dummy)));
+    fdui->button_stop = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 180, 220, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Close Spellchecker|#C^[");
-    fdui->done = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 240, 220, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 240, 220, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -97,7 +97,7 @@ FD_form_spellchecker * FormSpellchecker::build_spellchecker()
     fl_set_object_lalign(obj, FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
   {
     char const * const dummy = N_("Replace word|#R");
-    fdui->replace = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 140, 220, 30, idex(_(dummy)));
+    fdui->button_replace = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 140, 220, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
diff --git a/src/frontends/xforms/form_spellchecker.h b/src/frontends/xforms/form_spellchecker.h
index f0106f191b..9edd631450 100644
--- a/src/frontends/xforms/form_spellchecker.h
+++ b/src/frontends/xforms/form_spellchecker.h
@@ -17,14 +17,14 @@ struct FD_form_spellchecker {
 	FL_OBJECT *text;
 	FL_OBJECT *input;
 	FL_OBJECT *browser;
-	FL_OBJECT *options;
-	FL_OBJECT *start;
-	FL_OBJECT *insert;
-	FL_OBJECT *ignore;
-	FL_OBJECT *accept;
-	FL_OBJECT *stop;
-	FL_OBJECT *done;
-	FL_OBJECT *replace;
+	FL_OBJECT *button_options;
+	FL_OBJECT *button_start;
+	FL_OBJECT *button_insert;
+	FL_OBJECT *button_ignore;
+	FL_OBJECT *button_accept;
+	FL_OBJECT *button_stop;
+	FL_OBJECT *button_close;
+	FL_OBJECT *button_replace;
 	FL_OBJECT *slider;
 };
 
diff --git a/src/frontends/xforms/form_tabular.C b/src/frontends/xforms/form_tabular.C
index 13851adbd8..77be5dfaf7 100644
--- a/src/frontends/xforms/form_tabular.C
+++ b/src/frontends/xforms/form_tabular.C
@@ -25,7 +25,7 @@ FD_form_tabular * FormTabular::build_tabular()
   fdui->form = fl_bgn_form(FL_NO_BOX, 510, 325);
   fdui->form->u_vdata = this;
   obj = fl_add_box(FL_FLAT_BOX, 0, 0, 510, 325, "");
-  fdui->tabFolder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 0, 0, 505, 250, _("Tabbed folder"));
+  fdui->tabfolder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 0, 0, 505, 250, _("Tabbed folder"));
     fl_set_object_resize(obj, FL_RESIZE_ALL);
   {
     char const * const dummy = N_("Close|^[");
@@ -111,13 +111,13 @@ FD_form_tabular_options * FormTabular::build_tabular_options()
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
     char const * const dummy = N_("Longtable|#L");
-    fdui->radio_longtable = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 280, 30, 90, 25, idex(_(dummy)));
+    fdui->check_longtable = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 280, 30, 90, 25, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
     char const * const dummy = N_("Rotate 90°|#9");
-    fdui->radio_rotate_tabular = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 280, 55, 90, 25, idex(_(dummy)));
+    fdui->check_rotate_tabular = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 280, 55, 90, 25, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
@@ -169,7 +169,7 @@ FD_form_column_options * FormTabular::build_column_options()
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
     char const * const dummy = N_("Top|#t");
-    fdui->radio_border_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 45, 25, 25, idex(_(dummy)));
+    fdui->check_border_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 45, 25, 25, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -177,7 +177,7 @@ FD_form_column_options * FormTabular::build_column_options()
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
     char const * const dummy = N_("Bottom|#b");
-    fdui->radio_border_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 75, 25, 25, idex(_(dummy)));
+    fdui->check_border_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 75, 25, 25, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -185,7 +185,7 @@ FD_form_column_options * FormTabular::build_column_options()
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
     char const * const dummy = N_("Left|#l");
-    fdui->radio_border_left = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 65, 60, 25, 25, idex(_(dummy)));
+    fdui->check_border_left = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 65, 60, 25, 25, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -193,12 +193,13 @@ FD_form_column_options * FormTabular::build_column_options()
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
     char const * const dummy = N_("Right|#r");
-    fdui->radio_border_right = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 105, 60, 25, 25, idex(_(dummy)));
+    fdui->check_border_right = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 105, 60, 25, 25, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
+ fl_bgn_group();
   {
     char const * const dummy = N_("Left|#e");
     fdui->radio_align_left = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 205, 35, 105, 25, idex(_(dummy)));
@@ -207,6 +208,7 @@ FD_form_column_options * FormTabular::build_column_options()
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
+    fl_set_button(obj, 1);
   {
     char const * const dummy = N_("Right|#i");
     fdui->radio_align_right = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 205, 85, 105, 25, idex(_(dummy)));
@@ -223,17 +225,21 @@ FD_form_column_options * FormTabular::build_column_options()
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
+  fl_end_group();
+
+ fl_bgn_group();
   {
     char const * const dummy = N_("Top|#p");
-    fdui->radio_valign_top = obj = fl_add_round3dbutton(FL_PUSH_BUTTON, 330, 135, 155, 25, idex(_(dummy)));
+    fdui->radio_valign_top = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 330, 135, 155, 25, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
+    fl_set_button(obj, 1);
   {
     char const * const dummy = N_("Center|#n");
-    fdui->radio_valign_center = obj = fl_add_round3dbutton(FL_PUSH_BUTTON, 330, 160, 155, 25, idex(_(dummy)));
+    fdui->radio_valign_center = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 330, 160, 155, 25, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
@@ -241,12 +247,14 @@ FD_form_column_options * FormTabular::build_column_options()
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
     char const * const dummy = N_("Bottom|#o");
-    fdui->radio_valign_bottom = obj = fl_add_round3dbutton(FL_PUSH_BUTTON, 330, 185, 155, 25, idex(_(dummy)));
+    fdui->radio_valign_bottom = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 330, 185, 155, 25, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
+  fl_end_group();
+
   {
     char const * const dummy = N_("LaTeX Argument|#A");
     fdui->input_special_alignment = obj = fl_add_input(FL_NORMAL_INPUT, 30, 180, 275, 30, idex(_(dummy)));
@@ -307,7 +315,7 @@ FD_form_cell_options * FormTabular::build_cell_options()
     fl_set_object_lstyle(obj, FL_BOLD_STYLE);
   {
     char const * const dummy = N_("Top|#t");
-    fdui->radio_border_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 75, 45, 25, 25, idex(_(dummy)));
+    fdui->check_border_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 75, 45, 25, 25, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -315,7 +323,7 @@ FD_form_cell_options * FormTabular::build_cell_options()
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
     char const * const dummy = N_("Bottom|#b");
-    fdui->radio_border_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 75, 75, 25, 25, idex(_(dummy)));
+    fdui->check_border_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 75, 75, 25, 25, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -323,7 +331,7 @@ FD_form_cell_options * FormTabular::build_cell_options()
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
     char const * const dummy = N_("Left|#l");
-    fdui->radio_border_left = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 55, 60, 25, 25, idex(_(dummy)));
+    fdui->check_border_left = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 55, 60, 25, 25, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -331,12 +339,13 @@ FD_form_cell_options * FormTabular::build_cell_options()
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
     char const * const dummy = N_("Right|#r");
-    fdui->radio_border_right = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 95, 60, 25, 25, idex(_(dummy)));
+    fdui->check_border_right = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 95, 60, 25, 25, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
+ fl_bgn_group();
   {
     char const * const dummy = N_("Left|#e");
     fdui->radio_align_left = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 205, 35, 110, 25, idex(_(dummy)));
@@ -345,6 +354,7 @@ FD_form_cell_options * FormTabular::build_cell_options()
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
+    fl_set_button(obj, 1);
   {
     char const * const dummy = N_("Right|#i");
     fdui->radio_align_right = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 205, 85, 115, 25, idex(_(dummy)));
@@ -361,17 +371,21 @@ FD_form_cell_options * FormTabular::build_cell_options()
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
+  fl_end_group();
+
+ fl_bgn_group();
   {
     char const * const dummy = N_("Top|#p");
-    fdui->radio_valign_top = obj = fl_add_round3dbutton(FL_PUSH_BUTTON, 350, 135, 125, 25, idex(_(dummy)));
+    fdui->radio_valign_top = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 350, 135, 125, 25, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
+    fl_set_button(obj, 1);
   {
     char const * const dummy = N_("Center|#n");
-    fdui->radio_valign_center = obj = fl_add_round3dbutton(FL_PUSH_BUTTON, 350, 160, 125, 25, idex(_(dummy)));
+    fdui->radio_valign_center = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 350, 160, 125, 25, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
@@ -379,12 +393,14 @@ FD_form_cell_options * FormTabular::build_cell_options()
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
     char const * const dummy = N_("Bottom|#o");
-    fdui->radio_valign_bottom = obj = fl_add_round3dbutton(FL_PUSH_BUTTON, 350, 185, 125, 25, idex(_(dummy)));
+    fdui->radio_valign_bottom = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 350, 185, 125, 25, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
+  fl_end_group();
+
   {
     char const * const dummy = N_(" |#W");
     fdui->input_mcolumn_width = obj = fl_add_input(FL_NORMAL_INPUT, 350, 50, 75, 30, idex(_(dummy)));
@@ -403,19 +419,19 @@ FD_form_cell_options * FormTabular::build_cell_options()
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
     char const * const dummy = N_("Multicolumn|#M");
-    fdui->radio_multicolumn = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 140, 130, 25, idex(_(dummy)));
+    fdui->check_multicolumn = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 140, 130, 25, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
     char const * const dummy = N_("Use Minipage|#s");
-    fdui->radio_useminipage = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 165, 130, 25, idex(_(dummy)));
+    fdui->check_useminipage = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 165, 130, 25, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
     char const * const dummy = N_("Rotate 90°|#9");
-    fdui->radio_rotate_cell = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 190, 130, 25, idex(_(dummy)));
+    fdui->check_rotate_cell = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 190, 130, 25, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
@@ -459,17 +475,17 @@ FD_form_longtable_options * FormTabular::build_longtable_options()
   obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 115, 485, 35, "");
   obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 80, 485, 35, "");
   obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 45, 485, 35, "");
-  fdui->radio_lt_firsthead = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 135, 85, 60, 25, _("On"));
+  fdui->check_lt_firsthead = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 135, 85, 60, 25, _("On"));
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->radio_lt_head = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 135, 50, 60, 25, _("On"));
+  fdui->check_lt_head = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 135, 50, 60, 25, _("On"));
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->radio_lt_foot = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 135, 120, 60, 25, _("On"));
+  fdui->check_lt_foot = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 135, 120, 60, 25, _("On"));
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->radio_lt_lastfoot = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 135, 155, 60, 25, _("On"));
+  fdui->check_lt_lastfoot = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 135, 155, 60, 25, _("On"));
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
     char const * const dummy = N_("Page break on the current row|#B");
-    fdui->radio_lt_newpage = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 190, 245, 25, idex(_(dummy)));
+    fdui->check_lt_newpage = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 190, 245, 25, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
diff --git a/src/frontends/xforms/form_tabular.h b/src/frontends/xforms/form_tabular.h
index ca056ba46c..7b3bdd33e1 100644
--- a/src/frontends/xforms/form_tabular.h
+++ b/src/frontends/xforms/form_tabular.h
@@ -21,7 +21,7 @@ struct FD_form_tabular {
 	~FD_form_tabular();
 
 	FL_FORM *form;
-	FL_OBJECT *tabFolder;
+	FL_OBJECT *tabfolder;
 	FL_OBJECT *button_close;
 	FL_OBJECT *input_tabular_column;
 	FL_OBJECT *input_tabular_row;
@@ -37,18 +37,18 @@ struct FD_form_tabular_options {
 	FL_OBJECT *button_delete_row;
 	FL_OBJECT *button_set_borders;
 	FL_OBJECT *button_unset_borders;
-	FL_OBJECT *radio_longtable;
-	FL_OBJECT *radio_rotate_tabular;
+	FL_OBJECT *check_longtable;
+	FL_OBJECT *check_rotate_tabular;
 };
 struct FD_form_column_options {
 	~FD_form_column_options();
 
 	FL_FORM *form;
 	FL_OBJECT *input_column_width;
-	FL_OBJECT *radio_border_top;
-	FL_OBJECT *radio_border_bottom;
-	FL_OBJECT *radio_border_left;
-	FL_OBJECT *radio_border_right;
+	FL_OBJECT *check_border_top;
+	FL_OBJECT *check_border_bottom;
+	FL_OBJECT *check_border_left;
+	FL_OBJECT *check_border_right;
 	FL_OBJECT *radio_align_left;
 	FL_OBJECT *radio_align_right;
 	FL_OBJECT *radio_align_center;
@@ -62,10 +62,10 @@ struct FD_form_cell_options {
 	~FD_form_cell_options();
 
 	FL_FORM *form;
-	FL_OBJECT *radio_border_top;
-	FL_OBJECT *radio_border_bottom;
-	FL_OBJECT *radio_border_left;
-	FL_OBJECT *radio_border_right;
+	FL_OBJECT *check_border_top;
+	FL_OBJECT *check_border_bottom;
+	FL_OBJECT *check_border_left;
+	FL_OBJECT *check_border_right;
 	FL_OBJECT *radio_align_left;
 	FL_OBJECT *radio_align_right;
 	FL_OBJECT *radio_align_center;
@@ -74,20 +74,20 @@ struct FD_form_cell_options {
 	FL_OBJECT *radio_valign_bottom;
 	FL_OBJECT *input_mcolumn_width;
 	FL_OBJECT *input_special_multialign;
-	FL_OBJECT *radio_multicolumn;
-	FL_OBJECT *radio_useminipage;
-	FL_OBJECT *radio_rotate_cell;
+	FL_OBJECT *check_multicolumn;
+	FL_OBJECT *check_useminipage;
+	FL_OBJECT *check_rotate_cell;
 	FL_OBJECT *choice_value_mcolumn_width;
 };
 struct FD_form_longtable_options {
 	~FD_form_longtable_options();
 
 	FL_FORM *form;
-	FL_OBJECT *radio_lt_firsthead;
-	FL_OBJECT *radio_lt_head;
-	FL_OBJECT *radio_lt_foot;
-	FL_OBJECT *radio_lt_lastfoot;
-	FL_OBJECT *radio_lt_newpage;
+	FL_OBJECT *check_lt_firsthead;
+	FL_OBJECT *check_lt_head;
+	FL_OBJECT *check_lt_foot;
+	FL_OBJECT *check_lt_lastfoot;
+	FL_OBJECT *check_lt_newpage;
 	FL_OBJECT *check_head_2border_above;
 	FL_OBJECT *check_head_2border_below;
 	FL_OBJECT *check_1head_2border_above;
diff --git a/src/frontends/xforms/form_tabular_create.C b/src/frontends/xforms/form_tabular_create.C
index e30cb99202..6b75af640c 100644
--- a/src/frontends/xforms/form_tabular_create.C
+++ b/src/frontends/xforms/form_tabular_create.C
@@ -37,7 +37,7 @@ FD_form_tabular_create * FormTabularCreate::build_tabular_create()
     fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
   {
     char const * const dummy = N_("Cancel|^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 210, 90, 90, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 210, 90, 90, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
diff --git a/src/frontends/xforms/form_tabular_create.h b/src/frontends/xforms/form_tabular_create.h
index 677c9ac1f2..548c74dd31 100644
--- a/src/frontends/xforms/form_tabular_create.h
+++ b/src/frontends/xforms/form_tabular_create.h
@@ -17,7 +17,7 @@ struct FD_form_tabular_create {
 	FL_FORM *form;
 	FL_OBJECT *button_ok;
 	FL_OBJECT *button_apply;
-	FL_OBJECT *button_cancel;
+	FL_OBJECT *button_close;
 	FL_OBJECT *slider_columns;
 	FL_OBJECT *slider_rows;
 };
diff --git a/src/frontends/xforms/form_texinfo.C b/src/frontends/xforms/form_texinfo.C
index 9ac82d0b4e..c7db533588 100644
--- a/src/frontends/xforms/form_texinfo.C
+++ b/src/frontends/xforms/form_texinfo.C
@@ -34,6 +34,7 @@ FD_form_texinfo * FormTexinfo::build_texinfo()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   obj = fl_add_frame(FL_ENGRAVED_FRAME, 345, 15, 155, 100, "");
     fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
+ fl_bgn_group();
   {
     char const * const dummy = N_("LaTeX Classes|#C");
     fdui->radio_cls = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 350, 20, 30, 30, idex(_(dummy)));
@@ -65,6 +66,8 @@ FD_form_texinfo * FormTexinfo::build_texinfo()
     fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
     fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fl_end_group();
+
   obj = fl_add_frame(FL_ENGRAVED_FRAME, 345, 122, 155, 128, "");
     fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
   {
@@ -85,7 +88,7 @@ FD_form_texinfo * FormTexinfo::build_texinfo()
     fl_set_object_callback(obj, C_FormBaseInputCB, 2);
   {
     char const * const dummy = N_("Show Path|#P");
-    fdui->button_fullPath = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 350, 209, 30, 30, idex(_(dummy)));
+    fdui->check_fullpath = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 350, 209, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
diff --git a/src/frontends/xforms/form_texinfo.h b/src/frontends/xforms/form_texinfo.h
index 30c9024b57..d1996ee649 100644
--- a/src/frontends/xforms/form_texinfo.h
+++ b/src/frontends/xforms/form_texinfo.h
@@ -20,7 +20,7 @@ struct FD_form_texinfo {
 	FL_OBJECT *radio_bst;
 	FL_OBJECT *button_rescan;
 	FL_OBJECT *button_view;
-	FL_OBJECT *button_fullPath;
+	FL_OBJECT *check_fullpath;
 	FL_OBJECT *button_texhash;
 	FL_OBJECT *button_close;
 };
diff --git a/src/frontends/xforms/form_toc.C b/src/frontends/xforms/form_toc.C
index bb90e84b58..6118d0ef86 100644
--- a/src/frontends/xforms/form_toc.C
+++ b/src/frontends/xforms/form_toc.C
@@ -46,7 +46,7 @@ FD_form_toc * FormToc::build_toc()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Close|^[^M");
-    fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 310, 300, 100, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_RETURN_BUTTON, 310, 300, 100, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
diff --git a/src/frontends/xforms/form_toc.h b/src/frontends/xforms/form_toc.h
index 38556cf0b2..12ddaba08e 100644
--- a/src/frontends/xforms/form_toc.h
+++ b/src/frontends/xforms/form_toc.h
@@ -17,7 +17,7 @@ struct FD_form_toc {
 	FL_OBJECT *browser_toc;
 	FL_OBJECT *button_update;
 	FL_OBJECT *choice_toc_type;
-	FL_OBJECT *button_cancel;
+	FL_OBJECT *button_close;
 };
 
 #endif /* FD_form_toc_h_ */
diff --git a/src/frontends/xforms/form_url.C b/src/frontends/xforms/form_url.C
index 63a443622b..b47b9bc408 100644
--- a/src/frontends/xforms/form_url.C
+++ b/src/frontends/xforms/form_url.C
@@ -27,7 +27,7 @@ FD_form_url * FormUrl::build_url()
   obj = fl_add_box(FL_UP_BOX, 0, 0, 520, 170, "");
   {
     char const * const dummy = N_("URL|#U");
-    fdui->url = obj = fl_add_input(FL_NORMAL_INPUT, 70, 50, 440, 30, idex(_(dummy)));
+    fdui->input_url = obj = fl_add_input(FL_NORMAL_INPUT, 70, 50, 440, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -36,7 +36,7 @@ FD_form_url * FormUrl::build_url()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Name|#N");
-    fdui->name = obj = fl_add_input(FL_NORMAL_INPUT, 70, 90, 440, 30, idex(_(dummy)));
+    fdui->input_name = obj = fl_add_input(FL_NORMAL_INPUT, 70, 90, 440, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -45,7 +45,7 @@ FD_form_url * FormUrl::build_url()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("HTML type|#H");
-    fdui->radio_html = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 480, 10, 30, 30, idex(_(dummy)));
+    fdui->check_html = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 480, 10, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -55,7 +55,7 @@ FD_form_url * FormUrl::build_url()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Cancel|^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 410, 130, 100, 30, idex(_(dummy)));
+    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 410, 130, 100, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
diff --git a/src/frontends/xforms/form_url.h b/src/frontends/xforms/form_url.h
index 79bb426856..7776e2ea69 100644
--- a/src/frontends/xforms/form_url.h
+++ b/src/frontends/xforms/form_url.h
@@ -17,10 +17,10 @@ struct FD_form_url {
 	~FD_form_url();
 
 	FL_FORM *form;
-	FL_OBJECT *url;
-	FL_OBJECT *name;
-	FL_OBJECT *radio_html;
-	FL_OBJECT *button_cancel;
+	FL_OBJECT *input_url;
+	FL_OBJECT *input_name;
+	FL_OBJECT *check_html;
+	FL_OBJECT *button_close;
 	FL_OBJECT *button_ok;
 	FL_OBJECT *button_apply;
 	FL_OBJECT *button_restore;
diff --git a/src/frontends/xforms/forms/README b/src/frontends/xforms/forms/README
index 3297e18fe2..b9cf5985d2 100644
--- a/src/frontends/xforms/forms/README
+++ b/src/frontends/xforms/forms/README
@@ -14,8 +14,33 @@ updating the source incredibly easy.
 Name all buttons and other form components that are likely to cause a callback.
 The names should be of the form:  button_ok, radio_group_item and so on.
 
+Being more explicit (Angus, 12 Mar 2002):
+	class             | prefix
+	------------------+-------
+	FL_BROWSER        | browser
+	FL_BUTTON         | button
+	FL_PIXMAPBUTTON   | button
+	FL_CHECKBUTTON    | check
+	FL_CHOICE         | choice
+	FL_COUNTER        | counter
+	FL_DIAL           | dial
+	FL_INPUT          | input
+	FL_FRAME          | frame
+	FL_LABELFRAME     | frame
+	FL_ROUND3DBUTTON,
+	RADIO_BUTTON      | radio
+	FL_SLIDER         | slider
+	FL_VALSLIDER      | slider
+	FL_TABFOLDER      | tabfolder
+	FL_TEXT           | text
+
+The only exceptions to this are objects that are to be converted in the sed
+scripts. At the moment this applies only to bmtable:
+
+	Convert an FL_BUTTON to a FL_BMTABLE by using prefix "bmtable".
+
 Enter the full name of the callback eg.:
-        C_FormCopyrightOkCB
+        C_FormBaseOkCB
 
 That is, they all have the same format: C_##FormName##CallbackName.
 Your code will then need to use the appropriate macro to setup this C callback
diff --git a/src/frontends/xforms/forms/form_aboutlyx.fd b/src/frontends/xforms/forms/form_aboutlyx.fd
index e1b54f72e5..19f99f65c0 100644
--- a/src/frontends/xforms/forms/form_aboutlyx.fd
+++ b/src/frontends/xforms/forms/form_aboutlyx.fd
@@ -44,7 +44,7 @@ label: Close|^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: close
+name: button_close
 callback: C_FormBaseCancelCB
 argument: 0
 
@@ -62,7 +62,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_NoGravity FL_NoGravity
-name: tabbed_folder
+name: tabfolder
 callback: 
 argument: 
 
diff --git a/src/frontends/xforms/forms/form_bibitem.fd b/src/frontends/xforms/forms/form_bibitem.fd
index 8d2c10ad93..9a50639dd7 100644
--- a/src/frontends/xforms/forms/form_bibitem.fd
+++ b/src/frontends/xforms/forms/form_bibitem.fd
@@ -44,7 +44,7 @@ label: Key:|#K
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: key
+name: input_key
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -80,7 +80,7 @@ label: Cancel|^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_cancel
+name: button_close
 callback: C_FormBaseCancelCB
 argument: 2
 
@@ -98,7 +98,7 @@ label: Label:|#L
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: label
+name: input_label
 callback: C_FormBaseInputCB
 argument: 0
 
diff --git a/src/frontends/xforms/forms/form_bibtex.fd b/src/frontends/xforms/forms/form_bibtex.fd
index 53a1cf0ade..f9d0406f24 100644
--- a/src/frontends/xforms/forms/form_bibtex.fd
+++ b/src/frontends/xforms/forms/form_bibtex.fd
@@ -45,7 +45,7 @@ label: Database:|#D
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: database
+name: input_database
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -81,7 +81,7 @@ label: Cancel|^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_cancel
+name: button_close
 callback: C_FormBaseCancelCB
 argument: 2
 
@@ -99,7 +99,7 @@ label: Style:|#S
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: style
+name: input_style
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -117,7 +117,7 @@ label: Browse...|#B
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: database_browse
+name: button_database_browse
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -135,7 +135,7 @@ label: Browse...|#r
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: style_browse
+name: button_style_browse
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -153,7 +153,7 @@ label: Add bibliography to TOC|#A
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_bibtotoc
+name: check_bibtotoc
 callback: C_FormBaseInputCB
 argument: 0
 
diff --git a/src/frontends/xforms/forms/form_citation.fd b/src/frontends/xforms/forms/form_citation.fd
index 9a9bd92762..59be26abb7 100644
--- a/src/frontends/xforms/forms/form_citation.fd
+++ b/src/frontends/xforms/forms/form_citation.fd
@@ -26,7 +26,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: box
+name:
 callback: 
 argument: 
 
@@ -206,7 +206,7 @@ label: Regular Expression|#R
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_SouthWest FL_SouthWest
-name: button_search_type
+name: check_search_type
 callback: 
 argument: 
 
@@ -224,7 +224,7 @@ label: Case sensitive|#C
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_SouthWest FL_SouthWest
-name: button_search_case
+name: check_search_case
 callback: 
 argument: 
 
@@ -314,7 +314,7 @@ label: Full author list|#F
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_full_author_list
+name: check_full_author_list
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -332,7 +332,7 @@ label: Upper case|#U
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_force_uppercase
+name: check_force_uppercase
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -458,7 +458,7 @@ label: Cancel|^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_SouthEast FL_SouthEast
-name: button_cancel
+name: button_close
 callback: C_FormBaseCancelCB
 argument: 0
 
diff --git a/src/frontends/xforms/forms/form_document.fd b/src/frontends/xforms/forms/form_document.fd
index ca2ffbac5a..ba2619adf7 100644
--- a/src/frontends/xforms/forms/form_document.fd
+++ b/src/frontends/xforms/forms/form_document.fd
@@ -45,7 +45,7 @@ label: Tabbed folder
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: tabbed_folder
+name: tabfolder
 callback: 
 argument: 
 
@@ -63,7 +63,7 @@ label: Cancel|^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_cancel
+name: button_close
 callback: C_FormBaseDeprecatedCancelCB
 argument: INPUT
 
@@ -339,7 +339,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: group_radio_orientation
+name:
 callback: 
 argument: 
 
@@ -939,7 +939,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: group_doc_sides
+name:
 callback: 
 argument: 
 
@@ -1011,7 +1011,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: group_doc_columns
+name:
 callback: 
 argument: 
 
@@ -1083,7 +1083,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: group_doc_sep
+name:
 callback: 
 argument: 
 
@@ -1402,7 +1402,7 @@ label: Section number depth
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: slider_secnumdepth
+name: counter_secnumdepth
 callback: C_FormBaseDeprecatedInputCB
 argument: INPUT
 
@@ -1420,7 +1420,7 @@ label: Table of contents depth
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: slider_tocdepth
+name: counter_tocdepth
 callback: C_FormBaseDeprecatedInputCB
 argument: INPUT
 
@@ -1608,7 +1608,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_bullet_depth
+name:
 callback: 
 argument: 
 
@@ -1735,7 +1735,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_bullet_panel
+name:
 callback: 
 argument: 
 
@@ -1779,74 +1779,74 @@ argument: BULLETPANEL2
 --------------------
 class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
-box: 15 195 90 30
+box: 15 165 90 30
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Ding 2|#i
+label: Ding 1|#D
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_NoGravity FL_NoGravity
-name: radio_bullet_panel_ding2
+name: radio_bullet_panel_ding1
 callback: C_FormBaseDeprecatedInputCB
-argument: BULLETPANEL3
+argument: BULLETPANEL6
 
 --------------------
 class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
-box: 15 225 90 30
+box: 15 195 90 30
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Ding 3|#n
+label: Ding 2|#i
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_NoGravity FL_NoGravity
-name: radio_bullet_panel_ding3
+name: radio_bullet_panel_ding2
 callback: C_FormBaseDeprecatedInputCB
-argument: BULLETPANEL4
+argument: BULLETPANEL3
 
 --------------------
 class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
-box: 15 255 90 30
+box: 15 225 90 30
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Ding 4|#g
+label: Ding 3|#n
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_NoGravity FL_NoGravity
-name: radio_bullet_panel_ding4
+name: radio_bullet_panel_ding3
 callback: C_FormBaseDeprecatedInputCB
-argument: BULLETPANEL5
+argument: BULLETPANEL4
 
 --------------------
 class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
-box: 15 165 90 30
+box: 15 255 90 30
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Ding 1|#D
+label: Ding 4|#g
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_NoGravity FL_NoGravity
-name: radio_bullet_panel_ding1
+name: radio_bullet_panel_ding4
 callback: C_FormBaseDeprecatedInputCB
-argument: BULLETPANEL6
+argument: BULLETPANEL5
 
 --------------------
 class: FL_END_GROUP
diff --git a/src/frontends/xforms/forms/form_error.fd b/src/frontends/xforms/forms/form_error.fd
index e60d43106e..fb7c83d568 100644
--- a/src/frontends/xforms/forms/form_error.fd
+++ b/src/frontends/xforms/forms/form_error.fd
@@ -44,7 +44,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NorthWest FL_SouthEast
-name: message
+name: frame_message
 callback: 
 argument: 
 
@@ -62,7 +62,7 @@ label: Close|^[^M
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_South FL_South
-name: button_cancel
+name: button_close
 callback: C_FormBaseCancelCB
 argument: 0
 
diff --git a/src/frontends/xforms/forms/form_ert.fd b/src/frontends/xforms/forms/form_ert.fd
index 666938b884..9aed80c36f 100644
--- a/src/frontends/xforms/forms/form_ert.fd
+++ b/src/frontends/xforms/forms/form_ert.fd
@@ -62,7 +62,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: group_alignment
+name:
 callback: 
 argument: 
 
@@ -152,7 +152,7 @@ label: Cancel|^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_cancel
+name: button_close
 callback: C_FormBaseCancelCB
 argument: 0
 
diff --git a/src/frontends/xforms/forms/form_external.fd b/src/frontends/xforms/forms/form_external.fd
index e32a094b38..539d107c1c 100644
--- a/src/frontends/xforms/forms/form_external.fd
+++ b/src/frontends/xforms/forms/form_external.fd
@@ -224,7 +224,7 @@ label: Cancel|#C^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_SouthEast FL_SouthEast
-name: button_cancel
+name: button_close
 callback: C_FormBaseCancelCB
 argument: 0
 
diff --git a/src/frontends/xforms/forms/form_float.fd b/src/frontends/xforms/forms/form_float.fd
index 41db410917..c61bd1e4eb 100644
--- a/src/frontends/xforms/forms/form_float.fd
+++ b/src/frontends/xforms/forms/form_float.fd
@@ -80,7 +80,7 @@ label: Top of the page|#T
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_top
+name: check_top
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -98,7 +98,7 @@ label: Bottom of the page|#B
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_bottom
+name: check_bottom
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -116,7 +116,7 @@ label: Page of floats|#P
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_page
+name: check_page
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -134,7 +134,7 @@ label: Here, if possible|#i
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_here
+name: check_here
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -152,80 +152,80 @@ label: Here, definitely|#H
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_here_definitely
+name: check_here_definitely
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 280 160 70 30
+box: 10 160 80 30
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Cancel|^[
+label: Restore|#R
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_cancel
-callback: C_FormBaseCancelCB
+name: button_restore
+callback: C_FormBaseRestoreCB
 argument: 0
 
 --------------------
 class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 200 160 70 30
+type: RETURN_BUTTON
+box: 120 160 70 30
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Apply|#A
-shortcut: 
+label: OK
+shortcut: ^M
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_apply
-callback: C_FormBaseApplyCB
+name: button_ok
+callback: C_FormBaseOKCB
 argument: 0
 
 --------------------
 class: FL_BUTTON
-type: RETURN_BUTTON
-box: 120 160 70 30
+type: NORMAL_BUTTON
+box: 200 160 70 30
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: OK
-shortcut: ^M
+label: Apply|#A
+shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_ok
-callback: C_FormBaseOKCB
+name: button_apply
+callback: C_FormBaseApplyCB
 argument: 0
 
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 10 160 80 30
+box: 280 160 70 30
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Restore|#R
+label: Cancel|^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_restore
-callback: C_FormBaseRestoreCB
+name: button_close
+callback: C_FormBaseCancelCB
 argument: 0
 
 ==============================
diff --git a/src/frontends/xforms/forms/form_graphics.fd b/src/frontends/xforms/forms/form_graphics.fd
index 7d0645dba5..3814b66336 100644
--- a/src/frontends/xforms/forms/form_graphics.fd
+++ b/src/frontends/xforms/forms/form_graphics.fd
@@ -45,7 +45,7 @@ label: Tabbed folder
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: tabFolder
+name: tabfolder
 callback: 
 argument: 
 
@@ -99,7 +99,7 @@ label: Cancel|^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_cancel
+name: button_close
 callback: C_FormBaseCancelCB
 argument: 0
 
@@ -339,7 +339,7 @@ label: Draft mode|#D
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_draft
+name: check_draft
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -375,7 +375,7 @@ label: Don't unzip, when exporting to LaTeX|#u
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_nounzip
+name: check_nounzip
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -453,7 +453,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_size
+name:
 callback: 
 argument: 
 
@@ -471,7 +471,7 @@ label: Original size|#O
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_asis
+name: radio_asis
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -489,7 +489,7 @@ label: Scale|#S
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_scale
+name: radio_scale
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -507,7 +507,7 @@ label: Custom|#C
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_wh
+name: radio_wh
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -873,7 +873,7 @@ label: Clip to bounding box|#C
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_clip
+name: check_clip
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -1047,7 +1047,7 @@ label: Original size|#O
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_lyxasis
+name: radio_lyxasis
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -1065,7 +1065,7 @@ label: Scale|#S
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_lyxscale
+name: radio_lyxscale
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -1083,7 +1083,7 @@ label: Custom|#u
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_lyxwh
+name: radio_lyxwh
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -1137,7 +1137,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_display
+name:
 callback: 
 argument: 
 
diff --git a/src/frontends/xforms/forms/form_include.fd b/src/frontends/xforms/forms/form_include.fd
index 74e4a4cd58..f3d3b2dffb 100644
--- a/src/frontends/xforms/forms/form_include.fd
+++ b/src/frontends/xforms/forms/form_include.fd
@@ -116,7 +116,7 @@ label: Cancel|^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_cancel
+name: button_close
 callback: C_FormBaseCancelCB
 argument: 0
 
@@ -188,7 +188,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: include_grp
+name:
 callback: 
 argument: 
 
@@ -206,7 +206,7 @@ label: Verbatim|#V
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_verbatim
+name: radio_verbatim
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -224,7 +224,7 @@ label: Use input|#i
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_useinput
+name: radio_useinput
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -242,7 +242,7 @@ label: Use include|#U
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_useinclude
+name: radio_useinclude
 callback: C_FormBaseInputCB
 argument: 0
 
diff --git a/src/frontends/xforms/forms/form_index.fd b/src/frontends/xforms/forms/form_index.fd
index 4b32d17eac..81518fe88b 100644
--- a/src/frontends/xforms/forms/form_index.fd
+++ b/src/frontends/xforms/forms/form_index.fd
@@ -116,7 +116,7 @@ label: Cancel|^[
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_SouthEast FL_SouthEast
-name: button_cancel
+name: button_close
 callback: C_FormBaseCancelCB
 argument: 0
 
diff --git a/src/frontends/xforms/forms/form_maths_deco.fd b/src/frontends/xforms/forms/form_maths_deco.fd
index 8cf16f256f..b26e7b229e 100644
--- a/src/frontends/xforms/forms/form_maths_deco.fd
+++ b/src/frontends/xforms/forms/form_maths_deco.fd
@@ -63,7 +63,7 @@ label: Close
 shortcut: ^M
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_cancel
+name: button_close
 callback: C_FormBaseDeprecatedCancelCB
 argument: 0
 
diff --git a/src/frontends/xforms/forms/form_maths_delim.fd b/src/frontends/xforms/forms/form_maths_delim.fd
index 337a441eb9..12eddccd98 100644
--- a/src/frontends/xforms/forms/form_maths_delim.fd
+++ b/src/frontends/xforms/forms/form_maths_delim.fd
@@ -63,7 +63,7 @@ label: Cancel|^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_cancel
+name: button_close
 callback: C_FormBaseDeprecatedCancelCB
 argument: 0
 
@@ -135,7 +135,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: lado
+name:
 callback: 
 argument: 
 
diff --git a/src/frontends/xforms/forms/form_maths_matrix.fd b/src/frontends/xforms/forms/form_maths_matrix.fd
index b112042a45..401fc84beb 100644
--- a/src/frontends/xforms/forms/form_maths_matrix.fd
+++ b/src/frontends/xforms/forms/form_maths_matrix.fd
@@ -159,7 +159,7 @@ label: Cancel|^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_cancel
+name: button_close
 callback: C_FormBaseDeprecatedCancelCB
 argument: 0
 
diff --git a/src/frontends/xforms/forms/form_maths_space.fd b/src/frontends/xforms/forms/form_maths_space.fd
index d680cc2832..f1097a4575 100644
--- a/src/frontends/xforms/forms/form_maths_space.fd
+++ b/src/frontends/xforms/forms/form_maths_space.fd
@@ -45,7 +45,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: spaces
+name:
 callback: 
 argument: 
 
@@ -189,7 +189,7 @@ label: Close
 shortcut: ^M
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_cancel
+name: button_close
 callback: C_FormBaseDeprecatedCancelCB
 argument: 0
 
diff --git a/src/frontends/xforms/forms/form_maths_style.fd b/src/frontends/xforms/forms/form_maths_style.fd
index b7aa640715..7262178d85 100644
--- a/src/frontends/xforms/forms/form_maths_style.fd
+++ b/src/frontends/xforms/forms/form_maths_style.fd
@@ -81,7 +81,7 @@ label: Close
 shortcut: ^M
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_cancel
+name: button_close
 callback: C_FormBaseDeprecatedCancelCB
 argument: 0
 
diff --git a/src/frontends/xforms/forms/form_minipage.fd b/src/frontends/xforms/forms/form_minipage.fd
index 962b3f8e98..2cb49aee5e 100644
--- a/src/frontends/xforms/forms/form_minipage.fd
+++ b/src/frontends/xforms/forms/form_minipage.fd
@@ -116,7 +116,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: group_alignment
+name:
 callback: 
 argument: 
 
@@ -206,7 +206,7 @@ label: Cancel|^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_cancel
+name: button_close
 callback: C_FormBaseCancelCB
 argument: 0
 
diff --git a/src/frontends/xforms/forms/form_paragraph.fd b/src/frontends/xforms/forms/form_paragraph.fd
index 1d5d94b9d3..a67a7a554a 100644
--- a/src/frontends/xforms/forms/form_paragraph.fd
+++ b/src/frontends/xforms/forms/form_paragraph.fd
@@ -63,7 +63,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: group_radio_alignment
+name:
 callback: 
 argument: 
 
@@ -585,7 +585,7 @@ label: Cancel|^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_cancel
+name: button_close
 callback: C_FormBaseDeprecatedCancelCB
 argument: 0
 
diff --git a/src/frontends/xforms/forms/form_preamble.fd b/src/frontends/xforms/forms/form_preamble.fd
index 65b17ed7ed..dc9b88ad36 100644
--- a/src/frontends/xforms/forms/form_preamble.fd
+++ b/src/frontends/xforms/forms/form_preamble.fd
@@ -81,7 +81,7 @@ label: Cancel|^[
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_SouthEast FL_SouthEast
-name: button_cancel
+name: button_close
 callback: C_FormBaseCancelCB
 argument: 0
 
diff --git a/src/frontends/xforms/forms/form_preferences.fd b/src/frontends/xforms/forms/form_preferences.fd
index bfefd8e8ac..b0dde302a9 100644
--- a/src/frontends/xforms/forms/form_preferences.fd
+++ b/src/frontends/xforms/forms/form_preferences.fd
@@ -117,7 +117,7 @@ label: Cancel|^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_cancel
+name: button_close
 callback: C_FormBaseDeprecatedCancelCB
 argument: 0
 
@@ -984,7 +984,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: group_radio_printto
+name:
 callback: 
 argument: 
 
@@ -1312,7 +1312,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_button_group_display
+name:
 callback: 
 argument: 
 
diff --git a/src/frontends/xforms/forms/form_print.fd b/src/frontends/xforms/forms/form_print.fd
index 0e7f287110..a705b7d1f8 100644
--- a/src/frontends/xforms/forms/form_print.fd
+++ b/src/frontends/xforms/forms/form_print.fd
@@ -80,7 +80,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: group_radio_printto
+name:
 callback: 
 argument: 
 
@@ -188,7 +188,7 @@ label: Cancel|^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_cancel
+name: button_close
 callback: C_FormBaseCancelCB
 argument: 0
 
@@ -206,7 +206,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: group_radio_pages
+name:
 callback: 
 argument: 
 
@@ -296,7 +296,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: group_radio_order
+name:
 callback: 
 argument: 
 
@@ -404,7 +404,7 @@ label: Collated|#C
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_collated
+name: check_collated
 callback: C_FormBaseInputCB
 argument: 0
 
diff --git a/src/frontends/xforms/forms/form_ref.fd b/src/frontends/xforms/forms/form_ref.fd
index 750164d226..0e095f2aa1 100644
--- a/src/frontends/xforms/forms/form_ref.fd
+++ b/src/frontends/xforms/forms/form_ref.fd
@@ -224,7 +224,7 @@ label: Cancel|^[
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_SouthEast FL_SouthEast
-name: button_cancel
+name: button_close
 callback: C_FormBaseCancelCB
 argument: 0
 
diff --git a/src/frontends/xforms/forms/form_search.fd b/src/frontends/xforms/forms/form_search.fd
index bef021e445..8ab0b963f3 100644
--- a/src/frontends/xforms/forms/form_search.fd
+++ b/src/frontends/xforms/forms/form_search.fd
@@ -98,7 +98,7 @@ label: Forwards >|#F^s
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_SouthEast FL_SouthEast
-name: findnext
+name: button_findnext
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -116,7 +116,7 @@ label:  < Backwards|#B^r
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_SouthEast FL_SouthEast
-name: findprev
+name: button_findprev
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -134,7 +134,7 @@ label: Replace|#R#r
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_SouthEast FL_SouthEast
-name: replace
+name: button_replace
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -152,7 +152,7 @@ label: Close|^[
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_SouthEast FL_SouthEast
-name: button_cancel
+name: button_close
 callback: C_FormBaseCancelCB
 argument: 0
 
@@ -170,7 +170,7 @@ label: Case sensitive|#s#S
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_NorthEast FL_NorthEast
-name: casesensitive
+name: check_casesensitive
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -188,7 +188,7 @@ label: Match word|#M#m
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_NorthEast FL_NorthEast
-name: matchword
+name: check_matchword
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -206,7 +206,7 @@ label: Replace All|#A#a
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_SouthEast FL_SouthEast
-name: replaceall
+name: button_replaceall
 callback: C_FormBaseInputCB
 argument: 0
 
diff --git a/src/frontends/xforms/forms/form_sendto.fd b/src/frontends/xforms/forms/form_sendto.fd
index 604e19fb01..1291e8e3a7 100644
--- a/src/frontends/xforms/forms/form_sendto.fd
+++ b/src/frontends/xforms/forms/form_sendto.fd
@@ -116,7 +116,7 @@ label: Cancel|^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_SouthEast FL_SouthEast
-name: button_cancel
+name: button_close
 callback: C_FormBaseCancelCB
 argument: 0
 
diff --git a/src/frontends/xforms/forms/form_spellchecker.fd b/src/frontends/xforms/forms/form_spellchecker.fd
index c4dd3aa2a9..255c6f4010 100644
--- a/src/frontends/xforms/forms/form_spellchecker.fd
+++ b/src/frontends/xforms/forms/form_spellchecker.fd
@@ -98,7 +98,7 @@ label: Spellchecker Options...|#O
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: options
+name: button_options
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -116,7 +116,7 @@ label: Start spellchecking|#S
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: start
+name: button_start
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -134,7 +134,7 @@ label: Insert in personal dictionary|#I
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: insert
+name: button_insert
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -152,7 +152,7 @@ label: Ignore word|#g
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: ignore
+name: button_ignore
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -170,7 +170,7 @@ label: Accept word in this session|#A
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: accept
+name: button_accept
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -188,7 +188,7 @@ label: Stop spellchecking|#T
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: stop
+name: button_stop
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -206,7 +206,7 @@ label: Close Spellchecker|#C^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: done
+name: button_close
 callback: C_FormBaseCancelCB
 argument: 0
 
@@ -260,7 +260,7 @@ label: Replace word|#R
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: replace
+name: button_replace
 callback: C_FormBaseInputCB
 argument: 0
 
diff --git a/src/frontends/xforms/forms/form_tabular.fd b/src/frontends/xforms/forms/form_tabular.fd
index 23001056f0..e8b8174837 100644
--- a/src/frontends/xforms/forms/form_tabular.fd
+++ b/src/frontends/xforms/forms/form_tabular.fd
@@ -45,7 +45,7 @@ label: Tabbed folder
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: tabFolder
+name: tabfolder
 callback: 
 argument: 
 
@@ -267,7 +267,7 @@ label: Longtable|#L
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_longtable
+name: check_longtable
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
@@ -285,7 +285,7 @@ label: Rotate 90
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_rotate_tabular
+name: check_rotate_tabular
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
@@ -311,7 +311,7 @@ argument:
 Name: form_column_options
 Width: 505
 Height: 225
-Number of Objects: 19
+Number of Objects: 23
 
 --------------------
 class: FL_BOX
@@ -435,7 +435,7 @@ label: Top|#t
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_border_top
+name: check_border_top
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
@@ -453,7 +453,7 @@ label: Bottom|#b
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_border_bottom
+name: check_border_bottom
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
@@ -471,7 +471,7 @@ label: Left|#l
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_border_left
+name: check_border_left
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
@@ -489,10 +489,28 @@ label: Right|#r
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_border_right
+name: check_border_right
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
+--------------------
+class: FL_BEGIN_GROUP
+type: 0
+box: 0 0 0 0
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name:
+callback: 
+argument: 
+
 --------------------
 class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
@@ -510,6 +528,7 @@ gravity: FL_NoGravity FL_NoGravity
 name: radio_align_left
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
+	value: 1
 
 --------------------
 class: FL_ROUND3DBUTTON
@@ -547,9 +566,45 @@ name: radio_align_center
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
+--------------------
+class: FL_END_GROUP
+type: 0
+box: 0 0 0 0
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: 
+callback: 
+argument: 
+
+--------------------
+class: FL_BEGIN_GROUP
+type: 0
+box: 0 0 0 0
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name:
+callback: 
+argument: 
+
 --------------------
 class: FL_ROUND3DBUTTON
-type: PUSH_BUTTON
+type: RADIO_BUTTON
 box: 330 135 155 25
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
@@ -564,10 +619,11 @@ gravity: FL_NoGravity FL_NoGravity
 name: radio_valign_top
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
+	value: 1
 
 --------------------
 class: FL_ROUND3DBUTTON
-type: PUSH_BUTTON
+type: RADIO_BUTTON
 box: 330 160 155 25
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
@@ -585,7 +641,7 @@ argument: 0
 
 --------------------
 class: FL_ROUND3DBUTTON
-type: PUSH_BUTTON
+type: RADIO_BUTTON
 box: 330 185 155 25
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
@@ -601,6 +657,24 @@ name: radio_valign_bottom
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
+--------------------
+class: FL_END_GROUP
+type: 0
+box: 0 0 0 0
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: 
+callback: 
+argument: 
+
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
@@ -659,7 +733,7 @@ argument:
 Name: form_cell_options
 Width: 505
 Height: 225
-Number of Objects: 23
+Number of Objects: 27
 
 --------------------
 class: FL_BOX
@@ -783,7 +857,7 @@ label: Top|#t
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_border_top
+name: check_border_top
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
@@ -801,7 +875,7 @@ label: Bottom|#b
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_border_bottom
+name: check_border_bottom
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
@@ -819,7 +893,7 @@ label: Left|#l
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_border_left
+name: check_border_left
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
@@ -837,10 +911,28 @@ label: Right|#r
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_border_right
+name: check_border_right
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
+--------------------
+class: FL_BEGIN_GROUP
+type: 0
+box: 0 0 0 0
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name:
+callback: 
+argument: 
+
 --------------------
 class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
@@ -858,6 +950,7 @@ gravity: FL_NoGravity FL_NoGravity
 name: radio_align_left
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
+	value: 1
 
 --------------------
 class: FL_ROUND3DBUTTON
@@ -895,9 +988,45 @@ name: radio_align_center
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
+--------------------
+class: FL_END_GROUP
+type: 0
+box: 0 0 0 0
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: 
+callback: 
+argument: 
+
+--------------------
+class: FL_BEGIN_GROUP
+type: 0
+box: 0 0 0 0
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name:
+callback: 
+argument: 
+
 --------------------
 class: FL_ROUND3DBUTTON
-type: PUSH_BUTTON
+type: RADIO_BUTTON
 box: 350 135 125 25
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
@@ -912,10 +1041,11 @@ gravity: FL_NoGravity FL_NoGravity
 name: radio_valign_top
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
+	value: 1
 
 --------------------
 class: FL_ROUND3DBUTTON
-type: PUSH_BUTTON
+type: RADIO_BUTTON
 box: 350 160 125 25
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
@@ -933,7 +1063,7 @@ argument: 0
 
 --------------------
 class: FL_ROUND3DBUTTON
-type: PUSH_BUTTON
+type: RADIO_BUTTON
 box: 350 185 125 25
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
@@ -949,6 +1079,24 @@ name: radio_valign_bottom
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
+--------------------
+class: FL_END_GROUP
+type: 0
+box: 0 0 0 0
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: 
+callback: 
+argument: 
+
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
@@ -999,7 +1147,7 @@ label: Multicolumn|#M
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_multicolumn
+name: check_multicolumn
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
@@ -1017,7 +1165,7 @@ label: Use Minipage|#s
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_useminipage
+name: check_useminipage
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
@@ -1035,7 +1183,7 @@ label: Rotate 90
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_rotate_cell
+name: check_rotate_cell
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
@@ -1203,7 +1351,7 @@ label: On
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_lt_firsthead
+name: check_lt_firsthead
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
@@ -1221,7 +1369,7 @@ label: On
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_lt_head
+name: check_lt_head
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
@@ -1239,7 +1387,7 @@ label: On
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_lt_foot
+name: check_lt_foot
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
@@ -1257,7 +1405,7 @@ label: On
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_lt_lastfoot
+name: check_lt_lastfoot
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
@@ -1275,7 +1423,7 @@ label: Page break on the current row|#B
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_lt_newpage
+name: check_lt_newpage
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
diff --git a/src/frontends/xforms/forms/form_tabular_create.fd b/src/frontends/xforms/forms/form_tabular_create.fd
index 80a8eb2e44..2e0532e7e3 100644
--- a/src/frontends/xforms/forms/form_tabular_create.fd
+++ b/src/frontends/xforms/forms/form_tabular_create.fd
@@ -81,7 +81,7 @@ label: Cancel|^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_cancel
+name: button_close
 callback: C_FormBaseCancelCB
 argument: 
 
diff --git a/src/frontends/xforms/forms/form_texinfo.fd b/src/frontends/xforms/forms/form_texinfo.fd
index 0530fd2a76..1d1b5b4455 100644
--- a/src/frontends/xforms/forms/form_texinfo.fd
+++ b/src/frontends/xforms/forms/form_texinfo.fd
@@ -11,7 +11,7 @@ SnapGrid: 1
 Name: form_texinfo
 Width: 513
 Height: 312
-Number of Objects: 12
+Number of Objects: 14
 
 --------------------
 class: FL_BOX
@@ -67,6 +67,24 @@ name:
 callback: 
 argument: 
 
+--------------------
+class: FL_BEGIN_GROUP
+type: 0
+box: 0 0 0 0
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name:
+callback: 
+argument: 
+
 --------------------
 class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
@@ -122,6 +140,24 @@ name: radio_bst
 callback: C_FormBaseInputCB
 argument: 0
 
+--------------------
+class: FL_END_GROUP
+type: 0
+box: 0 0 0 0
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: 
+callback: 
+argument: 
+
 --------------------
 class: FL_FRAME
 type: ENGRAVED_FRAME
@@ -190,7 +226,7 @@ label: Show Path|#P
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_NorthEast FL_NorthEast
-name: button_fullPath
+name: check_fullpath
 callback: C_FormBaseInputCB
 argument: 2
 
diff --git a/src/frontends/xforms/forms/form_toc.fd b/src/frontends/xforms/forms/form_toc.fd
index 75624447cd..fab4f24765 100644
--- a/src/frontends/xforms/forms/form_toc.fd
+++ b/src/frontends/xforms/forms/form_toc.fd
@@ -98,7 +98,7 @@ label: Close|^[^M
 shortcut:
 resize: FL_RESIZE_NONE
 gravity: FL_SouthEast FL_SouthEast
-name: button_cancel
+name: button_close
 callback: C_FormBaseCancelCB
 argument: 0
 
diff --git a/src/frontends/xforms/forms/form_url.fd b/src/frontends/xforms/forms/form_url.fd
index 7fa732da88..a109081f5c 100644
--- a/src/frontends/xforms/forms/form_url.fd
+++ b/src/frontends/xforms/forms/form_url.fd
@@ -44,7 +44,7 @@ label: URL|#U
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_NorthWest FL_NorthEast
-name: url
+name: input_url
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -62,7 +62,7 @@ label: Name|#N
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_NorthWest FL_NorthEast
-name: name
+name: input_name
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -80,7 +80,7 @@ label: HTML type|#H
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_NorthWest FL_NorthEast
-name: radio_html
+name: check_html
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -98,7 +98,7 @@ label: Cancel|^[
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_SouthEast FL_SouthEast
-name: button_cancel
+name: button_close
 callback: C_FormBaseCancelCB
 argument: 0