diff --git a/theme/clean/css/display.css b/theme/clean/css/display.css
deleted file mode 100644
index ea2d62020e..0000000000
--- a/theme/clean/css/display.css
+++ /dev/null
@@ -1,256 +0,0 @@
-/** theme: clean
- *
- * @package   StatusNet
- * @author    Samantha Doherty <sammy@status.net>
- * @copyright 2010 StatusNet, Inc.
- * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
- * @link      http://status.net/
- */
-
-
-@media screen, projection, tv {
-
-body {
-    background: url(../images/page_bg.png) no-repeat fixed 50% 100%;
-    background-color: #6e6e8c;
-    font-family: "Liberation Sans", "Nimbus Sans L", "FreeSans", "Helvetica Neue", Helvetica, Arial, sans-serif; 
-    font-size: 86%;
-}
-
-#wrap {
-    width: 867px;
-    margin: 0px auto;
-    padding: 0px 8px 10px 8px;
-    background-color: #fff;
-    box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.7);
-    -moz-box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.7);
-    -webkit-box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.7);
-}
-
-#header {
-    width: 851px;
-    padding: 0px;
-    padding-top: 70px;
-    margin-left: 8px;
-}
-
-address {
-    float: left;
-    margin-right: 20px;
-    margin-top: 0px;
-}
-
-.poweredby {
-    background: url(../images/sn-tiny.png) no-repeat top left;
-    height: 40px;
-    font-size: 0.8em;
-    color: #fff;
-    line-height: 42px;
-    padding-left: 50px;
-    position: absolute;
-    top: 6px;
-    left: 0;
-    z-index: 99;
-    font-style: normal;
-}
-
-.poweredby a {
-    color: #fff !important;
-    font-weight: bold;
-}
-
-#site_nav_global_primary {
-    display: block;
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 98;
-    background-color: #829d25;
-    width: 883px;
-    margin-left: -16px; 
-    margin-top: 0px;
-    height: 30px;
-    line-height: 30px;
-    text-align: right;
-    border-top: 10px solid #fff;
-    border-bottom: 1px solid #fff;
-}
-
-#site_nav_global_primary li:last-child {
-    margin-right: 16px;
-}
-
-#site_nav_global_primary a {
-    color: #fff !important;
-    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
-}
-
-#site_notice {
-    float: right;
-    width: 270px;
-    padding: 10px; 
-    margin-left: 40px;
-}
-
-#anon_notice {
-    clear: both;
-    background: none;
-    padding: 0px;
-    margin-bottom: 0px;
-}
-
-.form_notice {
-    float: right;
-    width: 494px;
-    margin-top: 0px;
-}
-
-.form_notice fieldset {
-    width: 100%;
-}
-
-.form_notice textarea {
-    width: 362px;
-    height: 54px;
-}
-
-.form_notice label.notice_data-attach,
-.form_notice input.notice_data-attach {
-    top: 27px;
-}
-
-.form_notice .notice_data-geo_wrap label,
-.form_notice .notice_data-geo_wrap input {
-    top: 52px;
-}
-
-.form_notice .submit {
-    font-size: 0.9em;
-    top: 80px;
-    right:0;
-    height: 2.4em;
-    width: 96px;
-	right: 10px;
-}
-
-.form_notice .error,
-.form_notice .success {
-    width: 375px;
-}
-
-.form_notice .error {
-    width: 375px;
-    margin-left: 0px;
-}
-
-#core {
-    clear: both;
-    margin: 0px;
-    width: 851px;
-    margin-left: 8px;
-    margin-top: 14px;
-}
-
-#content {
-    padding-top: 10px;
-    width: 545px;
-    margin-right: 0px;
-}
-
-#site_nav_local_views {
-    background-color: #6e6e8c;
-    height: 2em;
-    line-height: 2em;
-    margin-bottom: 0px;
-    padding-left: 4px;
-}
-
-#site_nav_local_views a {
-    color: #fff !important;
-    padding: 2px 6px 2px 6px;
-}
-
-#site_nav_local_views .current a {
-    background: #fff !important;
-    color: #000 !important;
-    text-decoration: none;
-}
-
-#aside_primary {
-    width: 280px;
-    padding-left: 10px;
-}
-
-#aside_primary .section {
-    width: 270px;
-    margin-left: 0px;
-    margin-right: 10px;
-}
-
-.section ul.entities {
-    width: 290px;
-}
-
-.section .entities li {
-        margin-right: 17px;
-        margin-bottom: 10px;
-        width: 24px;
-}
-
-.notice {
-    line-height: 1.35em;
-}
-
-#content .notice .author .photo {
-    left: 0px;
-}
-
-#content .notice .entry-title {
-    min-height: 26px;
-}
-
-#shownotice .notice .entry-title {
-    min-height:123px;
-}
-
-.notice div.entry-content {
-    font-size: 0.9em;
-    line-height: 1.2em;
-    margin-top: 10px;
-    opacity: 0.6;
-}
-
-.notice:hover div.entry-content {
-    opacity: 1;
-}
-
-.user_in .notice div.entry-content {
-    max-width: 360px;
-}
-
-div.entry-content a.response:before {
-	content: "(";
-}
-
-div.entry-content a.response:after {
-	content: ")";
-}
-
-.notice-options {
-    margin-top: 8px;
-}
-
-.pagination {
-    height: 1.2em;
-}
-
-#jOverlayContent button {
-    top: 20px;
-    right: 36px;
-}
-
-.entity_profile {
-    width: 365px;
-}
-
-}/*end of @media screen, projection, tv*/
diff --git a/theme/clean/css/ie.css b/theme/clean/css/ie.css
deleted file mode 100644
index 272a5bbcae..0000000000
--- a/theme/clean/css/ie.css
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Temporary copy of base styles for overriding */
-
-input.checkbox,
-input.radio {
-top:0;
-}
-.form_notice textarea {
-    width: 362px;
-}
-.form_notice .count + label {
-position:absolute;
-top:25px;
-left:83%;
-text-indent:-9999px;
-height:16px;
-width:16px;
-display:block;
-    left: 390px;
-    top: 27px;
-}
-.form_notice .submit {
-    width: 96px;
-    max-width: 96px;
-}
-.form_notice .attach-status,
-.form_notice #notice_data-geo_selected {
-width:78.75%;
-}
-.form_notice .attach-status button,
-.form_notice #notice_data-geo_selected button {
-padding:0 4px;
-}
-.notice-options input.submit {
-font-size:0;
-text-align:right;
-text-indent:0;
-}
-.notice div.entry-content .timestamp a {
-margin-right:4px;
-}
-.entity_profile {
-width:64%;
-}
-.notice {
-z-index:1;
-}
-.notice:hover {
-z-index:9999;
-}
-.notice .thumbnail img {
-z-index:9999;
-}
-
-.form_settings fieldset fieldset legend {
-line-height:auto;
-}
-
-/* IE specific styles */
-
-.notice-options input.submit {
-    color:#FFFFFF;
-}
-
-.form_notice input.notice_data-attach {
-    filter: alpha(opacity=0);
-}
-
-.form_notice .count + label {
-    background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -328px;
-}
-
-.form_notice .notice_data-geo_wrap label {
-   background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -1780px;
-}
-.form_notice .notice_data-geo_wrap label.checked {
-   background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -1846px;
-}
diff --git a/theme/clean/css/mp-screen.css b/theme/clean/css/mp-screen.css
deleted file mode 100644
index 8d9489b0b1..0000000000
--- a/theme/clean/css/mp-screen.css
+++ /dev/null
@@ -1,191 +0,0 @@
-/* mobile style */
-
-body {
-    background-image: none;
-    min-width: 0;
-}
-
-#wrap {
-    margin: 0;
-    padding: 0;
-    min-width:0;
-    max-width:100%;
-}
-
-#header {
-    width: 96%;
-    padding: 0 2%;
-    padding-top: 20px;
-}
-
-.user_in #header {
-    padding-top: 40px;
-}
-
-address {
-margin:1em 0 0 0;
-float:left;
-width:100%;
-}
-
-address img + .fn {
-display:block;
-margin-top:1em;
-    margin-right: 10px;
-clear: left;
-float:left;
-}
-
-#site_nav_global_primary {
-    margin:0;
-    width: 98%;
-    padding: 4px 0;
-    margin-left: -2%;
-    height: auto;
-    position:absolute;
-    top:0;
-    left:0;
-    font-size: 1em;
-	letter-spacing: 0em;
-}
-
-#site_nav_global_primary li {
-    margin-left:0;
-    margin-right:10px;
-    float:left;
-    font-size:0.9em;
-    padding: 2px 4px;
-    line-height: 1em;
-}
-
-.form_notice {
-    float: left;
-    margin-left: -10px;
-    width: 300px;
-    padding: 4px;
-}
-
-#form_notice-direct.form_notice {
-    padding-top: 10px;
-}
-
-.form_notice textarea {
-    width: 210px;
-    height: 50px;
-    padding: 4px;
-}
-
-.form_notice .count {
-position:absolute;
-bottom:2px;
-    left: 175px;
-    font-size: 0.8em;
-z-index:9;
-}
-
-#form_notice-direct.form_notice .count {
-    left: 0px;
-}
-
-/*input type=file no good in
-iPhone/iPod Touch, Android, Opera Mini Simulator
-*/
-.form_notice .count + label,
-.form_notice label[for="notice_data-attach"] {
-display:none;
-}
-.form_notice input.notice_data-attach {
-position:static;
-clear:both;
-width:65%;
-height:auto;
-display:block;
-z-index:9;
-padding:0;
-margin:0;
-background:none;
-opacity:1;
-}
-
-.form_notice .submit {
-    text-align: center;
-    left: 230px;
-    top: 32px;
-    width: 70px;
-    font-size: 0.8em;
-}
-
-#form_notice-direct.form_notice .submit {
-    top: 62px;
-}
-
-#site_nav_local_views {
-    height: auto;
-    font-size: 0.9em;
-    line-height: 2em;
-    margin-bottom: 0px;
-    padding-left: 4px;
-}
-
-#site_nav_local_views li {
-    margin-right: 6px;
-}
-
-
-#core {
-    width: 100%;
-    margin: 0;
-}
-
-#content {
-    width: 96%;
-    padding: 10px 2%;
-    margin: 0;
-    min-height: auto;
-}
-
-#footer {
-    margin: 0;
-    padding: 10px 4px 4px 4px;
-}
-
-
-.form_settings fieldset {
-margin-bottom:7px;
-}
-
-.form_settings label {
-width:auto;
-display:block;
-float:none;
-    text-align: left;
-}
-
-.form_settings .form_data li {
-margin-bottom:7px;
-}
-
-.form_settings .form_data textarea,
-.form_settings .form_data select, 
-.form_settings .form_data input {
-margin-left:0;
-display:block;
-}
-.form_settings .form_data textarea {
-width:96.41%;
-}
-
-.form_settings .form_data label {
-float:none;
-}
-
-.form_settings .form_data p.form_guide {
-width:auto;
-margin-left:0;
-}
-
-
-#settings_design_color .form_data {
- width: auto;
- margin-right: 0;
-}
diff --git a/theme/clean/default-avatar-mini.png b/theme/clean/default-avatar-mini.png
deleted file mode 100644
index 7c9fc0348b..0000000000
Binary files a/theme/clean/default-avatar-mini.png and /dev/null differ
diff --git a/theme/clean/default-avatar-profile.png b/theme/clean/default-avatar-profile.png
deleted file mode 100644
index e8f87006a0..0000000000
Binary files a/theme/clean/default-avatar-profile.png and /dev/null differ
diff --git a/theme/clean/default-avatar-stream.png b/theme/clean/default-avatar-stream.png
deleted file mode 100644
index c8148e42ef..0000000000
Binary files a/theme/clean/default-avatar-stream.png and /dev/null differ
diff --git a/theme/clean/images/page_bg.png b/theme/clean/images/page_bg.png
deleted file mode 100644
index a9f446812f..0000000000
Binary files a/theme/clean/images/page_bg.png and /dev/null differ
diff --git a/theme/clean/images/sn-tiny.png b/theme/clean/images/sn-tiny.png
deleted file mode 100644
index e1db3a1605..0000000000
Binary files a/theme/clean/images/sn-tiny.png and /dev/null differ
diff --git a/theme/clean/logo.png b/theme/clean/logo.png
deleted file mode 100644
index b078601019..0000000000
Binary files a/theme/clean/logo.png and /dev/null differ
diff --git a/theme/clean/mobilelogo.png b/theme/clean/mobilelogo.png
deleted file mode 100644
index 66bb5f6787..0000000000
Binary files a/theme/clean/mobilelogo.png and /dev/null differ
diff --git a/theme/clean/theme.ini b/theme/clean/theme.ini
deleted file mode 100644
index 0209008d40..0000000000
--- a/theme/clean/theme.ini
+++ /dev/null
@@ -1 +0,0 @@
-include=rebase