From 87f4a77c45cb3631321ca2f4670d31888753c5ce Mon Sep 17 00:00:00 2001
From: Atul Varma <varmaa@gmail.com>
Date: Fri, 17 May 2013 17:37:01 -0400
Subject: [PATCH] Moved all webmaker-specific stuff into themes/webmaker/.

It's not really a proper theme because I just copied all public
views in there. Had to do this b/c it was difficult to separate out
what was webmaker-specific from what wasn't, especially since the
webmaker css uses its own grid system and such. Alas, we'll have to go
back later and fix things up.

Now the public views just use generic ol' bootstrap, but are thus
in prime condition for theming.
---
 .../webmaker/public}/img/bg-stone.png         | Bin
 .../webmaker/public}/img/favicon.ico          | Bin
 .../webmaker/public}/img/footer-logo.png      | Bin
 .../webmaker/public}/img/header_logo.png      | Bin
 .../webmaker/public}/stylesheets/criteria.css |   0
 .../opensans/Apache License Version 2.txt     |   0
 .../opensans/OpenSans-Bold-webfont.eot        | Bin
 .../opensans/OpenSans-Bold-webfont.svg        |   0
 .../opensans/OpenSans-Bold-webfont.ttf        | Bin
 .../opensans/OpenSans-Bold-webfont.woff       | Bin
 .../opensans/OpenSans-BoldItalic-webfont.eot  | Bin
 .../opensans/OpenSans-BoldItalic-webfont.svg  |   0
 .../opensans/OpenSans-BoldItalic-webfont.ttf  | Bin
 .../opensans/OpenSans-BoldItalic-webfont.woff | Bin
 .../opensans/OpenSans-ExtraBold-webfont.eot   | Bin
 .../opensans/OpenSans-ExtraBold-webfont.svg   |   0
 .../opensans/OpenSans-ExtraBold-webfont.ttf   | Bin
 .../opensans/OpenSans-ExtraBold-webfont.woff  | Bin
 .../OpenSans-ExtraBoldItalic-webfont.eot      | Bin
 .../OpenSans-ExtraBoldItalic-webfont.svg      |   0
 .../OpenSans-ExtraBoldItalic-webfont.ttf      | Bin
 .../OpenSans-ExtraBoldItalic-webfont.woff     | Bin
 .../opensans/OpenSans-Italic-webfont.eot      | Bin
 .../opensans/OpenSans-Italic-webfont.svg      |   0
 .../opensans/OpenSans-Italic-webfont.ttf      | Bin
 .../opensans/OpenSans-Italic-webfont.woff     | Bin
 .../opensans/OpenSans-Light-webfont.eot       | Bin
 .../opensans/OpenSans-Light-webfont.svg       |   0
 .../opensans/OpenSans-Light-webfont.ttf       | Bin
 .../opensans/OpenSans-Light-webfont.woff      | Bin
 .../opensans/OpenSans-LightItalic-webfont.eot | Bin
 .../opensans/OpenSans-LightItalic-webfont.svg |   0
 .../opensans/OpenSans-LightItalic-webfont.ttf | Bin
 .../OpenSans-LightItalic-webfont.woff         | Bin
 .../opensans/OpenSans-Regular-webfont.eot     | Bin
 .../opensans/OpenSans-Regular-webfont.svg     |   0
 .../opensans/OpenSans-Regular-webfont.ttf     | Bin
 .../opensans/OpenSans-Regular-webfont.woff    | Bin
 .../opensans/OpenSans-Semibold-webfont.eot    | Bin
 .../opensans/OpenSans-Semibold-webfont.svg    |   0
 .../opensans/OpenSans-Semibold-webfont.ttf    | Bin
 .../opensans/OpenSans-Semibold-webfont.woff   | Bin
 .../OpenSans-SemiboldItalic-webfont.eot       | Bin
 .../OpenSans-SemiboldItalic-webfont.svg       |   0
 .../OpenSans-SemiboldItalic-webfont.ttf       | Bin
 .../OpenSans-SemiboldItalic-webfont.woff      | Bin
 .../stylesheets/opensans/stylesheet.css       |   0
 .../webmaker/public}/stylesheets/webmaker.css |   0
 themes/webmaker/views/public/404.html         |  28 ++++++
 themes/webmaker/views/public/500.html         |  23 +++++
 themes/webmaker/views/public/all.html         |  40 +++++++++
 themes/webmaker/views/public/claim.html       |  30 +++++++
 .../webmaker/views/public/confirm-claim.html  |  41 +++++++++
 themes/webmaker/views/public/criteria.html    |  29 ++++++
 themes/webmaker/views/public/layout.html      |  84 ++++++++++++++++++
 views/public/404.html                         |  36 +++-----
 views/public/500.html                         |  26 ++----
 views/public/all.html                         |  32 ++-----
 views/public/claim.html                       |  37 +++-----
 views/public/confirm-claim.html               |  63 ++++++-------
 views/public/criteria.html                    |  38 +++-----
 views/public/layout.html                      |  75 ++--------------
 62 files changed, 356 insertions(+), 226 deletions(-)
 rename {public => themes/webmaker/public}/img/bg-stone.png (100%)
 rename {public => themes/webmaker/public}/img/favicon.ico (100%)
 rename {public => themes/webmaker/public}/img/footer-logo.png (100%)
 rename {public => themes/webmaker/public}/img/header_logo.png (100%)
 rename {public => themes/webmaker/public}/stylesheets/criteria.css (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/Apache License Version 2.txt (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-Bold-webfont.eot (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-Bold-webfont.svg (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-Bold-webfont.ttf (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-Bold-webfont.woff (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-BoldItalic-webfont.eot (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-BoldItalic-webfont.svg (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-BoldItalic-webfont.ttf (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-BoldItalic-webfont.woff (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-ExtraBold-webfont.eot (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-ExtraBold-webfont.svg (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-ExtraBold-webfont.ttf (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-ExtraBold-webfont.woff (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-ExtraBoldItalic-webfont.eot (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-ExtraBoldItalic-webfont.svg (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-ExtraBoldItalic-webfont.ttf (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-ExtraBoldItalic-webfont.woff (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-Italic-webfont.eot (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-Italic-webfont.svg (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-Italic-webfont.ttf (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-Italic-webfont.woff (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-Light-webfont.eot (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-Light-webfont.svg (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-Light-webfont.ttf (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-Light-webfont.woff (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-LightItalic-webfont.eot (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-LightItalic-webfont.svg (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-LightItalic-webfont.ttf (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-LightItalic-webfont.woff (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-Regular-webfont.eot (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-Regular-webfont.svg (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-Regular-webfont.ttf (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-Regular-webfont.woff (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-Semibold-webfont.eot (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-Semibold-webfont.svg (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-Semibold-webfont.ttf (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-Semibold-webfont.woff (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-SemiboldItalic-webfont.eot (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-SemiboldItalic-webfont.svg (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-SemiboldItalic-webfont.ttf (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/OpenSans-SemiboldItalic-webfont.woff (100%)
 rename {public => themes/webmaker/public}/stylesheets/opensans/stylesheet.css (100%)
 rename {public => themes/webmaker/public}/stylesheets/webmaker.css (100%)
 create mode 100644 themes/webmaker/views/public/404.html
 create mode 100644 themes/webmaker/views/public/500.html
 create mode 100644 themes/webmaker/views/public/all.html
 create mode 100644 themes/webmaker/views/public/claim.html
 create mode 100644 themes/webmaker/views/public/confirm-claim.html
 create mode 100644 themes/webmaker/views/public/criteria.html
 create mode 100644 themes/webmaker/views/public/layout.html

diff --git a/public/img/bg-stone.png b/themes/webmaker/public/img/bg-stone.png
similarity index 100%
rename from public/img/bg-stone.png
rename to themes/webmaker/public/img/bg-stone.png
diff --git a/public/img/favicon.ico b/themes/webmaker/public/img/favicon.ico
similarity index 100%
rename from public/img/favicon.ico
rename to themes/webmaker/public/img/favicon.ico
diff --git a/public/img/footer-logo.png b/themes/webmaker/public/img/footer-logo.png
similarity index 100%
rename from public/img/footer-logo.png
rename to themes/webmaker/public/img/footer-logo.png
diff --git a/public/img/header_logo.png b/themes/webmaker/public/img/header_logo.png
similarity index 100%
rename from public/img/header_logo.png
rename to themes/webmaker/public/img/header_logo.png
diff --git a/public/stylesheets/criteria.css b/themes/webmaker/public/stylesheets/criteria.css
similarity index 100%
rename from public/stylesheets/criteria.css
rename to themes/webmaker/public/stylesheets/criteria.css
diff --git a/public/stylesheets/opensans/Apache License Version 2.txt b/themes/webmaker/public/stylesheets/opensans/Apache License Version 2.txt
similarity index 100%
rename from public/stylesheets/opensans/Apache License Version 2.txt
rename to themes/webmaker/public/stylesheets/opensans/Apache License Version 2.txt
diff --git a/public/stylesheets/opensans/OpenSans-Bold-webfont.eot b/themes/webmaker/public/stylesheets/opensans/OpenSans-Bold-webfont.eot
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-Bold-webfont.eot
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-Bold-webfont.eot
diff --git a/public/stylesheets/opensans/OpenSans-Bold-webfont.svg b/themes/webmaker/public/stylesheets/opensans/OpenSans-Bold-webfont.svg
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-Bold-webfont.svg
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-Bold-webfont.svg
diff --git a/public/stylesheets/opensans/OpenSans-Bold-webfont.ttf b/themes/webmaker/public/stylesheets/opensans/OpenSans-Bold-webfont.ttf
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-Bold-webfont.ttf
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-Bold-webfont.ttf
diff --git a/public/stylesheets/opensans/OpenSans-Bold-webfont.woff b/themes/webmaker/public/stylesheets/opensans/OpenSans-Bold-webfont.woff
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-Bold-webfont.woff
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-Bold-webfont.woff
diff --git a/public/stylesheets/opensans/OpenSans-BoldItalic-webfont.eot b/themes/webmaker/public/stylesheets/opensans/OpenSans-BoldItalic-webfont.eot
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-BoldItalic-webfont.eot
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-BoldItalic-webfont.eot
diff --git a/public/stylesheets/opensans/OpenSans-BoldItalic-webfont.svg b/themes/webmaker/public/stylesheets/opensans/OpenSans-BoldItalic-webfont.svg
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-BoldItalic-webfont.svg
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-BoldItalic-webfont.svg
diff --git a/public/stylesheets/opensans/OpenSans-BoldItalic-webfont.ttf b/themes/webmaker/public/stylesheets/opensans/OpenSans-BoldItalic-webfont.ttf
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-BoldItalic-webfont.ttf
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-BoldItalic-webfont.ttf
diff --git a/public/stylesheets/opensans/OpenSans-BoldItalic-webfont.woff b/themes/webmaker/public/stylesheets/opensans/OpenSans-BoldItalic-webfont.woff
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-BoldItalic-webfont.woff
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-BoldItalic-webfont.woff
diff --git a/public/stylesheets/opensans/OpenSans-ExtraBold-webfont.eot b/themes/webmaker/public/stylesheets/opensans/OpenSans-ExtraBold-webfont.eot
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-ExtraBold-webfont.eot
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-ExtraBold-webfont.eot
diff --git a/public/stylesheets/opensans/OpenSans-ExtraBold-webfont.svg b/themes/webmaker/public/stylesheets/opensans/OpenSans-ExtraBold-webfont.svg
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-ExtraBold-webfont.svg
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-ExtraBold-webfont.svg
diff --git a/public/stylesheets/opensans/OpenSans-ExtraBold-webfont.ttf b/themes/webmaker/public/stylesheets/opensans/OpenSans-ExtraBold-webfont.ttf
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-ExtraBold-webfont.ttf
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-ExtraBold-webfont.ttf
diff --git a/public/stylesheets/opensans/OpenSans-ExtraBold-webfont.woff b/themes/webmaker/public/stylesheets/opensans/OpenSans-ExtraBold-webfont.woff
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-ExtraBold-webfont.woff
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-ExtraBold-webfont.woff
diff --git a/public/stylesheets/opensans/OpenSans-ExtraBoldItalic-webfont.eot b/themes/webmaker/public/stylesheets/opensans/OpenSans-ExtraBoldItalic-webfont.eot
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-ExtraBoldItalic-webfont.eot
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-ExtraBoldItalic-webfont.eot
diff --git a/public/stylesheets/opensans/OpenSans-ExtraBoldItalic-webfont.svg b/themes/webmaker/public/stylesheets/opensans/OpenSans-ExtraBoldItalic-webfont.svg
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-ExtraBoldItalic-webfont.svg
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-ExtraBoldItalic-webfont.svg
diff --git a/public/stylesheets/opensans/OpenSans-ExtraBoldItalic-webfont.ttf b/themes/webmaker/public/stylesheets/opensans/OpenSans-ExtraBoldItalic-webfont.ttf
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-ExtraBoldItalic-webfont.ttf
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-ExtraBoldItalic-webfont.ttf
diff --git a/public/stylesheets/opensans/OpenSans-ExtraBoldItalic-webfont.woff b/themes/webmaker/public/stylesheets/opensans/OpenSans-ExtraBoldItalic-webfont.woff
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-ExtraBoldItalic-webfont.woff
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-ExtraBoldItalic-webfont.woff
diff --git a/public/stylesheets/opensans/OpenSans-Italic-webfont.eot b/themes/webmaker/public/stylesheets/opensans/OpenSans-Italic-webfont.eot
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-Italic-webfont.eot
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-Italic-webfont.eot
diff --git a/public/stylesheets/opensans/OpenSans-Italic-webfont.svg b/themes/webmaker/public/stylesheets/opensans/OpenSans-Italic-webfont.svg
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-Italic-webfont.svg
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-Italic-webfont.svg
diff --git a/public/stylesheets/opensans/OpenSans-Italic-webfont.ttf b/themes/webmaker/public/stylesheets/opensans/OpenSans-Italic-webfont.ttf
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-Italic-webfont.ttf
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-Italic-webfont.ttf
diff --git a/public/stylesheets/opensans/OpenSans-Italic-webfont.woff b/themes/webmaker/public/stylesheets/opensans/OpenSans-Italic-webfont.woff
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-Italic-webfont.woff
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-Italic-webfont.woff
diff --git a/public/stylesheets/opensans/OpenSans-Light-webfont.eot b/themes/webmaker/public/stylesheets/opensans/OpenSans-Light-webfont.eot
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-Light-webfont.eot
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-Light-webfont.eot
diff --git a/public/stylesheets/opensans/OpenSans-Light-webfont.svg b/themes/webmaker/public/stylesheets/opensans/OpenSans-Light-webfont.svg
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-Light-webfont.svg
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-Light-webfont.svg
diff --git a/public/stylesheets/opensans/OpenSans-Light-webfont.ttf b/themes/webmaker/public/stylesheets/opensans/OpenSans-Light-webfont.ttf
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-Light-webfont.ttf
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-Light-webfont.ttf
diff --git a/public/stylesheets/opensans/OpenSans-Light-webfont.woff b/themes/webmaker/public/stylesheets/opensans/OpenSans-Light-webfont.woff
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-Light-webfont.woff
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-Light-webfont.woff
diff --git a/public/stylesheets/opensans/OpenSans-LightItalic-webfont.eot b/themes/webmaker/public/stylesheets/opensans/OpenSans-LightItalic-webfont.eot
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-LightItalic-webfont.eot
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-LightItalic-webfont.eot
diff --git a/public/stylesheets/opensans/OpenSans-LightItalic-webfont.svg b/themes/webmaker/public/stylesheets/opensans/OpenSans-LightItalic-webfont.svg
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-LightItalic-webfont.svg
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-LightItalic-webfont.svg
diff --git a/public/stylesheets/opensans/OpenSans-LightItalic-webfont.ttf b/themes/webmaker/public/stylesheets/opensans/OpenSans-LightItalic-webfont.ttf
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-LightItalic-webfont.ttf
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-LightItalic-webfont.ttf
diff --git a/public/stylesheets/opensans/OpenSans-LightItalic-webfont.woff b/themes/webmaker/public/stylesheets/opensans/OpenSans-LightItalic-webfont.woff
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-LightItalic-webfont.woff
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-LightItalic-webfont.woff
diff --git a/public/stylesheets/opensans/OpenSans-Regular-webfont.eot b/themes/webmaker/public/stylesheets/opensans/OpenSans-Regular-webfont.eot
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-Regular-webfont.eot
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-Regular-webfont.eot
diff --git a/public/stylesheets/opensans/OpenSans-Regular-webfont.svg b/themes/webmaker/public/stylesheets/opensans/OpenSans-Regular-webfont.svg
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-Regular-webfont.svg
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-Regular-webfont.svg
diff --git a/public/stylesheets/opensans/OpenSans-Regular-webfont.ttf b/themes/webmaker/public/stylesheets/opensans/OpenSans-Regular-webfont.ttf
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-Regular-webfont.ttf
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-Regular-webfont.ttf
diff --git a/public/stylesheets/opensans/OpenSans-Regular-webfont.woff b/themes/webmaker/public/stylesheets/opensans/OpenSans-Regular-webfont.woff
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-Regular-webfont.woff
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-Regular-webfont.woff
diff --git a/public/stylesheets/opensans/OpenSans-Semibold-webfont.eot b/themes/webmaker/public/stylesheets/opensans/OpenSans-Semibold-webfont.eot
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-Semibold-webfont.eot
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-Semibold-webfont.eot
diff --git a/public/stylesheets/opensans/OpenSans-Semibold-webfont.svg b/themes/webmaker/public/stylesheets/opensans/OpenSans-Semibold-webfont.svg
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-Semibold-webfont.svg
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-Semibold-webfont.svg
diff --git a/public/stylesheets/opensans/OpenSans-Semibold-webfont.ttf b/themes/webmaker/public/stylesheets/opensans/OpenSans-Semibold-webfont.ttf
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-Semibold-webfont.ttf
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-Semibold-webfont.ttf
diff --git a/public/stylesheets/opensans/OpenSans-Semibold-webfont.woff b/themes/webmaker/public/stylesheets/opensans/OpenSans-Semibold-webfont.woff
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-Semibold-webfont.woff
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-Semibold-webfont.woff
diff --git a/public/stylesheets/opensans/OpenSans-SemiboldItalic-webfont.eot b/themes/webmaker/public/stylesheets/opensans/OpenSans-SemiboldItalic-webfont.eot
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-SemiboldItalic-webfont.eot
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-SemiboldItalic-webfont.eot
diff --git a/public/stylesheets/opensans/OpenSans-SemiboldItalic-webfont.svg b/themes/webmaker/public/stylesheets/opensans/OpenSans-SemiboldItalic-webfont.svg
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-SemiboldItalic-webfont.svg
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-SemiboldItalic-webfont.svg
diff --git a/public/stylesheets/opensans/OpenSans-SemiboldItalic-webfont.ttf b/themes/webmaker/public/stylesheets/opensans/OpenSans-SemiboldItalic-webfont.ttf
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-SemiboldItalic-webfont.ttf
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-SemiboldItalic-webfont.ttf
diff --git a/public/stylesheets/opensans/OpenSans-SemiboldItalic-webfont.woff b/themes/webmaker/public/stylesheets/opensans/OpenSans-SemiboldItalic-webfont.woff
similarity index 100%
rename from public/stylesheets/opensans/OpenSans-SemiboldItalic-webfont.woff
rename to themes/webmaker/public/stylesheets/opensans/OpenSans-SemiboldItalic-webfont.woff
diff --git a/public/stylesheets/opensans/stylesheet.css b/themes/webmaker/public/stylesheets/opensans/stylesheet.css
similarity index 100%
rename from public/stylesheets/opensans/stylesheet.css
rename to themes/webmaker/public/stylesheets/opensans/stylesheet.css
diff --git a/public/stylesheets/webmaker.css b/themes/webmaker/public/stylesheets/webmaker.css
similarity index 100%
rename from public/stylesheets/webmaker.css
rename to themes/webmaker/public/stylesheets/webmaker.css
diff --git a/themes/webmaker/views/public/404.html b/themes/webmaker/views/public/404.html
new file mode 100644
index 0000000..61c7449
--- /dev/null
+++ b/themes/webmaker/views/public/404.html
@@ -0,0 +1,28 @@
+{% extends "public/layout.html" %}
+{% block head %}
+  <link rel="stylesheet" href="/stylesheets/criteria.css">
+{% endblock %}
+{% block body %}
+  <div class="row">
+    <div class="span7">
+      <h2>Mozilla Webmaker Badges</h2>
+    </div>
+  </div>
+  <div class="media card">
+    <!-- <img class="img badge" src=""> -->
+    <div class="bd">
+      <hgroup>
+        <h1>Not Found</h1>
+      </hgroup>
+      <p>Sorry, we couldn't find the page you were looking for.<p>
+      <p>
+        If you are looking to claim a badge, <a href="/claim">head over
+        to the claim page</a>
+      <p>
+      <p>
+        If you want to see the list of availible badges, try going to
+        the <a href="/">badge listing</a>
+      <p>
+    </div>
+  </div>
+{% endblock %}
diff --git a/themes/webmaker/views/public/500.html b/themes/webmaker/views/public/500.html
new file mode 100644
index 0000000..389d3ba
--- /dev/null
+++ b/themes/webmaker/views/public/500.html
@@ -0,0 +1,23 @@
+{% extends "public/layout.html" %}
+{% block head %}
+  <link rel="stylesheet" href="/stylesheets/criteria.css">
+{% endblock %}
+{% block body %}
+  <div class="row">
+    <div class="span7">
+      <h2>Mozilla Webmaker Badges</h2>
+    </div>
+  </div>
+  <div class="media card">
+    <!-- <img class="img badge" src=""> -->
+    <div class="bd">
+      <hgroup>
+        <h1>Oh no! Something went wrong</h1>
+      </hgroup>
+      <p>
+        There was a problem trying to do whatever you just tried to
+        do. Please try again later.
+      <p>
+    </div>
+  </div>
+{% endblock %}
diff --git a/themes/webmaker/views/public/all.html b/themes/webmaker/views/public/all.html
new file mode 100644
index 0000000..1613b3d
--- /dev/null
+++ b/themes/webmaker/views/public/all.html
@@ -0,0 +1,40 @@
+{% extends "public/layout.html" %}
+{% block head %}
+  <link rel="stylesheet" href="/stylesheets/criteria.css">
+{% endblock %}
+{% block body %}
+  <div class="row">
+    <div class="span7">
+      <h2>Mozilla Webmaker Badges</h2>
+    </div>
+    <div class="span10">
+      <strong>Webmaker Badges are here!</strong>
+      <p>
+        Badges are digital records of skills, achievements and participation. Now you can earn Webmaker Badges to recognize the skills that you learn while making awesome webmaking projects, as well as for participating in the Webmaker community and events.
+      </p>
+      <p>
+        Head over to <a href="https://thimble.webmaker.org">Thimble</a>, pick a project and sign in to start earning!
+      </p>
+    </div>
+  </div>
+  {% for badge in badges %}
+  <div class="media card">
+    <img class="img badge" src="{{ badge.relativeUrl('image')}}">
+    <div class="bd">
+      <hgroup>
+        <h1>{{ badge.name }}</h1>
+      </hgroup>
+      <dl class="dl-horizontal narrow-dt">
+        <dt>Description:</dt>
+        <dd>
+          {% if badge.criteria.content %}
+            {{ badge.criteria.content | markdown }}
+          {% else %}
+            {{ badge.description | stupidSafe }}
+          {% endif %}
+        </dd>
+      </dl>
+    </div>
+  </div>
+  {% endfor %}
+{% endblock %}
diff --git a/themes/webmaker/views/public/claim.html b/themes/webmaker/views/public/claim.html
new file mode 100644
index 0000000..ca73393
--- /dev/null
+++ b/themes/webmaker/views/public/claim.html
@@ -0,0 +1,30 @@
+{% extends "public/layout.html" %}
+{% block head %}
+  <link rel="stylesheet" href="/stylesheets/criteria.css">
+{% endblock %}
+{% block body %}
+  <div class="row">
+    <div class="span7">
+      <h2>Mozilla Webmaker Badges</h2>
+    </div>
+  </div>
+  <div class="media card">
+    <div class="bd">
+      <hgroup>
+        <h3>What's your claim code?</h3>
+      </hgroup>
+      <p class="notice">Spaces, dashes and lettercase don't matter, just type in the words</p>
+
+      <form method="post" class="claim-form" action="">
+        {% if missing %}
+          <p><strong class="error">Sorry, could not find a badge with that code.</strong></p>
+        {% endif %}
+
+        <input id="name" type="hidden" name="csrf" value="{{ csrf }}">
+        <input tabindex="1" type="text" name="code" placeholder="Enter your claim code" class="input" value="{{ code | default('') | e }}">
+        <input tabindex="2" type="submit" value="Get your badge!" class="button">
+      </form>
+
+    </div>
+  </div>
+{% endblock %}
diff --git a/themes/webmaker/views/public/confirm-claim.html b/themes/webmaker/views/public/confirm-claim.html
new file mode 100644
index 0000000..e9aff80
--- /dev/null
+++ b/themes/webmaker/views/public/confirm-claim.html
@@ -0,0 +1,41 @@
+{% extends "public/layout.html" %}
+{% block head %}
+  <link rel="stylesheet" href="/stylesheets/criteria.css">
+{% endblock %}
+{% block body %}
+  <div class="row">
+    <div class="span7">
+      <h2>Mozilla Webmaker Badges</h2>
+    </div>
+  </div>
+  <div class="media card">
+    <img class="img badge" src="{{ badge.relativeUrl('image')}}">
+    <div class="bd">
+      <hgroup>
+        <h1>{{ badge.name }}</h1>
+      </hgroup>
+      <dl class="dl-horizontal narrow-dt">
+        <dt>Description:</dt>
+        <dd>
+          {% if badge.criteria.content %}
+            {{ badge.criteria.content | markdown }}
+          {% else %}
+            {{ badge.description | stupidSafe }}
+          {% endif %}
+        </dd>
+      </dl>
+      <hr>
+      
+      <form method="post" action="/claim/confirm" class="confirm-form js-confirm-form">
+        <input type="hidden" name="csrf" value="{{ csrf }}">
+        <input type="hidden" name="code" value="{{ code }}">
+        <input tabindex="1" type="email" name="email" placeholder="you@example.org" class="input js-email-input" required>
+        <input tabindex="2" type="submit" value="Claim your badge" class="button js-submit-button">
+      </form>
+    </div>
+  </div>
+
+  <script src="https://beta.openbadges.org/issuer.js"></script>
+  <script src="/js/claim-award.js"></script>
+{% endblock %}
+
diff --git a/themes/webmaker/views/public/criteria.html b/themes/webmaker/views/public/criteria.html
new file mode 100644
index 0000000..ce8225a
--- /dev/null
+++ b/themes/webmaker/views/public/criteria.html
@@ -0,0 +1,29 @@
+{% extends "public/layout.html" %}
+{% block head %}
+  <link rel="stylesheet" href="/stylesheets/criteria.css">
+{% endblock %}
+{% block body %}
+  <div class="row">
+    <div class="span7">
+      <h2>Mozilla Webmaker Badges</h2>
+    </div>
+  </div>
+  <div class="media card">
+    <img class="img badge" src="{{ badge.relativeUrl('image')}}">
+    <div class="bd">
+      <hgroup>
+        <h1>{{ badge.name }}</h1>
+      </hgroup>
+      <dl class="dl-horizontal narrow-dt">
+        <dt>Description:</dt>
+        <dd>
+          {% if badge.criteria.content %}
+            {{ badge.criteria.content | markdown }}
+          {% else %}
+            {{ badge.description | stupidSafe }}
+          {% endif %}
+        </dd>
+      </dl>
+    </div>
+  </div>
+{% endblock %}
diff --git a/themes/webmaker/views/public/layout.html b/themes/webmaker/views/public/layout.html
new file mode 100644
index 0000000..a9fbd89
--- /dev/null
+++ b/themes/webmaker/views/public/layout.html
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html lang="en-US" dir="ltr">
+<head>
+  <meta charset="utf-8">
+  <title>Mozilla Webmaker Badges</title>
+  <link rel="stylesheet" href="/stylesheets/opensans/stylesheet.css">
+  <link rel="stylesheet" href="/stylesheets/webmaker.css">
+  <link href="//www.mozilla.org/tabzilla/media/css/tabzilla.css" rel="stylesheet">
+  <!--[if lt IE 9]>
+  <script src="/js/html5shiv.js"></script>
+  <![endif]-->
+   <script src="/js/jquery.min.js"></script>
+  {% block head %}{% endblock %} 
+</head>
+<body>
+  <div class="wrapper bg-stone">
+    <header>
+      <div class="container">
+        <div class="logo">
+          <a href="#">
+            <img src="/img/header_logo.png" alt="Mozilla Webmaker Logo">
+          </a>
+        </div>
+        <a href="http://www.mozilla.org/" id="tabzilla">Mozilla</a>
+        <nav role="navigation">
+          <ul>
+            <li class="active">
+              <a href="#">Badges</a>
+            </li>
+          </ul>
+        </nav>
+      </div>
+    </header>
+    <section>
+      <div class="container">
+      {% block body %}{% endblock %}
+      </div>
+    </section>
+    <footer>
+      <div class="container">
+        <div class="row">
+          <div class="span2">
+            <h2><img src="/img/footer-logo.png" alt="Webmaker Logo"></h2>
+          </div>
+          <nav class="span2">
+            <h3>About</h3>
+            <ul>
+                <li><a href="https://www.webmaker.org/en-US/about/">About Us</a></li>
+                <li><a href="mailto:mozparty@mozilla.org">Contact Us</a></li>
+                <li><a href="http://www.mozilla.org/en-US/privacy-policy.html">Privacy Policy</a></li>
+                <li><a href="http://www.mozilla.org/en-US/about/legal.html">Legal Notices</a></li>
+            </ul>
+          </nav>
+          <nav class="span2">
+            <h3>Connect with us</h3>
+            <ul>
+                <li><a href="http://twitter.com/mozilla/">Twitter</a></li>
+                <li><a href="https://www.facebook.com/mozilla/">Facebook</a></li>
+            </ul>
+          </nav>
+          <nav class="span2">
+            <h3>Make something</h3>
+            <ul>
+                <li><a href="https://www.webmaker.org/en-US/projects/">Projects</a></li>
+                <li><a href="https://www.webmaker.org/en-US/tools/">Tools</a></li>
+                <li><a href="https://www.webmaker.org/en-US/events/">Events</a></li>
+            </ul>
+          </nav>
+          <nav class="span2">
+            <h3>Support our work</h3>
+            <ul>
+                <li><a href="https://donate.mozilla.org/page/contribute/join-mozilla?source=join_link">Donate</a></li>
+                <li><a href="https://mozillalabs.com/en-US/">Contribute</a></li>
+                <li><a href="https://donate.mozilla.org/page/contribute/firefoxtshirt">Buy a t-shirt</a></li>
+            </ul>
+          </nav>
+        </div>
+      </div>
+    </footer>
+  </div>
+  <script src="//www.mozilla.org/tabzilla/media/js/tabzilla.js"></script> 
+  {% block scripts %}{% endblock %} 
+</body>
+</html>
diff --git a/views/public/404.html b/views/public/404.html
index 61c7449..82b697c 100644
--- a/views/public/404.html
+++ b/views/public/404.html
@@ -1,28 +1,14 @@
 {% extends "public/layout.html" %}
-{% block head %}
-  <link rel="stylesheet" href="/stylesheets/criteria.css">
-{% endblock %}
+{% block title %}Not Found{% endblock %}
 {% block body %}
-  <div class="row">
-    <div class="span7">
-      <h2>Mozilla Webmaker Badges</h2>
-    </div>
-  </div>
-  <div class="media card">
-    <!-- <img class="img badge" src=""> -->
-    <div class="bd">
-      <hgroup>
-        <h1>Not Found</h1>
-      </hgroup>
-      <p>Sorry, we couldn't find the page you were looking for.<p>
-      <p>
-        If you are looking to claim a badge, <a href="/claim">head over
-        to the claim page</a>
-      <p>
-      <p>
-        If you want to see the list of availible badges, try going to
-        the <a href="/">badge listing</a>
-      <p>
-    </div>
-  </div>
+  <h1>Not Found</h1>
+  <p>Sorry, we couldn't find the page you were looking for.<p>
+  <p>
+    If you are looking to claim a badge, <a href="/claim">head over
+    to the claim page</a>
+  <p>
+  <p>
+    If you want to see the list of availible badges, try going to
+    the <a href="/">badge listing</a>
+  <p>
 {% endblock %}
diff --git a/views/public/500.html b/views/public/500.html
index 389d3ba..cf3c5bc 100644
--- a/views/public/500.html
+++ b/views/public/500.html
@@ -1,23 +1,9 @@
 {% extends "public/layout.html" %}
-{% block head %}
-  <link rel="stylesheet" href="/stylesheets/criteria.css">
-{% endblock %}
+{% block title %}Oh no! Something went wrong{% endblock %}
 {% block body %}
-  <div class="row">
-    <div class="span7">
-      <h2>Mozilla Webmaker Badges</h2>
-    </div>
-  </div>
-  <div class="media card">
-    <!-- <img class="img badge" src=""> -->
-    <div class="bd">
-      <hgroup>
-        <h1>Oh no! Something went wrong</h1>
-      </hgroup>
-      <p>
-        There was a problem trying to do whatever you just tried to
-        do. Please try again later.
-      <p>
-    </div>
-  </div>
+  <h1>Oh no! Something went wrong</h1>
+  <p>
+    There was a problem trying to do whatever you just tried to
+    do. Please try again later.
+  <p>
 {% endblock %}
diff --git a/views/public/all.html b/views/public/all.html
index 1613b3d..f4b2ec6 100644
--- a/views/public/all.html
+++ b/views/public/all.html
@@ -1,30 +1,15 @@
 {% extends "public/layout.html" %}
-{% block head %}
-  <link rel="stylesheet" href="/stylesheets/criteria.css">
-{% endblock %}
+{% block title %}All Badges{% endblock %}
 {% block body %}
+  <h1>All Badges</h1>
+  {% for badge in badges %}
   <div class="row">
-    <div class="span7">
-      <h2>Mozilla Webmaker Badges</h2>
-    </div>
-    <div class="span10">
-      <strong>Webmaker Badges are here!</strong>
-      <p>
-        Badges are digital records of skills, achievements and participation. Now you can earn Webmaker Badges to recognize the skills that you learn while making awesome webmaking projects, as well as for participating in the Webmaker community and events.
-      </p>
-      <p>
-        Head over to <a href="https://thimble.webmaker.org">Thimble</a>, pick a project and sign in to start earning!
-      </p>
+    <div class="span3">
+      <img src="{{ badge.relativeUrl('image')}}">
     </div>
-  </div>
-  {% for badge in badges %}
-  <div class="media card">
-    <img class="img badge" src="{{ badge.relativeUrl('image')}}">
-    <div class="bd">
-      <hgroup>
-        <h1>{{ badge.name }}</h1>
-      </hgroup>
-      <dl class="dl-horizontal narrow-dt">
+    <div class="span9">
+      <h4 class="media-heading">{{ badge.name }}</h4>
+      <dl>
         <dt>Description:</dt>
         <dd>
           {% if badge.criteria.content %}
@@ -36,5 +21,6 @@ <h1>{{ badge.name }}</h1>
       </dl>
     </div>
   </div>
+  <br>
   {% endfor %}
 {% endblock %}
diff --git a/views/public/claim.html b/views/public/claim.html
index ca73393..97ffedd 100644
--- a/views/public/claim.html
+++ b/views/public/claim.html
@@ -1,30 +1,17 @@
 {% extends "public/layout.html" %}
-{% block head %}
-  <link rel="stylesheet" href="/stylesheets/criteria.css">
-{% endblock %}
+{% block title %}Claim A Badge{% endblock %}
 {% block body %}
-  <div class="row">
-    <div class="span7">
-      <h2>Mozilla Webmaker Badges</h2>
-    </div>
-  </div>
-  <div class="media card">
-    <div class="bd">
-      <hgroup>
-        <h3>What's your claim code?</h3>
-      </hgroup>
-      <p class="notice">Spaces, dashes and lettercase don't matter, just type in the words</p>
-
-      <form method="post" class="claim-form" action="">
-        {% if missing %}
-          <p><strong class="error">Sorry, could not find a badge with that code.</strong></p>
-        {% endif %}
+  <h1>What's your claim code?</h1>
+  <p class="notice">Spaces, dashes and lettercase don't matter, just type in the words.</p>
 
-        <input id="name" type="hidden" name="csrf" value="{{ csrf }}">
-        <input tabindex="1" type="text" name="code" placeholder="Enter your claim code" class="input" value="{{ code | default('') | e }}">
-        <input tabindex="2" type="submit" value="Get your badge!" class="button">
-      </form>
+  <form method="post" class="claim-form" action="">
+    {% if missing %}
+      <p><strong class="error">Sorry, could not find a badge with that code.</strong></p>
+    {% endif %}
 
-    </div>
-  </div>
+    <input id="name" type="hidden" name="csrf" value="{{ csrf }}">
+    <input tabindex="1" type="text" name="code" placeholder="Enter your claim code" class="input" value="{{ code | default('') | e }}">
+    <br>
+    <input tabindex="2" type="submit" value="Get your badge!" class="btn btn-primary">
+  </form>
 {% endblock %}
diff --git a/views/public/confirm-claim.html b/views/public/confirm-claim.html
index e9aff80..13a0ef0 100644
--- a/views/public/confirm-claim.html
+++ b/views/public/confirm-claim.html
@@ -1,41 +1,30 @@
 {% extends "public/layout.html" %}
-{% block head %}
-  <link rel="stylesheet" href="/stylesheets/criteria.css">
-{% endblock %}
+{% block title %}{{ badge.name }}{% endblock %}
 {% block body %}
-  <div class="row">
-    <div class="span7">
-      <h2>Mozilla Webmaker Badges</h2>
-    </div>
-  </div>
-  <div class="media card">
-    <img class="img badge" src="{{ badge.relativeUrl('image')}}">
-    <div class="bd">
-      <hgroup>
-        <h1>{{ badge.name }}</h1>
-      </hgroup>
-      <dl class="dl-horizontal narrow-dt">
-        <dt>Description:</dt>
-        <dd>
-          {% if badge.criteria.content %}
-            {{ badge.criteria.content | markdown }}
-          {% else %}
-            {{ badge.description | stupidSafe }}
-          {% endif %}
-        </dd>
-      </dl>
-      <hr>
-      
-      <form method="post" action="/claim/confirm" class="confirm-form js-confirm-form">
-        <input type="hidden" name="csrf" value="{{ csrf }}">
-        <input type="hidden" name="code" value="{{ code }}">
-        <input tabindex="1" type="email" name="email" placeholder="you@example.org" class="input js-email-input" required>
-        <input tabindex="2" type="submit" value="Claim your badge" class="button js-submit-button">
-      </form>
-    </div>
-  </div>
+  <h1>{{ badge.name }}</h1>
 
-  <script src="https://beta.openbadges.org/issuer.js"></script>
-  <script src="/js/claim-award.js"></script>
-{% endblock %}
+  <dl>
+    <dt>Description:</dt>
+    <dd>
+      {% if badge.criteria.content %}
+        {{ badge.criteria.content | markdown }}
+      {% else %}
+        {{ badge.description | stupidSafe }}
+      {% endif %}
+    </dd>
+  </dl>
+
+  <hr>
 
+  <form method="post" action="/claim/confirm" class="confirm-form js-confirm-form">
+    <input type="hidden" name="csrf" value="{{ csrf }}">
+    <input type="hidden" name="code" value="{{ code }}">
+    <input tabindex="1" type="email" name="email" placeholder="you@example.org" class="input js-email-input" required>
+    <br>
+    <input tabindex="2" type="submit" value="Claim your badge" class="btn btn-primary js-submit-button">
+  </form>
+{% endblock %}
+{% block scripts %}
+<script src="https://beta.openbadges.org/issuer.js"></script>
+<script src="/js/claim-award.js"></script>
+{% endblock %}
diff --git a/views/public/criteria.html b/views/public/criteria.html
index ce8225a..25c7efc 100644
--- a/views/public/criteria.html
+++ b/views/public/criteria.html
@@ -1,29 +1,15 @@
 {% extends "public/layout.html" %}
-{% block head %}
-  <link rel="stylesheet" href="/stylesheets/criteria.css">
-{% endblock %}
+{% block title %}{{ badge.name }}{% endblock %}
 {% block body %}
-  <div class="row">
-    <div class="span7">
-      <h2>Mozilla Webmaker Badges</h2>
-    </div>
-  </div>
-  <div class="media card">
-    <img class="img badge" src="{{ badge.relativeUrl('image')}}">
-    <div class="bd">
-      <hgroup>
-        <h1>{{ badge.name }}</h1>
-      </hgroup>
-      <dl class="dl-horizontal narrow-dt">
-        <dt>Description:</dt>
-        <dd>
-          {% if badge.criteria.content %}
-            {{ badge.criteria.content | markdown }}
-          {% else %}
-            {{ badge.description | stupidSafe }}
-          {% endif %}
-        </dd>
-      </dl>
-    </div>
-  </div>
+  <h1>{{ badge.name }}</h1>
+  <dl>
+    <dt>Description:</dt>
+    <dd>
+      {% if badge.criteria.content %}
+        {{ badge.criteria.content | markdown }}
+      {% else %}
+        {{ badge.description | stupidSafe }}
+      {% endif %}
+    </dd>
+  </dl>
 {% endblock %}
diff --git a/views/public/layout.html b/views/public/layout.html
index a9fbd89..f460dbe 100644
--- a/views/public/layout.html
+++ b/views/public/layout.html
@@ -2,83 +2,18 @@
 <html lang="en-US" dir="ltr">
 <head>
   <meta charset="utf-8">
-  <title>Mozilla Webmaker Badges</title>
-  <link rel="stylesheet" href="/stylesheets/opensans/stylesheet.css">
-  <link rel="stylesheet" href="/stylesheets/webmaker.css">
-  <link href="//www.mozilla.org/tabzilla/media/css/tabzilla.css" rel="stylesheet">
+  <link rel="stylesheet" href="/stylesheets/bootstrap.min.css">
+  <title>{% block title %}{% endblock %}</title>
   <!--[if lt IE 9]>
   <script src="/js/html5shiv.js"></script>
   <![endif]-->
-   <script src="/js/jquery.min.js"></script>
   {% block head %}{% endblock %} 
 </head>
 <body>
-  <div class="wrapper bg-stone">
-    <header>
-      <div class="container">
-        <div class="logo">
-          <a href="#">
-            <img src="/img/header_logo.png" alt="Mozilla Webmaker Logo">
-          </a>
-        </div>
-        <a href="http://www.mozilla.org/" id="tabzilla">Mozilla</a>
-        <nav role="navigation">
-          <ul>
-            <li class="active">
-              <a href="#">Badges</a>
-            </li>
-          </ul>
-        </nav>
-      </div>
-    </header>
-    <section>
-      <div class="container">
-      {% block body %}{% endblock %}
-      </div>
-    </section>
-    <footer>
-      <div class="container">
-        <div class="row">
-          <div class="span2">
-            <h2><img src="/img/footer-logo.png" alt="Webmaker Logo"></h2>
-          </div>
-          <nav class="span2">
-            <h3>About</h3>
-            <ul>
-                <li><a href="https://www.webmaker.org/en-US/about/">About Us</a></li>
-                <li><a href="mailto:mozparty@mozilla.org">Contact Us</a></li>
-                <li><a href="http://www.mozilla.org/en-US/privacy-policy.html">Privacy Policy</a></li>
-                <li><a href="http://www.mozilla.org/en-US/about/legal.html">Legal Notices</a></li>
-            </ul>
-          </nav>
-          <nav class="span2">
-            <h3>Connect with us</h3>
-            <ul>
-                <li><a href="http://twitter.com/mozilla/">Twitter</a></li>
-                <li><a href="https://www.facebook.com/mozilla/">Facebook</a></li>
-            </ul>
-          </nav>
-          <nav class="span2">
-            <h3>Make something</h3>
-            <ul>
-                <li><a href="https://www.webmaker.org/en-US/projects/">Projects</a></li>
-                <li><a href="https://www.webmaker.org/en-US/tools/">Tools</a></li>
-                <li><a href="https://www.webmaker.org/en-US/events/">Events</a></li>
-            </ul>
-          </nav>
-          <nav class="span2">
-            <h3>Support our work</h3>
-            <ul>
-                <li><a href="https://donate.mozilla.org/page/contribute/join-mozilla?source=join_link">Donate</a></li>
-                <li><a href="https://mozillalabs.com/en-US/">Contribute</a></li>
-                <li><a href="https://donate.mozilla.org/page/contribute/firefoxtshirt">Buy a t-shirt</a></li>
-            </ul>
-          </nav>
-        </div>
-      </div>
-    </footer>
+  <div class="container">
+  {% block body %}{% endblock %}
   </div>
-  <script src="//www.mozilla.org/tabzilla/media/js/tabzilla.js"></script> 
+  <script src="/js/jquery.min.js"></script>
   {% block scripts %}{% endblock %} 
 </body>
 </html>