diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 17f9e012..3576fd1f 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -13,7 +13,7 @@ h1 {
     margin-top:50px;
 }
 
-.dottedLine {
+.dotted_line {
     width:100%;
     height:0px;
     border-bottom: dotted 1px #5f5f5f;
@@ -42,7 +42,7 @@ a {
     margin-right: auto;
 }
 
-.button {
+.button_red, .button_green {
     font-family: 'Carter One', arial, serif;
     height: 28px;
     min-width: 99px;
@@ -60,11 +60,11 @@ a {
     padding-right:11px;
 }
 
-.buttonRed {
-    background-image: url('button_red.png');
+.button_red {
+    background-image: url('../images/button_red.png');
 }
 
-.buttonGreen {
-    background-image: url('button_green.png');
+.button_green {
+    background-image: url('../images/button_green.png');
 }
 
diff --git a/mediagoblin/static/css/base.css~ b/mediagoblin/static/css/base.css~
index 17f9e012..e69a87e7 100644
--- a/mediagoblin/static/css/base.css~
+++ b/mediagoblin/static/css/base.css~
@@ -13,7 +13,7 @@ h1 {
     margin-top:50px;
 }
 
-.dottedLine {
+.dotted_line {
     width:100%;
     height:0px;
     border-bottom: dotted 1px #5f5f5f;
@@ -42,7 +42,7 @@ a {
     margin-right: auto;
 }
 
-.button {
+.button_red, .button_green {
     font-family: 'Carter One', arial, serif;
     height: 28px;
     min-width: 99px;
@@ -60,11 +60,11 @@ a {
     padding-right:11px;
 }
 
-.buttonRed {
+.button_red {
     background-image: url('button_red.png');
 }
 
-.buttonGreen {
+.button_green {
     background-image: url('button_green.png');
 }
 
diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html
index 46552a39..d5a5ddef 100644
--- a/mediagoblin/templates/mediagoblin/auth/login.html
+++ b/mediagoblin/templates/mediagoblin/auth/login.html
@@ -33,12 +33,12 @@
       {{ wtforms_util.render_table(login_form) }}
       <tr>
         <td></td>
-        <td><input type="submit" value="submit" /></td>
+        <td><input type="submit" value="submit" class="button_green"/></td>
       </tr>
     </table>
 
     {% if next %}
-      <input type="hidden" name="next" value="{{ next }}" class="buttonGreen" />
+      <input type="hidden" name="next" value="{{ next }}" class="button_green" />
     {% endif %}
   </form>
 {% endblock %}
diff --git a/mediagoblin/templates/mediagoblin/auth/login.html~ b/mediagoblin/templates/mediagoblin/auth/login.html~
index f2e7b664..19d90907 100644
--- a/mediagoblin/templates/mediagoblin/auth/login.html~
+++ b/mediagoblin/templates/mediagoblin/auth/login.html~
@@ -38,7 +38,7 @@
     </table>
 
     {% if next %}
-      <input type="hidden" name="next" value="{{ next }}" />
+      <input type="hidden" name="next" value="{{ next }}" class="button_green" />
     {% endif %}
   </form>
 {% endblock %}
diff --git a/mediagoblin/templates/mediagoblin/auth/register.html b/mediagoblin/templates/mediagoblin/auth/register.html
index de3ec71d..ee2f425b 100644
--- a/mediagoblin/templates/mediagoblin/auth/register.html
+++ b/mediagoblin/templates/mediagoblin/auth/register.html
@@ -26,7 +26,7 @@
       {{ wtforms_util.render_table(register_form) }}
       <tr>
         <td></td>
-        <td><input type="submit" value="submit" class="buttonGreen" /></td>
+        <td><input type="submit" value="submit" class="button_green" /></td>
       </tr>
     </table>
   </form>
diff --git a/mediagoblin/templates/mediagoblin/auth/register.html~ b/mediagoblin/templates/mediagoblin/auth/register.html~
index f3489397..de3ec71d 100644
--- a/mediagoblin/templates/mediagoblin/auth/register.html~
+++ b/mediagoblin/templates/mediagoblin/auth/register.html~
@@ -26,7 +26,7 @@
       {{ wtforms_util.render_table(register_form) }}
       <tr>
         <td></td>
-        <td><input type="submit" value="submit" /></td>
+        <td><input type="submit" value="submit" class="buttonGreen" /></td>
       </tr>
     </table>
   </form>
diff --git a/mediagoblin/templates/mediagoblin/submit/start.html b/mediagoblin/templates/mediagoblin/submit/start.html
index 562d9050..21a7ed4e 100644
--- a/mediagoblin/templates/mediagoblin/submit/start.html
+++ b/mediagoblin/templates/mediagoblin/submit/start.html
@@ -28,7 +28,7 @@
       {{ wtforms_util.render_table(submit_form) }}
       <tr>
         <td></td>
-        <td><input type="submit" value="submit" /></td>
+        <td><input type="submit" value="submit" class="button_green" /></td>
       </tr>
     </table>
   </form>
diff --git a/mediagoblin/templates/mediagoblin/submit/start.html~ b/mediagoblin/templates/mediagoblin/submit/start.html~
new file mode 100644
index 00000000..562d9050
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/submit/start.html~
@@ -0,0 +1,35 @@
+{#
+# 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" %}
+
+{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
+
+{% block mediagoblin_content %}
+  <h2>Submit yer media</h2>
+
+  <form action="{{ request.urlgen('mediagoblin.submit.start') }}"
+        method="POST" enctype="multipart/form-data">
+    <table>
+      {{ wtforms_util.render_table(submit_form) }}
+      <tr>
+        <td></td>
+        <td><input type="submit" value="submit" /></td>
+      </tr>
+    </table>
+  </form>
+{% endblock %}    
diff --git a/mediagoblin/templates/mediagoblin/test_submit.html b/mediagoblin/templates/mediagoblin/test_submit.html
index ebf93b59..86cf4655 100644
--- a/mediagoblin/templates/mediagoblin/test_submit.html
+++ b/mediagoblin/templates/mediagoblin/test_submit.html
@@ -25,7 +25,7 @@
         {{ wtforms_util.render_table(image_form) }}
         <tr>
           <td></td>
-          <td><input type="submit" value="submit" class="buttonGreen" /></td>
+          <td><input type="submit" value="submit" class="button_green" /></td>
         </tr>
       </table>
     </form>