diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 93b0b1a2..17f9e012 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -1 +1,70 @@
-/* stuff goes here :) */
\ No newline at end of file
+body {
+    background-color: #272727;
+    background-image: url('back.png');
+    color: #f7f7f7;
+    font-family: sans;
+    padding:none;
+    margin:0px;
+}
+
+h1 {
+    font-family: 'Carter One', arial, serif;
+    margin-bottom: 20px;
+    margin-top:50px;
+}
+
+.dottedLine {
+    width:100%;
+    height:0px;
+    border-bottom: dotted 1px #5f5f5f;
+    position:absolute;
+    left:0px;
+    margin-top:-20px;
+}
+
+a {
+    color: #d12929;
+    border-bottom: 1px dotted;
+    text-decoration: none;
+}
+
+.header {
+    width:100%;
+    height:60px;
+    background-image:url('header_back.png');
+    padding-top:40px;
+    margin-bottom:80px;
+}
+
+.container {
+    width: 800px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.button {
+    font-family: 'Carter One', arial, serif;
+    height: 28px;
+    min-width: 99px;
+    box-shadow: 0px 0px 5px #000;
+    border-radius: 5px;
+    border: none;
+    color: #272727;
+    margin: 10px;
+    font-size: 1em;
+    float: left;
+    display: block;
+    text-align: center;
+    padding-top: 4px;
+    padding-left:11px;
+    padding-right:11px;
+}
+
+.buttonRed {
+    background-image: url('button_red.png');
+}
+
+.buttonGreen {
+    background-image: url('button_green.png');
+}
+
diff --git a/mediagoblin/static/css/base.css~ b/mediagoblin/static/css/base.css~
new file mode 100644
index 00000000..17f9e012
--- /dev/null
+++ b/mediagoblin/static/css/base.css~
@@ -0,0 +1,70 @@
+body {
+    background-color: #272727;
+    background-image: url('back.png');
+    color: #f7f7f7;
+    font-family: sans;
+    padding:none;
+    margin:0px;
+}
+
+h1 {
+    font-family: 'Carter One', arial, serif;
+    margin-bottom: 20px;
+    margin-top:50px;
+}
+
+.dottedLine {
+    width:100%;
+    height:0px;
+    border-bottom: dotted 1px #5f5f5f;
+    position:absolute;
+    left:0px;
+    margin-top:-20px;
+}
+
+a {
+    color: #d12929;
+    border-bottom: 1px dotted;
+    text-decoration: none;
+}
+
+.header {
+    width:100%;
+    height:60px;
+    background-image:url('header_back.png');
+    padding-top:40px;
+    margin-bottom:80px;
+}
+
+.container {
+    width: 800px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.button {
+    font-family: 'Carter One', arial, serif;
+    height: 28px;
+    min-width: 99px;
+    box-shadow: 0px 0px 5px #000;
+    border-radius: 5px;
+    border: none;
+    color: #272727;
+    margin: 10px;
+    font-size: 1em;
+    float: left;
+    display: block;
+    text-align: center;
+    padding-top: 4px;
+    padding-left:11px;
+    padding-right:11px;
+}
+
+.buttonRed {
+    background-image: url('button_red.png');
+}
+
+.buttonGreen {
+    background-image: url('button_green.png');
+}
+
diff --git a/mediagoblin/static/images/back.png b/mediagoblin/static/images/back.png
new file mode 100644
index 00000000..3d7fe844
Binary files /dev/null and b/mediagoblin/static/images/back.png differ
diff --git a/mediagoblin/static/images/button_green.png b/mediagoblin/static/images/button_green.png
new file mode 100644
index 00000000..0fc234d4
Binary files /dev/null and b/mediagoblin/static/images/button_green.png differ
diff --git a/mediagoblin/static/images/button_red.png b/mediagoblin/static/images/button_red.png
new file mode 100644
index 00000000..b0f7dcad
Binary files /dev/null and b/mediagoblin/static/images/button_red.png differ
diff --git a/mediagoblin/static/images/header_back.png b/mediagoblin/static/images/header_back.png
new file mode 100644
index 00000000..3647b99d
Binary files /dev/null and b/mediagoblin/static/images/header_back.png differ
diff --git a/mediagoblin/static/images/logo.png b/mediagoblin/static/images/logo.png
new file mode 100644
index 00000000..8d2f6272
Binary files /dev/null and b/mediagoblin/static/images/logo.png differ
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 71c2e550..07be3c47 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -23,7 +23,8 @@
   </head>
 
   <body>
-  <body>
+    <h1>GNU MediaGoblin at your duty!</h1>
+    <!-- OLD CODE HERE
     {% block mediagoblin_body %}
       {% block mediagoblin_header %}
         <table id="mediagoblin_header">
@@ -66,6 +67,6 @@
         {% block mediagoblin_content %}
         {% endblock mediagoblin_content %}
       </div>
-    {% endblock mediagoblin_body %}
+    {% endblock mediagoblin_body %}-->
   </body>
 </html>
diff --git a/mediagoblin/templates/mediagoblin/base.html~ b/mediagoblin/templates/mediagoblin/base.html~
new file mode 100644
index 00000000..07be3c47
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/base.html~
@@ -0,0 +1,72 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+<html>
+  <head>
+    <title>{% block title %}MediaGoblin{% endblock title %}</title>
+    <link rel="stylesheet" type="text/css"
+          href="{{ request.staticdirect('/css/base.css') }}"/>
+  </head>
+
+  <body>
+    <h1>GNU MediaGoblin at your duty!</h1>
+    <!-- OLD CODE HERE
+    {% block mediagoblin_body %}
+      {% block mediagoblin_header %}
+        <table id="mediagoblin_header">
+          <tr>
+            <td id="mediagoblin_logo">
+              {% block mediagoblin_logo %}
+                <a href="{{ request.urlgen('index') }}">MediaGoblin</a>
+              {% endblock %}
+            </td>
+            <td>{% block mediagoblin_header_title %}MediaGoblin Home{% endblock %}</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td>
+              {% block mediagoblin_header_subtitle %}
+                Clever subtitle here!
+              {% endblock %}</td>
+          </tr>
+          {% if request.user %}
+            <tr>
+              <td></td>
+              <td>
+                Welcome {{ request.user['username'] }}! --
+                <a href="{{ request.urlgen('mediagoblin.auth.logout') }}">
+                  Logout</a>
+              </td>
+            </tr>
+          {% else %}
+            <tr>
+              <td></td>
+              <td>
+                <a href="{{ request.urlgen('mediagoblin.auth.login') }}">
+                  Login</a>
+              </td>
+            </tr>
+          {% endif %}
+        </table>
+      {% endblock %}
+      <div id="mediagoblin_content">
+        {% block mediagoblin_content %}
+        {% endblock mediagoblin_content %}
+      </div>
+    {% endblock mediagoblin_body %}-->
+  </body>
+</html>
diff --git a/mediagoblin/templates/mediagoblin/media_details.html b/mediagoblin/templates/mediagoblin/media_details.html
index 1b02c809..bd63a289 100644
--- a/mediagoblin/templates/mediagoblin/media_details.html
+++ b/mediagoblin/templates/mediagoblin/media_details.html
@@ -20,7 +20,7 @@
 
   {# temporarily, an "image gallery" that isn't one really ;) #}
   {% if media %}
-    <h2>Media details for {{media.title}}</h2>
+    <h1>Media details for {{media.title}}</h1>
     <div>
       <img src="{{ request.app.public_store.file_url(
                     media.media_files.main) }}" />
diff --git a/mediagoblin/templates/mediagoblin/media_details.html~ b/mediagoblin/templates/mediagoblin/media_details.html~
new file mode 100644
index 00000000..1b02c809
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/media_details.html~
@@ -0,0 +1,34 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "mediagoblin/base.html" %}
+{% block mediagoblin_content %}
+
+  {# temporarily, an "image gallery" that isn't one really ;) #}
+  {% if media %}
+    <h2>Media details for {{media.title}}</h2>
+    <div>
+      <img src="{{ request.app.public_store.file_url(
+                    media.media_files.main) }}" />
+  
+      <br/>Uploaded: {{ media.created}}
+      <br/>Description: {{media.description}}
+    </div>
+  {% else %}
+    <p>Sorry, no such media found.<p/>
+  {% endif %}
+{% endblock %}    
diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html
index fa78bda2..e2b2730a 100644
--- a/mediagoblin/templates/mediagoblin/root.html
+++ b/mediagoblin/templates/mediagoblin/root.html
@@ -19,7 +19,7 @@
 
 {% block mediagoblin_content %}
   
-  <h2>{% trans %}Welcome to GNU MediaGoblin!{% endtrans %}</h2>
+  <h1>{% trans %}Welcome to GNU MediaGoblin!{% endtrans %}</h1>
 
   {% if request.user %}
   <p>
diff --git a/mediagoblin/templates/mediagoblin/root.html~ b/mediagoblin/templates/mediagoblin/root.html~
new file mode 100644
index 00000000..fa78bda2
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/root.html~
@@ -0,0 +1,56 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "mediagoblin/base.html" %}
+
+{% block mediagoblin_content %}
+  
+  <h2>{% trans %}Welcome to GNU MediaGoblin!{% endtrans %}</h2>
+
+  {% if request.user %}
+  <p>
+    <a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a>.
+  </p>
+
+  {% else %}
+  <p>
+    If you have an account, you can
+    <a href="{{ request.urlgen('mediagoblin.auth.login') }}">Login</a>.
+  </p>
+  <p>
+    If you don't have an account, please 
+    <a href="{{ request.urlgen('mediagoblin.auth.register') }}">Register</a>.
+  </p>
+
+  {% endif %}
+
+  {# temporarily, an "image gallery" that isn't one really ;) #}
+
+  <div>
+    <ul>
+      {% for entry in media_entries %}
+        <li>
+          <a href="{{ request.urlgen('mediagoblin.user_pages.media_home',
+                   user= entry.uploader.username, m_id= entry._id) }}">
+            <img src="{{ request.app.public_store.file_url(
+                      entry['media_files']['thumb']) }}" /></a>
+        </li>
+      {% endfor %}
+    </ul>
+  </div>
+
+{% endblock %}