diff --git a/.rvmrc b/.rvmrc
new file mode 100644
index 0000000..f73d5d7
--- /dev/null
+++ b/.rvmrc
@@ -0,0 +1 @@
+rvm 1.9.2
diff --git a/index.html b/index.html
index a82febe..d3da3d3 100644
--- a/index.html
+++ b/index.html
@@ -1,80 +1,91 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html>
 
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html lang="en">
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-
-	<title>espen/balder @ GitHub</title>
-	
-	<style type="text/css">
-		body {
-  		margin-top: 1.0em;
-  		background-color: #60882a;
-		  font-family: "Helvetica,Arial,FreeSans";
-  		color: #ffffff;
-    }
-    #container {
-      margin: 0 auto;
-      width: 700px;
-    }
-		h1 { font-size: 3.8em; color: #9f77d5; margin-bottom: 3px; }
-		h1 .small { font-size: 0.4em; }
-		h1 a { text-decoration: none }
-		h2 { font-size: 1.5em; color: #9f77d5; }
-    h3 { text-align: center; color: #9f77d5; }
-    a { color: #9f77d5; }
-    .description { font-size: 1.2em; margin-bottom: 30px; margin-top: 30px; font-style: italic;}
-    .download { float: right; }
-		pre { background: #000; color: #fff; padding: 15px;}
-    hr { border: 0; width: 80%; border-bottom: 1px solid #aaa}
-    .footer { text-align:center; padding-top:30px; font-style: italic; }
-	</style>
-	
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Balder - Photo gallery in Ruby on Rails</title>
+	<link rel="stylesheet" href="css/balder.css" />
+	<link rel="stylesheet" href="colorbox/example1/colorbox.css" />
+	<script src="javascript/jquery-1.3.2.min.js" type="text/javascript"></script>
+	<script src="colorbox/colorbox/jquery.colorbox-min.js" type="text/javascript"></script>
+	<script src="javascript/balder.js" type="text/javascript"></script>
 </head>
-
 <body>
-  <a href="http://github.com/espen/balder"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
 
-  <div id="container">
+<div id="container">
+<h1>Balder - Photo gallery</h1>
 
-    <div class="download">
-      <a href="http://github.com/espen/balder/zipball/master">
-        <img border="0" width="90" src="http://github.com/images/modules/download/zip.png"></a>
-      <a href="http://github.com/espen/balder/tarball/master">
-        <img border="0" width="90" src="http://github.com/images/modules/download/tar.png"></a>
-    </div>
+<p>
+<b>Balder is a photo gallery built in Ruby on Rails. It aims to minimalistically beautiful and simple to use.</b>
+<br/><br/>
+You can upload multiple photos in the web interface or bulk upload folders over FTP/SFTP to your server. 
+Image and thumbnail sizes are configurable and can be regenerated at any time.
+Balder reads and writes EXIF/IPTC tags so you can easily take your photos with you to another application.
+Photos can be browsed from collections, albums, tags or by location with the Google Maps integration.
+<br/><br/>
+Balder is available <b>free</b> and the source can be downloaded from <a href="http://github.com/espen/balder">GitHub</a> or <a href="http://gitorious.org/balder">Gitorious</a>.
+The code is released under the <a href="http://www.gnu.org/licenses/gpl-3.0.txt">GNU General Public License v3</a>. 
+Please <a href="mailto:espen@inspired.no">contact me</a> if you require an alternative license (for a fee).
+</p>
 
-    <h1><a href="http://github.com/espen/balder">balder</a>
-      <span class="small">by <a href="http://github.com/espen">espen</a></span></h1>
+<h3>Show me</h3>
+<p>I travelled for ten months last year. You can see some of the places and photos I visited in <a href="http://photos.inspired.no">my photo gallery</a>.</p>
+<p>Whatever..just show me some screenshots. Sure:</p>
+	
+Public gallery:
+<ul id="screenshots">
+	<li><a rel="screenshot" href="images/album.png" title="Album">Album</a></li>
+	<li><a rel="screenshot" href="images/collections.png" title="Collections">Collections</a></li>
+	<li><a rel="screenshot" href="images/photo.png" title="Display single photo">Single photo</a></li>
+</ul>
 
-    <div class="description">
-      Balder - Photo gallery
-    </div>
+Administration:
+<ul id="screenshots">
+	<li><a rel="screenshot" href="images/album-add-to-collection.png" title="Add albums to collection">Add albums to collection</a></li>
+	<li><a rel="screenshot" href="images/upload_photos_progress.png" title="Upload multiple photos">Upload multiple photos with live progress</a></li>
+	<li><a rel="screenshot" href="images/edit_multiple.png" title="Edit multiple photos">Edit multiple photos</a></li>
+</ul>
 
-    <h2>Authors</h2>
-<p>Espen Antonsen (espen@inspired.no)<br/><br/>      </p>
-<h2>Contact</h2>
-<p>Espen Antonsen (espen@inspired.no)<br/>      </p>
+<h3>And you are?</h3>
+<p>I am Espen Antonsen, the modern day <a href="#balder">balder</a>.
+You seem to be the curious-type so go ahead and read more about me on <a href="http://inspired.no">my website</a>.</p>
+
+<h2>Features</h2>
+<ul>
+<li>Stores photos to disk in folders (or store on Amazon S3, Rackspace, Google Storage or Gridfs)</li>
+<li>Create multiple thumbnails of custom sizes</li>
+<li>Read and writes EXIF/IPTC title, description and keywords</li>
+<li>Organize in albums (as events in iPhoto)</li>
+<li>Combine albums in collections (as albums in iPhoto)</li>
+<li>Upload multiple photos (even without Flash)</li>
+<li>Tag photos. Can also tag albums (actually all photos in album is tagged)</li>
+<li>User management with roles and permissions</li>
+<li>Private mode (need to login)</li>
+<li>Geo-location of albums &amp; photos with Google Maps integration</li>
+</ul>
+
+<p>
+<a href="https://github.com/espen/balder/issues?labels=Feature+request&sort=created&direction=desc&state=open&page=1">Upcoming features</a>
+</p>
+
+<h3 id="balder">Balder?</h3>
+<p>Balder, or baldr which is the correct old norse spelling, was the <a href="http://en.wikipedia.org/wiki/Baldr">norse god of light and beauty</a>.</p>
 
 
-    <h2>Download</h2>
-    <p>
-      You can download this project in either
-      <a href="http://github.com/espen/balder/zipball/master">zip</a> or
-      <a href="http://github.com/espen/balder/tarball/master">tar</a> formats.
-    </p>
-    <p>You can also clone the project with <a href="http://git-scm.com">Git</a>
-      by running:
-      <pre>$ git clone git://github.com/espen/balder</pre>
-    </p>
+</div>
 
-    <div class="footer">
-      get the source code on GitHub : <a href="http://github.com/espen/balder">espen/balder</a>
-    </div>
+<a href="http://github.com/espen/balder/"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png" alt="Fork me on GitHub" /></a>
 
-  </div>
+<script type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+try {
+var pageTracker = _gat._getTracker("UA-63732-12");
+pageTracker._trackPageview();
+} catch(err) {}
+</script>
 
-  
 </body>
-</html>
+</html>
\ No newline at end of file
