diff --git a/js/country.js b/js/country.js
index 145aa490c3..70414e1805 100644
--- a/js/country.js
+++ b/js/country.js
@@ -275,7 +275,7 @@ aStates[249]="|'Adan|'Ataq|Abyan|Al Bayda'|Al Hudaydah|Al Jawf|Al Mahrah|Al Mahw
 aStates[250]="|Kosovo|Montenegro|Serbia|Vojvodina";
 aStates[251]="|Central|Copperbelt|Eastern|Luapula|Lusaka|North-Western|Northern|Southern|Western";
 aStates[252]="|Bulawayo|Harare|ManicalandMashonaland Central|Mashonaland East|Mashonaland West|Masvingo|Matabeleland North|Matabeleland South|Midlands";
-aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|Chaos Friends|DFRN|Distributed Friend Network|ErrLock|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hikado|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Optimistisch|Pplsnet|Recolutionari.es|SilverLips|Sparkling Network|SPRACI|Styliztique|Sysfu Social Club|Trevena|theshi.re|Tumpambae|Uzmiac|Other";
+aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|Chaos Friends|DFRN|Distributed Friend Network|ErrLock|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hikado|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Optimistisch|Pplsnet|Recolutionari.es|SPRACI|Styliztique|Sysfu Social Club|theshi.re|Tumpambae|Uzmiac|Other";
 /* 
  * gArCountryInfo
  * (0) Country name
diff --git a/view/theme/diabook/admin_users.tpl b/view/theme/diabook/admin_users.tpl
deleted file mode 100644
index 8aabb51ec9..0000000000
--- a/view/theme/diabook/admin_users.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "$confirm_delete".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("$confirm_delete_multi");
-	}
-	function selectall(cls){
-		$("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/users" method="post">
-		        <input type='hidden' name='form_security_token' value='$form_security_token'>
-		<h3>$h_pending</h3>
-		{{ if $pending }}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{ for $pending as $u }}
-				<tr>
-					<td class="created">$u.created</td>
-					<td class="name">$u.name</td>
-					<td class="email">$u.email</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
-					<td class="tools">
-						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
-						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
-					</td>
-				</tr>
-			{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
-		{{ else }}
-			<p>$no_pending</p>
-		{{ endif }}
-	
-	
-		
-	
-		<h3>$h_users</h3>
-		{{ if $users }}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{ for $users as $u }}
-					<tr>
-						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-						<td class='email'>$u.email</td>
-						<td class='register_date'>$u.register_date</td>
-						<td class='login_date'>$u.login_date</td>
-						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page-flags</td>
-						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
-						<td class="tools" style="width:60px;">
-							<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-							<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
-						</td>
-					</tr>
-				{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
-		{{ else }}
-			NO USERS?!?
-		{{ endif }}
-	</form>
-</div>
diff --git a/view/theme/diabook/contact_template.tpl b/view/theme/diabook/contact_template.tpl
deleted file mode 100644
index 48930b48ab..0000000000
--- a/view/theme/diabook/contact_template.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-                        $contact.photo_menu
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/smoothly/header.tpl b/view/theme/diabook/experimental
similarity index 100%
rename from view/theme/smoothly/header.tpl
rename to view/theme/diabook/experimental
diff --git a/view/theme/diabook/message_side.tpl b/view/theme/diabook/message_side.tpl
deleted file mode 100644
index 9f15870964..0000000000
--- a/view/theme/diabook/message_side.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="message-sidebar" class="widget">
-	<div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div>
-	
-	<ul class="message-ul">
-		{{ for $tabs as $t }}
-			<li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index cf45441757..c0ca82b41c 100644
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -37,7 +37,6 @@ load_config("diabook");
 load_pconfig(local_user(), "diabook");
 
 //get statuses of boxes at right-hand-column
-$close_pages      = get_diabook_config( "close_pages", 1 );
 $close_profiles   = get_diabook_config( "close_profiles", 0 );
 $close_helpers    = get_diabook_config( "close_helpers", 0 );
 $close_services   = get_diabook_config( "close_services", 0 );
@@ -297,11 +296,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	<script>
 	$("right_aside").ready(function(){
 
-	if('.$close_pages.')
-		{
-		document.getElementById( "close_pages" ).style.display = "none";
-			};
-
 	if('.$close_mapquery.')
 		{
 		document.getElementById( "close_mapquery" ).style.display = "none";
@@ -368,7 +362,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
  function diabook_community_info() {
 	$a = get_app();
 
-	$close_pages      = get_diabook_config( "close_pages", 1 );
 	$close_profiles   = get_diabook_config( "close_profiles", 0 );
 	$close_helpers    = get_diabook_config( "close_helpers", 0 );
 	$close_services   = get_diabook_config( "close_services", 0 );
@@ -530,40 +523,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	$aside['$nv'] = $nv;
 	}}
 
-   //Community_Pages at right_aside
-   if($close_pages != "1") {
-   if(local_user()) {
-   $page = '
-			<h3 style="margin-top:0px;">'.t("Community Pages").'<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="'.t("Settings").'"></a></h3>
-			<div id=""><ul style="margin-left: 7px;margin-top: 0px;padding-left: 0px;padding-top: 0px;">';
-
-	$pagelist = array();
-
-	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
-			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
-			ORDER BY `name` ASC",
-			intval($a->user['uid'])
-	);
-
-	$pageD = array();
-
-	// Look if the profile is a community page
-	foreach($contacts as $contact) {
-		$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
-	};
-
-
-	$contacts = $pageD;
-
-	foreach($contacts as $contact) {
-		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px; word-wrap: break-word; width: 132px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
-				$contact["name"]."</a></li>";
-	}
-	$page .= '</ul></div>';
-	//if (sizeof($contacts) > 0)
-		$aside['$page'] = $page;
-	}}
-  //END Community Page
 
    //mapquery
 
@@ -616,7 +575,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	}
    //end twitter
    if($ccCookie != "10") {
-	$close_pages      = get_diabook_config( "close_pages", 1 );
 	$close_profiles   = get_diabook_config( "close_profiles", 0 );
 	$close_helpers    = get_diabook_config( "close_helpers", 0 );
 	$close_services   = get_diabook_config( "close_services", 0 );
@@ -629,7 +587,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	$close_or_not = array('1'=>t("don't show"),	'0'=>t("show"),);
 	$boxsettings['title'] = Array("", t('Show/hide boxes at right-hand column:'), "", "");
 	$aside['$boxsettings'] = $boxsettings;
-	$aside['$close_pages'] = array('diabook_close_pages', t('Community Pages'), $close_pages, '', $close_or_not);
 	$aside['$close_mapquery'] = array('diabook_close_mapquery', t('Earth Layers'), $close_mapquery, '', $close_or_not);
 	$aside['$close_profiles'] = array('diabook_close_profiles', t('Community Profiles'), $close_profiles, '', $close_or_not);
 	$aside['$close_helpers'] = array('diabook_close_helpers', t('Help or @NewHere ?'), $close_helpers, '', $close_or_not);
@@ -643,7 +600,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
    $baseurl = $a->get_baseurl($ssl_state);
    $aside['$baseurl'] = $baseurl;
    if (isset($_POST['diabook-settings-box-sub']) && $_POST['diabook-settings-box-sub']!=''){
-		set_pconfig(local_user(), 'diabook', 'close_pages', $_POST['diabook_close_pages']);
 		set_pconfig(local_user(), 'diabook', 'close_mapquery', $_POST['diabook_close_mapquery']);
 		set_pconfig(local_user(), 'diabook', 'close_profiles', $_POST['diabook_close_profiles']);
 		set_pconfig(local_user(), 'diabook', 'close_helpers', $_POST['diabook_close_helpers']);
diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index 5cb9ee205d..cc5197dab1 100644
--- a/view/theme/dispy/dark/style.css
+++ b/view/theme/dispy/dark/style.css
@@ -191,7 +191,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #jot-title-wrapper{margin-bottom:5px;}
 #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;}
+#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;margin:5em auto 1em;}#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: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;}
@@ -519,7 +519,7 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
 .type-text{background-position:-60px 0px;}
 .type-unkn{background-position:-80px 0;}
 .cc-license{margin-top:100px;font-size:0.7em;}
-footer{display:block;clear:both;text-align:center;}
+footer{display:block;clear:both;}
 #sectionfooter{margin:1em 0 1em 0;}
 #profile-jot-text{height:20px;color:#eeeecc;background:#2e2f2e;border:1px solid #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;width:99.5%;}
 #photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#2e2f2e;color:#eeeecc;}
@@ -549,4 +549,5 @@ footer{display:block;clear:both;text-align:center;}
 #sidebar-page-list ul{padding:0;margin:5px 0;}
 #sidebar-page-list li{list-style:none;}
 #jappix_mini{margin-left:130px;position:fixed;bottom:0;right:175px !important;z-index:999;}
+#fancybox-content{color:#111;}
 @media handheld and screen{body{font-size:15pt;}}@media only screen and (min-device-width:320px) and (max-device-width:480px){body{font-size:12pt;}}@media only screen and (min-width:321px){body{font-size:12pt;}}@media only screen and (max-width:320px){body{font-size:12pt;}}@media only screen and (min-device-width:768px) and (max-device-width:1024px){body{font-size:14pt;}}@media only screen and (min-device-width:768px) and (max-device-width:1024px) and (orientation:landscape){body{font-size:14pt;}}@media only screen and (min-device-width:768px) and (max-device-width:1024px) and (orientation:portrait){body{font-size:14pt;}}@media only screen and (min-width:1024px){body{font-size:14pt;}}@media only screen and (min-width:1520px){body{font-size:16pt;}}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-device-pixel-ratio:1.5){body{font-size:14pt;}}
diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index d7becbedb8..d6920c7733 100644
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -1258,6 +1258,7 @@ nav #nav-notifications-linkmenu {
     .rounded_corners;
     .box_shadow(5px, 0, 10px);
     padding: 3px 3px 6px 10px;
+    margin: 5em auto 1em;
     .wall-item-outside-wrapper {
         border: 0;
         .rounded_corners(0px 0px 0px 0px);
@@ -3230,4 +3231,8 @@ footer {
     z-index: 999;
 }
 
+#fancybox-content {
+	color: #111;
+}
+
 @import "../css/media";
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
index fe8d6884cc..bb237be48e 100644
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@@ -191,7 +191,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #jot-title-wrapper{margin-bottom:5px;}
 #jot-title-display{font-weight:bold;}
 .jothidden{display:none;}
-#jot-preview-content{background-color:#f2f2c3;color:#111111;border:1px solid #111111;-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;}
+#jot-preview-content{background-color:#f2f2c3;color:#111111;border:1px solid #111111;-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;margin:5em auto 1em;}#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: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 #284d7d;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:#f2f2c3;color:#111111;border:1px solid #284d7d;}
@@ -519,7 +519,7 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
 .type-text{background-position:-60px 0px;}
 .type-unkn{background-position:-80px 0;}
 .cc-license{margin-top:100px;font-size:0.7em;}
-footer{display:block;clear:both;text-align:center;}
+footer{display:block;clear:both;}
 #sectionfooter{margin:1em 0 1em 0;}
 #profile-jot-text{height:20px;color:#666666;background:#cccccc;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;width:99.5%;}
 #photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#eeeeec;color:#111111;}
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index 3db91a8507..950aaff5d6 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -1259,6 +1259,7 @@ nav #nav-notifications-linkmenu {
     .rounded_corners;
     .box_shadow(5px, 0, 10px);
     padding: 3px 3px 6px 10px;
+    margin: 5em auto 1em;
     .wall-item-outside-wrapper {
         border: 0;
         .rounded_corners(0px 0px 0px 0px);
diff --git a/view/theme/smoothly/categories_widget.tpl b/view/theme/smoothly/categories_widget.tpl
deleted file mode 100644
index 773f3d7d69..0000000000
--- a/view/theme/smoothly/categories_widget.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="categories-sidebar" class="widget">
-	<h3>$title</h3>
-	<div id="nets-desc">$desc</div>
-	
-	<ul class="categories-ul">
-		<li class="widget-list"><a href="$base" class="categories-link categories-all{{ if $sel_all }} categories-selected{{ endif }}">$all</a></li>
-		{{ for $terms as $term }}
-			<li class="widget-list"><a href="$base?f=&category=$term.name" class="categories-link{{ if $term.selected }} categories-selected{{ endif }}">$term.name</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/smoothly/contact_template.tpl b/view/theme/smoothly/contact_template.tpl
deleted file mode 100644
index 917d302f7e..0000000000
--- a/view/theme/smoothly/contact_template.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-                        $contact.photo_menu
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/smoothly/css/typography.css b/view/theme/smoothly/css/typography.css
index ffcb900034..7ae53a2658 100644
--- a/view/theme/smoothly/css/typography.css
+++ b/view/theme/smoothly/css/typography.css
@@ -1,4 +1,4 @@
-/* global typography settings */
+/* global basic typography settings */
 
 textarea,
 pre,
@@ -127,7 +127,7 @@ li {
 
 dt { font-weight:bold; }
 
-dd { margin:0 0 1.5em 0.8em; }
+dd { }
 
 
 /* --- general text formatting | Allgemeine Textauszeichnung ------------------------------------------ */
@@ -135,8 +135,8 @@ dd { margin:0 0 1.5em 0.8em; }
 p {
 	max-width: 600px;
 	font-size:1em;
-	line-height:1.5em;
-	margin: 1.5em 0 0 0;
+	/*line-height:1.5em;*/
+	/*margin: 1.5em 0 0 0;*/
 }
 
 blockquote, cite, q {
@@ -225,6 +225,10 @@ hr {
 	color: #1873a2;
 }
 
+.hidden { 
+	display: none!important; 
+}
+
 /*--- Links ----------------------------------------------------------------------------------------- */
 
 a {
@@ -244,7 +248,7 @@ a:focus {
 	text-decoration:none;
 }
 
-/* --- images ------------------ */
+/*--- Images ----------------------------------------------------------------------------------------- */
 
 img,
 figure {
@@ -271,3 +275,9 @@ figure {
 	-moz-box-shadow: 0 0 3px rgba(0,0,0,.25);
 	box-shadow: 0 0 3px rgba(0,0,0,.25);
 }
+
+/*--- Tables ----------------------------------------------------------------------------------------- */
+
+tr {
+	border: 1px solid #eeeeee;
+}
diff --git a/view/theme/smoothly/footer.tpl b/view/theme/smoothly/footer.tpl
deleted file mode 100644
index 25058a7ff7..0000000000
--- a/view/theme/smoothly/footer.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="footerbox" style="display:none">
-<a style="float:right; color:#333;margin-right:10px;display: table;margin-top: 5px;" href="friendica" title="Site Info / Impressum" >Info / Impressum</a>
-</div>
\ No newline at end of file
diff --git a/view/theme/smoothly/generic_links_widget.tpl b/view/theme/smoothly/generic_links_widget.tpl
deleted file mode 100644
index a1159f5bc8..0000000000
--- a/view/theme/smoothly/generic_links_widget.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="widget{{ if $class }} $class{{ endif }}">
-	{{if $title}}<h3>$title</h3>{{endif}}
-	{{if $desc}}<div class="desc">$desc</div>{{endif}}
-	
-	<ul>
-		{{ for $items as $item }}
-			<li class="widget-list"><a href="$item.url" class="{{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/smoothly/group_drop.tpl b/view/theme/smoothly/group_drop.tpl
deleted file mode 100644
index f088fc06ff..0000000000
--- a/view/theme/smoothly/group_drop.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="group-delete-wrapper" id="group-delete-wrapper-$id" >
-	<a href="group/drop/$id" 
-		onclick="return confirmDelete();" 
-		title="$delete" 
-		id="group-delete-icon-$id" 
-		class="drophide group-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" >Delete Group</a>
-</div>
-<div class="group-delete-end"></div>
diff --git a/view/theme/smoothly/group_side.tpl b/view/theme/smoothly/group_side.tpl
deleted file mode 100644
index a1fc70a22e..0000000000
--- a/view/theme/smoothly/group_side.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="widget" id="group-sidebar">
-<h3>$title</h3>
-
-<div id="sidebar-group-list">
-	<ul id="sidebar-group-ul">
-		{{ for $groups as $group }}
-			<li class="sidebar-group-li">
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}			
-				{{ if $group.edit }}
-					<a class="groupsideedit" href="$group.edit.href"><span class="icon small-pencil"></span></a>
-				{{ endif }}
-				<a class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
-			</li>
-		{{ endfor }}
-	</ul>
-	</div>
-  <div id="sidebar-new-group">
-  <a href="group/new">$createtext</a>
-  </div>
-</div>
-
-
diff --git a/view/theme/smoothly/arrow.png b/view/theme/smoothly/images/arrow.png
similarity index 100%
rename from view/theme/smoothly/arrow.png
rename to view/theme/smoothly/images/arrow.png
diff --git a/view/theme/smoothly/calendar.png b/view/theme/smoothly/images/calendar.png
similarity index 100%
rename from view/theme/smoothly/calendar.png
rename to view/theme/smoothly/images/calendar.png
diff --git a/view/theme/smoothly/connect.png b/view/theme/smoothly/images/connect.png
similarity index 100%
rename from view/theme/smoothly/connect.png
rename to view/theme/smoothly/images/connect.png
diff --git a/view/theme/smoothly/dot.png b/view/theme/smoothly/images/dot.png
similarity index 100%
rename from view/theme/smoothly/dot.png
rename to view/theme/smoothly/images/dot.png
diff --git a/view/theme/smoothly/down.png b/view/theme/smoothly/images/down.png
similarity index 100%
rename from view/theme/smoothly/down.png
rename to view/theme/smoothly/images/down.png
diff --git a/view/theme/smoothly/file.gif b/view/theme/smoothly/images/file.gif
similarity index 100%
rename from view/theme/smoothly/file.gif
rename to view/theme/smoothly/images/file.gif
diff --git a/view/theme/smoothly/groups.png b/view/theme/smoothly/images/groups.png
similarity index 100%
rename from view/theme/smoothly/groups.png
rename to view/theme/smoothly/images/groups.png
diff --git a/view/theme/smoothly/icons.png b/view/theme/smoothly/images/icons.png
similarity index 100%
rename from view/theme/smoothly/icons.png
rename to view/theme/smoothly/images/icons.png
diff --git a/view/theme/smoothly/icons.svg b/view/theme/smoothly/images/icons.svg
similarity index 100%
rename from view/theme/smoothly/icons.svg
rename to view/theme/smoothly/images/icons.svg
diff --git a/view/theme/smoothly/login-bg.gif b/view/theme/smoothly/images/login-bg.gif
similarity index 100%
rename from view/theme/smoothly/login-bg.gif
rename to view/theme/smoothly/images/login-bg.gif
diff --git a/view/theme/smoothly/lrarrow.gif b/view/theme/smoothly/images/lrarrow.gif
similarity index 100%
rename from view/theme/smoothly/lrarrow.gif
rename to view/theme/smoothly/images/lrarrow.gif
diff --git a/view/theme/smoothly/menu-user-pin.jpg b/view/theme/smoothly/images/menu-user-pin.jpg
similarity index 100%
rename from view/theme/smoothly/menu-user-pin.jpg
rename to view/theme/smoothly/images/menu-user-pin.jpg
diff --git a/view/theme/smoothly/menu-user-pin.png b/view/theme/smoothly/images/menu-user-pin.png
similarity index 100%
rename from view/theme/smoothly/menu-user-pin.png
rename to view/theme/smoothly/images/menu-user-pin.png
diff --git a/view/theme/smoothly/nav-bg.png b/view/theme/smoothly/images/nav-bg.png
similarity index 100%
rename from view/theme/smoothly/nav-bg.png
rename to view/theme/smoothly/images/nav-bg.png
diff --git a/view/theme/smoothly/next.png b/view/theme/smoothly/images/next.png
similarity index 100%
rename from view/theme/smoothly/next.png
rename to view/theme/smoothly/images/next.png
diff --git a/view/theme/smoothly/notifications.png b/view/theme/smoothly/images/notifications.png
similarity index 100%
rename from view/theme/smoothly/notifications.png
rename to view/theme/smoothly/images/notifications.png
diff --git a/view/theme/smoothly/photo-menu.jpg b/view/theme/smoothly/images/photo-menu.jpg
similarity index 100%
rename from view/theme/smoothly/photo-menu.jpg
rename to view/theme/smoothly/images/photo-menu.jpg
diff --git a/view/theme/smoothly/photography.png b/view/theme/smoothly/images/photography.png
similarity index 100%
rename from view/theme/smoothly/photography.png
rename to view/theme/smoothly/images/photography.png
diff --git a/view/theme/smoothly/premium.png b/view/theme/smoothly/images/premium.png
similarity index 100%
rename from view/theme/smoothly/premium.png
rename to view/theme/smoothly/images/premium.png
diff --git a/view/theme/smoothly/prev.png b/view/theme/smoothly/images/prev.png
similarity index 100%
rename from view/theme/smoothly/prev.png
rename to view/theme/smoothly/images/prev.png
diff --git a/view/theme/smoothly/search.png b/view/theme/smoothly/images/search.png
similarity index 100%
rename from view/theme/smoothly/search.png
rename to view/theme/smoothly/images/search.png
diff --git a/view/theme/smoothly/shiny.png b/view/theme/smoothly/images/shiny.png
similarity index 100%
rename from view/theme/smoothly/shiny.png
rename to view/theme/smoothly/images/shiny.png
diff --git a/view/theme/smoothly/star.png b/view/theme/smoothly/images/star.png
similarity index 100%
rename from view/theme/smoothly/star.png
rename to view/theme/smoothly/images/star.png
diff --git a/view/theme/smoothly/tobottom.png b/view/theme/smoothly/images/tobottom.png
similarity index 100%
rename from view/theme/smoothly/tobottom.png
rename to view/theme/smoothly/images/tobottom.png
diff --git a/view/theme/smoothly/totop.png b/view/theme/smoothly/images/totop.png
similarity index 100%
rename from view/theme/smoothly/totop.png
rename to view/theme/smoothly/images/totop.png
diff --git a/view/theme/smoothly/user.png b/view/theme/smoothly/images/user.png
similarity index 100%
rename from view/theme/smoothly/user.png
rename to view/theme/smoothly/images/user.png
diff --git a/view/theme/smoothly/login.tpl b/view/theme/smoothly/login.tpl
index 483f540c97..281890f423 100644
--- a/view/theme/smoothly/login.tpl
+++ b/view/theme/smoothly/login.tpl
@@ -1,4 +1,4 @@
-<img style="float:left; margin-right:20px" src="/images/friendica-128.png" title="friendica">
+<img style="float:left; margin:5px 20px 0 0" src="/images/friendica-128.png" title="friendica">
 
 <div class="login-form">
 <form action="$dest_url" method="post" >
diff --git a/view/theme/smoothly/mail_head.tpl b/view/theme/smoothly/mail_head.tpl
deleted file mode 100644
index afb65f5373..0000000000
--- a/view/theme/smoothly/mail_head.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3>$messages</h3>
-
-$tab_content
diff --git a/view/theme/smoothly/message_side.tpl b/view/theme/smoothly/message_side.tpl
deleted file mode 100644
index a35c74ed99..0000000000
--- a/view/theme/smoothly/message_side.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<div id="message-sidebar" class="widget">
-	<br />
-	<div id="side-invite-link" class="side-link" ><a href="$new.url" class="{{ if $new.sel }}newmessage-selected{{ endif }}">$new.label</a> </div>
-	
-	<ul class="message-ul">
-		{{ for $tabs as $t }}
-			<li class="tool">
-			<a href="$t.url" class="message-link{{ if $t.sel }}message-selected{{ endif }}">$t.label</a>
-			</li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/smoothly/nav.tpl b/view/theme/smoothly/nav.tpl
index 03d4df5084..fee2577a50 100644
--- a/view/theme/smoothly/nav.tpl
+++ b/view/theme/smoothly/nav.tpl
@@ -57,8 +57,8 @@
 </nav>
 
 <div id="scrollup" >
-<a href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/totop.png" alt="to top" title="to top" /></a><br />
-<a href="javascript:ScrollToBottom()"><img src="view/theme/smoothly/tobottom.png" alt="to bottom" title="to bottom" /></a>
+<a href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/images/totop.png" alt="to top" title="to top" /></a><br />
+<a href="javascript:ScrollToBottom()"><img src="view/theme/smoothly/images/tobottom.png" alt="to bottom" title="to bottom" /></a>
 </div>
 
 <ul id="nav-notifications-template" style="display:none;" rel="template">
diff --git a/view/theme/smoothly/nets.tpl b/view/theme/smoothly/nets.tpl
deleted file mode 100644
index 920c2332b6..0000000000
--- a/view/theme/smoothly/nets.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="nets-sidebar" class="widget">
-	<h3>$title</h3>
-	<div id="nets-desc">$desc</div>
-	<a href="$base?nets=all" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
-	<ul class="nets-ul">
-	{{ for $nets as $net }}
-	<li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
-	{{ endfor }}
-	</ul>
-</div>
diff --git a/view/theme/smoothly/peoplefind.tpl b/view/theme/smoothly/peoplefind.tpl
deleted file mode 100644
index 59f803d130..0000000000
--- a/view/theme/smoothly/peoplefind.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="peoplefind-sidebar" class="widget">
-	<h3>$findpeople</h3>
-	<div id="peoplefind-desc">$desc</div>
-	<form action="dirfind" method="post" >
-		<input id="side-peoplefind-url" type="text-sidebar" name="search" size="24" title="$hint" />
-		<input id="side-peoplefind-submit" type="submit" name="submit" value="$findthem" />
-	</form>
-	<div class="side-link" id="side-invite-link"><a href="match" >$similar</a></div>
-	<div class="side-link" id="side-invite-link"><a href="suggest" >$suggest</a></div>
-	<div class="side-link" id="side-invite-link"><a href="randprof" target="extlink" >$random</a></div>
-	{{ if $inv }} 
-	<div class="side-link" id="side-invite-link"><a href="invite" >$inv</a></div>
-	{{ endif }}
-</div>
-
diff --git a/view/theme/smoothly/photo_album.tpl b/view/theme/smoothly/photo_album.tpl
deleted file mode 100644
index a0e3f46c49..0000000000
--- a/view/theme/smoothly/photo_album.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id">
-	<a href="$photolink" class="photo-album-photo-link" id="photo-album-photo-link-$id" title="$phototitle">
-		<img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe  resize" id="photo-album-photo-$id" />
-	</div>
-		<p class='caption'>$desc</p>		
-	</a>
-	</div>
-<div class="photo-album-image-wrapper-end"></div>
diff --git a/view/theme/smoothly/photo_top.tpl b/view/theme/smoothly/photo_top.tpl
deleted file mode 100644
index 10d76f170f..0000000000
--- a/view/theme/smoothly/photo_top.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-$id">
-	<div id="photo-album-wrapper-inner">
-	<a href="$photo.link" class="photo-top-photo-link" id="photo-top-photo-link-$id" title="$photo.title"><img src="$photo.src" alt="$phoyo.alt" title="$photo.title" class="photo-top-photo" id="photo-top-photo-$id" /></a>
-	</div>
-	<div class="photo-top-album-name"><a href="$photo.album.link" class="photo-top-album-link" title="$photo.album.alt" >$photo.album.name</a></div>
-</div>
-<div class="photo-top-image-wrapper-end"></div>
diff --git a/view/theme/smoothly/photo_view.tpl b/view/theme/smoothly/photo_view.tpl
deleted file mode 100644
index 4c754f5978..0000000000
--- a/view/theme/smoothly/photo_view.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
--
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
-</div>
-
-<div id="photo-photo" class="lframe">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-	<a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a>
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-</div>
-
-<div id="photo-photo-end"></div>
-<div id="photo-caption" >$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
-
-{{ if $likebuttons }}
-<div id="photo-like-div">
-	$likebuttons
-	$like
-	$dislike	
-</div>
-{{ endif }}
-
-$comments
-
-$paginate
-
diff --git a/view/theme/smoothly/profile_entry.tpl b/view/theme/smoothly/profile_entry.tpl
deleted file mode 100644
index 55d6448c65..0000000000
--- a/view/theme/smoothly/profile_entry.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="profile-listing" >
-<div class="profile-listing-photo-wrapper" >
-<a href="profiles/$id" class="profile-listing-edit-link"><img class="profile-listing-photo mframe" id="profile-listing-photo-$id" src="$photo" alt="$alt" /></a>
-</div>
-<div class="profile-listing-photo-end"></div>
-<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
-<div class='profile-visible'>$visible</div>
-</div>
-<div class="profile-listing-end"></div>
-
diff --git a/view/theme/smoothly/profile_vcard.tpl b/view/theme/smoothly/profile_vcard.tpl
deleted file mode 100644
index 6d5fb10b74..0000000000
--- a/view/theme/smoothly/profile_vcard.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-<div class="vcard">
-	<div class="fn label">$profile.name</div>
-				
-	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="191" height="191" src="$profile.photo" alt="$profile.name"></div>
-
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
-			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
\ No newline at end of file
diff --git a/view/theme/smoothly/saved_searches_aside.tpl b/view/theme/smoothly/saved_searches_aside.tpl
deleted file mode 100644
index e2aae1e77c..0000000000
--- a/view/theme/smoothly/saved_searches_aside.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="widget" id="saved-search-list">
-	<h3 id="search">$title</h3>
-	$searchbox
-	
-	<ul id="saved-search-ul">
-		{{ for $saved as $search }}
-		<li class="saved-search-li clear">
-			<a onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
-			<a class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
-		</li>
-		{{ endfor }}
-	</ul>
-	<div class="clear"></div>
-</div>
diff --git a/view/theme/smoothly/screenshot.png b/view/theme/smoothly/screenshot.png
deleted file mode 100644
index 09237d71aa..0000000000
Binary files a/view/theme/smoothly/screenshot.png and /dev/null differ
diff --git a/view/theme/smoothly/search_item.tpl b/view/theme/smoothly/search_item.tpl
deleted file mode 100644
index 6503eb6787..0000000000
--- a/view/theme/smoothly/search_item.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-<a name="$item.id" ></a>
-<div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
-	<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info" id="wall-item-info-$item.id">
-			<div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-$item.id" 
-				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-					<ul>
-						$item.item_photo_menu
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
-		</div>
-		<div class="wall-item-lock-wrapper">
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}			
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-			</div>
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			<div class="wall-item-delete-end"></div>
-		</div>
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
-			
-			{{ if $item.has_cats }}
-			<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name 
-			<a href="$cat.removeurl" title="$remove">[$remove]</a> 
-			{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name 
-			<a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
-				
-		</div>			
-		
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-</div>
-
-<div class="wall-item-outside-wrapper-end $item.indent" ></div>
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index 8bc50a0fe7..ef7891f12e 100644
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -2,7 +2,7 @@
   	style.css
   	Smoothly
    
-	Created by alex@friendica.pixelbits.de on 2012-10-23
+	Created by alex@friendica.pixelbits.de on 2012-10-25
 
 ** Colors ** 
 Blue links - #1873a2
@@ -16,7 +16,6 @@ Orange - #fec01d
 
 @import url('css/typography.css');
 
-
 .lockview {
 	cursor: pointer;
 }
@@ -26,13 +25,11 @@ Orange - #fec01d
 	font-size: 100%;
 }
 
-
 input[type=text] {
 	float: left;
 	border: 1px solid #b0b0b0;
 	padding: 2px;
 	width: 550px;
-	/*margin-top: 10px;*/
 	border-radius: 3px;
 		-moz-border-radius: 3px;
 		-webkit-border-radius: 3px;
@@ -50,7 +47,7 @@ input[type=text-sidebar] {
 }
 
 input[type=submit] {
-	margin: 10px;
+	margin:10px 10px 0 0;
 	font-size: 0.9em;
 	padding: 5px;
 	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
@@ -79,6 +76,7 @@ input[type=submit]:hover {
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 }
+
 input[type=submit]:active {
 	position: relative;
 	top: 1px;
@@ -96,14 +94,13 @@ input[type=submit]:active {
 }
 
 .dirsearch-desc {
-
 }
 
 .smalltext {
 	font-size: 0.7em
 }
 
-::selection	{
+::selection {
 	background: #fec01d;
 	color: #000; /* Safari and Opera */
 }
@@ -132,8 +129,8 @@ section {
 
 .mframe {
 	padding: 3px;
-    background: none repeat scroll 0 0 #FFFFFF;
-    border: 1px solid #C5C5C5;
+	background: none repeat scroll 0 0 #FFFFFF;
+	border: 1px solid #C5C5C5;
 	border-radius: 3px;
 		-moz-border-radius: 3px;
 		-webkit-border-radius: 3px;
@@ -188,7 +185,8 @@ section {
 /* = Login = */
 /* ========= */
 
-#login-name-wrapper {
+#login-name-wrapper,
+#login-password-wrapper {
 	vertical-align: middle;
 	margin: auto;
 }
@@ -198,11 +196,6 @@ section {
 	margin-left: 20px;
 }
 
-#login-password-wrapper {
-	vertical-align: middle;
-	margin: auto;
-}
-
 #login-extra-links {
 	width: 90px;
 	margin-top: 20px;
@@ -222,11 +215,18 @@ section {
 }
 
 #login_standard {
-	width: 210px;
+	width: 250px;
 	float: left;
+	border: 1px solid #7C7D7B;
+	border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+	padding: 10px;
+	margin: 10px 0 0 0;
 }
+
 #login_openid {
-	width: 210px;
+	width: 300px;
 	margin-left: 150px;
 }
 
@@ -249,14 +249,18 @@ section {
 	height: 50px;
 }
 
-#login-submit-button {
+#login-submit-button,
+#login-submit-wrapper {
 	margin-top: 10px;
 	margin-left: 75px;
 }
 
-#login-submit-wrapper {
+#login-submit-button {
+	width: 271px;
+}
+
+.login-form,
 	margin-top: 10px;
-	margin-left: 75px;
 }
 
 /* ========= */
@@ -357,7 +361,7 @@ nav #banner {
 	display: block;
 	position: absolute;
 	margin-left: 3px;
-	margin-top: 3px;
+	/*margin-top: 2px;*/
 	padding-bottom: 5px;	
 }
 
@@ -391,8 +395,24 @@ nav #user-menu {
 	text-decoration: none;
 	text-align: center;   
 }
+
+nav #user-menu:hover {
+	border: 1px solid #7C7D7B;
+	box-shadow: 0 0 8px #BDBDBD;
+		-moz-box-shadow: 3px 3px 4px #959494;
+		-webkit-box-shadow: 3px 3px 4px #959494;
+	border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2;
+	color: #efefef;
+}
+
 nav #user-menu-label::after {
-	content: url("menu-user-pin.png") no-repeat;
+	content: url("images/menu-user-pin.png") no-repeat;
 	padding-left: 15px;
 }
 
@@ -412,32 +432,6 @@ nav #user-menu-label {
 nav #nav-link-wrapper .nav-link {
 	border-right: 1px solid #babdb6;
 }
-/* menu problems
-.nav-commlink, .nav-login-link {
-	display: block;
-	height: 15px;
-	margin-top: 67px;
-	margin-right: 2px;
-	padding: 6px 3px;
-	float: left;
-	bottom: 140px;
-	border: 1px solid #babdb6;
-	border-bottom: 0px;
-	background-color: #aec0d3;
-	color: #565854;		
-	border-radius: 3px 3px 0px 0px;
-	-moz-border-radius: 3px 3px 0px 0px;
-}
-
-.nav-commlink.selected {
-	background-color: #ffffff;
-	border-bottom: 1px solid #ffffff;
-	color: #000000 !important;
-	margin-top: 64px;
-	padding-top: 6px;
-	padding-bottom: 8px;
-}
-*/
 
 .error-message {
 	color: #FF0000;
@@ -463,19 +457,19 @@ ul#user-menu-popup {
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#797979', endColorstr='#898988');
 	background-color: #898988;
 	width: 100%;
-	padding: 10px 0px;
+	padding: 0;
 	margin: 0px;
-	margin-top: 4px;
+	margin-top: 10px;
 	top: 20px;
 	left: 0px;
 	border: 1px solid #9a9a9a;
 	border-top: none;
-	-webkit-border-radius: 0px 0px 5px 5px;
-	-moz-border-radius: 0px 0px 5px 5px;    
 	border-radius: 0px 0px 5px 5px;
-	-moz-box-shadow: 5px 5px 10px #242424;
-	-webkit-box-shadow: 5px 5px 10px #242424;
+		-webkit-border-radius: 0px 0px 5px 5px;
+		-moz-border-radius: 0px 0px 5px 5px;
 	box-shadow: 5px 5px 10px #242424;    
+		-moz-box-shadow: 5px 5px 10px #242424;
+		-webkit-box-shadow: 5px 5px 10px #242424;
 	z-index: 10000;
 }
 
@@ -493,7 +487,7 @@ ul#user-menu-popup li a:hover {
 	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #6da6c4), color-stop(1, #1873a2) );
 	background: -moz-linear-gradient( center top, #6da6c4 5%, #1873a2 100% );
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#6da6c4', endColorstr='#1873a2');
-	background-color: #6da6c4;
+	background-color: #1873a2;
 }
 
 ul#user-menu-popup li a.nav-sep {
@@ -515,7 +509,7 @@ ul#user-menu-popup li a.nav-sep {
 .nav-ajax-update {
 	width: 44px;
 	height: 32px;
-	background: transparent url('notifications.png') 0px 0px no-repeat; 
+	background: transparent url('images/notifications.png') 0px 0px no-repeat; 
 	color: #333333;
 	font-weight: bold;
 	font-size: 0.8em;
@@ -562,7 +556,8 @@ ul#user-menu-popup li a.nav-sep {
 /* = System Messages = */
 /* =================== */
 
-#sysmsg_info, #sysmsg {
+#sysmsg_info, 
+#sysmsg {
 	position: fixed; 
 	bottom: 0px; right:20%; 
 	box-shadow: 7px 7px 10px #434343;
@@ -607,6 +602,10 @@ aside a {
 	/*padding-bottom: 5px;*/
 }
 
+aside h4 {
+	font-size: 1.3em;
+}
+
 .vcard .title {
 	font-size: 1em;
 }
@@ -643,9 +642,6 @@ aside a {
 		-webkit-border-radius: 5px;
 }
 
-aside h4 {
-	font-size: 1.3em;
-}
 
 .allcontact-link {
 	color: #626262;
@@ -691,8 +687,8 @@ aside h4 {
 	display: block;
 	color: #FFFFFF;
 	border-radius: 5px;
-	-webkit-border-radius: 5px ;
-	-moz-border-radius: 5px;
+		-webkit-border-radius: 5px ;
+		-moz-border-radius: 5px;
 	padding: 5px;
 	font-weight: bold;
 	background-color: #3465a4;
@@ -725,8 +721,8 @@ aside h4 {
 	width: auto;
 }
 
-h3#search:before {
-	content: url("search.png");
+h3 #search:before {
+	content: url("images/search.png");
 	padding-right: 10px;
 	vertical-align: middle;
 }
@@ -747,6 +743,29 @@ h3#search:before {
 	padding-bottom: 10px;
 }
 
+#message-sidebar {
+	vertical-align: middle;
+	margin-top: 40px;
+}
+
+#message-new {
+	padding: 7px;
+	width: 165px;
+	margin: 10px;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+	background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
+	background-color: #bdbdbd;
+	display: inline-block;
+	color: #efefef;
+	text-decoration: none;
+	text-align: center;
+	border: 1px solid #7C7D7B;
+	border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+}
+
 #peoplefind-desc {
 	margin-left: 10px;
 }
@@ -756,18 +775,13 @@ h3#search:before {
 	margin-right: 30px;
 }
 
+#sidebar-ungrouped {
+	margin: 10px;
+}
+
 #sidebar-group-list  a {
-	/*padding-bottom: 10px;*/
 }
 
-/*#sidebar-group-list ul {
-	list-style-type: none;
-}
-
-#sidebar-group-list li {
-	margin-top: 10px;
-}*/
-
 #sidebar-group-list .icon,
 #sidebar-group-list .iconspacer {
 	display: inline-block;
@@ -775,6 +789,17 @@ h3#search:before {
 	width: 12px;
 }
 
+#side-peoplefind-submit {
+	margin: 10px;
+}
+
+#side-peoplefind-url {
+	margin: 10px;
+	width: 175px;
+}
+
+#sidebar-page-list {}
+
 .widget {
 	margin-top: 20px;
 	box-shadow: 1px 2px 6px 0px #959494;
@@ -793,7 +818,7 @@ h3#search:before {
 
 li.widget-list {
 	list-style: none outside none;
-	background: url("arrow.png") no-repeat scroll left center transparent;
+	background: url("images/arrow.png") no-repeat scroll left center transparent;
 	display: block;
    	padding: 3px 24px;
 }
@@ -837,7 +862,10 @@ li.widget-list {
 	top: 1px;
 }
 
-.group-selected, .nets-selected, .fileas-selected, .categories-selected {
+.group-selected, 
+.nets-selected, 
+.fileas-selected, 
+.categories-selected {
 	padding-bottom: 0px;
 	padding-left: 2px;
 	padding-right: 2px;
@@ -870,7 +898,6 @@ li.widget-list {
 ul .sidebar-group-li {
 	list-style: none;
 	font-size: 1.0em;
-	/*padding-bottom: 5px;*/
 }
 
 ul .sidebar-group-li .icon {
@@ -883,22 +910,30 @@ ul .sidebar-group-li .icon {
 	list-style-type: none;
 }
 
-.nets-ul li, .fileas-ul li, .categories-ul li {
-	/*margin-top: 10px;*/
+.nets-ul li, 
+.fileas-ul li, 
+.categories-ul li {
 }
 
 .nets-link {
-	margin-left: 24px;
+	color: #1873A2;
+	text-decoration: none;
+	margin-left: 2px;
+	padding-left: 20px;
+	background: url("images/arrow.png") no-repeat scroll left center transparent;
+	box-shadow: none;
 }
 .nets-all {
 	margin-left: 42px;
 }
 
-.fileas-link, .categories-link {
+.fileas-link, 
+.categories-link {
 	margin-left: 0px;
 }
 
-.fileas-all, .categories-all {
+.fileas-all, 
+.categories-all {
 	margin-left: 0px;
 }
 
@@ -925,7 +960,7 @@ ul .sidebar-group-li .icon {
 }
 
 #group-sidebar h3:before {
-	content: url("groups.png");
+	content: url("images/groups.png");
 	padding-right: 10px;
 	vertical-align: middle;
 }
@@ -943,11 +978,13 @@ ul .sidebar-group-li .icon {
 	margin-right: 5px;
 }
 
-.birthday-today, .event-today {
+.birthday-today, 
+.event-today {
 	font-weight: bold;
 }
 
-#birthday-wrapper, #event-wrapper {
+#birthday-wrapper, 
+#event-wrapper {
 	margin-left: 15px;
 }
 
@@ -973,6 +1010,7 @@ ul .sidebar-group-li .icon {
 		-moz-box-shadow: 3px 3px 4px #959494;
 		-webkit-box-shadow: 3px 3px 4px #959494;
 }
+
 .contact-block-div {
 	float: left;
 }
@@ -989,6 +1027,7 @@ ul .sidebar-group-li .icon {
 
 .contact-block-h4,
 .contact-block-content {
+	margin: 0;
 }
 
 #contact-block,
@@ -1012,14 +1051,15 @@ ul .sidebar-group-li .icon {
 }
 
 #profile-jot-text_ifr {
-	width: 99.9%!important
+	width: 99.9% !important;
 }
 
 #profile-jot-submit-wrapper { 
 	margin-top: 30px;
 }
 
-#jot-title, #jot-category {
+#jot-title, 
+#jot-category {
 	margin: 0px;
 	height: 20px;
 	width: 575px;
@@ -1048,17 +1088,20 @@ ul .sidebar-group-li .icon {
 	border: 1px solid #cccccc;
 }
 
-.jothidden { display:none; }
+.jothidden {
+	display: none; 
+}
 
 .preview {
 	background: #FFFFC8;
 }
 
 #theme-preview {
-	margin: 15px 0 15px 150px;
+	margin: 15px 0 15px 0;
 }
 
-#profile-jot-perms, #profile-jot-submit {
+#profile-jot-perms, 
+#profile-jot-submit {
 	width: 60px;
 	font-size: 12px;
 	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
@@ -1080,7 +1123,6 @@ ul .sidebar-group-li .icon {
 #jot-preview-link {
 	float: left;
 	width: 60px;
-	/*height: 10px;*/
 	font-size: 12px;
 	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
 	background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
@@ -1329,14 +1371,10 @@ ul .sidebar-group-li .icon {
 	margin-left: 10px;
 }
 
-.wall-item-photo-menu {
-	display: none;
-}
-
 .wall-item-photo-menu-button {
 	display: none;
 	text-indent: -99999px;
-	background: #eeeeee url("menu-user-pin.png") no-repeat 75px center;
+	background: #eeeeee url("images/menu-user-pin.png") no-repeat 75px center;
 	position: absolute;
 	overflow: hidden;
 	height: 20px;
@@ -1355,8 +1393,16 @@ ul .sidebar-group-li .icon {
 
 .wall-item-photo-wrapper { 
 	width: 80px; 
-	height: 80px;  
+	height: 80px;
+	padding: 4px;
 	position: relative;
+	border: 1px solid #dddddd;
+	border-radius: 5px;
+		-webkit-border-radius: 5px;
+		-moz-border-radius: 5px;
+	box-shadow: 3px 3px 4px #959494;
+		-moz-box-shadow: 3px 3px 4px #959494;
+		-webkit-box-shadow: 3px 3px 4px #959494;
 }
 
 .wall-item-tools { 
@@ -1435,10 +1481,7 @@ ul .sidebar-group-li .icon {
 	margin-right: 20px;
 }
 
-.star-item {
-	float: left;	
-}
-
+.star-item,
 .tag-item {
 	float: left;	
 }
@@ -1562,6 +1605,7 @@ ul .sidebar-group-li .icon {
 }
 
 .wall-item-photo-menu {
+	display: none;
 	min-width: 92px;
 	color: #2e3436;
 	border-top: 1px;
@@ -1570,7 +1614,7 @@ ul .sidebar-group-li .icon {
 	border-left: 1px solid #dddddd;
 	border-bottom: 1px solid #dddddd;
 	position: absolute;
-	left: -2px; 
+	left: -1px; 
 	top: 101px;
 	display: none;
 	z-index: 10000;
@@ -1620,12 +1664,11 @@ ul .sidebar-group-li .icon {
 	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
 	background-color: #1873a2; 
-	/*order-bottom: none;*/
 }
 
 .icon.drop,
 .icon.drophide { 
-	float: right;
+	float: left;
 }
 
 #item-delete-selected-end,
@@ -1633,14 +1676,13 @@ ul .sidebar-group-li .icon {
 	overflow: auto;
 	margin-top: 20px;
 	float: right;
-    width: 250px;
+	width: 250px;
 }
 
 #item-delete-selected-icon {}
 
 code {
 	font-family: Courier, monospace;
-	/*white-space: pre;*/
 	display: block;
 	overflow: auto;
 	border: 1px solid #444;
@@ -1797,7 +1839,6 @@ code {
 
 .wall-item-body code {
 	font-family: Courier, monospace;
-	/*white-space: pre;*/
 	display: block;
 	overflow: auto;
 	border: 1px solid #cccccc;
@@ -1836,29 +1877,18 @@ div[id$="wrapper"] br {
 	margin-left: 20px;
 }
 
-#profile-listing-desc {
+#profile-listing-desc,
+#profile-listing-new-link-wrapper {
 	float: left;
 	display: inline;
 	padding: 5px 10px 5px 10px;
 	width: 150px;
-	margin-bottom: 20px;
-	margin-top: 20px;
+	margin:20px 10px 0 0;
 	display: inline-block;
 	font-style: bold;
 	text-align: center;
 }
 
-#profile-listing-new-link-wrapper {
-	float: left;
-	display: inline;
-	width: auto;
-	margin-left: 5px;
-	margin-top: 20px;
-	padding: 5px 10px 5px 10px;
-	font-style: bold;
-	text-align: center;
-}
-
 .profile-listing-name {
 	font-size: 1em;
 }
@@ -1866,6 +1896,10 @@ div[id$="wrapper"] br {
 	color: #898989;
 }
 
+#profile-edit-links {
+	margin-left: 0;
+}
+
 #profile-edit-links li {
 	display: inline;
 	width: 150px;
@@ -1914,7 +1948,7 @@ div[id$="wrapper"] br {
 	clear:both; 
 }
 
-.profile-match-name a{
+.profile-match-name a {
 	color: #999;
 	font-size: 1em;
 }
@@ -1924,10 +1958,12 @@ div[id$="wrapper"] br {
 }
 
 .profile-match-wrapper {
-	width: 82%;
-	padding: 5px;
+	float:left;
+	height:120px;
+	padding:10px;
+	width:120px;
 	margin-bottom: 10px;
-	margin-left: 20px;
+	/*margin-left: 20px;*/
 	background-color: #f6f6f6;
 	border: 1px solid #dddddd;
 	box-shadow: 3px 3px 4px #959494;
@@ -1949,13 +1985,26 @@ div[id$="wrapper"] br {
 /* ========== */
 /* = Photos = */
 /* ========== */
+
 .photos {
 	height: auto;
 	overflow: auto;
 }
 
+.photo {
+	height: 191px!important;
+	width: 191px!important;
+}
+
+#side-bar-photos-albums {
+}
+
+#photo-albums-upload-link {
+	margin: 20px;
+}
+
 #side-bar-photos-albums h3:before {
-	content: url("photography.png");
+	content: url("images/photography.png");
 	padding-right: 10px;
 	vertical-align: middle;
 }
@@ -2033,7 +2082,9 @@ div[id$="wrapper"] br {
 	border-bottom: 0px; 
 }
 
-.photo-top-photo {}
+.photo-top-photo {
+	width: 180px;
+}
 .photo-album-photo {} 
 
 .photo-top-album-name {
@@ -2089,13 +2140,13 @@ div[id$="wrapper"] br {
 #photo-prev-link { 
 	left: 0px; 
 	top: 0px; 
-	background-image: url('prev.png'); 
+	background-image: url('images/prev.png'); 
 }
 
 #photo-next-link { 
 	right: 0px; 
 	top: 0px; 
-	background-image: url('next.png');
+	background-image: url('images/next.png');
 }
 
 #photo-prev-link a,
@@ -2128,17 +2179,15 @@ div[id$="wrapper"] br {
 
 #photos-upload-existing-album-text,
 #photos-upload-newalbum-div { 
-	background-color: #fff;
 	color: #909090;
-	font-size: 1.2em;
 	padding: 3px 0px;
-	padding-left: 0px;
 	width: 300px;
 }
 
 #photos-upload-album-select,
 #photos-upload-newalbum { 
-	width: 400px; 
+	width: 400px;
+	margin-bottom: 10px;
 }
 
 #photos-upload-perms-menu {
@@ -2150,6 +2199,12 @@ div[id$="wrapper"] br {
 	display: none;
 }
 
+#photos-upload-perms {
+	margin-top: 10px;
+}
+
+.photos-upload-perms {}
+
 select, input {
 	border: 1px solid #b0b0b0;
 	padding: 2px;
@@ -2187,14 +2242,6 @@ textarea, keygen {
 input {
 	margin-top: 3px;
 	margin-right: 10px;
-	/*font-size: 0.9em;
-	letter-spacing: normal;
-	word-spacing: normal;
-	line-height: 1.2em;
-	text-transform: none;
-	text-indent: 0px;
-	text-shadow: none;
-	display: inline-block;*/
 	text-align: -webkit-auto;
 }
 
@@ -2236,7 +2283,7 @@ input {
 	text-align: left;
 }
 
-input#photo_edit_form {
+input #photo_edit_form {
 	display: block;
 	width: 100%;
 }
@@ -2272,9 +2319,9 @@ input#photo_edit_form {
 .mail-conv-detail, 
 .mail-list-detail {
 	position: relative;
-	width: 500px;
+	width: 550px;
 	padding: 50px;
-	margin: 20px auto;
+	margin: 20px 0 0 0;
 	background-color: #fff;
 	-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
 	-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
@@ -2377,7 +2424,7 @@ margin-left: 0px;
 	border-radius: 3px;
 		-moz-border-radius: 3px;
 		-webkit-border-radius: 3px;
-    box-shadow: 0 0 8px #BDBDBD;
+	box-shadow: 0 0 8px #BDBDBD;
 		-moz-box-shadow: 3px 3px 4px #959494;
 		-webkit-box-shadow: 3px 3px 4px #959494;
 }
@@ -2468,6 +2515,7 @@ margin-left: 0px;
 	margin: auto;
 	border: 1px solid #dddddd;
 }
+
 .mail-conv-break { 
 	display: none; 
 	border: none;
@@ -2624,10 +2672,18 @@ margin-left: 0px;
 }
 
 #contact-edit-update-now:hover {
+	color: #efefef;
 	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
 	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
 	background-color: #1873a2;
+	border: 1px solid #7C7D7B;
+	box-shadow: 0 0 8px #BDBDBD;
+		-moz-box-shadow: 3px 3px 4px #959494;
+		-webkit-box-shadow: 3px 3px 4px #959494;
+	border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
 }
 
 #contact-edit-update-now:active {
@@ -2642,12 +2698,27 @@ margin-left: 0px;
 	margin: auto;
 }
 
+#contact-edit-info-wrapper,
+#contact-edit-info-end,
+#contact-edit-profile-select-text,
+#contact-edit-profile-select-end,
+#contact-edit-poll-wrapper,
+#contact-edit-end {
+}
+
+.contact-edit-submit {
+}
+
+#contact-profile-selector {
+}
+
 .contact-photo-menu-button {
 	position: absolute;
-	background-image: url("photo-menu.jpg");
+	background-image: url("images/photo-menu.jpg");
 	background-position: top left; 
 	background-repeat: no-repeat;
-	margin: 10px 0 0 0; padding: 0px;
+	margin: 10px 0 0 0; 
+	padding: 0px;
 	width: 16px;
 	height: 16px;
 	top: 64px; left:0px;
@@ -2661,7 +2732,8 @@ margin-left: 0px;
 	border: 1px solid #ddd;
 	background: #f1f1f1;
 	position: absolute;
-	left: 0px; top: 90px;
+	left: 0px; 
+	top: 90px;
 	display: none;
 	z-index: 10000;
 	box-shadow: 3px 3px 5px #888;
@@ -2704,7 +2776,7 @@ margin-left: 0px;
 }
 
 #follow-sidebar h3:before {
-	content: url("user.png");
+	content: url("images/user.png");
 	padding-right: 10px;
 	vertical-align: middle;
 }
@@ -2720,10 +2792,14 @@ margin-left: 0px;
 	text-align: center;
 }
 
+#side-invite-link,
+#side-random-profile-link,
+#side-suggest-link,
 #side-match-link {
-	width: 158px;
+	width: 80%;
 	padding: 10px;
-	margin: auto 10px 20px;
+	margin: auto;
+	margin-bottom: 20px;
 	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
 	background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
@@ -2738,12 +2814,15 @@ margin-left: 0px;
 		-webkit-border-radius: 5px;
 }
 
+#side-invite-link:hover,
+#side-random-profile-link:hover,
+#side-suggest-link:hover,
 #side-match-link:hover {
 	color: #efefef;
 	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
 	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color: #1873a2;
+	background-color: #1873a2;	
 	border: 1px solid #7C7D7B;
 	box-shadow: 0 0 8px #BDBDBD;
 		-moz-box-shadow: 3px 3px 4px #959494;
@@ -2753,104 +2832,23 @@ margin-left: 0px;
 		-webkit-border-radius: 5px;
 }
 
+
+#side-invite-link:active,
+#side-random-profile-link:active,
+#side-suggest-link:active,
 #side-match-link:active {
 	background-color: #1873a2;
 	position: relative;
-	top: 1px;
+	top: 1px;	
 }
 
+#side-invite-link a,
+#side-random-profile-link a,
+#side-suggest-link a,
 #side-match-link a {
-	color: #efefef;
-}
-
-#side-invite-link {
-	width: 80%;
-	padding: 10px;
-	margin: auto;
-	margin-bottom: 20px;
-	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color: #bdbdbd;
-	padding: 5px 10px 5px 10px;
-	color: #efefef;
-	font-size: 1.1em;
-	text-align: center;
-	border: 1px solid #7C7D7B;
-	border-radius: 5px;
-		-moz-border-radius: 5px;
-		-webkit-border-radius: 5px;
-}
-
-#side-invite-link:hover {
-	color: #efefef;
-	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color: #1873a2;	
-	border: 1px solid #7C7D7B;
-	box-shadow: 0 0 8px #BDBDBD;
-		-moz-box-shadow: 3px 3px 4px #959494;
-		-webkit-box-shadow: 3px 3px 4px #959494;
-	border-radius: 5px;
-		-moz-border-radius: 5px;
-		-webkit-border-radius: 5px;
-}
-
-
-#side-invite-link:active {
-	background-color: #1873a2;
-	position: relative;
-	top: 1px;	
-}
-
-#side-invite-link a {
 	color: #efefef;	
 }
 
-#side-suggest-link {
-	width: 80%;
-	padding: 10px;
-	margin: auto;
-	margin-bottom: 20px;
-	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color: #bdbdbd;
-	padding: 5px 10px 5px 10px;
-	color: #efefef;
-	font-size: 1.1em;
-	text-align: center;
-	border: 1px solid #7C7D7B;
-	border-radius: 5px;
-		-moz-border-radius: 5px;
-		-webkit-border-radius: 5px;
-}
-
-#side-suggest-link:hover {
-	color: #efefef;
-	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color: #1873a2;	
-	border: 1px solid #7C7D7B;
-	box-shadow: 0 0 8px #BDBDBD;
-		-moz-box-shadow: 3px 3px 4px #959494;
-		-webkit-box-shadow: 3px 3px 4px #959494;
-	border-radius: 5px;
-		-moz-border-radius: 5px;
-		-webkit-border-radius: 5px;
-}
-
-#side-suggest-link:active {
-	background-color: #1873a2;
-	position: relative;
-	top: 1px;	
-}
-
-#side-suggest-link a {
-	color: #efefef;	
-}
 
 #invite-message,
 #invite-recipients, 
@@ -2932,11 +2930,12 @@ margin-left: 0px;
 /* = Register, Settings, Profile Forms = */
 /* ===================================== */
 
-#id_openid_url, .openid input{
-	background: url(login-bg.gif) no-repeat;
+#id_openid_url, 
+.openid input {
+	background: url(images/login-bg.gif) no-repeat;
 	background-position: 0 50%;
 	padding-left: 18px;
-	width: 220px!important;
+	width: 250px!important;
 }
 
 .openid:hover {
@@ -3067,20 +3066,20 @@ margin-left: 0px;
 	margin-right: 155px;
 }
 
-/* #register-form span,
-#profile-edit-form span  { */
 #register-form span {
 	color: #555753;
 	display: block;
 	margin-bottom: 20px;
 }
 
+.settings-submit,
 .settings-submit-wrapper,
 .profile-edit-submit-wrapper { 
 	margin: 30px 0px;
 }
 
-.profile-listing { 
+.profile-listing,
+.profile-listing-end { 
 	float: left; 
 	clear: both; 
 	margin: 20px 20px 0px 0px;
@@ -3096,13 +3095,18 @@ margin-left: 0px;
 	margin-top: 10px;
 }
 
-#label-register-name, #label-register-email, #label-register-nickname, #label-register-openid {
+#label-register-name, 
+#label-register-email, 
+#label-register-nickname, 
+#label-register-openid {
 	float: left;
 	width: 350px;
 	margin-top: 10px;
 }
 
-#register-name, #register-email, #register-nickname {
+#register-name, 
+#register-email, 
+#register-nickname {
 	float: left;
 	margin-top: 10px;
 	width: 150px;
@@ -3118,7 +3122,11 @@ margin-left: 0px;
 	margin-bottom: 25px;
 }
 
-#register-name-end, #register-email-end, #register-nickname-end, #register-submit-end, #register-openid-end {
+#register-name-end, 
+#register-email-end, 
+#register-nickname-end, 
+#register-submit-end, 
+#register-openid-end {
 	clear: both;
 }
 
@@ -3216,7 +3224,7 @@ margin-left: 0px;
 #group-members h3,
 #group-all-contacts h3,
 #prof-members h3,
-#prof-all-contacts h3{
+#prof-all-contacts h3 {
 	color: #555753;
 	margin: 0px;
 	padding: 5px;
@@ -3295,7 +3303,7 @@ margin-left: 0px;
 	font-weight: bolder;
 }
 
- .vevent .event-location {
+.vevent .event-location {
 	margin-left: 10px;
 	margin-right: 10px;
 	font-size: 1em;
@@ -3358,7 +3366,7 @@ margin-left: 0px;
 }
 
 .event-description:before {
-	content: url('calendar.png');
+	content: url('images/calendar.png');
 	margin-right: 15px;
 	vertical-align: middle;
 }
@@ -3418,10 +3426,6 @@ margin-left: 0px;
 		-webkit-box-shadow: 5px 2px 8px #959494;
 }
 
-tr {
-	border: 1px solid #eeeeee;
-}
-
 .calendar td {
 	font-size: 14px;
 	text-align: center;
@@ -3609,7 +3613,8 @@ tr {
 
 .field label {
 	float: left;
-	width: 480px;
+	min-width: 120px;
+	margin: 5px 10px 0 0;
 }
 
 .field checkbox {
@@ -3673,10 +3678,6 @@ tr {
 	text-align: left;
 }
 
-.hidden { 
-	display: none!important; 
-}
-
 .field .radio .field_help { 
 	margin-left: 0px; 
 }
@@ -3695,19 +3696,19 @@ tr {
 	display: block; 
 	width: 20px; 
 	height: 20px;
-	background-image: url("icons.png");
+	background-image: url("images/icons.png");
 }
 .starred { 
-	background-image: url("star.png");
+	background-image: url("images/star.png");
 	repeat: no-repeat;
 }
 .unstarred { 
-	background-image: url("premium.png");
+	background-image: url("images/premium.png");
 	repeat: no-repeat;
 }
 
 .notify {
-	background-image: url("notifications.png");
+	background-image: url("images/notifications.png");
 	repeat: no-repeat;
 }
 
@@ -3748,7 +3749,7 @@ tr {
 }
 
 .sharePerms {
-	background-image: url("icons.png");
+	background-image: url("images/icons.png");
 	width: 20px;
 	height: 20px;
 	margin: 2px 0px 2px 3px;
@@ -3860,7 +3861,7 @@ footer {
 		-moz-box-shadow: 2px 2px 3px #c1c1c1;
 		-webkit-box-shadow: 2px 2px 3px #c1c1c1;
 }
-.acl-list-item img{
+.acl-list-item img {
 	width: 30px;
 	height: 30px;
 	float: left;
@@ -3901,7 +3902,7 @@ footer {
 	background-color: #1873a2;
 }
 
-.acl-button-hide.selected {
+.acl-button-hide .selected {
 	color: #efefef;
 	background-color: #a2a2a2;
 }
@@ -4114,9 +4115,9 @@ ul.menu-popup {
 	background: #000000;
 }
 
-/* Pages profile widget
------------------------------------------------------------ */
-#page-profile
+/* Pages profile widget ----------------------------------------------------------- */
+
+#page-profile,
 #profile-page-list {
 	margin-left: 45px;
 }
@@ -4166,7 +4167,7 @@ ul.menu-popup {
 	z-index: 100;
 }
 
-#scrollup a:hover{
+#scrollup a:hover {
 	text-decoration: none;
 	border: 0;
 }
@@ -4178,7 +4179,7 @@ ul.menu-popup {
 }
 
 div.wall-item-content-wrapper.shiny {
-	background-image: url("shiny.png");
+	background-image: url("images/shiny.png");
 	background-repeat: repeat-x;
 }
 
@@ -4196,21 +4197,27 @@ div.wall-item-content-wrapper.shiny {
 #profile-upload-wrapper,
 #wall-image-upload-div,
 #wall-file-upload-div,
-.hover, .focus {
+
+.hover, 
+.focus {
 	cursor: pointer;
 }
 
 hr.line-dots {
-    background: url("dot.png") repeat-x scroll left center transparent;
+    background: url("images/dot.png") repeat-x scroll left center transparent;
     border: medium none;
 }
 
-.body-tag, .filesavetags, .categorytags {
+.body-tag, 
+.filesavetags, 
+.categorytags {
 	opacity: 0.5;
 	filter:alpha(opacity=50);
 }
 
-.body-tag:hover, .filesavetags:hover, .categorytags:hover {
+.body-tag:hover, 
+.filesavetags:hover, 
+.categorytags:hover {
 	opacity: 1.0 !important;
 	filter:alpha(opacity=100) !important;
 }
@@ -4222,14 +4229,15 @@ hr.line-dots {
 	margin-right: 10px;
 
 }
-.item-select:hover, .checkeditem {
+.item-select:hover, 
+.checkeditem {
 	opacity: 1;
 	filter:alpha(opacity=100);
 }
 
 .filer-icon {
 	display: block; width: 16px; height: 16px;
-	background-image: url('file.gif');
+	background-image: url('images/file.gif');
 }
 
 .icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
@@ -4249,13 +4257,20 @@ hr.line-dots {
 	color: #888888;
 }
 
-.location, .location-label, .gender-label, .marital-label, .homepage-label {
+.location, 
+.location-label, 
+.gender-label, 
+.marital-label, 
+.homepage-label {
 	float: left;
 	text-align: left;
 	display: block;
 }
 
-.adr, .x-gender, .marital-text, .homepage-url {
+.adr, 
+.x-gender, 
+.marital-text, 
+.homepage-url {
 	float: left;
 	display: block;
 	margin-left: 8px;
@@ -4284,20 +4299,86 @@ hr.line-dots {
 .fc-border-separate,
 .fc-content {}
 
-div#datebrowse-sidebar.widget {
+div #datebrowse-sidebar.widget {
 	text-align:center;
 }
 
 /* Fakelink */
 
-.fakelink, .fakelink:visited, .fakelink:link {
+.fakelink, 
+.fakelink:visited, 
+.fakelink:link {
 	color: #1873a2;
 	cursor: pointer;
 	margin-bottom: 10px;
-	margin-left: 10px;
-	/*background: url("down.png") no-repeat scroll left center transparent;*/
+	/*background: url("images/down.png") no-repeat scroll left center transparent;*/
 }
 
 .fakelink:hover {
 	color: #6da6c4;
 }
+
+#id_theme {
+	margin:10px 10px 0 0;
+}
+
+#id_post_newfriend,
+#id_post_joingroup,
+#id_post_profilechange,
+#id_notify1,
+#id_notify2,
+#id_notify3,
+#id_notify4,
+#id_notify5,
+#id_notify6,
+#id_notify7,
+#id_notify8,
+#id_allow_location {
+	margin: 6px 0 0 0;
+}
+
+#settings-form {}
+.select {}
+.field_help {
+	margin: 5px 0 10px;
+}
+
+#settings-activity-desc,
+#settings-notify-desc {
+	margin:10px 10px 10px 0;
+	font-weight: bold;
+}
+
+#settings-notifications {
+	border: 1px solid #7C7D7B;
+	border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+	padding:10px;
+}
+
+#id_npassword {}
+
+#posted-date-selector {
+	margin-left: 33px;
+}
+
+#hide-comments-page-widget {
+	margin-left: 40px;
+}
+
+#collapsed-comments-page-widget {}
+
+.tool {}
+
+#logo-text {
+}
+
+#logo-img {
+	margin: 3px 0 0 0;
+}
+
+.bigwidget {}
+
+#remote-friends-in-common  {}
+
diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index ee91aed17e..95dd4bb973 100644
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Smoothly
  * Description: Like coffee with milk. Theme works fine with iPad[2].
- * Version: Version 0.10.23
+ * Version: Version 0.10.25
  * Author: Alex <https://friendica.pixelbits.de/profile/alex>
  * Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
  * Screenshot: <a href="screenshot.png">Screenshot</a>