Merge branch '0.9-release'

* 0.9-release: (874 commits)
  Removed call to NewDirectMessage() until IE return is fixed i.e.,
  Don't show flag user button your own profile
  Fixed HXR response for flag user
  Using the right form class name
  Using common_redirect
  Left a form_data class of a <ul> in the user admin panel
  Added validation to fields in user admin panel
  Added a user admin panel
  Added mobile logos for default and identica themes
  Changed gif to png
  Changed this to action. THANKS zach!
  Doing content negotiation only once
  Add execute bit to pingqueuehandler
  Localisation updates for !StatusNet from !translatewiki.net
  Use the browser's geolocation API to set the location on the notice form
  Add geometa library, and include it.
  Add location form elements to the noticeform, and save their values on submission
  Use the $user object nickname, as login name doesnt have to == nickname anymore with plugins such as ldap/etc
  Revert "Re added NICKNAME_FMT constant to router.php."
  Moved most path and server settings to a new paths admin panel
  ...

Conflicts:
	js/util.js
	locale/it_IT/LC_MESSAGES/statusnet.mo
	locale/mk_MK/LC_MESSAGES/statusnet.mo
	locale/mk_MK/LC_MESSAGES/statusnet.po
	locale/pt_BR/LC_MESSAGES/statusnet.mo
	locale/vi_VN/LC_MESSAGES/statusnet.mo
	plugins/InfiniteScroll/infinitescroll.js
	plugins/Realtime/realtimeupdate.js

25 files changed, 479 insertions, 1785 deletions

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 7706fba48..e584fae43 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -93,17 +93,34 @@ border-radius:4px;
 -webkit-border-radius:4px;
 margin-bottom:18px;
 }
+
+.xoxo li {
+list-style-type:none;
+}
+
 form label.submit {
 display:none;
 }
-
 .form_settings {
 clear:both;
 }
-
 .form_settings fieldset {
 margin-bottom:29px;
 }
+.form_settings fieldset fieldset {
+margin-bottom:41px;
+padding:3% 1.795% 1.795% 3%;
+border-radius:11px;
+-moz-border-radius:11px;
+-webkit-border-radius:11px;
+border-width:1px;
+border-style:solid;
+}
+.form_settings fieldset fieldset legend {
+line-height:0;
+}
+
+
 .form_settings input.remove {
 margin-left:11px;
 }
@@ -117,16 +134,28 @@ float:left;
 .form_settings .form_data textarea,
 .form_settings .form_data select,
 .form_settings .form_data input {
-margin-left:11px;
+margin-left:1.795%;
 float:left;
 }
+.form_settings .form_data input {
+width:39%;
+}
+.form_settings .form_data input.submit,
+.form_settings .form_data input.checkbox,
+.form_settings .form_data input.radio {
+width:auto;
+}
+.form_settings .form_data textarea {
+width:63%;
+}
+
 .form_settings .form_data input.submit {
 margin-left:0;
 }
 
 .form_settings label {
 margin-top:2px;
-width:152px;
+width:24%;
 }
 
 .form_actions label {
@@ -163,7 +192,7 @@ display:none;
 
 .form_settings .form_data p.form_guide {
 clear:both;
-margin-left:163px;
+margin-left:26%;
 margin-bottom:0;
 }
 
@@ -221,6 +250,10 @@ margin-left:29px;
 #form_search .submit {
 margin-left:11px;
 }
+#form_search .form_data input {
+width:auto;
+}
+
 
 address {
 float:left;
@@ -251,7 +284,7 @@ margin-right:18px;
 margin-bottom:11px;
 margin-left:18px;
 }
-#site_nav_global_primary ul li {
+#site_nav_global_primary li {
 display:inline;
 margin-left:11px;
 }
@@ -432,21 +465,21 @@ border-width:1px;
 border-style:solid;
 }
 
-#form_notice {
+.form_notice {
 width:45%;
 float:left;
 position:relative;
 line-height:1;
 }
-#form_notice fieldset {
+.form_notice fieldset {
 border:0;
 padding:0;
 position:relative;
 }
-#form_notice legend {
+.form_notice legend {
 display:none;
 }
-#form_notice textarea {
+.form_notice textarea {
 float:left;
 border-radius:7px;
 -moz-border-radius:7px;
@@ -458,45 +491,44 @@ padding:7px 7px 16px 7px;
 position:relative;
 z-index:2;
 }
-#form_notice label {
+.form_notice label {
 display:block;
 float:left;
 font-size:1.3em;
 margin-bottom:7px;
 }
-#form_notice label[for=notice_data-attach],
-#form_notice #notice_data-attach {
+.form_notice label[for=notice_data-attach],
+.form_notice #notice_data-attach {
 position:absolute;
 top:25px;
+right:10.5%;
 cursor:pointer;
 }
-#form_notice label[for=notice_data-attach] {
+.form_notice label[for=notice_data-attach] {
 text-indent:-9999px;
-left:86%;
 width:16px;
 height:16px;
 }
-#form_notice #notice_data-attach {
-left:40.6%;
+.form_notice #notice_data-attach {
 padding:0;
 height:16px;
 }
-#form_notice .form_note {
+.form_notice .form_note {
 position:absolute;
 bottom:2px;
 right:21.715%;
 z-index:9;
 }
-#form_notice .form_note dt {
+.form_notice .form_note dt {
 font-weight:bold;
 display:none;
 }
-#notice_text-count {
+.form_notice #notice_text-count {
 font-weight:bold;
 line-height:1.15;
 padding:1px 2px;
 }
-#form_notice #notice_action-submit {
+.form_notice #notice_action-submit {
 width:14%;
 height:47px;
 padding:0;
@@ -504,24 +536,24 @@ position:absolute;
 bottom:0;
 right:0;
 }
-#form_notice label[for=to] {
+.form_notice label[for=to] {
 margin-top:7px;
 }
-#form_notice select[id=to] {
+.form_notice select[id=to] {
 margin-bottom:7px;
 margin-left:18px;
 float:left;
 max-width:322px;
 }
-#form_notice .error,
-#form_notice .success {
+.form_notice .error,
+.form_notice .success {
 float:left;
 clear:both;
 width:81.5%;
 margin-bottom:0;
 line-height:1.618;
 }
-#form_notice #notice_data-attach_selected code {
+.form_notice #notice_data-attach_selected code {
 float:left;
 width:90%;
 display:block;
@@ -529,15 +561,25 @@ font-size:1.1em;
 line-height:1.8;
 overflow:auto;
 }
-#form_notice #notice_data-attach_selected button {
+.form_notice #notice_data-attach_selected button {
 float:right;
 font-size:0.8em;
 }
 
+button.close {
+width:16px;
+height:16px;
+text-indent:-9999px;
+padding:0;
+border:0;
+text-align:center;
+font-weight:bold;
+}
+
 /* entity_profile */
 .entity_profile {
 position:relative;
-width:74.702%;
+width:73%;
 min-height:123px;
 float:left;
 margin-bottom:18px;
@@ -583,14 +625,18 @@ margin-left:0;
 font-size:1.1em;
 font-weight:bold;
 }
-.entity_profile .entity_fn dd:before {
+.entity_profile .fn:before {
 content: "(";
 font-weight:normal;
 }
-.entity_profile .entity_fn dd:after {
+.entity_profile .fn:after {
 content: ")";
 font-weight:normal;
 }
+.entity_profile .nickname:after,
+.entity_profile .nickname:before {
+content:"";
+}
 .entity_profile dt,
 .entity_profile h2 {
 display:none;
@@ -604,8 +650,9 @@ font-style:italic;
 /*entity_actions*/
 .entity_actions {
 float:right;
-margin-left:2.35%;
-max-width:25%;
+margin-left:2%;
+margin-bottom:18px;
+min-width:21%;
 }
 .entity_actions h2 {
 display:none;
@@ -614,7 +661,7 @@ display:none;
 list-style-type:none;
 }
 .entity_actions li {
-margin-bottom:4px;
+margin-bottom:7px;
 }
 .entity_actions li:first-child {
 border-top:0;
@@ -633,30 +680,28 @@ text-align:left;
 width:100%;
 }
 .entity_actions a,
-.entity_nudge p,
 .entity_remote_subscribe {
 text-decoration:none;
 font-weight:bold;
 display:block;
 }
+.entity_actions a,
+.entity_actions input {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+}
 
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.form_group_block input.submit,
-.form_group_unblock input.submit,
-.entity_send-a-message a,
-.entity_edit a,
-.form_user_nudge input.submit,
-.entity_nudge p,
-.form_make_admin input.submit {
+.entity_actions a,
+.entity_actions input,
+.entity_actions p {
 border:0;
-padding-left:20px;
+padding-left:23px;
 }
 
-.entity_edit a,
-.entity_send-a-message a,
-.entity_nudge p {
-padding:4px 4px 4px 23px;
+.entity_actions a,
+.entity_actions p {
+padding:1px 4px 1px 26px;
 }
 
 .entity_remote_subscribe {
@@ -671,6 +716,40 @@ border-radius:4px;
 margin-bottom:18px;
 }
 
+
+.entity_send-a-message button {
+position:absolute;
+top:3px;
+right:3px;
+}
+
+.entity_send-a-message .form_notice {
+position:absolute;
+top:34px;
+right:-1px;
+padding:1.795%;
+width:65%;
+z-index:2;
+ border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
+border-width:1px;
+border-style:solid;
+}
+.entity_send-a-message .form_notice legend {
+display:block;
+margin-bottom:11px;
+}
+
+.entity_send-a-message .form_notice label,
+.entity_send-a-message .form_notice select {
+display:none;
+}
+.entity_send-a-message .form_notice input.submit {
+text-align:center;
+}
+
+
 .entity_tags ul {
 list-style-type:none;
 display:inline;
@@ -739,18 +818,22 @@ display:none;
 .profiles {
 list-style-type:none;
 }
-.profile .entity_profile .entity_location {
+.profile .entity_profile .fn.nickname,
+.profile .entity_profile .url[rel~=contact] {
+margin-left:0;
+display:inline;
+}
+
+.profile .entity_profile .fn,
+.profile .entity_profile .location {
+margin-left:11px;
+margin-bottom:4px;
 width:auto;
 clear:none;
-margin-left:11px;
 }
-.profile .entity_profile dl,
-.profile .entity_profile dd {
-display:inline;
-float:none;
-}
-.profile .entity_profile .entity_note,
-.profile .entity_profile .entity_url,
+
+.profile .entity_profile .note,
+.profile .entity_profile .url,
 .profile .entity_profile .entity_tags,
 .profile .entity_profile .form_subscription_edit {
 margin-left:59px;
@@ -789,6 +872,10 @@ margin-left:2%;
 width:98%;
 float:left;
 }
+.mark-top {
+border-top-width:1px;
+border-top-style:solid;
+}
 
 /* NOTICES */
 #notices_primary {
@@ -865,11 +952,12 @@ clear:left;
 float:left;
 font-size:0.95em;
 margin-left:59px;
-width:50%;
+max-width:74%;
 }
 #showstream .notice div.entry-content,
 #shownotice .notice div.entry-content {
 margin-left:0;
+max-width:82%;
 }
 
 .notice .notice-options a,
@@ -887,7 +975,6 @@ position:relative;
 font-size:0.95em;
 width:90px;
 float:right;
-margin-right:11px;
 }
 
 .notice-options a {
@@ -897,18 +984,12 @@ float:left;
 .notice-options .notice_reply,
 .notice-options .form_favor,
 .notice-options .form_disfavor {
-position:absolute;
-top:0;
+float:left;
+margin-left:18px;
 }
 .notice-options .form_favor,
 .notice-options .form_disfavor {
-left:0;
-}
-.notice-options .notice_reply {
-left:29px;
-}
-.notice-options .notice_delete {
-right:0;
+margin-left:0;
 }
 .notice-options input,
 .notice-options a {
@@ -922,11 +1003,14 @@ border:0;
 .notice-options .notice_reply,
 .notice-options .notice_delete {
 text-decoration:none;
-padding-left:16px;
 }
 .notice-options form input.submit {
 width:16px;
-padding:2px 0;
+height:16px;
+padding:0;
+border-radius:0;
+-moz-border-radius:0;
+-webkit-border-radius:0;
 }
 .notice-options .form_favor legend,
 .notice-options .form_disfavor legend {
@@ -937,6 +1021,10 @@ display:none;
 border:0;
 padding:0;
 }
+.notice-options a {
+width:16px;
+height:16px;
+}
 
 .notice .attachment {
 position:relative;
@@ -992,11 +1080,6 @@ margin-bottom:11px;
 position:absolute;
 top:0;
 right:0;
-width:29px;
-height:29px;
-text-align:center;
-font-weight:bold;
-padding:0;
 }
 #jOverlayContent h1 {
 max-width:425px;
@@ -1257,18 +1340,18 @@ clear:both;
 margin-bottom:0;
 }
 
-#form_settings_design #settings_design_background-image img {
+#settings_design_background-image img {
 max-width:480px;
 max-height:480px;
 }
 
-#form_settings_design #settings_design_color .form_data,
-#form_settings_design #color-picker {
+#settings_design_color .form_data,
+#color-picker {
 float:left;
 }
-#form_settings_design #settings_design_color .form_data {
+#settings_design_color .form_data {
 width:400px;
-margin-right:28px;
+margin-right:1%;
 }
 
 #settings_design_color .form_data li {
@@ -1281,6 +1364,7 @@ display:block;
 #settings_design_color .form_data .swatch {
 padding:11px;
 margin-left:0;
+width:auto;
 }
 
 .instructions ul {
@@ -1296,3 +1380,13 @@ display:none;
 .guide {
 clear:both;
 }
+
+#bookmarklet address {
+display:none;
+}
+#bookmarklet .form_notice {
+width:auto;
+}
+#bookmarklet #wrap {
+min-width:0;
+}
diff --git a/theme/base/css/facebookapp.css b/theme/base/css/facebookapp.css
deleted file mode 100644
index e6b1c9ee5..000000000
--- a/theme/base/css/facebookapp.css
+++ /dev/null
@@ -1,97 +0,0 @@
-* {
-font-size:14px;
-font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif;
-}
-
-#wrap {
-background-color:#F0F2F5;
-padding-left:18px;
-padding-right:18px;
-width:auto;
-}
-
-p,label,
-h1,h2,h3,h4,h5,h6 {
-color:#000;
-}
-
-#content {
-width:95%;
-}
-
-#site_nav_local_views a {
-background-color:#D0DFE7;
-}
-#site_nav_local_views a:hover {
-background-color:#FAFBFC;
-}
-
-span.facebook-button {
-border: 2px solid #aaa;
-padding: 3px;
-display: block;
-float: left;
-margin-right: 20px;
--moz-border-radius: 4px; 
-border-radius:4px; 
--webkit-border-radius:4px;
-font-weight: bold;
-background-color:#A9BF4F;
-color:#fff;
-font-size:1.2em
-}
-
-span.facebook-button a { color:#fff }
-
-.facebook_guide {
-margin-bottom:18px;
-}
-.facebook_guide p {
-font-weight:bold;
-}
-
-
-input {
-height:auto !important;
-}
-
-#facebook-friends {
-float:left;
-width:100%;
-}
-
-#facebook-friends li {
-float:left;
-margin-right:2%;
-margin-bottom:11px;
-width:18%;
-height:115px;
-}
-#facebook-friends li a {
-float:left;
-}
-
-#add_to_profile {
-position:absolute;
-right:18px;
-top:10px;
-z-index:2;
-}
-
-.notice div.entry-content dl,
-.notice div.entry-content dt, 
-.notice div.entry-content dd {
-margin-right:5px;
-}
-
-#content_inner p {
-margin-bottom:18px;
-}
-
-#content_inner ul {
-list-style-type:none;
-}
-
-.form_settings label {
-margin-right:18px;
-}
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index 3e128b84e..4e50aadbe 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -3,10 +3,10 @@ input.checkbox,
 input.radio {
 top:0;
 }
-#form_notice textarea {
+.form_notice textarea {
 width:78%;
 }
-#form_notice .form_note + label {
+.form_notice .form_note + label {
 position:absolute;
 top:25px;
 left:83%;
@@ -15,23 +15,20 @@ height:16px;
 width:16px;
 display:block;
 }
-#form_notice #notice_action-submit {
+.form_notice #notice_action-submit {
 width:17%;
 max-width:17%;
 }
-#form_notice #notice_data-attach_selected {
+.form_notice #notice_data-attach_selected {
 width:78.5%;
 }
-#form_notice #notice_data-attach_selected button {
+.form_notice #notice_data-attach_selected button {
 padding:0 4px;
 }
 .notice-options input.submit {
 font-size:0;
-margin-top:3px;
-height:16px;
 text-align:right;
 text-indent:0;
-width:24px;
 }
 .notice div.entry-content .timestamp a {
 margin-right:4px;
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
new file mode 100644
index 000000000..f19d6a3f6
--- /dev/null
+++ b/theme/base/images/icons/icons-01.gif
diff --git a/theme/base/images/icons/twotone/green/minus.gif b/theme/base/images/icons/twotone/green/minus.gif
new file mode 100644
index 000000000..461cd8cb2
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/minus.gif
diff --git a/theme/base/images/icons/twotone/green/plus.gif b/theme/base/images/icons/twotone/green/plus.gif
new file mode 100644
index 000000000..4407d0b2d
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/plus.gif
diff --git a/theme/base/images/icons/twotone/green/x.gif b/theme/base/images/icons/twotone/green/x.gif
new file mode 100644
index 000000000..ffb2efea0
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/x.gif
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 86369cb99..f4af07081 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -18,7 +18,7 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 font-size:1em;
 }
 address {
-margin-right:7.2%;
+margin-right:5.7%;
 }
 
 input, textarea, select, option {
@@ -28,7 +28,19 @@ input, textarea, select,
 .entity_remote_subscribe {
 border-color:#AAAAAA;
 }
-#filter_tags ul li {
+
+.form_settings fieldset fieldset {
+background:rgba(240, 240, 240, 0.2);
+box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
+}
+
+#filter_tags ul li,
+.entity_send-a-message .form_notice,
+.pagination .nav_prev a,
+.pagination .nav_next a,
+.form_settings fieldset fieldset {
 border-color:#DDDDDD;
 }
 
@@ -37,35 +49,47 @@ background:none;
 }
 
 input.submit,
-#form_notice.warning #notice_text-count,
+.form_notice.warning #notice_text-count,
 .form_settings .form_note,
-.entity_remote_subscribe {
+.entity_remote_subscribe,
+.entity_actions .form_notice input.submit {
 background-color:#9BB43E;
 }
-
-input:focus, textarea:focus, select:focus,
-#form_notice.warning #notice_data-text {
-border-color:#9BB43E;
+input.submit,
+.form_notice.warning #notice_text-count,
+.form_settings .form_note,
+.entity_remote_subscribe,
+.entity_actions a,
+.entity_actions input,
+button {
 box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 }
-input.submit,
+.entity_actions a,
+.entity_actions input,
+.entity_actions p {
+border-color:transparent;
+background-color:transparent;
+}
+input:focus, textarea:focus, select:focus,
+.form_notice.warning #notice_data-text,
+.form_notice.warning #notice_text-count,
+.form_settings .form_note,
 .entity_remote_subscribe {
+border-color:#9BB43E;
+}
+input.submit,
+.entity_remote_subscribe,
+.entity_actions .form_notice input.submit {
 color:#FFFFFF;
 }
 
 a,
-div.notice-options input,
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.form_group_block input.submit,
-.form_group_unblock input.submit,
-.entity_send-a-message a,
-.form_user_nudge input.submit,
-.entity_nudge p,
 .form_settings input.form_action-primary,
-.form_make_admin input.submit {
+.notice-options input,
+.entity_actions a,
+.entity_actions input {
 color:#002FA7;
 }
 
@@ -84,16 +108,48 @@ background-color:#C8D1D5;
 #notice_text-count {
 color:#333333;
 }
-#form_notice.warning #notice_text-count {
+.form_notice.warning #notice_text-count {
 color:#000000;
 }
-#form_notice label[for=notice_data-attach] {
-background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
+.form_notice label[for=notice_data-attach] {
+background-position:0 -328px;
 }
-#form_notice #notice_data-attach {
+.form_notice #notice_data-attach {
 opacity:0;
 }
 
+.form_notice label[for=notice_data-attach],
+#export_data li a.rss,
+#export_data li a.atom,
+#export_data li a.foaf,
+.entity_edit a,
+.entity_send-a-message a,
+.entity_nudge p,
+.form_user_nudge input.submit,
+.form_user_block input.submit,
+.form_user_unblock input.submit,
+.form_group_block input.submit,
+.form_group_unblock input.submit,
+.form_make_admin input.submit,
+.notice .attachment,
+.notice-options .notice_reply,
+.notice-options form.form_favor input.submit,
+.notice-options form.form_disfavor input.submit,
+.notice-options .notice_delete,
+#new_group a,
+.pagination .nav_prev a,
+.pagination .nav_next a,
+button.close,
+.form_group_leave input.submit,
+.form_user_unsubscribe input.submit,
+.form_group_join input.submit,
+.form_user_subscribe input.submit,
+.entity_subscribe a {
+background-image:url(../../base/images/icons/icons-01.gif);
+background-repeat:no-repeat;
+background-color:transparent;
+}
+
 #wrap form.processing input.submit {
 background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 cursor:wait;
@@ -112,7 +168,8 @@ box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
 border-color:transparent;
 }
 #content,
-#site_nav_local_views .current a {
+#site_nav_local_views .current a,
+.entity_send-a-message .form_notice {
 background-color:#FFFFFF;
 }
 
@@ -130,6 +187,12 @@ background-color:rgba(255, 255, 255, 0.7);
 #site_nav_local_views .current a {
 text-shadow: rgba(194,194,194,0.5) 1px 1px 1px;
 }
+.processing {
+background-image:url(../../base/images/icons/icon_processing.gif);
+background-repeat:no-repeat;
+background-position:47% 47%;
+}
+
 
 .error {
 background-color:#F7E8E8;
@@ -138,6 +201,10 @@ background-color:#F7E8E8;
 background-color:#EFF3DC;
 }
 
+button.close {
+background-position:0 -1120px;
+}
+
 #anon_notice {
 background-color:#87B4C8;
 color:#FFFFFF;
@@ -150,82 +217,79 @@ background-color:#9BB43E;
 
 #export_data li a {
 background-repeat:no-repeat;
-background-position:0 45%;
 }
 #export_data li a.rss {
-background-image:url(../../base/images/icons/icon_rss.png);
+background-position:0 -130px;
 }
 #export_data li a.atom {
-background-image:url(../../base/images/icons/icon_atom.png);
+background-position:0 -64px;
 }
 #export_data li a.foaf {
-background-image:url(../../base/images/icons/icon_foaf.gif);
+background-position:0 1px;
 }
 
-.entity_edit a,
-.entity_send-a-message a,
-.form_user_nudge input.submit,
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.form_group_block input.submit,
-.form_group_unblock input.submit,
-.entity_nudge p,
-.form_make_admin input.submit {
-background-position: 0 40%;
-background-repeat: no-repeat;
-background-color:transparent;
-}
 .form_group_join input.submit,
-.form_group_leave input.submit
+.form_group_leave input.submit,
 .form_user_subscribe input.submit,
-.form_user_unsubscribe input.submit {
-background-color:#9BB43E;
+.form_user_unsubscribe input.submit,
+.entity_subscribe a {
+background-color:#AAAAAA;
 color:#FFFFFF;
 }
-.form_user_unsubscribe input.submit,
 .form_group_leave input.submit,
-.form_user_authorization input.reject {
-background-color:#87B4C8;
+.form_user_unsubscribe input.submit {
+background-position:5px -1246px;
+}
+.form_group_join input.submit,
+.form_user_subscribe input.submit,
+.entity_subscribe a {
+background-position:5px -1181px;
 }
 
 .entity_edit a {
-background-image:url(../../base/images/icons/twotone/green/edit.gif);
+background-position: 5px -718px;
 }
 .entity_send-a-message a {
-background-image:url(../../base/images/icons/twotone/green/quote.gif);
+background-position: 5px -852px;
+}
+.entity_send-a-message .form_notice {
+box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
 }
+
 .entity_nudge p,
 .form_user_nudge input.submit {
-background-image:url(../../base/images/icons/twotone/green/mail.gif);
+background-position: 5px -785px;
 }
 .form_user_block input.submit,
 .form_user_unblock input.submit,
 .form_group_block input.submit,
 .form_group_unblock input.submit {
-background-image:url(../../base/images/icons/twotone/green/shield.gif);
+background-position: 5px -918px;
 }
 .form_make_admin input.submit {
-background-image:url(../../base/images/icons/twotone/green/admin.gif);
+background-position: 5px -983px;
 }
 
 /* NOTICES */
 .notice .attachment {
-background:transparent url(../../base/images/icons/twotone/green/clip-02.gif) no-repeat 0 45%;
+background-position:0 -394px;
 }
 #attachments .attachment {
 background:none;
 }
 .notice-options .notice_reply {
-background:transparent url(../../base/images/icons/twotone/green/reply.gif) no-repeat 0 45%;
+background-position:0 -592px;
 }
 .notice-options form.form_favor input.submit {
-background:transparent url(../../base/images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
+background-position:0 -460px;
 }
 .notice-options form.form_disfavor input.submit {
-background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
+background-position:0 -526px;
 }
 .notice-options .notice_delete {
-background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%;
+background-position:0 -658px;
 }
 
 .notices div.entry-content,
@@ -236,9 +300,12 @@ opacity:0.4;
 .notices li:hover div.notice-options {
 opacity:1;
 }
-div.notice-options a,
-div.notice-options input {
+.notice-options a,
+.notice-options input {
 font-family:sans-serif;
+box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 }
 #content .notices li:hover {
 background-color:rgba(240, 240, 240, 0.2);
@@ -262,19 +329,33 @@ background-color:rgba(200, 200, 200, 0.300);
 /*END: NOTICES */
 
 #new_group a {
-background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%;
+background-position:0 -1054px;
 }
 
 .pagination .nav_prev a,
 .pagination .nav_next a {
 background-repeat:no-repeat;
-border-color:#C8D1D5;
+box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 }
 .pagination .nav_prev a {
-background-image:url(../../base/images/icons/twotone/green/arrow-left.gif);
-background-position:10% 45%;
+background-position:10% -187px;
 }
 .pagination .nav_next a {
-background-image:url(../../base/images/icons/twotone/green/arrow-right.gif);
-background-position:90% 45%;
+background-position:105% -252px;
 }
+.pagination .nav .processing {
+background-image:url(../../base/images/icons/icon_processing.gif);
+box-shadow:none;
+-moz-box-shadow:none;
+-webkit-box-shadow:none;
+outline:none;
+}
+.pagination .nav_next a.processing {
+background-position:90% 47%;
+}
+.pagination .nav_prev a.processing {
+background-position:10% 47%;
+}
+
diff --git a/theme/default/css/ie.css b/theme/default/css/ie.css
index cbbd49ce6..a0d3cd682 100644
--- a/theme/default/css/ie.css
+++ b/theme/default/css/ie.css
@@ -6,9 +6,9 @@ color:#FFFFFF;
 #site_nav_local_views a {
 background-color:#C8D1D5;
 }
-#form_notice .form_note + label {
+.form_notice .form_note + label {
 background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
 }
-#form_notice #notice_data-attach {
+.form_notice #notice_data-attach {
 filter: alpha(opacity=0);
 }
diff --git a/theme/default/mobilelogo.png b/theme/default/mobilelogo.png
new file mode 100644
index 000000000..b72f7aff5
--- /dev/null
+++ b/theme/default/mobilelogo.png
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 9fc97180d..ff7311302 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -28,7 +28,19 @@ input, textarea, select,
 .entity_remote_subscribe {
 border-color:#AAAAAA;
 }
-#filter_tags ul li {
+
+.form_settings fieldset fieldset {
+background:rgba(240, 240, 240, 0.2);
+box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
+}
+
+#filter_tags ul li,
+.entity_send-a-message .form_notice,
+.pagination .nav_prev a,
+.pagination .nav_next a,
+.form_settings fieldset fieldset {
 border-color:#DDDDDD;
 }
 
@@ -37,35 +49,47 @@ background:none;
 }
 
 input.submit,
-#form_notice.warning #notice_text-count,
+.form_notice.warning #notice_text-count,
 .form_settings .form_note,
-.entity_remote_subscribe {
+.entity_remote_subscribe,
+.entity_actions .form_notice input.submit {
 background-color:#9BB43E;
 }
-
-input:focus, textarea:focus, select:focus,
-#form_notice.warning #notice_data-text {
-border-color:#9BB43E;
+input.submit,
+.form_notice.warning #notice_text-count,
+.form_settings .form_note,
+.entity_remote_subscribe,
+.entity_actions a,
+.entity_actions input,
+button {
 box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 }
-input.submit,
+.entity_actions a,
+.entity_actions input,
+.entity_actions p {
+border-color:transparent;
+background-color:transparent;
+}
+input:focus, textarea:focus, select:focus,
+.form_notice.warning #notice_data-text,
+.form_notice.warning #notice_text-count,
+.form_settings .form_note,
 .entity_remote_subscribe {
+border-color:#9BB43E;
+}
+input.submit,
+.entity_remote_subscribe,
+.entity_actions .form_notice input.submit {
 color:#FFFFFF;
 }
 
 a,
-div.notice-options input,
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.form_group_block input.submit,
-.form_group_unblock input.submit,
-.entity_send-a-message a,
-.form_user_nudge input.submit,
-.entity_nudge p,
 .form_settings input.form_action-primary,
-.form_make_admin input.submit {
+.notice-options input,
+.entity_actions a,
+.entity_actions input {
 color:#002FA7;
 }
 
@@ -84,16 +108,48 @@ background-color:#CEE1E9;
 #notice_text-count {
 color:#333333;
 }
-#form_notice.warning #notice_text-count {
+.form_notice.warning #notice_text-count {
 color:#000000;
 }
-#form_notice label[for=notice_data-attach] {
-background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
+.form_notice label[for=notice_data-attach] {
+background-position:0 -328px;
 }
-#form_notice #notice_data-attach {
+.form_notice #notice_data-attach {
 opacity:0;
 }
 
+.form_notice label[for=notice_data-attach],
+#export_data li a.rss,
+#export_data li a.atom,
+#export_data li a.foaf,
+.entity_edit a,
+.entity_send-a-message a,
+.entity_nudge p,
+.form_user_nudge input.submit,
+.form_user_block input.submit,
+.form_user_unblock input.submit,
+.form_group_block input.submit,
+.form_group_unblock input.submit,
+.form_make_admin input.submit,
+.notice .attachment,
+.notice-options .notice_reply,
+.notice-options form.form_favor input.submit,
+.notice-options form.form_disfavor input.submit,
+.notice-options .notice_delete,
+#new_group a,
+.pagination .nav_prev a,
+.pagination .nav_next a,
+button.close,
+.form_group_leave input.submit,
+.form_user_unsubscribe input.submit,
+.form_group_join input.submit,
+.form_user_subscribe input.submit,
+.entity_subscribe a {
+background-image:url(../../base/images/icons/icons-01.gif);
+background-repeat:no-repeat;
+background-color:transparent;
+}
+
 #wrap form.processing input.submit {
 background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 cursor:wait;
@@ -112,7 +168,8 @@ box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
 border-color:transparent;
 }
 #content,
-#site_nav_local_views .current a {
+#site_nav_local_views .current a,
+.entity_send-a-message .form_notice {
 background-color:#FFFFFF;
 }
 
@@ -130,6 +187,11 @@ background-color:rgba(255, 255, 255, 0.7);
 #site_nav_local_views .current a {
 text-shadow: rgba(194,194,194,0.5) 1px 1px 1px;
 }
+.processing {
+background-image:url(../../base/images/icons/icon_processing.gif);
+background-repeat:no-repeat;
+background-position:47% 47%;
+}
 
 .error {
 background-color:#F7E8E8;
@@ -138,6 +200,10 @@ background-color:#F7E8E8;
 background-color:#EFF3DC;
 }
 
+button.close {
+background-position:0 -1120px;
+}
+
 #anon_notice {
 background-color:#87B4C8;
 color:#FFFFFF;
@@ -150,82 +216,79 @@ background-color:#9BB43E;
 
 #export_data li a {
 background-repeat:no-repeat;
-background-position:0 45%;
 }
 #export_data li a.rss {
-background-image:url(../../base/images/icons/icon_rss.png);
+background-position:0 -130px;
 }
 #export_data li a.atom {
-background-image:url(../../base/images/icons/icon_atom.png);
+background-position:0 -64px;
 }
 #export_data li a.foaf {
-background-image:url(../../base/images/icons/icon_foaf.gif);
+background-position:0 1px;
 }
 
-.entity_edit a,
-.entity_send-a-message a,
-.form_user_nudge input.submit,
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.form_group_block input.submit,
-.form_group_unblock input.submit,
-.entity_nudge p,
-.form_make_admin input.submit {
-background-position: 0 40%;
-background-repeat: no-repeat;
-background-color:transparent;
-}
 .form_group_join input.submit,
-.form_group_leave input.submit
+.form_group_leave input.submit,
 .form_user_subscribe input.submit,
-.form_user_unsubscribe input.submit {
-background-color:#9BB43E;
+.form_user_unsubscribe input.submit,
+.entity_subscribe a {
+background-color:#AAAAAA;
 color:#FFFFFF;
 }
-.form_user_unsubscribe input.submit,
 .form_group_leave input.submit,
-.form_user_authorization input.reject {
-background-color:#87B4C8;
+.form_user_unsubscribe input.submit {
+background-position:5px -1246px;
+}
+.form_group_join input.submit,
+.form_user_subscribe input.submit,
+.entity_subscribe a {
+background-position:5px -1181px;
 }
 
 .entity_edit a {
-background-image:url(../../base/images/icons/twotone/green/edit.gif);
+background-position: 5px -718px;
 }
 .entity_send-a-message a {
-background-image:url(../../base/images/icons/twotone/green/quote.gif);
+background-position: 5px -852px;
+}
+.entity_send-a-message .form_notice {
+box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
 }
+
 .entity_nudge p,
 .form_user_nudge input.submit {
-background-image:url(../../base/images/icons/twotone/green/mail.gif);
+background-position: 5px -785px;
 }
 .form_user_block input.submit,
 .form_user_unblock input.submit,
 .form_group_block input.submit,
 .form_group_unblock input.submit {
-background-image:url(../../base/images/icons/twotone/green/shield.gif);
+background-position: 5px -918px;
 }
 .form_make_admin input.submit {
-background-image:url(../../base/images/icons/twotone/green/admin.gif);
+background-position: 5px -983px;
 }
 
 /* NOTICES */
 .notice .attachment {
-background:transparent url(../../base/images/icons/twotone/green/clip-02.gif) no-repeat 0 45%;
+background-position:0 -394px;
 }
 #attachments .attachment {
 background:none;
 }
 .notice-options .notice_reply {
-background:transparent url(../../base/images/icons/twotone/green/reply.gif) no-repeat 0 45%;
+background-position:0 -592px;
 }
 .notice-options form.form_favor input.submit {
-background:transparent url(../../base/images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
+background-position:0 -460px;
 }
 .notice-options form.form_disfavor input.submit {
-background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
+background-position:0 -526px;
 }
 .notice-options .notice_delete {
-background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%;
+background-position:0 -658px;
 }
 
 .notices div.entry-content,
@@ -236,9 +299,12 @@ opacity:0.4;
 .notices li:hover div.notice-options {
 opacity:1;
 }
-div.notice-options a,
-div.notice-options input {
+.notice-options a,
+.notice-options input {
 font-family:sans-serif;
+box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 }
 #content .notices li:hover {
 background-color:rgba(240, 240, 240, 0.2);
@@ -262,19 +328,33 @@ background-color:rgba(200, 200, 200, 0.300);
 /*END: NOTICES */
 
 #new_group a {
-background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%;
+background-position:0 -1054px;
 }
 
 .pagination .nav_prev a,
 .pagination .nav_next a {
 background-repeat:no-repeat;
-border-color:#CEE1E9;
+box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 }
 .pagination .nav_prev a {
-background-image:url(../../base/images/icons/twotone/green/arrow-left.gif);
-background-position:10% 45%;
+background-position:10% -187px;
 }
 .pagination .nav_next a {
-background-image:url(../../base/images/icons/twotone/green/arrow-right.gif);
-background-position:90% 45%;
+background-position:105% -252px;
 }
+.pagination .nav .processing {
+background-image:url(../../base/images/icons/icon_processing.gif);
+box-shadow:none;
+-moz-box-shadow:none;
+-webkit-box-shadow:none;
+outline:none;
+}
+.pagination .nav_next a.processing {
+background-position:90% 47%;
+}
+.pagination .nav_prev a.processing {
+background-position:10% 47%;
+}
+
diff --git a/theme/identica/css/ie.css b/theme/identica/css/ie.css
index 97cabc30a..9ede1e324 100644
--- a/theme/identica/css/ie.css
+++ b/theme/identica/css/ie.css
@@ -6,9 +6,15 @@ color:#FFFFFF;
 #site_nav_local_views a {
 background-color:#D9DADB;
 }
-#form_notice .form_note + label {
-background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
+.form_notice .form_note + label {
+background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px;
 }
-#form_notice #notice_data-attach {
+.form_notice #notice_data-attach {
 filter: alpha(opacity=0);
 }
+.notice-options form.form_favor input.submit {
+background-position:0 -460px;
+}
+.notice-options form.form_disfavor input.submit {
+background-position:0 -526px;
+}
diff --git a/theme/identica/mobilelogo.png b/theme/identica/mobilelogo.png
new file mode 100644
index 000000000..b72f7aff5
--- /dev/null
+++ b/theme/identica/mobilelogo.png
diff --git a/theme/iphone/bg-body.gif b/theme/iphone/bg-body.gif
deleted file mode 100644
index d87e2e8d7..000000000
--- a/theme/iphone/bg-body.gif
+++ /dev/null
diff --git a/theme/iphone/bg-header.gif b/theme/iphone/bg-header.gif
deleted file mode 100644
index 5154b2e5e..000000000
--- a/theme/iphone/bg-header.gif
+++ /dev/null
diff --git a/theme/iphone/default-avatar-mini.png b/theme/iphone/default-avatar-mini.png
deleted file mode 100644
index 38b8692b4..000000000
--- a/theme/iphone/default-avatar-mini.png
+++ /dev/null
diff --git a/theme/iphone/default-avatar-profile.png b/theme/iphone/default-avatar-profile.png
deleted file mode 100644
index f8357d4fc..000000000
--- a/theme/iphone/default-avatar-profile.png
+++ /dev/null
diff --git a/theme/iphone/default-avatar-stream.png b/theme/iphone/default-avatar-stream.png
deleted file mode 100644
index 6b63baa70..000000000
--- a/theme/iphone/default-avatar-stream.png
+++ /dev/null
diff --git a/theme/iphone/display.css b/theme/iphone/display.css
deleted file mode 100644
index 1838a8e86..000000000
--- a/theme/iphone/display.css
+++ /dev/null
@@ -1,698 +0,0 @@
-/* CSS Document */
-/* Design & CSS by Marie-Claude Doyon http://www.marieclaudedoyon.com */
-/* Simplified for mobile by Ken Sheppardson http://identi.ca/kshep    */
-
-@import url(../../base/css/display.css);
-
-html {}
-body {
-  width: 100%;
-  padding: 0;
-  margin: 0;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 24px;
-  min-height: 100%;
-  height: 100%;
-  color: #193441;
-}
-
-a {
-  color: #C15D42;
-  text-decoration: none;
-}
-a:hover {
-  text-decoration: underline;
-}
-img, img a {
-  border: 0;
-}
-h1 {
-  font-size: 1.2em;
-}
-
-#wrap {
-  margin: 0;
-}
-
-#header {
-  width: 100%;
-  float: left;
-  background-color: #193441;
-  margin: 0 0 20px 0;
-  padding: 0;
-}
-#logo {
-  float: left;
-  margin: 10px 0px 0px 10px;
-}
-p#branding {
-  margin: 0;
-  padding: 6px 0 3px 0;
-  color: #fbf2d7;
-  font-size: 2em;
-  font-weight: bold;
-  line-height: 2.5em;
-}
-p#branding a {
-  color: #dab134;
-}
-
-#header h1.pagetitle {
-  display: none;
-  margin: 0;
-  padding: 0;
-  font-size: 1.2em;
-  line-height: 2em;
-  color: #d8e2d7;
-}
-
-#header h2.sitename {
-  display: none;
-  margin: 0;
-  padding: 0;
-  color: #FCFFF5;
-}
-
-/* ===== Begin Navigation Styling ===== */
-
-/* ----- Navigation ------ */
-#nav {
-  float: right;
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
-  font-size: 1.2em;
-}
-#nav li {
-  display: block;
-  float: left;
-}
-#nav li a {
-  display: block;
-  padding: 9px 15px 12px 0px;
-  color: #91AA9D;
-}
-#nav li a:hover {
-  text-decoration: underline;
-}
-
-/* ----- Tabs ----- */
-#nav_views {
-  clear: both;
-  float: left;
-  margin: 10px 0px 0px 5px;
-  padding: 0;
-  bottom: 0;
-  list-style-type: none;
-  font-size: 1.1em;
-  font-weight: bold;
-}
-#nav_views li {
-  display: block;
-  float: left;
-  line-height: 1.3em;
-}
-#nav_views li a {
-  display: block;
-  margin: 0;
-  padding: 4px 12px 3px 12px;
-  color: #FCFFF5;
-  background-color: #91AA9D;
-  border-right: 1px solid #6A8787;
-}
-#nav_views li a:hover {
-  text-decoration: none;
-}
-#nav_views li.current a, #nav_views li.current a:hover {
-  color: #3F606F;
-  background-color: #FCFFF5;
-  border-right: 1px solid #6A8787;
-}
-#nav_views li.current a:hover {
-  color: #193441;
-}
-#nav_views li a:hover {
-  color: #FCFFF5;
-  background-color: #3F606F;
-  border-right: 1px solid #6A8787;
-}
-
-/* ----- Nav Footer ----- */
-#nav_sub {
-  clear: both;
-  margin: 18px 10px 0 10px;
-  padding: 0;
-  list-style-type: none;
-  font-size: 1.1em;
-  font-weight: bold;
-  line-height: 2em;
-  border-top: 1px solid #D8E2D7;
-}
-#nav_sub li {
-  display: block;
-  float: left;
-}
-#nav_sub li a {
-  padding: 6px 24px 6px 0;
-}
-#nav_sub li a:hover {
-  text-decoration: underline;
-}
-/* ===== End Navigation Styling ===== */
-
-#content {
-  clear: left;
-  margin: 10px;
-  font-family: Georgia, "Times New Roman", Times, serif;
-  font-size: 1em;
-  line-height: 1.1em;
-}
-#content h2 {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 1.1em;
-}
-#content label {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 1.1em;
-}
-
-.instructions {
-  clear: both;
-  float: left;
-  margin: 5px 5px 10px 5px;
-}
-.instructions p, .success, .error {
-  font-weight: normal;
-  margin: 0;
-  padding: 10px;
-  font-family: Georgia, "Times New Roman", Times, serif;
-  font-size: 1.1em;
-  line-height: 1.2em;
-  border: 1px solid #91AA9D;
-  color: #FCFFF5;
-}
-.instructions a, .success a, .error a {
-  color: #d8e2d7;
-  text-decoration: underline;
-}
-.instructions a:hover, .success a:hover, .error a:hover {
-  color: #FCFFF5;
-}
-.success {
-  clear: both;
-  float: left;
-  margin: 5px 5px 10px 5px;
-  background-color: #48705b;
-}
-.error {
-  clear: both;
-  float: left;
-  margin: 5px 5px 10px 5px;
-  background-color: #ce3728;
-}
-
-/* ----- Stream -----*/
-
-#notices {
-  clear: both;
-  margin: 0 auto;
-  padding: 0;
-  list-style-type: none;
-  border-top: 1px solid #D8E2D7;
-}
-#notices a:hover {
-  text-decoration: underline;
-}
-.notice_single {
-  clear: both;
-  display: block;
-  margin: 0;
-  padding: 5px 5px 5px 0;
-  min-height: 48px;
-  font-family: Georgia, "Times New Roman", Times, serif;
-  font-size: 1em;
-  line-height: 1.4em;
-  border-bottom: 1px solid #D8E2D7;
-}
-.notice_single:hover {
-  background-color: #F3F8EA;
-}
-.notice_single p {
-  display: inline;
-  margin: 0;
-  padding: 0;
-}
-#notice_delete_form #confirmation_text {
-  display: block;
-  font-size: 1.1em;
-  font-weight: bold;
-}
-input#submit_yes, input#submit_no {
-  margin: 18px 10px 0px 0px;
-  padding: 4px;
-  font-weight: bold;
-  color: #FCFFF5;
-  background-color: #C15D42;
-  cursor: pointer;
-  border: 0;
-  width: 40px;
-}
-input#submit_yes:hover, input#submit_no:hover {
-  background-color: #904632;
-}
-.avatar.stream {
-  float: left;
-  margin: 0 10px 0 0;
-}
-p.time {
-  display: block;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 0.9em;
-  line-height: 2em;
-}
-p.time a {
-  color: #91AA9D;
-}
-
-/* ----- Profile -----*/
-#profile {
-  clear: both;
-  float: left;
-  padding: 10px 0 0 0;
-  border-top: 1px solid #D8E2D7;
-  font-family: Georgia, "Times New Roman", Times, serif;
-}
-#profile h1 {
-  clear: both;
-  float: left;
-  margin: 0;
-  padding: 0;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 1.2em;
-}
-#profile h2 {
-  clear: both;
-  float: left;
-  margin: 0;
-  padding: 1em 0 0.2em 0;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 1.1em;
-  text-transform: uppercase;
-  color: #91AA9D;
-}
-#profile p {
-  clear: both;
-  float: left;
-  margin: 0 10px 0 0;
-  font-size: 1em;
-  line-height: 1.4em;
-}
-#profile p.location {
-  margin: 0 10px 12px 0;
-  font-style: italic;
-}
-#profile p.notice_current {
-  font-size: 1.2em;
-  line-height: 1.3em;
-}
-#profile_avatar {
-  float: left;
-  margin-right: 4px;
-}
-#profile_avatar img {
-  margin-bottom: 5px;
-}
-.avatar.profile {
-  clear: left;
-  margin: 0 10px 5px 0;
-}
-.avatar.original {
-  float: left;
-  margin: 0 10px 18px 0;
-}
-a.nickname {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-weight: bold;
-  font-size: 1.1em;
-  padding-right: 3px;
-}
-#profile_information {
-  float: left;
-}
-
-.statistics {
-  clear: both;
-  float: left;
-}
-.statistics h2 {
-  clear: both;
-  float: left;
-  margin: 12px 0 3px 0;
-}
-dl.statistics {
-  margin: 0;
-}
-.statistics dt {
-  clear: left;
-  float: left;
-  width: 200px;
-}
-.statistics dd {
-  float: left;
-}
-.statistics dt:after {
-  content: ":";
-}
-#subscriptions {
-  clear: both;
-  float: left;
-  margin: 18px 0 30px 0;
-}
-#subscriptions_avatars {
-  clear: both;
-  float: left;
-  margin: 6px 0 0 0;
-  padding: 0;
-  list-style-type: none;
-}
-#subscriptions_avatars li .avatar.mini {
-  float: left;
-  margin: 0 3px 3px 0;
-  padding: 0;
-  line-height: 0;
-}
-#subscriptions_viewall {
-  clear: left;
-}
-/* ----- End Profile -----*/
-
-/* ----- Begin Subscriptions & Subscribers -----*/
-
-ul.subscriptions, ul.subscribers {
-  float: none;
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
-  overflow: auto;
-}
-ul.subscriptions li, ul.subscribers li {
-  display: block;
-  float: left;
-  padding: 0;
-}
-/* ----- End Subscriptions & Subscribers -----*/
-
-#pagination {
-  margin: 18px auto;
-}
-#nav_pagination {
-  margin: 0 0 36px 0;
-  padding: 0;
-  float: right;
-  list-style-type: none;
-  font-size: 12px;
-  font-weight: bold;
-}
-#nav_pagination li {
-  display: block;
-  float: left;
-  background-color: #91AA9D;
-}
-#nav_pagination li.before {
-  margin-right: 1px;
-}
-#nav_pagination li a {
-  padding: 6px 15px;
-  line-height: 2em;
-  background-color: #91AA9D;
-  color: #FCFFF5;
-}
-#nav_pagination li a:hover {
-  background-color: #3F606F;
-  color: #FCFFF5;
-  text-decoration: none;
-}
-
-#footer {
-  clear: both;
-  margin: 10px;
-  border-top: 1px solid #D8E2D7;
-}
-#footer p {
-  font-size: 0.8em;
-  margin-top: 1em;
-  line-height: 1.2em;
-}
-#cc {
-  float: left;
-  margin: 3px 10px 0 0;
-}
-
-/* ===== Begin Forms Styling ===== */
-
-/* ----- Forms General Style ----- */
-form {
-  margin: 0 auto;
-  padding: 0;
-}
-form {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 1em;
-}
-form label {
-  display: block;
-  font-size: 1em;
-  font-weight: bold;
-  line-height: 1.5em;
-}
-form input {
-  border: 1px solid #D8E2D7;
-  width: 264px;
-}
-input#submit, input.submit  {
-  display: block;
-  margin: 18px 0;
-  padding: 4px;
-  font-weight: bold;
-  color: #FCFFF5;
-  background-color: #C15D42;
-  cursor: pointer;
-  border: 0;
-  width: auto;
-}
-input#submit:hover, input.submit:hover {
-  background-color: #904632;
-}
-input.checkbox {
-  width: auto;
-  border: 0;
-}
-textarea, input {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 1em;
-  color: #193441;
-  padding: 3px;
-}
-textarea:focus, input:focus {
-  background-color: #f0f6eb;
-}
-textarea {
-  width: 270px;
-  border: 1px solid #D8E2D7;
-}
-.input_instructions {
-  margin-top: 3px;
-  display: block;
-  font-size: 1em;
-  line-height: 1.2em;
-  color: #91aa9d;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-
-/* ----- Status Form ----- */
-#status_form {
-  width: 100%;
-  margin: 0px 0px 10px 5px;
-}
-#status_form p {
-  margin: 0;
-  padding: 0;
-}
-#status_label {
-  display: none;
-  clear: both;
-  margin: 0;
-  padding: 0 0 3px 0;
-  font-size: 1.5em;
-  font-weight: bold;
-  line-height: 2em;
-  color: #91AA9D;
-}
-#status_textarea {
-  display: block;
-  float: left;
-  width: 70%;
-  height: 3em;
-  margin: 0 0 10px 0;
-  padding: 0;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 1.1em;
-  color: #193441;
-  border: 0;
-}
-#status_submit {
-  display: block;
-  float: left;
-  margin: 0 0 0 4px;
-  padding: 1em 10px 1em 10px;
-  line-height: 1em;
-  width: 10%;
-  background-color: #C15D42;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-weight: bold;
-  font-size: 1em;
-  color: #FCFFF5;
-  cursor: pointer;
-  border: 0;
-}
-#status_submit:hover {
-  background-color: #904632;
-}
-#counter {
-  padding: 1em .5em 1em 5px;
-  color: #fff;
-  clear: both;
-  float: left;
-  font-weight: bold;
-  text-align: right;
-}
-/* ----- Subscribe Form ----- */
-#subscribe .submit, #unsubscribe .submit, #remotesubscribe .button, #remotesubscribe {
-  clear: left;
-  margin: 0;
-  width: 96px;
-  height: 27px;
-  font-family: verdana, arial, helvetica, sans-serif;
-  font-weight: bold;
-  font-size: 12px;
-  text-transform: uppercase;
-  background-color: #c15d42;
-  color: #fcfff5;
-  border: 0;
-}
-#remotesubscribe {
-  width: 96px;
-  height: 22px;
-  padding: 5px 0 0 0;
-  text-align: center;
-}
-#subscribe .button:hover, #unsubscribe .button:hover {
-  background-color: #904632;
-  cursor: pointer;
-}
-
-a#remotesubscribe {
-  display: block;
-}
-
-/* ----- Login Form -----*/
-input#license {
-  width: auto;
-  border: 0;
-}
-/* ----- Avatar Form -----*/
-form {
-  clear: left;
-}
-
-/* ----- OpenID Form -----*/
-
-input#openid_url {
-  background: url(login-bg.gif) no-repeat;
-  background-color: #fff;
-  background-position: 4px 50%;
-  color: #000;
-  padding-left: 24px;
-}
-
-/* People lists (search results, maybe subscribers) */
-
-#profiles {
-  clear: both;
-  margin: 0 auto;
-  padding: 0;
-  list-style-type: none;
-  border-top: 1px solid #D8E2D7;
-}
-#profiles a:hover {
-  text-decoration: underline;
-}
-
-.profile_single {
-  clear: both;
-  display: block;
-  margin: 0;
-  padding: 5px 5px 5px 0;
-  min-height: 48px;
-  font-family: Georgia, "Times New Roman", Times, serif;
-  font-size: 1.2em;
-  line-height: 1.4em;
-  border-bottom: 1px solid #D8E2D7;
-}
-.profile_single:hover {
-  background-color: #F3F8EA;
-}
-
-/* ----- IM Settings Form -----*/
-
-#imsettings p {
-  margin: 0;
-  padding: 0;
-  line-height: 1.3em;
-}
-
-/* ===== End Forms Styling ===== */
-
-/* ===== Tag Cloud Styling ===== */
-
-p.tagcloud {
-text-align: center;
-}
-
-p.tagcloud a {
-line-height:1em;
-vertical-align:middle;
-}
-
-p.tagcloud a.largest {
-font-size: 4em;
-}
-p.tagcloud a.verylarge {
-font-size: 3em;
-}
-
-p.tagcloud a.large {
-font-size: 2em;
-}
-
-p.tagcloud a.medium {
-font-size: 1.5em;
-}
-
-p.tagcloud a.small {
-font-size: 1em;
-}
-
-p.tagcloud a.verysmall {
-font-size: 80%;
-}
-
-p.tagcloud a.smallest {
-font-size: 60%;
-}
-
-a.replybutton {
-  border: 1px solid #D8E2D7;
-  padding: 0px 10px 0px 10px;
-  line-height: 0.8em;
-}
diff --git a/theme/iphone/display.css.dist b/theme/iphone/display.css.dist
deleted file mode 100644
index 395da2e2f..000000000
--- a/theme/iphone/display.css.dist
+++ /dev/null
@@ -1,686 +0,0 @@
-/* CSS Document */
-/* Design & CSS by Marie-Claude Doyon http://www.marieclaudedoyon.com */
-
-html {
-	background: url(bg-body.gif) repeat-y top center #d8e2d7;
-	}
-body {
-	position: absolute;
-	width: 100%;
-	margin: 0;
-	padding: 0;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	line-height: 12px;
-	min-height: 100%;
-	height: 100%;
-	color: #193441;
-	}
-a {
-	color: #C15D42;
-	text-decoration: none;
-	}
-a:hover {
-	text-decoration: underline;
-	}
-img, img a {
-	border: 0;
-	}
-h1 {
-	font-size: 14px;
-	}
-
-
-#wrap {
-	margin: 0 auto;
-	padding: 0 20px;
-	width: 760px;
-	background: url(bg-header.gif) repeat-x #FCFFF5;
-	}
-#header {
-	position: relative;
-	margin: 0 auto;
-	width: 540px;
-	height: 216px;
-	}
-#logo {
-	margin-top: 9px;
-	}
-p#branding {
-	margin: 0;
-	padding: 6px 0 3px 0;
-	color: #fbf2d7;
-	font-size: 21px;
-	font-weight: bold;
-	line-height: 27px;
-	}
-p#branding a {
-	color: #dab134;
-	}
-
-#header h1.pagetitle {
-	margin: 0;
-	padding: 0;
-	font-size: 15px;
-	line-height: 24px;
-	color: #d8e2d7;
-}
-
-#header h2.sitename {
-	display: none;
-	margin: 0;
-	padding: 0;
-	color: #FCFFF5;
-}
-
-/* ===== Begin Navigation Styling ===== */
-
-/* ----- Navigation ------ */
-#nav {
-	float: right;
-	margin: 0;
-	padding: 0;
-	list-style-type: none;
-	font-size: 12px;
-	}
-#nav li {
-	display: block;
-	float: left;
-	}
-#nav li a {
-	display: block;
-	padding: 9px 9px 12px 9px;
-	color: #91AA9D;
-	}
-#nav li a:hover {
-	text-decoration: underline;
-	}
-
-/* ----- Tabs ----- */
-#nav_views {
-	margin: 0 auto;
-	padding: 0;
-	position: absolute;
-	bottom: 0;
-	list-style-type: none;
-	font-size: 14px;
-	font-weight: bold;
-	width: 540px;
-	/*height: 30px;*/
-	}
-#nav_views li {
-	display: block;
-	float: left;
-	line-height: 21px;
-	}
-#nav_views li a {
-	display: block;
-	margin: 0;
-	padding: 4px 12px 3px 12px;
-	color: #FCFFF5;
-	background-color: #91AA9D;
-	border-right: 1px solid #6A8787;
-	}
-#nav_views li a:hover {
-	text-decoration: none;
-	}
-#nav_views li.current a, #nav_views li.current a:hover {
-	color: #3F606F;
-	background-color: #FCFFF5;
-	border-right: 1px solid #6A8787;
-	}
-#nav_views li.current a:hover {
-	color: #193441;
-	}
-#nav_views li a:hover {
-	color: #FCFFF5;
-	background-color: #3F606F;
-	border-right: 1px solid #6A8787;
-	}
-
-/* ----- Nav Footer ----- */
-#nav_sub {
-	clear: both;
-	margin: 18px auto 0 auto;
-	padding: 0;
-	list-style-type: none;
-	font-size: 11px;
-	font-weight: bold;
-	line-height: 21px;
-	border-top: 1px solid #D8E2D7;
-	width: 540px;
-	}
-#nav_sub li {
-	display: block;
-	float: left;
-	}
-#nav_sub li a {
-	padding: 6px 24px 6px 0;
-	}
-#nav_sub li a:hover {
-	text-decoration: underline;
-	}
-/* ===== End Navigation Styling ===== */
-
-#content {
-	clear: left;
-	margin: 40px 0 45px 0;
-	padding: 0 110px;
-	font-family: Georgia, "Times New Roman", Times, serif;
-	font-size: 14px;
-	line-height: 18px;
-	}
-#content h2 {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 15px;
-	}
-#content label {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	}
-.instructions p, .success, .error {
-	font-weight: normal;
-	margin: 36px 0 0 0;
-	padding: 10px;
-	font-family: Georgia, "Times New Roman", Times, serif;
-	font-size: 13px;
-	line-height: 15px;
-	border: 1px solid #91AA9D;
-	color: #FCFFF5;
-	}
-.instructions a, .success a, .error a {
-	color: #d8e2d7;
-	text-decoration: underline;
-	}
-.instructions a:hover, .success a:hover, .error a:hover {
-	color: #FCFFF5;
-	}		
-.success {
-	background-color: #48705b;
-	}
-.error {
-	background-color: #ce3728;
-	}
-
-
-/* ----- Stream -----*/
-
-#notices {
-	clear: both;
-	margin: 0 auto;
-	padding: 0;
-	list-style-type: none;
-	width: 540px;
-	border-top: 1px solid #D8E2D7;
-	}
-#notices a:hover {
-	text-decoration: underline;
-	}
-.notice_single {
-	clear: both;
-	display: block;
-	margin: 0;
-	padding: 5px 5px 5px 0;
-	min-height: 48px;
-	font-family: Georgia, "Times New Roman", Times, serif;
-	font-size: 13px;
-	line-height: 16px;
-	border-bottom: 1px solid #D8E2D7;
-	}
-.notice_single:hover {
-	background-color: #F3F8EA;
-	}
-.notice_single p {
-	display: inline;
-	margin: 0;
-	padding: 0;
-	}
-#notice_delete_form #confirmation_text {
-        display: block;
-	font-size: 14px;
-	font-weight: bold;
-	}
-input#submit_yes, input#submit_no {
-	margin: 18px 10px 0px 0px;
-	padding: 4px;
-	font-weight: bold;
-	color: #FCFFF5;
-	background-color: #C15D42;
-	cursor: pointer;
-	border: 0;
-	width: 40px;
-	}
-input#submit_yes:hover, input#submit_no:hover {
-	background-color: #904632;
-	}
-.avatar.stream {
-	float: left;
-	margin: 0 10px 0 0;
-	}
-p.time {
-	display: block;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	line-height: 15px;
-	}
-p.time a {
-	color: #91AA9D;
-	}
-	
-/* ----- Profile -----*/
-#profile {
-	clear: left;
-	margin: 0 -110px;
-	padding: 10px 0 0 0;
-	min-height: 170px;
-	border-top: 1px solid #D8E2D7;
-	font-family: Georgia, "Times New Roman", Times, serif;
-	}
-#profile h1 {
-	margin: 0;
-	padding: 0;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	}
-#profile h2 {
-	margin: 0;
-	padding: 0;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	text-transform: uppercase;
-	color: #91AA9D;
-	}
-#profile p {
-	margin: 0 10px 0 0;
-	font-size: 12px;
-	line-height: 14px;
-	}
-#profile p.location {
-	margin: 0 10px 12px 0;
-	font-style: italic;
-	}
-#profile p.notice_current {
-	font-size: 18px;
-	line-height: 21px;
-	}
-#profile_avatar {
-	float: left;
-	margin-right: 4px;
-	}
-#profile_avatar img {
-	margin-bottom: 5px;
-	}
-.avatar.profile {
-	clear: left;
-	margin: 0 10px 5px 0;
-	}
-.avatar.original {
-	float: left;
-	margin: 0 10px 18px 0;
-	}
-a.nickname {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	font-size: 12px;
-	padding-right: 3px;
-	}
-#profile_information {
-	float: left;
-	position: relative;
-	width: 270px;
-	height: 200px;
-	}
-.statistics {
-	margin-top: 18px;
-	}
-.statistics h2 {
-	margin: 12px 0 3px 0;
-	}
-dl.statistics {
-	margin: 0;
-	font-size: 12px;
-	line-height: 14px;
-	}
-.statistics dt {
-	float: left;
-	width: 96px;
-}	
-.statistics dd {
-	margin-left: 100px;
-}
-.statistics dt:after {
-	content: ":";
-	}
-#subscriptions {
-	float: left;
-	margin: 18px 0 30px 0;
-	}
-#subscriptions_avatars {
-	float: left;
-	margin: 6px 0 0 0;
-	padding: 0;
-	list-style-type: none;
-	width: 270px;
-	}
-#subscriptions_avatars li .avatar.mini {
-	float: left;
-	margin: 0 3px 3px 0;
-	padding: 0;
-	line-height: 0;
-	/* border: 1px solid #f00; */
-	}
-#subscriptions_viewall {
-	clear: left;
-	}
-/* ----- End Profile -----*/
-
-/* ----- Begin Subscriptions & Subscribers -----*/
-
-ul.subscriptions, ul.subscribers {
-	float: none;
-	margin: 0;
-	padding: 0;
-	list-style-type: none;
-	overflow: auto;
-	}
-ul.subscriptions li, ul.subscribers li {
-	display: block;
-	float: left;
-	padding: 0;
-	}
-/* ----- End Subscriptions & Subscribers -----*/
-
-
-
-#pagination {
-	margin: 18px auto;
-	width: 540px;
-	}
-#nav_pagination {
-	margin: 0 0 36px 0;
-	padding: 0;
-	float: right;
-	list-style-type: none;
-	font-size: 12px;
-	font-weight: bold;
-	}
-#nav_pagination li {
-	display: block;
-	float: left;
-	background-color: #91AA9D;
-	}
-#nav_pagination li.before {
-	margin-right: 1px;
-	}
-#nav_pagination li a {
-	padding: 6px 15px;
-	line-height: 21px;
-	background-color: #91AA9D;
-	color: #FCFFF5;
-	}
-#nav_pagination li a:hover {
-	background-color: #3F606F;
-	color: #FCFFF5;
-	text-decoration: none;
-	}
-
-#footer {
-	clear: both;
-	margin: 0 auto;
-	padding: 0 0 36px 0;
-	width: 540px;
-	border-top: 1px solid #D8E2D7;
-	}
-#footer p {
-	margin-top: 9px;
-	line-height: 12px;
-	}
-#cc {
-	float: left;
-	margin: 3px 10px 0 0;
-	}
-
-/* ===== Begin Forms Styling ===== */
-
-/* ----- Forms General Style ----- */
-form {
-	margin: 0 auto;
-	padding: 0;
-	}
-form {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	}
-form label {
-	display: block;
-	font-size: 12px;
-	font-weight: bold;
-	line-height: 18px;
-	}
-form input {
-	border: 1px solid #D8E2D7;
-	width: 264px;
-	}
-input#submit, input.submit  {
-	display: block;
-	margin: 18px 0;
-	padding: 4px;
-	font-weight: bold;
-	color: #FCFFF5;
-	background-color: #C15D42;
-	cursor: pointer;
-	border: 0;
-	width: auto;
-	}
-input#submit:hover, input.submit:hover {
-	background-color: #904632;
-	}
-input.checkbox {
-	/*width: 14px;
-	height: 14px;*/
-	width: auto;
-	border: 0;
-	}	
-textarea, input {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #193441;
-	padding: 3px;
-	}
-textarea:focus, input:focus {
-	background-color: #f0f6eb;
-	}
-textarea {
-	width: 270px;
-	border: 1px solid #D8E2D7;
-	}
-.input_instructions {
-	margin-top: 3px;
-	display: block;
-	font-size: 11px;
-	line-height: 15px;
-	color: #91aa9d;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	}
-
-/* ----- Status Form ----- */
-#status_form {
-	height: 96px;
-	/*background-color: #F00;*/
-	}
-#status_form p {
-	margin: 36px 0 0 0;
-	padding: 0;
-	}
-#status_label {
-	display: block;
-	clear: both;
-	margin: 0;
-	padding: 0 0 3px 0;
-	font-size: 18px;
-	font-weight: bold;
-	line-height: 24px;
-	color: #91AA9D;
-	}
-#status_textarea {
-	display: block;
-	float: left;
-	width: 463px;
-	height: 35px;
-	padding: 5px;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #193441;
-	border: 0;
-	}
-#status_submit {
-	display: block;
-	float: left;
-	margin: 1px 0 0 4px;
-	width: 63px;
-	height: 45px;
-	background-color: #C15D42;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	font-size: 14px;
-	color: #FCFFF5;
-	cursor: pointer;
-	border: 0;
-	}
-#status_submit:hover {
-	background-color: #904632;
-	}
-#counter {
-	position: absolute;
-	top: 140px;
-	left: -64px;
-	width: 50px;
-	font-weight: bold;
-	text-align: right;
-}
-/* ----- Subscribe Form ----- */
-#subscribe .submit, #unsubscribe .submit, #remotesubscribe .button, #remotesubscribe {
-	clear: left;
-	margin: 0;
-	width: 96px;
-	height: 27px;
-	font-family: verdana, arial, helvetica, sans-serif;
-	font-weight: bold;
-	font-size: 10px;
-	text-transform: uppercase;
-	background-color: #c15d42;
-	color: #fcfff5;
-	border: 0;
-	}
-#remotesubscribe {
-	width: 96px;
-	height: 22px;
-	padding: 5px 0 0 0;
-	text-align: center;
-	}
-#subscribe .button:hover, #unsubscribe .button:hover {
-	background-color: #904632;
-	cursor: pointer;
-	}
-
-a#remotesubscribe {
-	display: block;
-}
-
-/* ----- Login Form -----*/
-input#license {
-	width: auto;
-	border: 0;
-	}
-/* ----- Avatar Form -----*/
-form {
-	clear: left;
-}
-
-/* ----- OpenID Form -----*/
-
-input#openid_url {
-   background: url(login-bg.gif) no-repeat;
-   background-color: #fff;
-   background-position: 4px 50%;
-   color: #000;
-   padding-left: 24px;
-}
-
-/* People lists (search results, maybe subscribers) */
-
-#profiles {
-	clear: both;
-	margin: 0 auto;
-	padding: 0;
-	list-style-type: none;
-	width: 540px;
-	border-top: 1px solid #D8E2D7;
-	/*border: 1px solid #F00;*/
-	}
-#profiles a:hover {
-	text-decoration: underline;
-	}
-	
-.profile_single {
-	clear: both;
-	display: block;
-	margin: 0;
-	padding: 5px 5px 5px 0;
-	min-height: 48px;
-	font-family: Georgia, "Times New Roman", Times, serif;
-	font-size: 13px;
-	line-height: 16px;
-	border-bottom: 1px solid #D8E2D7;
-	}
-.profile_single:hover {
-	background-color: #F3F8EA;
-	}
-
-/* ----- IM Settings Form -----*/
-
-#imsettings p {
-	margin: 0;
-	padding: 0;
-	line-height: 15px;
-}
-
-/* ===== End Forms Styling ===== */
-
-/* ===== Tag Cloud Styling ===== */
-
-p.tagcloud {
-text-align: center;
-}
-
-p.tagcloud a {
-line-height:100%;
-vertical-align:middle;
-}
-
-p.tagcloud a.largest {
-font-size: 400%;
-}
-p.tagcloud a.verylarge {
-font-size: 300%;
-}
-
-p.tagcloud a.large {
-font-size: 200%;
-}
-
-p.tagcloud a.medium {
-font-size: 150%;
-}
-
-p.tagcloud a.small {
-font-size: 100%;
-}
-
-p.tagcloud a.verysmall {
-font-size: 80%;
-}
-
-p.tagcloud a.smallest {
-font-size: 60%;
-}
diff --git a/theme/iphone/ie6.css.dist b/theme/iphone/ie6.css.dist
deleted file mode 100644
index 97d9fee3f..000000000
--- a/theme/iphone/ie6.css.dist
+++ /dev/null
@@ -1,63 +0,0 @@
-@charset "UTF-8";
-/* CSS Document */
-body {
-	text-align: center;
-}
-input {
-	height: 24px;
-}
-#wrap {
-	margin: 0 auto;
-	padding: 0 20px;
-	width: 800px;
-	text-align: left;
-	background: url(bg-header.gif) repeat-x #FCFFF5;
-	}
-#header {
-	position: relative;
-	margin-left: 108px;
-	}	
-#nav_views {
-	margin: 0;
-	}
-#nav_views li {
-	line-height: 19px;
-	}
-.statistics dd {
-	margin-top: -15px;
-	clear: both;
-	}	
-#notices {
-	margin: 0;
-	}			
-.notice_single {
-	height: 48px;
-	}
-#profile p.notice_current {
-	height: 96px;
-	}	
-	
-#subscriptions_avatars li {
-	float: left;
-	margin: 0;
-	padding: 0;
-	}
-img.avatar.original, img.avatar.profile {
-	clear: none;
-	float: left;
-}		
-#status_textarea {
-	height: 46px;
-	}
-			
-#nav_pagination li a {
-	padding: 6px 15px;
-	line-height: 27px;
-	}
-#nav_sub {
-	position: relative;
-	margin-left: 108px;
-	}	
-#footer {
-	margin-left: 108px;
-}
diff --git a/theme/iphone/ie7.css.dist b/theme/iphone/ie7.css.dist
deleted file mode 100644
index bbf52d5cf..000000000
--- a/theme/iphone/ie7.css.dist
+++ /dev/null
@@ -1,20 +0,0 @@
-@charset "UTF-8";
-/* CSS Document */
-
-#statistics dd {
-	clear: both;
-	}		
-	
-	
-#subscriptions_avatars li {
-	float: left;
-	}
-img.avatar.original, img.avatar.profile {
-	clear: none;
-	float: left;
-}
-			
-#nav_pagination li a {
-	padding: 6px 15px;
-	line-height: 27px;
-	}
\ No newline at end of file
diff --git a/theme/iphone/login-bg.gif b/theme/iphone/login-bg.gif
deleted file mode 100644
index e2d8377db..000000000
--- a/theme/iphone/login-bg.gif
+++ /dev/null
diff --git a/theme/iphone/logo.png b/theme/iphone/logo.png
deleted file mode 100644
index 3b271814d..000000000
--- a/theme/iphone/logo.png
+++ /dev/null
diff --git a/theme/readme.txt b/theme/readme.txt
index 151b1fb71..d030f2db4 100644
--- a/theme/readme.txt
+++ b/theme/readme.txt
@@ -1,7 +1,7 @@
 /** Howto: create a statusnet theme
  *
  * @package   StatusNet
- * @author Sarven Capadisli <csarven@controlyourself.ca>
+ * @author Sarven Capadisli <csarven@status.net>
  * @copyright 2009 Control Yourself, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://laconi.ca/