diff --git a/Identity/Models/Html/Home/forms.html b/Identity/Models/Html/Home/forms.html
index 522bbb0..612564f 100644
--- a/Identity/Models/Html/Home/forms.html
+++ b/Identity/Models/Html/Home/forms.html
@@ -208,7 +208,7 @@
             The content of left column starts here.
             -->
     
-	        <h1><a name="head-6412b72f4d5315d52a34bb138f3c6b14">Forms</a></h1>
+	        <h1><a name="head-455f683b996e298e30cd89bdf267cf1a">Forms</a></h1>
 
         	<p>CentOS Forms Visual Style Guide.</p>
 
diff --git a/Identity/Models/Html/Home/headings.html b/Identity/Models/Html/Home/headings.html
index 40d5f42..14999f6 100644
--- a/Identity/Models/Html/Home/headings.html
+++ b/Identity/Models/Html/Home/headings.html
@@ -205,33 +205,38 @@
             The content of left column starts here.
             -->
 
-	        <h1><a name="head-a1811f6545db914813115417011b2df9">Headings</a></h1>
+	        <h1><a name="head-6b9358d34b58f88f3d03e90e589c71f4">Headings</a></h1>
     
 	        <p>CentOS Headings Visual Style Guide.</p>
 
             <div class="toc">
-            <h3><a name="head-6915b22396134a9ca1709c5ab6f15e3f">Table of contents</a></h3>
-                <ul>
-                <li><a href="#head-dc0cb512bb74064641dae42bf4581955">Recommendations</a></li>
-                <li><a href="#head-">Examples</a></li>
-                <ul>
-                    <li><a href="#head-5871b1272673f7cf89bcaf48972c848a">Heading Level 1</a></li>
-                    <li><a href="#head-d33a28a4193cffb949f506cfdf770f05">Heading Level 2</a></li>
-                    <li><a href="#head-82dd23c665d8ee437a980459c8b80d7a">Heading Level 3</a></li>
-                    <li><a href="#head-157dc030ea314f4b53a6ed238113a3f8">Heading Level 4</a></li>
-                    <li><a href="#head-33628cc07bcbefc4e4732407b8680bf6">Heading Level 5</a></li>
-                    <li><a href="#head-93b42a4a61a0b05a81aff6224555603c">Heading Level 6</a></li>
-                </ul>
-                </ul>
             </div>
 
-            <h2><a name="head-dc0cb512bb74064641dae42bf4581955">Recommendations</a></h2>
+            <h1><a name="head-b36f1286c992bc6d45a099abd334d2cc" href="#head-b36f1286c992bc6d45a099abd334d2cc">Heading Level 1</a></h1>
+            <pre>&lt;h1&gt;&lt;a name="head-5871b1272673f7cf89bcaf48972c848a" href="#head-5871b1272673f7cf89bcaf48972c848a"&gt;Heading Level 1&lt;/a&gt;&lt;/h1&gt;</pre>
+
+            <h2><a name="head-5003625eae36782ab5b73c8c2fbe9dd8" href="#head-5003625eae36782ab5b73c8c2fbe9dd8">Heading Level 2</a></h2>
+            <pre>&lt;h2&gt;&lt;a name="head-d33a28a4193cffb949f506cfdf770f05" href="#head-d33a28a4193cffb949f506cfdf770f05"&gt;Heading Level 2&lt;/a&gt;&lt;/h2&gt;</pre>
+
+            <h3><a name="head-10bbb3bf6f193ae1feb7a4b390f8cbe8" href="#head-10bbb3bf6f193ae1feb7a4b390f8cbe8">Heading Level 3</a></h3>
+            <pre>&lt;h3&gt;&lt;a name="head-82dd23c665d8ee437a980459c8b80d7a" href="#head-82dd23c665d8ee437a980459c8b80d7a"&gt;Heading Level 3&lt;/a&gt;&lt;/h3&gt;</pre>
+
+            <h4><a name="head-8ca0298dd61db97feb032a4bec76dbf0" href="#head-8ca0298dd61db97feb032a4bec76dbf0">Heading Level 4</a></h4>
+            <pre>&lt;h4&gt;&lt;a name="head-157dc030ea314f4b53a6ed238113a3f8" href="#head-157dc030ea314f4b53a6ed238113a3f8"&gt;Heading Level 4&lt;/a&gt;&lt;/h4&gt;</pre>
+
+            <h5><a name="head-21a1ed3c1c019ab1d5aa9504cbdb9e63" href="#head-21a1ed3c1c019ab1d5aa9504cbdb9e63">Heading Level 5</a></h5>
+            <pre>&lt;h5&gt;&lt;a name="head-33628cc07bcbefc4e4732407b8680bf6" href="#head-33628cc07bcbefc4e4732407b8680bf6"&gt;Heading Level 5&lt;/a&gt;&lt;/h5&gt;</pre>
+
+            <h6><a name="head-b44df3849cd5a9dd0599091b51661da5" href="#head-b44df3849cd5a9dd0599091b51661da5">Heading Level 6</a></h6>
+            <pre>&lt;h6&gt;&lt;a name="head-93b42a4a61a0b05a81aff6224555603c" href="#head-93b42a4a61a0b05a81aff6224555603c"&gt;Heading Level 5&lt;/a&gt;&lt;/h6&gt;</pre>
+
+            <h2><a name="head-910028ec18d2f05fbbe2c27938709ecb">Recommendations</a></h2>
 
             <p>As heading design recommendations:</p>
 
             <ul>
 
-                <li><p>When defining headings, make it accessible
+                <li><p>When defining headings, make them accessible
                 using the following structure:</p>
 
                 <pre>&lt;h1&gt;&lt;a name="head-a1811f6545db914813115417011b2df9"&gt;Heading&lt;/a&gt;&lt;/h1&gt;</pre>
@@ -243,6 +248,16 @@
                 
                 </li>
 
+                <li><p>Sometimes headings are used as links. For those
+                cases, use the following structure:</p></li>
+
+                <pre>&lt;h1&gt;&lt;a href="#head-a1811f6545db914813115417011b2df9"&gt;Heading&lt;/a&gt;&lt;/h1&gt;</pre>
+
+                <p>or the following, if you want to make a heading an
+                anchor and link of itself:</p>
+
+                <pre>&lt;h1&gt;&lt;a name="head-a1811f6545db914813115417011b2df9" href="#head-a1811f6545db914813115417011b2df9"&gt;Heading&lt;/a&gt;&lt;/h1&gt;</pre>
+
                 <li><p>Avoid using more than 4 levels of headings. If
                 you think you need to, you probably do; but consider
                 splitting your content in several pages instead. Too
@@ -251,26 +266,6 @@
 
             </ul>
 
-            <h2><a href="head-c1fb2df131f9b6be4e9c0868b3352fc0">Examples</a></h2>
-
-            <h1><a name="head-5871b1272673f7cf89bcaf48972c848a" href="#head-5871b1272673f7cf89bcaf48972c848a">Heading Level 1</a></h1>
-            <pre>&lt;h1&gt;&lt;a name="head-5871b1272673f7cf89bcaf48972c848a" href="#head-5871b1272673f7cf89bcaf48972c848a"&gt;Heading Level 1&lt;/a&gt;&lt;/h1&gt;</pre>
-
-            <h2><a name="head-d33a28a4193cffb949f506cfdf770f05" href="#head-d33a28a4193cffb949f506cfdf770f05">Heading Level 2</a></h2>
-            <pre>&lt;h2&gt;&lt;a name="head-d33a28a4193cffb949f506cfdf770f05" href="#head-d33a28a4193cffb949f506cfdf770f05"&gt;Heading Level 2&lt;/a&gt;&lt;/h2&gt;</pre>
-
-            <h3><a name="head-82dd23c665d8ee437a980459c8b80d7a" href="#head-82dd23c665d8ee437a980459c8b80d7a">Heading Level 3</a></h3>
-            <pre>&lt;h3&gt;&lt;a name="head-82dd23c665d8ee437a980459c8b80d7a" href="#head-82dd23c665d8ee437a980459c8b80d7a"&gt;Heading Level 3&lt;/a&gt;&lt;/h3&gt;</pre>
-
-            <h4><a name="head-157dc030ea314f4b53a6ed238113a3f8" href="#head-157dc030ea314f4b53a6ed238113a3f8">Heading Level 4</a></h4>
-            <pre>&lt;h4&gt;&lt;a name="head-157dc030ea314f4b53a6ed238113a3f8" href="#head-157dc030ea314f4b53a6ed238113a3f8"&gt;Heading Level 4&lt;/a&gt;&lt;/h4&gt;</pre>
-
-            <h5><a name="head-33628cc07bcbefc4e4732407b8680bf6" href="#head-33628cc07bcbefc4e4732407b8680bf6">Heading Level 5</a></h5>
-            <pre>&lt;h5&gt;&lt;a name="head-33628cc07bcbefc4e4732407b8680bf6" href="#head-33628cc07bcbefc4e4732407b8680bf6"&gt;Heading Level 5&lt;/a&gt;&lt;/h5&gt;</pre>
-
-            <h6><a name="head-93b42a4a61a0b05a81aff6224555603c" href="#head-93b42a4a61a0b05a81aff6224555603c">Heading Level 6</a></h6>
-            <pre>&lt;h6&gt;&lt;a name="head-93b42a4a61a0b05a81aff6224555603c" href="#head-93b42a4a61a0b05a81aff6224555603c"&gt;Heading Level 5&lt;/a&gt;&lt;/h6&gt;</pre>
-
             <!-- 
             The content of left column ends here.
             -->
diff --git a/Identity/Models/Html/Home/links.html b/Identity/Models/Html/Home/links.html
index 05bcd89..06f9df3 100644
--- a/Identity/Models/Html/Home/links.html
+++ b/Identity/Models/Html/Home/links.html
@@ -208,32 +208,32 @@
             The content of left column goes here.
             -->
 
-	<h1><a name="head-2ce64f1d078abfcab46e9a45ec966f21">Links</a></h1>
+	<h1><a name="head-4bf1da4a0cc0f48fb867e3b5b0981955">Links</a></h1>
 
 	<p>CentOS Links Visual Style Guide.</p>
 
 
-    <h2><a name="head-dc0cb512bb74064641dae42bf4581955">Recommendations</a></h2>
+    <h2><a name="head-d5478160b64a951985a957d659db34db">Recommendations</a></h2>
 
 	<ul>
 		<li>...</li>
 	</ul>
 
-    <h2><a href="head-c1fb2df131f9b6be4e9c0868b3352fc0">Examples</a></h2>
+    <h2><a href="#head-1a5c8b0161fff18ddb6b0d689c1ae728">Examples</a></h2>
 
-	<h3><a name="head-31f0d293c07c6836dab528e9b3a666fd">Common link style</a></h3>
+	<h3><a name="head-effc1aa5cdecd9fb96c7b2023ae33969">Common link style</a></h3>
 
 	<p><a href="">This is a common text link style</a></p>
 	<p><a href="" class="nonexistent">This is a common nonexistant text link style</a></p>
 
-	<h3><a href="head-709ae08a7b553f9a0c30bae0059ef344">Image link style</a></h3>
+	<h3><a href="#head-899fbe11c80e21cccbb021aad06cee72">Image link style</a></h3>
 
 	<p><a title="Image Link"
     href="/home/centos/artwork/trunk/Identity/Widgets/Img/poweredby-1.png"><img
     src="/home/centos/artwork/trunk/Identity/Widgets/Img/poweredby-1.png"
     alt="Powered by CentOS" /></a></p>
 
-	<h3><a name="head-915653bf3b46b30e84b5dd244fefd881">Decorative link styles</a></h3>
+	<h3><a name="head-786feb9a9f36a71ad1307813b81d3522">Decorative link styles</a></h3>
 
 	<p><a class="www" href="http://www.centos.org/">http://www.centos.org/</a>. This is
 	the "www" and "http" link style. It is generally used to link
diff --git a/Identity/Models/Html/Home/lists.html b/Identity/Models/Html/Home/lists.html
index b1ec888..11f23d1 100644
--- a/Identity/Models/Html/Home/lists.html
+++ b/Identity/Models/Html/Home/lists.html
@@ -208,7 +208,7 @@
             The content of left column goes here.
             -->
 
-	<h1><a name="#head-4d26fe6e135bd5df71763906939fb8b8">Lists</a></h1>
+	<h1><a name="head-db5b781aadf313d5cc868e9b81c36aef">Lists</a></h1>
 
 	<p>CentOS Lists Visual Style Guide.</p>
 
@@ -222,7 +222,7 @@
     </ul>
     </div>
 
-	<h2><a name="head-e292ecd3aaf69881cddc8d0b6768448a">Unordered Lists</a></h2>
+	<h2><a name="head-60fb16dcff9c9238beee25fee6af4f12">Unordered Lists</a></h2>
 
     <p>This section illustrates the visual style of unordered lists.</p>
 
@@ -232,7 +232,7 @@
         <li>This is even another list element.</li>
 	</ul>
 
-	<h2><a name="head-767042866fe68d7058b33181d25a4728">Ordered Lists</a></h2>
+	<h2><a name="head-cae90dafce41292edcefee541385595b">Ordered Lists</a></h2>
 
     <p>This section illustrates the visual style of ordered lists.</p>
 
@@ -242,7 +242,7 @@
         <li>This is even another list element.</li>
 	</ol>
 
-	<h2><a name="head-e8489ae9d71b3a11bf3a9229506a74fb">Definition Lists</a></h2>
+	<h2><a name="head-7affb4f4610862f6bee081edfb132c12">Definition Lists</a></h2>
 
     <p>This section illustrates the visual style of definition lists.</p>
 
@@ -254,7 +254,7 @@
 		<dd>Community Enterprise Operating System</dd>
 	</dl>
 
-	<h2><a name="head-ec292ddd7a46d7f87e484794bf9c8a20">Nested Lists</a></h2>
+	<h2><a name="head-4f22b95b8aa06701c94de36eb2c3c1cb">Nested Lists</a></h2>
 
 	<p>Lists may also be nested and different list types may be
 	used together, as in the following example, which is a
diff --git a/Identity/Models/Html/Home/texts.html b/Identity/Models/Html/Home/texts.html
index 8662681..27095d2 100644
--- a/Identity/Models/Html/Home/texts.html
+++ b/Identity/Models/Html/Home/texts.html
@@ -208,7 +208,7 @@
             The content of left column goes here.
             -->
 
-	<h1><a name="head-b17e230bca18ae33ca5e04e0df1e2cdb">Texts</a></h1>
+	<h1><a name="head-92d9f6d589ffa11edb9be7bc89dccbf1">Texts</a></h1>
 
 	<p>CentOS Texts Visual Style Guide.</p>
 
@@ -224,7 +224,7 @@
         </ul>
     </div>
 
-	<h2><a name="head-46ca48cb3e70fa30e73c5720c4f951c7">Phrase elements</a></h2>
+	<h2><a name="head-7f2454a2d2e2c7193fe769eef1af892e">Phrase elements</a></h2>
 
 	<dl>
 	<dt>EM</dt>
@@ -265,7 +265,7 @@
 
 	</dl>
 
-	<h2><a name="head-666ae0df1f90f9daec2dfc71a0b08a11">Subscripts and superscripts</a></h2>
+	<h2><a name="head-8224f9ee023060a1241ca475b1665963">Subscripts and superscripts</a></h2>
 
 	<dl>
 	
@@ -277,7 +277,7 @@
 		<dd><span lang="fr">M<sup>lle</sup> Dupont</span></dd>
 	</dl>
 
-	<h2><a name="head-c815fda27b02fd5f1fcde759a5705d11">Paragraphs</a></h2>
+	<h2><a name="head-7ca9872415d21fe435c303ca2f652a74">Paragraphs</a></h2>
 
     <p><a href="http://www.centos.org/">CentOS</a> is an
     Enterprise-class Linux Distribution derived from sources freely
@@ -311,13 +311,13 @@
     </p>
 
 
-	<h3><a name="head-7272128cff8b13a8f03a3de78bec414b">Preformatted texts</a></h3>
+	<h3><a name="head-a0d54800706832ae55de339d29d71d30">Preformatted texts</a></h3>
 
 	<pre>This is a small one-line pre formatted element.</pre>
 
 	<pre>This is a long one-line pre formatted element to illustrate how the content is scrollable when it doesn't fit the current screen area.</pre>
 
-	<h3><a name="head-494e91f987781084ae369ca54e767cf3">Quotations</a></h3>
+	<h3><a name="head-72139d5aacccba4da51cacae48b5d868">Quotations</a></h3>
 
 	<blockquote>
     <p>The simplest quotation.</p>
@@ -445,7 +445,7 @@ she told me &lt;q lang="en-US"&gt;Mary wants you to get some ice cream
 on your way home.&lt;/q&gt; I think I will get some at Ben and
 Jerry’s, on Gloucester Road.&lt;/q&gt;&lt;/p&gt;</pre>
 
-    <h2><a name="head-dc0cb512bb74064641dae42bf4581955">Recommendations</a></h2>
+    <h2><a name="head-2c2a74db8623f853a07d3913c94f7609">Recommendations</a></h2>
 
     <p>In order to maintain a consistent quotation style, consider the
     following recomendations:</p>