diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout
index 5273126f89..cd2247b3d6 100644
--- a/lib/layouts/IEEEtran.layout
+++ b/lib/layouts/IEEEtran.layout
@@ -10,39 +10,39 @@
 
 Format 35
 
-Sides          1
-SecNumDepth    3
-TocDepth       3
-DefaultStyle   Standard
+Sides	1
+SecNumDepth	3
+TocDepth	3
+DefaultStyle	Standard
 
 ClassOptions
-  FontSize    9|10|11|12
+  FontSize	9|10|11|12
 end
 
 
 # This is just to show how to declare the default font.
 # The defaults are exactly those shown here.
 DefaultFont
-  Family       Roman
-  Series       Medium
-  Shape        Up
-  Size         Normal
-  Color        None
+  Family	Roman
+  Series	Medium
+  Shape		Up
+  Size		Normal
+  Color		None
 EndFont
 
 
 Style Standard
-  Margin       Static
-  LatexType    Paragraph
-  LatexName    dummy
-  ParIndent    MM
-  ParSkip      0.4
-  Align        Block
+  Margin	Static
+  LatexType	Paragraph
+  LatexName	dummy
+  ParIndent	MM
+  ParSkip	0.4
+  Align		Block
   AlignPossible Block, Left, Right, Center
-  LabelType    No_Label
+  LabelType	No_Label
 End
 
-Counter        theorem
+Counter		theorem
 End
 
 Input stdcounters.inc
@@ -62,104 +62,104 @@ NoStyle Chapter*
 
 
 Style Title
-  Margin       Static
-  LatexType    Command
-  LatexName    title
-  Category     FrontMatter
-  InTitle      1
+  Margin	Static
+  LatexType	Command
+  LatexName	title
+  Category	FrontMatter
+  InTitle	1
   OptionalArgs 0
-  ParSkip      0.4
-  ItemSep      0
-  TopSep       0
-  BottomSep    1
-  ParSep       1
-  Align        Center
-  LabelType    No_Label
+  ParSkip	0.4
+  ItemSep	0
+  TopSep	0
+  BottomSep	1
+  ParSep	1
+  Align		Center
+  LabelType	No_Label
   Font
-    Size       Largest
+    Size	Largest
   EndFont
 End
 
 
 InsetLayout Flex:IEEE_membership
-  LyxType      custom
-  LatexType    command
-  LatexName    IEEEmembership
-  LabelString  "IEEE membership"
+  LyxType	custom
+  LatexType	command
+  LatexName	IEEEmembership
+  LabelString	"IEEE membership"
   Font
-    Shape      Italic
-    Size       Large
-    Misc       No_Emph
-    Misc       No_Noun
-    Misc       No_Bar
+    Shape	Italic
+    Size	Large
+    Misc	No_Emph
+    Misc	No_Noun
+    Misc	No_Bar
   EndFont
   LabelFont
-    Color      green
-    Size       Small
+    Color	green
+    Size	Small
   EndFont
 End
 
 
 InsetLayout Flex:Lowercase
-  CopyStyle    Flex:IEEE_membership
-  LatexType    command
-  LatexName    MakeLowercase
-  LabelString  "lowercase"
+  CopyStyle	Flex:IEEE_membership
+  LatexType	command
+  LatexName	MakeLowercase
+  LabelString	"lowercase"
   Font
-    Size       Normal
+    Size	Normal
   EndFont
 End
 
 
 Style Author
-  Margin       Static
-  LatexType    Command
-  Category     FrontMatter
-  InTitle      1
-  OptionalArgs 1
-  LatexName    author
-  LabelSep     xxx
-  ParSkip      0.4
-  TopSep       1.3
-  BottomSep    0.7
-  ParSep       0.7
-  Align        Center
-  LabelType    No_Label
+  Margin	Static
+  LatexType	Command
+  Category	FrontMatter
+  InTitle	1
+  OptionalArgs	1
+  LatexName	author
+  LabelSep	xxx
+  ParSkip	0.4
+  TopSep	1.3
+  BottomSep	0.7
+  ParSep	0.7
+  Align		Center
+  LabelType	No_Label
   Font
-    Size       Large
+    Size	Large
   EndFont
 End
 
 
 Style Special_Paper_Notice
-  CopyStyle    Title
-  LatexName    IEEEspecialpapernotice
-  InTitle      1
+  CopyStyle	Title
+  LatexName	IEEEspecialpapernotice
+  InTitle	1
   Font
-    Shape      Italic
-    Size       Large
+    Shape	Italic
+    Size	Large
   EndFont
 End
 
 
 Style After_Title_Text
-  CopyStyle    Special_Paper_Notice
-  LatexName    IEEEaftertitletext
+  CopyStyle	Special_Paper_Notice
+  LatexName	IEEEaftertitletext
   Font
-    Shape      Up
-    Size       Normal
+    Shape	Up
+    Size	Normal
   EndFont
 End
 
 
 Style Page_headings
-  LaTeXType    Command
-  LaTeXName    markboth
-  Category     FrontMatter
-  InTitle      1
-  Align        Center
+  LaTeXType	Command
+  LaTeXName	markboth
+  Category	FrontMatter
+  InTitle	1
+  Align		Center
   Font
-    Size       Small
+    Size	Small
   EndFont
   Preamble
   % protect \markboth against an old bug reintroduced in babel >= 3.8g
@@ -171,145 +171,145 @@ End
 
 
 Style MarkBoth
-  ObsoletedBy  Page_headings
+  ObsoletedBy	Page_headings
 End
 
 
 Style Publication_ID
-  CopyStyle    Special_Paper_Notice
-  LatexName    IEEEpubid
+  CopyStyle	Special_Paper_Notice
+  LatexName	IEEEpubid
   Font
-    Shape      Up
-    Size       Small
+    Shape	Up
+    Size	Small
   EndFont
 End
 
 
 Style Abstract
-  Margin       First_Dynamic
-  LatexType    Environment
-  LatexName    abstract
-  Category     FrontMatter
-  TopSep       0.7
-  BottomSep    0.7
-  ParSkip      0.4
-  LabelType    Static
-  LabelString  "Abstract---"
+  Margin	First_Dynamic
+  LatexType	Environment
+  LatexName	abstract
+  Category	FrontMatter
+  TopSep	0.7
+  BottomSep	0.7
+  ParSkip	0.4
+  LabelType	Static
+  LabelString	"Abstract---"
   Font
-    Series     Bold
-    Size       small
+    Series	Bold
+    Size	small
   EndFont
   LabelFont
-    Shape      Italic
-    Series     Bold
-    Size       Small
+    Shape	Italic
+    Series	Bold
+    Size	Small
   EndFont
 End
 
 
 Style Keywords
-  CopyStyle    Abstract
-  LatexName    IEEEkeywords
-  LabelString  "Index Terms---"
+  CopyStyle	Abstract
+  LatexName	IEEEkeywords
+  LabelString	"Index Terms---"
 End
 
 
 Style Appendices
-  Margin       Dynamic
-  LatexType    Command
-  LatexName    appendices
-  Category     BackMatter
-  KeepEmpty    1
-  ParSkip      0.4
-  Align        Block
-  LabelSep     xx
-  LabelType    Static
-  LabelString  "Appendices"
+  Margin	Dynamic
+  LatexType	Command
+  LatexName	appendices
+  Category	BackMatter
+  KeepEmpty	1
+  ParSkip	0.4
+  Align		Block
+  LabelSep	xx
+  LabelType	Static
+  LabelString	"Appendices"
   LabelFont
-    Series     Bold
-    Color      Green
+    Series	Bold
+    Color	Green
   EndFont
 End
 
 Style Appendix
-  CopyStyle    Appendices
-  LatexName    appendix
-  LabelString  "Appendix"
-  OptionalArgs 1
+  CopyStyle	Appendices
+  LatexName	appendix
+  LabelString	"Appendix"
+  OptionalArgs	1
 End
 
 
 Style Bibliography
-  Margin       First_Dynamic
-  LatexType    Bib_Environment
-  LatexName    thebibliography
-  Category     BackMatter
-  NextNoIndent 1
-  LeftMargin   MM
-  ParSkip      0.4
-  ItemSep      0
-  TopSep       0.7
-  BottomSep    0.7
-  ParSep       0.5
-  Align        Block
-  AlignPossible Block, Left
-  LabelType    Bibliography
-  LabelString  "References"
+  Margin	First_Dynamic
+  LatexType	Bib_Environment
+  LatexName	thebibliography
+  Category	BackMatter
+  NextNoIndent	1
+  LeftMargin	MM
+  ParSkip	0.4
+  ItemSep	0
+  TopSep	0.7
+  BottomSep	0.7
+  ParSep	0.5
+  Align		Block
+  AlignPossible	Block, Left
+  LabelType	Bibliography
+  LabelString	"References"
   LabelBottomSep 1.2
   LabelFont
-    Series     Bold
-    Size       Larger
+    Series	Bold
+    Size	Larger
   EndFont
 End
 
 
 Style Biography
-  LaTeXType    Environment
-  LaTeXName    IEEEbiography
-  Category     BackMatter
-  OptionalArgs 1
-  Align        Block
+  LaTeXType	Environment
+  LaTeXName	IEEEbiography
+  Category	BackMatter
+  OptionalArgs	1
+  Align		Block
   TextFont
-    Size       Small
+    Size	Small
   EndFont
 End
 
 
 Style Biography_without_photo
-  CopyStyle    Biography
-  LaTeXName    IEEEbiographynophoto
+  CopyStyle	Biography
+  LaTeXName	IEEEbiographynophoto
   OptionalArgs 0
 End
 
 Style BiographyNoPhoto
-  ObsoletedBy  Biography_without_photo
+  ObsoletedBy	Biography_without_photo
 End
 
 
 Style Proof
-  Category     Theorem
-  Margin       First_Dynamic
-  LatexType    Environment
-  LatexName    IEEEproof
-  NextNoIndent 1
-  OptionalArgs 1
-  LabelSep     xx
-  ParIndent    MMM
-  ParSkip      0.4
-  ItemSep      0.2
-  TopSep       0.7
-  BottomSep    0.7
-  ParSep       0.3
-  Align        Block
+  Category	Theorem
+  Margin	First_Dynamic
+  LatexType	Environment
+  LatexName	IEEEproof
+  NextNoIndent	1
+  OptionalArgs	1
+  LabelSep	xx
+  ParIndent	MMM
+  ParSkip	0.4
+  ItemSep	0.2
+  TopSep	0.7
+  BottomSep	0.7
+  ParSep	0.3
+  Align		Block
   AlignPossible Block, Left
-  LabelType    Static
-  LabelString  "Proof."
-  EndLabelType Filled_Box
+  LabelType	Static
+  LabelString	"Proof."
+  EndLabelType	Filled_Box
   Font
-    Shape      Up
-    Size       Normal
+    Shape	Up
+    Size	Normal
   EndFont
   LabelFont
-    Shape      Italic
+    Shape	Italic
   EndFont
 End
diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout
index 4b5e9e0020..a06228192b 100644
--- a/lib/layouts/moderncv.layout
+++ b/lib/layouts/moderncv.layout
@@ -6,13 +6,13 @@
 
 # General textclass parameters
 Format 35
-	Columns			1
-	Sides			1
-	SecNumDepth		-1
-	TocDepth		-1
+	Columns		1
+	Sides		1
+	SecNumDepth	-1
+	TocDepth	-1
 
-Provides hyperref  1
-Provides url       1
+Provides hyperref	1
+Provides url		1
 
 
 # Standard style definition
@@ -47,7 +47,7 @@ Style Section
 	  Family		Sans
 	  Series		Bold
 	EndFont
-		TocLevel 1
+	TocLevel		1
 End
 
 Style Subsection
@@ -60,7 +60,7 @@ Style Subsection
 	  Family		Sans
 	  Series		Medium
 	EndFont
-	TocLevel 2
+	TocLevel		2
 End
 
 Style Entry
@@ -171,20 +171,20 @@ Style Bibliography
 End
 
 Style --Separator--
-	KeepEmpty             1
-	Margin                Dynamic
-	LatexType             Paragraph
-	LatexName             dummy
-	ParIndent             MM
-	Align                 Block
-	LabelType             Static
-	LabelString           "--- Separate Environment ---"
+	KeepEmpty		1
+	Margin			Dynamic
+	LatexType		Paragraph
+	LatexName		dummy
+	ParIndent		MM
+	Align			Block
+	LabelType		Static
+	LabelString		"--- Separate Environment ---"
 	LabelFont
-	  Family              Roman
-	  Series              Medium
-	  Size                Normal
-	  Color               Blue
+	  Family		Roman
+	  Series		Medium
+	  Size			Normal
+	  Color			Blue
 	EndFont
-	HTMLLabel             NONE
+	HTMLLabel		NONE
 End
 
diff --git a/lib/layouts/tufte-book.layout b/lib/layouts/tufte-book.layout
index 8df0b13944..c3dde0f0f6 100644
--- a/lib/layouts/tufte-book.layout
+++ b/lib/layouts/tufte-book.layout
@@ -239,10 +239,10 @@ Float
 End
 
 Style Bibliography
-	TopSep                4
-	LabelString           "Bibliography"
+	TopSep		4
+	LabelString	"Bibliography"
 	LabelFont
-	  Series              Bold
-	  Size                Huge
+	  Series	Bold
+	  Size		Huge
 	EndFont
 End