93 files changed, 342 insertions, 900 deletions

diff --git a/theme/default/base/css/display.css b/theme/base/css/display.css
index a6fe8eb75..a6fe8eb75 100644
--- a/theme/default/base/css/display.css
+++ b/theme/base/css/display.css
diff --git a/theme/cloudy/base/css/facebookapp.css b/theme/base/css/facebookapp.css
index 163b41fb4..163b41fb4 100644
--- a/theme/cloudy/base/css/facebookapp.css
+++ b/theme/base/css/facebookapp.css
diff --git a/theme/default/base/css/farbtastic.css b/theme/base/css/farbtastic.css
index 3b8fec58f..3b8fec58f 100644
--- a/theme/default/base/css/farbtastic.css
+++ b/theme/base/css/farbtastic.css
diff --git a/theme/cloudy/base/css/ie.css b/theme/base/css/ie.css
index 5d8bea8ae..5d8bea8ae 100644
--- a/theme/cloudy/base/css/ie.css
+++ b/theme/base/css/ie.css
diff --git a/theme/cloudy/base/css/ie6.css b/theme/base/css/ie6.css
index 76a82c004..76a82c004 100644
--- a/theme/cloudy/base/css/ie6.css
+++ b/theme/base/css/ie6.css
diff --git a/theme/cloudy/base/css/jquery.Jcrop.css b/theme/base/css/jquery.Jcrop.css
index 6c6dfb503..6c6dfb503 100644
--- a/theme/cloudy/base/css/jquery.Jcrop.css
+++ b/theme/base/css/jquery.Jcrop.css
diff --git a/theme/cloudy/base/css/mobile.css b/theme/base/css/mobile.css
index eee98317c..eee98317c 100644
--- a/theme/cloudy/base/css/mobile.css
+++ b/theme/base/css/mobile.css
diff --git a/theme/cloudy/base/css/print.css b/theme/base/css/print.css
index d76dd608c..d76dd608c 100644
--- a/theme/cloudy/base/css/print.css
+++ b/theme/base/css/print.css
diff --git a/theme/cloudy/base/css/thickbox.css b/theme/base/css/thickbox.css
index d24b9bedf..d24b9bedf 100644
--- a/theme/cloudy/base/css/thickbox.css
+++ b/theme/base/css/thickbox.css
diff --git a/theme/base/default-avatar-mini.png b/theme/base/default-avatar-mini.png
new file mode 100644
index 000000000..38b8692b4
--- /dev/null
+++ b/theme/base/default-avatar-mini.png
diff --git a/theme/base/default-avatar-profile.png b/theme/base/default-avatar-profile.png
new file mode 100644
index 000000000..f8357d4fc
--- /dev/null
+++ b/theme/base/default-avatar-profile.png
diff --git a/theme/base/default-avatar-stream.png b/theme/base/default-avatar-stream.png
new file mode 100644
index 000000000..6b63baa70
--- /dev/null
+++ b/theme/base/default-avatar-stream.png
diff --git a/theme/cloudy/base/images/icons/icon_atom.png b/theme/base/images/icons/icon_atom.png
index 6a001f11a..6a001f11a 100644
--- a/theme/cloudy/base/images/icons/icon_atom.png
+++ b/theme/base/images/icons/icon_atom.png
diff --git a/theme/cloudy/base/images/icons/icon_foaf.gif b/theme/base/images/icons/icon_foaf.gif
index f8f784423..f8f784423 100644
--- a/theme/cloudy/base/images/icons/icon_foaf.gif
+++ b/theme/base/images/icons/icon_foaf.gif
diff --git a/theme/cloudy/base/images/icons/icon_rss.png b/theme/base/images/icons/icon_rss.png
index 0ccd1ce25..0ccd1ce25 100644
--- a/theme/cloudy/base/images/icons/icon_rss.png
+++ b/theme/base/images/icons/icon_rss.png
diff --git a/theme/cloudy/base/images/icons/icon_vcard.gif b/theme/base/images/icons/icon_vcard.gif
index 6d52947f3..6d52947f3 100644
--- a/theme/cloudy/base/images/icons/icon_vcard.gif
+++ b/theme/base/images/icons/icon_vcard.gif
diff --git a/theme/cloudy/skin/default/images/icons/twotone/green/arrow-left.gif b/theme/base/images/icons/twotone/green/arrow-left.gif
index afed19084..afed19084 100644
--- a/theme/cloudy/skin/default/images/icons/twotone/green/arrow-left.gif
+++ b/theme/base/images/icons/twotone/green/arrow-left.gif
diff --git a/theme/cloudy/skin/default/images/icons/twotone/green/arrow-right.gif b/theme/base/images/icons/twotone/green/arrow-right.gif
index ee1707ed9..ee1707ed9 100644
--- a/theme/cloudy/skin/default/images/icons/twotone/green/arrow-right.gif
+++ b/theme/base/images/icons/twotone/green/arrow-right.gif
diff --git a/theme/default/skin/default/images/icons/twotone/green/disfavourite.gif b/theme/base/images/icons/twotone/green/disfavourite.gif
index 3946869ae..3946869ae 100644
--- a/theme/default/skin/default/images/icons/twotone/green/disfavourite.gif
+++ b/theme/base/images/icons/twotone/green/disfavourite.gif
diff --git a/theme/cloudy/skin/default/images/icons/twotone/green/edit.gif b/theme/base/images/icons/twotone/green/edit.gif
index c746aca60..c746aca60 100644
--- a/theme/cloudy/skin/default/images/icons/twotone/green/edit.gif
+++ b/theme/base/images/icons/twotone/green/edit.gif
diff --git a/theme/default/skin/default/images/icons/twotone/green/favourite.gif b/theme/base/images/icons/twotone/green/favourite.gif
index d93515e37..d93515e37 100644
--- a/theme/default/skin/default/images/icons/twotone/green/favourite.gif
+++ b/theme/base/images/icons/twotone/green/favourite.gif
diff --git a/theme/cloudy/skin/default/images/icons/twotone/green/mail.gif b/theme/base/images/icons/twotone/green/mail.gif
index 1084c862f..1084c862f 100644
--- a/theme/cloudy/skin/default/images/icons/twotone/green/mail.gif
+++ b/theme/base/images/icons/twotone/green/mail.gif
diff --git a/theme/cloudy/skin/default/images/icons/twotone/green/news.gif b/theme/base/images/icons/twotone/green/news.gif
index 712c685dc..712c685dc 100644
--- a/theme/cloudy/skin/default/images/icons/twotone/green/news.gif
+++ b/theme/base/images/icons/twotone/green/news.gif
diff --git a/theme/cloudy/skin/default/images/icons/twotone/green/quote.gif b/theme/base/images/icons/twotone/green/quote.gif
index 4ba1f0c03..4ba1f0c03 100644
--- a/theme/cloudy/skin/default/images/icons/twotone/green/quote.gif
+++ b/theme/base/images/icons/twotone/green/quote.gif
diff --git a/theme/default/skin/default/images/icons/twotone/green/reply.gif b/theme/base/images/icons/twotone/green/reply.gif
index 6ff01bb35..6ff01bb35 100644
--- a/theme/default/skin/default/images/icons/twotone/green/reply.gif
+++ b/theme/base/images/icons/twotone/green/reply.gif
diff --git a/theme/cloudy/skin/default/images/icons/twotone/green/shield.gif b/theme/base/images/icons/twotone/green/shield.gif
index 419d5ee4b..419d5ee4b 100644
--- a/theme/cloudy/skin/default/images/icons/twotone/green/shield.gif
+++ b/theme/base/images/icons/twotone/green/shield.gif
diff --git a/theme/default/skin/default/images/icons/twotone/green/trash.gif b/theme/base/images/icons/twotone/green/trash.gif
index 78dd64a3d..78dd64a3d 100644
--- a/theme/default/skin/default/images/icons/twotone/green/trash.gif
+++ b/theme/base/images/icons/twotone/green/trash.gif
diff --git a/theme/cloudy/base/images/illustrations/illu_jcrop.gif b/theme/base/images/illustrations/illu_jcrop.gif
index 72ea7ccb5..72ea7ccb5 100644
--- a/theme/cloudy/base/images/illustrations/illu_jcrop.gif
+++ b/theme/base/images/illustrations/illu_jcrop.gif
diff --git a/theme/cloudy/base/images/illustrations/illu_progress_loading-01.gif b/theme/base/images/illustrations/illu_progress_loading-01.gif
index 82290f483..82290f483 100644
--- a/theme/cloudy/base/images/illustrations/illu_progress_loading-01.gif
+++ b/theme/base/images/illustrations/illu_progress_loading-01.gif
diff --git a/theme/default/logo.png b/theme/base/logo.png
index 7c68b34f6..7c68b34f6 100644
--- a/theme/default/logo.png
+++ b/theme/base/logo.png
diff --git a/theme/cloudy/base/css/display.css b/theme/cloudy/css/display.css
index c71a59ef2..151758b48 100644
--- a/theme/cloudy/base/css/display.css
+++ b/theme/cloudy/css/display.css
@@ -1240,3 +1240,311 @@ padding-top:160px;
 #tag #form_notice {
 display:none;
 }
+
+
+html,
+body,
+a:active {
+background-color:#9AE4E8;
+}
+body {
+font-family:'Lucida Grande',sans-serif;
+background:#9AE4E8  url(../images/illustrations/illu_clouds-01.gif) 0 0 no-repeat;
+color:#333333;
+}
+#core {
+background:url(../images/illustrations/illu_arrow-up-01.gif) no-repeat 25px 0;
+}
+
+input, textarea, select, option {
+font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
+}
+input, textarea, select,
+.entity_remote_subscribe {
+border-color:#aaa;
+}
+#filter_tags ul li {
+border-color:#ddd;
+}
+
+.form_settings input.form_action-secondary {
+background:none;
+}
+
+input.submit,
+#form_notice.warning #notice_text-count,
+#nav_register a,
+.form_settings .form_note,
+.entity_remote_subscribe {
+background-color:#9BB43E;
+}
+
+input:focus, textarea:focus, select:focus,
+#form_notice.warning #notice_data-text {
+border-color:#9BB43E;
+}
+input.submit,
+#nav_register a,
+.entity_remote_subscribe {
+color:#fff;
+}
+
+a,
+div.notice-options input,
+.form_user_block input.submit,
+.form_user_unblock input.submit,
+.entity_send-a-message a,
+.form_user_nudge input.submit,
+.entity_nudge p,
+.form_settings input.form_action-secondary {
+color:#0084B4;
+}
+
+.notice,
+.profile {
+border-top-color:#DDFFCC;
+}
+.section .profile {
+border-top-color:#87B4C8;
+}
+
+
+#content .notice p.entry-content a:visited {
+background-color:#fcfcfc;
+}
+#content .notice p.entry-content .vcard a {
+background-color:#fcfffc;
+}
+
+#aside_primary {
+background-color:#DDFFCC;
+}
+
+
+#notice_text-count {
+color:#333;
+}
+#form_notice.warning #notice_text-count {
+color:#000;
+}
+#form_notice.processing #notice_action-submit {
+background:#fff url(../../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
+cursor:wait;
+text-indent:-9999px;
+}
+
+#content,
+#site_nav_local_views a,
+#aside_primary {
+border-color:#fff;
+}
+#content,
+#site_nav_local_views .current a {
+background-color:#fff;
+}
+
+#site_nav_local_views a {
+background-color:rgba(135, 180, 200, 0.3);
+}
+#site_nav_local_views a:hover {
+background-color:rgba(255, 255, 255, 0.7);
+}
+
+
+.error {
+background-color:#F7E8E8;
+}
+.success {
+background-color:#EFF3DC;
+}
+
+
+#anon_notice {
+background-color:#FEFFDF;
+color:#333;
+border-color:#fff;
+}
+
+#showstream #anon_notice {
+background-color:#FEFFDF;
+}
+
+
+#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);
+}
+#export_data li a.atom {
+background-image:url(../../base/images/icons/icon_atom.png);
+}
+#export_data li a.foaf {
+background-image:url(../../base/images/icons/icon_foaf.gif);
+}
+
+.entity_edit a,
+.entity_send-a-message a,
+.form_user_nudge input.submit,
+.form_user_block input.submit,
+.form_user_unblock input.submit,
+.entity_nudge p {
+background-position: 0 40%;
+background-repeat: no-repeat;
+background-color:transparent;
+}
+.form_group_join input.submit,
+.form_group_leave input.submit
+.form_user_subscribe input.submit,
+.form_user_unsubscribe input.submit {
+background-color:#9BB43E;
+color:#fff;
+}
+.form_user_unsubscribe input.submit,
+.form_group_leave input.submit {
+background-color:#87B4C8;
+}
+
+.entity_edit a {
+background-image:url(../images/icons/twotone/green/edit.gif);
+}
+.entity_send-a-message a {
+background-image:url(../images/icons/twotone/green/quote.gif);
+}
+.entity_nudge p,
+.form_user_nudge input.submit {
+background-image:url(../images/icons/twotone/green/mail.gif);
+}
+.form_user_block input.submit,
+.form_user_unblock input.submit {
+background-image:url(../images/icons/twotone/green/shield.gif);
+}
+
+
+
+/* NOTICES */
+.notices li.over {
+background-color:#fcfcfc;
+}
+
+.notice-options .notice_reply a,
+.notice-options form input.submit {
+background-color:transparent;
+}
+.notice-options .notice_reply a {
+background:transparent url(../images/icons/icon_reply.gif) no-repeat 0 45%;
+}
+.notice-options form.form_favor input.submit {
+background:transparent url(../images/icons/icon_favourite.gif) no-repeat 0 45%;
+}
+.notice-options form.form_disfavor input.submit {
+background:transparent url(../images/icons/icon_disfavourite.gif) no-repeat 0 45%;
+}
+.notice-options .notice_delete a {
+background:transparent url(../images/icons/icon_trash.gif) no-repeat 0 45%;
+}
+
+.notices div.entry-content,
+.notices div.notice-options {
+opacity:0.4;
+}
+.notices li.hover div.entry-content,
+.notices li.hover div.notice-options {
+opacity:1;
+}
+div.entry-content {
+color:#333;
+}
+div.notice-options a,
+div.notice-options input {
+font-family:sans-serif;
+}
+.notices li.hover {
+background-color:#fcfcfc;
+}
+/*END: NOTICES */
+
+
+#new_group a {
+background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%;
+}
+
+.pagination .nav_prev a,
+.pagination .nav_next a {
+background-repeat:no-repeat;
+border-color:#DDFFCC;
+}
+.pagination .nav_prev a {
+background-image:url(../../base/images/icons/twotone/green/arrow-left.gif);
+background-position:10% 45%;
+}
+.pagination .nav_next a {
+background-image:url(../../base/images/icons/twotone/green/arrow-right.gif);
+background-position:90% 45%;
+}
+
+
+/*--------------------------------------*/
+
+#anon_notice {
+background:url(../images/illustrations/illu_unicorn-01.png) no-repeat 0 0;
+}
+#showstream #anon_notice,
+#content .notice p.entry-content a:visited,
+content .notice p.entry-content .vcard a {
+background-color:transparent;
+}
+
+#anon_notice p {
+background-color:#FEFFDF;
+border-color:#FFFF00;
+}
+
+
+#form_notice .form_note {
+color:#CCC;
+}
+input.submit {
+background-color:#eee;
+color:#666;
+}
+
+.notices li.hover {
+background-color:#F7F7F7;
+}
+
+
+.notice div.entry-content,
+.notice div.entry-content a {
+color:#999;
+}
+
+.notices div.entry-content,
+.notices div.notice-options {
+opacity:1;
+}
+
+#site_nav_local_views {
+background-color:#DDFFCC;
+}
+#site_nav_local_views li,
+#aside_primary {
+border-color:#BDDCAD;
+}
+#site_nav_local_views a,
+.aside .section h2 {
+background-color:transparent;
+border-color:transparent;
+color:#4C4C4C;
+}
+#site_nav_local_views .current {
+border-left-color:#fff;
+}
+
+#site_nav_local_views .current a,
+#site_nav_global_primary,
+#footer {
+background-color:#fff;
+}
+
diff --git a/theme/cloudy/skin/default/css/ie.css b/theme/cloudy/css/ie.css
index 095122100..095122100 100644
--- a/theme/cloudy/skin/default/css/ie.css
+++ b/theme/cloudy/css/ie.css
diff --git a/theme/default/base/images/icons/icon_atom.png b/theme/cloudy/images/icons/icon_atom.png
index 6a001f11a..6a001f11a 100644
--- a/theme/default/base/images/icons/icon_atom.png
+++ b/theme/cloudy/images/icons/icon_atom.png
diff --git a/theme/cloudy/skin/default/images/icons/icon_disfavourite.gif b/theme/cloudy/images/icons/icon_disfavourite.gif
index 2b02ac8a6..2b02ac8a6 100644
--- a/theme/cloudy/skin/default/images/icons/icon_disfavourite.gif
+++ b/theme/cloudy/images/icons/icon_disfavourite.gif
diff --git a/theme/cloudy/skin/default/images/icons/icon_favourite.gif b/theme/cloudy/images/icons/icon_favourite.gif
index 716ce3549..716ce3549 100644
--- a/theme/cloudy/skin/default/images/icons/icon_favourite.gif
+++ b/theme/cloudy/images/icons/icon_favourite.gif
diff --git a/theme/cloudy/skin/default/images/icons/icon_foaf.gif b/theme/cloudy/images/icons/icon_foaf.gif
index f8f784423..f8f784423 100644
--- a/theme/cloudy/skin/default/images/icons/icon_foaf.gif
+++ b/theme/cloudy/images/icons/icon_foaf.gif
diff --git a/theme/cloudy/base/images/icons/icon_processing.gif b/theme/cloudy/images/icons/icon_processing.gif
index d0bce1542..d0bce1542 100644
--- a/theme/cloudy/base/images/icons/icon_processing.gif
+++ b/theme/cloudy/images/icons/icon_processing.gif
diff --git a/theme/cloudy/skin/default/images/icons/icon_reply.gif b/theme/cloudy/images/icons/icon_reply.gif
index a4379a70b..a4379a70b 100644
--- a/theme/cloudy/skin/default/images/icons/icon_reply.gif
+++ b/theme/cloudy/images/icons/icon_reply.gif
diff --git a/theme/default/base/images/icons/icon_rss.png b/theme/cloudy/images/icons/icon_rss.png
index 0ccd1ce25..0ccd1ce25 100644
--- a/theme/default/base/images/icons/icon_rss.png
+++ b/theme/cloudy/images/icons/icon_rss.png
diff --git a/theme/cloudy/skin/default/images/icons/icon_trash.gif b/theme/cloudy/images/icons/icon_trash.gif
index 916a332a3..916a332a3 100644
--- a/theme/cloudy/skin/default/images/icons/icon_trash.gif
+++ b/theme/cloudy/images/icons/icon_trash.gif
diff --git a/theme/cloudy/skin/default/images/icons/icon_vcard.gif b/theme/cloudy/images/icons/icon_vcard.gif
index 6d52947f3..6d52947f3 100644
--- a/theme/cloudy/skin/default/images/icons/icon_vcard.gif
+++ b/theme/cloudy/images/icons/icon_vcard.gif
diff --git a/theme/default/skin/default/images/icons/twotone/green/arrow-left.gif b/theme/cloudy/images/icons/twotone/green/arrow-left.gif
index afed19084..afed19084 100644
--- a/theme/default/skin/default/images/icons/twotone/green/arrow-left.gif
+++ b/theme/cloudy/images/icons/twotone/green/arrow-left.gif
diff --git a/theme/default/skin/default/images/icons/twotone/green/arrow-right.gif b/theme/cloudy/images/icons/twotone/green/arrow-right.gif
index ee1707ed9..ee1707ed9 100644
--- a/theme/default/skin/default/images/icons/twotone/green/arrow-right.gif
+++ b/theme/cloudy/images/icons/twotone/green/arrow-right.gif
diff --git a/theme/default/skin/default/images/icons/twotone/green/edit.gif b/theme/cloudy/images/icons/twotone/green/edit.gif
index c746aca60..c746aca60 100644
--- a/theme/default/skin/default/images/icons/twotone/green/edit.gif
+++ b/theme/cloudy/images/icons/twotone/green/edit.gif
diff --git a/theme/default/skin/default/images/icons/twotone/green/mail.gif b/theme/cloudy/images/icons/twotone/green/mail.gif
index 1084c862f..1084c862f 100644
--- a/theme/default/skin/default/images/icons/twotone/green/mail.gif
+++ b/theme/cloudy/images/icons/twotone/green/mail.gif
diff --git a/theme/default/skin/default/images/icons/twotone/green/news.gif b/theme/cloudy/images/icons/twotone/green/news.gif
index 712c685dc..712c685dc 100644
--- a/theme/default/skin/default/images/icons/twotone/green/news.gif
+++ b/theme/cloudy/images/icons/twotone/green/news.gif
diff --git a/theme/default/skin/default/images/icons/twotone/green/quote.gif b/theme/cloudy/images/icons/twotone/green/quote.gif
index 4ba1f0c03..4ba1f0c03 100644
--- a/theme/default/skin/default/images/icons/twotone/green/quote.gif
+++ b/theme/cloudy/images/icons/twotone/green/quote.gif
diff --git a/theme/default/skin/default/images/icons/twotone/green/shield.gif b/theme/cloudy/images/icons/twotone/green/shield.gif
index 419d5ee4b..419d5ee4b 100644
--- a/theme/default/skin/default/images/icons/twotone/green/shield.gif
+++ b/theme/cloudy/images/icons/twotone/green/shield.gif
diff --git a/theme/cloudy/skin/default/images/illustrations/illu_arrow-up-01.gif b/theme/cloudy/images/illustrations/illu_arrow-up-01.gif
index 577be1871..577be1871 100644
--- a/theme/cloudy/skin/default/images/illustrations/illu_arrow-up-01.gif
+++ b/theme/cloudy/images/illustrations/illu_arrow-up-01.gif
diff --git a/theme/cloudy/skin/default/images/illustrations/illu_clouds-01.gif b/theme/cloudy/images/illustrations/illu_clouds-01.gif
index 41cd622cf..41cd622cf 100644
--- a/theme/cloudy/skin/default/images/illustrations/illu_clouds-01.gif
+++ b/theme/cloudy/images/illustrations/illu_clouds-01.gif
diff --git a/theme/default/base/images/illustrations/illu_jcrop.gif b/theme/cloudy/images/illustrations/illu_jcrop.gif
index 72ea7ccb5..72ea7ccb5 100644
--- a/theme/default/base/images/illustrations/illu_jcrop.gif
+++ b/theme/cloudy/images/illustrations/illu_jcrop.gif
diff --git a/theme/default/base/images/illustrations/illu_progress_loading-01.gif b/theme/cloudy/images/illustrations/illu_progress_loading-01.gif
index 82290f483..82290f483 100644
--- a/theme/default/base/images/illustrations/illu_progress_loading-01.gif
+++ b/theme/cloudy/images/illustrations/illu_progress_loading-01.gif
diff --git a/theme/cloudy/skin/default/images/illustrations/illu_unicorn-01.png b/theme/cloudy/images/illustrations/illu_unicorn-01.png
index 6cb51b298..6cb51b298 100644
--- a/theme/cloudy/skin/default/images/illustrations/illu_unicorn-01.png
+++ b/theme/cloudy/images/illustrations/illu_unicorn-01.png
diff --git a/theme/cloudy/skin/default/css/display.css b/theme/cloudy/skin/default/css/display.css
deleted file mode 100644
index b30ca9d0d..000000000
--- a/theme/cloudy/skin/default/css/display.css
+++ /dev/null
@@ -1,314 +0,0 @@
-/** theme: twitter
- *
- * @package   Laconica
- * @author Sarven Capadisli <csarven@controlyourself.ca>
- * @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/
- */
-html,
-body,
-a:active {
-background-color:#9AE4E8;
-}
-body {
-font-family:'Lucida Grande',sans-serif;
-background:#9AE4E8  url(../images/illustrations/illu_clouds-01.gif) 0 0 no-repeat;
-color:#333333;
-}
-#core {
-background:url(../images/illustrations/illu_arrow-up-01.gif) no-repeat 25px 0;
-}
-
-input, textarea, select, option {
-font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
-}
-input, textarea, select,
-.entity_remote_subscribe {
-border-color:#aaa;
-}
-#filter_tags ul li {
-border-color:#ddd;
-}
-
-.form_settings input.form_action-secondary {
-background:none;
-}
-
-input.submit,
-#form_notice.warning #notice_text-count,
-#nav_register a,
-.form_settings .form_note,
-.entity_remote_subscribe {
-background-color:#9BB43E;
-}
-
-input:focus, textarea:focus, select:focus,
-#form_notice.warning #notice_data-text {
-border-color:#9BB43E;
-}
-input.submit,
-#nav_register a,
-.entity_remote_subscribe {
-color:#fff;
-}
-
-a,
-div.notice-options input,
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.entity_send-a-message a,
-.form_user_nudge input.submit,
-.entity_nudge p,
-.form_settings input.form_action-secondary {
-color:#0084B4;
-}
-
-.notice,
-.profile {
-border-top-color:#DDFFCC;
-}
-.section .profile {
-border-top-color:#87B4C8;
-}
-
-
-#content .notice p.entry-content a:visited {
-background-color:#fcfcfc;
-}
-#content .notice p.entry-content .vcard a {
-background-color:#fcfffc;
-}
-
-#aside_primary {
-background-color:#DDFFCC;
-}
-
-
-#notice_text-count {
-color:#333;
-}
-#form_notice.warning #notice_text-count {
-color:#000;
-}
-#form_notice.processing #notice_action-submit {
-background:#fff url(../../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
-cursor:wait;
-text-indent:-9999px;
-}
-
-#content,
-#site_nav_local_views a,
-#aside_primary {
-border-color:#fff;
-}
-#content,
-#site_nav_local_views .current a {
-background-color:#fff;
-}
-
-#site_nav_local_views a {
-background-color:rgba(135, 180, 200, 0.3);
-}
-#site_nav_local_views a:hover {
-background-color:rgba(255, 255, 255, 0.7);
-}
-
-
-.error {
-background-color:#F7E8E8;
-}
-.success {
-background-color:#EFF3DC;
-}
-
-
-#anon_notice {
-background-color:#FEFFDF;
-color:#333;
-border-color:#fff;
-}
-
-#showstream #anon_notice {
-background-color:#FEFFDF;
-}
-
-
-#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);
-}
-#export_data li a.atom {
-background-image:url(../../../base/images/icons/icon_atom.png);
-}
-#export_data li a.foaf {
-background-image:url(../../../base/images/icons/icon_foaf.gif);
-}
-
-.entity_edit a,
-.entity_send-a-message a,
-.form_user_nudge input.submit,
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.entity_nudge p {
-background-position: 0 40%;
-background-repeat: no-repeat;
-background-color:transparent;
-}
-.form_group_join input.submit,
-.form_group_leave input.submit
-.form_user_subscribe input.submit,
-.form_user_unsubscribe input.submit {
-background-color:#9BB43E;
-color:#fff;
-}
-.form_user_unsubscribe input.submit,
-.form_group_leave input.submit {
-background-color:#87B4C8;
-}
-
-.entity_edit a {
-background-image:url(../images/icons/twotone/green/edit.gif);
-}
-.entity_send-a-message a {
-background-image:url(../images/icons/twotone/green/quote.gif);
-}
-.entity_nudge p,
-.form_user_nudge input.submit {
-background-image:url(../images/icons/twotone/green/mail.gif);
-}
-.form_user_block input.submit,
-.form_user_unblock input.submit {
-background-image:url(../images/icons/twotone/green/shield.gif);
-}
-
-
-
-/* NOTICES */
-.notices li.over {
-background-color:#fcfcfc;
-}
-
-.notice-options .notice_reply a,
-.notice-options form input.submit {
-background-color:transparent;
-}
-.notice-options .notice_reply a {
-background:transparent url(../images/icons/icon_reply.gif) no-repeat 0 45%;
-}
-.notice-options form.form_favor input.submit {
-background:transparent url(../images/icons/icon_favourite.gif) no-repeat 0 45%;
-}
-.notice-options form.form_disfavor input.submit {
-background:transparent url(../images/icons/icon_disfavourite.gif) no-repeat 0 45%;
-}
-.notice-options .notice_delete a {
-background:transparent url(../images/icons/icon_trash.gif) no-repeat 0 45%;
-}
-
-.notices div.entry-content,
-.notices div.notice-options {
-opacity:0.4;
-}
-.notices li.hover div.entry-content,
-.notices li.hover div.notice-options {
-opacity:1;
-}
-div.entry-content {
-color:#333;
-}
-div.notice-options a,
-div.notice-options input {
-font-family:sans-serif;
-}
-.notices li.hover {
-background-color:#fcfcfc;
-}
-/*END: NOTICES */
-
-
-#new_group a {
-background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
-}
-
-.pagination .nav_prev a,
-.pagination .nav_next a {
-background-repeat:no-repeat;
-border-color:#DDFFCC;
-}
-.pagination .nav_prev a {
-background-image:url(../images/icons/twotone/green/arrow-left.gif);
-background-position:10% 45%;
-}
-.pagination .nav_next a {
-background-image:url(../images/icons/twotone/green/arrow-right.gif);
-background-position:90% 45%;
-}
-
-
-/*--------------------------------------*/
-
-#anon_notice {
-background:url(../images/illustrations/illu_unicorn-01.png) no-repeat 0 0;
-}
-#showstream #anon_notice,
-#content .notice p.entry-content a:visited,
-content .notice p.entry-content .vcard a {
-background-color:transparent;
-}
-
-#anon_notice p {
-background-color:#FEFFDF;
-border-color:#FFFF00;
-}
-
-
-#form_notice .form_note {
-color:#CCC;
-}
-input.submit {
-background-color:#eee;
-color:#666;
-}
-
-.notices li.hover {
-background-color:#F7F7F7;
-}
-
-
-.notice div.entry-content,
-.notice div.entry-content a {
-color:#999;
-}
-
-.notices div.entry-content,
-.notices div.notice-options {
-opacity:1;
-}
-
-#site_nav_local_views {
-background-color:#DDFFCC;
-}
-#site_nav_local_views li,
-#aside_primary {
-border-color:#BDDCAD;
-}
-#site_nav_local_views a,
-.aside .section h2 {
-background-color:transparent;
-border-color:transparent;
-color:#4C4C4C;
-}
-#site_nav_local_views .current {
-border-left-color:#fff;
-}
-
-#site_nav_local_views .current a,
-#site_nav_global_primary,
-#footer {
-background-color:#fff;
-}
-
diff --git a/theme/cloudy/skin/default/images/icons/icon_atom.jpg b/theme/cloudy/skin/default/images/icons/icon_atom.jpg
deleted file mode 100644
index 22853edc4..000000000
--- a/theme/cloudy/skin/default/images/icons/icon_atom.jpg
+++ /dev/null
diff --git a/theme/cloudy/skin/default/images/icons/icon_rss.jpg b/theme/cloudy/skin/default/images/icons/icon_rss.jpg
deleted file mode 100644
index da23422d0..000000000
--- a/theme/cloudy/skin/default/images/icons/icon_rss.jpg
+++ /dev/null
diff --git a/theme/default/base/css/facebookapp.css b/theme/default/base/css/facebookapp.css
deleted file mode 100644
index 163b41fb4..000000000
--- a/theme/default/base/css/facebookapp.css
+++ /dev/null
@@ -1,100 +0,0 @@
-@import url("display.css");
-@import url("../../identica/css/display.css");
-
-* {
-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/default/base/css/ie.css b/theme/default/base/css/ie.css
deleted file mode 100644
index 5d8bea8ae..000000000
--- a/theme/default/base/css/ie.css
+++ /dev/null
@@ -1,32 +0,0 @@
-/* IE specific styles */
-legend {
-margin-left:-7px;
-}
-input.checkbox {
-top:0;
-}
-#form_notice textarea {
-width:78%;
-}
-#form_notice #notice_action-submit {
-width:17%;
-max-width:17%;
-}
-#anon_notice {
-max-width:39%;
-}
-
-.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;
-}
-.entity_profile {
-width:64%;
-}
diff --git a/theme/default/base/css/ie6.css b/theme/default/base/css/ie6.css
deleted file mode 100644
index 76a82c004..000000000
--- a/theme/default/base/css/ie6.css
+++ /dev/null
@@ -1,30 +0,0 @@
-/* IE6 specific styles */
-address {
-margin-left:7px;
-}
-address .fn {
-display:none;
-}
-#content {
-width:70%;
-}
-#aside_primary {
-padding:5%;
-width:29.5%;
-}
-.entity_profile .entity_nickname,
-.entity_profile .entity_location,
-.entity_profile .entity_url,
-.entity_profile .entity_note,
-.entity_profile .entity_tags {
-margin-left:0;
-}
-.entity_profile .entity_depiction {
-margin-bottom:123px;
-}
-.entity_actions {
-width:20%;
-}
-.notice div.entry-content {
-width:63%;
-}
diff --git a/theme/default/base/css/jquery.Jcrop.css b/theme/default/base/css/jquery.Jcrop.css
deleted file mode 100644
index 6c6dfb503..000000000
--- a/theme/default/base/css/jquery.Jcrop.css
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Fixes issue here http://code.google.com/p/jcrop/issues/detail?id=1 */
-.jcrop-holder
-{
-	text-align: left;
-}
-
-.jcrop-vline, .jcrop-hline
-{
-	font-size: 0;
-	position: absolute;
-	background: #fff url(../images/illustrations/illu_jcrop.gif) top left repeat;
-	/*
-	opacity: .5;
-	*filter:alpha(opacity=50);
-	*/
-}
-.jcrop-vline { height: 100%; width: 1px !important; }
-.jcrop-hline { width: 100%; height: 1px !important; }
-.jcrop-handle {
-	font-size: 1px;
-	width: 7px !important;
-	height: 7px !important;
-	border: 1px #eee solid;
-	background-color: #333;
-	/*width: 9px;
-	height: 9px;*/
-}
-
-.jcrop-tracker {
-	/*background-color: gray;*/
-	width: 100%; height: 100%;
-}
-
-.custom .jcrop-vline,
-.custom .jcrop-hline
-{
-	background: yellow;
-}
-.custom .jcrop-handle
-{
-	border-color: black;
-	background-color: #C7BB00;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-}
diff --git a/theme/default/base/css/mobile.css b/theme/default/base/css/mobile.css
deleted file mode 100644
index eee98317c..000000000
--- a/theme/default/base/css/mobile.css
+++ /dev/null
@@ -1,150 +0,0 @@
-/** theme: base
- *
- * @package   Laconica
- * @author    Meitar Moscovitz <meitar@maymay.net>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
- */
-
-body {
-font-size:2.5em;
-}
-
-#wrap {
-width:95%;
-}
-
-#header,
-#header address,
-#anon_notice,
-#site_nav_local_views .nav,
-#form_notice,
-#form_notice .form_data li,
-#core,
-#content_inner,
-#notices_primary,
-.notice,
-.notice .entry-title,
-.notice div.entry-content,
-.notice-options,
-.notice .notice-options a,
-.pagination,
-.pagination .nav,
-.aside .section {
-float:none;
-}
-
-.notice-options .notice_reply,
-.notice-options .notice_delete,
-.notice-options .form_favor,
-.notice-options .form_disfavor {
-position:static;
-}
-
-#form_notice,
-#anon_notice,
-#footer,
-#form_notice .form_actions input.submit {
-width:auto;
-}
-
-.form_settings label {
-width:25%;
-}
-.form_settings .form_data p.form_guide {
-margin-left:26%;
-}
-
-#site_nav_global_primary {
-width:75%;
-}
-
-.entity_profile {
-width:65%;
-}
-.entity_actions {
-margin-left:0;
-}
-
-#form_notice,
-#anon_notice {
-clear:both;
-}
-
-#content,
-#aside_primary {
-width:96%;
-padding-left:2%;
-padding-right:2%;
-}
-
-#site_notice {
-position:static;
-float:right;
-clear:right;
-width:75%;
-margin-right:0;
-margin-bottom:11px;
-}
-
-.notices {
-font-size:1.5em;
-}
-
-#form_notice textarea {
-width:80%;
-height:5em;
-}
-#form_notice .form_note {
-right:20%;
-top:6em;
-}
-
-
-.vcard .photo,
-.section .vcard .photo {
-margin-right:18px;
-}
-.notice,
-.profile {
-margin-bottom:18px;
-}
-
-.notices .entry-title,
-.notices div.entry-content {
-width:90%;
-}
-.notice div.entry-content {
-margin-left:0;
-}
-
-.notice .author .photo {
-height:4.5em;
-width:4.5em;
-}
-.notice-options {
-position:absolute;
-top:0;
-right:0;
-padding-left:7%;
-width:3%;
-}
-
-.notice-options .notice_delete a {
-float:left;
-}
-.pagination .nav {
-overflow:auto;
-}
-
-#export_data {
-display:none;
-}
-
-#site_nav_local_views li {
-margin-right:4px;
-}
-#site_nav_local_views a {
-padding:18px 11px;
-}
diff --git a/theme/default/base/css/print.css b/theme/default/base/css/print.css
deleted file mode 100644
index d76dd608c..000000000
--- a/theme/default/base/css/print.css
+++ /dev/null
@@ -1,36 +0,0 @@
-/** theme: base
- *
- * @package   Laconica
- * @author Sarven Capadisli <csarven@controlyourself.ca>
- * @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/
- */
-
-a:after { background-color:#fff; }
-a:not([href^="#"]):after { content:" ( "attr(href)" ) "; }
-
-img { border:none; }
-p { orphans: 2; widows: 1; }
-
-#site_nav_global_primary,
-#site_nav_local_views,
-#form_notice,
-.pagination,
-#site_nav_global_secondary,
-.entity_actions,
-.notice-options,
-#aside_primary,
-.form_subscription_edit .submit {
-display:none;
-}
-
-.timestamp dt, .timestamp dd,
-.device dt, .device dd {
-display:inline;
-}
-
-.profiles li,
-.notices li {
-margin-bottom:18px;
-}
diff --git a/theme/default/base/css/thickbox.css b/theme/default/base/css/thickbox.css
deleted file mode 100644
index d24b9bedf..000000000
--- a/theme/default/base/css/thickbox.css
+++ /dev/null
@@ -1,163 +0,0 @@
-/* ----------------------------------------------------------------------------------------------------------------*/
-/* ---------->>> global settings needed for thickbox <<<-----------------------------------------------------------*/
-/* ----------------------------------------------------------------------------------------------------------------*/
-*{padding: 0; margin: 0;}
-
-/* ----------------------------------------------------------------------------------------------------------------*/
-/* ---------->>> thickbox specific link and font settings <<<------------------------------------------------------*/
-/* ----------------------------------------------------------------------------------------------------------------*/
-#TB_window {
-	font: 12px Arial, Helvetica, sans-serif;
-	color: #333333;
-}
-
-#TB_secondLine {
-	font: 10px Arial, Helvetica, sans-serif;
-	color:#666666;
-}
-
-#TB_window a:link {color: #666666;}
-#TB_window a:visited {color: #666666;}
-#TB_window a:hover {color: #000;}
-#TB_window a:active {color: #666666;}
-#TB_window a:focus{color: #666666;}
-
-/* ----------------------------------------------------------------------------------------------------------------*/
-/* ---------->>> thickbox settings <<<-----------------------------------------------------------------------------*/
-/* ----------------------------------------------------------------------------------------------------------------*/
-#TB_overlay {
-	position: fixed;
-	z-index:100;
-	top: 0px;
-	left: 0px;
-	height:100%;
-	width:100%;
-}
-
-.TB_overlayMacFFBGHack {background: url(macFFBgHack.png) repeat;}
-.TB_overlayBG {
-	background-color:#000;
-	filter:alpha(opacity=75);
-	-moz-opacity: 0.75;
-	opacity: 0.75;
-}
-
-* html #TB_overlay { /* ie6 hack */
-     position: absolute;
-     height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
-}
-
-#TB_window {
-	position: fixed;
-	background: #ffffff;
-	z-index: 102;
-	color:#000000;
-	display:none;
-	border: 4px solid #525252;
-	text-align:left;
-	top:50%;
-	left:50%;
-}
-
-* html #TB_window { /* ie6 hack */
-position: absolute;
-margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
-}
-
-#TB_window img#TB_Image {
-	display:block;
-	margin: 15px 0 0 15px;
-	border-right: 1px solid #ccc;
-	border-bottom: 1px solid #ccc;
-	border-top: 1px solid #666;
-	border-left: 1px solid #666;
-}
-
-#TB_caption{
-	height:25px;
-	padding:7px 30px 10px 25px;
-	float:left;
-}
-
-#TB_closeWindow{
-	height:25px;
-	padding:11px 25px 10px 0;
-	float:right;
-}
-
-#TB_closeAjaxWindow{
-	padding:7px 10px 5px 0;
-	margin-bottom:1px;
-	text-align:right;
-	float:right;
-}
-
-#TB_ajaxWindowTitle{
-	float:left;
-	padding:7px 0 5px 10px;
-	margin-bottom:1px;
-}
-
-#TB_title{
-	background-color:#e8e8e8;
-	height:27px;
-}
-
-#TB_ajaxContent{
-	clear:both;
-	padding:2px 15px 15px 15px;
-	overflow:auto;
-	text-align:left;
-	line-height:1.4em;
-}
-
-#TB_ajaxContent.TB_modal{
-	padding:15px;
-}
-
-#TB_ajaxContent p{
-	padding:5px 0px 5px 0px;
-}
-
-#TB_load{
-	position: fixed;
-	display:none;
-	height:13px;
-	width:208px;
-	z-index:103;
-	top: 50%;
-	left: 50%;
-	margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */
-}
-
-* html #TB_load { /* ie6 hack */
-position: absolute;
-margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
-}
-
-#TB_HideSelect{
-	z-index:99;
-	position:fixed;
-	top: 0;
-	left: 0;
-	background-color:#fff;
-	border:none;
-	filter:alpha(opacity=0);
-	-moz-opacity: 0;
-	opacity: 0;
-	height:100%;
-	width:100%;
-}
-
-* html #TB_HideSelect { /* ie6 hack */
-     position: absolute;
-     height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
-}
-
-#TB_iframeContent{
-	clear:both;
-	border:none;
-	margin-bottom:-1px;
-	margin-top:1px;
-	_margin-bottom:1px;
-}
diff --git a/theme/default/base/images/icons/icon_foaf.gif b/theme/default/base/images/icons/icon_foaf.gif
deleted file mode 100644
index f8f784423..000000000
--- a/theme/default/base/images/icons/icon_foaf.gif
+++ /dev/null
diff --git a/theme/default/base/images/icons/icon_processing.gif b/theme/default/base/images/icons/icon_processing.gif
deleted file mode 100644
index d0bce1542..000000000
--- a/theme/default/base/images/icons/icon_processing.gif
+++ /dev/null
diff --git a/theme/default/base/images/icons/icon_vcard.gif b/theme/default/base/images/icons/icon_vcard.gif
deleted file mode 100644
index 6d52947f3..000000000
--- a/theme/default/base/images/icons/icon_vcard.gif
+++ /dev/null
diff --git a/theme/default/skin/default/css/display.css b/theme/default/css/display.css
index e290c208b..2f41a9843 100644
--- a/theme/default/skin/default/css/display.css
+++ b/theme/default/css/display.css
@@ -7,6 +7,8 @@
  * @link      http://laconi.ca/
  */
 
+@import url(../../base/css/display.css);
+
 html,
 body,
 a:active {
@@ -90,7 +92,7 @@ color:#333;
 color:#000;
 }
 #form_notice.processing #notice_action-submit {
-background:#fff url(../../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
+background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 cursor:wait;
 text-indent:-9999px;
 }
@@ -137,13 +139,13 @@ background-repeat:no-repeat;
 background-position:0 45%;
 }
 #export_data li a.rss {
-background-image:url(../../../base/images/icons/icon_rss.png);
+background-image:url(../../base/images/icons/icon_rss.png);
 }
 #export_data li a.atom {
-background-image:url(../../../base/images/icons/icon_atom.png);
+background-image:url(../../base/images/icons/icon_atom.png);
 }
 #export_data li a.foaf {
-background-image:url(../../../base/images/icons/icon_foaf.gif);
+background-image:url(../../base/images/icons/icon_foaf.gif);
 }
 
 .entity_edit a,
@@ -170,18 +172,18 @@ background-color:#97BFD1;
 }
 
 .entity_edit a {
-background-image:url(../images/icons/twotone/green/edit.gif);
+background-image:url(../../base/images/icons/twotone/green/edit.gif);
 }
 .entity_send-a-message a {
-background-image:url(../images/icons/twotone/green/quote.gif);
+background-image:url(../../base/images/icons/twotone/green/quote.gif);
 }
 .entity_nudge p,
 .form_user_nudge input.submit {
-background-image:url(../images/icons/twotone/green/mail.gif);
+background-image:url(../../base/images/icons/twotone/green/mail.gif);
 }
 .form_user_block input.submit,
 .form_user_unblock input.submit {
-background-image:url(../images/icons/twotone/green/shield.gif);
+background-image:url(../../base/images/icons/twotone/green/shield.gif);
 }
 
 
@@ -196,16 +198,16 @@ background-color:#fcfcfc;
 background-color:transparent;
 }
 .notice-options .notice_reply a {
-background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/twotone/green/reply.gif) no-repeat 0 45%;
 }
 .notice-options form.form_favor input.submit {
-background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
 }
 .notice-options form.form_disfavor input.submit {
-background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
 }
 .notice-options .notice_delete a {
-background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%;
 }
 
 .notices div.entry-content,
@@ -230,7 +232,7 @@ background-color:#fcfcfc;
 
 
 #new_group a {
-background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%;
 }
 
 .pagination .nav_prev a,
@@ -239,10 +241,10 @@ background-repeat:no-repeat;
 border-color:#D1D9E4;
 }
 .pagination .nav_prev a {
-background-image:url(../images/icons/twotone/green/arrow-left.gif);
+background-image:url(../../base/images/icons/twotone/green/arrow-left.gif);
 background-position:10% 45%;
 }
 .pagination .nav_next a {
-background-image:url(../images/icons/twotone/green/arrow-right.gif);
+background-image:url(../../base/images/icons/twotone/green/arrow-right.gif);
 background-position:90% 45%;
 }
diff --git a/theme/default/skin/default/css/ie.css b/theme/default/css/ie.css
index 2b06768ea..2b06768ea 100644
--- a/theme/default/skin/default/css/ie.css
+++ b/theme/default/css/ie.css
diff --git a/theme/default/skin/default/images/icons/icon_atom.jpg b/theme/default/skin/default/images/icons/icon_atom.jpg
deleted file mode 100644
index 22853edc4..000000000
--- a/theme/default/skin/default/images/icons/icon_atom.jpg
+++ /dev/null
diff --git a/theme/default/skin/default/images/icons/icon_foaf.gif b/theme/default/skin/default/images/icons/icon_foaf.gif
deleted file mode 100644
index f8f784423..000000000
--- a/theme/default/skin/default/images/icons/icon_foaf.gif
+++ /dev/null
diff --git a/theme/default/skin/default/images/icons/icon_rss.jpg b/theme/default/skin/default/images/icons/icon_rss.jpg
deleted file mode 100644
index da23422d0..000000000
--- a/theme/default/skin/default/images/icons/icon_rss.jpg
+++ /dev/null
diff --git a/theme/default/skin/default/images/icons/icon_vcard.gif b/theme/default/skin/default/images/icons/icon_vcard.gif
deleted file mode 100644
index 6d52947f3..000000000
--- a/theme/default/skin/default/images/icons/icon_vcard.gif
+++ /dev/null
diff --git a/theme/default/skin/identica/images/icons/icon_atom.jpg b/theme/default/skin/identica/images/icons/icon_atom.jpg
deleted file mode 100644
index 22853edc4..000000000
--- a/theme/default/skin/identica/images/icons/icon_atom.jpg
+++ /dev/null
diff --git a/theme/default/skin/identica/images/icons/icon_foaf.gif b/theme/default/skin/identica/images/icons/icon_foaf.gif
deleted file mode 100644
index f8f784423..000000000
--- a/theme/default/skin/identica/images/icons/icon_foaf.gif
+++ /dev/null
diff --git a/theme/default/skin/identica/images/icons/icon_rss.jpg b/theme/default/skin/identica/images/icons/icon_rss.jpg
deleted file mode 100644
index da23422d0..000000000
--- a/theme/default/skin/identica/images/icons/icon_rss.jpg
+++ /dev/null
diff --git a/theme/default/skin/identica/images/icons/icon_vcard.gif b/theme/default/skin/identica/images/icons/icon_vcard.gif
deleted file mode 100644
index 6d52947f3..000000000
--- a/theme/default/skin/identica/images/icons/icon_vcard.gif
+++ /dev/null
diff --git a/theme/default/skin/identica/images/icons/twotone/green/arrow-left.gif b/theme/default/skin/identica/images/icons/twotone/green/arrow-left.gif
deleted file mode 100644
index afed19084..000000000
--- a/theme/default/skin/identica/images/icons/twotone/green/arrow-left.gif
+++ /dev/null
diff --git a/theme/default/skin/identica/images/icons/twotone/green/arrow-right.gif b/theme/default/skin/identica/images/icons/twotone/green/arrow-right.gif
deleted file mode 100644
index ee1707ed9..000000000
--- a/theme/default/skin/identica/images/icons/twotone/green/arrow-right.gif
+++ /dev/null
diff --git a/theme/default/skin/identica/images/icons/twotone/green/disfavourite.gif b/theme/default/skin/identica/images/icons/twotone/green/disfavourite.gif
deleted file mode 100644
index 3946869ae..000000000
--- a/theme/default/skin/identica/images/icons/twotone/green/disfavourite.gif
+++ /dev/null
diff --git a/theme/default/skin/identica/images/icons/twotone/green/edit.gif b/theme/default/skin/identica/images/icons/twotone/green/edit.gif
deleted file mode 100644
index c746aca60..000000000
--- a/theme/default/skin/identica/images/icons/twotone/green/edit.gif
+++ /dev/null
diff --git a/theme/default/skin/identica/images/icons/twotone/green/favourite.gif b/theme/default/skin/identica/images/icons/twotone/green/favourite.gif
deleted file mode 100644
index d93515e37..000000000
--- a/theme/default/skin/identica/images/icons/twotone/green/favourite.gif
+++ /dev/null
diff --git a/theme/default/skin/identica/images/icons/twotone/green/mail.gif b/theme/default/skin/identica/images/icons/twotone/green/mail.gif
deleted file mode 100644
index 1084c862f..000000000
--- a/theme/default/skin/identica/images/icons/twotone/green/mail.gif
+++ /dev/null
diff --git a/theme/default/skin/identica/images/icons/twotone/green/news.gif b/theme/default/skin/identica/images/icons/twotone/green/news.gif
deleted file mode 100644
index 712c685dc..000000000
--- a/theme/default/skin/identica/images/icons/twotone/green/news.gif
+++ /dev/null
diff --git a/theme/default/skin/identica/images/icons/twotone/green/quote.gif b/theme/default/skin/identica/images/icons/twotone/green/quote.gif
deleted file mode 100644
index 4ba1f0c03..000000000
--- a/theme/default/skin/identica/images/icons/twotone/green/quote.gif
+++ /dev/null
diff --git a/theme/default/skin/identica/images/icons/twotone/green/reply.gif b/theme/default/skin/identica/images/icons/twotone/green/reply.gif
deleted file mode 100644
index 6ff01bb35..000000000
--- a/theme/default/skin/identica/images/icons/twotone/green/reply.gif
+++ /dev/null
diff --git a/theme/default/skin/identica/images/icons/twotone/green/shield.gif b/theme/default/skin/identica/images/icons/twotone/green/shield.gif
deleted file mode 100644
index 419d5ee4b..000000000
--- a/theme/default/skin/identica/images/icons/twotone/green/shield.gif
+++ /dev/null
diff --git a/theme/default/skin/identica/images/icons/twotone/green/trash.gif b/theme/default/skin/identica/images/icons/twotone/green/trash.gif
deleted file mode 100644
index 78dd64a3d..000000000
--- a/theme/default/skin/identica/images/icons/twotone/green/trash.gif
+++ /dev/null
diff --git a/theme/default/skin/identica/css/display.css b/theme/identica/css/display.css
index a44b8cdd7..a96118897 100644
--- a/theme/default/skin/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -7,6 +7,8 @@
  * @link      http://laconi.ca/
  */
 
+@import url(../../base/css/display.css);
+
 html,
 body,
 a:active {
@@ -90,7 +92,7 @@ color:#333;
 color:#000;
 }
 #form_notice.processing #notice_action-submit {
-background:#fff url(../../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
+background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 cursor:wait;
 text-indent:-9999px;
 }
@@ -137,13 +139,13 @@ background-repeat:no-repeat;
 background-position:0 45%;
 }
 #export_data li a.rss {
-background-image:url(../../../base/images/icons/icon_rss.png);
+background-image:url(../../base/images/icons/icon_rss.png);
 }
 #export_data li a.atom {
-background-image:url(../../../base/images/icons/icon_atom.png);
+background-image:url(../../base/images/icons/icon_atom.png);
 }
 #export_data li a.foaf {
-background-image:url(../../../base/images/icons/icon_foaf.gif);
+background-image:url(../../base/images/icons/icon_foaf.gif);
 }
 
 .entity_edit a,
@@ -170,18 +172,18 @@ background-color:#87B4C8;
 }
 
 .entity_edit a {
-background-image:url(../images/icons/twotone/green/edit.gif);
+background-image:url(../../base/images/icons/twotone/green/edit.gif);
 }
 .entity_send-a-message a {
-background-image:url(../images/icons/twotone/green/quote.gif);
+background-image:url(../../base/images/icons/twotone/green/quote.gif);
 }
 .entity_nudge p,
 .form_user_nudge input.submit {
-background-image:url(../images/icons/twotone/green/mail.gif);
+background-image:url(../../base/images/icons/twotone/green/mail.gif);
 }
 .form_user_block input.submit,
 .form_user_unblock input.submit {
-background-image:url(../images/icons/twotone/green/shield.gif);
+background-image:url(../../base/images/icons/twotone/green/shield.gif);
 }
 
 
@@ -196,16 +198,16 @@ background-color:#fcfcfc;
 background-color:transparent;
 }
 .notice-options .notice_reply a {
-background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/twotone/green/reply.gif) no-repeat 0 45%;
 }
 .notice-options form.form_favor input.submit {
-background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
 }
 .notice-options form.form_disfavor input.submit {
-background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
 }
 .notice-options .notice_delete a {
-background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%;
 }
 
 .notices div.entry-content,
@@ -230,7 +232,7 @@ background-color:#fcfcfc;
 
 
 #new_group a {
-background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%;
 }
 
 .pagination .nav_prev a,
@@ -239,10 +241,10 @@ background-repeat:no-repeat;
 border-color:#CEE1E9;
 }
 .pagination .nav_prev a {
-background-image:url(../images/icons/twotone/green/arrow-left.gif);
+background-image:url(../../base/images/icons/twotone/green/arrow-left.gif);
 background-position:10% 45%;
 }
 .pagination .nav_next a {
-background-image:url(../images/icons/twotone/green/arrow-right.gif);
+background-image:url(../../base/images/icons/twotone/green/arrow-right.gif);
 background-position:90% 45%;
 }
diff --git a/theme/default/skin/identica/css/ie.css b/theme/identica/css/ie.css
index 2f463bb44..2f463bb44 100644
--- a/theme/default/skin/identica/css/ie.css
+++ b/theme/identica/css/ie.css
diff --git a/theme/identica/default-avatar-mini.png b/theme/identica/default-avatar-mini.png
new file mode 100644
index 000000000..38b8692b4
--- /dev/null
+++ b/theme/identica/default-avatar-mini.png
diff --git a/theme/identica/default-avatar-profile.png b/theme/identica/default-avatar-profile.png
new file mode 100644
index 000000000..f8357d4fc
--- /dev/null
+++ b/theme/identica/default-avatar-profile.png
diff --git a/theme/identica/default-avatar-stream.png b/theme/identica/default-avatar-stream.png
new file mode 100644
index 000000000..6b63baa70
--- /dev/null
+++ b/theme/identica/default-avatar-stream.png
diff --git a/theme/identica/logo.png b/theme/identica/logo.png
new file mode 100644
index 000000000..7c68b34f6
--- /dev/null
+++ b/theme/identica/logo.png