diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html
index f2e7b664..46552a39 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="buttonGreen" />
     {% endif %}
   </form>
 {% endblock %}
diff --git a/mediagoblin/templates/mediagoblin/auth/login.html~ b/mediagoblin/templates/mediagoblin/auth/login.html~
new file mode 100644
index 00000000..f2e7b664
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/auth/login.html~
@@ -0,0 +1,44 @@
+{#
+# 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>Login:</h2>
+
+  <form action="{{ request.urlgen('mediagoblin.auth.login') }}"
+        method="POST" enctype="multipart/form-data">
+
+    {% if login_failed %}
+      <p><i>Login failed!</i></p>
+    {% endif %}
+
+    <table>
+      {{ wtforms_util.render_table(login_form) }}
+      <tr>
+        <td></td>
+        <td><input type="submit" value="submit" /></td>
+      </tr>
+    </table>
+
+    {% if next %}
+      <input type="hidden" name="next" value="{{ next }}" />
+    {% endif %}
+  </form>
+{% endblock %}
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/auth/register.html~ b/mediagoblin/templates/mediagoblin/auth/register.html~
new file mode 100644
index 00000000..f3489397
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/auth/register.html~
@@ -0,0 +1,33 @@
+{#
+# 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 %}
+  <form action="{{ request.urlgen('mediagoblin.auth.register') }}"
+        method="POST" enctype="multipart/form-data">
+    <table>
+      {{ wtforms_util.render_table(register_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 b02f4e40..ebf93b59 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" /></td>
+          <td><input type="submit" value="submit" class="buttonGreen" /></td>
         </tr>
       </table>
     </form>
diff --git a/mediagoblin/templates/mediagoblin/test_submit.html~ b/mediagoblin/templates/mediagoblin/test_submit.html~
new file mode 100644
index 00000000..ebf93b59
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/test_submit.html~
@@ -0,0 +1,33 @@
+{#
+# 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/>.
+#}
+{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
+
+<html>
+  <body>
+    <form action="{{ request.urlgen('test_submit') }}" method="POST"
+          enctype="multipart/form-data">
+      <table>
+        {{ wtforms_util.render_table(image_form) }}
+        <tr>
+          <td></td>
+          <td><input type="submit" value="submit" class="buttonGreen" /></td>
+        </tr>
+      </table>
+    </form>
+  </body>
+</html>