diff --git a/lib/layouts/theorems-ams.inc b/lib/layouts/theorems-ams.inc
index 6a763bfbcd..cacb37c519 100644
--- a/lib/layouts/theorems-ams.inc
+++ b/lib/layouts/theorems-ams.inc
@@ -52,13 +52,13 @@ Style Theorem
 		\theoremstyle{plain}
 		\newtheorem{thm}{Theorem}
 	EndPreamble
-	Requires amsthm
+	Requires              amsthm
 End
 
 
 Style Corollary
 	CopyStyle             Theorem
-	DependsOn		          Theorem
+	DependsOn	      Theorem
 	LatexName             cor
 	LabelString           "Corollary \thetheorem."
 	Preamble
@@ -70,7 +70,7 @@ End
 
 Style Lemma
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             lem
 	LabelString           "Lemma \thetheorem."
 	Preamble
@@ -82,7 +82,7 @@ End
 
 Style Proposition
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             prop
 	LabelString           "Proposition \thetheorem."
 	Preamble
@@ -94,7 +94,7 @@ End
 
 Style Conjecture
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             conjecture
 	LabelString           "Conjecture \thetheorem."
 	Preamble
@@ -106,7 +106,7 @@ End
 
 Style Fact
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             fact
 	LabelString           "Fact \thetheorem."
 	Preamble
@@ -118,7 +118,7 @@ End
 
 Style Definition
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             defn
 	LabelString           "Definition \thetheorem."
 	Font
@@ -143,6 +143,7 @@ Style Example
 	 \theoremstyle{definition}
 	  \newtheorem{example}[thm]{Example}
 	EndPreamble
+	Requires              amsthm
 End
 
 
@@ -154,6 +155,7 @@ Style Problem
 	  \theoremstyle{definition}
 	  \newtheorem{problem}[thm]{Problem}
 	EndPreamble
+	Requires              amsthm
 End
 
 
@@ -165,12 +167,13 @@ Style Exercise
 	  \theoremstyle{definition}
 	  \newtheorem{xca}[thm]{Exercise}
 	EndPreamble
+	Requires              amsthm
 End
 
 
 Style Remark
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             rem
 	LabelString           "Remark \thetheorem."
 	Font
@@ -196,6 +199,7 @@ Style Claim
 	  \theoremstyle{remark}
 	  \newtheorem{claim}[thm]{Claim}
 	EndPreamble
+	Requires              amsthm
 End
 
 
diff --git a/lib/layouts/theorems-starred.inc b/lib/layouts/theorems-starred.inc
index 268ad8e722..788c185355 100644
--- a/lib/layouts/theorems-starred.inc
+++ b/lib/layouts/theorems-starred.inc
@@ -50,6 +50,7 @@ Style Theorem*
 	  \theoremstyle{plain}
 	  \newtheorem*{thm*}{Theorem}
 	EndPreamble
+	Requires              amsthm
 End
 
 
@@ -61,6 +62,7 @@ Style Corollary*
 	  \theoremstyle{plain}
 	  \newtheorem*{cor*}{Corollary}
 	EndPreamble
+	Requires              amsthm
 End
 
 
@@ -72,6 +74,7 @@ Style Lemma*
 	  \theoremstyle{plain}
 	  \newtheorem*{lem*}{Lemma}
 	EndPreamble
+	Requires              amsthm
 End
 
 
@@ -83,6 +86,7 @@ Style Proposition*
 	  \theoremstyle{plain}
 	  \newtheorem*{prop*}{Proposition}
 	EndPreamble
+	Requires              amsthm
 End
 
 
@@ -94,6 +98,7 @@ Style Conjecture*
 	  \theoremstyle{plain}
 	  \newtheorem*{conjecture*}{Conjecture}
 	EndPreamble
+	Requires              amsthm
 End
 
 
@@ -105,6 +110,7 @@ Style Fact*
 	  \theoremstyle{plain}
 	  \newtheorem*{fact*}{Fact}
 	EndPreamble
+	Requires              amsthm
 End
 
 
@@ -124,6 +130,7 @@ Style Definition*
 	 \theoremstyle{definition}
 	 \newtheorem*{defn*}{Definition}
 	EndPreamble
+	Requires              amsthm
 End
 
 
@@ -135,6 +142,7 @@ Style Example*
 	  \theoremstyle{definition}
 	  \newtheorem*{example*}{Example}
 	EndPreamble
+	Requires              amsthm
 End
 
 
@@ -146,6 +154,7 @@ Style Problem*
 	  \theoremstyle{definition}
 	  \newtheorem*{problem*}{Problem}
 	EndPreamble
+	Requires              amsthm
 End
 
 
@@ -157,6 +166,7 @@ Style Exercise*
 	  \theoremstyle{definition}
 	  \newtheorem*{xca*}{Exercise}
 	EndPreamble
+	Requires              amsthm
 End
 
 
@@ -176,6 +186,7 @@ Style Remark*
 	  \theoremstyle{remark}
 	  \newtheorem*{rem*}{Remark}
 	EndPreamble
+	Requires              amsthm
 End
 
 
@@ -187,5 +198,6 @@ Style Claim*
 	  \theoremstyle{remark}
 	  \newtheorem*{claim*}{Claim}
 	EndPreamble
+	Requires              amsthm
 End
 
diff --git a/lib/layouts/theorems.inc b/lib/layouts/theorems.inc
index be81dd1e3d..14fff8755f 100644
--- a/lib/layouts/theorems.inc
+++ b/lib/layouts/theorems.inc
@@ -51,12 +51,13 @@ Style Theorem
 	Preamble
 		\newtheorem{thm}{Theorem}
 	EndPreamble
+	Requires              amsthm
 End
 
 
 Style Corollary
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             cor
 	LabelString           "Corollary \thetheorem."
 	Preamble
@@ -67,7 +68,7 @@ End
 
 Style Lemma
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             lem
 	LabelString           "Lemma \thetheorem."
 	Preamble
@@ -78,7 +79,7 @@ End
 
 Style Proposition
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             prop
 	LabelString           "Proposition \thetheorem."
 	Preamble
@@ -89,7 +90,7 @@ End
 
 Style Conjecture
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             conjecture
 	LabelString           "Conjecture \thetheorem."
 	Preamble
@@ -100,7 +101,7 @@ End
 
 Style Fact
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             fact
 	LabelString           "Fact \thetheorem."
 	Preamble
@@ -111,7 +112,7 @@ End
 
 Style Definition
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             defn
 	LabelString           "Definition \thetheorem."
 	Font
@@ -133,9 +134,10 @@ Style Example
 	LatexName             example
 	LabelString           "Example \thetheorem."
 	Preamble
-	 \theoremstyle{definition}
+	  \theoremstyle{definition}
 	  \newtheorem{example}[thm]{Example}
 	EndPreamble
+	Requires              amsthm
 End
 
 
@@ -147,6 +149,7 @@ Style Problem
 	  \theoremstyle{definition}
 	  \newtheorem{problem}[thm]{Problem}
 	EndPreamble
+	Requires              amsthm
 End
 
 
@@ -158,12 +161,13 @@ Style Exercise
 	  \theoremstyle{definition}
 	  \newtheorem{xca}[thm]{Exercise}
 	EndPreamble
+	Requires              amsthm
 End
 
 
 Style Remark
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             rem
 	LabelString           "Remark \thetheorem."
 	Font
@@ -189,6 +193,7 @@ Style Claim
 	  \theoremstyle{remark}
 	  \newtheorem{claim}[thm]{Claim}
 	EndPreamble
+	Requires              amsthm
 End