diff --git a/README.md b/README.md
index 1ab73c6..3e2e006 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,20 @@
-nimforum
-========
+# nimforum
 
-This is Nimrod's forum. The code depends on the RST parser of the Nimrod
+This is Nim's forum. Available at http://forum.nim-lang.org.
+
+## Building
+
+You can use ``nimble`` (available [here](https://github.com/nim-lang/nimble) 
+to get all the necessary
+[dependencies](https://github.com/nim-lang/nimforum/blob/master/nimforum.nimble#L11).
+
+Clone this repo and execute ``nimble build`` in this repositories directory.
+
+## Dependencies
+
+The code depends on the RST parser of the Nim
 compiler and on Jester. The code generating captchas for registration uses the
-[cairo module](http://nimrod-lang.org/cairo.html), which requires you to have
+[cairo module](https://github.com/nim-lang/cairo), which requires you to have
 the [cairo library](http://cairographics.org) installed when you run the forum,
 or you will be greeted by a cryptic error message similar to:
 
@@ -19,7 +30,7 @@ Replace ``/opt/local/lib`` with the correct path on your system.
 
 # Copyright
 
-Copyright (c) 2012-2013 Andreas Rumpf, Dominik Picheta.
+Copyright (c) 2012-2015 Andreas Rumpf, Dominik Picheta.
 
 All rights reserved.
 
diff --git a/captchas.nim b/captchas.nim
index d95767b..c4f6ac2 100644
--- a/captchas.nim
+++ b/captchas.nim
@@ -1,6 +1,6 @@
 #
 #
-#              The Nimrod Forum
+#              The Nim Forum
 #        (c) Copyright 2012 Andreas Rumpf, Dominik Picheta
 #        Look at license.txt for more info.
 #        All rights reserved.
diff --git a/createdb.nim b/createdb.nim
index 1566089..815b7a8 100644
--- a/createdb.nim
+++ b/createdb.nim
@@ -1,6 +1,6 @@
 #
 #
-#              The Nimrod Forum
+#              The Nim Forum
 #        (c) Copyright 2012 Andreas Rumpf, Dominik Picheta
 #        Look at license.txt for more info.
 #        All rights reserved.
diff --git a/license.txt b/license.txt
index a7c088e..cf4ac4a 100644
--- a/license.txt
+++ b/license.txt
@@ -1,4 +1,4 @@
-Copyright (C) 2013 Andreas Rumpf, Dominik Picheta
+Copyright (C) 2015 Andreas Rumpf, Dominik Picheta
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of 
 this software and associated documentation files (the "Software"), to deal in 
@@ -15,4 +15,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR 
  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/main.tmpl b/main.tmpl
index 235e4aa..89e301c 100644
--- a/main.tmpl
+++ b/main.tmpl
@@ -1,5 +1,5 @@
 #! stdtmpl
-#proc genMain(c: var TForumData, content: string, title = "Nimrod Forum",
+#proc genMain(c: var TForumData, content: string, title = "Nim Forum",
 #             additional_headers = "", showRssLinks = false): string =
 #  result = ""
 #  var stats: TForumStats
@@ -98,7 +98,7 @@
             <form method="get" action="http://www.google.com/search" target="_blank" class="searchForm">
               <input type="text" name="q" maxlength="255" value="${c.search}" title="Search this forum" />
               <input type="submit" value="Search" class="button search">
-              <input type="hidden"  name="sitesearch" value="http://forum.nimrod-lang.org" />
+              <input type="hidden"  name="sitesearch" value="http://forum.nim-lang.org" />
             </form>
           #end if
         </div>
@@ -156,7 +156,7 @@
       <div id="foot-legal">
         <h4>Written in Nim - Powered by <a href="https://github.com/dom96/jester">Jester</a></h4>
         Web Design by <a href="http://reign-studios.net/philipwitte/">Philip Witte</a> &amp; <a href="http://picheta.me">Dominik Picheta</a><br>
-        Copyright © 2015 - <a href="http://nim-lang.org/blog/">Andreas Rumpf</a> &amp; <a href="https://github.com/Araq/Nimrod/graphs/contributors">Contributors</a>
+        Copyright © 2015 - <a href="http://nim-lang.org/blog/">Andreas Rumpf</a> &amp; <a href="https://github.com/Araq/Nim/graphs/contributors">Contributors</a>
       </div>
     </div>
   </footer>
@@ -208,7 +208,7 @@
 #    ORDER BY modified DESC LIMIT 1""")
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
-    <title>Nimrod forum thread activity</title>
+    <title>Nim forum thread activity</title>
     <link href="${c.req.makeUri("/threadActivity.xml")}" rel="self" />
     <link href="${frontQuery}" />
     <id>${frontQuery}</id>
@@ -257,7 +257,7 @@ ${xmlEncode(rstToHtml(%postContent))}</content>
 #    ORDER BY creation DESC LIMIT 1""")
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
-    <title>Nimrod forum post activity</title>
+    <title>Nim forum post activity</title>
     <link href="${c.req.makeUri("/postActivity.xml")}" rel="self" />
     <link href="${frontQuery}" />
     <id>${frontQuery}</id>