diff --git a/Manuals/Common_content/Entities.ent b/Manuals/Common_content/Entities.ent
index e42c505..4eabe3b 100644
--- a/Manuals/Common_content/Entities.ent
+++ b/Manuals/Common_content/Entities.ent
@@ -6,6 +6,18 @@
     their maintainance easier to realize.
 -->
 
+<!-- Common document structure -->
+
+<!ENTITY preface                SYSTEM "Preface.docbook">
+<!ENTITY preface-overview       SYSTEM "Preface/overview.docbook">
+<!ENTITY preface-history        SYSTEM "Preface/history.docbook">
+<!ENTITY preface-docconvs       SYSTEM "Preface/docconvs.docbook">
+<!ENTITY preface-feedback       SYSTEM "Preface/feedback.docbook">
+
+<!ENTITY licenses               SYSTEM "Licenses.docbook">
+<!ENTITY licenses-gpl           SYSTEM "Licenses/gpl.docbook">
+<!ENTITY licenses-gfdl          SYSTEM "Licenses/gfdl.docbook">
+
 <!-- About Corporate Identity -->
 
 <!ENTITY CI         "Corporate Identity">
@@ -50,3 +62,4 @@
 <!ENTITY TCMOTIF    "<xref linkend='identity-brand-motif' />">
 <!ENTITY TCM        "&TC; Mission">
 <!ENTITY TCDOCS     "<ulink type='http' url='http://www.centos.org/docs/'>&TC; Documentation</ulink>">
+
diff --git a/Manuals/Common_content/Licenses.docbook b/Manuals/Common_content/Licenses.docbook
index dfc86ce..738a86b 100644
--- a/Manuals/Common_content/Licenses.docbook
+++ b/Manuals/Common_content/Licenses.docbook
@@ -1,6 +1,9 @@
 <part id="licenses">
+
     <title>Licenses</title>
+
     &licenses-gpl;
     &licenses-gfdl;
+
 </part>
 
diff --git a/Manuals/Common_content/Licenses.ent b/Manuals/Common_content/Licenses.ent
deleted file mode 100644
index 29e0b56..0000000
--- a/Manuals/Common_content/Licenses.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ENTITY licenses       SYSTEM "Licenses.docbook">
-<!ENTITY licenses-gpl   SYSTEM "Licenses/gpl.docbook">
-<!ENTITY licenses-gfdl  SYSTEM "Licenses/gfdl.docbook">
diff --git a/Manuals/Common_content/Preface.ent b/Manuals/Common_content/Preface.ent
deleted file mode 100644
index 9b60f8b..0000000
--- a/Manuals/Common_content/Preface.ent
+++ /dev/null
@@ -1,5 +0,0 @@
-<!ENTITY preface                SYSTEM "Preface.docbook">
-<!ENTITY preface-overview       SYSTEM "Preface/overview.docbook">
-<!ENTITY preface-history        SYSTEM "Preface/history.docbook">
-<!ENTITY preface-docconvs       SYSTEM "Preface/docconvs.docbook">
-<!ENTITY preface-feedback       SYSTEM "Preface/feedback.docbook">
diff --git a/Manuals/Tcar-ug/tcar-ug.docbook b/Manuals/Tcar-ug/tcar-ug.docbook
index 24c87c4..15d29c3 100644
--- a/Manuals/Tcar-ug/tcar-ug.docbook
+++ b/Manuals/Tcar-ug/tcar-ug.docbook
@@ -1,30 +1,32 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-               "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
-               [
-
-<!ENTITY % Commons.ent          SYSTEM "Commons.ent">
-<!ENTITY % Preface.ent          SYSTEM "Preface.ent">
-<!ENTITY % Repository.ent       SYSTEM "Repository.ent">
-<!ENTITY % Identity.ent         SYSTEM "Identity.ent">
-<!ENTITY % Locales.ent          SYSTEM "Locales.ent">
-<!ENTITY % Manuals.ent          SYSTEM "Manuals.ent">
-<!ENTITY % Scripts.ent          SYSTEM "Scripts.ent">
-<!ENTITY % Licenses.ent         SYSTEM "Licenses.ent">
-
-%Commons.ent;
-%Preface.ent;
-%Repository.ent;
-%Identity.ent;
-%Locales.ent;
-%Manuals.ent;
-%Scripts.ent;
-%Licenses.ent;
-]>
+    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
+    [
+
+    <!-- Common content -->
+
+    <!ENTITY % Entities SYSTEM "../Common_content/Entities.ent">
+    %Entities;
+
+    <!-- Specific content -->
+
+    <!ENTITY % Identity     SYSTEM "Identity.ent">
+    %Identity;
+    <!ENTITY % Locales      SYSTEM "Locales.ent">
+    %Locales;
+    <!ENTITY % Manuals      SYSTEM "Manuals.ent">
+    %Manuals;
+    <!ENTITY % Repository   SYSTEM "Repository.ent">
+    %Repository;
+    <!ENTITY % Scripts      SYSTEM "Scripts.ent">
+    %Scripts;
+
+    ]>
 
 <book lang="en_US">
 
     <!-- Front matter -->
+
     <title>The CentOS Artwork Repository</title>
     <subtitle>User's Guide</subtitle>
 
@@ -54,7 +56,7 @@
               published by the Free Software Foundation; with no
               Invariant Sections, no Front-Cover Texts, and no
               Back-Cover Texts. A copy of the license is included in
-              <xref linkend="licenses-gfdl" />
+              <xref linkend="licenses-gfdl" />.
             </para>
         </legalnotice>
 
@@ -76,15 +78,15 @@
 
     </bookinfo>
 
-    <!-- Front matter -->
-    &preface;
-
     <!-- Main matter -->
+    &preface;
     &repo;
     &identity;
     &locales;
     &manuals;
     &scripts;
+
+    <!-- Back matter -->
     &licenses;
 
 </book>