diff --git a/.gitignore b/.gitignore
index d0174fb..335a261 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@ Thumbs.db
 
 .rbenv-version
 .rvmrc
+
+.idea
diff --git a/_config.yml b/_config.yml
index cb62001..1693fcf 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,10 +1,9 @@
 # This is the default format.
 # For more see: https://github.com/mojombo/jekyll/wiki/Permalinks
 permalink: /:categories/:year/:month/:day/:title
-
 exclude: [".rvmrc", ".rbenv-version", "README.md", "Rakefile", "changelog.md"]
 auto: true
-pygments: true
+highlighter: pygments
 
 # Themes are encouraged to use these universal variables
 # so be sure to set them if your theme uses them.
@@ -58,7 +57,7 @@ JB :
   BASE_PATH : false
 
   # By default, the asset_path is automatically defined relative to BASE_PATH plus the enabled theme.
-  # ex: [BASE_PATH]/assets/themes/[THEME-NAME]
+  # ex: [BASE_PATH]/assets/themes/[THEME_NAME]
   #
   # Override this by defining an absolute path to assets here.
   # ex:
@@ -122,5 +121,4 @@ JB :
   # Setting any helper's provider to 'custom' will bypass the helper code
   # and include your custom code. Your custom file must be defined at:
   #   ./_includes/custom/[HELPER]
-  # where [HELPER] is the name of the helper you are overriding.
-
+  # where [HELPER] is the name of the helper you are overriding.
\ No newline at end of file
diff --git a/_includes/JB/setup b/_includes/JB/setup
index efcd84b..b17f493 100644
--- a/_includes/JB/setup
+++ b/_includes/JB/setup
@@ -16,7 +16,7 @@
     {% if site.JB.ASSET_PATH %}
       {% assign ASSET_PATH = site.JB.ASSET_PATH %}
     {% else %}
-      {% capture ASSET_PATH %}{{ BASE_PATH }}/assets/themes/{{ page.theme.name }}{% endcapture %}
+      {% capture ASSET_PATH %}{{ BASE_PATH }}/assets/themes/{% if page.theme.name %}{{ page.theme.name }}{% else if %}{{ layout.theme.name }}{% endif %}{% endcapture %}
     {% endif %}  
   {% endif %}
 {% endcapture %}{% assign jbcache = nil %}
\ No newline at end of file
diff --git a/_includes/themes/metromongo/frontpage.html b/_includes/themes/metromongo/frontpage.html
index 2b24ff6..3cacdb6 100644
--- a/_includes/themes/metromongo/frontpage.html
+++ b/_includes/themes/metromongo/frontpage.html
@@ -14,8 +14,8 @@ <h2><span>mongo</span>engine</h2>
               <p>
               Documentation available at
               <a href="http://docs.mongoengine.org/">docs.mongoengine.org</a>
-              - there is currently a <a href="http://docs.mongoengine.org/en/latest/tutorial.html">tutorial</a>, a <a href="http://docs.mongoengine.org/en/latest/guide/">user guide</a> and
-              <a href="http://docs.mongoengine.org/en/latest/apireference.html">API reference</a>.
+              - there is currently a <a href="http://docs.mongoengine.org/tutorial.html">tutorial</a>, a <a href="http://docs.mongoengine.org/guide/">user guide</a> and
+              <a href="http://docs.mongoengine.org/apireference.html">API reference</a>.
             </p>
             </blockquote>
           </div>
@@ -28,11 +28,11 @@ <h3>Simple to use</h3>
 {% highlight python %}
 from mongoengine import *                           # To define a schema for a
                                                     # document, we create a
-class Metadata(EmbeddedDocument):                  # class that inherits from
+class Metadata(EmbeddedDocument):                   # class that inherits from
     tags = ListField(StringField())                 # Document.
     revisions = ListField(IntField())
                                                     # Fields are specified by
-class WikiPage(Document):                          # adding field objects as
+class WikiPage(Document):                           # adding field objects as
     title = StringField(required=True)              # class attributes to the
     text = StringField()                            # document class.
     metadata = EmbeddedDocumentField(Metadata)
@@ -74,7 +74,7 @@ <h3>Tutorial</h3>
           <div class="sl-slide-inner bg-5">
             <h3>Help wanted</h3>
             <blockquote>
-              <p>We're always looking for help on <em>any aspect</em> of mongoengine.</p>
+              <p>We're always looking for help on <em>any aspect</em> of Mongoengine.</p>
                 <a href="#contribute">
                   <img src="http://github.com/%7B%7B%20ASSET_PATH%20%7D%7Dmetromongo/images/helpwanted.jpg">
                 </a>
@@ -107,8 +107,8 @@ <h2 class="bg-1"><span>mongo</span>engine</h2>
             <p>
             Documentation available at
             <a href="http://docs.mongoengine.org/">http://docs.mongoengine.org</a>
-            - there is currently a <a href="http://docs.mongoengine.org/en/latest/tutorial.html">tutorial</a>, a <a href="http://docs.mongoengine.org/en/latest/guide/">user guide</a> and
-            <a href="http://docs.mongoengine.org/en/latest/apireference.html">API reference</a>.
+            - there is currently a <a href="http://docs.mongoengine.org/tutorial.html">tutorial</a>, a <a href="http://docs.mongoengine.org/guide/">user guide</a> and
+            <a href="http://docs.mongoengine.org/apireference.html">API reference</a>.
             </p>
           </div>
         </div>
@@ -131,11 +131,11 @@ <h2 class="bg-2"><span class="icon icon-wrench"></span><a name="getting-started"
            archives for the stable and master versions.</p>
         <p>To get to grips with MongoEngine, there is extensive
           <a href="http://docs.mongoengine.org/">documentation</a>,
-          <a href="http://docs.mongoengine.org/en/latest/apireference.html">API references</a>
-          and a <a href="http://docs.mongoengine.org/en/latest/tutorial.html">tutorial</a>.
+          <a href="http://docs.mongoengine.org/apireference.html">API references</a>
+          and a <a href="http://docs.mongoengine.org/tutorial.html">tutorial</a>.
 
           You can find help by joining the <a href="http://groups.google.com/group/mongoengine-users">MongoEngine
-          Users mailing list</a> or by chatting with other users on the <a href="/service/irc://irc.freenode.net/mongoengine">#mongoengine IRC channel.</a>
+          Users mailing list.</a>
         </p>
       </div>
     </div>
@@ -156,7 +156,7 @@ <h2 id="ghw-logo" class="bg-3"><span class="icon icon-github"></span>Code</h2>
       <h2 class="bg-4"><span class="icon icon-leaf"></span>mongoengine</h2>
       <div class="sans">
         <h3 id="community">Community</h3>
-        You can find help by joining the <a href="http://groups.google.com/group/mongoengine-users">MongoEngine Users mailing list</a> or by chatting with other users on the <a href="/service/irc://irc.freenode.net/mongoengine">#mongoengine IRC channel.</a>
+        You can find help by joining the <a href="http://groups.google.com/group/mongoengine-users">MongoEngine Users mailing list.</a>
       </div>
       <div class="sans">
         <h3 id="contribute">Contributing</h3>
@@ -172,7 +172,7 @@ <h3 id="contribute">Contributing</h3>
           <li>MongoEngine website!</li>
         </ul>
         <p>
-          To contribute to the project contact me <a href="http://twitter.com/rossc0">@RossC0</a> or fork any repository from the <a href="http://github.com/mongoengine">mongoengine organisation</a> on github and send a pull request, all contributions and suggestions are welcome!
+          To contribute to the project, fork any repository from the <a href="http://github.com/mongoengine">mongoengine organisation</a> on github and send a pull request, all contributions and suggestions are welcome!
         </p>
         <p>If you or your company is doing something cool / interesting on mongoengine then we want to know about it!</p>
       </div>
diff --git a/_includes/themes/metromongo/settings.yml b/_includes/themes/metromongo/settings.yml
index 260f82e..2ffddbb 100644
--- a/_includes/themes/metromongo/settings.yml
+++ b/_includes/themes/metromongo/settings.yml
@@ -1,2 +1,2 @@
 theme :
-  name : mongoengine
\ No newline at end of file
+  name : metromongo
\ No newline at end of file
diff --git a/_includes/themes/mongoengine/frontpage.html b/_includes/themes/mongoengine/frontpage.html
index eba661c..a81effe 100644
--- a/_includes/themes/mongoengine/frontpage.html
+++ b/_includes/themes/mongoengine/frontpage.html
@@ -28,8 +28,8 @@ <h1 class="logo">MongoEngine</h1>
           <p id="documentation">
             Documentation available at
             <a href="http://bit.ly/mongoengine-docs">http://bit.ly/mongoengine-docs</a>
-            - there is currently a <a href="http://readthedocs.org/docs/mongoengine-odm/en/latest/tutorial.html">tutorial</a>, a <a href="http://readthedocs.org/docs/mongoengine-odm/en/latest/guide/index.html">user guide</a> and
-            <a href="http://readthedocs.org/docs/mongoengine-odm/en/latest/apireference.html">API reference</a>.
+            - there is currently a <a href="http://docs.mongoengine.org/tutorial.html">tutorial</a>, a <a href="http://docs.mongoengine.org/guide/index.html">user guide</a> and
+            <a href="http://docs.mongoengine.org/apireference.html">API reference</a>.
           </p>
       </div>
       <div class="tab-pane" id="example">
@@ -138,11 +138,11 @@ <h2><a name="getting-started"></a>Getting Started</h2>
          archives for the stable and master versions.</p>
       <p>To get to grips with MongoEngine, there is extensive
         <a href="http://bit.ly/mongoengine-docs">documentation</a>,
-        <a href="http://readthedocs.org/docs/mongoengine-odm/en/latest/apireference.html">API references</a>
-        and a <a href="http://readthedocs.org/docs/mongoengine-odm/en/latest/tutorial.html">tutorial</a>.
+        <a href="http://docs.mongoengine.org/apireference.html">API references</a>
+        and a <a href="http://docs.mongoengine.org/tutorial.html">tutorial</a>.
 
         You can find help by joining the <a href="http://groups.google.com/group/mongoengine-users">MongoEngine
-        Users mailing list</a> or by chatting with other users on the <a href="/service/irc://irc.freenode.net/mongoengine">#mongoengine IRC channel.</a>
+        Users mailing list.</a>
       </p>
       <p>
         If you are interested in contributing, join the
@@ -186,8 +186,6 @@ <h3 class="first">Contributing</h3>
   <div class="span12 secondary_info">
     <h2><a name="community"></a>Community</h2>
       <div class="span6">
-        <h3>IRC</h3>
-        <p><a href="/service/irc://irc.freenode.net/mongoengine">irc.freenode.net #mongoengine</a></p>
         <h3>Github</h3>
         <div id="github-commits"></div>
       </div>
@@ -197,4 +195,4 @@ <h3>Github</h3>
 
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/docs/index.html b/docs/index.html
index e116c06..e0d7ba7 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -4,5 +4,5 @@
 ---
 {% include JB/setup %}
 
-Documentation is now available at <a href="http://bit.ly/mongoengine-docs">http://bit.ly/mongoengine-docs</a>
-<script>window.location.href = "http://readthedocs.org/docs/mongoengine-odm/en/latest/";</script>
\ No newline at end of file
+Documentation is now available at <a href="http://docs.mongoengine.org/">http://docs.mongoengine.org/</a>
+<script>window.location.href = "http://docs.mongoengine.org/";</script>