Merge remote branch 'upstream/master'

13 files changed, 203 insertions, 299 deletions

diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl
index 4d09b9255..aaa27465b 100644
--- a/view/theme/dispy/communityhome.tpl
+++ b/view/theme/dispy/communityhome.tpl
@@ -2,7 +2,6 @@
 <div>$page</div>
 {{ endif }}
 
-{{ if $lastusers_title }}
 <h3 id="extra-help-header">Help or '@NewHere'?</h3>
 <div id="extra-help">
 <a href="https://helpers.pyxis.uberspace.de/profile/helpers"
@@ -13,27 +12,24 @@
 	title="Local Friendica" target="_blank">Local Friendica</a><br />
 <a href="http://kakste.com/profile/newhere" title="@NewHere" target="_blank">NewHere</a>
 </div>
-{{ endif }}
 
-{{ if $lastusers_title }}
 <h3 id="connect-services-header">Connectable Services</h3>
-<div id="connect-services">
-<a href="$url/facebook"><img alt="Facebook"
-	src="view/theme/dispy/icons/facebook.png" title="Facebook" /></a>
-<a href="$url/settings/connectors"><img
-	alt="StatusNet" src="view/theme/dispy/icons/StatusNet.png?" title="StatusNet" /></a>
-<a href="$url/settings/connectors"><img
-	alt="LiveJournal" src="view/theme/dispy/icons/livejournal.png?" title="LiveJournal" /></a>
-<a href="$url/settings/connectors"><img
-	alt="Posterous" src="view/theme/dispy/icons/posterous.png?" title="Posterous" /></a><br />
-<a href="$url/settings/connectors"><img
-	alt="Tumblr" src="view/theme/dispy/icons/tumblr.png?" title="Tumblr" /></a>
-<a href="$url/settings/connectors"><img
-	alt="Twitter" src="view/theme/dispy/icons/twitter.png?" title="Twitter" /></a>
-<a href="$url/settings/connectors"><img
-	alt="WordPress" src="view/theme/dispy/icons/wordpress.png?" title="WordPress" /></a>
-<a href="$url/settings/connectors"><img
-	alt="E-Mail" src="view/theme/dispy/icons/email.png?" title="E-Mail" /></a>
-</div>
-{{ endif }}
+<ul id="connect-services">
+<li><a href="$url/facebook"><img alt="Facebook"
+	src="view/theme/dispy/icons/facebook.png" title="Facebook" /></a></li>
+<li><a href="$url/settings/connectors"><img
+	alt="StatusNet" src="view/theme/dispy/icons/StatusNet.png" title="StatusNet" /></a></li>
+<li><a href="$url/settings/connectors"><img
+	alt="LiveJournal" src="view/theme/dispy/icons/livejournal.png" title="LiveJournal" /></a></li>
+<li><a href="$url/settings/connectors"><img
+	alt="Posterous" src="view/theme/dispy/icons/posterous.png" title="Posterous" /></a></li>
+<li><a href="$url/settings/connectors"><img
+	alt="Tumblr" src="view/theme/dispy/icons/tumblr.png" title="Tumblr" /></a></li>
+<li><a href="$url/settings/connectors"><img
+	alt="Twitter" src="view/theme/dispy/icons/twitter.png" title="Twitter" /></a></li>
+<li><a href="$url/settings/connectors"><img
+	alt="WordPress" src="view/theme/dispy/icons/wordpress.png" title="WordPress" /></a></li>
+<li><a href="$url/settings/connectors"><img
+	alt="E-Mail" src="view/theme/dispy/icons/email.png" title="E-Mail" /></a></li>
+</ul>
 
diff --git a/view/theme/dispy/config.php b/view/theme/dispy/config.php
index a24288bf8..25663c10b 100644
--- a/view/theme/dispy/config.php
+++ b/view/theme/dispy/config.php
@@ -41,17 +41,17 @@ function theme_admin_post(&$a) {
 
 function dispy_form(&$a, $font_size, $line_height, $colour) {
 	$line_heights = array(
-		"1.3"=>"1.3",
-		"---"=>"---",
-		"1.6"=>"1.6",				
-		"1.5"=>"1.5",		
-		"1.4"=>"1.4",
-		"1.2"=>"1.2",
-		"1.1"=>"1.1",
+		"1.3" => "1.3",
+		"---" => "---",
+		"1.6" => "1.6",				
+		"1.5" => "1.5",		
+		"1.4" => "1.4",
+		"1.2" => "1.2",
+		"1.1" => "1.1",
 	);	
 	$font_sizes = array(
 		'12' => '12',
-		'14' =>'14',
+		'14' => '14',
 		"---" => "---",
 		"16" => "16",		
 		"15" => "15",
diff --git a/view/theme/dispy/dark/_base.less b/view/theme/dispy/dark/_base.less
index 000cdbd5a..d1051a989 100644
--- a/view/theme/dispy/dark/_base.less
+++ b/view/theme/dispy/dark/_base.less
@@ -17,6 +17,7 @@
 @import "../css/reset";
 
 //* backgrounds */
+@lt_bg_colour: lighten(@bg_colour, 10%);
 @dk_bg_colour: #1d1f1d;
 @bg_colour: #2e2f2e;
 @bg_alt_colour: #2e302e;
@@ -24,8 +25,9 @@
 @menu_bg_colour: #555753;
 
 //* font colour, aka color: */
-@lt_main_colour: #ffff99;
+@lt_main_colour: lighten(@main_colour, 10%);
 @main_colour: #eeeecc;
+@dk_main_colour: darken(@main_colour, 20%);
 @main_alt_colour: #eeeeee;
 // darken(@main_alt_colour, 13%) > #cdcdcd
 // darken(@main_alt_colour, 13.5%) > #cccccc
@@ -56,9 +58,6 @@
 @info: #1353b1;
 @alert: #ff0000;
 
-@lt_main_colour: lighten(@bg_colour, 10%);
-@dk_main_colour: darken(@bg_colour, 10%);
-
 //* links */
 @link_colour: #88a9d2;
 @dk_link_colour: darken(@link_colour, 10%);
@@ -137,7 +136,19 @@
 	-webkit-text-overflow: @t;
 	text-overflow: @t;
 }
-
+.lin_gradient(@x1: left, @x2: right, @y1: top, @y2: bottom, @c1: @bg_colour, @c2: @dk_bg_colour) {
+	// w3c
+	background: linear-gradient(@x1 @y2, @c1, @c2);
+	// webkit
+	// -webkit-gradient(<type>, <point> [, <radius>]?, <point> [, <radius>]? [, <stop>]*)
+	background: -webkit-gradient(linear, @x1 @y1, @x2 @y2, from(@c1), to(@c2));
+	// mozilla
+	// -moz-linear-gradient([<point> || <angle>,]? <stop>, <stop> [, <stop>])
+	background: -moz-linear-gradient(@x1 @y2, @c1, @c2);
+	// opera
+	//background: -o-linear-gradient([<point> || <angle>,]? <stop>, <stop> [, <stop>]);
+	background: -o-linear-gradient(@x1, @c1, @c2);
+}
 //* pre wrap */
 .wrap () {
 	white-space: pre-wrap;
diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index 029722c3a..965350749 100644
--- a/view/theme/dispy/dark/style.css
+++ b/view/theme/dispy/dark/style.css
@@ -20,7 +20,7 @@ tr:nth-child(even){background-color:#474947;}
 :focus{outline:none;}
 a:focus{outline:invert, dashed, thin;}
 [disabled="disabled"]{background:#4e4f4e;color:#ddddbb;}
-ins,mark{background-color:#2e302e;color:#474947;}
+ins,mark{background-color:#2e302e;color:#fbfbf2;}
 ins{text-decoration:none;}
 mark{font-style:italic;font-weight:bold;}
 pre,code,kbd,samp,.wall-item-body code{font-family:monospace, monospace;_font-family:monospace;font-size:1em;}
@@ -58,7 +58,7 @@ h6{font-size:xx-small;}
 #articlemain{width:100%;height:100%;margin:0 auto;}
 .button{color:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#eeeecc;font-weight:bold;}
 #profile-listing-desc a{color:#eeeecc;font-weight:bold;}
-[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:3px ridge #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
+[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:2px outset #d4d580;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
 #item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
 .intro-approve-as-friend-desc{margin-top:10px;}
 .intro-desc{margin-bottom:20px;font-weight:bold;}
@@ -133,7 +133,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #sysmsg_info{position:fixed;bottom:0;-moz-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-o-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-webkit-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-ms-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;padding:10px;background-color:#fcaf3e;border:2px solid #f8911b;border-bottom:0;padding-bottom:50px;z-index:1000;}
 #sysmsg{position:fixed;bottom:0;-moz-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-o-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-webkit-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-ms-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;padding:10px;background-color:#fcaf3e;border:2px solid #f8911b;border-bottom:0;padding-bottom:50px;z-index:1000;}
 #sysmsg_info br,#sysmsg br{display:block;margin:2px 0px;border-top:1px solid #eeeecc;}
-#asidemain{float:left;font-size:small;margin:20px 0 20px 35px;width:25%;display:inline;}
+#asidemain{float:left;font-size:small;margin:1em;width:25%;display:inline;}
 #asideright,#asideleft{display:none;}
 .vcard .fn{font-size:1.5em;font-weight:bold;border-bottom:1px solid #638ec4;padding-bottom:3px;}
 .vcard #profile-photo-wrapper{margin:20px 0;background-color:#555753;padding:5px;width:175px;height:175px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;}
@@ -187,7 +187,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #jot-title-display{font-weight:bold;}
 .jothidden{display:none;}
 #jot-preview-content{background-color:#2e3436;color:#eeeecc;border:1px solid #2e2f2e;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:5px 0 10px 0px #111111;-o-box-shadow:5px 0 10px 0px #111111;-webkit-box-shadow:5px 0 10px 0px #111111;-ms-box-shadow:5px 0 10px 0px #111111;box-shadow:5px 0 10px 0px #111111;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;-o-border-radius:0px 0px 0px 0px;-webkit-border-radius:0px 0px 0px 0px;-moz-border-radius:0px 0px 0px 0px;-ms-border-radius:0px 0px 0px 0px;border-radius:0px 0px 0px 0px;-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
-#sectionmain{margin:20px;font-size:0.8em;min-width:475px;width:67%;float:left;display:inline;}
+#sectionmain{margin:1em;font-size:0.8em;min-width:475px;width:69%;float:left;display:inline;}
 .tabs{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:10px 0;}.tabs li{display:inline;font-size:smaller;}
 .tab{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab:active,.tab:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
 .tab a{border:0;text-decoration:none;}
@@ -203,7 +203,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 [id^="tread-wrapper"],[class^="tread-wrapper"]{margin:1.2em 0 0 0;padding:0px;}
 .wall-item-photo-menu{display:none;}
 .wall-item-photo-menu-button{display:none;text-indent:-99999px;background:#555753 url(dark/menu-user-pin.jpg) no-repeat 75px center;position:absolute;overflow:hidden;width:90px;height:20px;top:85px;left:0;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;}
-.wall-item-info{float:left;width:8em;position:relative;}
+.wall-item-info{float:left;width:7em;position:relative;}
 .wall-item-photo-wrapper{width:80px;height:80px;position:relative;padding:5px;background-color:#555753;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
 [class^="wall-item-tools"] *{}[class^="wall-item-tools"] *>*{}
 .wall-item-tools{float:right;opacity:0.4;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;}.wall-item-tools:hover{opacity:1;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;}
@@ -223,7 +223,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 .wall-item-arrowphoto-wrapper{position:absolute;left:35px;top:80px;z-index:10002;}
 .wall-item-photo-menu{min-width:92px;font-size:0.75em;border:2px solid #555753;border-top:0px;background:#555753;position:absolute;left:-2px;top:101px;display:none;z-index:10003;-o-border-radius:0 5px 5px 5px;-webkit-border-radius:0 5px 5px 5px;-moz-border-radius:0 5px 5px 5px;-ms-border-radius:0 5px 5px 5px;border-radius:0 5px 5px 5px;}.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 6px;color:#eeeeee;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeee;}
 #item-delete-selected{overflow:auto;width:100%;}
-#connect-services-header,#connect-services,#extra-help-header,#extra-help,#postit-header,#postit{margin:5px 0 0 0;}
+#connect-services-header,#extra-help-header{margin:1.5em 0 0 0;}
+#connect-services,#extra-help{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:1em 0 0 0;}#connect-services li,#extra-help li{display:inline;}
 .ccollapse-wrapper{font-size:0.9em;margin-left:5em;}
 .hide-comments-outer{font-size:small;}
 .wall-item-outside-wrapper.comment{margin-left:5em;}.wall-item-outside-wrapper.comment .wall-item-photo{width:40px !important;height:40px !important;}
diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index fb0fbc6df..d394b13bf 100644
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -315,7 +315,7 @@ h6 {
 [id$="-desc"] {
 	color: @main_colour;
 	background: @bg_colour;
-	.borders(3px, ridge, @main_colour);
+	.borders(2px, outset, @dk_main_colour);
 	.rounded_corners;
 	// .box_shadow(3px, 3px, 5px);
     margin: 3px 10px 7px 0;
@@ -872,7 +872,7 @@ nav #nav-notifications-linkmenu {
 #asidemain {
 	float: left;
 	font-size: small;
-	margin: 20px 0 20px 35px;
+	margin: 1em;
 	width: 25%;
 	display: inline;
 }
@@ -1229,10 +1229,10 @@ nav #nav-notifications-linkmenu {
  * section
  */
 #sectionmain {
-	margin: 20px;
+	margin: 1em;
 	font-size: 0.8em;
 	min-width: 475px;
-	width: 67%;
+	width: 69%;
 	float: left;
 	display: inline;
 }
@@ -1348,7 +1348,7 @@ nav #nav-notifications-linkmenu {
 }
 .wall-item-info {
 	float: left;
-	width: 8em;
+	width: 7em;
 	position: relative;
 }
 .wall-item-photo-wrapper {
@@ -1501,12 +1501,16 @@ nav #nav-notifications-linkmenu {
 	width: 100%;
 }
 #connect-services-header,
+#extra-help-header {
+	margin: 1.5em 0 0 0;
+}
 #connect-services,
-#extra-help-header,
-#extra-help,
-#postit-header,
-#postit {
-	margin: 5px 0 0 0;
+#extra-help {
+	.list_reset;
+	margin: 1em 0 0 0;
+	li {
+		display: inline;
+	}
 }
 
 
diff --git a/view/theme/dispy/dark/theme.php b/view/theme/dispy/dark/theme.php
index e156b6a7d..f73a12765 100644
--- a/view/theme/dispy/dark/theme.php
+++ b/view/theme/dispy/dark/theme.php
@@ -3,7 +3,6 @@
 /*
  * Name: Dispy Dark
  * Description: Dispy Dark: Dark, Spartan, Sleek, and Functional
- * Version: 1.2.1
  * Author: Simon <http://simon.kisikew.org/>
  * Maintainer: Simon <http://simon.kisikew.org/>
  * Screenshot: <a href="screenshot.jpg">Screenshot</a>
@@ -13,7 +12,6 @@ $a = get_app();
 $a->theme_info = array(
     'family' => 'dispy',
     'name' => 'dark',
-    'version' => '1.2.1'
 );
 
 function dispy_dark_init(&$a) {
diff --git a/view/theme/dispy/light/_base.less b/view/theme/dispy/light/_base.less
index 3046c1bac..c605dc702 100644
--- a/view/theme/dispy/light/_base.less
+++ b/view/theme/dispy/light/_base.less
@@ -24,8 +24,9 @@
 @menu_bg_colour: #555753;
 
 //* font colour, aka color: */
-@lt_main_colour: #ffff99;
+@lt_main_colour: lighten(@bg_colour, 10%);
 @main_colour: #111;
+@dk_main_colour: darken(@bg_colour, 10%);
 @main_alt_colour: #999999;
 // darken(@main_alt_colour, 6.5%) > #888888
 // //#9eabb0
@@ -55,9 +56,6 @@
 @info: #364e59;
 @alert: #ff0000;
 
-@lt_main_colour: lighten(@bg_colour, 10%);
-@dk_main_colour: darken(@bg_colour, 10%);
-
 //* links */
 // yes our link colour is "friendica blue" ;)
 @link_colour: @friendica_blue;
@@ -137,7 +135,19 @@
 	-webkit-text-overflow: @t;
 	text-overflow: @t;
 }
-
+.lin_gradient(@x1: left, @x2: right, @y1: top, @y2: bottom, @c1: @bg_colour, @c2: @dk_bg_colour) {
+	// w3c
+	background: linear-gradient(@x1 @y2, @c1, @c2);
+	// webkit
+	// -webkit-gradient(<type>, <point> [, <radius>]?, <point> [, <radius>]? [, <stop>]*)
+	background: -webkit-gradient(linear, @x1 @y1, @x2 @y2, from(@c1), to(@c2));
+	// mozilla
+	// -moz-linear-gradient([<point> || <angle>,]? <stop>, <stop> [, <stop>])
+	background: -moz-linear-gradient(@x1 @y2, @c1, @c2);
+	// opera
+	//background: -o-linear-gradient([<point> || <angle>,]? <stop>, <stop> [, <stop>]);
+	background: -o-linear-gradient(@x1, @c1, @c2);
+}
 //* pre wrap */
 .wrap () {
 	white-space: pre-wrap;
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index 045dadba5..90cb8780b 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -316,7 +316,7 @@ h6 {
 [id$="-desc"] {
 	color: @bg_colour;
 	background: @dk_bg_colour;
-	.borders(3px, ridge, @main_colour);
+	.borders(2px, outset, @main_colour);
 	.rounded_corners;
 	// .box_shadow(3px, 3px, 5px);
     margin: 3px 10px 7px 0;
@@ -873,7 +873,7 @@ nav #nav-notifications-linkmenu {
 #asidemain {
 	float: left;
 	font-size: small;
-	margin: 20px 0 20px 35px;
+	margin: 1em;
 	width: 25%;
 	display: inline;
 }
@@ -1230,10 +1230,10 @@ nav #nav-notifications-linkmenu {
  * section
  */
 #sectionmain {
-	margin: 20px;
+	margin: 1em;
 	font-size: 0.8em;
 	min-width: 475px;
-	width: 67%;
+	width: 69%;
 	float: left;
 	display: inline;
 }
@@ -1349,7 +1349,7 @@ nav #nav-notifications-linkmenu {
 }
 .wall-item-info {
 	float: left;
-	width: 8em;
+	width: 7em;
 	position: relative;
 }
 .wall-item-photo-wrapper {
@@ -1502,12 +1502,16 @@ nav #nav-notifications-linkmenu {
 	width: 100%;
 }
 #connect-services-header,
+#extra-help-header {
+	margin: 1.5em 0 0 0;
+}
 #connect-services,
-#extra-help-header,
-#extra-help,
-#postit-header,
-#postit {
-	margin: 5px 0 0 0;
+#extra-help {
+	.list_reset;
+	margin: 1em 0 0 0;
+	li {
+		display: inline;
+	}
 }
 
 
diff --git a/view/theme/dispy/light/theme.php b/view/theme/dispy/light/theme.php
index df3cca042..94a699b70 100644
--- a/view/theme/dispy/light/theme.php
+++ b/view/theme/dispy/light/theme.php
@@ -3,7 +3,6 @@
 /*
  * Name: Dispy Light
  * Description: Dispy Light: Light, Spartan, Sleek, and Functional
- * Version: 1.2.1
  * Author: Simon <http://simon.kisikew.org/>
  * Maintainer: Simon <http://simon.kisikew.org/>
  * Screenshot: <a href="screenshot.jpg">Screenshot</a>
@@ -13,7 +12,6 @@ $a = get_app();
 $a->theme_info = array(
     'family' => 'dispy',
 	'name' => 'light',
-	'version' => '1.2.1'
 );
 
 function dispy_light_init(&$a) {
diff --git a/view/theme/dispy/style.php b/view/theme/dispy/style.php
index f666e2768..375651425 100644
--- a/view/theme/dispy/style.php
+++ b/view/theme/dispy/style.php
@@ -13,238 +13,94 @@
         $colour = get_pconfig(local_user(), "dispy", "colour");
     }
 
-    if ($line_height === false) { $line_height = $site_line_height; }
-    if ($line_height === false) { $line_height = "1.2"; }
-    if ($dispy_font_size === false) { $dispy_font_size = $site_dispy_font_size; }
-    if ($dispy_font_size === false) { $dispy_font_size = "12"; }
-    if ($colour === false) { $colour = $site_colour; }
-    if ($colour === false) { $colour = "light"; }
+    if ($line_height === false) {
+		$line_height = $site_line_height;
+	}
+    if ($line_height === false) {
+		$line_height = "1.2";
+	}
+    if ($dispy_font_size === false) {
+		$dispy_font_size = $site_dispy_font_size;
+	}
+    if ($dispy_font_size === false) {
+		$dispy_font_size = "12";
+	}
+    if ($colour === false) {
+		$colour = $site_colour;
+	}
+    if ($colour === false) {
+		$colour = "light";
+	}
     
     if($colour == "light") {
         if (file_exists("$THEMEPATH/light/style.css")) {
             echo file_get_contents("$THEMEPATH/light/style.css");
         }
-        if($dispy_font_size == "16") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 16px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 16px;
-                }";  
-        }
-        if($dispy_font_size == "15") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 15px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 15px;
-                }";
-        }	
-        if($dispy_font_size == "14") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 14px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 14px;
-                }";
-        }
-        if($dispy_font_size == "13.5") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 13.5px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 13.5px;
-                }";
-        }
-        if($dispy_font_size == "13") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 13px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 13px;
-                }";
-        }
-        if($dispy_font_size == "12.5") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 12.5px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 12.5px;
-                }";
-        }
-        if($dispy_font_size == "12") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 12px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 12px;
-                }";
-        }
-        if($line_height == "1.5") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.5;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.5;
-                }";
-        }	
-        if($line_height == "1.4") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.4;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.4;
-                }";
-        }
-        if($line_height == "1.3") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.3;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.3;
-                }";
-        }
-        if($line_height == "1.2") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.2;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.2;
-                }";
-        }
-        if($line_height == "1.1") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.1;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.1;
-                }";
-        }
     }
 
     if($colour == "dark") {
         if (file_exists("$THEMEPATH/dark/style.css")) { 
             echo file_get_contents("$THEMEPATH/dark/style.css");
         }
-        if($dispy_font_size == "16") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 16px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 16px;
-                }";  
-        }
-        if($dispy_font_size == "15") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 15px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 15px;
-                }";
-        }	
-        if($dispy_font_size == "14") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 14px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 14px;
-                }";
-        }
-        if($dispy_font_size == "13.5") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 13.5px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 13.5px;
-                }";
-        }
-        if($dispy_font_size == "13") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 13px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 13px;
-                }";
-        }
-        if($dispy_font_size == "12.5") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 12.5px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 12.5px;
-                }";
-        }
-        if($dispy_font_size == "12") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 12px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 12px;
-                }";
-        }
-        if($line_height == "1.5") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.5;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.5;
-                }";
-        }	
-        if($line_height == "1.4"){
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.4;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.4;
-                }";
-        }
-        if($line_height == "1.3") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.3;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.3;
-                }";
-        }
-        if($line_height == "1.2") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.2;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.2;
-                }";
-        }
-        if($line_height == "1.1") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.1;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.1;
-                }";
-        }
-    }
+	}
 
+	if($dispy_font_size == "16") {
+		echo ".wall-item-content {
+				font-size: 16px;
+			}";
+	}
+	if($dispy_font_size == "15") {
+		echo ".wall-item-content {
+				font-size: 15px;
+			}";
+	}	
+	if($dispy_font_size == "14") {
+		echo ".wall-item-content {
+				font-size: 14px;
+			}";
+	}
+	if($dispy_font_size == "13.5") {
+		echo ".wall-item-content {
+				font-size: 13.5px;
+			}";
+	}
+	if($dispy_font_size == "13") {
+		echo ".wall-item-content {
+				font-size: 13px;
+			}";
+	}
+	if($dispy_font_size == "12.5") {
+		echo ".wall-item-content {
+				font-size: 12.5px;
+			}";
+	}
+	if($dispy_font_size == "12") {
+		echo ".wall-item-content {
+				font-size: 12px;
+			}";
+	}
+	if($line_height == "1.5") {
+		echo ".wall-item-content {
+				line-height: 1.5;
+			}";
+	}	
+	if($line_height == "1.4") {
+		echo ".wall-item-content {
+				line-height: 1.4;
+			}";
+	}
+	if($line_height == "1.3") {
+		echo ".wall-item-content {
+				line-height: 1.3;
+			}";
+	}
+	if($line_height == "1.2") {
+		echo ".wall-item-content {
+				line-height: 1.2;
+			}";
+	}
+	if($line_height == "1.1") {
+		echo ".wall-item-content {
+				line-height: 1.1;
+			}";
+	}
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index deedc86f7..2d423a928 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -20,7 +20,7 @@
 $a = get_app();
 $a->theme_info = array(
     'family' => 'dispy',
-	'version' => '1.2'
+	'version' => '1.2.2'
 );
 
 function dispy_init(&$a) {
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 0abf128a3..07eba1edb 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -338,6 +338,15 @@ div.wall-item-content-wrapper.shiny {
 	font-weight: bold;
 }
 
+.settings-widget .selected {
+	padding: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;	
+	border: 1px solid #CCCCCC;
+	background: #F8F8F8;
+	font-weight: bold;
+}
+
 .fakelink:hover {
 	color: #3465a4;
 	text-decoration: underline;
@@ -809,8 +818,15 @@ input#dfrn-url {
 	clear: both;
 }
 
+.settings-widget ul {
+	list-style-type: none;
+	padding: 0px;
+}
 
-
+.settings-widget li {
+	margin-left: 24px;
+	margin-bottom: 8px;
+}
 
 
 #gender-select, #marital-select, #sexual-select {
diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css
index 82ba795cd..39da7bb6c 100644
--- a/view/theme/slackr/style.css
+++ b/view/theme/slackr/style.css
@@ -43,7 +43,7 @@ nav #site-location {
 #profile-jot-text_parent, .mceLayout {
 	border-radius: 3px;
 	-moz-border-radius: 3px;
-	box-shadow: 3px 3px 10px 0 #000000;
+	box-shadow: 4px 4px 3px 0 #444444;
 }
 
 #profile-jot-text:hover {
@@ -66,24 +66,34 @@ nav #site-location {
 .wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
 	border-radius: 3px;
 	-moz-border-radius: 3px;
-	box-shadow: 3px 3px 10px 0 #000000;
+	box-shadow: 4px 4px 3px 0 #444444;
 }
 
 #sidebar-page-list img {
 	border-radius: 3px;
 	-moz-border-radius: 3px;
-	box-shadow: 3px 3px 10px -2px #000000;
+	box-shadow: 4px 4px 3px 0 #444444;
 }
 
 .contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo, .fc, .profile-jot-text, .group-selected, .nets-selected, .fileas-selected, #profile-jot-submit, .categories-selected {
 	border-radius: 3px;
 	-moz-border-radius: 3px;
-	box-shadow: 3px 3px 10px 0 #000000;
+	box-shadow: 4px 4px 3px 0 #444444;
+}
+.settings-widget .selected {
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	box-shadow: 4px 4px 3px 0 #444444;
+}
+
+.photo {
+	border: 1px solid #AAAAAA;
 }
 
 .photo-top-photo, .photo-album-photo {
 	padding: 10px;
 	max-width: 300px;
+	border: 1px solid #888888;
 }
 
 .rotleft1 {