diff --git a/realms/templates/auth/login.html b/realms/templates/auth/login.html
index db774c9..034f256 100644
--- a/realms/templates/auth/login.html
+++ b/realms/templates/auth/login.html
@@ -1,8 +1,8 @@
 {% extends 'layout.html' %}
 {% from 'macros.html' import render_form, render_field %}
 {% block body %}
-     {% call render_form(form, action_url=url_for('auth.login'), action_text='Login', btn_class='btn btn-primary') %}
-        {{ render_field(form.email, placeholder='Email', type='email', required=1) }}
-        {{ render_field(form.password, placeholder='Password', type='password', required=1) }}
-    {% endcall %}
+  {% call render_form(form, action_url=url_for('auth.login'), action_text='Login', btn_class='btn btn-primary') %}
+    {{ render_field(form.email, placeholder='Email', type='email', required=1) }}
+    {{ render_field(form.password, placeholder='Password', type='password', required=1) }}
+  {% endcall %}
 {% endblock %}
diff --git a/realms/templates/auth/register.html b/realms/templates/auth/register.html
index 065dc03..2e82fbd 100644
--- a/realms/templates/auth/register.html
+++ b/realms/templates/auth/register.html
@@ -1,13 +1,13 @@
 {% extends 'layout.html' %}
 {% from 'macros.html' import render_form, render_field %}
 {% block body %}
-     {% call render_form(form, action_url=url_for('auth.register'), action_text='Register', btn_class='btn btn-primary') %}
-        {{ render_field(form.username, placeholder='Username', type='username', **{"required": 1, "data-parsley-type": "alphanum"}) }}
-        {{ render_field(form.email, placeholder='Email', type='email', required=1) }}
-        {{ render_field(form.password, placeholder='Password', type='password', **{"required": 1, "data-parsley-minlength": "6"}) }}
-        {{ render_field(form.confirm, placeholder='Confirm Password', type='password', **{"required": 1, "data-parsley-minlength": "6"}) }}
-        {% if config.RECAPTCHA_ENABLE %}
-            {{ render_field(form.recaptcha) }}
-        {% endif %}
-     {% endcall %}
+  {% call render_form(form, action_url=url_for('auth.register'), action_text='Register', btn_class='btn btn-primary') %}
+    {{ render_field(form.username, placeholder='Username', type='username', **{"required": 1, "data-parsley-type": "alphanum"}) }}
+    {{ render_field(form.email, placeholder='Email', type='email', required=1) }}
+    {{ render_field(form.password, placeholder='Password', type='password', **{"required": 1, "data-parsley-minlength": "6"}) }}
+    {{ render_field(form.confirm, placeholder='Confirm Password', type='password', **{"required": 1, "data-parsley-minlength": "6"}) }}
+    {% if config.RECAPTCHA_ENABLE %}
+      {{ render_field(form.recaptcha) }}
+    {% endif %}
+  {% endcall %}
 {% endblock %}
\ No newline at end of file
diff --git a/realms/templates/errors/404.html b/realms/templates/errors/404.html
index 686ef75..66bfd47 100644
--- a/realms/templates/errors/404.html
+++ b/realms/templates/errors/404.html
@@ -1,6 +1,6 @@
 {% extends 'layout.html' %}
 {% block body %}
 
-    <h1>Page Not Found</h1>
+  <h1>Page Not Found</h1>
 
 {% endblock %}
\ No newline at end of file
diff --git a/realms/templates/errors/error.html b/realms/templates/errors/error.html
index 818238a..cb11722 100644
--- a/realms/templates/errors/error.html
+++ b/realms/templates/errors/error.html
@@ -2,9 +2,9 @@
 {% block title %}{{ title|escape }}{% endblock %}
 {% block scripts %}
   {% if traceback %}
-  <link rel="stylesheet" href="{{ static_url('vendor/highlightjs/default.css') }}" />
-  <script src="{{ static_url('vendor/highlightjs/highlight.pack.js') }}"></script>
-  <script>hljs.initHighlightingOnLoad();</script>
+    <link rel="stylesheet" href="{{ static_url('vendor/highlightjs/default.css') }}" />
+    <script src="{{ static_url('vendor/highlightjs/highlight.pack.js') }}"></script>
+    <script>hljs.initHighlightingOnLoad();</script>
   {% endif %}
 {% endblock %}
 {% block content %}
diff --git a/realms/templates/layout.html b/realms/templates/layout.html
index 5d8d3aa..2f25f41 100644
--- a/realms/templates/layout.html
+++ b/realms/templates/layout.html
@@ -12,7 +12,7 @@
     {% for bundle in g.assets['css'] %}
       {% assets bundle %}
         <link href="{{ ASSET_URL }}" rel="stylesheet">
-    {% endassets %}
+      {% endassets %}
     {% endfor %}
     {% block css %}{% endblock %}
 
diff --git a/realms/templates/wiki/compare.html b/realms/templates/wiki/compare.html
index 6f83d22..c79a374 100644
--- a/realms/templates/wiki/compare.html
+++ b/realms/templates/wiki/compare.html
@@ -1,19 +1,16 @@
 {% extends 'layout.html' %}
 {% block body %}
 
-    <h2>History for <strong>{{ name }}</strong></h2>
-    <div class="pull-right">
-        <a href="{{ url_for('wiki.commit', name=name, sha=old) }}" class="btn btn-default btn-sm">View Old</a>
-        <a href="{{ url_for('wiki.commit', name=name, sha=new) }}" class="btn btn-info btn-sm">View New</a>
-    </div>
-    <p>
-        <a class="btn btn-default btn-sm" href="{{ url_for('wiki.history', name=name) }}">Back to History</a>
-    </p>
-
-
-    {{ diff|safe }}
-
-    <p>
-        <a class="btn btn-default btn-sm" href="{{ url_for('wiki.history', name=name) }}">Back to History</a>
-    </p>
+  <h2>History for <strong>{{ name }}</strong></h2>
+  <div class="pull-right">
+    <a href="{{ url_for('wiki.commit', name=name, sha=old) }}" class="btn btn-default btn-sm">View Old</a>
+    <a href="{{ url_for('wiki.commit', name=name, sha=new) }}" class="btn btn-info btn-sm">View New</a>
+  </div>
+  <p>
+    <a class="btn btn-default btn-sm" href="{{ url_for('wiki.history', name=name) }}">Back to History</a>
+  </p>
+  {{ diff|safe }}
+  <p>
+    <a class="btn btn-default btn-sm" href="{{ url_for('wiki.history', name=name) }}">Back to History</a>
+  </p>
 {% endblock %}
\ No newline at end of file
diff --git a/realms/templates/wiki/create.html b/realms/templates/wiki/create.html
index cb3c6d9..6a7775c 100644
--- a/realms/templates/wiki/create.html
+++ b/realms/templates/wiki/create.html
@@ -1,18 +1,18 @@
 {% extends 'layout.html' %}
 {% block body %}
 
-    <form role="form" method="post">
-        <div class="form-group">
-            <label for="name"></label>
-            <input id="name" type="text" class="form-control" name="name" placeholder="Page Name" value="{{- name -}}" />
-        </div>
+  <form role="form" method="post">
+    <div class="form-group">
+      <label for="name"></label>
+      <input id="name" type="text" class="form-control" name="name" placeholder="Page Name" value="{{- name -}}" />
+    </div>
 
-        <div class="form-group">
-            <label for="content"></label>
-            <textarea name="content" id="content" class="form-control" placeholder="Content"></textarea>
-        </div>
+    <div class="form-group">
+      <label for="content"></label>
+      <textarea name="content" id="content" class="form-control" placeholder="Content"></textarea>
+    </div>
 
-        <input type="submit" class="btn btn-primary" value="Save" />
-    </form>
+    <input type="submit" class="btn btn-primary" value="Save" />
+  </form>
 
 {% endblock %}
\ No newline at end of file
diff --git a/realms/templates/wiki/edit.html b/realms/templates/wiki/edit.html
index ea01f53..1d3fb4b 100644
--- a/realms/templates/wiki/edit.html
+++ b/realms/templates/wiki/edit.html
@@ -1,112 +1,98 @@
 {% extends 'layout.html' %}
 {% block js %}
-        <script>
-        $(function(){
-            $("#start-togetherjs").click(function(){
-                $(this).prop('disabled', true).html("Loading");
-            });
+ <script>
+    $(function(){
+        $("#start-togetherjs").click(function(){
+            $(this).prop('disabled', true).html("Loading");
         });
-        TogetherJSConfig_toolName = "Collaboration";
-        TogetherJSConfig_suppressJoinConfirmation = true;
-        {% if session.get('user') %}
-        TogetherJSConfig_getUserName = function () {
-            return {{ session['user'].get('username')|tojson }};
-        };
+    });
+    TogetherJSConfig_toolName = "Collaboration";
+    TogetherJSConfig_suppressJoinConfirmation = true;
+    {% if current_user.is_authenticated() %}
+    TogetherJSConfig_getUserName = function () {
+        return {{ current_user.username|tojson }};
+    };
 
-        TogetherJSConfig_getUserAvatar = function () {
-            return {{ session['user'].get('avatar')|tojson }};
-        };
-        {% endif %}
+    TogetherJSConfig_getUserAvatar = function () {
+        return {{ current_user.avatar|tojson }};
+    };
+    {% endif %}
 
-        TogetherJSConfig_on_ready = function () {
-           MDR.sanitize = true;
-           $("#preview").html('');
-           $("#start-togetherjs").addClass('btn-danger').html('End Collaboration').prop('disabled', false);
-        };
-        TogetherJSConfig_on_close = function () {
-            MDR.sanitize = false;
-            $("#start-togetherjs").removeClass('btn-danger').html('Collaborate').prop('disabled', false);
-        };
+    TogetherJSConfig_on_ready = function () {
+       MDR.sanitize = true;
+       $("#preview").html('');
+       $("#start-togetherjs").addClass('btn-danger').html('End Collaboration').prop('disabled', false);
+    };
+    TogetherJSConfig_on_close = function () {
+        MDR.sanitize = false;
+        $("#start-togetherjs").removeClass('btn-danger').html('Collaborate').prop('disabled', false);
+    };
 
-    </script>
-    <script src="https://togetherjs.com/togetherjs-min.js"></script>
+</script>
+<script src="https://togetherjs.com/togetherjs-min.js"></script>
 
 {% endblock %}
 {% block body %}
-{% block css %}
-<style>
-    #main-body {
-        background: inherit;
-        border: inherit;
-        padding: 0;
-        -webkit-box-shadow: 0;
-        -moz-box-shadow: 0;
-        box-shadow: 0;
-    }
-</style>
-{% endblock %}
+  <div id="app-wrap">
+    <div id="app-controls" class="row">
+      <div class="col-xs-3">
+        <input id="page-name" type="text" class="form-control input-sm" name="name" placeholder="Name" value="{{- name -}}" />
+      </div>
+      <div class="col-xs-3">
+        <input id="page-message" type="text" class="form-control input-sm" name="page-message" placeholder="Comment" value="" />
+      </div>
 
+      <div class="col-xs-6">
+        <div class="pull-right">
 
-    <div id="app-wrap">
-        <div id="app-controls" class="row">
-            <div class="col-xs-3">
-                <input id="page-name" type="text" class="form-control input-sm" name="name" placeholder="Name" value="{{- name -}}" />
-            </div>
-            <div class="col-xs-3">
-                <input id="page-message" type="text" class="form-control input-sm" name="page-message" placeholder="Comment" value="" />
-            </div>
+          <button class="btn btn-success btn-sm" id="start-togetherjs" type="button"
+                  onclick="TogetherJS(this); return false">
+            Collaborate
+          </button>
 
-            <div class="col-xs-6">
-                <div class="pull-right">
-
-                    <button class="btn btn-success btn-sm" id="start-togetherjs" type="button"
-                     onclick="TogetherJS(this); return false">
-                      Collaborate
-                    </button>
-
-                    <a href="#" id="drop6" role="button" class="dropdown-toggle btn btn-default btn-sm" data-toggle="dropdown">Theme <b class="caret"></b></a>
-                    <ul id="theme-list" class="dropdown-menu" role="menu" aria-labelledby="drop6">
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/chrome" >Chrome</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/clouds" >Clouds</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/clouds_midnight" >Clouds Midnight</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/cobalt" >Cobalt</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/crimson_editor" >Crimson Editor</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/dawn" class="selected">Dawn</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/dreamweaver" >Dreamweaver</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/eclipse" >Eclipse</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/idle_fingers" >idleFingers</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/kr_theme" >krTheme</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/merbivore" >Merbivore</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/merbivore_soft" >Merbivore Soft</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/mono_industrial" >Mono Industrial</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/monokai" >Monokai</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/pastel_on_dark">Pastel on Dark</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/solarized_dark" >Solarized Dark</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/solarized_light" >Solarized Light</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/textmate" >TextMate</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/tomorrow" >Tomorrow</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/tomorrow_night">Tomorrow Night</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/tomorrow_night_blue" >Tomorrow Night Blue</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/tomorrow_night_bright" >Tomorrow Night Bright</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/tomorrow_night_eighties" >Tomorrow Night 80s</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/twilight" >Twilight</a></li>
-                        <li><a tabindex="-1" href="#" data-value="ace/theme/vibrant_ink" >Vibrant Ink</a></li>
-                    </ul>
-                    <a id="save-native" class="btn btn-primary btn-sm"><i class="icon-save"></i> Save</a>
-                </div>
-            </div>
+          <a href="#" id="drop6" role="button" class="dropdown-toggle btn btn-default btn-sm" data-toggle="dropdown">Theme <b class="caret"></b></a>
+          <ul id="theme-list" class="dropdown-menu" role="menu" aria-labelledby="drop6">
+            <li><a tabindex="-1" href="#" data-value="ace/theme/chrome" >Chrome</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/clouds" >Clouds</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/clouds_midnight" >Clouds Midnight</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/cobalt" >Cobalt</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/crimson_editor" >Crimson Editor</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/dawn" class="selected">Dawn</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/dreamweaver" >Dreamweaver</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/eclipse" >Eclipse</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/idle_fingers" >idleFingers</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/kr_theme" >krTheme</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/merbivore" >Merbivore</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/merbivore_soft" >Merbivore Soft</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/mono_industrial" >Mono Industrial</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/monokai" >Monokai</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/pastel_on_dark">Pastel on Dark</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/solarized_dark" >Solarized Dark</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/solarized_light" >Solarized Light</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/textmate" >TextMate</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/tomorrow" >Tomorrow</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/tomorrow_night">Tomorrow Night</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/tomorrow_night_blue" >Tomorrow Night Blue</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/tomorrow_night_bright" >Tomorrow Night Bright</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/tomorrow_night_eighties" >Tomorrow Night 80s</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/twilight" >Twilight</a></li>
+            <li><a tabindex="-1" href="#" data-value="ace/theme/vibrant_ink" >Vibrant Ink</a></li>
+          </ul>
+          <a id="save-native" class="btn btn-primary btn-sm"><i class="icon-save"></i> Save</a>
         </div>
-
-        <div class="row" style="position: relative; height: 100%; margin-left: 15px; margin-right: 15px;">
-            <div class="col-xs-6" style="position: absolute; bottom: 20px; top: 10px; left:0;border-right: 2px solid transparent;">
-                <div id="editor">{{ content }}</div>
-            </div>
-            <div class="col-xs-6" style="position: absolute; bottom: 20px; top: 10px; right:0; border-left: 2px solid transparent;">
-                <div id="preview"></div>
-            </div>
-        </div>
-
-
+      </div>
     </div>
 
+    <div class="row" style="position: relative; height: 100%; margin-left: 15px; margin-right: 15px;">
+      <div class="col-xs-6" style="position: absolute; bottom: 20px; top: 10px; left:0;border-right: 2px solid transparent;">
+        <div id="editor">{{ content }}</div>
+      </div>
+      <div class="col-xs-6" style="position: absolute; bottom: 20px; top: 10px; right:0; border-left: 2px solid transparent;">
+        <div id="preview"></div>
+      </div>
+    </div>
+
+
+  </div>
+
 {% endblock %}
\ No newline at end of file
diff --git a/realms/templates/wiki/history.html b/realms/templates/wiki/history.html
index 57f55e3..c5b4588 100644
--- a/realms/templates/wiki/history.html
+++ b/realms/templates/wiki/history.html
@@ -1,58 +1,58 @@
 {% extends 'layout.html' %}
 {% block body %}
 
-    <h2>History for <strong>{{ name }}</strong></h2>
-    <p>
-        <a class="btn btn-default btn-sm compare-revisions">Compare Revisions</a>
-    </p>
+  <h2>History for <strong>{{ name }}</strong></h2>
+  <p>
+    <a class="btn btn-default btn-sm compare-revisions">Compare Revisions</a>
+  </p>
 
-    <table class="table table-bordered revision-tbl">
+  <table class="table table-bordered revision-tbl">
     <thead>
     <tr>
-        <th></th>
-        <th>Name</th>
-        <th>Revision Message</th>
-        <th>Date</th>
+      <th></th>
+      <th>Name</th>
+      <th>Revision Message</th>
+      <th>Date</th>
     </tr>
     </thead>
     {% for h in history %}
-        <tr>
-            <td class="checkbox-cell text-center">
-                <input type="checkbox" name="versions[]" value="{{ h.sha }}" />
-            </td>
-            <td>{{ h.author }}</td>
-            <td><a href="{{ url_for('wiki.commit', name=name, sha=h.sha) }}" class='label label-primary'>View</a> {{ h.message }} </td>
-            <td>{{ h.time|datetime }}</td>
-        </tr>
+      <tr>
+        <td class="checkbox-cell text-center">
+          <input type="checkbox" name="versions[]" value="{{ h.sha }}" />
+        </td>
+        <td>{{ h.author }}</td>
+        <td><a href="{{ url_for('wiki.commit', name=name, sha=h.sha) }}" class='label label-primary'>View</a> {{ h.message }} </td>
+        <td>{{ h.time|datetime }}</td>
+      </tr>
     {% endfor %}
-    </table>
-    <p>
-        <a class="btn btn-default btn-sm compare-revisions">Compare Revisions</a>
-    </p>
+  </table>
+  <p>
+    <a class="btn btn-default btn-sm compare-revisions">Compare Revisions</a>
+  </p>
 
 {% endblock %}
 
 {% block js %}
-<script>
-$(function(){
-    $('.revision-tbl :checkbox').change(function () {
+  <script>
+    $(function(){
+      $('.revision-tbl :checkbox').change(function () {
         var $cs=$(this).closest('.revision-tbl').find(':checkbox:checked');
         if ($cs.length > 2) {
-            this.checked=false;
+          this.checked=false;
         }
-    });
+      });
 
-    $(".compare-revisions").click(function(){
+      $(".compare-revisions").click(function(){
         var $cs = $('.revision-tbl').find(':checkbox:checked');
         if ($cs.length != 2) return;
         var revs = [];
         $.each($cs, function(i, v){
-            revs.push(v.value);
+          revs.push(v.value);
         });
         revs.reverse();
         revs = revs.join("..");
         location.href = "{{ config.BASE_URL }}/_compare/{{ name }}/" + revs;
+      });
     });
-});
-</script>
+  </script>
 {% endblock %}
\ No newline at end of file
diff --git a/realms/templates/wiki/page.html b/realms/templates/wiki/page.html
index a47d1b7..c355c81 100644
--- a/realms/templates/wiki/page.html
+++ b/realms/templates/wiki/page.html
@@ -1,30 +1,30 @@
 {% extends 'layout.html' %}
 {% block page_menu %}
-<div class="controls pull-right">
+  <div class="controls pull-right">
     <a class="btn btn-default btn-sm" href="{{ url_for('wiki.edit', name=name) }}">Edit</a>
     <a class="btn btn-default btn-sm" href="{{ url_for('wiki.history', name=name) }}">History</a>
-</div>
+  </div>
 {% endblock %}
 
 {% block body %}
-    {% if commit %}
-        <div id="page-action-bar">
-            <form method="POST" action="{{ url_for('wiki.revert') }}">
-                <input type="hidden" value="{{ name }}" name="name" />
-                <input type="hidden" value="{{ commit }}" name="commit" />
-                <input type="submit" class="btn btn-danger btn-sm" title="Revert back to this revision" value="Revert" />
-            </form>
-        </div>
-    {% endif %}
-    <div id="page-content" style="display:none">
-        {{ page.data }}
+  {% if commit %}
+    <div id="page-action-bar">
+      <form method="POST" action="{{ url_for('wiki.revert') }}">
+        <input type="hidden" value="{{ name }}" name="name" />
+        <input type="hidden" value="{{ commit }}" name="commit" />
+        <input type="submit" class="btn btn-danger btn-sm" title="Revert back to this revision" value="Revert" />
+      </form>
     </div>
+  {% endif %}
+  <div id="page-content" style="display:none">
+    {{ page.data }}
+  </div>
 
 {% endblock %}
 {% block js %}
-    <script>
-        $(function(){
-            $("#page-content").html(MDR.convert({{ page.data|tojson|safe }})).show();
-        });
-    </script>
+  <script>
+    $(function(){
+      $("#page-content").html(MDR.convert({{ page.data|tojson|safe }})).show();
+    });
+  </script>
 {% endblock %}
\ No newline at end of file