diff --git a/dpaste/static/dpaste/theme.css b/dpaste/static/dpaste/theme.css
index 41136c7..f109d7c 100644
--- a/dpaste/static/dpaste/theme.css
+++ b/dpaste/static/dpaste/theme.css
@@ -15,7 +15,20 @@ tt strong {
 /* Custom container */
 .container-fluid {
     margin: 0 auto;
-    max-width: 1100px;
+    padding: 0;
+}
+
+.container-fluid > div,
+.container-fluid > header,
+.container-fluid > form,
+.container-fluid > h2,
+.container-fluid > h3,
+.container-fluid > h4 {
+    padding: 0 30px;
+}
+
+.row-fluid {
+    width: auto;
 }
 
 .container > hr {
@@ -26,6 +39,10 @@ tt strong {
     color: #5393b4;
 }
 
+h1, h2, h3, h4 {
+    font-weight: 300;
+}
+
 /* ----------------------------------------------------------------------------
    Snippet form
 ---------------------------------------------------------------------------- */
@@ -70,6 +87,10 @@ tt strong {
     margin-bottom: 20px;
 }
 
+.snippet-reply {
+    margin-top: 30px;
+}
+
 .snippet-reply-hidden {
     opacity: 0.3;
 }
@@ -143,10 +164,6 @@ div.tree div.submit input{
    Pre
 ---------------------------------------------------------------------------- */
 
-.prettyprint {
-    background-color: #272822;
-    padding: 10px 15px 10px 0;
-}
 
 ol.linenums {
     margin: 0 0 0 45px; /* IE indents via margin-left */
@@ -166,12 +183,20 @@ ol.linenums li.marked {
 /* ----------------------------------------------------------------------------
    Pygments
 ---------------------------------------------------------------------------- */
-pre .gd { background-color: rgba(226, 12, 19, .5); color: #fff; display: block; }
-pre .gi { background-color: rgba(23, 189, 10, .5); color: #fff; display: block; }
+
+pre {
+    background: #232829;
+    color: #f8f8f2;
+    padding: 10px 15px 10px 0;
+    border-radius: 0;
+    padding: 20px 30px;
+}
+
+pre .gd { background-color: rgba(226, 12, 19, .3); color: #fff; display: block; }
+pre .gi { background-color: rgba(23, 189, 10, .2); color: #fff; display: block; }
 
 
 pre .hll { background-color: #49483e }
-pre  { background: #272822; color: #f8f8f2 }
 pre .c { color: #75715e } /* Comment */
 pre .err { color: #960050; background-color: #1e0010 } /* Error */
 pre .k { color: #66d9ef } /* Keyword */
diff --git a/dpaste/templates/dpaste/snippet_details.html b/dpaste/templates/dpaste/snippet_details.html
index fa7dfa5..ea68367 100644
--- a/dpaste/templates/dpaste/snippet_details.html
+++ b/dpaste/templates/dpaste/snippet_details.html
@@ -12,7 +12,7 @@
     Snippet Diff View
     ======================================================================= -->
     <div id="snippet-diff" class="snippet-diff container-fluid">
-        <div class="row-fluid">
+        <div class="row-fluid" style="width: auto; padding: 30px 0">
             <div class="span9">
                 <div id="diff" style="display:none;"></div>
             </div>
@@ -71,12 +71,9 @@
         {% include "dpaste/snippet_pre.html" %}
     {% endif %}
 
-
     <!-- ======================================================================
     Snippet Reply
     ======================================================================= -->
-    <hr>
-
     <div class="snippet-reply snippet-reply-hidden">
         <h3>{% trans "Reply to this snippet" %} &rarr;</h3>
         {% include "dpaste/snippet_form.html" %}
diff --git a/dpaste/templates/dpaste/snippet_list.html b/dpaste/templates/dpaste/snippet_list.html
index fb20f3f..350bc9f 100644
--- a/dpaste/templates/dpaste/snippet_list.html
+++ b/dpaste/templates/dpaste/snippet_list.html
@@ -8,13 +8,12 @@
 {% block dpaste_nav_history %}active{% endblock %}
 {% block page %}
     {% for snippet in snippet_list %}
-    <h4>
+    <h4 style="margin-top: 50px;">
         <a title="{{ snippet.published|date:_("DATETIME_FORMAT") }}" href="{{ snippet.get_absolute_url }}">
             {% blocktrans with snippet.published|timesince as since %}{{ since }} ago{% endblocktrans %}
         </a>
     </h4>
     {% include "dpaste/snippet_pre.html" %}
-    {% if not forloop.last %}<hr>{% endif %}
     {% empty %}
     <p>{% trans "No snippets saved. Either all your snippets are expired or your cookie has changed." %}</p>
     {% endfor %}
diff --git a/dpaste/templates/dpaste/snippet_pre.html b/dpaste/templates/dpaste/snippet_pre.html
index 02e839d..b2247ff 100644
--- a/dpaste/templates/dpaste/snippet_pre.html
+++ b/dpaste/templates/dpaste/snippet_pre.html
@@ -1 +1 @@
-{% load dpaste_tags %}<pre class="prettyprint linenums"><ol class="linenums">{% for line in snippet|highlight %}<li id="{{ forloop.counter }}">{{ line|safe|default:"&nbsp;" }}</li>{% endfor %}</ol></pre>
\ No newline at end of file
+{% load dpaste_tags %}<pre><ol class="linenums">{% for line in snippet|highlight %}<li id="{{ forloop.counter }}">{{ line|safe|default:"&nbsp;" }}</li>{% endfor %}</ol></pre>