diff --git a/src/docbkx/resources/css/html.css b/src/docbkx/resources/css/html.css
index 10936f337..dd2ab6941 100644
--- a/src/docbkx/resources/css/html.css
+++ b/src/docbkx/resources/css/html.css
@@ -1,46 +1,19 @@
+@IMPORT url("highlight.css");
+
 body {
-    text-align: justify;
-    margin-right: 2em;
-    margin-left: 2em;
+   text-align: justify;
+   margin-right: 2em;
+   margin-left: 2em;
 }
 
 a,
-    a[accesskey^
-
-=
-"h"
-]
-,
-a[accesskey^
-
-=
-"n"
-]
-,
-a[accesskey^
-
-=
-"u"
-]
-,
-a[accesskey^
-
-=
-"p"
-]
-{
-font-family: Verdana, Arial, helvetica, sans-serif
-
-;
-font-size:
-
-12
-px
-
-;
-color: #003399
-
-;
+a[accesskey^="h"],
+a[accesskey^="n"],
+a[accesskey^="u"],
+a[accesskey^="p"] {
+    font-family: Verdana, Arial, helvetica, sans-serif;
+    font-size: 12px;
+	color: #003399;
 }
 
 a:active {
@@ -52,19 +25,19 @@ a:visited {
 }
 
 p {
-    font-family: Verdana, Arial, sans-serif;
+	font-family: Verdana, Arial, sans-serif;
 }
 
 dt {
-    font-family: Verdana, Arial, sans-serif;
-    font-size: 12px;
+	font-family: Verdana, Arial, sans-serif;
+	font-size: 12px;
 }
 
 p, dl, dt, dd, blockquote {
     color: #000000;
     margin-bottom: 3px;
     margin-top: 3px;
-    padding-top: 0px;
+    padding-top: 0;
 }
 
 ol, ul, p {
@@ -85,7 +58,7 @@ p.releaseinfo {
 
 p.pubdate {
     font-size: 120%;
-    font-weight: bold;
+    font-weight: bold; 
     font-family: Verdana, Arial, helvetica, sans-serif;
 }
 
@@ -97,53 +70,27 @@ td, th, span {
     color: #000000;
 }
 
-td[width^
-
-=
-"40%"
-]
-{
-font-family: Verdana, Arial, helvetica, sans-serif
-
-;
-font-size:
-
-12
-px
-
-;
-color: #003399
-
-;
+td[width^="40%"] {
+    font-family: Verdana, Arial, helvetica, sans-serif;
+    font-size: 12px;
+	color: #003399;
 }
 
-table[summary^
-
-=
-"Navigation header"
-]
-tbody tr th[colspan^
-
-=
-"3"
-]
-{
-font-family: Verdana, Arial, helvetica, sans-serif
-
-;
+table[summary^="Navigation header"] tbody tr th[colspan^="3"] {
+    font-family: Verdana, Arial, helvetica, sans-serif;
 }
 
 blockquote {
-    margin-right: 0px;
+    margin-right: 0;
 }
 
-h1, h2, h3, h4, h6, H6 {
+h1, h2, h3, h4, h6 {
     color: #000000;
     font-weight: 500;
-    margin-top: 0px;
+    margin-top: 0;
     padding-top: 14px;
     font-family: Verdana, Arial, helvetica, sans-serif;
-    margin-bottom: 0px;
+    margin-bottom: 0;
 }
 
 h2.title {
@@ -157,7 +104,7 @@ h2.subtitle {
 }
 
 .firstname, .surname {
-    font-size: 12px;
+	font-size: 12px;
     font-family: Verdana, Arial, helvetica, sans-serif;
 }
 
@@ -166,114 +113,42 @@ table {
     border-spacing: 0;
     border: 1px black;
     empty-cells: hide;
-    margin: 10px 0px 30px 50px;
+    margin: 10px 0 30px 50px;
     width: 90%;
 }
 
 div.table {
-    margin: 30px 0px 30px 0px;
-    border: 1px dashed gray;
-    padding: 10px;
+	margin: 30px 0 10px 0;
+	border: 1px dashed gray;
+	padding: 10px;
 }
 
 div .table-contents table {
-    border: 1px solid black;
+	border: 1px solid black;
 }
 
 div.table > p.title {
-    padding-left: 10px;
+	padding-left: 10px;
 }
 
-table[summary^
-
-=
-"Navigation footer"
-]
-{
-border-collapse: collapse
-
-;
-border-spacing:
-
-0
-;
-border:
-
-1
-px black
-
-;
-empty-cells: hide
-
-;
-margin:
-
-0
-px
-
-;
-width:
-
-100
-%
-;
+table[summary^="Navigation footer"] {
+    border-collapse: collapse;
+    border-spacing: 0;
+    border: 1px black;
+    empty-cells: hide;    
+    margin: 0px;
+    width: 100%;
 }
 
-table[summary^
-
-=
-"Note"
-]
-,
-table[summary^
-
-=
-"Warning"
-]
-,
-table[summary^
-
-=
-"Tip"
-]
-{
-border-collapse: collapse
-
-;
-border-spacing:
-
-0
-;
-border:
-
-1
-px black
-
-;
-empty-cells: hide
-
-;
-margin:
-
-10
-px
-
-0
-px
-
-10
-px
-
--
-20
-px
-
-;
-width:
-
-100
-%
-;
+table[summary^="Note"],
+table[summary^="Warning"],
+table[summary^="Tip"] {
+    border-collapse: collapse;
+    border-spacing: 0;
+    border: 1px black;
+    empty-cells: hide;    
+    margin: 10px 0px 10px -20px;
+    width: 100%;
 }
 
 td {
@@ -282,35 +157,31 @@ td {
 }
 
 div.warning TD {
-    text-align: justify;
+	text-align: justify;
 }
 
-h1 {
-    font-size: 150%;
+h1 { 
+    font-size: 150%; 
 }
 
-h2 {
-    font-size: 110%;
+h2 { 
+    font-size: 110%; 
 }
 
 h3 {
-    font-size: 100%;
-    font-weight: bold;
+    font-size: 100%; font-weight: bold; 
 }
 
-h4 {
-    font-size: 90%;
-    font-weight: bold;
+h4 { 
+    font-size: 90%; font-weight: bold;
 }
 
 h5 {
-    font-size: 90%;
-    font-style: italic;
+    font-size: 90%; font-style: italic; 
 }
 
-h6 {
-    font-size: 100%;
-    font-style: italic;
+h6 { 
+    font-size: 100%; font-style: italic; 
 }
 
 tt {
@@ -320,13 +191,14 @@ tt {
 }
 
 .navheader, .navfooter {
-    border: none;
+	border: none;
 }
 
 div.navfooter table {
-    border: dashed gray;
-    border-width: 1px 1px 1px 1px;
-    background-color: #cde48d;
+	border-style: dashed;
+	border-color: gray;
+	border-width: 1px 1px 1px 1px;
+	background-color: #cde48d;
 }
 
 pre {
@@ -346,23 +218,23 @@ hr {
     width: 100%;
     height: 1px;
     background-color: #CCCCCC;
-    border-width: 0px;
-    padding: 0px;
+    border-width: 0;
+    padding: 0;
 }
 
-.variablelist {
-    padding-top: 10px;
-    padding-bottom: 10px;
+.variablelist { 
+    padding-top: 10px; 
+    padding-bottom: 10px; 
     margin: 0;
 }
 
-.term {
-    font-weight: bold;
+.term { 
+    font-weight:bold;
 }
 
 .mediaobject {
-    padding-top: 30px;
-    padding-bottom: 30px;
+    padding-top: 30px; 
+    padding-bottom: 30px; 
 }
 
 .legalnotice {
@@ -373,7 +245,7 @@ hr {
 
 .sidebar {
     float: right;
-    margin: 10px 0px 10px 30px;
+    margin: 10px 0 10px 30px;
     padding: 10px 20px 20px 20px;
     width: 33%;
     border: 1px solid black;
@@ -382,12 +254,12 @@ hr {
 }
 
 .property {
-    font-family: "Courier New", Courier, monospace;
+	font-family: "Courier New", Courier, monospace;
 }
 
 a code {
-    font-family: Verdana, Arial, monospace;
-    font-size: 12px;
+	font-family: Verdana, Arial, monospace;
+	font-size: 12px;
 }
 
 td code {
@@ -395,27 +267,39 @@ td code {
 }
 
 div.note * td,
-    div.tip * td,
-    div.warning * td,
-    div.calloutlist * td {
-    text-align: justify;
-    font-size: 100%;
+div.tip * td,
+div.warning * td,
+div.calloutlist * td {
+	text-align: justify;
+	font-size: 100%;
+}
+
+.programlisting {
+   clear: both;
 }
 
 .programlisting .interfacename,
-    .programlisting .literal,
-    .programlisting .classname {
+.programlisting .literal,
+.programlisting .classname {
     font-size: 95%;
 }
 
 .title .interfacename,
-    .title .literal,
-    .title .classname {
+.title .literal,
+.title .classname {
     font-size: 130%;
 }
 
 /* everything in a <lineannotation/> is displayed in a coloured, comment-like font */
 .programlisting * .lineannotation,
-    .programlisting * .lineannotation * {
-    color: green;
+.programlisting * .lineannotation * {
+	color: green;
 }
+
+.question * p {
+    font-size: 100%;
+}
+
+.answer * p {
+    font-size: 100%;
+}
\ No newline at end of file
diff --git a/src/docbkx/resources/css/stylesheet.css b/src/docbkx/resources/css/stylesheet.css
deleted file mode 100644
index 77569070a..000000000
--- a/src/docbkx/resources/css/stylesheet.css
+++ /dev/null
@@ -1,99 +0,0 @@
-@IMPORT url("highlight.css");
-
-html {
-  padding:       0pt;
-  margin:        0pt;
-}
-
-body {
-  margin-left:   10%;
-  margin-right:  10%;
-  font-family:   Arial, Sans-serif;
-}
-
-div {
-  margin:        0pt;
-}
-
-p {
-  text-align:    justify;
-}
-
-hr {
-  border:        1px solid gray;
-  background:    gray;
-}
-
-h1,h2,h3,h4 {
-  color:         #234623;
-  font-family:   Arial, Sans-serif;
-}
-
-pre {
-  line-height:   1.0;
-  color:         black;
-}
-
-pre.programlisting {
-  font-size:     10pt;
-  padding:       7pt 3pt;
-  border:        1pt solid black;
-  background:    #eeeeee;
-  clear:         both;
-}
-
-div.table {
-  margin:        1em;
-  padding:       0.5em;
-  text-align:    center;
-}
-
-div.table table {
-  display:       table;
-  width:         100%;
-}
-
-div.table td {
-  padding-left:  7px;
-  padding-right: 7px;
-}
-
-.sidebar {
-    float: right;
-    margin: 10px 0 10px 30px;
-    padding: 10px 20px 20px 20px;
-    width: 33%;
-    border: 1px solid black;
-    background-color: #F4F4F4;
-    font-size: 14px;
-}
-
-.mediaobject {
-    padding-top: 30px; 
-    padding-bottom: 30px; 
-}
-
-.legalnotice {
-    font-family: Verdana, Arial, helvetica, sans-serif;
-    font-size: 12px;
-    font-style: italic;
-}
-
-p.releaseinfo {
-    font-size: 100%;
-    font-weight: bold;
-    font-family: Verdana, Arial, helvetica, sans-serif;
-    padding-top: 10px;
-}
-
-p.pubdate {
-    font-size: 120%;
-    font-weight: bold; 
-    font-family: Verdana, Arial, helvetica, sans-serif;
-}
-
-span.productname {
-    font-size: 200%;
-    font-weight: bold; 
-    font-family: Verdana, Arial, helvetica, sans-serif;
-}
diff --git a/src/docbkx/resources/images/admons/blank.png b/src/docbkx/resources/images/admons/blank.png
new file mode 100644
index 000000000..764bf4f0c
Binary files /dev/null and b/src/docbkx/resources/images/admons/blank.png differ
diff --git a/src/docbkx/resources/images/admons/caution.gif b/src/docbkx/resources/images/admons/caution.gif
new file mode 100644
index 000000000..d9f5e5b1b
Binary files /dev/null and b/src/docbkx/resources/images/admons/caution.gif differ
diff --git a/src/docbkx/resources/images/admons/caution.png b/src/docbkx/resources/images/admons/caution.png
new file mode 100644
index 000000000..5b7809ca4
Binary files /dev/null and b/src/docbkx/resources/images/admons/caution.png differ
diff --git a/src/docbkx/resources/images/admons/caution.tif b/src/docbkx/resources/images/admons/caution.tif
new file mode 100644
index 000000000..4a282948c
Binary files /dev/null and b/src/docbkx/resources/images/admons/caution.tif differ
diff --git a/src/docbkx/resources/images/admons/draft.png b/src/docbkx/resources/images/admons/draft.png
new file mode 100644
index 000000000..0084708c9
Binary files /dev/null and b/src/docbkx/resources/images/admons/draft.png differ
diff --git a/src/docbkx/resources/images/admons/home.gif b/src/docbkx/resources/images/admons/home.gif
new file mode 100644
index 000000000..6784f5bb0
Binary files /dev/null and b/src/docbkx/resources/images/admons/home.gif differ
diff --git a/src/docbkx/resources/images/admons/home.png b/src/docbkx/resources/images/admons/home.png
new file mode 100644
index 000000000..cbb711de7
Binary files /dev/null and b/src/docbkx/resources/images/admons/home.png differ
diff --git a/src/docbkx/resources/images/admons/important.gif b/src/docbkx/resources/images/admons/important.gif
new file mode 100644
index 000000000..6795d9a81
Binary files /dev/null and b/src/docbkx/resources/images/admons/important.gif differ
diff --git a/src/docbkx/resources/images/admons/important.png b/src/docbkx/resources/images/admons/important.png
new file mode 100644
index 000000000..ad57f6f72
Binary files /dev/null and b/src/docbkx/resources/images/admons/important.png differ
diff --git a/src/docbkx/resources/images/admons/important.tif b/src/docbkx/resources/images/admons/important.tif
new file mode 100644
index 000000000..184de6371
Binary files /dev/null and b/src/docbkx/resources/images/admons/important.tif differ
diff --git a/src/docbkx/resources/images/admons/next.gif b/src/docbkx/resources/images/admons/next.gif
new file mode 100644
index 000000000..aa1516e69
Binary files /dev/null and b/src/docbkx/resources/images/admons/next.gif differ
diff --git a/src/docbkx/resources/images/admons/next.png b/src/docbkx/resources/images/admons/next.png
new file mode 100644
index 000000000..45835bf89
Binary files /dev/null and b/src/docbkx/resources/images/admons/next.png differ
diff --git a/src/docbkx/resources/images/admons/note.gif b/src/docbkx/resources/images/admons/note.gif
new file mode 100644
index 000000000..f329d359e
Binary files /dev/null and b/src/docbkx/resources/images/admons/note.gif differ
diff --git a/src/docbkx/resources/images/admons/note.png b/src/docbkx/resources/images/admons/note.png
new file mode 100644
index 000000000..ad57f6f72
Binary files /dev/null and b/src/docbkx/resources/images/admons/note.png differ
diff --git a/src/docbkx/resources/images/admons/note.tif b/src/docbkx/resources/images/admons/note.tif
new file mode 100644
index 000000000..08644d6b5
Binary files /dev/null and b/src/docbkx/resources/images/admons/note.tif differ
diff --git a/src/docbkx/resources/images/admons/prev.gif b/src/docbkx/resources/images/admons/prev.gif
new file mode 100644
index 000000000..64ca8f3c7
Binary files /dev/null and b/src/docbkx/resources/images/admons/prev.gif differ
diff --git a/src/docbkx/resources/images/admons/prev.png b/src/docbkx/resources/images/admons/prev.png
new file mode 100644
index 000000000..cf24654f8
Binary files /dev/null and b/src/docbkx/resources/images/admons/prev.png differ
diff --git a/src/docbkx/resources/images/admons/tip.gif b/src/docbkx/resources/images/admons/tip.gif
new file mode 100644
index 000000000..823f2b417
Binary files /dev/null and b/src/docbkx/resources/images/admons/tip.gif differ
diff --git a/src/docbkx/resources/images/admons/tip.png b/src/docbkx/resources/images/admons/tip.png
new file mode 100644
index 000000000..ad57f6f72
Binary files /dev/null and b/src/docbkx/resources/images/admons/tip.png differ
diff --git a/src/docbkx/resources/images/admons/tip.tif b/src/docbkx/resources/images/admons/tip.tif
new file mode 100644
index 000000000..4a3d8c75f
Binary files /dev/null and b/src/docbkx/resources/images/admons/tip.tif differ
diff --git a/src/docbkx/resources/images/admons/toc-blank.png b/src/docbkx/resources/images/admons/toc-blank.png
new file mode 100644
index 000000000..6ffad17a0
Binary files /dev/null and b/src/docbkx/resources/images/admons/toc-blank.png differ
diff --git a/src/docbkx/resources/images/admons/toc-minus.png b/src/docbkx/resources/images/admons/toc-minus.png
new file mode 100644
index 000000000..abbb020c8
Binary files /dev/null and b/src/docbkx/resources/images/admons/toc-minus.png differ
diff --git a/src/docbkx/resources/images/admons/toc-plus.png b/src/docbkx/resources/images/admons/toc-plus.png
new file mode 100644
index 000000000..941312ce0
Binary files /dev/null and b/src/docbkx/resources/images/admons/toc-plus.png differ
diff --git a/src/docbkx/resources/images/admons/up.gif b/src/docbkx/resources/images/admons/up.gif
new file mode 100644
index 000000000..aabc2d016
Binary files /dev/null and b/src/docbkx/resources/images/admons/up.gif differ
diff --git a/src/docbkx/resources/images/admons/up.png b/src/docbkx/resources/images/admons/up.png
new file mode 100644
index 000000000..07634de26
Binary files /dev/null and b/src/docbkx/resources/images/admons/up.png differ
diff --git a/src/docbkx/resources/images/admons/warning.gif b/src/docbkx/resources/images/admons/warning.gif
new file mode 100644
index 000000000..c6acdec60
Binary files /dev/null and b/src/docbkx/resources/images/admons/warning.gif differ
diff --git a/src/docbkx/resources/images/admons/warning.png b/src/docbkx/resources/images/admons/warning.png
new file mode 100644
index 000000000..ef3e10f40
Binary files /dev/null and b/src/docbkx/resources/images/admons/warning.png differ
diff --git a/src/docbkx/resources/images/admons/warning.tif b/src/docbkx/resources/images/admons/warning.tif
new file mode 100644
index 000000000..7b6611ec7
Binary files /dev/null and b/src/docbkx/resources/images/admons/warning.tif differ
diff --git a/src/docbkx/resources/xsl/fopdf.xsl b/src/docbkx/resources/xsl/fopdf.xsl
index e7b3fee8d..62539d30d 100644
--- a/src/docbkx/resources/xsl/fopdf.xsl
+++ b/src/docbkx/resources/xsl/fopdf.xsl
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
 
-    This is the XSL FO (PDF) stylesheet for the Spring reference
+    This is the XSL FO (PDF) stylesheet for the Spring Data reference
     documentation.
-    
-    Thanks are due to Christian Bauer of the Hibernate project
-    team for writing the original stylesheet upon which this one
-    is based.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
@@ -14,6 +10,7 @@
 
 
     <xsl:import href="urn:docbkx:stylesheet"/>
+    <xsl:import href="highlight-fo.xsl"/>
 
     <!--###################################################
                   Custom Title Page
@@ -26,13 +23,16 @@
                 <fo:table-body>
                     <fo:table-row>
                         <fo:table-cell text-align="center">
+							<!-- Logo 
                             <fo:block>
-                                <fo:block font-family="Helvetica" font-size="24pt" padding-before="10mm">
-                                    <xsl:value-of select="bookinfo/title"/>
-                                </fo:block>
+                                <fo:external-graphic src="file:src/docbkx/resources/images/s2_box_logo.png"/>
                             </fo:block>
+                            -->
                             <fo:block font-family="Helvetica" font-size="22pt" padding-before="10mm">
-                                <xsl:value-of select="bookinfo/subtitle"/>
+                                <xsl:value-of select="bookinfo/subtitle"/> 
+                            </fo:block>
+                            <fo:block font-family="Helvetica" font-size="14pt" padding="10mm">
+                                <xsl:value-of select="bookinfo/title"/>
                             </fo:block>
                             <fo:block font-family="Helvetica" font-size="12pt" padding="10mm">
                                 <xsl:value-of select="bookinfo/releaseinfo"/>
@@ -49,7 +49,6 @@
                     <fo:table-row>
                         <fo:table-cell text-align="center">
                             <fo:block font-family="Helvetica" font-size="12pt" padding="10mm">
-                                <xsl:text>Copyright &#xA9; 2010 </xsl:text>
                                 <xsl:for-each select="bookinfo/authorgroup/author">
                                     <xsl:if test="position() > 1">
                                         <xsl:text>, </xsl:text>
@@ -57,8 +56,15 @@
                                     <xsl:value-of select="firstname"/>
                                     <xsl:text> </xsl:text>
                                     <xsl:value-of select="surname"/>
+                                    <xsl:text> (</xsl:text>
+                                    <xsl:value-of select="affiliation"/>
+                                    <xsl:text>)</xsl:text>
                                 </xsl:for-each>
                             </fo:block>
+                            <fo:block font-family="Helvetica" font-size="12pt" padding="10mm">
+								<xsl:text>Copyright &#xA9; 2006-2009</xsl:text>
+							</fo:block>
+
                             <fo:block font-family="Helvetica" font-size="10pt" padding="1mm">
                                 <xsl:value-of select="bookinfo/legalnotice"/>
                             </fo:block>
@@ -98,13 +104,11 @@
         <xsl:param name="sequence" select="''"/>
         <xsl:param name="position" select="''"/>
         <xsl:param name="gentext-key" select="''"/>
-        <xsl:variable name="Version">
-            <xsl:if test="//releaseinfo">
-                <xsl:text>Spring Datastore Key-Value (</xsl:text>
-                <xsl:value-of select="//releaseinfo"/>
-                <xsl:text>)</xsl:text>
-            </xsl:if>
-        </xsl:variable>
+		<xsl:variable name="Version">
+			<xsl:if test="//releaseinfo">
+				<xsl:text>Spring Data Redis (</xsl:text><xsl:value-of select="//releaseinfo" /><xsl:text>)</xsl:text>
+			</xsl:if>
+		</xsl:variable>
         <xsl:choose>
             <xsl:when test="$sequence='blank'">
                 <xsl:if test="$position = 'center'">
@@ -144,11 +148,11 @@
    ################################################### -->
 
     <!-- These extensions are required for table printing and other stuff -->
-    <xsl:param name="use.extensions">1</xsl:param>
     <xsl:param name="tablecolumns.extension">0</xsl:param>
-    <xsl:param name="callout.extensions">1</xsl:param>
     <!-- FOP provide only PDF Bookmarks at the moment -->
     <xsl:param name="fop.extensions">1</xsl:param>
+    <xsl:param name="fop1.extensions">1</xsl:param>
+    <xsl:param name="ignore.image.scaling">0</xsl:param>
 
     <!--###################################################
                      Table Of Contents
@@ -368,7 +372,7 @@
 
     <!-- Use nice graphics for admonitions -->
     <xsl:param name="admon.graphics">'1'</xsl:param>
-    <!--  <xsl:param name="admon.graphics.path">&admon_gfx_path;</xsl:param> -->
+    <xsl:param name="admon.graphics.path">src/docbkx/resources/images/admons/</xsl:param>
 
     <!--###################################################
                          Misc
@@ -415,4 +419,31 @@
         </fo:basic-link>
     </xsl:template>
 
+    <xsl:template match="link">
+        <fo:basic-link internal-destination="{@linkend}"
+                xsl:use-attribute-sets="xref.properties"
+                text-decoration="underline"
+                color="blue">
+            <xsl:choose>
+                <xsl:when test="count(child::node())=0">
+                    <xsl:value-of select="@linkend"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:apply-templates/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </fo:basic-link>
+    </xsl:template>
+    <!--
+    
+    <xsl:template match="xref">
+        <fo:basic-link internal-destination="{@linkend}"
+                xsl:use-attribute-sets="xref.properties"
+                text-decoration="underline"
+                color="blue">
+				<xsl:apply-templates/>
+        </fo:basic-link>
+    </xsl:template>    
+    -->
+
 </xsl:stylesheet>
diff --git a/src/docbkx/resources/xsl/highlight-fo.xsl b/src/docbkx/resources/xsl/highlight-fo.xsl
new file mode 100644
index 000000000..f0b5dd941
--- /dev/null
+++ b/src/docbkx/resources/xsl/highlight-fo.xsl
@@ -0,0 +1,44 @@
+<?xml version='1.0'?>
+<!-- 
+    Simple highlighter for FO/PDF output. Follows the Eclipse color scheme.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:fo="http://www.w3.org/1999/XSL/Format"
+                xmlns:xslthl="http://xslthl.sf.net"
+                exclude-result-prefixes="xslthl"
+                version='1.0'>
+
+	<xsl:template match='xslthl:keyword'>
+	  <fo:inline font-weight="bold" color="#7F0055"><xsl:apply-templates/></fo:inline>
+	</xsl:template>
+	
+	<xsl:template match='xslthl:comment'>
+	  <fo:inline font-style="italic" color="#3F5F5F"><xsl:apply-templates/></fo:inline>
+	</xsl:template>
+
+	<xsl:template match='xslthl:oneline-comment'>
+	  <fo:inline font-style="italic" color="#3F5F5F"><xsl:apply-templates/></fo:inline>
+	</xsl:template>
+
+	<xsl:template match='xslthl:multiline-comment'>
+	  <fo:inline font-style="italic" color="#3F5FBF"><xsl:apply-templates/></fo:inline>
+	</xsl:template>
+
+	<xsl:template match='xslthl:tag'>
+	  <fo:inline  color="#3F7F7F"><xsl:apply-templates/></fo:inline>
+	</xsl:template>
+
+	<xsl:template match='xslthl:attribute'>
+	  <fo:inline olor="#7F007F"><xsl:apply-templates/></fo:inline>
+	</xsl:template>
+	
+	<xsl:template match='xslthl:value'>
+	  <fo:inline color="#2A00FF"><xsl:apply-templates/></fo:inline>
+	</xsl:template>
+
+	<xsl:template match='xslthl:string'>
+	  <fo:inline color="#2A00FF"><xsl:apply-templates/></fo:inline>
+	</xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/docbkx/resources/xsl/highlight.xsl b/src/docbkx/resources/xsl/highlight.xsl
new file mode 100644
index 000000000..c63c4765c
--- /dev/null
+++ b/src/docbkx/resources/xsl/highlight.xsl
@@ -0,0 +1,42 @@
+<?xml version='1.0'?>
+<!-- 
+    Simple highlighter for HTML output. Follows the Eclipse color scheme.
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:xslthl="http://xslthl.sf.net"
+                exclude-result-prefixes="xslthl"
+                version='1.0'>
+
+	<xsl:template match='xslthl:keyword'>
+	  <span class="hl-keyword"><xsl:value-of select='.'/></span>
+	</xsl:template>
+
+	<xsl:template match='xslthl:comment'>
+	  <span class="hl-comment"><xsl:value-of select='.'/></span>
+	</xsl:template>
+
+	<xsl:template match='xslthl:oneline-comment'>
+	  <span class="hl-comment"><xsl:value-of select='.'/></span>
+	</xsl:template>
+
+	<xsl:template match='xslthl:multiline-comment'>
+	  <span class="hl-multiline-comment"><xsl:value-of select='.'/></span>
+	</xsl:template>
+
+	<xsl:template match='xslthl:tag'>
+	  <span class="hl-tag"><xsl:value-of select='.'/></span>
+	</xsl:template>
+
+	<xsl:template match='xslthl:attribute'>
+	  <span class="hl-attribute"><xsl:value-of select='.'/></span>
+	</xsl:template>
+
+	<xsl:template match='xslthl:value'>
+	  <span class="hl-value"><xsl:value-of select='.'/></span>
+	</xsl:template>
+	
+	<xsl:template match='xslthl:string'>
+	  <span class="hl-string"><xsl:value-of select='.'/></span>
+	</xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/docbkx/resources/xsl/html.xsl b/src/docbkx/resources/xsl/html.xsl
index aa7930bab..2b0f8d6e2 100644
--- a/src/docbkx/resources/xsl/html.xsl
+++ b/src/docbkx/resources/xsl/html.xsl
@@ -5,21 +5,21 @@
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
+                xmlns:xslthl="http://xslthl.sf.net"
+                exclude-result-prefixes="xslthl"                
                 version="1.0">
-
+                
     <xsl:import href="urn:docbkx:stylesheet"/>
-
+    <xsl:import href="highlight.xsl"/>
+	
     <!--###################################################
                     HTML Settings
    ################################################### -->
-
-    <xsl:param name="html.stylesheet">html.css</xsl:param>
-
+	
     <!-- These extensions are required for table printing and other stuff -->
-    <xsl:param name="use.extensions">1</xsl:param>
     <xsl:param name="tablecolumns.extension">0</xsl:param>
-    <xsl:param name="callout.extensions">1</xsl:param>
     <xsl:param name="graphicsize.extension">0</xsl:param>
+    <xsl:param name="ignore.image.scaling">1</xsl:param>
 
     <!--###################################################
                      Table Of Contents
@@ -47,7 +47,7 @@
    ################################################### -->
 
     <!-- Use images for callouts instead of (1) (2) (3) -->
-    <xsl:param name="callout.graphics">0</xsl:param>
+    <xsl:param name="callout.graphics">1</xsl:param>
 
     <!-- Place callout marks at this column in annotated areas -->
     <xsl:param name="callout.defaultcolumn">90</xsl:param>
@@ -57,8 +57,8 @@
    ################################################### -->
 
     <!-- Use nice graphics for admonitions -->
-    <xsl:param name="admon.graphics">0</xsl:param>
-
+    <xsl:param name="admon.graphics">1</xsl:param>
+	<xsl:param name="admon.graphics.path">images/admons/</xsl:param>
     <!--###################################################
                          Misc
    ################################################### -->
@@ -75,9 +75,9 @@
             <xsl:text>, </xsl:text>
         </xsl:if>
         <span class="{name(.)}">
-            <xsl:call-template name="person.name"/>
+            <xsl:call-template name="person.name"/> 
+            (<xsl:value-of select="affiliation"/>)
             <xsl:apply-templates mode="titlepage.mode" select="./contrib"/>
-            <xsl:apply-templates mode="titlepage.mode" select="./affiliation"/>
         </span>
     </xsl:template>
     <xsl:template match="authorgroup" mode="titlepage.mode">
@@ -87,5 +87,21 @@
             <xsl:apply-templates mode="titlepage.mode"/>
         </div>
     </xsl:template>
+   <!--###################################################
+                     Headers and Footers
+    ################################################### -->
+    <!-- let's have a Spring and I21 banner across the top of each page -->
+    <xsl:template name="user.header.navigation">
+        <div style="background-color:white;border:none;height:73px;border:1px solid black;">
+            <a style="border:none;" href="http://www.springframework.org/osgi/"
+               title="The Spring Framework - Spring Data">
+                <img style="border:none;" src="images/xdev-spring_logo.jpg"/>
+            </a>
+            <a style="border:none;" href="http://www.SpringSource.com/" title="SpringSource - Spring from the Source">
+                <img style="border:none;position:absolute;padding-top:5px;right:42px;" src="images/s2-banner-rhs.png"/>
+            </a>
+        </div>
+    </xsl:template>
 
 </xsl:stylesheet>
+
diff --git a/src/docbkx/resources/xsl/html/html_chunk.xsl b/src/docbkx/resources/xsl/html/html_chunk.xsl
deleted file mode 100644
index 81e6ab235..000000000
--- a/src/docbkx/resources/xsl/html/html_chunk.xsl
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-				xmlns:xslthl="http://xslthl.sf.net"
-				exclude-result-prefixes="xslthl"
-				version='1.0'>
-
-	<xsl:param name="chunk.section.depth">'5'</xsl:param>
-	<xsl:param name="use.id.as.filename" select="1"/>
-
-<!-- Extensions -->
-	<xsl:param name="use.extensions">1</xsl:param>
-	<xsl:param name="tablecolumns.extension">0</xsl:param>
-	<xsl:param name="callout.extensions">1</xsl:param>
-
-<!-- Activate Graphics -->
-	<xsl:param name="admon.graphics" select="1"/>
-	<xsl:param name="admon.graphics.path">images/</xsl:param>
-	<xsl:param name="admon.graphics.extension">.gif</xsl:param>
-	<xsl:param name="callout.graphics" select="1" />
-	<xsl:param name="callout.defaultcolumn">120</xsl:param>
-	<xsl:param name="callout.graphics.path">images/callouts/</xsl:param>
-	<xsl:param name="callout.graphics.extension">.gif</xsl:param>
-
-	<xsl:param name="table.borders.with.css" select="1"/>
-	<xsl:param name="html.stylesheet">css/stylesheet.css</xsl:param>
-	<xsl:param name="html.stylesheet.type">text/css</xsl:param>
-	<xsl:param name="generate.toc">book toc,title</xsl:param>
-
-	<xsl:param name="admonition.title.properties">text-align: left</xsl:param>
-
-<!-- Label Chapters and Sections (numbering) -->
-	<xsl:param name="chapter.autolabel" select="1"/>
-	<xsl:param name="section.autolabel" select="1"/>
-	<xsl:param name="section.autolabel.max.depth" select="3"/>
-
-	<xsl:param name="section.label.includes.component.label" select="1"/>
-	<xsl:param name="table.footnote.number.format" select="'1'"/>
-
-<!-- Show only Sections up to level 3 in the TOCs -->
-	<xsl:param name="toc.section.depth">3</xsl:param>
-
-<!-- Remove "Chapter" from the Chapter titles... -->
-	<xsl:param name="local.l10n.xml" select="document('')"/>
-	<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
-		<l:l10n language="en">
-			<l:context name="title-numbered">
-				<l:template name="chapter" text="%n.&#160;%t"/>
-				<l:template name="section" text="%n&#160;%t"/>
-			</l:context>
-		</l:l10n>
-	</l:i18n>
-
-<!-- Use code syntax highlighting -->
-	<xsl:param name="highlight.source" select="1"/>
-
-	<xsl:template match='xslthl:keyword'>
-		<span class="hl-keyword"><xsl:value-of select='.'/></span>
-	</xsl:template>
-
-	<xsl:template match='xslthl:comment'>
-		<span class="hl-comment"><xsl:value-of select='.'/></span>
-	</xsl:template>
-
-	<xsl:template match='xslthl:oneline-comment'>
-		<span class="hl-comment"><xsl:value-of select='.'/></span>
-	</xsl:template>
-
-	<xsl:template match='xslthl:multiline-comment'>
-		<span class="hl-multiline-comment"><xsl:value-of select='.'/></span>
-	</xsl:template>
-
-	<xsl:template match='xslthl:tag'>
-		<span class="hl-tag"><xsl:value-of select='.'/></span>
-	</xsl:template>
-
-	<xsl:template match='xslthl:attribute'>
-		<span class="hl-attribute"><xsl:value-of select='.'/></span>
-	</xsl:template>
-
-	<xsl:template match='xslthl:value'>
-		<span class="hl-value"><xsl:value-of select='.'/></span>
-	</xsl:template>
-	
-	<xsl:template match='xslthl:string'>
-		<span class="hl-string"><xsl:value-of select='.'/></span>
-	</xsl:template>
-
-	<!-- Google Analytics -->
-	<xsl:template name="user.head.content">
-		<xsl:comment>Begin Google Analytics code</xsl:comment>
-		<script type="text/javascript">
-			var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-			document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-		</script>
-		<script type="text/javascript">
-			var pageTracker = _gat._getTracker("UA-2728886-3");
-			pageTracker._setDomainName("none");
-			pageTracker._setAllowLinker(true);
-			pageTracker._trackPageview();
-		</script>
-		<xsl:comment>End Google Analytics code</xsl:comment>
-	</xsl:template>
-
-	<!-- Loopfuse -->
-	<xsl:template name="user.footer.content">
-		<xsl:comment>Begin LoopFuse code</xsl:comment>
-		<script src="http://loopfuse.net/webrecorder/js/listen.js" type="text/javascript">
-		</script>
-		<script type="text/javascript">
-			_lf_cid = "LF_48be82fa";
-			_lf_remora();
-		</script>
-		<xsl:comment>End LoopFuse code</xsl:comment>
-	</xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/docbkx/resources/xsl/html/titlepage.xml b/src/docbkx/resources/xsl/html/titlepage.xml
deleted file mode 100644
index 09539c068..000000000
--- a/src/docbkx/resources/xsl/html/titlepage.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
-             xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
-             xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="book" t:wrapper="div" class="titlepage">
-  <t:titlepage-content t:side="recto">
-    <productname/>
-    <title/>
-    <subtitle/>
-    <!-- <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <mediaobject/> -->
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-    <hr/>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-</t:templates>
diff --git a/src/docbkx/resources/xsl/html_chunk.xsl b/src/docbkx/resources/xsl/html_chunk.xsl
index 59016d819..29b35d281 100644
--- a/src/docbkx/resources/xsl/html_chunk.xsl
+++ b/src/docbkx/resources/xsl/html_chunk.xsl
@@ -7,22 +7,24 @@
                 version="1.0">
 
     <xsl:import href="urn:docbkx:stylesheet"/>
+    <xsl:import href="highlight.xsl"/>
+    
+
     <!--###################################################
                      HTML Settings
     ################################################### -->
     <xsl:param name="chunk.section.depth">'5'</xsl:param>
     <xsl:param name="use.id.as.filename">'1'</xsl:param>
-    <!-- These extensions are required for table printing and other stuff -->
-    <xsl:param name="use.extensions">1</xsl:param>
-    <xsl:param name="tablecolumns.extension">0</xsl:param>
-    <xsl:param name="callout.extensions">1</xsl:param>
+	<xsl:param name="tablecolumns.extension">0</xsl:param>
     <xsl:param name="graphicsize.extension">0</xsl:param>
+    <xsl:param name="ignore.image.scaling">1</xsl:param>
     <!--###################################################
                       Table Of Contents
     ################################################### -->
     <!-- Generate the TOCs for named components only -->
     <xsl:param name="generate.toc">
         book toc
+        qandaset toc
     </xsl:param>
     <!-- Show only Sections up to level 3 in the TOCs -->
     <xsl:param name="toc.section.depth">3</xsl:param>
@@ -39,6 +41,14 @@
     <!-- Place callout marks at this column in annotated areas -->
     <xsl:param name="callout.graphics">1</xsl:param>
     <xsl:param name="callout.defaultcolumn">90</xsl:param>
+    
+    <!--###################################################
+                      Admonitions
+   ################################################### -->
+
+    <!-- Use nice graphics for admonitions -->
+    <xsl:param name="admon.graphics">1</xsl:param>
+	<xsl:param name="admon.graphics.path">images/admons/</xsl:param>    
     <!--###################################################
                           Misc
     ################################################### -->
@@ -55,9 +65,12 @@
             <xsl:text>, </xsl:text>
         </xsl:if>
         <span class="{name(.)}">
-            <xsl:call-template name="person.name"/>
+            <xsl:call-template name="person.name"/> 
+            (<xsl:value-of select="affiliation"/>)
             <xsl:apply-templates mode="titlepage.mode" select="./contrib"/>
+            <!--
             <xsl:apply-templates mode="titlepage.mode" select="./affiliation"/>
+            -->
         </span>
     </xsl:template>
     <xsl:template match="authorgroup" mode="titlepage.mode">
@@ -70,15 +83,15 @@
     <!--###################################################
                      Headers and Footers
     ################################################### -->
-    <!-- let's have a Spring and SpringSource banner across the top of each page -->
+    <!-- let's have a Spring and I21 banner across the top of each page -->
     <xsl:template name="user.header.navigation">
         <div style="background-color:white;border:none;height:73px;border:1px solid black;">
-            <a style="border:none;" href="http://static.springframework.org/spring-ws/site/"
-               title="The Spring Framework - Spring Web Services">
+            <a style="border:none;" href="http://www.springframework.org/osgi/"
+               title="The Spring Framework - Spring Data">
                 <img style="border:none;" src="images/xdev-spring_logo.jpg"/>
             </a>
-            <a style="border:none;" href="http://www.springsource.com/" title="SpringSource">
-                <img style="border:none;position:absolute;padding-top:5px;right:42px;" src="images/s2_box_logo.png"/>
+            <a style="border:none;" href="http://www.SpringSource.com/" title="SpringSource - Spring from the Source">
+                <img style="border:none;position:absolute;padding-top:5px;right:42px;" src="images/s2-banner-rhs.png"/>
             </a>
         </div>
     </xsl:template>
@@ -187,8 +200,8 @@
                                 </td>
                                 <td width="20%" align="center">
                                     <span style="color:white;font-size:90%;">
-                                        <a href="http://www.springsource.com/"
-                                           title="SpringSource">Sponsored by SpringSource
+                                        <a href="http://www.SpringSource.com/"
+                                           title="SpringSource - Spring from the Source">Sponsored by SpringSource
                                         </a>
                                     </span>
                                 </td>
diff --git a/src/docbkx/resources/xsl/pdf/fopdf.xsl b/src/docbkx/resources/xsl/pdf/fopdf.xsl
deleted file mode 100644
index 2905ee3c2..000000000
--- a/src/docbkx/resources/xsl/pdf/fopdf.xsl
+++ /dev/null
@@ -1,518 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-				xmlns:fo="http://www.w3.org/1999/XSL/Format"
-				xmlns:xslthl="http://xslthl.sf.net"
-				exclude-result-prefixes="xslthl"
-				version='1.0'>
-
-<!-- Use nice graphics for admonitions -->
-	<xsl:param name="admon.graphics">'1'</xsl:param>
-	<xsl:param name="admon.graphics.path">@file.prefix@@dbf.xsl@/images/</xsl:param>
-	<xsl:param name="draft.watermark.image" select="'@file.prefix@@dbf.xsl@/images/draft.png'"/>
-	<xsl:param name="paper.type" select="'@paper.type@'"/>
-
-	<xsl:param name="page.margin.top" select="'1cm'"/>
-	<xsl:param name="region.before.extent" select="'1cm'"/>
-	<xsl:param name="body.margin.top" select="'1.5cm'"/>
-
-	<xsl:param name="body.margin.bottom" select="'1.5cm'"/>
-	<xsl:param name="region.after.extent" select="'1cm'"/>
-	<xsl:param name="page.margin.bottom" select="'1cm'"/>
-	<xsl:param name="title.margin.left" select="'0cm'"/>
-
-<!--###################################################
-		Header
-	################################################### -->
-
-<!-- More space in the center header for long text -->
-	<xsl:attribute-set name="header.content.properties">
-		<xsl:attribute name="font-family">
-			<xsl:value-of select="$body.font.family"/>
-		</xsl:attribute>
-		<xsl:attribute name="margin-left">-5em</xsl:attribute>
-		<xsl:attribute name="margin-right">-5em</xsl:attribute>
-	</xsl:attribute-set>
-
-<!--###################################################
-		Table of Contents
-	################################################### -->
-
-	<xsl:param name="generate.toc">
-		book      toc,title
-	</xsl:param>
-
-<!--###################################################
-		Custom Header
-	################################################### -->
-
-	<xsl:template name="header.content">
-		<xsl:param name="pageclass" select="''"/>
-		<xsl:param name="sequence" select="''"/>
-		<xsl:param name="position" select="''"/>
-		<xsl:param name="gentext-key" select="''"/>
-
-		<xsl:variable name="Version">
-			<xsl:choose>
-				<xsl:when test="//productname">
-					<xsl:value-of select="//productname"/><xsl:text> </xsl:text>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:text>please define productname in your docbook file!</xsl:text>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-
-		<xsl:choose>
-			<xsl:when test="$sequence='blank'">
-				<xsl:choose>
-					<xsl:when test="$position='center'">
-						<xsl:value-of select="$Version"/>
-					</xsl:when>
-
-					<xsl:otherwise>
-						<!-- nop -->
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:when>
-
-			<xsl:when test="$pageclass='titlepage'">
-				<!-- nop: other titlepage sequences have no header -->
-			</xsl:when>
-
-			<xsl:when test="$position='center'">
-				<xsl:value-of select="$Version"/>
-			</xsl:when>
-
-			<xsl:otherwise>
-				<!-- nop -->
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
-<!--###################################################
-		Custom Footer
-	################################################### -->
-
-	<xsl:template name="footer.content">
-		<xsl:param name="pageclass" select="''"/>
-		<xsl:param name="sequence" select="''"/>
-		<xsl:param name="position" select="''"/>
-		<xsl:param name="gentext-key" select="''"/>
-
-		<xsl:variable name="Version">
-			<xsl:choose>
-				<xsl:when test="//releaseinfo">
-					<xsl:value-of select="//releaseinfo"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<!-- nop -->
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-
-		<xsl:variable name="Title">
-			<xsl:value-of select="//title"/>
-		</xsl:variable>
-
-		<xsl:choose>
-			<xsl:when test="$sequence='blank'">
-				<xsl:choose>
-					<xsl:when test="$double.sided != 0 and $position = 'left'">
-						<xsl:value-of select="$Version"/>
-					</xsl:when>
-
-					<xsl:when test="$double.sided = 0 and $position = 'center'">
-						<!-- nop -->
-					</xsl:when>
-
-					<xsl:otherwise>
-						<fo:page-number/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:when>
-
-			<xsl:when test="$pageclass='titlepage'">
-				<!-- nop: other titlepage sequences have no footer -->
-			</xsl:when>
-
-			<xsl:when test="$double.sided != 0 and $sequence = 'even' and $position='left'">
-				<fo:page-number/>
-			</xsl:when>
-
-			<xsl:when test="$double.sided != 0 and $sequence = 'odd' and $position='right'">
-				<fo:page-number/>
-			</xsl:when>
-
-			<xsl:when test="$double.sided = 0 and $position='right'">
-				<fo:page-number/>
-			</xsl:when>
-
-			<xsl:when test="$double.sided != 0 and $sequence = 'odd' and $position='left'">
-				<xsl:value-of select="$Version"/>
-			</xsl:when>
-
-			<xsl:when test="$double.sided != 0 and $sequence = 'even' and $position='right'">
-				<xsl:value-of select="$Version"/>
-			</xsl:when>
-
-			<xsl:when test="$double.sided = 0 and $position='left'">
-				<xsl:value-of select="$Version"/>
-			</xsl:when>
-
-			<xsl:when test="$position='center'">
-				<xsl:value-of select="$Title"/>
-			</xsl:when>
-
-			<xsl:otherwise>
-				<!-- nop -->
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
-	<xsl:template match="processing-instruction('hard-pagebreak')">
-		<fo:block break-before='page'/>
-	</xsl:template>
-
-<!--###################################################
-		Extensions
-	################################################### -->
-
-<!-- These extensions are required for table printing and other stuff -->
-	<xsl:param name="use.extensions">1</xsl:param>
-	<xsl:param name="tablecolumns.extension">0</xsl:param>
-	<xsl:param name="callout.extensions">1</xsl:param>
-	<xsl:param name="fop.extensions">1</xsl:param>
-
-<!--###################################################
-		Paper & Page Size
-	################################################### -->
-
-<!-- Paper type, no headers on blank pages, no double sided printing -->
-	<xsl:param name="double.sided">0</xsl:param>
-	<xsl:param name="headers.on.blank.pages">0</xsl:param>
-	<xsl:param name="footers.on.blank.pages">0</xsl:param>
-
-<!--###################################################
-		Fonts & Styles
-	################################################### -->
-
-	<xsl:param name="hyphenate">false</xsl:param>
-
-<!-- Default Font size -->
-	<xsl:param name="body.font.master">11</xsl:param>
-	<xsl:param name="body.font.small">8</xsl:param>
-
-<!-- Line height in body text -->
-	<xsl:param name="line-height">1.4</xsl:param>
-
-<!-- Chapter title size -->
-	<xsl:attribute-set name="chapter.titlepage.recto.style">
-		<xsl:attribute name="text-align">left</xsl:attribute>
-		<xsl:attribute name="font-weight">bold</xsl:attribute>
-		<xsl:attribute name="font-size">
-			<xsl:value-of select="$body.font.master * 1.8"/>
-			<xsl:text>pt</xsl:text>
-		</xsl:attribute>
-	</xsl:attribute-set>
-
-<!-- Why is the font-size for chapters hardcoded in the XSL FO templates?
-	 Let's remove it, so this sucker can use our attribute-set only... -->
-	<xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">
-		<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"
-				xsl:use-attribute-sets="chapter.titlepage.recto.style">
-			<xsl:call-template name="component.title">
-			<xsl:with-param name="node" select="ancestor-or-self::chapter[1]"/>
-			</xsl:call-template>
-		</fo:block>
-	</xsl:template>
-
-<!-- Sections 1, 2 and 3 titles have a small bump factor and padding -->
-	<xsl:attribute-set name="section.title.level1.properties">
-		<xsl:attribute name="space-before.optimum">0.8em</xsl:attribute>
-		<xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-		<xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
-		<xsl:attribute name="font-size">
-			<xsl:value-of select="$body.font.master * 1.5"/>
-			<xsl:text>pt</xsl:text>
-		</xsl:attribute>
-		<xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
-		<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
-		<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
-	</xsl:attribute-set>
-	<xsl:attribute-set name="section.title.level2.properties">
-		<xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
-		<xsl:attribute name="space-before.minimum">0.6em</xsl:attribute>
-		<xsl:attribute name="space-before.maximum">0.6em</xsl:attribute>
-		<xsl:attribute name="font-size">
-			<xsl:value-of select="$body.font.master * 1.25"/>
-			<xsl:text>pt</xsl:text>
-		</xsl:attribute>
-		<xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
-		<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
-		<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
-	</xsl:attribute-set>
-	<xsl:attribute-set name="section.title.level3.properties">
-		<xsl:attribute name="space-before.optimum">0.4em</xsl:attribute>
-		<xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
-		<xsl:attribute name="space-before.maximum">0.4em</xsl:attribute>
-		<xsl:attribute name="font-size">
-			<xsl:value-of select="$body.font.master * 1.0"/>
-			<xsl:text>pt</xsl:text>
-		</xsl:attribute>
-		<xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
-		<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
-		<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
-	</xsl:attribute-set>
-	<xsl:attribute-set name="section.title.level4.properties">
-		<xsl:attribute name="space-before.optimum">0.3em</xsl:attribute>
-		<xsl:attribute name="space-before.minimum">0.3em</xsl:attribute>
-		<xsl:attribute name="space-before.maximum">0.3em</xsl:attribute>
-		<xsl:attribute name="font-size">
-			<xsl:value-of select="$body.font.master * 0.9"/>
-			<xsl:text>pt</xsl:text>
-		</xsl:attribute>
-		<xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
-		<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
-		<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
-	</xsl:attribute-set>
-
-<!-- Use code syntax highlighting -->
-	<xsl:param name="highlight.source" select="1"/>
-	<xsl:param name="highlight.default.language" select="xml" />
-
-	<xsl:template match='xslthl:keyword'>
-		<fo:inline font-weight="bold" color="#7F0055"><xsl:apply-templates/></fo:inline>
-	</xsl:template>
-	
-	<xsl:template match='xslthl:comment'>
-		<fo:inline font-style="italic" color="#3F5F5F"><xsl:apply-templates/></fo:inline>
-	</xsl:template>
-
-	<xsl:template match='xslthl:oneline-comment'>
-		<fo:inline font-style="italic" color="#3F5F5F"><xsl:apply-templates/></fo:inline>
-	</xsl:template>
-
-	<xsl:template match='xslthl:multiline-comment'>
-		<fo:inline font-style="italic" color="#3F5FBF"><xsl:apply-templates/></fo:inline>
-	</xsl:template>
-
-	<xsl:template match='xslthl:tag'>
-		<fo:inline  color="#3F7F7F"><xsl:apply-templates/></fo:inline>
-	</xsl:template>
-
-	<xsl:template match='xslthl:attribute'>
-		<fo:inline color="#7F007F"><xsl:apply-templates/></fo:inline>
-	</xsl:template>
-	
-	<xsl:template match='xslthl:value'>
-		<fo:inline color="#2A00FF"><xsl:apply-templates/></fo:inline>
-	</xsl:template>
-
-	<xsl:template match='xslthl:string'>
-		<fo:inline color="#2A00FF"><xsl:apply-templates/></fo:inline>
-	</xsl:template>
-
-<!--###################################################
-		Tables
-	################################################### -->
-
-	<!-- Some padding inside tables -->
-	<xsl:attribute-set name="table.cell.padding">
-		<xsl:attribute name="padding-left">4pt</xsl:attribute>
-		<xsl:attribute name="padding-right">4pt</xsl:attribute>
-		<xsl:attribute name="padding-top">4pt</xsl:attribute>
-		<xsl:attribute name="padding-bottom">4pt</xsl:attribute>
-	</xsl:attribute-set>
-
-<!-- Only hairlines as frame and cell borders in tables -->
-	<xsl:param name="table.frame.border.thickness">0.1pt</xsl:param>
-	<xsl:param name="table.cell.border.thickness">0.1pt</xsl:param>
-
-<!--###################################################
-		Labels
-	################################################### -->
-
-<!-- Label Chapters and Sections (numbering) -->
-	<xsl:param name="chapter.autolabel" select="1"/>
-	<xsl:param name="section.autolabel" select="1"/>
-	<xsl:param name="section.autolabel.max.depth" select="1"/>
-
-	<xsl:param name="section.label.includes.component.label" select="1"/>
-	<xsl:param name="table.footnote.number.format" select="'1'"/>
-
-<!--###################################################
-		Programlistings
-	################################################### -->
-
-<!-- Verbatim text formatting (programlistings) -->
-	<xsl:attribute-set name="monospace.verbatim.properties">
-		<xsl:attribute name="font-size">
-			<xsl:value-of select="$body.font.small * 1.0"/>
-			<xsl:text>pt</xsl:text>
-		</xsl:attribute>
-	</xsl:attribute-set>
-
-	<xsl:attribute-set name="verbatim.properties">
-		<xsl:attribute name="space-before.minimum">1em</xsl:attribute>
-		<xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-		<xsl:attribute name="space-before.maximum">1em</xsl:attribute>
-		<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
-		<xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
-		<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
-
-		<xsl:attribute name="border-color">#444444</xsl:attribute>
-		<xsl:attribute name="border-style">solid</xsl:attribute>
-		<xsl:attribute name="border-width">0.1pt</xsl:attribute>
-		<xsl:attribute name="padding-top">0.5em</xsl:attribute>
-		<xsl:attribute name="padding-left">0.5em</xsl:attribute>
-		<xsl:attribute name="padding-right">0.5em</xsl:attribute>
-		<xsl:attribute name="padding-bottom">0.5em</xsl:attribute>
-		<xsl:attribute name="margin-left">0.5em</xsl:attribute>
-		<xsl:attribute name="margin-right">0.5em</xsl:attribute>
-	</xsl:attribute-set>
-
-    <!-- Shade (background) programlistings -->
-	<xsl:param name="shade.verbatim">1</xsl:param>
-	<xsl:attribute-set name="shade.verbatim.style">
-		<xsl:attribute name="background-color">#F0F0F0</xsl:attribute>
-	</xsl:attribute-set>
-
-	<xsl:attribute-set name="list.block.spacing">
-		<xsl:attribute name="space-before.optimum">0.1em</xsl:attribute>
-		<xsl:attribute name="space-before.minimum">0.1em</xsl:attribute>
-		<xsl:attribute name="space-before.maximum">0.1em</xsl:attribute>
-		<xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
-		<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
-		<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
-	</xsl:attribute-set>
-
-	<xsl:attribute-set name="example.properties">
-		<xsl:attribute name="space-before.minimum">0.5em</xsl:attribute>
-		<xsl:attribute name="space-before.optimum">0.5em</xsl:attribute>
-		<xsl:attribute name="space-before.maximum">0.5em</xsl:attribute>
-		<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
-		<xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
-		<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
-		<xsl:attribute name="keep-together.within-column">always</xsl:attribute>
-	</xsl:attribute-set>
-
-<!--###################################################
-		Title information for Figures, Examples etc.
-	################################################### -->
-
-	<xsl:attribute-set name="formal.title.properties" use-attribute-sets="normal.para.spacing">
-		<xsl:attribute name="font-weight">normal</xsl:attribute>
-		<xsl:attribute name="font-style">italic</xsl:attribute>
-		<xsl:attribute name="font-size">
-			<xsl:value-of select="$body.font.master"/>
-			<xsl:text>pt</xsl:text>
-		</xsl:attribute>
-		<xsl:attribute name="hyphenate">false</xsl:attribute>
-		<xsl:attribute name="space-before.minimum">0.1em</xsl:attribute>
-		<xsl:attribute name="space-before.optimum">0.1em</xsl:attribute>
-		<xsl:attribute name="space-before.maximum">0.1em</xsl:attribute>
-	</xsl:attribute-set>
-
-<!--###################################################
-		Callouts
-	################################################### -->
-
-<!-- don't use images for callouts -->
-	<xsl:param name="callout.graphics">0</xsl:param>
-	<xsl:param name="callout.unicode">1</xsl:param>
-
-<!-- Place callout marks at this column in annotated areas -->
-	<xsl:param name="callout.defaultcolumn">90</xsl:param>
-
-<!--###################################################
-		Misc
-	################################################### -->
-
-<!-- Placement of titles -->
-	<xsl:param name="formal.title.placement">
-		figure after
-		example after
-		equation before
-		table before
-		procedure before
-	</xsl:param>
-
-<!-- Format Variable Lists as Blocks (prevents horizontal overflow) -->
-	<xsl:param name="variablelist.as.blocks">1</xsl:param>
-
-	<xsl:param name="body.start.indent">0pt</xsl:param>
-
-<!-- Show only Sections up to level 3 in the TOCs -->
-	<xsl:param name="toc.section.depth">3</xsl:param>
-
-<!-- Remove "Chapter" from the Chapter titles... -->
-	<xsl:param name="local.l10n.xml" select="document('')"/>
-	<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
-		<l:l10n language="en">
-			<l:context name="title-numbered">
-				<l:template name="chapter" text="%n.&#160;%t"/>
-				<l:template name="section" text="%n&#160;%t"/>
-			</l:context>
-			<l:context name="title">
-				<l:template name="example" text="Example&#160;%n&#160;%t"/>
-			</l:context>
-		</l:l10n>
-	</l:i18n>
-
-<!--###################################################
-		colored and hyphenated links 
-	################################################### --> 
-
-	<xsl:template match="ulink">
-		<fo:basic-link external-destination="{@url}"
-				xsl:use-attribute-sets="xref.properties"
-				text-decoration="underline"
-				color="blue">
-			<xsl:choose>
-				<xsl:when test="count(child::node())=0">
-					<xsl:value-of select="@url"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:apply-templates/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</fo:basic-link>
-	</xsl:template>
-
-	<xsl:template match="link">
-		<fo:basic-link internal-destination="{@linkend}"
-				xsl:use-attribute-sets="xref.properties"
-				text-decoration="underline"
-				color="blue">
-			<xsl:choose>
-				<xsl:when test="count(child::node())=0">
-					<xsl:value-of select="@linkend"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:apply-templates/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</fo:basic-link>
-	</xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/docbkx/resources/xsl/pdf/titlepage.xml b/src/docbkx/resources/xsl/pdf/titlepage.xml
deleted file mode 100644
index dc18e1e0d..000000000
--- a/src/docbkx/resources/xsl/pdf/titlepage.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!DOCTYPE t:templates [
-<!ENTITY hsize0 "10pt">
-<!ENTITY hsize1 "12pt">
-<!ENTITY hsize2 "14.4pt">
-<!ENTITY hsize3 "17.28pt">
-<!ENTITY hsize4 "20.736pt">
-<!ENTITY hsize5 "24.8832pt">
-<!ENTITY hsize0space "7.5pt"> <!-- 0.75 * hsize0 -->
-<!ENTITY hsize1space "9pt"> <!-- 0.75 * hsize1 -->
-<!ENTITY hsize2space "10.8pt"> <!-- 0.75 * hsize2 -->
-<!ENTITY hsize3space "12.96pt"> <!-- 0.75 * hsize3 -->
-<!ENTITY hsize4space "15.552pt"> <!-- 0.75 * hsize4 -->
-<!ENTITY hsize5space "18.6624pt"> <!-- 0.75 * hsize5 -->
-]>
-<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
-             xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
-             xmlns:fo="http://www.w3.org/1999/XSL/Format"
-             xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-  <t:titlepage t:element="book" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-             t:named-template="division.title"
-             param:node="ancestor-or-self::book[1]"
-             text-align="center"
-             font-size="&hsize5;"
-             space-before="&hsize5space;"
-             font-weight="bold"
-             font-family="{$title.fontset}"/>
-      <subtitle
-                text-align="center"
-                font-size="&hsize4;"
-                space-before="&hsize4space;"
-                font-family="{$title.fontset}"/>
-
-      <!-- <corpauthor space-before="0.5em"
-                  font-size="&hsize2;"/>
-      <authorgroup space-before="0.5em"
-                   font-size="&hsize2;"/>
-      <author space-before="0.5em"
-              font-size="&hsize2;"/> -->
-
-    <mediaobject space-before="2em" space-after="2em"/>   
-    <releaseinfo space-before="5em" font-size="&hsize2;"/>
-    <copyright space-before="1.5em"
-              font-weight="normal"
-              font-size="8"/>
-    <legalnotice space-before="5em"
-              font-weight="normal"
-              font-style="italic"
-              font-size="8"/>
-    <othercredit space-before="2em"
-              font-weight="normal"
-              font-size="8"/>
-    <pubdate space-before="0.5em"/>
-    <revision space-before="0.5em"/>
-    <revhistory space-before="0.5em"/>
-    <abstract space-before="0.5em"
-              text-align="start"
-              margin-left="0.5in"
-              margin-right="0.5in"
-              font-family="{$body.fontset}"/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-</t:templates>