diff --git a/CNAME b/CNAME
index 72aabfc..3a299b8 100644
--- a/CNAME
+++ b/CNAME
@@ -1 +1 @@
-sqlstyle.guide
+www.sqlstyle.guide
diff --git a/_config.yml b/_config.yml
index a396971..a36a1c4 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,6 +1,10 @@
-name:          SQL Style Guide by Simon Holywell
-description:   A consistent SQL style guide for greater readability and easier maintenance.
+name:          SQL style guide by Simon Holywell
+description:   A consistent code style guide for SQL to ensure legible and maintainable projects
+
+ga_ua_code: UA-65071829-1
+
 url:           http://www.sqlstyle.guide
+domain:        sqlstyle.guide
 port:          4040
 
 markdown:      kramdown
diff --git a/_includes/foot.html b/_includes/foot.html
index 4a58b89..fcf80e9 100644
--- a/_includes/foot.html
+++ b/_includes/foot.html
@@ -15,17 +15,17 @@
             Creative CommonsAttribution-ShareAlike 4.0 International License</a>.
             <br />Based on a work at 
         <a xmlns:dct="http://purl.org/dc/terms/"
-           href="http://www.sqlstyle.guide"
+           href="{{ site.url }}"
            rel="dct:source">
-            http://www.sqlstyle.guide</a>.
+            {{ site.url }}</a>.
     </p>
     <div class="buttons">
         <ul class="quick-links">
             <li>
-                <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=treffynnon&repo=sqlstyle.guide&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="112px" height="20px"></iframe>
+                <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=treffynnon&amp;repo={{ site.domain }}&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="112px" height="20px"></iframe>
             </li>
             <li>
-                <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=treffynnon&repo=sqlstyle.guide&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="98px" height="20px"></iframe>
+                <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=treffynnon&amp;repo={{ site.domain }}&amp;type=fork&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="98px" height="20px"></iframe>
             </li>
         </ul>
         <ul class="quick-links">
@@ -33,7 +33,7 @@
                 <a href="https://twitter.com/treffynnon" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @treffynnon</a>
             </li>
             <li class="tweet-btn">
-                <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.sqlstyle.guide" data-text="SQL style guide by @treffynnon" data-dnt="true">Tweet</a>
+                <a href="https://twitter.com/share" class="twitter-share-button" data-url="{{ site.url }}" data-text="SQL style guide by @treffynnon: {{ site.description }}" data-dnt="true">Tweet</a>
             </li>
         </ul>
     </div>
diff --git a/_includes/head.html b/_includes/head.html
index 3565f25..275d508 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -3,12 +3,12 @@
 </nav>
 <header class="top">
     <div class="wrap">
-        <h1>SQL Style Guide</h1>
+        <h1 itemprop="name">SQL Style Guide</h1>
         <p class="author" itemprop="author">by 
             <a href="https://www.simonholywell.com" itemprop="url"><span itemprop="name">Simon Holywell</span></a> &middot;
             <a href="https://twitter.com/treffynnon">@Treffynnon</a>
         </p>
-        <p class="twitter"><a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.sqlstyle.guide" data-text="SQL style guide by @treffynnon" data-size="large" data-dnt="true">Tweet</a>
+        <p class="twitter"><a href="https://twitter.com/share" class="twitter-share-button" data-url="{{ site.url }}" data-text="SQL style guide by @treffynnon: {{ site.description }}" data-size="large" data-dnt="true">Tweet</a>
         </p>
     </div>
 </header>
\ No newline at end of file
diff --git a/_includes/sqlstyle.guide.md b/_includes/sqlstyle.guide.md
index 67c0329..6ddae11 100644
--- a/_includes/sqlstyle.guide.md
+++ b/_includes/sqlstyle.guide.md
@@ -4,7 +4,7 @@
 
 You can use this set of guidelines, [fork them][fork] or make your own - the
 key here is that you pick a style and stick to it. To suggest changes
-or fix bugs please open an [issue][] or [pull request][pull] on Git Hub.
+or fix bugs please open an [issue][] or [pull request][pull] on GitHub.
 
 These guidelines are designed to be compatible with Joe Celko's [SQL Programming
 Style][celko] book to make adoption for teams who have already read that book
@@ -1249,12 +1249,15 @@ ZONE
 
 [simon]: https://www.simonholywell.com/
     "SimonHolywell.com"
-[issue]: #
-[fork]: #
-[pull]: #
+[issue]: https://github.com/treffynnon/sqlstyle.guide/issues
+    "SQL style guide issues on GitHub"
+[fork]: https://github.com/treffynnon/sqlstyle.guide/fork
+    "Fork SQL style guide on GitHub"
+[pull]: https://github.com/treffynnon/sqlstyle.guide/pulls/
+    "SQL style guide pull requests on GitHub"
 [celko]: http://www.amazon.com/gp/product/0120887975/ref=as_li_tl?ie=UTF8&camp=1789&creative=390957&creativeASIN=0120887975&linkCode=as2&tag=fuph-20&linkId=7PF4X6KIAMWYYT7Z
     "Joe Celko's SQL Programming Style (The Morgan Kaufmann Series in Data Management Systems)"
-[dl-md]: https://raw.githubusercontent.com/treffynnon/sqlstyle.guide/master/_includes/sqlstyle.guide.md
+[dl-md]: https://raw.githubusercontent.com/treffynnon/sqlstyle.guide/gh-pages/_includes/sqlstyle.guide.md
     "Download the guide in Markdown format"
 [iso-8601]: https://en.wikipedia.org/wiki/ISO_8601
     "Wikipedia: ISO 8601"
diff --git a/_layouts/default.html b/_layouts/default.html
index fd4e639..73a2242 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -9,48 +9,49 @@
         <link rel="stylesheet" href="style.css">
 
         <meta content="website" property="og:type">
-        <meta content="http://www.sqlstyle.guide/" property="og:url">
-        <meta content="0001-01-01 00:00:00 +0000 UTC" property="og:updated_time">
+        <meta content="{{ site.url }}" property="og:url">
+        <meta content="{{ site.time | date_to_xmlschema }}" property="og:updated_time">
         <meta content="https://www.facebook.com/holywell" property="article:author">
         <meta content="https://www.facebook.com/holywell" property="article:publisher">
-        <meta content="0001-01-01 00:00:00 +0000 UTC" property="article:modified_time">
+        <meta content="{{ site.time | date_to_xmlschema }}" property="article:modified_time">
         <meta content="" property="article:section">
-        <meta content="A code style guide for SQL code to ensure legible and maintainable projects." itemprop="description" name="description" property="og:description">
-        <meta content="sql, style guide, code style guide, simon holywell, holywell" itemprop="keywords" name="keywords">
-        <meta content="summary" name="twitter:card"></meta>
-        <meta content="SQL style guide by Simon Holywell" name="twitter:title">
-        <meta content="A code style guide for SQL code to ensure legible and maintainable projects." name="twitter:description">
+        <meta content="{{ site.description }}" itemprop="description" name="description" property="og:description">
+        <meta content="sql, style guide, code style guide, simon holywell, holywell" itemprop="keywords" name="keywords" property="article:tag">
+        <meta content="summary" name="twitter:card">
+        <meta content="{{ site.name }}" name="twitter:title">
+        <meta content="{{ site.description }}" name="twitter:description">
         <meta content="@treffynnon" name="twitter:site">
         <meta content="@treffynnon" name="twitter:creator">
-        <meta content="sqlstyle.guide" name="twitter:domain">
+        <meta content="{{ site.domain }}" name="twitter:domain">
 
         <link href="http://plus.google.com/+SimonHolywell" rel="author">
-        
+
+        <link rel="canonical" href="{{ site.url }}">
+    </head>
+    <body itemscope itemtype="http://schema.org/TechArticle">
+        <meta itemprop="wordCount" content="{{ content | number_of_words }}">
+        <meta itemprop="about" content="{{ site.description }}">
+        <meta itemprop="audience" content="SQL programmers">
+        <meta itemprop="license" content="http://creativecommons.org/licenses/by-sa/4.0/">
+        <meta itemprop="version" content="1.0.0">
+        <meta itemprop="proficiencyLevel" content="Beginer">
+        <meta itemprop="dependencies" content="SQL knowledge">
+        <meta itemprop="copyrightHolder" content="Simon Holywell">
+        {% include head.html %}
+        <main class="article-body wrap" id="content" itemprop="articleBody">
+            {{ content }}
+        </main>
+        {% include foot.html %}
+        <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
+        <script src="scripts.js"></script>
         <script>
             (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
             (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
             m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
             })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-            ga('create', 'UA-65071829-1', 'auto');
+            ga('create', '{{ site.ga_ua_code }}', 'auto');
             ga('send', 'pageview');
         </script>
-    </head>
-    <body itemscope itemtype="http://schema.org/TechArticle">
-        {% include head.html %}
-        <div id="content" class="wrap">
-            {{ content }}
-        </div>
-        {% include foot.html %}
-        <script>!function (d, s, id) {
-                var js, fjs = d.getElementsByTagName(s)[0];
-                if (!d.getElementById(id)) {
-                    js = d.createElement(s);
-                    js.id = id;
-                    js.src = "//platform.twitter.com/widgets.js";
-                    fjs.parentNode.insertBefore(js, fjs);
-                }
-            }(document, "script", "twitter-wjs");</script>
-        <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
-        <script src="scripts.js"></script>
     </body>
 </html>