diff --git a/lib/bind/aqua.bind b/lib/bind/aqua.bind
index 817163c0ca..a9f8f080b5 100644
--- a/lib/bind/aqua.bind
+++ b/lib/bind/aqua.bind
@@ -10,6 +10,8 @@
 # ~/.lyx/bind/aqua.bind
 #
 
+Format 1
+
 \bind "M-~S-i c"		"citation-insert"
 \bind "M-~S-i f"		"footnote-insert"
 \bind "M-~S-i u"		"url-insert"
@@ -47,7 +49,7 @@
 \bind "M-~S-i h y"		"math-matrix 2 2"
 \bind "M-~S-i h c"		"math-insert \cases"
 
-\bind "M-~S-i o c"		"toc-insert"
+\bind "M-~S-i o c"		"inset-insert toc"
 \bind "M-~S-i o i"		"index-print"
 \bind "M-~S-i o b"		"bibtex-insert"
 
diff --git a/lib/bind/broadway.bind b/lib/bind/broadway.bind
index 75ad24bced..2ea8ec6399 100644
--- a/lib/bind/broadway.bind
+++ b/lib/bind/broadway.bind
@@ -10,6 +10,8 @@
 
 # Broadway Play
 
+Format 1
+
 \bind "M-z s"			"layout Speaker"
 \bind "M-z n"			"layout Narrative"
 \bind "M-z a"			"layout ACT"
diff --git a/lib/bind/cua.bind b/lib/bind/cua.bind
index 145120ce1c..3911dfba94 100644
--- a/lib/bind/cua.bind
+++ b/lib/bind/cua.bind
@@ -34,6 +34,8 @@
 
 ###
 
+Format 1
+
 \bind "C-n"			"buffer-new"
 \bind "C-S-N"			"buffer-new-template"
 \bind "C-o"			"file-open"
diff --git a/lib/bind/cyrkeys.bind b/lib/bind/cyrkeys.bind
index c7746cf470..9debc8e7c8 100644
--- a/lib/bind/cyrkeys.bind
+++ b/lib/bind/cyrkeys.bind
@@ -10,6 +10,8 @@
 
 # Cyrillic X11 key definitions
 
+Format 1
+
 \bind	"Cyrillic_GHE_bar"		"self-insert"
 \bind	"Cyrillic_ghe_bar"		"self-insert"
 \bind	"Cyrillic_ZHE_descender"	"self-insert"
diff --git a/lib/bind/de/menus.bind b/lib/bind/de/menus.bind
index becab55ece..3ecae15fb7 100644
--- a/lib/bind/de/menus.bind
+++ b/lib/bind/de/menus.bind
@@ -38,6 +38,8 @@
 #
 # Menü Schriftgröße
 #
+Format 1
+
 \bind "M-s t"			"font-size tiny"
 \bind "M-s S-S"			"font-size footnotesize"
 \bind "M-s s"			"font-size small"
diff --git a/lib/bind/emacs.bind b/lib/bind/emacs.bind
index 75c23b3e6f..d552c15fca 100644
--- a/lib/bind/emacs.bind
+++ b/lib/bind/emacs.bind
@@ -25,6 +25,8 @@
 #
 # Happy tuning!
 
+Format 1
+
 \bind "C-~S-at"			"mark-on"
 \bind "C-a"			"line-begin"
 \bind "C-b"			"char-backward"
diff --git a/lib/bind/fi/menus.bind b/lib/bind/fi/menus.bind
index de89d56548..cb67c3b7ba 100644
--- a/lib/bind/fi/menus.bind
+++ b/lib/bind/fi/menus.bind
@@ -31,6 +31,8 @@
 #
 
 
+Format 1
+
 \bind "M-k k"			"font-size tiny"
 \bind "M-k S-P"			"font-size footnotesize"
 \bind "M-k p"			"font-size small"
diff --git a/lib/bind/greekkeys.bind b/lib/bind/greekkeys.bind
index ac6d5d2035..d602345aaf 100644
--- a/lib/bind/greekkeys.bind
+++ b/lib/bind/greekkeys.bind
@@ -9,6 +9,8 @@
 # Full author contact details are available in file CREDITS.
 # Greek X11 key definitions
 
+Format 1
+
 \bind	"Greek_ALPHAaccent"	"self-insert"
 \bind	"Greek_EPSILONaccent"	"self-insert"
 \bind	"Greek_ETAaccent"	"self-insert"
diff --git a/lib/bind/hollywood.bind b/lib/bind/hollywood.bind
index ff0d956077..1b0f9a74ee 100644
--- a/lib/bind/hollywood.bind
+++ b/lib/bind/hollywood.bind
@@ -10,6 +10,8 @@
 
 # Hollywood script
 
+Format 1
+
 \bind "M-z s"			"layout Speaker"
 \bind "M-z n"			"layout Narrative"
 \bind "M-z e"			"layout EXT."
diff --git a/lib/bind/latinkeys.bind b/lib/bind/latinkeys.bind
index f36e64e134..759dcac126 100644
--- a/lib/bind/latinkeys.bind
+++ b/lib/bind/latinkeys.bind
@@ -12,6 +12,8 @@
 
 # KP_ keys. Should possibly be moved to another file
 
+Format 1
+
 \bind "KP_0"			"self-insert 0"
 \bind "KP_1"			"self-insert 1"
 \bind "KP_2"			"self-insert 2"
diff --git a/lib/bind/mac.bind b/lib/bind/mac.bind
index 9249f8d255..e9a9ce940c 100644
--- a/lib/bind/mac.bind
+++ b/lib/bind/mac.bind
@@ -27,6 +27,8 @@
 
 ###
 
+Format 1
+
 \bind "C-n"				"buffer-new"
 \bind "C-S-N"			"buffer-new-template"
 \bind "C-o"				"file-open"
diff --git a/lib/bind/math.bind b/lib/bind/math.bind
index 0630f36748..ea791b841e 100644
--- a/lib/bind/math.bind
+++ b/lib/bind/math.bind
@@ -32,6 +32,8 @@
 
 # These are defined for the math menu:
 
+Format 1
+
 \bind "M-m f"			"math-insert \frac"
 \bind "M-m s"			"math-insert \sqrt"
 \bind "M-m x"			"math-subscript"
diff --git a/lib/bind/menus.bind b/lib/bind/menus.bind
index 78636d50a5..3392b3388d 100644
--- a/lib/bind/menus.bind
+++ b/lib/bind/menus.bind
@@ -18,6 +18,8 @@
 # Font size menu
 #
 
+Format 1
+
 \bind "M-s t"			"font-size tiny"
 \bind "M-s S-S"			"font-size footnotesize"
 \bind "M-s s"			"font-size small"
diff --git a/lib/bind/pt/menus.bind b/lib/bind/pt/menus.bind
index 84ff089476..f3a107ea57 100644
--- a/lib/bind/pt/menus.bind
+++ b/lib/bind/pt/menus.bind
@@ -22,6 +22,8 @@
 # Tamanho de Fonte
 #
 
+Format 1
+
 \bind "M-s t"			"font-size tiny"
 \bind "M-s S-S"			"font-size footnotesize"
 \bind "M-s s"			"font-size small"
diff --git a/lib/bind/sciword.bind b/lib/bind/sciword.bind
index d395ac59b2..3367c4ea9a 100644
--- a/lib/bind/sciword.bind
+++ b/lib/bind/sciword.bind
@@ -13,6 +13,8 @@
 #\bind "C-b"                    "font-bold"
 
 # Copy, paste, etc.: more familiar keys
+Format 1
+
 \bind "C-c"	"copy"
 
 # Display equation toggle: type it in a displayed equation to convert it
diff --git a/lib/bind/site.bind b/lib/bind/site.bind
index 02b9ce23ab..3756a18792 100644
--- a/lib/bind/site.bind
+++ b/lib/bind/site.bind
@@ -20,6 +20,8 @@
 # with every new install of LyX and your changes will be lost.
 # 
 
+Format 1
+
 \bind "Right"      "char-right"
 \bind "Left"       "char-left"
 \bind "Up"         "up"
diff --git a/lib/bind/sv/menus.bind b/lib/bind/sv/menus.bind
index 2919cbf738..6ccc102fd9 100644
--- a/lib/bind/sv/menus.bind
+++ b/lib/bind/sv/menus.bind
@@ -32,6 +32,8 @@
 # Font size menu
 #
 
+Format 1
+
 \bind "M-s t"			"font-size pytteliten"
 \bind "M-s S-S"			"font-size mindre"
 \bind "M-s s"			"font-size liten"
diff --git a/lib/bind/xemacs.bind b/lib/bind/xemacs.bind
index 4894279824..97551aec54 100644
--- a/lib/bind/xemacs.bind
+++ b/lib/bind/xemacs.bind
@@ -27,6 +27,8 @@
 #
 # Happy tuning!
 
+Format 1
+
 \bind "C-~S-at"			"mark-on"
 \bind "C-a"			"line-begin"
 \bind "C-b"			"char-backward"
diff --git a/lib/ui/classic.ui b/lib/ui/classic.ui
index 3e92c41b93..6adfa49105 100644
--- a/lib/ui/classic.ui
+++ b/lib/ui/classic.ui
@@ -26,6 +26,8 @@
 # The interface is designed (partially) following the KDE Human Interface
 # Guidelines (http://usability.kde.org/hig/)
 
+Format 1
+
 Menuset
 
 	Menubar
@@ -257,7 +259,7 @@ Menuset
 		Item "Single Quote|Q" "quote-insert single"
 		Item "Ordinary Quote|O" "self-insert \""
 		Item "Menu Separator|M" "specialchar-insert menu-separator"
-		Item "Horizontal Line" "line-insert"
+		Item "Horizontal Line" "inset-insert line rule height 0.25ex width 100col% \end_inset"
 		Item "Page Break" "pagebreak-insert"
 	End
 
@@ -311,7 +313,7 @@ Menuset
 	End
 
 	Menu "insert_toc"
-		Item "Table of Contents|C" "toc-insert"
+		Item "Table of Contents|C" "inset-insert toc"
 		FloatListInsert
 		Item "Index List|I" "index-print"
 		Item "Nomenclature|N" "nomencl-print"
diff --git a/lib/ui/default.ui b/lib/ui/default.ui
index a3ec300b09..1e795c45d1 100644
--- a/lib/ui/default.ui
+++ b/lib/ui/default.ui
@@ -14,6 +14,8 @@
 # The interface is designed (partially) following the KDE Human Interface
 # Guidelines (http://usability.kde.org/hig/)
 
+Format 1
+
 Include "stdmenus.inc"
 
 Include "stdcontext.inc"
diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index a79b6d990e..9ba1c294a4 100644
--- a/lib/ui/stdcontext.inc
+++ b/lib/ui/stdcontext.inc
@@ -19,6 +19,8 @@
 #   (except when the preposition is part of a verb phrase, such as "Check In")
 # (http://library.gnome.org/devel/hig-book/stable/design-text-labels.html.en)
 
+Format 1
+
 Menuset
 
 #
diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc
index 2baf9a0a9c..38b13b59aa 100644
--- a/lib/ui/stdmenus.inc
+++ b/lib/ui/stdmenus.inc
@@ -21,6 +21,8 @@
 #   (except when the preposition is part of a verb phrase, such as "Check In")
 # (http://library.gnome.org/devel/hig-book/stable/design-text-labels.html.en)
 
+Format 1
+
 Menuset
 
 	Menubar
diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc
index 4038d78d87..cdbb2c5fa3 100644
--- a/lib/ui/stdtoolbars.inc
+++ b/lib/ui/stdtoolbars.inc
@@ -62,6 +62,8 @@
 #
 # This is the default toolbar:
 
+Format 1
+
 ToolbarSet
 
 	Toolbar "standard" "Standard"