Merge branch 'uiredesign' of /var/www/trunk into uiredesign

89 files changed, 443 insertions, 129 deletions

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 7433a45e4..e337f1c98 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -48,13 +48,20 @@ input, textarea, select, option {
 padding:4px;
 font-family:sans-serif;
 font-size:1em;
--moz-border-radius:4px;
 }
-input:focus, textarea:focus, select:focus {
+input, textarea, select {
 border-width:2px;
 border-style: solid;
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+}
+input.submit {
+font-weight:bold;
+}
+textarea {
+overflow:auto;
 }
-
 select, option {
 padding-bottom:0;
 }
@@ -73,28 +80,25 @@ font-weight:bold;
 form ul li input {
 }
 
-form input.checkbox {
+input.checkbox {
 position:relative;
 top:2px;
 left:0;
+border:0;
 }
 
-#page_notice .error {
-background-color:#F7E8E8;
+#page_notice .error,
+#page_notice .success {
 padding:4px 7px;
+border-radius:4px;
 -moz-border-radius:4px;
+-webkit-border-radius:4px;
 }
 form label.submit {
 display:none;
 }
-form .error_message {
-display:block;
-}
-.form_response {
-margin-bottom:18px;
-}
-
-form input.submit {
+.form_settings input.remove {
+margin-left:11px;
 }
 
 
@@ -110,20 +114,24 @@ font-style:italic;
 }
 
 
-.form_settings .form_datas li {
+.form_settings .form_data li {
 width:100%;
 float:left;
 }
 
-.form_settings .form_datas label,
-.form_settings .form_datas input {
-margin-right:11px;
+.form_settings .form_data label {
+float:left;
+}
+.form_settings .form_data textarea,
+.form_settings .form_data select,
+.form_settings .form_data input {
+margin-left:11px;
 float:left;
 }
 
 .form_settings label {
-margin-top:7px;
-width:123px;
+margin-top:2px;
+width:152px;
 }
 
 .form_actions label {
@@ -136,13 +144,14 @@ font-weight:bold;
 }
 
 #form_settings_profile legend,
-#form_login legend {
+#form_login legend,
+#form_register legend {
 display:none;
 }
 
-.form_settings .form_datas p.form_guide {
+.form_settings .form_data p.form_guide {
 clear:both;
-margin-left:134px;
+margin-left:163px;
 margin-bottom:0;
 }
 
@@ -152,20 +161,27 @@ margin-bottom:11px;
 
 .form_settings input.checkbox {
 margin-top:3px;
+margin-left:0;
 }
 .form_settings label.checkbox {
 font-weight:normal;
-width:auto;
 margin-top:0;
+margin-right:0;
+margin-left:11px;
+float:left;
+width:90%;
 }
 
-#form_login p.form_guide {
+#form_login p.form_guide,
+#form_register #settings_rememberme p.form_guide {
 margin-left:0;
 }
 
 
 .form_settings .form_note {
+border-radius:4px;
 -moz-border-radius:4px;
+-webkit-border-radius:4px;
 padding:0 7px;
 }
 
@@ -179,13 +195,11 @@ float:left;
 margin-bottom:18px;
 margin-left:18px;
 }
-address .fn,
-address .email {
-display:none;
+address.vcard img.logo {
+margin-right:0;
 }
 
 
-
 #header {
 width:100%;
 position:relative;
@@ -196,6 +210,8 @@ margin-bottom:29px;
 
 #site_nav_global_primary {
 float:right;
+margin-right:18px;
+margin-bottom:11px;
 }
 #site_nav_global_primary ul li {
 display:inline;
@@ -226,8 +242,8 @@ margin-bottom:18px;
 
 #footer {
 float:left;
-width:68%;
-padding-bottom:11px;
+width:64%;
+padding:18px;
 }
 
 
@@ -250,9 +266,12 @@ text-decoration:none;
 padding:4px 11px;
 -moz-border-radius-topleft:4px;
 -moz-border-radius-topright:4px;
+-webkit-border-top-left-radius:4px;
+-webkit-border-top-right-radius:4px;
 border-width:1px;
 border-style:solid;
 border-bottom:0;
+text-shadow: 4px 4px 4px #ddd;
 font-weight:bold;
 }
 #site_nav_local_views .nav {
@@ -318,8 +337,8 @@ margin-bottom:11px;
 line-height:1.5;
 }
 
-
-#site_content_license_cc p {
+#site_content_license_cc {
+margin-bottom:0;
 }
 #site_content_license_cc img {
 display:inline;
@@ -347,12 +366,17 @@ margin-bottom:1em;
 width:644px;
 padding:18px;
 float:left;
+border-radius:7px;
 -moz-border-radius:7px;
 -moz-border-radius-topleft:0;
+-webkit-border-radius:7px;
+-webkit-border-top-left-radius:0;
 }
 
 #content_inner {
 position:relative;
+width:100%;
+float;left;
 }
 
 #aside_primary {
@@ -360,7 +384,9 @@ width:300px;
 float:left;
 margin-left:2px;
 padding:18px 4px 18px 18px;
+border-radius:7px;
 -moz-border-radius:7px;
+-webkit-border-radius:7px;
 }
 
 
@@ -371,7 +397,6 @@ padding:18px 4px 18px 18px;
 width:384px;
 width:458px;
 float:left;
-margin-left:68px;
 position:relative;
 line-height:1;
 }
@@ -383,20 +408,21 @@ padding:0;
 display:none;
 }
 #form_notice textarea {
--moz-border-radius:4px;
-width:304px;
+border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
 width:377px;
-height:95px;
+width:370px;
 height:86px;
 line-height:1.5;
-padding:7px 7px 14px 7px;
+padding:7px 7px 16px 7px;
 }
 #form_notice label {
 display:block;
 font-size:1.3em;
 margin-bottom:7px;
 }
-#form_notice .form_datas li {
+#form_notice .form_data li {
 float:left;
 }
 
@@ -412,8 +438,7 @@ margin-left:4px;
 
 #form_notice .form_note {
 position:absolute;
-top:125px;
-top:116px;
+top:120px;
 right:98px;
 z-index:9;
 }
@@ -441,10 +466,14 @@ text-indent:-9999px;
 }
 #form_notice .form_actions {
 position:absolute;
-top:107px;
-top:98px;
+bottom:0;
 right:0;
 }
+#form_notice .form_actions input.submit {
+width:60px;
+padding:8px;
+}
+
 #form_notice li {
 margin-bottom:0;
 }
@@ -664,8 +693,10 @@ border-top:1px dashed #D1D9E4;
 list-style-type:none;
 /*margin-bottom:11px;*/
 }
-.notices li.over {
-background-color:#fcfcfc;
+.notices li.hover {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
 }
 
 
@@ -673,7 +704,9 @@ background-color:#fcfcfc;
 #notices_primary {
 float:left;
 width:644px;
+border-radius:7px;
 -moz-border-radius:7px;
+-webkit-border-radius:7px;
 }
 #notices_primary h2 {
 display:none;
@@ -715,6 +748,7 @@ font-style:italic;
 
 .notice .entry-title {
 float:left;
+width:100%;
 }
 .notice p.entry-content {
 display:inline;
@@ -730,20 +764,17 @@ display:inline;
 #laconicat .notice p.entry-content {
 /*margin-left:199px;*/
 }
-.notice p.entry-content a {
-
-}
-.notice p.entry-content a:hover {
-
-}
-.notice p.entry-content .tag a {
-
+.notice p.entry-content a:visited {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
 }
-.notice p.entry-content .tag a:hover {
-
+.notice p.entry-content .vcard a {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
 }
 
-
 .notice div.entry-content {
 /*border:1px solid blue;*/
 clear:left;
@@ -860,15 +891,18 @@ padding-left:16px;
 
 .notice-options form input.submit {
 cursor:pointer;
-padding:2px 0 2px 10px;
+width:16px;
+padding:2px 0;
 }
 
 .notice-options .notice_delete dt,
-.notice-options .form_favor legend {
+.notice-options .form_favor legend,
+.notice-options .form_disfavor legend {
 display:none;
 }
 .notice-options .notice_delete fieldset,
-.notice-options .form_favor fieldset {
+.notice-options .form_favor fieldset,
+.notice-options .form_disfavor fieldset {
 border:0;
 padding:0;
 }
@@ -908,11 +942,13 @@ border-bottom:0;
 
 .pagination .nav_prev a {
 -moz-border-radius-topright:7px;
+-webkit-border-top-right-radius:7px;
 padding-left:20px;
 border-left:0;
 }
 .pagination .nav_next a {
 -moz-border-radius-topleft:7px;
+-webkit-border-top-left-radius:7px;
 padding-right:20px;
 border-right:0;
 }
@@ -944,12 +980,12 @@ background-color:#D1D9E4;
 
 
 #user_actions #user_subscribe .form_note,
-#user_actions #user_subscribe .form_datas,
+#user_actions #user_subscribe .form_data,
 #user_actions #user_subscribe .form_actions label {
 display:none;
 }
 #form_user-relationship .form_note,
-#form_user-relationship .form_datas,
+#form_user-relationship .form_data,
 #form_user-relationship .form_actions label {
 display:block;
 }
@@ -957,7 +993,7 @@ display:block;
 #user_actions #user-relationship_submit {
 margin-bottom:0;
 }
-#form_user-relationship .form_datas li label {
+#form_user-relationship .form_data li label {
 margin-right:11px;
 }
 
@@ -1035,7 +1071,7 @@ font-size:2.2em;
 
 
 
-#form_settings_photo .form_datas {
+#form_settings_photo .form_data {
 clear:both;
 }
 
@@ -1127,7 +1163,9 @@ height:109px;
 border-width:1px;
 border-style:dotted;
 text-decoration:none;
+border-radius:7px;
 -moz-border-radius:7px;
+-webkit-border-radius:7px;
 padding:7px;
 font-size:1.6em;
 font-weight:bold;
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
new file mode 100644
index 000000000..9baa953b3
--- /dev/null
+++ b/theme/base/css/ie.css
@@ -0,0 +1,26 @@
+/* IE specific styles */
+
+#aside_primary {
+padding-left:11px;
+}
+.notice-options form input.submit {
+font-size:0;
+margin-top:3px;
+height:16px;
+text-align:right;
+text-indent:0;
+color:#fff;
+width:24px;
+}
+
+input.checkbox {
+top:0;
+}
+
+legend {
+margin-left:-7px;
+}
+
+.notice div.entry-content .timestamp a {
+margin-right:4px;
+}
\ No newline at end of file
diff --git a/theme/base/css/ie7.css b/theme/base/css/ie7.css
new file mode 100644
index 000000000..a6e2548ab
--- /dev/null
+++ b/theme/base/css/ie7.css
@@ -0,0 +1,5 @@
+/* IE7 specific styles */
+
+#form_notice textarea {
+width:370px;
+} 
\ No newline at end of file
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
new file mode 100644
index 000000000..2b71b0719
--- /dev/null
+++ b/theme/default/css/display.css
@@ -0,0 +1,245 @@
+/* theme: identica */
+html,
+body,
+a:active {
+background-color:#CEE1E9;
+}
+body {
+font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
+font-size:1em;
+}
+address {
+margin-right:71px;
+}
+address .fn {
+display:none;
+}
+
+input, textarea, select, option {
+font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
+}
+input, textarea, select {
+border-color:#aaa;
+}
+
+input.submit,
+#form_notice.warning #notice_text-count,
+#nav_register a,
+.form_settings .form_note {
+background-color:#A9BF4F;
+}
+
+input:focus, textarea:focus, select:focus,
+#form_notice.warning #notice_data-text {
+border-color:#A9BF4F;
+}
+input.submit,
+#nav_register a {
+color:#F5FDFD;
+}
+
+a,
+div.notice-options input {
+color:#002E6E;
+}
+
+.notice p.entry-content a:visited {
+background-color:#fcfcfc;
+}
+.notice p.entry-content .vcard a {
+background-color:#fcfffc;
+}
+
+#aside_primary,
+#user_subscribe a,
+#TB_window input.submit,
+.form_user_subscribe input.submit {
+background-color:#fff;
+}
+
+
+#notice_text-count {
+color:#333;
+}
+#form_notice.warning #notice_text-count,
+#user_actions a {
+color:#000;
+}
+
+#form_notice #notice_data-attach_view {
+background-image:url(../images/icons/twotone/green/paper-clip.gif);
+background-repeat:no-repeat;
+background-position:0 45%;
+background-color:transparent;
+}
+
+#nav_register a {
+text-decoration:none;
+font-weight:bold;
+padding:2px 4px;
+}
+
+#content,
+#site_nav_local_views a {
+border-color:#F5FDFD;
+}
+#content,
+#site_nav_local_views .current a {
+background-color:#F5FDFD;
+}
+
+#site_nav_local_views a {
+background-color:rgba(255, 255, 255, 0.2);
+}
+#site_nav_local_views a:hover {
+background-color:rgba(255, 255, 255, 0.7);
+}
+
+
+
+
+#page_notice .error {
+background-color:#F7E8E8;
+}
+#page_notice .success {
+background-color:#EFF3DC;
+}
+
+#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.jpg);
+}
+#export_data li a.atom {
+background-image:url(../../base/images/icons/icon_atom.jpg);
+}
+#export_data li a.foaf {
+background-image:url(../../base/images/icons/icon_foaf.gif);
+}
+#export_data li a.export_vcard {
+background-image:url(../../base/images/icons/icon_vcard.gif);
+}
+
+
+/*user_actions*/
+#user_actions li {
+border-top-color:#eee;
+}
+#user_subscribe a,
+#TB_window input.submit,
+.form_user_subscribe input.submit {
+background-image: url(../images/icons/twotone/green/shield.gif);
+background-position: 0 45%;
+background-repeat: no-repeat;
+}
+.form_user_unsubscribe input.submit {
+background-color:#647819;
+color:#F5FDFD;
+}
+#user_send-a-message a {
+background:url(../images/icons/twotone/green/quote.gif) 0 45% no-repeat;
+}
+.form_user_nudge input.submit {
+background:url(../images/icons/twotone/green/mail.gif) 0 45% no-repeat;
+}
+.form_user_block input.submit {
+background:url(../images/icons/twotone/green/against.gif) 0 45% no-repeat;
+}
+
+
+/* NOTICES */
+.notices li.over {
+background-color:#fcfcfc;
+}
+
+.notice-data a span {
+background-color:transparent;
+background-repeat:no-repeat;
+background-position:0 45%;
+}
+.notice_video .notice-data a span {
+background-image:url(../images/icons/twotone/green/camera.gif);
+}
+.notice_audio .notice-data a span {
+background-image:url(../images/icons/twotone/green/music.gif);
+}
+.notice_image .notice-data a span {
+background-image:url(../images/icons/twotone/green/search.gif);
+}
+.notice_event .notice-data a span {
+background-image:url(../images/icons/twotone/green/calendar.gif);
+}
+.notice_location .notice-data a span {
+background-image:url(../images/icons/twotone/green/flag.gif);
+}
+.notice_document .notice-data a span {
+background-image:url(../images/icons/twotone/green/document.gif);
+}
+
+.notice-options .notice_reply a,
+.notice-options form input.submit {
+background-color:transparent;
+}
+.notice-options .notice_reply a {
+background:transparent url(../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%;
+}
+.notice-options form.form_disfavor input.submit {
+background:transparent url(../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%;
+}
+
+div.notice-options {
+opacity:0.3;
+}
+.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 */
+
+
+
+.pagination .nav_prev a,
+.pagination .nav_next a {
+background-repeat:no-repeat;
+}
+.pagination .nav_prev a {
+background-image:url(../images/icons/twotone/green/arrow-left.gif);
+background-position:0 45%;
+}
+.pagination .nav_next a {
+background-image:url(../images/icons/twotone/green/arrow-right.gif);
+background-position:100% 45%;
+}
+
+
+
+#home #intro #guide_steps li a {
+border-color:#ccc;
+color:#F5FDFD;
+}
+#home #intro #step_join-now a {
+background-color:#f00;
+}
+#home #intro #step_start-a-group a {
+background-color:#0f0;
+}
+#home #intro #step_create-a-community a {
+background-color:#00f;
+}
\ No newline at end of file
diff --git a/theme/default/images/icons/icon_atom.jpg b/theme/default/images/icons/icon_atom.jpg
new file mode 100644
index 000000000..22853edc4
--- /dev/null
+++ b/theme/default/images/icons/icon_atom.jpg
diff --git a/theme/default/images/icons/icon_foaf.gif b/theme/default/images/icons/icon_foaf.gif
new file mode 100644
index 000000000..f8f784423
--- /dev/null
+++ b/theme/default/images/icons/icon_foaf.gif
diff --git a/theme/default/images/icons/icon_rss.jpg b/theme/default/images/icons/icon_rss.jpg
new file mode 100644
index 000000000..da23422d0
--- /dev/null
+++ b/theme/default/images/icons/icon_rss.jpg
diff --git a/theme/default/images/icons/icon_vcard.gif b/theme/default/images/icons/icon_vcard.gif
new file mode 100644
index 000000000..6d52947f3
--- /dev/null
+++ b/theme/default/images/icons/icon_vcard.gif
diff --git a/theme/default/images/icons/twotone/green/against.gif b/theme/default/images/icons/twotone/green/against.gif
new file mode 100644
index 000000000..ca796c8a3
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/against.gif
diff --git a/theme/default/images/icons/twotone/green/arrow-down.gif b/theme/default/images/icons/twotone/green/arrow-down.gif
new file mode 100644
index 000000000..c709e5877
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/arrow-down.gif
diff --git a/theme/default/images/icons/twotone/green/arrow-downleft.gif b/theme/default/images/icons/twotone/green/arrow-downleft.gif
new file mode 100644
index 000000000..a4a98035d
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/arrow-downleft.gif
diff --git a/theme/default/images/icons/twotone/green/arrow-downright.gif b/theme/default/images/icons/twotone/green/arrow-downright.gif
new file mode 100644
index 000000000..3e6001a61
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/arrow-downright.gif
diff --git a/theme/default/images/icons/twotone/green/arrow-left.gif b/theme/default/images/icons/twotone/green/arrow-left.gif
new file mode 100644
index 000000000..afed19084
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/arrow-left.gif
diff --git a/theme/default/images/icons/twotone/green/arrow-right.gif b/theme/default/images/icons/twotone/green/arrow-right.gif
new file mode 100644
index 000000000..ee1707ed9
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/arrow-right.gif
diff --git a/theme/default/images/icons/twotone/green/arrow-up.gif b/theme/default/images/icons/twotone/green/arrow-up.gif
new file mode 100644
index 000000000..d0f5fbeaa
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/arrow-up.gif
diff --git a/theme/default/images/icons/twotone/green/arrow-upleft.gif b/theme/default/images/icons/twotone/green/arrow-upleft.gif
new file mode 100644
index 000000000..1e9e6935b
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/arrow-upleft.gif
diff --git a/theme/default/images/icons/twotone/green/arrow-upright.gif b/theme/default/images/icons/twotone/green/arrow-upright.gif
new file mode 100644
index 000000000..c7fecc8a0
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/arrow-upright.gif
diff --git a/theme/default/images/icons/twotone/green/back-forth.gif b/theme/default/images/icons/twotone/green/back-forth.gif
new file mode 100644
index 000000000..33a9540c8
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/back-forth.gif
diff --git a/theme/default/images/icons/twotone/green/bookmark.gif b/theme/default/images/icons/twotone/green/bookmark.gif
new file mode 100644
index 000000000..23f318ecc
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/bookmark.gif
diff --git a/theme/default/images/icons/twotone/green/bulb.gif b/theme/default/images/icons/twotone/green/bulb.gif
new file mode 100644
index 000000000..f70652c03
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/bulb.gif
diff --git a/theme/default/images/icons/twotone/green/calendar.gif b/theme/default/images/icons/twotone/green/calendar.gif
new file mode 100644
index 000000000..a09b65aca
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/calendar.gif
diff --git a/theme/default/images/icons/twotone/green/calendar2.gif b/theme/default/images/icons/twotone/green/calendar2.gif
new file mode 100644
index 000000000..7884b02dd
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/calendar2.gif
diff --git a/theme/default/images/icons/twotone/green/camera.gif b/theme/default/images/icons/twotone/green/camera.gif
new file mode 100644
index 000000000..1a85fbad0
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/camera.gif
diff --git a/theme/default/images/icons/twotone/green/cart.gif b/theme/default/images/icons/twotone/green/cart.gif
new file mode 100644
index 000000000..47eaa0a2e
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/cart.gif
diff --git a/theme/default/images/icons/twotone/green/caution.gif b/theme/default/images/icons/twotone/green/caution.gif
new file mode 100644
index 000000000..3ad2c322b
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/caution.gif
diff --git a/theme/default/images/icons/twotone/green/chart.gif b/theme/default/images/icons/twotone/green/chart.gif
new file mode 100644
index 000000000..136d74517
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/chart.gif
diff --git a/theme/default/images/icons/twotone/green/checkmark.gif b/theme/default/images/icons/twotone/green/checkmark.gif
new file mode 100644
index 000000000..892429d48
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/checkmark.gif
diff --git a/theme/default/images/icons/twotone/green/clipboard.gif b/theme/default/images/icons/twotone/green/clipboard.gif
new file mode 100644
index 000000000..9317bdcd0
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/clipboard.gif
diff --git a/theme/default/images/icons/twotone/green/clock.gif b/theme/default/images/icons/twotone/green/clock.gif
new file mode 100644
index 000000000..d1410f925
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/clock.gif
diff --git a/theme/default/images/icons/twotone/green/closed-folder.gif b/theme/default/images/icons/twotone/green/closed-folder.gif
new file mode 100644
index 000000000..0410fc6e8
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/closed-folder.gif
diff --git a/theme/default/images/icons/twotone/green/database.gif b/theme/default/images/icons/twotone/green/database.gif
new file mode 100644
index 000000000..29ce02492
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/database.gif
diff --git a/theme/default/images/icons/twotone/green/disfavourite.gif b/theme/default/images/icons/twotone/green/disfavourite.gif
new file mode 100644
index 000000000..3946869ae
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/disfavourite.gif
diff --git a/theme/default/images/icons/twotone/green/diskette.gif b/theme/default/images/icons/twotone/green/diskette.gif
new file mode 100644
index 000000000..e970b0a30
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/diskette.gif
diff --git a/theme/default/images/icons/twotone/green/document.gif b/theme/default/images/icons/twotone/green/document.gif
new file mode 100644
index 000000000..9c08f4a3a
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/document.gif
diff --git a/theme/default/images/icons/twotone/green/double-arrow.gif b/theme/default/images/icons/twotone/green/double-arrow.gif
new file mode 100644
index 000000000..2e8648264
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/double-arrow.gif
diff --git a/theme/default/images/icons/twotone/green/edit.gif b/theme/default/images/icons/twotone/green/edit.gif
new file mode 100644
index 000000000..c746aca60
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/edit.gif
diff --git a/theme/default/images/icons/twotone/green/eject.gif b/theme/default/images/icons/twotone/green/eject.gif
new file mode 100644
index 000000000..7e0906cfe
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/eject.gif
diff --git a/theme/default/images/icons/twotone/green/exclaim.gif b/theme/default/images/icons/twotone/green/exclaim.gif
new file mode 100644
index 000000000..588e28c26
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/exclaim.gif
diff --git a/theme/default/images/icons/twotone/green/fastforward.gif b/theme/default/images/icons/twotone/green/fastforward.gif
new file mode 100644
index 000000000..28e495103
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/fastforward.gif
diff --git a/theme/default/images/icons/twotone/green/favourite.gif b/theme/default/images/icons/twotone/green/favourite.gif
new file mode 100644
index 000000000..d93515e37
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/favourite.gif
diff --git a/theme/default/images/icons/twotone/green/flag.gif b/theme/default/images/icons/twotone/green/flag.gif
new file mode 100644
index 000000000..68c8aee25
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/flag.gif
diff --git a/theme/default/images/icons/twotone/green/graph.gif b/theme/default/images/icons/twotone/green/graph.gif
new file mode 100644
index 000000000..0c1794b4e
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/graph.gif
diff --git a/theme/default/images/icons/twotone/green/grow.gif b/theme/default/images/icons/twotone/green/grow.gif
new file mode 100644
index 000000000..c4118d53b
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/grow.gif
diff --git a/theme/default/images/icons/twotone/green/headphones.gif b/theme/default/images/icons/twotone/green/headphones.gif
new file mode 100644
index 000000000..5be6c67dd
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/headphones.gif
diff --git a/theme/default/images/icons/twotone/green/home.gif b/theme/default/images/icons/twotone/green/home.gif
new file mode 100644
index 000000000..d2a3421ef
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/home.gif
diff --git a/theme/default/images/icons/twotone/green/hourglass.gif b/theme/default/images/icons/twotone/green/hourglass.gif
new file mode 100644
index 000000000..b62b9480c
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/hourglass.gif
diff --git a/theme/default/images/icons/twotone/green/info.gif b/theme/default/images/icons/twotone/green/info.gif
new file mode 100644
index 000000000..86ef1f8b4
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/info.gif
diff --git a/theme/default/images/icons/twotone/green/key.gif b/theme/default/images/icons/twotone/green/key.gif
new file mode 100644
index 000000000..ccf357ab2
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/key.gif
diff --git a/theme/default/images/icons/twotone/green/lock.gif b/theme/default/images/icons/twotone/green/lock.gif
new file mode 100644
index 000000000..db00706b5
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/lock.gif
diff --git a/theme/default/images/icons/twotone/green/mail.gif b/theme/default/images/icons/twotone/green/mail.gif
new file mode 100644
index 000000000..1084c862f
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/mail.gif
diff --git a/theme/default/images/icons/twotone/green/move.gif b/theme/default/images/icons/twotone/green/move.gif
new file mode 100644
index 000000000..d2c30b1d2
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/move.gif
diff --git a/theme/default/images/icons/twotone/green/music.gif b/theme/default/images/icons/twotone/green/music.gif
new file mode 100644
index 000000000..64b51d4e1
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/music.gif
diff --git a/theme/default/images/icons/twotone/green/news.gif b/theme/default/images/icons/twotone/green/news.gif
new file mode 100644
index 000000000..712c685dc
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/news.gif
diff --git a/theme/default/images/icons/twotone/green/note.gif b/theme/default/images/icons/twotone/green/note.gif
new file mode 100644
index 000000000..bcc0b149b
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/note.gif
diff --git a/theme/default/images/icons/twotone/green/open-folder.gif b/theme/default/images/icons/twotone/green/open-folder.gif
new file mode 100644
index 000000000..d41300a08
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/open-folder.gif
diff --git a/theme/default/images/icons/twotone/green/paper-clip.gif b/theme/default/images/icons/twotone/green/paper-clip.gif
new file mode 100644
index 000000000..1d45f1d1e
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/paper-clip.gif
diff --git a/theme/default/images/icons/twotone/green/paper-clip2.gif b/theme/default/images/icons/twotone/green/paper-clip2.gif
new file mode 100644
index 000000000..a8c7805be
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/paper-clip2.gif
diff --git a/theme/default/images/icons/twotone/green/pause.gif b/theme/default/images/icons/twotone/green/pause.gif
new file mode 100644
index 000000000..ced0b6440
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/pause.gif
diff --git a/theme/default/images/icons/twotone/green/phone.gif b/theme/default/images/icons/twotone/green/phone.gif
new file mode 100644
index 000000000..69359f764
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/phone.gif
diff --git a/theme/default/images/icons/twotone/green/play.gif b/theme/default/images/icons/twotone/green/play.gif
new file mode 100644
index 000000000..794ec85b6
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/play.gif
diff --git a/theme/default/images/icons/twotone/green/plus.gif b/theme/default/images/icons/twotone/green/plus.gif
new file mode 100644
index 000000000..4407d0b2d
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/plus.gif
diff --git a/theme/default/images/icons/twotone/green/print.gif b/theme/default/images/icons/twotone/green/print.gif
new file mode 100644
index 000000000..17727d5d7
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/print.gif
diff --git a/theme/default/images/icons/twotone/green/question-mark.gif b/theme/default/images/icons/twotone/green/question-mark.gif
new file mode 100644
index 000000000..1689efcd0
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/question-mark.gif
diff --git a/theme/default/images/icons/twotone/green/quote.gif b/theme/default/images/icons/twotone/green/quote.gif
new file mode 100644
index 000000000..4ba1f0c03
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/quote.gif
diff --git a/theme/default/images/icons/twotone/green/refresh.gif b/theme/default/images/icons/twotone/green/refresh.gif
new file mode 100644
index 000000000..8a8b8144f
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/refresh.gif
diff --git a/theme/default/images/icons/twotone/green/reply.gif b/theme/default/images/icons/twotone/green/reply.gif
new file mode 100644
index 000000000..6ff01bb35
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/reply.gif
diff --git a/theme/default/images/icons/twotone/green/rewind.gif b/theme/default/images/icons/twotone/green/rewind.gif
new file mode 100644
index 000000000..aca3ee35b
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/rewind.gif
diff --git a/theme/default/images/icons/twotone/green/search.gif b/theme/default/images/icons/twotone/green/search.gif
new file mode 100644
index 000000000..c36463d0d
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/search.gif
diff --git a/theme/default/images/icons/twotone/green/shield.gif b/theme/default/images/icons/twotone/green/shield.gif
new file mode 100644
index 000000000..419d5ee4b
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/shield.gif
diff --git a/theme/default/images/icons/twotone/green/skip-back.gif b/theme/default/images/icons/twotone/green/skip-back.gif
new file mode 100644
index 000000000..adca7aa3e
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/skip-back.gif
diff --git a/theme/default/images/icons/twotone/green/skip.gif b/theme/default/images/icons/twotone/green/skip.gif
new file mode 100644
index 000000000..ae5417f2f
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/skip.gif
diff --git a/theme/default/images/icons/twotone/green/skull.gif b/theme/default/images/icons/twotone/green/skull.gif
new file mode 100644
index 000000000..033506732
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/skull.gif
diff --git a/theme/default/images/icons/twotone/green/statusbar.gif b/theme/default/images/icons/twotone/green/statusbar.gif
new file mode 100644
index 000000000..47d61b106
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/statusbar.gif
diff --git a/theme/default/images/icons/twotone/green/stop.gif b/theme/default/images/icons/twotone/green/stop.gif
new file mode 100644
index 000000000..e0b108d35
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/stop.gif
diff --git a/theme/default/images/icons/twotone/green/template.gif b/theme/default/images/icons/twotone/green/template.gif
new file mode 100644
index 000000000..65c0c4a0a
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/template.gif
diff --git a/theme/default/images/icons/twotone/green/text-bigger.gif b/theme/default/images/icons/twotone/green/text-bigger.gif
new file mode 100644
index 000000000..45e143b7a
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/text-bigger.gif
diff --git a/theme/default/images/icons/twotone/green/text-smaller.gif b/theme/default/images/icons/twotone/green/text-smaller.gif
new file mode 100644
index 000000000..a54d0c1d3
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/text-smaller.gif
diff --git a/theme/default/images/icons/twotone/green/trash.gif b/theme/default/images/icons/twotone/green/trash.gif
new file mode 100644
index 000000000..78dd64a3d
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/trash.gif
diff --git a/theme/default/images/icons/twotone/green/two-docs.gif b/theme/default/images/icons/twotone/green/two-docs.gif
new file mode 100644
index 000000000..97e54b964
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/two-docs.gif
diff --git a/theme/default/images/icons/twotone/green/twotone.gif b/theme/default/images/icons/twotone/green/twotone.gif
new file mode 100644
index 000000000..45aad25c4
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/twotone.gif
diff --git a/theme/default/images/icons/twotone/green/undo.gif b/theme/default/images/icons/twotone/green/undo.gif
new file mode 100644
index 000000000..6869b3050
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/undo.gif
diff --git a/theme/default/images/icons/twotone/green/user.gif b/theme/default/images/icons/twotone/green/user.gif
new file mode 100644
index 000000000..c85460fcd
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/user.gif
diff --git a/theme/default/images/icons/twotone/green/vegetable.gif b/theme/default/images/icons/twotone/green/vegetable.gif
new file mode 100644
index 000000000..4d421c1bb
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/vegetable.gif
diff --git a/theme/default/images/icons/twotone/green/x.gif b/theme/default/images/icons/twotone/green/x.gif
new file mode 100644
index 000000000..ffb2efea0
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/x.gif
diff --git a/theme/default/images/icons/twotone/green/zoom-in.gif b/theme/default/images/icons/twotone/green/zoom-in.gif
new file mode 100644
index 000000000..a59a5bb50
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/zoom-in.gif
diff --git a/theme/default/images/icons/twotone/green/zoom-out.gif b/theme/default/images/icons/twotone/green/zoom-out.gif
new file mode 100644
index 000000000..c61f999fd
--- /dev/null
+++ b/theme/default/images/icons/twotone/green/zoom-out.gif
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 832862551..d5a5ce956 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -1,52 +1,69 @@
 /* theme: identica */
-html {
+html,
+body,
+a:active {
 background-color:#ddd;
 }
 body {
 font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 font-size:1em;
 }
+address {
+margin-right:71px;
+}
+address .fn {
+display:none;
+}
+
 input, textarea, select, option {
 font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 }
-input:focus, textarea:focus, select:focus {
-border-color:#B2D0DD;
+input, textarea, select {
+border-color:#aaa;
 }
-a {
-color:#002E6E;
+
+input.submit,
+#form_notice.warning #notice_text-count,
+#nav_register a,
+.form_settings .form_note {
+background-color:#A9BF4F;
 }
-a:active {
-background-color:#ddd;
+
+input:focus, textarea:focus, select:focus,
+#form_notice.warning #notice_data-text {
+border-color:#A9BF4F;
+}
+input.submit,
+#nav_register a {
+color:#fff;
+}
+
+a,
+div.notice-options input {
+color:#002E6E;
 }
+
 .notice p.entry-content a:visited {
 background-color:#fcfcfc;
--moz-border-radius:4px;
 }
 .notice p.entry-content .vcard a {
 background-color:#fcfffc;
--moz-border-radius:4px;
 }
 
-
-
-#aside_primary {
+#aside_primary,
+#user_subscribe a,
+#TB_window input.submit,
+.form_user_subscribe input.submit {
 background-color:#CEE1E9;
 }
 
 
-
-#form_notice label {
-color:#88171A;
-}
 #notice_text-count {
 color:#333;
 }
-#form_notice.warning #notice_text-count {
+#form_notice.warning #notice_text-count,
+#user_actions a {
 color:#000;
-background-color:#A9BF4F;
-}
-#form_notice.warning #notice_data-text {
-border-color:#A9BF4F;
 }
 
 #form_notice #notice_data-attach_view {
@@ -56,24 +73,37 @@ background-position:0 45%;
 background-color:transparent;
 }
 
+#nav_register a {
+text-decoration:none;
+font-weight:bold;
+padding:2px 4px;
+}
 
+#content,
 #site_nav_local_views a {
 border-color:#fff;
-background-color:rgba(255, 255, 255, 0.2);
-}
-#site_nav_local_views a:hover {
-background-color:rgba(255, 255, 255, 0.7);
 }
-
-
 #content,
 #site_nav_local_views .current a {
 background-color:#fff;
 }
 
+#site_nav_local_views a {
+background-color:rgba(255, 255, 255, 0.2);
+}
+#site_nav_local_views a:hover {
+background-color:rgba(255, 255, 255, 0.7);
+}
+
 
 
 
+#page_notice .error {
+background-color:#F7E8E8;
+}
+#page_notice .success {
+background-color:#EFF3DC;
+}
 
 #export_data li a {
 background-repeat:no-repeat;
@@ -97,13 +127,12 @@ background-image:url(../../base/images/icons/icon_vcard.gif);
 #user_actions li {
 border-top-color:#eee;
 }
-#user_actions a {
-color:#000;
-}
 #user_subscribe a,
 #TB_window input.submit,
 .form_user_subscribe input.submit {
-background:#CEE1E9 url(../images/icons/twotone/green/shield.gif) 0 45% no-repeat;
+background-image: url(../images/icons/twotone/green/shield.gif);
+background-position: 0 45%;
+background-repeat: no-repeat;
 }
 .form_user_unsubscribe input.submit {
 background-color:#647819;
@@ -120,28 +149,11 @@ background:url(../images/icons/twotone/green/against.gif) 0 45% no-repeat;
 }
 
 
-.user_tags .mark_hash {
-color:#555;
-}
-
-
-
-.vcard .fn {
-}
-.vcard .fn:hover {
-}
-
-
-
-
 /* NOTICES */
-.notice div.entry-content a {
-
-}
-.notice div.entry-content a:hover {
+.notices li.over {
+background-color:#fcfcfc;
 }
 
-
 .notice-data a span {
 background-color:transparent;
 background-repeat:no-repeat;
@@ -186,7 +198,9 @@ background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0
 div.notice-options {
 opacity:0.3;
 }
-
+.notices li.hover div.notice-options {
+opacity:1;
+}
 div.entry-content {
 color:#333;
 }
@@ -194,22 +208,9 @@ div.notice-options a,
 div.notice-options input {
 font-family:sans-serif;
 }
-div.notice-options input {
-color:#002E6E;
-
-}
 .notices li.hover {
 background-color:#fcfcfc;
 }
-.notices li.hover div.entry-content,
-.notices li.hover div.notice-options {
-opacity:1;
-}
-
-.form_settings .form_note {
-background-color:#A9BF4F;
-}
-
 /*END: NOTICES */
 
 
@@ -241,5 +242,4 @@ background-color:#0f0;
 }
 #home #intro #step_create-a-community a {
 background-color:#00f;
-}
-
+}
\ No newline at end of file
diff --git a/theme/identica/images/icons/twotone/green/disfavourite.gif b/theme/identica/images/icons/twotone/green/disfavourite.gif
new file mode 100644
index 000000000..3946869ae
--- /dev/null
+++ b/theme/identica/images/icons/twotone/green/disfavourite.gif
diff --git a/theme/identica/logo.png b/theme/identica/logo.png
index 4a5b5470e..cee36799e 100644
--- a/theme/identica/logo.png
+++ b/theme/identica/logo.png