diff --git a/lib/layouts/hanging.module b/lib/layouts/hanging.module
index 7de86aa8c5..55c1a2e2d4 100644
--- a/lib/layouts/hanging.module
+++ b/lib/layouts/hanging.module
@@ -48,4 +48,6 @@ Style Hanging
       \everypar={\hangpara}}{\par}
     }
   EndPreamble
+  DocBookTag             para
+  DocBookAttr            role='hanging'
 End
diff --git a/lib/layouts/initials.module b/lib/layouts/initials.module
index 87f19e56e3..2a39c07bb6 100644
--- a/lib/layouts/initials.module
+++ b/lib/layouts/initials.module
@@ -21,7 +21,9 @@ InsetLayout Flex:Initial
 	  Size		Large
 	EndFont
 	Requires	lettrine
-	ResetsFont true
+	ResetsFont  true
+    DocBookTag             para
+    DocBookAttr            role='hanging'
 End
 
 Style Initial
@@ -34,16 +36,23 @@ Style Initial
 	Argument 1
 	  LabelString	"Options"
 	  Tooltip	"Option(s) for the initial"
+	  DocBookTag    NONE
 	EndArgument
 	Argument 2
 	  Mandatory	1
 	  LabelString	"Initial"
 	  Tooltip	"Initial letter(s)"
+	  DocBookTag      phrase
+	  DocBookAttr     role='initial'
+	  DocBookTagType  inline
 	EndArgument
 	Argument 3
 	  Mandatory	1
 	  LabelString	"Rest of Initial"
 	  Tooltip	"Rest of initial word or text"
+	  DocBookTag      phrase
+	  DocBookAttr     role='rest-of-initial'
+	  DocBookTagType  inline
 	EndArgument
 	LabelSep	x
 	ParIndent	MMM
@@ -56,5 +65,7 @@ Style Initial
 	LabelFont
 	  Series	Bold
 	EndFont
+    DocBookTag             para
+    DocBookAttr            role='paragraph-with-initial'
 End
 
diff --git a/lib/layouts/theorems.inc b/lib/layouts/theorems.inc
index b725b1a2ee..6033882570 100644
--- a/lib/layouts/theorems.inc
+++ b/lib/layouts/theorems.inc
@@ -236,7 +236,7 @@ Style Example
 	BabelPreamble
 		\addto\captions$$lang{\renewcommand{\examplename}{_(Example)}}
 	EndBabelPreamble
-	DocBookWrapperTag     informalexample
+	DocBookWrapperTag     example
 	DocBookTag            para
 	DocBookAttr           ""
 End