From ed42fa7d59f0eb979b3b5c86b6969c53d6b6573b Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Thu, 1 Mar 2012 11:46:08 +0100
Subject: conversation: remove templating items in code and move it to
 template.

---
 view/theme/dispy/search_item.tpl   | 52 +++++++++++-----------
 view/theme/dispy/wall_item.tpl     | 82 +++++++++++++++++-----------------
 view/theme/dispy/wallwall_item.tpl | 90 +++++++++++++++++++-------------------
 3 files changed, 112 insertions(+), 112 deletions(-)

(limited to 'view/theme/dispy')

diff --git a/view/theme/dispy/search_item.tpl b/view/theme/dispy/search_item.tpl
index 3d841ab08..54c3e389c 100755
--- a/view/theme/dispy/search_item.tpl
+++ b/view/theme/dispy/search_item.tpl
@@ -1,40 +1,40 @@
-<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
-	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-		<div class="wall-item-info" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" 
-				 onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
-				 onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-				<a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-				<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
+<div class="wall-item-outside-wrapper$item.indent" 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" 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" 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_photo_menu
+						$item.item_photo_menu
 					</ul>
 				</div>
 			</div>
 			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</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 $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+			{{ 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-$id">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-				{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
 			</div>
-				{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+				{{ if $item.drop.dropping }}<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-$id" >
-			<div class="wall-item-title" id="wall-item-title-$id">$title</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-$id" >$body</div>
+			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
 		</div>
 		<div class="wall-item-author">
-				<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
+				<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">$item.ago</div>
 				
 		</div>			
 		
@@ -42,10 +42,10 @@
 	<div class="wall-item-wrapper-end"></div>
 </div>
 
-<div class="wall-item-outside-wrapper-end$indent" ></div>
-	<div class="wall-item-conv" id="wall-item-conv-$id" >
-	{{ if $conv }}
-		<a href='$conv.href' id='context-$id' title='$conv.title'>$conv.title</a>
+<div class="wall-item-outside-wrapper-end$item.indent" ></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>
 
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index 882843a09..0dcd30f7b 100755
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -1,77 +1,77 @@
-<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
-	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-		<div class="wall-item-info" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" 
-				 onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
-				 onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-				<a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-					<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" />
+<div class="wall-item-outside-wrapper$item.indent" 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" 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" 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-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
+				<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_photo_menu
+						$item.item_photo_menu
 					</ul>
 				</div>
 			</div>
 			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</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 $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+			{{ 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-$id">
-			{{ if $star }}
-				<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
-				<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			{{ if $item.star }}
+				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
 			{{ endif }}
-			{{ if $vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-				<a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
-				<a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
-				{{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
-				<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+			{{ if $item.vote }}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+				{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 			</div>
 			{{ endif }}
-			{{ if $plink }}
-				<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
+			{{ if $item.plink }}
+				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
 			{{ endif }}
-			{{ if $edpost }}
-				<a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>'
+			{{ if $item.edpost }}
+				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>'
 			{{ endif }}
 		
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-				{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
 			</div>
-				{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+				{{ if $item.drop.dropping }}<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-$id" >
-			<div class="wall-item-title" id="wall-item-title-$id">$title</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-$id" >$body
+			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
 					<div class="body-tag">
-						{{ for $tags as $tag }}
-							<span class='tag'>$tag</span>
+						{{ for $item.tags as $item.tag }}
+							<span class='tag'>$item.tag</span>
 						{{ endfor }}
 					</div>
 			</div>
 		</div>
 		<div class="wall-item-author">
-				<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
+				<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">$item.ago</div>
 				
 		</div>	
 	</div>
 	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like" id="wall-item-like-$id">$like</div>
-	<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
+	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
 	<div class="wall-item-comment-wrapper" >
-	$comment
+	$item.comment
 	</div>
 </div>
 
-<div class="wall-item-outside-wrapper-end$indent" ></div>
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
 
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl
index 57c6600b7..31f046a76 100755
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/wallwall_item.tpl
@@ -1,81 +1,81 @@
-<div class="wall-item-outside-wrapper$indent wallwall" id="wall-item-outside-wrapper-$id" >
-	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-		<div class="wall-item-info wallwall" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$id" >
-				<a href="$owner_url" title="$olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
-				<img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" style="height: 80px; width: 80px;" alt="$owner_name" /></a>
+<div class="wall-item-outside-wrapper$item.indent wallwall" 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 wallwall" id="wall-item-info-$item.id">
+			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+				<a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
+				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
 			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$wall" /></div>
-			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$id" 
-				onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
-                onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-				<a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-				<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
+			<div class="wall-item-photo-wrapper wwfrom" 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" 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_photo_menu
+                        $item.item_photo_menu
                     </ul>
                 </div>
 
 			</div>
 			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</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 $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+				{{ 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-$id">
-			{{ if $star }}
-				<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
-				<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			{{ if $item.star }}
+				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
 			{{ endif }}
-			{{ if $vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-				<a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
-				<a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
-				{{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
-				<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+			{{ if $item.vote }}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+				{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 			</div>
 			{{ endif }}
-			{{ if $plink }}
-				<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
+			{{ if $item.plink }}
+				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
 			{{ endif }}
-			{{ if $edpost }}
-				<a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>'
+			{{ if $item.edpost }}
+				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>'
 			{{ endif }}
 		
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-				{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
 			</div>
-				{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+				{{ if $item.drop.dropping }}<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-$id" >
-			<div class="wall-item-title" id="wall-item-title-$id">$title</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-$id" >$body
+			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
 					<div class="body-tag">
-						{{ for $tags as $tag }}
-							<span class='tag'>$tag</span>
+						{{ for $item.tags as $item.tag }}
+							<span class='tag'>$item.tag</span>
 						{{ endfor }}
 					</div>			
 			</div>
 		</div>
 		<div class="wall-item-author">
-			<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
-			<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
+			<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">$item.ago</div>
 		</div>	
 	</div>	
 	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like" id="wall-item-like-$id">$like</div>
-	<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
+	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
 	<div class="wall-item-comment-wrapper" >
-	$comment
+	$item.comment
 	</div>
 </div>
 
-<div class="wall-item-outside-wrapper-end$indent" ></div>
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
 
-- 
cgit v1.2.3


From ef3484750137707287c6482e1def07cb7aec54a7 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 2 Mar 2012 12:41:34 +0100
Subject: templates: fix tags

---
 view/theme/dispy/wall_item.tpl     | 4 ++--
 view/theme/dispy/wallwall_item.tpl | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'view/theme/dispy')

diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index 0dcd30f7b..09cf64397 100755
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -53,8 +53,8 @@
 			<div class="wall-item-title-end"></div>
 			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
 					<div class="body-tag">
-						{{ for $item.tags as $item.tag }}
-							<span class='tag'>$item.tag</span>
+						{{ for $item.tags as $tag }}
+							<span class='tag'>$tag</span>
 						{{ endfor }}
 					</div>
 			</div>
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl
index 31f046a76..c3638094c 100755
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/wallwall_item.tpl
@@ -58,8 +58,8 @@
 			<div class="wall-item-title-end"></div>
 			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
 					<div class="body-tag">
-						{{ for $item.tags as $item.tag }}
-							<span class='tag'>$item.tag</span>
+						{{ for $item.tags as $tag }}
+							<span class='tag'>$tag</span>
 						{{ endfor }}
 					</div>			
 			</div>
-- 
cgit v1.2.3


From 64400e8d59cab64cfa57b969df88a4cafe76f168 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sat, 3 Mar 2012 19:19:35 -0500
Subject: first commit for dispy New Edition

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy/comment_item.tpl     |   35 +
 view/theme/dispy/contact_template.tpl |    6 +-
 view/theme/dispy/conversation.tpl     |   21 +
 view/theme/dispy/group_side.tpl       |   12 +-
 view/theme/dispy/head.tpl             |   99 ++
 view/theme/dispy/icons.png            |  Bin 20057 -> 28076 bytes
 view/theme/dispy/icons.svg            | 1940 ++++++++++++++--------
 view/theme/dispy/jot-header.tpl       |  346 ++--
 view/theme/dispy/jot.tpl              |  106 +-
 view/theme/dispy/mail_head.tpl        |    8 +-
 view/theme/dispy/nav.tpl              |  165 +-
 view/theme/dispy/profile_vcard.tpl    |   59 +-
 view/theme/dispy/style.css            | 2855 +++++++++++++++++++++++----------
 view/theme/dispy/theme.php            |   74 +
 view/theme/dispy/wall_item.tpl        |    6 +-
 view/theme/dispy/wallwall_item.tpl    |    6 +-
 16 files changed, 3955 insertions(+), 1783 deletions(-)
 create mode 100644 view/theme/dispy/comment_item.tpl
 mode change 100755 => 100644 view/theme/dispy/contact_template.tpl
 create mode 100644 view/theme/dispy/conversation.tpl
 mode change 100755 => 100644 view/theme/dispy/group_side.tpl
 create mode 100644 view/theme/dispy/head.tpl
 mode change 100755 => 100644 view/theme/dispy/icons.png
 mode change 100755 => 100644 view/theme/dispy/icons.svg
 mode change 100755 => 100644 view/theme/dispy/jot-header.tpl
 mode change 100755 => 100644 view/theme/dispy/jot.tpl
 mode change 100755 => 100644 view/theme/dispy/mail_head.tpl
 mode change 100755 => 100644 view/theme/dispy/nav.tpl
 mode change 100755 => 100644 view/theme/dispy/profile_vcard.tpl
 mode change 100755 => 100644 view/theme/dispy/style.css
 create mode 100644 view/theme/dispy/theme.php
 mode change 100755 => 100644 view/theme/dispy/wall_item.tpl
 mode change 100755 => 100644 view/theme/dispy/wallwall_item.tpl

(limited to 'view/theme/dispy')

diff --git a/view/theme/dispy/comment_item.tpl b/view/theme/dispy/comment_item.tpl
new file mode 100644
index 000000000..85176732b
--- /dev/null
+++ b/view/theme/dispy/comment_item.tpl
@@ -0,0 +1,35 @@
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+				<input type="hidden" name="type" value="$type" />
+				<input type="hidden" name="profile_uid" value="$profile_uid" />
+				<input type="hidden" name="parent" value="$parent" />
+				<input type="hidden" name="return" value="$return_path" />
+				<input type="hidden" name="jsreload" value="$jsreload" />
+				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
+					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+
+				{{ if $qcomment }}
+                <ul class="qcomment-wrapper">
+				{{ for $qcomment as $qc }}				
+					<li class="fakelink qcomment"
+                    onclick="commentInsert(this,$id); return false;">$qc</li>
+				{{ endfor }}
+                </ul>
+				{{ endif }}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;">
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/dispy/contact_template.tpl b/view/theme/dispy/contact_template.tpl
old mode 100755
new mode 100644
index 48930b48a..2aa9b88fe
--- a/view/theme/dispy/contact_template.tpl
+++ b/view/theme/dispy/contact_template.tpl
@@ -1,9 +1,9 @@
 
 <div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
+	<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)" >
+		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>
 
@@ -20,6 +20,8 @@
 	</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-details" id="contact-entry-url-$contact.id" >$contact.itemurl</div>
+	<div class="contact-entry-details" id="contact-entry-network-$contact.id" >$contact.network</div>
 
 	<div class="contact-entry-end" ></div>
 </div>
diff --git a/view/theme/dispy/conversation.tpl b/view/theme/dispy/conversation.tpl
new file mode 100644
index 000000000..0b14f1c80
--- /dev/null
+++ b/view/theme/dispy/conversation.tpl
@@ -0,0 +1,21 @@
+{{ for $threads as $thread }}
+<div id="tread-wrapper-$thread.id" class="tread-wrapper">
+	{{ for $thread.items as $item }}
+		{{if $item.comment_firstcollapsed}}
+			<div class="hide-comments-outer">
+			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
+			</div>
+			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
+		{{endif}}
+		{{if $item.comment_lastcollapsed}}</div>{{endif}}
+		
+		{{ inc $item.template }}{{ endinc }}
+		
+		
+	{{ endfor }}
+</div>
+{{ endfor }}
+
+{{ if $dropping }}
+<a href="#" onclick="deleteCheckedItems();return false;"><span class="icon delete"></span><span class="s22 text">$dropping</span></a>
+{{ endif }}
diff --git a/view/theme/dispy/group_side.tpl b/view/theme/dispy/group_side.tpl
old mode 100755
new mode 100644
index a1fc70a22..516d70d5b
--- a/view/theme/dispy/group_side.tpl
+++ b/view/theme/dispy/group_side.tpl
@@ -5,23 +5,25 @@
 	<ul id="sidebar-group-ul">
 		{{ for $groups as $group }}
 			<li class="sidebar-group-li">
+				<a href="$group.href" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}">$group.text</a>
+				{{ if $group.edit }}
+					<a 
+                        class="groupsideedit"
+                        href="$group.edit.href" title="$edittext"><span class="icon small-pencil"></span></a>
+				{{ endif }}
 				{{ 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>
+  <a href="group/new" title="$createtext"><span class="action text add">$createtext</span></a>
   </div>
 </div>
 
diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl
new file mode 100644
index 000000000..793af6fd2
--- /dev/null
+++ b/view/theme/dispy/head.tpl
@@ -0,0 +1,99 @@
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<base href="$baseurl/" />
+<meta name="generator" content="$generator" />
+<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
+
+<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
+
+<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
+<link rel="search"
+         href="$baseurl/opensearch" 
+         type="application/opensearchdescription+xml" 
+         title="Search in Friendica" />
+
+<!--[if IE]>
+<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
+<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
+<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
+<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js" ></script>
+<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>
+<script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
+<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
+<script type="text/javascript" src="$baseurl/js/acl.js" ></script>
+<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js" ></script>
+<script type="text/javascript" src="$baseurl/js/main.js" ></script>
+<script>
+
+	var updateInterval = $update_interval;
+
+	function confirmDelete() { return confirm("$delitem"); }
+	function commentOpen(obj,id) {
+		if(obj.value == '$comment') {
+			obj.value = '';
+			obj.className = "comment-edit-text-full";
+			openMenu("comment-edit-submit-wrapper-" + id);
+		}
+	}
+	function commentClose(obj,id) {
+		if(obj.value == '') {
+			obj.value = '$comment';
+			obj.className="comment-edit-text-empty";
+			closeMenu("comment-edit-submit-wrapper-" + id);
+		}
+	}
+
+
+	function commentInsert(obj,id) {
+		var tmpStr = $("#comment-edit-text-" + id).val();
+		if(tmpStr == '$comment') {
+			tmpStr = '';
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+		}
+		var ins = $(obj).html();
+		ins = ins.replace('&lt;','<');
+		ins = ins.replace('&gt;','>');
+		ins = ins.replace('&amp;','&');
+		ins = ins.replace('&quot;','"');
+		$("#comment-edit-text-" + id).val(tmpStr + ins);
+	}
+
+	function showHideComments(id) {
+		if( $('#collapsed-comments-' + id).is(':visible')) {
+			$('#collapsed-comments-' + id).hide();
+			$('#hide-comments-' + id).html('$showmore');
+		}
+		else {
+			$('#collapsed-comments-' + id).show();
+			$('#hide-comments-' + id).html('$showfewer');
+		}
+	}
+
+    $(document).ready(function() {
+        function toggleToolbar() {
+            if ( $('#nav-floater').is(':visible') ) {
+                $('#nav-floater').slideUp('fast');
+                $('.floaterflip').css({
+                    backgroundPosition: '-210px -60px' 
+                });
+            } else {
+                $('#nav-floater').slideDown('fast');
+                $('.floaterflip').css({
+                    backgroundPosition: '-190px -60px'
+                });
+            }
+        };
+        $('.floaterflip').click(function() {
+            toggleToolbar();
+            return false;
+        });
+    });
+
+</script>
+
+
diff --git a/view/theme/dispy/icons.png b/view/theme/dispy/icons.png
old mode 100755
new mode 100644
index bd52b62c8..d9d58aa47
Binary files a/view/theme/dispy/icons.png and b/view/theme/dispy/icons.png differ
diff --git a/view/theme/dispy/icons.svg b/view/theme/dispy/icons.svg
old mode 100755
new mode 100644
index b435ba665..40899c0a5
--- a/view/theme/dispy/icons.svg
+++ b/view/theme/dispy/icons.svg
@@ -7,15 +7,16 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="250"
    height="200"
    id="svg3403"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48+devel r"
    sodipodi:docname="icons.svg"
-   inkscape:export-filename="/home/fabio/public_html/friendika/view/theme/dispy/icons.png"
+   inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy/icons.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
@@ -50,19 +51,19 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.9899495"
-     inkscape:cx="43.010429"
-     inkscape:cy="-67.661177"
+     inkscape:zoom="10.435404"
+     inkscape:cx="86.68027"
+     inkscape:cy="39.719931"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:snap-global="false"
-     inkscape:window-width="1534"
-     inkscape:window-height="1067"
-     inkscape:window-x="104"
-     inkscape:window-y="63"
+     inkscape:window-width="1065"
+     inkscape:window-height="742"
+     inkscape:window-x="40"
+     inkscape:window-y="61"
      inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
@@ -100,12 +101,12 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Livello 1"
+     inkscape:label="Layer1"
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-852.36218)">
@@ -118,11 +119,12 @@
        y="852.36218"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons.png"
        inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+       inkscape:export-ydpi="90"
+       transform="matrix(1,0,0,1.5151515,0,-439.09566)" />
     <g
        id="ico_dir"
        transform="matrix(0.43114968,0,0,0.43114968,-178.47604,867.63556)"
-       style="stroke:#888a85;display:inline"
+       style="fill:#333333;stroke:#e6e6e6;display:inline"
        inkscape:label="#g3846">
       <rect
          ry="6"
@@ -132,30 +134,30 @@
          height="44.285713"
          width="44.285713"
          id="rect3820"
-         style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
          inkscape:connector-curvature="0"
-         style="fill:#2e3436;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="m 449.12191,27.281249 c -2.07646,0 -3.76352,1.688406 -3.76352,3.766518 0,2.078113 1.68706,3.766518 3.76352,3.766518 2.07646,0 3.76351,-1.688405 3.76351,-3.766518 0,-2.078112 -1.68705,-3.766518 -3.76351,-3.766518 z m 0,7.533036 c -5.23267,0 -9.47459,5.783883 -9.47459,12.932589 0,0.201529 0.0196,0.406525 0.0264,0.605804 l 18.89654,0 c 0.007,-0.199279 0.0264,-0.404275 0.0264,-0.605804 0,-7.148706 -4.24192,-12.932589 -9.47459,-12.932589 z"
          id="path3830" />
       <path
          id="path3832"
          d="m 431.26477,26.924106 c -2.07646,0 -3.76352,1.688406 -3.76352,3.766518 0,2.078113 1.68706,3.766518 3.76352,3.766518 2.07646,0 3.76351,-1.688405 3.76351,-3.766518 0,-2.078112 -1.68705,-3.766518 -3.76351,-3.766518 z m 0,7.533036 c -5.23267,0 -9.47459,5.783883 -9.47459,12.932589 0,0.201529 0.0196,0.406525 0.0264,0.605804 l 18.89654,0 c 0.007,-0.199279 0.0264,-0.404275 0.0264,-0.605804 0,-7.148706 -4.24192,-12.932589 -9.47459,-12.932589 z"
-         style="fill:#2e3436;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          inkscape:connector-curvature="0" />
       <path
          inkscape:connector-curvature="0"
          id="path3822"
          d="M 439.46875,29.78125 C 437.00319,29.78125 435,31.784443 435,34.25 c 0,2.465557 2.00319,4.46875 4.46875,4.46875 2.46556,0 4.46875,-2.003193 4.46875,-4.46875 0,-2.465557 -2.00319,-4.46875 -4.46875,-4.46875 z m 0,8.9375 c -6.2132,0 -11.25,6.862234 -11.25,15.34375 0,0.239102 0.0233,0.482318 0.0313,0.71875 l 22.4375,0 c 0.008,-0.236432 0.0313,-0.479648 0.0313,-0.71875 0,-8.481516 -5.0368,-15.34375 -11.25,-15.34375 z"
-         style="fill:#2e3436;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
     <g
        id="ico_search"
        transform="matrix(0.43114968,0,0,0.43114968,-201.41936,889.63556)"
-       style="stroke:#888a85;display:inline"
+       style="fill:#333333;stroke:#e6e6e6;display:inline"
        inkscape:label="#g3852">
       <rect
-         style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="rect3837"
          width="44.285713"
          height="44.285713"
@@ -167,7 +169,7 @@
          inkscape:connector-curvature="0"
          id="path3839"
          d="m 477.97758,26.469174 c -3.64342,3.88426 -3.47037,9.984211 0.41389,13.627637 3.52011,3.301856 8.87059,3.441123 12.55302,0.54905 -0.17428,0.682501 0.0188,1.431563 0.57086,1.949383 l 13.7666,12.913032 c 0.80813,0.75802 2.06896,0.717682 2.82698,-0.09044 l 0.68414,-0.729357 c 0.75802,-0.808126 0.71768,-2.06896 -0.0904,-2.82698 l -13.7666,-12.913032 c -0.55205,-0.51782 -1.31192,-0.66264 -1.98188,-0.445086 2.65077,-3.859767 2.16978,-9.190402 -1.35033,-12.492258 -3.88426,-3.643426 -9.9828,-3.426204 -13.62623,0.458055 z"
-         style="fill:#2e3436;fill-opacity:1;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;fill-opacity:1;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
          transform="translate(-0.21428562,-0.35714286)"
          d="m 492.49999,33.612183 c 0,4.043513 -3.27792,7.321428 -7.32143,7.321428 -4.04352,0 -7.32143,-3.277915 -7.32143,-7.321428 0,-4.043514 3.27791,-7.321429 7.32143,-7.321429 4.04351,0 7.32143,3.277915 7.32143,7.321429 z"
@@ -176,12 +178,12 @@
          sodipodi:cy="33.612183"
          sodipodi:cx="485.17856"
          id="path3844"
-         style="fill:#2e3436;fill-opacity:1;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:none;fill-opacity:1;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          sodipodi:type="arc" />
     </g>
     <g
        inkscape:label="#g3852"
-       style="stroke:#888a85;display:inline"
+       style="fill:#333333;stroke:#e6e6e6;display:inline"
        transform="matrix(0.43114968,0,0,0.43114968,-201.41936,845.63556)"
        id="ico_logout">
       <rect
@@ -192,9 +194,9 @@
          height="44.285713"
          width="44.285713"
          id="rect3995"
-         style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         style="fill:#555753;fill-opacity:1;stroke:#888a85;stroke-width:2.31938004"
+         style="fill:#333333;fill-opacity:1;stroke:#e6e6e6;stroke-width:2.31938004"
          d="M 504.69787,28.735741 480.30214,53.131477"
          id="path4003"
          inkscape:connector-curvature="0" />
@@ -202,15 +204,15 @@
          inkscape:connector-curvature="0"
          id="path4005"
          d="M 504.69787,53.131473 480.30214,28.735746"
-         style="fill:#555753;fill-opacity:1;stroke:#888a85;stroke-width:2.31938004" />
+         style="fill:#333333;fill-opacity:1;stroke:#e6e6e6;stroke-width:2.31938004" />
     </g>
     <g
        inkscape:label="#g3846"
-       style="stroke:#d3d7cf;display:inline"
+       style="fill:#1a1a1a;stroke:#d3d7cf;display:inline"
        transform="matrix(0.43114968,0,0,0.43114968,-156.47604,867.63556)"
        id="ico_dir_on">
       <rect
-         style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="rect4011"
          width="44.285713"
          height="44.285713"
@@ -221,22 +223,22 @@
       <path
          id="path4013"
          d="m 449.12191,27.281249 c -2.07646,0 -3.76352,1.688406 -3.76352,3.766518 0,2.078113 1.68706,3.766518 3.76352,3.766518 2.07646,0 3.76351,-1.688405 3.76351,-3.766518 0,-2.078112 -1.68705,-3.766518 -3.76351,-3.766518 z m 0,7.533036 c -5.23267,0 -9.47459,5.783883 -9.47459,12.932589 0,0.201529 0.0196,0.406525 0.0264,0.605804 l 18.89654,0 c 0.007,-0.199279 0.0264,-0.404275 0.0264,-0.605804 0,-7.148706 -4.24192,-12.932589 -9.47459,-12.932589 z"
-         style="fill:#2e3436;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          inkscape:connector-curvature="0" />
       <path
          inkscape:connector-curvature="0"
-         style="fill:#2e3436;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="m 431.26477,26.924106 c -2.07646,0 -3.76352,1.688406 -3.76352,3.766518 0,2.078113 1.68706,3.766518 3.76352,3.766518 2.07646,0 3.76351,-1.688405 3.76351,-3.766518 0,-2.078112 -1.68705,-3.766518 -3.76351,-3.766518 z m 0,7.533036 c -5.23267,0 -9.47459,5.783883 -9.47459,12.932589 0,0.201529 0.0196,0.406525 0.0264,0.605804 l 18.89654,0 c 0.007,-0.199279 0.0264,-0.404275 0.0264,-0.605804 0,-7.148706 -4.24192,-12.932589 -9.47459,-12.932589 z"
          id="path4015" />
       <path
-         style="fill:#2e3436;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="M 439.46875,29.78125 C 437.00319,29.78125 435,31.784443 435,34.25 c 0,2.465557 2.00319,4.46875 4.46875,4.46875 2.46556,0 4.46875,-2.003193 4.46875,-4.46875 0,-2.465557 -2.00319,-4.46875 -4.46875,-4.46875 z m 0,8.9375 c -6.2132,0 -11.25,6.862234 -11.25,15.34375 0,0.239102 0.0233,0.482318 0.0313,0.71875 l 22.4375,0 c 0.008,-0.236432 0.0313,-0.479648 0.0313,-0.71875 0,-8.481516 -5.0368,-15.34375 -11.25,-15.34375 z"
          id="path4017"
          inkscape:connector-curvature="0" />
     </g>
     <g
        inkscape:label="#g3852"
-       style="stroke:#d3d7cf;display:inline"
+       style="fill:#1a1a1a;stroke:#d3d7cf;display:inline"
        transform="matrix(0.43114968,0,0,0.43114968,-179.41936,889.63556)"
        id="ico_search_on">
       <rect
@@ -247,15 +249,15 @@
          height="44.285713"
          width="44.285713"
          id="rect4021"
-         style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         style="fill:#2e3436;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:none;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="m 477.97758,26.469174 c -3.64342,3.88426 -3.47037,9.984211 0.41389,13.627637 3.52011,3.301856 8.87059,3.441123 12.55302,0.54905 -0.17428,0.682501 0.0188,1.431563 0.57086,1.949383 l 13.7666,12.913032 c 0.80813,0.75802 2.06896,0.717682 2.82698,-0.09044 l 0.68414,-0.729357 c 0.75802,-0.808126 0.71768,-2.06896 -0.0904,-2.82698 l -13.7666,-12.913032 c -0.55205,-0.51782 -1.31192,-0.66264 -1.98188,-0.445086 2.65077,-3.859767 2.16978,-9.190402 -1.35033,-12.492258 -3.88426,-3.643426 -9.9828,-3.426204 -13.62623,0.458055 z"
          id="path4023"
          inkscape:connector-curvature="0" />
       <path
          sodipodi:type="arc"
-         style="fill:#2e3436;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:none;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="path4025"
          sodipodi:cx="485.17856"
          sodipodi:cy="33.612183"
@@ -267,10 +269,10 @@
     <g
        id="ico_logout_on"
        transform="matrix(0.43114968,0,0,0.43114968,-179.41936,845.63556)"
-       style="stroke:#d3d7cf;display:inline"
+       style="fill:#1a1a1a;stroke:#d3d7cf;display:inline"
        inkscape:label="#g3852">
       <rect
-         style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="rect4029"
          width="44.285713"
          height="44.285713"
@@ -282,16 +284,16 @@
          inkscape:connector-curvature="0"
          id="path4031"
          d="M 504.69787,28.735741 480.30214,53.131477"
-         style="fill:#555753;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.31938004" />
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.31938004" />
       <path
-         style="fill:#555753;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.31938004"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.31938004"
          d="M 504.69787,53.131473 480.30214,28.735746"
          id="path4033"
          inkscape:connector-curvature="0" />
     </g>
     <g
        inkscape:label="#g3852"
-       style="stroke:#888a85;display:inline;filter:url(#filter4064)"
+       style="fill:#333333;stroke:#e6e6e6;display:inline;filter:url(#filter4064)"
        transform="matrix(0.43114968,0,0,0.43114968,-201.41936,911.63556)"
        id="g4040">
       <rect
@@ -302,9 +304,9 @@
          height="44.285713"
          width="44.285713"
          id="rect4042"
-         style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         style="fill:#2e3436;fill-opacity:1;stroke:#888a85;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         style="fill:#333333;fill-opacity:1;stroke:#e6e6e6;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
          d="m 484.90604,52.679071 c 0,0 -0.72327,1.028211 -2.88202,1.697409 -0.63474,-0.494653 -1.23439,-1.034334 -1.79294,-1.613646 0.43889,-2.217071 1.3855,-3.044283 1.3855,-3.044283 l 2.04237,-1.648571 c -0.73879,-0.915258 -1.3342,-1.946011 -1.75793,-3.043257 l -2.44847,0.945549 c 0,0 -1.18951,0.40671 -3.32932,-0.320779 -0.22277,-0.773276 -0.39067,-1.56235 -0.50204,-2.359331 1.65823,-1.535673 2.91028,-1.648499 2.91028,-1.648499 l 2.62132,-0.133248 c -0.0597,-1.174706 0.0645,-2.358577 0.36658,-3.495332 l -2.53663,-0.674208 c 0,0 -1.20139,-0.37014 -2.50493,-2.216441 0.2743,-0.756533 0.60227,-1.4936 0.98062,-2.20383 2.24419,-0.267701 3.32343,0.376954 3.32343,0.376954 l 2.19901,1.432971 c 0.64217,-0.985455 1.43848,-1.870246 2.35108,-2.612309 l -1.65589,-2.03644 c 0,0 -0.75438,-1.005609 -0.72373,-3.265497 0.66659,-0.45082 1.36515,-0.854347 2.08871,-1.206542 1.97294,1.102524 2.46715,2.258424 2.46715,2.258424 l 0.93675,2.451844 c 1.09876,-0.419794 2.26306,-0.667544 3.43754,-0.731472 l -0.14265,-2.620822 c 0,0 -0.0192,-1.25697 1.3339,-3.067245 0.80426,0.02709 1.6066,0.111239 2.39899,0.251604 0.94809,2.051624 0.66849,3.277254 0.66849,3.277254 l -0.6833,2.534196 c 1.13566,0.306213 2.22322,0.790136 3.21097,1.428761 l 1.42508,-2.204138 c 0,0 0.72327,-1.028211 2.88202,-1.697409 0.63474,0.494653 1.23439,1.034334 1.79294,1.613646 -0.43889,2.217071 -1.3855,3.044283 -1.3855,3.044283 l -2.04237,1.648571 c 0.73879,0.915258 1.3342,1.946011 1.75793,3.043257 l 2.44847,-0.945549 c 0,0 1.18951,-0.40671 3.32932,0.320779 0.22277,0.773276 0.39067,1.56235 0.50204,2.359331 -1.65823,1.535673 -2.91028,1.648499 -2.91028,1.648499 l -2.62132,0.133248 c 0.0597,1.174706 -0.0645,2.358577 -0.36658,3.495332 l 2.53663,0.674208 c 0,0 1.20139,0.37014 2.50493,2.216441 -0.2743,0.756533 -0.60227,1.4936 -0.98062,2.20383 -2.24419,0.267701 -3.32343,-0.376954 -3.32343,-0.376954 l -2.19901,-1.432971 c -0.64217,0.985455 -1.43848,1.870246 -2.35108,2.612309 l 1.65589,2.03644 c 0,0 0.75438,1.005609 0.72373,3.265497 -0.66659,0.45082 -1.36515,0.854347 -2.08871,1.206542 -1.97294,-1.102524 -2.46715,-2.258424 -2.46715,-2.258424 l -0.93675,-2.451844 c -1.09876,0.419794 -2.26306,0.667544 -3.43754,0.731472 l 0.14265,2.620822 c 0,0 0.0192,1.25697 -1.3339,3.067245 -0.80426,-0.02709 -1.6066,-0.111239 -2.39899,-0.251604 -0.94809,-2.051624 -0.66849,-3.277254 -0.66849,-3.277254 l 0.6833,-2.534196 c -1.13566,-0.306213 -2.22322,-0.790136 -3.21097,-1.428761 l -1.42508,2.204138"
          id="path4048"
          inkscape:connector-curvature="0"
@@ -314,10 +316,10 @@
     <g
        id="g4068"
        transform="matrix(0.43114968,0,0,0.43114968,-179.41936,911.63556)"
-       style="stroke:#d3d7cf;display:inline;filter:url(#filter4064)"
+       style="fill:#1a1a1a;stroke:#d3d7cf;display:inline;filter:url(#filter4064)"
        inkscape:label="#g3852">
       <rect
-         style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="rect4070"
          width="44.285713"
          height="44.285713"
@@ -331,15 +333,15 @@
          inkscape:connector-curvature="0"
          id="path4072"
          d="m 484.90604,52.679071 c 0,0 -0.72327,1.028211 -2.88202,1.697409 -0.63474,-0.494653 -1.23439,-1.034334 -1.79294,-1.613646 0.43889,-2.217071 1.3855,-3.044283 1.3855,-3.044283 l 2.04237,-1.648571 c -0.73879,-0.915258 -1.3342,-1.946011 -1.75793,-3.043257 l -2.44847,0.945549 c 0,0 -1.18951,0.40671 -3.32932,-0.320779 -0.22277,-0.773276 -0.39067,-1.56235 -0.50204,-2.359331 1.65823,-1.535673 2.91028,-1.648499 2.91028,-1.648499 l 2.62132,-0.133248 c -0.0597,-1.174706 0.0645,-2.358577 0.36658,-3.495332 l -2.53663,-0.674208 c 0,0 -1.20139,-0.37014 -2.50493,-2.216441 0.2743,-0.756533 0.60227,-1.4936 0.98062,-2.20383 2.24419,-0.267701 3.32343,0.376954 3.32343,0.376954 l 2.19901,1.432971 c 0.64217,-0.985455 1.43848,-1.870246 2.35108,-2.612309 l -1.65589,-2.03644 c 0,0 -0.75438,-1.005609 -0.72373,-3.265497 0.66659,-0.45082 1.36515,-0.854347 2.08871,-1.206542 1.97294,1.102524 2.46715,2.258424 2.46715,2.258424 l 0.93675,2.451844 c 1.09876,-0.419794 2.26306,-0.667544 3.43754,-0.731472 l -0.14265,-2.620822 c 0,0 -0.0192,-1.25697 1.3339,-3.067245 0.80426,0.02709 1.6066,0.111239 2.39899,0.251604 0.94809,2.051624 0.66849,3.277254 0.66849,3.277254 l -0.6833,2.534196 c 1.13566,0.306213 2.22322,0.790136 3.21097,1.428761 l 1.42508,-2.204138 c 0,0 0.72327,-1.028211 2.88202,-1.697409 0.63474,0.494653 1.23439,1.034334 1.79294,1.613646 -0.43889,2.217071 -1.3855,3.044283 -1.3855,3.044283 l -2.04237,1.648571 c 0.73879,0.915258 1.3342,1.946011 1.75793,3.043257 l 2.44847,-0.945549 c 0,0 1.18951,-0.40671 3.32932,0.320779 0.22277,0.773276 0.39067,1.56235 0.50204,2.359331 -1.65823,1.535673 -2.91028,1.648499 -2.91028,1.648499 l -2.62132,0.133248 c 0.0597,1.174706 -0.0645,2.358577 -0.36658,3.495332 l 2.53663,0.674208 c 0,0 1.20139,0.37014 2.50493,2.216441 -0.2743,0.756533 -0.60227,1.4936 -0.98062,2.20383 -2.24419,0.267701 -3.32343,-0.376954 -3.32343,-0.376954 l -2.19901,-1.432971 c -0.64217,0.985455 -1.43848,1.870246 -2.35108,2.612309 l 1.65589,2.03644 c 0,0 0.75438,1.005609 0.72373,3.265497 -0.66659,0.45082 -1.36515,0.854347 -2.08871,1.206542 -1.97294,-1.102524 -2.46715,-2.258424 -2.46715,-2.258424 l -0.93675,-2.451844 c -1.09876,0.419794 -2.26306,0.667544 -3.43754,0.731472 l 0.14265,2.620822 c 0,0 0.0192,1.25697 -1.3339,3.067245 -0.80426,-0.02709 -1.6066,-0.111239 -2.39899,-0.251604 -0.94809,-2.051624 -0.66849,-3.277254 -0.66849,-3.277254 l 0.6833,-2.534196 c -1.13566,-0.306213 -2.22322,-0.790136 -3.21097,-1.428761 l -1.42508,2.204138"
-         style="fill:#2e3436;fill-opacity:1;stroke:#d3d7cf;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#d3d7cf;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
     </g>
     <g
        id="g4074"
        transform="matrix(0.43114968,0,0,0.43114968,-201.41936,933.6356)"
-       style="stroke:#888a85;display:inline;filter:url(#filter4064)"
+       style="fill:#333333;stroke:#e6e6e6;display:inline;filter:url(#filter4064)"
        inkscape:label="#g3852">
       <rect
-         style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="rect4076"
          width="44.285713"
          height="44.285713"
@@ -348,33 +350,28 @@
          rx="6"
          ry="6" />
       <path
-         style="fill:#2e3436;fill-opacity:1;stroke:#888a85;stroke-width:0.79446769;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         style="fill:none;fill-opacity:1;stroke:#e6e6e6;stroke-width:0.79446769;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
          d="m 871.875,46.1875 c -1.86715,0.0095 -3.39179,1.39545 -3.65625,3.1875 -0.13267,-0.238038 -0.39472,-0.407705 -0.6875,-0.40625 L 860.21875,49 c -0.42864,0.0022 -0.75216,0.352585 -0.75,0.78125 l 0,0.375 c 0.002,0.428643 0.35273,0.783324 0.78125,0.78125 l 0.71875,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.04661 -0.0143,-0.115964 -0.0313,-0.15625 l 1.25,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.05736 -0.006,-0.140333 -0.0313,-0.1875 l 2.1875,0 c 0.29284,-0.0015 0.55725,-0.166865 0.6875,-0.40625 0.28274,1.789274 1.85161,3.165775 3.71875,3.15625 2.0603,-0.01052 3.69802,-1.720959 3.6875,-3.78125 -0.0105,-2.060291 -1.68969,-3.698024 -3.75,-3.6875 z"
          transform="matrix(2.3193801,0,0,2.3193801,-1519.671,-74.824492)"
          id="path3839-4"
          inkscape:connector-curvature="0" />
     </g>
-    <g
-       inkscape:label="#g3852"
-       style="stroke:#d3d7cf;display:inline;filter:url(#filter4064)"
-       transform="matrix(0.43114968,0,0,0.43114968,-179.41936,933.6356)"
-       id="g4106">
-      <rect
-         ry="6"
-         rx="6"
-         y="18.790752"
-         x="470.35715"
-         height="44.285713"
-         width="44.285713"
-         id="rect4108"
-         style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         id="path4110"
-         transform="matrix(2.3193801,0,0,2.3193801,-1519.671,-74.824492)"
-         d="m 871.875,46.1875 c -1.86715,0.0095 -3.39179,1.39545 -3.65625,3.1875 -0.13267,-0.238038 -0.39472,-0.407705 -0.6875,-0.40625 L 860.21875,49 c -0.42864,0.0022 -0.75216,0.352585 -0.75,0.78125 l 0,0.375 c 0.002,0.428643 0.35273,0.783324 0.78125,0.78125 l 0.71875,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.04661 -0.0143,-0.115964 -0.0313,-0.15625 l 1.25,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.05736 -0.006,-0.140333 -0.0313,-0.1875 l 2.1875,0 c 0.29284,-0.0015 0.55725,-0.166865 0.6875,-0.40625 0.28274,1.789274 1.85161,3.165775 3.71875,3.15625 2.0603,-0.01052 3.69802,-1.720959 3.6875,-3.78125 -0.0105,-2.060291 -1.68969,-3.698024 -3.75,-3.6875 z"
-         style="fill:#2e3436;fill-opacity:1;stroke:#d3d7cf;stroke-width:0.79446769;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
+    <rect
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       id="rect4108"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6"
+       transform="matrix(0.43114968,0,0,0.43114968,-179.41936,933.6356)" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;fill-opacity:1;stroke:#d3d7cf;stroke-width:0.794;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;filter:url(#filter4064)"
+       d="m 871.875,46.1875 c -1.86715,0.0095 -3.39179,1.39545 -3.65625,3.1875 -0.13267,-0.238038 -0.39472,-0.407705 -0.6875,-0.40625 L 860.21875,49 c -0.42864,0.0022 -0.75216,0.352585 -0.75,0.78125 l 0,0.375 c 0.002,0.428643 0.35273,0.783324 0.78125,0.78125 l 0.71875,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.04661 -0.0143,-0.115964 -0.0313,-0.15625 l 1.25,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.05736 -0.006,-0.140333 -0.0313,-0.1875 l 2.1875,0 c 0.29284,-0.0015 0.55725,-0.166865 0.6875,-0.40625 0.28274,1.789274 1.85161,3.165775 3.71875,3.15625 2.0603,-0.01052 3.69802,-1.720959 3.6875,-3.78125 -0.0105,-2.060291 -1.68969,-3.698024 -3.75,-3.6875 z"
+       transform="translate(-834.62503,901.37504)"
+       id="path4110" />
     <g
        id="g4031-9"
        transform="matrix(0.45818575,0.68148541,-0.68148541,0.45818575,-2.7897502,485.71067)"
@@ -384,7 +381,7 @@
        inkscape:export-ydpi="90">
       <path
          sodipodi:type="arc"
-         style="fill:#555753;fill-opacity:1;stroke:none"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:none"
          id="path4002-3"
          sodipodi:cx="559.67499"
          sodipodi:cy="21.754047"
@@ -400,11 +397,11 @@
          sodipodi:cy="21.754047"
          sodipodi:cx="559.67499"
          id="path4004-9"
-         style="fill:#555753;fill-opacity:1;stroke:none"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:none"
          sodipodi:type="arc" />
       <path
          sodipodi:type="arc"
-         style="fill:#555753;fill-opacity:1;stroke:none"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:none"
          id="path4006-4"
          sodipodi:cx="559.67499"
          sodipodi:cy="21.754047"
@@ -413,7 +410,7 @@
          d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
          transform="matrix(2.2,0,0,2.2,-671.07968,-28.226177)" />
       <path
-         style="fill:none;stroke:#555753;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         style="fill:none;stroke:#1a1a1a;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 563.21055,31.653543 4.41942,-6.187185 -7.6014,-6.187184"
          id="path4010-56"
          inkscape:connector-curvature="0" />
@@ -425,16 +422,16 @@
          sodipodi:cy="21.754047"
          sodipodi:cx="559.67499"
          id="path4008-8"
-         style="fill:#555753;fill-opacity:1;stroke:none"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:none"
          sodipodi:type="arc" />
       <path
-         style="fill:none;stroke:#555753;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         style="fill:none;stroke:#1a1a1a;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 567.45319,25.466358 7.6014,-4.065864"
          id="path4012-5"
          inkscape:connector-curvature="0" />
     </g>
     <path
-       style="fill:none;stroke:#555753;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        d="m 218.00001,881.25007 -5.8125,0 0,9.1875 10.53125,0 0,-5.2187"
        id="rect4432"
        inkscape:connector-curvature="0"
@@ -443,7 +440,7 @@
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:#666666;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="rect4387-8"
        width="14.5"
        height="9"
@@ -456,19 +453,19 @@
        inkscape:export-ydpi="90" />
     <path
        sodipodi:type="arc"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:#e6e6e6;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="path4391-3"
        sodipodi:cx="408.8125"
        sodipodi:cy="220.26843"
        sodipodi:rx="2.6875"
        sodipodi:ry="2.71875"
-       d="m 411.5,220.26843 a 2.6875,2.71875 0 1 1 -5.375,0 2.6875,2.71875 0 1 1 5.375,0 z"
+       d="m 411.5,220.26843 c 0,1.50153 -1.20323,2.71875 -2.6875,2.71875 -1.48427,0 -2.6875,-1.21722 -2.6875,-2.71875 0,-1.50152 1.20323,-2.71875 2.6875,-2.71875 1.48427,0 2.6875,1.21723 2.6875,2.71875 z"
        transform="matrix(1.1489362,0,0,1.1489362,-286.13697,609.51131)"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#555753;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:#ffffff;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        d="m 242.44524,860.13287 c -0.98011,0 -1.77562,0.6006 -1.77562,1.3586 l 0,1.5632 c 0,0.7581 0.79551,1.3733 1.77562,1.3733 l 4.53349,0 c 0.98012,0 1.77562,-0.6152 1.77562,-1.3733 l 0,-1.5632 c 0,-0.758 -0.7955,-1.3586 -1.77562,-1.3586 l -4.53349,0 z m 0.41557,1.0372 3.70235,0 c 0.51967,0 0.94448,0.2879 0.94448,0.6574 l 0,0.8912 c 0,0.3695 -0.42481,0.672 -0.94448,0.672 l -3.70235,0 c -0.51966,0 -0.94447,-0.3025 -0.94447,-0.672 l 0,-0.8912 c 0,-0.3695 0.42481,-0.6574 0.94447,-0.6574 z"
        id="rect4397-0"
        inkscape:connector-curvature="0"
@@ -479,12 +476,12 @@
        inkscape:connector-curvature="0"
        id="path4418-4"
        d="m 232.97199,860.13287 c -0.98011,0 -1.77562,0.6006 -1.77562,1.3586 l 0,1.5632 c 0,0.7581 0.79551,1.3733 1.77562,1.3733 l 4.53349,0 c 0.98012,0 1.77562,-0.6152 1.77562,-1.3733 l 0,-1.5632 c 0,-0.758 -0.7955,-1.3586 -1.77562,-1.3586 l -4.53349,0 z m 0.41557,1.0372 3.70236,0 c 0.51966,0 0.94447,0.2879 0.94447,0.6574 l 0,0.8912 c 0,0.3695 -0.42481,0.672 -0.94447,0.672 l -3.70236,0 c -0.51966,0 -0.94447,-0.3025 -0.94447,-0.672 l 0,-0.8912 c 0,-0.3695 0.42481,-0.6574 0.94447,-0.6574 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:#555753;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:#ffffff;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:#555753;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:#ffffff;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="rect4395-0"
        width="6.7246785"
        height="1.6362466"
@@ -495,243 +492,217 @@
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
-    <rect
-       style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
-       id="rect4416-1"
-       width="14.495689"
-       height="6.5407376"
-       x="132.5179"
-       y="901.32971"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <text
-       xml:space="preserve"
-       style="font-size:5.54432058px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
-       x="139.36653"
-       y="900.60059"
-       id="text4406-9"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan4408-6"
-         x="139.36653"
-         y="900.60059">You</tspan><tspan
-         sodipodi:role="line"
-         x="139.36653"
-         y="906.1449"
-         id="tspan4410-2"
-         style="fill:#eeeeec">Tube</tspan></text>
-    <path
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       d="m 118.03127,895.15627 0,0.3125 c 0,1.2601 -0.0643,3.4345 -0.35937,5.75 l -1.5625,1e-4 c -0.80183,0.011 -1.64766,4.0737 -1.60938,8.0625 l 8.25,0 c -0.057,-5.5479 1.56902,-11.5211 1.75,-5.6563 0.21453,6.9525 1.74237,-5.1823 1.75,-8.4687 z"
-       id="rect4428-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csccccscc"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       d="m 124.78127,905.73727 -1.9375,-0.063"
-       id="path4440-4"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       d="m 117.59377,901.20597 6.4375,0"
-       id="path4442-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4446-9"
-       width="1.0625"
-       height="0.375"
-       x="115.28126"
-       y="908.11218"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="906.51843"
-       x="115.34376"
-       height="0.375"
-       width="1.0625"
-       id="rect4448-3"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4450-6"
-       width="1.0625"
-       height="0.375"
-       x="115.50001"
-       y="904.89343"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="903.42468"
-       x="115.81251"
-       height="0.375"
-       width="1.0625"
-       id="rect4452-0"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4454-5"
-       width="1.0625"
-       height="0.375"
-       x="116.21876"
-       y="902.17468"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="900.17468"
-       x="118.50001"
-       height="0.375"
-       width="1.0625"
-       id="rect4456-0"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4458-2"
-       width="1.0625"
-       height="0.375"
-       x="118.68751"
-       y="898.70593"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="897.20593"
-       x="118.75001"
-       height="0.375"
-       width="1.0625"
-       id="rect4460-9"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4462-4"
-       width="1.0625"
-       height="0.375"
-       x="118.75001"
-       y="895.79968"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="908.11218"
-       x="120.84376"
-       height="0.375"
-       width="1.0625"
-       id="rect4464-3"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4466-5"
-       width="1.0625"
-       height="0.375"
-       x="120.90627"
-       y="906.51843"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="904.89343"
-       x="121.06252"
-       height="0.375"
-       width="1.0625"
-       id="rect4468-1"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4470-7"
-       width="1.0625"
-       height="0.375"
-       x="121.37502"
-       y="903.42468"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="902.17468"
-       x="121.78127"
-       height="0.375"
-       width="1.0625"
-       id="rect4472-4"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4474-3"
-       width="1.0625"
-       height="0.375"
-       x="124.06252"
-       y="900.17468"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="898.70593"
-       x="124.25002"
-       height="0.375"
-       width="1.0625"
-       id="rect4476-1"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4478-4"
-       width="1.0625"
-       height="0.375"
-       x="124.31252"
-       y="897.20593"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="895.79968"
-       x="124.31252"
-       height="0.375"
-       width="1.0625"
-       id="rect4480-6"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
     <g
-       style="display:inline"
+       id="g1037">
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:nodetypes="csccccscc"
+         inkscape:connector-curvature="0"
+         id="rect4428-4"
+         d="m 118.03127,895.15627 0,0.3125 c 0,1.2601 -0.0643,3.4345 -0.35937,5.75 l -1.5625,1e-4 c -0.80183,0.011 -1.64766,4.0737 -1.60938,8.0625 l 8.25,0 c -0.057,-5.5479 1.56902,-11.5211 1.75,-5.6563 0.21453,6.9525 1.74237,-5.1823 1.75,-8.4687 z"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         inkscape:connector-curvature="0"
+         id="path4440-4"
+         d="m 124.78127,905.73727 -1.9375,-0.063"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4442-9"
+         d="m 117.59377,901.20597 6.4375,0"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="908.11218"
+         x="115.28126"
+         height="0.375"
+         width="1.0625"
+         id="rect4446-9"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4448-3"
+         width="1.0625"
+         height="0.375"
+         x="115.34376"
+         y="906.51843" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="904.89343"
+         x="115.50001"
+         height="0.375"
+         width="1.0625"
+         id="rect4450-6"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4452-0"
+         width="1.0625"
+         height="0.375"
+         x="115.81251"
+         y="903.42468" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="902.17468"
+         x="116.21876"
+         height="0.375"
+         width="1.0625"
+         id="rect4454-5"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4456-0"
+         width="1.0625"
+         height="0.375"
+         x="118.50001"
+         y="900.17468" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="898.70593"
+         x="118.68751"
+         height="0.375"
+         width="1.0625"
+         id="rect4458-2"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4460-9"
+         width="1.0625"
+         height="0.375"
+         x="118.75001"
+         y="897.20593" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="895.79968"
+         x="118.75001"
+         height="0.375"
+         width="1.0625"
+         id="rect4462-4"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4464-3"
+         width="1.0625"
+         height="0.375"
+         x="120.84376"
+         y="908.11218" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="906.51843"
+         x="120.90627"
+         height="0.375"
+         width="1.0625"
+         id="rect4466-5"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4468-1"
+         width="1.0625"
+         height="0.375"
+         x="121.06252"
+         y="904.89343" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="903.42468"
+         x="121.37502"
+         height="0.375"
+         width="1.0625"
+         id="rect4470-7"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4472-4"
+         width="1.0625"
+         height="0.375"
+         x="121.78127"
+         y="902.17468" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="900.17468"
+         x="124.06252"
+         height="0.375"
+         width="1.0625"
+         id="rect4474-3"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4476-1"
+         width="1.0625"
+         height="0.375"
+         x="124.25002"
+         y="898.70593" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="897.20593"
+         x="124.31252"
+         height="0.375"
+         width="1.0625"
+         id="rect4478-4"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4480-6"
+         width="1.0625"
+         height="0.375"
+         x="124.31252"
+         y="895.79968" />
+    </g>
+    <g
+       style="stroke:#1a1a1a;display:inline"
        id="g4507-4"
        transform="matrix(0.92823291,-0.48059851,0.48059851,0.92823291,-312.89954,806.76727)"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
@@ -742,9 +713,9 @@
          inkscape:connector-curvature="0"
          id="path4491-2"
          d="m 310.75659,223.79453 c 0.76095,-0.8373 1.2453,-2.02269 1.2453,-3.35786 0,-1.33796 -0.48156,-2.54257 -1.2453,-3.38009"
-         style="fill:none;stroke:#555753;stroke-width:0.35579938;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.35579938;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         style="fill:none;stroke:#555753;stroke-width:0.47089946;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.47089946;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="m 311.49266,224.75938 c 1.00712,-1.10816 1.64816,-2.67702 1.64816,-4.44411 0,-1.77079 -0.63735,-3.36509 -1.64816,-4.47354"
          id="path4496-2"
          inkscape:connector-curvature="0"
@@ -754,48 +725,52 @@
          inkscape:connector-curvature="0"
          id="path4498-6"
          d="m 312.78041,226.18348 c 1.3429,-1.47763 2.19766,-3.56956 2.19766,-5.9258 0,-2.36118 -0.84984,-4.48703 -2.19766,-5.96505"
-         style="fill:none;stroke:#555753;stroke-width:0.62789989;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.62789989;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
          sodipodi:nodetypes="ccccccc"
          inkscape:connector-curvature="0"
          id="path4500-4"
          d="m 309.34375,224.125 0,-7.375 -3.78125,2.07812 -3.4375,-0.10937 0,3.46875 3.4375,-0.125 z"
-         style="fill:none;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g1373"
+       style="stroke:#1a1a1a">
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         transform="translate(-224.73743,661.76263)"
+         d="m 292.21188,220.62782 c 0,4.10051 -3.32411,7.42462 -7.42462,7.42462 -4.1005,0 -7.42462,-3.32411 -7.42462,-7.42462 0,-4.1005 3.32412,-7.42462 7.42462,-7.42462 4.10051,0 7.42462,3.32412 7.42462,7.42462 z"
+         sodipodi:ry="7.4246211"
+         sodipodi:rx="7.4246211"
+         sodipodi:cy="220.62782"
+         sodipodi:cx="284.78726"
+         id="path4515-2"
+         style="fill:none;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         sodipodi:type="arc" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:nodetypes="csc"
+         inkscape:connector-curvature="0"
+         id="path4517-8"
+         d="m 53.15626,883.15627 c 1.94168,0.712 4.31843,1.1563 6.90625,1.1563 2.58782,0 4.96457,-0.4443 6.90625,-1.1563"
+         style="fill:none;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
+         d="m 60.45665,888.82867 c 0.71191,-1.9416 1.15625,-4.3184 1.15625,-6.9062 0,-2.5878 -0.44434,-4.9646 -1.15625,-6.9063"
+         id="path4528-8"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="csc" />
     </g>
-    <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="path4515-2"
-       sodipodi:cx="284.78726"
-       sodipodi:cy="220.62782"
-       sodipodi:rx="7.4246211"
-       sodipodi:ry="7.4246211"
-       d="m 292.21188,220.62782 a 7.4246211,7.4246211 0 1 1 -14.84924,0 7.4246211,7.4246211 0 1 1 14.84924,0 z"
-       transform="translate(-224.73743,661.76263)"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       style="fill:none;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
-       d="m 53.15626,883.15627 c 1.94168,0.712 4.31843,1.1563 6.90625,1.1563 2.58782,0 4.96457,-0.4443 6.90625,-1.1563"
-       id="path4517-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csc"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       sodipodi:nodetypes="csc"
-       inkscape:connector-curvature="0"
-       id="path4528-8"
-       d="m 60.45665,888.82867 c 0.71191,-1.9416 1.15625,-4.3184 1.15625,-6.9062 0,-2.5878 -0.44434,-4.9646 -1.15625,-6.9063"
-       style="fill:none;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
     <text
        xml:space="preserve"
-       style="font-size:3.72799897px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#555753;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:3.72799897px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#1a1a1a;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        x="51.803352"
        y="859.21899"
        id="text4532-2"
@@ -807,9 +782,9 @@
          id="tspan4534-8"
          x="51.803352"
          y="859.21899"
-         style="font-weight:bold;fill:#555753;-inkscape-font-specification:Liberation Sans Bold">Lorem Ip</tspan></text>
+         style="font-weight:bold;fill:#1a1a1a;-inkscape-font-specification:Liberation Sans Bold">Lorem Ip</tspan></text>
     <path
-       style="fill:#555753;fill-opacity:1;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
        d="m 52.25001,862.61227 15.25,0"
        id="path4536-8"
        inkscape:connector-curvature="0"
@@ -820,12 +795,12 @@
        inkscape:connector-curvature="0"
        id="path4538-8"
        d="m 52.25001,864.86227 15.25,0"
-       style="fill:#555753;fill-opacity:1;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
-       style="fill:#555753;fill-opacity:1;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
        d="m 52.25001,867.11227 15.25,0"
        id="path4540-6"
        inkscape:connector-curvature="0"
@@ -833,7 +808,7 @@
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
-       style="fill:none;stroke:#555753;stroke-width:0.82322329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:0.82322329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        d="m 242.49116,907.21887 5.125,-5.125 -5.125,-5.0937"
        id="rect4544-3"
        inkscape:connector-curvature="0"
@@ -846,20 +821,15 @@
        inkscape:connector-curvature="0"
        id="path4549-8"
        d="m 237.98183,907.21887 -5.125,-5.125 5.125,-5.0937"
-       style="fill:none;stroke:#555753;stroke-width:0.82322329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:0.82322329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <g
-       style="display:inline"
-       id="g4213"
-       transform="translate(49.48448,-140.79121)"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
+       id="g4173">
       <path
          sodipodi:type="star"
-         style="fill:#555753;fill-opacity:1;stroke:none"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a"
          id="path4802"
          sodipodi:sides="8"
          sodipodi:cx="98.48214"
@@ -872,9 +842,9 @@
          inkscape:rounded="0"
          inkscape:randomized="0"
          d="m 98.48214,-19.375 6.43972,2.66742 2.66742,6.439723 -2.66742,6.4397218 -6.439721,2.6674201 -6.439722,-2.6674204 -2.66742,-6.4397225 2.667421,-6.439722 z"
-         transform="matrix(0.92307692,0.3846154,-0.3846154,0.92307692,-44.340246,974.7537)" />
+         transform="matrix(0.92307692,0.3846154,-0.3846154,0.92307692,5.144234,833.96249)" />
       <path
-         transform="matrix(0.74691191,0.31121331,-0.31121331,0.74691191,-26.237457,980.1736)"
+         transform="matrix(0.74691191,0.31121331,-0.31121331,0.74691191,23.247023,839.38239)"
          d="m 98.48214,-19.375 6.43972,2.66742 2.66742,6.439723 -2.66742,6.4397218 -6.439721,2.6674201 -6.439722,-2.6674204 -2.66742,-6.4397225 2.667421,-6.439722 z"
          inkscape:randomized="0"
          inkscape:rounded="0"
@@ -889,21 +859,23 @@
          id="path4804"
          style="fill:none;stroke:#d3d7cf;stroke-width:2.47171569;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          sodipodi:type="star" />
-      <path
-         style="fill:none;stroke:#555753;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-         d="m 53.26552,1056.9525 -5.5,6.2008 5.5,6.2009"
-         id="rect4806"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path4812"
-         d="m 67.781143,1069.3407 5.46875,-6.2009 -5.46875,-6.1736"
-         style="fill:none;stroke:#555753;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
     </g>
     <path
-       style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="rect4806"
+       d="m 53.26552,1056.9525 -5.5,6.2008 5.5,6.2009"
+       style="fill:none;stroke:#1a1a1a;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       transform="translate(49.48448,-140.79121)" />
+    <path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#1a1a1a;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       d="m 67.781143,1069.3407 5.46875,-6.2009 -5.46875,-6.1736"
+       id="path4812"
+       transform="translate(49.48448,-140.79121)" />
+    <path
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none;display:inline"
        id="path4257"
        d="m 115.39024,855.00555 c 0.0904,0.0266 0.18708,0.0371 0.27111,0.0797 0.24682,0.12501 0.80382,0.53514 1.00046,0.67918 0.72548,0.53142 1.43751,1.08068 2.14837,1.63134 1.22364,0.99003 2.36274,2.09287 3.41202,3.2665 0.43117,0.4822 1.01205,1.207 1.42675,1.7166 0.97898,1.2314 2.022,2.4234 2.86791,3.7533 0.20576,0.2994 0.39551,0.6797 0.65579,0.9028 -0.10862,-0.1107 -0.10877,-0.099 0.0344,-0.01 0.19118,0.1291 -1.63528,2.8328 -1.82646,2.7036 l 0,0 c -0.18814,-0.022 -0.0511,0 -0.37755,-0.1793 -0.55628,-0.365 -1.09599,-0.7525 -1.61517,-1.1691 -1.27322,-1.0021 -2.36476,-2.2048 -3.47982,-3.3749 -1.53016,-1.5621 -3.0115,-3.1717 -4.57958,-4.6966 -0.94249,-1.01074 -1.92636,-2.0326 -2.54392,-3.28422 -0.14292,-0.18424 2.46273,-2.20539 2.60565,-2.02115 z"
        inkscape:connector-curvature="0"
@@ -911,7 +883,7 @@
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
-       style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none;display:inline"
        id="path4259"
        d="m 112.109,867.43007 c 0.0548,-0.091 0.10266,-0.1866 0.16432,-0.2731 0.23235,-0.3261 0.52565,-0.6137 0.79275,-0.9102 0.42229,-0.4689 0.38553,-0.4337 0.82852,-0.9537 1.44214,-1.6363 3.06836,-3.0981 4.69856,-4.5425 1.63203,-1.40989 3.17698,-2.9167 4.78859,-4.3486 0.46305,-0.4369 0.97793,-0.80137 1.52221,-1.12653 0.15824,-0.21119 3.14491,2.0267 2.98666,2.23789 l 0,0 c -0.2952,0.52243 -0.62275,1.02042 -1.01852,1.47475 -0.88192,1.11919 -1.78212,2.22369 -2.79371,3.23049 -0.29346,0.2921 -0.60222,0.5684 -0.90606,0.8497 -0.31321,0.2899 -0.63003,0.5759 -0.94504,0.8639 -1.67153,1.4209 -3.37366,2.8163 -5.22715,3.9963 -0.49876,0.3405 -0.57121,0.3777 -1.0203,0.7266 -0.39341,0.3057 -0.75974,0.6889 -1.26518,0.7962 -0.14292,0.1842 -2.74857,-1.8369 -2.60565,-2.0212 z"
        inkscape:connector-curvature="0"
@@ -922,7 +894,7 @@
        inkscape:connector-curvature="0"
        d="m 135.39024,855.00555 c 0.0904,0.027 0.18708,0.037 0.27111,0.08 0.24682,0.125 0.80382,0.5352 1.00046,0.6792 0.72548,0.5314 1.43751,1.0807 2.14837,1.6314 1.22364,0.99 2.36274,2.0928 3.41202,3.26652 0.43117,0.4822 1.01205,1.207 1.42675,1.7166 0.97898,1.2314 2.022,2.4234 2.86791,3.7533 0.20576,0.2994 0.39551,0.6797 0.65579,0.9028 -0.10862,-0.1107 -0.10877,-0.099 0.0344,-0.01 0.19118,0.1291 -1.63528,2.8328 -1.82646,2.7036 l 0,0 c -0.18814,-0.022 -0.0511,0 -0.37755,-0.1793 -0.55628,-0.365 -1.09599,-0.7525 -1.61517,-1.1691 -1.27322,-1.0021 -2.36476,-2.2048 -3.47982,-3.3749 -1.53016,-1.5621 -3.0115,-3.1717 -4.57958,-4.6966 -0.94249,-1.01082 -1.92636,-2.03262 -2.54392,-3.28432 -0.14292,-0.1842 2.46273,-2.2054 2.60565,-2.0211 z"
        id="path4263"
-       style="fill:#d3d7cf;fill-opacity:1;stroke:none;display:inline"
+       style="fill:#666666;fill-opacity:1;stroke:none;display:inline"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
@@ -930,12 +902,12 @@
        inkscape:connector-curvature="0"
        d="m 132.109,867.43017 c 0.0548,-0.091 0.10266,-0.1866 0.16432,-0.2731 0.23235,-0.3261 0.52565,-0.6137 0.79275,-0.9102 0.42229,-0.4689 0.38553,-0.4337 0.82852,-0.9537 1.44214,-1.6363 3.06836,-3.0981 4.69856,-4.5425 1.63203,-1.40992 3.17698,-2.91672 4.78859,-4.34862 0.46305,-0.4369 0.97793,-0.8014 1.52221,-1.1266 0.15824,-0.2112 3.14491,2.0267 2.98666,2.2379 l 0,0 c -0.2952,0.5224 -0.62275,1.0204 -1.01852,1.4748 -0.88192,1.11922 -1.78212,2.22372 -2.79371,3.23052 -0.29346,0.2921 -0.60222,0.5684 -0.90606,0.8497 -0.31321,0.2899 -0.63003,0.5759 -0.94504,0.8639 -1.67153,1.4209 -3.37366,2.8163 -5.22715,3.9963 -0.49876,0.3405 -0.57121,0.3777 -1.0203,0.7266 -0.39341,0.3057 -0.75974,0.6889 -1.26518,0.7962 -0.14292,0.1842 -2.74857,-1.8369 -2.60565,-2.0212 z"
        id="path4265"
-       style="fill:#d3d7cf;fill-opacity:1;stroke:none;display:inline"
+       style="fill:#666666;fill-opacity:1;stroke:none;display:inline"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <g
-       style="display:inline"
+       style="stroke:#1a1a1a;display:inline"
        id="g4283"
        transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,294.0656)"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
@@ -946,14 +918,14 @@
          inkscape:connector-curvature="0"
          id="path4269"
          d="m -44.467884,1107.2152 0,17.7252 1.161165,3.7983 c 1.200046,4.2782 1.065706,4.1105 2.322331,0 l 1.161165,-3.7983 0,-17.7252 z"
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
          inkscape:connector-curvature="0"
          id="path4271"
          d="m -44.467884,1124.9404 4.644661,0"
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
       <path
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
          d="m -42.239747,1107.2336 0,17.6813"
          id="path4275"
          inkscape:connector-curvature="0" />
@@ -962,7 +934,7 @@
          inkscape:connector-curvature="0"
          id="path4279"
          d="m -43.348187,1128.4959 c 1.108441,-0.8952 1.929509,-0.3581 2.381097,0.045 -0.328428,1.1191 -1.190549,3.9391 -1.190549,3.9391 z"
-         style="fill:#555753;stroke:#555753;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:#1a1a1a;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
       <rect
          ry="0.42804927"
          rx="0.37616169"
@@ -971,10 +943,10 @@
          height="1.8614606"
          width="5.1800866"
          id="rect4281"
-         style="fill:#555753;fill-opacity:1;stroke:none" />
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a" />
     </g>
     <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       style="fill:#e6e6e6;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        id="rect4290"
        width="3.5355339"
        height="1.8561553"
@@ -986,7 +958,7 @@
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        d="m 214.75589,862.65317 c 3.31942,-0.632 4.06019,-2.1721 5.3033,-4.08897 0.42304,-0.6524 -0.64726,-2.63586 0,-3.13491 0.10703,-0.0825 0.93192,0 1.06066,0 2.52315,0 1.41421,3.50161 1.41421,4.77048 0,0.2317 -0.47723,0.6815 -0.17677,0.6815 2.44972,0 2.94209,0.3603 4.41942,1.4993 0.0697,0.054 0.31741,3.8443 0.17677,3.9527 -0.26074,0.201 -0.49042,0.5145 -0.7071,0.6815 -0.13627,0.105 0.38563,0.7684 0.17677,1.0904 -0.17664,0.2724 -0.85358,0.8061 -1.23743,0.9541 -0.36233,0.1398 -0.89015,0 -1.23744,0.1363 -1.96875,0.759 -2.1166,-0.9523 -3.18198,-1.363 -0.34866,-0.1344 -0.63592,-0.1088 -1.06066,-0.2726 -0.99671,-0.3842 -3.88909,0.6704 -3.88909,-0.2726 0,-1.2852 -0.2556,-3.5996 -1.06066,-4.6342 z"
        id="path4292"
        inkscape:connector-curvature="0"
@@ -997,84 +969,93 @@
        inkscape:connector-curvature="0"
        id="path4294"
        d="m 205.42921,862.12677 c -3.31942,0.632 -4.06019,2.1721 -5.3033,4.089 -0.42304,0.6524 0.64726,2.6358 0,3.1349 -0.10703,0.082 -0.93192,0 -1.06066,0 -2.52315,0 -1.41421,-3.5016 -1.41421,-4.7705 0,-0.2317 0.47723,-0.6815 0.17677,-0.6815 -2.44972,0 -2.94209,-0.3603 -4.41942,-1.4993 -0.0697,-0.054 -0.31741,-3.84428 -0.17677,-3.95268 0.26074,-0.201 0.49042,-0.5145 0.7071,-0.6815 0.13627,-0.105 -0.38563,-0.7684 -0.17677,-1.0904 0.17664,-0.2724 0.85358,-0.8061 1.23743,-0.9541 0.36233,-0.1398 0.89015,0 1.23744,-0.1363 1.96875,-0.759 2.1166,0.9523 3.18198,1.363 0.34866,0.1344 0.63592,0.1088 1.06066,0.2726 0.99671,0.3842 3.88909,-0.6704 3.88909,0.2726 0,1.2852 0.2556,3.59958 1.06066,4.63418 z"
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       transform="translate(-204.73743,661.76269)"
-       d="m 292.21188,220.62782 a 7.4246211,7.4246211 0 1 1 -14.84924,0 7.4246211,7.4246211 0 1 1 14.84924,0 z"
-       sodipodi:ry="7.4246211"
-       sodipodi:rx="7.4246211"
-       sodipodi:cy="220.62782"
-       sodipodi:cx="284.78726"
-       id="path4298"
-       style="fill:none;stroke:#d3d7cf;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       sodipodi:type="arc"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       sodipodi:nodetypes="csc"
-       inkscape:connector-curvature="0"
-       id="path4300"
-       d="m 73.15626,883.15627 c 1.94168,0.712 4.31843,1.1563 6.90625,1.1563 2.58782,0 4.96457,-0.4443 6.90625,-1.1563"
-       style="fill:none;stroke:#d3d7cf;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       style="fill:none;stroke:#d3d7cf;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
-       d="m 80.45665,888.82867 c 0.71191,-1.9416 1.15625,-4.3184 1.15625,-6.9062 0,-2.5878 -0.44434,-4.9646 -1.15625,-6.9063"
-       id="path4302"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csc"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       transform="translate(-184.73743,661.76263)"
-       d="m 292.21188,220.62782 a 7.4246211,7.4246211 0 1 1 -14.84924,0 7.4246211,7.4246211 0 1 1 14.84924,0 z"
-       sodipodi:ry="7.4246211"
-       sodipodi:rx="7.4246211"
-       sodipodi:cy="220.62782"
-       sodipodi:cx="284.78726"
-       id="path4306"
-       style="fill:none;stroke:#555753;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       sodipodi:type="arc"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       style="fill:none;stroke:#555753;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-       d="m 94.285536,887.89997 11.048544,-11.0485"
-       id="path4308"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:#555753;stroke:none;display:inline"
-       id="rect4310"
-       width="3.3587573"
-       height="12.020815"
-       x="115.93771"
-       y="876.12292"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="876.12292"
-       x="120.53392"
-       height="12.020815"
-       width="3.3587573"
-       id="rect4312"
-       style="fill:#555753;stroke:none;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
+    <g
+       id="g1378">
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:type="arc"
+         style="fill:none;stroke:#666666;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="path4298"
+         sodipodi:cx="284.78726"
+         sodipodi:cy="220.62782"
+         sodipodi:rx="7.4246211"
+         sodipodi:ry="7.4246211"
+         d="m 292.21188,220.62782 c 0,4.10051 -3.32411,7.42462 -7.42462,7.42462 -4.1005,0 -7.42462,-3.32411 -7.42462,-7.42462 0,-4.1005 3.32412,-7.42462 7.42462,-7.42462 4.10051,0 7.42462,3.32412 7.42462,7.42462 z"
+         transform="translate(-204.73743,661.76269)" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#666666;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
+         d="m 73.15626,883.15627 c 1.94168,0.712 4.31843,1.1563 6.90625,1.1563 2.58782,0 4.96457,-0.4443 6.90625,-1.1563"
+         id="path4300"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="csc" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:nodetypes="csc"
+         inkscape:connector-curvature="0"
+         id="path4302"
+         d="m 80.45665,888.82867 c 0.71191,-1.9416 1.15625,-4.3184 1.15625,-6.9062 0,-2.5878 -0.44434,-4.9646 -1.15625,-6.9063"
+         style="fill:none;stroke:#666666;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline" />
+    </g>
+    <g
+       id="g277">
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:type="arc"
+         style="fill:none;stroke:#1a1a1a;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="path4306"
+         sodipodi:cx="284.78726"
+         sodipodi:cy="220.62782"
+         sodipodi:rx="7.4246211"
+         sodipodi:ry="7.4246211"
+         d="m 292.21188,220.62782 c 0,4.10051 -3.32411,7.42462 -7.42462,7.42462 -4.1005,0 -7.42462,-3.32411 -7.42462,-7.42462 0,-4.1005 3.32412,-7.42462 7.42462,-7.42462 4.10051,0 7.42462,3.32412 7.42462,7.42462 z"
+         transform="translate(-184.73743,661.76263)" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         inkscape:connector-curvature="0"
+         id="path4308"
+         d="m 94.285536,887.89997 11.048544,-11.0485"
+         style="fill:none;stroke:#1a1a1a;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+    </g>
+    <g
+       id="g273">
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="876.12292"
+         x="115.93771"
+         height="12.020815"
+         width="3.3587573"
+         id="rect4310"
+         style="fill:#1a1a1a;stroke:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:#1a1a1a;stroke:none;display:inline"
+         id="rect4312"
+         width="3.3587573"
+         height="12.020815"
+         x="120.53392"
+         y="876.12292" />
+    </g>
     <path
-       style="fill:#555753;stroke:none;display:inline"
+       style="fill:#1a1a1a;stroke:none;display:inline"
        d="m 134.32248,876.12297 11.31371,6.0104 -11.31371,6.0104 z"
        id="rect4314"
        inkscape:connector-curvature="0"
@@ -1083,20 +1064,20 @@
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <g
-       style="display:inline"
+       style="stroke:#1a1a1a;display:inline"
        transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)"
        id="g4317"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90">
       <path
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none"
          d="m -44.467884,1107.2152 0,17.7252 1.161165,3.7983 c 1.200046,4.2782 1.065706,4.1105 2.322331,0 l 1.161165,-3.7983 0,-17.7252 z"
          id="path4319"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="ccccccc" />
       <path
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
          d="m -44.467884,1124.9404 4.644661,0"
          id="path4321"
          inkscape:connector-curvature="0" />
@@ -1104,15 +1085,15 @@
          inkscape:connector-curvature="0"
          id="path4323"
          d="m -42.239747,1107.2336 0,17.6813"
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
       <path
-         style="fill:#555753;stroke:#555753;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         style="fill:#1a1a1a;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
          d="m -43.348187,1128.4959 c 1.108441,-0.8952 1.929509,-0.3581 2.381097,0.045 -0.328428,1.1191 -1.190549,3.9391 -1.190549,3.9391 z"
          id="path4325"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="cccc" />
       <rect
-         style="fill:#555753;fill-opacity:1;stroke:none"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a"
          id="rect4327"
          width="5.1800866"
          height="1.8614606"
@@ -1122,9 +1103,9 @@
          ry="0.42804927" />
     </g>
     <g
-       style="display:inline"
+       style="stroke:#1a1a1a;display:inline"
        id="g4329"
-       transform="matrix(0.24508333,0.24508333,-0.24508333,0.24508333,458.00011,612.37085)"
+       transform="matrix(0.24508333,0.24508333,-0.24508333,0.24508333,461.00011,612.37085)"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90">
@@ -1133,14 +1114,14 @@
          inkscape:connector-curvature="0"
          id="path4331"
          d="m -44.467884,1107.2152 0,17.7252 1.161165,3.7983 c 1.200046,4.2782 1.065706,4.1105 2.322331,0 l 1.161165,-3.7983 0,-17.7252 z"
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
          inkscape:connector-curvature="0"
          id="path4333"
          d="m -44.467884,1124.9404 4.644661,0"
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
       <path
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
          d="m -42.239747,1107.2336 0,17.6813"
          id="path4335"
          inkscape:connector-curvature="0" />
@@ -1149,7 +1130,7 @@
          inkscape:connector-curvature="0"
          id="path4337"
          d="m -43.348187,1128.4959 c 1.108441,-0.8952 1.929509,-0.3581 2.381097,0.045 -0.328428,1.1191 -1.190549,3.9391 -1.190549,3.9391 z"
-         style="fill:#555753;stroke:#555753;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:#1a1a1a;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
       <rect
          ry="0.42804927"
          rx="0.37616169"
@@ -1158,23 +1139,23 @@
          height="1.8614606"
          width="5.1800866"
          id="rect4339"
-         style="fill:#555753;fill-opacity:1;stroke:none" />
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a" />
     </g>
     <g
        id="layer1-2"
        transform="matrix(0.03334717,0,0,0.03334717,191.57984,885.59897)"
-       style="fill:#555753;display:inline"
+       style="fill:#1a1a1a;display:inline"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90">
       <path
          id="path11522"
-         style="fill:#555753;fill-opacity:1"
+         style="fill:#1a1a1a;fill-opacity:1"
          d="m 264.62704,45.67985 56.31152,-101.021534 0.2677,36.946034 118.51291,-0.267671 c 21.1765,-2.244605 39.74272,-10.852596 53.18801,-27.040291 C 449.99593,42.074998 437.6363,104.18491 348.60347,104.22236 l -27.39721,0 -0.2677,41.05114 -56.31152,-99.59365 z M 128.9798,105.11479 C 65.618201,85.84639 36.055796,7.7860213 7.07577,-47.220709 c 13.282679,12.076484 38.139773,29.363022 52.577167,29.364467 27.689982,0.06456 55.380063,0.116317 83.070083,0.174562 l 83.88712,0 -0.26776,122.43949 -0.26771,0.35698 -97.09487,0 z M 2.5,-79.206629 42.995596,-161.8012 3.5060915,-183.49253 l 118.3343785,0 57.2039,103.877161 -38.79429,-23.228801 c -12.44295,26.27544 -24.88589,52.550878 -37.32884,78.826316 C 88.601045,-24.268303 74.280847,-24.518751 59.960649,-24.769199 32.037317,-31.279427 12.61125,-53.254123 2.5,-79.206629 z m 395.45406,53.939396 -52.29561,-96.380927 105.66215,-63.98618 51.13531,102.449252 c 1.54832,24.517706 -38.03694,58.635841 -62.6066,58.370427 l -41.89525,-0.452572 z M 88.64259,-250.78088 l 53.98405,-80.90589 c 52.35957,-19.50079 82.68955,22.59846 101.8318,49.13587 l -50.86768,97.63029 -104.94817,-65.86027 z m 204.54178,43.54987 c -10.85783,-25.59753 -25.36515,-54.87764 -43.50654,-80.336 -16.24176,-22.7925 -35.86597,-42.67852 -50.7326,-51.5631 l 136.53974,-0.26767 c 24.52088,2.20137 36.43539,16.49668 49.43976,36.05358 l 19.63307,34.53651 30.34224,-19.3654 -57.11457,101.73554 -123.15347,0.26768 38.55237,-21.06114 z"
          inkscape:connector-curvature="0" />
     </g>
     <path
-       style="fill:none;stroke:#555753;display:inline"
+       style="fill:none;stroke:#1a1a1a;display:inline"
        d="m 219.92452,876.86347 1.33532,1.5307 -5.05101,4.4063 4.00584,4.592 5.05101,-4.4063 1.29423,1.4837 1.19091,-7.757 z"
        id="rect4425"
        inkscape:connector-curvature="0"
@@ -1182,122 +1163,134 @@
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
-    <rect
-       style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
-       id="rect4564-9"
-       width="10.935946"
-       height="7.925663"
-       x="71.833412"
-       y="900.66992"
-       rx="1.9019035"
-       ry="2.3056474"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.69802254;display:inline"
-       id="rect4566-9"
-       width="7.7661061"
-       height="7.5413885"
-       x="73.447395"
-       y="896.3468"
-       rx="1.9019035"
-       ry="2.3056474"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       ry="2.3056474"
-       rx="1.9019035"
-       y="900.66992"
-       x="92.208412"
-       height="7.925663"
-       width="10.935946"
-       id="rect4506"
-       style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       style="fill:none;stroke:#555753;stroke-width:0.69802254;display:inline"
-       d="m 108.78126,899.75007 0,-1.0938 c 0,-1.2773 -0.8526,-2.3124 -1.90625,-2.3124 l -3.96875,0 c -1.05366,0 -1.90625,1.0351 -1.90625,2.3124 l 0,2.9376"
-       id="rect4508"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cssssc"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:#555753;stroke:none;display:inline"
-       id="rect4514"
-       width="19.512196"
-       height="19.512196"
-       x="150.24391"
-       y="892.60608"
-       rx="2.9268293"
-       ry="2.9268293"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       ry="2.9268293"
-       rx="2.9268293"
-       y="892.60608"
-       x="170.24391"
-       height="19.512196"
-       width="19.512196"
-       id="rect4516"
-       style="fill:#555753;stroke:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       ry="2.3056474"
-       rx="1.9019035"
-       y="900.66992"
-       x="151.83342"
-       height="7.925663"
-       width="10.935946"
-       id="rect4518"
-       style="fill:#eeeeec;fill-opacity:1;stroke:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       ry="2.3056474"
-       rx="1.9019035"
-       y="896.3468"
-       x="153.4474"
-       height="7.5413885"
-       width="7.7661061"
-       id="rect4520"
-       style="fill:none;stroke:#eeeeec;stroke-width:0.69802254;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:#eeeeec;fill-opacity:1;stroke:none;display:inline"
-       id="rect4522"
-       width="10.935946"
-       height="7.925663"
-       x="172.20842"
-       y="900.66992"
-       rx="1.9019035"
-       ry="2.3056474"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       sodipodi:nodetypes="cssssc"
-       inkscape:connector-curvature="0"
-       id="path4524"
-       d="m 188.78127,899.75007 0,-1.0938 c 0,-1.2773 -0.85259,-2.3124 -1.90625,-2.3124 l -3.96875,0 c -1.05365,0 -1.90625,1.0351 -1.90625,2.3124 l 0,2.9376"
-       style="fill:none;stroke:#eeeeec;stroke-width:0.69802254;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+    <g
+       id="g269">
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         ry="2.3056474"
+         rx="1.9019035"
+         y="900.66992"
+         x="71.833412"
+         height="7.925663"
+         width="10.935946"
+         id="rect4564-9"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         ry="2.3056474"
+         rx="1.9019035"
+         y="896.3468"
+         x="73.447395"
+         height="7.5413885"
+         width="7.7661061"
+         id="rect4566-9"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.69802254;display:inline" />
+    </g>
+    <g
+       id="g265">
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;display:inline"
+         id="rect4506"
+         width="10.935946"
+         height="7.925663"
+         x="92.208412"
+         y="900.66992"
+         rx="1.9019035"
+         ry="2.3056474" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:nodetypes="cssssc"
+         inkscape:connector-curvature="0"
+         id="rect4508"
+         d="m 108.78126,899.75007 0,-1.0938 c 0,-1.2773 -0.8526,-2.3124 -1.90625,-2.3124 l -3.96875,0 c -1.05366,0 -1.90625,1.0351 -1.90625,2.3124 l 0,2.9376"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.69802254;display:inline" />
+    </g>
+    <g
+       id="g1060">
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         ry="2.9268293"
+         rx="2.9268293"
+         y="892.60608"
+         x="150.24391"
+         height="19.512196"
+         width="19.512196"
+         id="rect4514"
+         style="fill:#1a1a1a;stroke:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:#eeeeec;fill-opacity:1;stroke:none;display:inline"
+         id="rect4518"
+         width="10.935946"
+         height="7.925663"
+         x="151.83342"
+         y="900.66992"
+         rx="1.9019035"
+         ry="2.3056474" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#eeeeec;stroke-width:0.69802254;display:inline"
+         id="rect4520"
+         width="7.7661061"
+         height="7.5413885"
+         x="153.4474"
+         y="896.3468"
+         rx="1.9019035"
+         ry="2.3056474" />
+    </g>
+    <g
+       id="g1065">
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:#1a1a1a;stroke:none;display:inline"
+         id="rect4516"
+         width="19.512196"
+         height="19.512196"
+         x="170.24391"
+         y="892.60608"
+         rx="2.9268293"
+         ry="2.9268293" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         ry="2.3056474"
+         rx="1.9019035"
+         y="900.66992"
+         x="172.20842"
+         height="7.925663"
+         width="10.935946"
+         id="rect4522"
+         style="fill:#eeeeec;fill-opacity:1;stroke:none;display:inline" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#eeeeec;stroke-width:0.69802254;display:inline"
+         d="m 188.78127,899.75007 0,-1.0938 c 0,-1.2773 -0.85259,-2.3124 -1.90625,-2.3124 l -3.96875,0 c -1.05365,0 -1.90625,1.0351 -1.90625,2.3124 l 0,2.9376"
+         id="path4524"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cssssc" />
+    </g>
     <path
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        d="m 61.2575,895.73577 c -0.85405,0.9453 -1.14575,2.2161 -0.88721,3.3884 l -8.17918,8.1791 c -0.14244,0.1425 -0.12201,0.3935 0.0507,0.5661 l 2.21807,2.2181 c 0.17268,0.1727 0.42791,0.1974 0.57035,0.055 l 8.13693,-8.1369 c 1.26093,0.3161 2.65155,-0.016 3.63762,-1.0013 0.66189,-0.6619 1.02334,-1.5095 1.09849,-2.3744 l -2.11666,2.1167 -3.2405,-0.8746 -0.87454,-3.2405 2.14201,-2.1419 c -0.88104,0.066 -1.74292,0.4331 -2.41663,1.1068 -0.0467,0.047 -0.0968,0.09 -0.13942,0.1395 z"
        id="path4529"
        inkscape:connector-curvature="0"
@@ -1306,7 +1299,7 @@
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
-       style="fill:none;stroke:#555753;stroke-width:0.80000001;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:0.80000001;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
        d="m 201.14016,895.80807 -8.25003,8.25 -0.94202,3.5156 2.58822,2.5882 3.10935,-0.8332 10.50754,-10.5075 -2e-5,-2.3881 -1.69404,-1.694 -1.94401,0 -9.97205,9.972 3e-5,1.972 0.61101,0.611 1.73597,0 9.36804,-9.368"
        id="path3395"
        inkscape:connector-curvature="0"
@@ -1315,7 +1308,7 @@
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <rect
-       style="fill:#555753;stroke:none;display:inline"
+       style="fill:#333333;stroke:none;display:inline"
        id="rect3397"
        width="19.512196"
        height="19.512196"
@@ -1352,23 +1345,23 @@
        inkscape:export-xdpi="90"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        transform="translate(-224.73743,701.76263)"
-       d="m 292.21188,220.62782 a 7.4246211,7.4246211 0 1 1 -14.84924,0 7.4246211,7.4246211 0 1 1 14.84924,0 z"
+       d="m 292.21188,220.62782 c 0,4.10051 -3.32411,7.42462 -7.42462,7.42462 -4.1005,0 -7.42462,-3.32411 -7.42462,-7.42462 0,-4.1005 3.32412,-7.42462 7.42462,-7.42462 4.10051,0 7.42462,3.32412 7.42462,7.42462 z"
        sodipodi:ry="7.4246211"
        sodipodi:rx="7.4246211"
        sodipodi:cy="220.62782"
        sodipodi:cx="284.78726"
        id="path4020"
-       style="fill:none;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        sodipodi:type="arc" />
     <path
        sodipodi:type="arc"
-       style="fill:#555753;fill-opacity:1;stroke:#555753;stroke-width:1.62554049;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;stroke-width:1.62554049;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="path4022"
        sodipodi:cx="284.78726"
        sodipodi:cy="220.62782"
        sodipodi:rx="7.4246211"
        sodipodi:ry="7.4246211"
-       d="m 292.21188,220.62782 a 7.4246211,7.4246211 0 1 1 -14.84924,0 7.4246211,7.4246211 0 1 1 14.84924,0 z"
+       d="m 292.21188,220.62782 c 0,4.10051 -3.32411,7.42462 -7.42462,7.42462 -4.1005,0 -7.42462,-3.32411 -7.42462,-7.42462 0,-4.1005 3.32412,-7.42462 7.42462,-7.42462 4.10051,0 7.42462,3.32412 7.42462,7.42462 z"
        transform="matrix(0.61517998,0,0,0.61517998,-115.14559,786.66463)"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
@@ -1378,20 +1371,18 @@
        inkscape:export-xdpi="90"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        sodipodi:type="arc"
-       style="fill:none;stroke:#d3d7cf;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="path4024"
        sodipodi:cx="284.78726"
        sodipodi:cy="220.62782"
        sodipodi:rx="7.4246211"
        sodipodi:ry="7.4246211"
-       d="m 292.21188,220.62782 a 7.4246211,7.4246211 0 1 1 -14.84924,0 7.4246211,7.4246211 0 1 1 14.84924,0 z"
+       d="m 292.21188,220.62782 c 0,4.10051 -3.32411,7.42462 -7.42462,7.42462 -4.1005,0 -7.42462,-3.32411 -7.42462,-7.42462 0,-4.1005 3.32412,-7.42462 7.42462,-7.42462 4.10051,0 7.42462,3.32412 7.42462,7.42462 z"
        transform="translate(-204.73743,701.76269)" />
     <g
-       inkscape:label="#g3852"
-       style="stroke:#888a85;display:inline;filter:url(#filter4064)"
-       transform="matrix(0.43114968,0,0,0.43114968,-201.41936,955.6356)"
-       id="g3139">
+       id="g226">
       <rect
+         transform="matrix(0.43114968,0,0,0.43114968,-201.41936,955.6356)"
          ry="6"
          rx="6"
          y="18.790752"
@@ -1399,15 +1390,24 @@
          height="44.285713"
          width="44.285713"
          id="rect3141"
-         style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)" />
+      <text
+         sodipodi:linespacing="100%"
+         id="text3151"
+         y="979.64215"
+         x="5.6234956"
+         style="font-size:17.09149551px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#f2f2f2;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:FreeSans Bold"
+         xml:space="preserve"><tspan
+           y="979.64215"
+           x="5.6234956"
+           id="tspan3153"
+           sodipodi:role="line">?</tspan></text>
     </g>
     <g
-       id="g3145"
-       transform="matrix(0.43114968,0,0,0.43114968,-179.41936,955.6356)"
-       style="stroke:#d3d7cf;display:inline;filter:url(#filter4064)"
-       inkscape:label="#g3852">
+       id="g204">
       <rect
-         style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         transform="matrix(0.43114968,0,0,0.43114968,-179.41936,955.6356)"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
          id="rect3147"
          width="44.285713"
          height="44.285713"
@@ -1415,28 +1415,694 @@
          y="18.790752"
          rx="6"
          ry="6" />
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-size:17.09149551px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#888a85;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:FreeSans Bold"
-       x="5.6234956"
-       y="979.64215"
-       id="text3151"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan3153"
-         x="5.6234956"
-         y="979.64215">?</tspan></text>
-    <text
-       sodipodi:linespacing="100%"
-       id="text3155"
-       y="979.64215"
-       x="27.623495"
-       style="font-size:17.09149551000000145px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#d3d7cf;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:FreeSans Bold"
-       xml:space="preserve"><tspan
-         y="979.64215"
+      <text
+         xml:space="preserve"
+         style="font-size:17.09149551px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#d3d7cf;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:FreeSans Bold"
          x="27.623495"
-         id="tspan3157"
-         sodipodi:role="line">?</tspan></text>
+         y="979.64215"
+         id="text3155"
+         sodipodi:linespacing="100%"><tspan
+           sodipodi:role="line"
+           id="tspan3157"
+           x="27.623495"
+           y="979.64215">?</tspan></text>
+    </g>
+    <path
+       sodipodi:type="star"
+       style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#b3b3b3;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path4061"
+       sodipodi:sides="5"
+       sodipodi:cx="133.6317"
+       sodipodi:cy="61.950726"
+       sodipodi:r1="8.4750214"
+       sodipodi:r2="4.2375107"
+       sodipodi:arg1="0.97074611"
+       sodipodi:arg2="1.5990646"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 138.41741,68.945222 -4.90548,-2.758679 -5.05353,2.47708 1.10779,-5.517867 -3.91747,-4.040728 5.59012,-0.651551 2.6324,-4.974387 2.34711,5.115187 5.54438,0.966388 -4.13954,3.812909 z"
+       transform="matrix(0.86880929,0,0,0.9052037,23.373259,866.40571)"
+       inkscape:transform-center-x="-0.064310184"
+       inkscape:transform-center-y="-0.6685783" />
+    <path
+       inkscape:transform-center-y="-0.6685783"
+       inkscape:transform-center-x="-0.064310184"
+       transform="matrix(0.86880929,0,0,0.9052037,43.373259,866.40571)"
+       d="m 138.41741,68.945222 -4.90548,-2.758679 -5.05353,2.47708 1.10779,-5.517867 -3.91747,-4.040728 5.59012,-0.651551 2.6324,-4.974387 2.34711,5.115187 5.54438,0.966388 -4.13954,3.812909 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0"
+       inkscape:flatsided="false"
+       sodipodi:arg2="1.5990646"
+       sodipodi:arg1="0.97074611"
+       sodipodi:r2="4.2375107"
+       sodipodi:r1="8.4750214"
+       sodipodi:cy="61.950726"
+       sodipodi:cx="133.6317"
+       sodipodi:sides="5"
+       id="path4063"
+       style="fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:#b3b3b3;stroke-width:1.19979274;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       sodipodi:type="star" />
+    <g
+       id="g4177"
+       transform="translate(0,0.22992881)">
+      <path
+         sodipodi:nodetypes="cccccc"
+         style="fill:#cccccc;fill-opacity:1"
+         d="m 53.921057,63.979016 -5.615027,-6.233401 9.206725,-9.241692 5.744016,0.08696 -0.101757,6.527264 z"
+         id="path4152"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.83907455,0,0,0.82021694,132.45839,876.23647)" />
+      <path
+         sodipodi:nodetypes="cccccccccccccccccccccc"
+         inkscape:connector-curvature="0"
+         d="m 54.67642,55.699012 2.077304,-0.01567 -0.06764,2.127228 -2.053363,0.03612 z m 3.043854,-0.97892 -5.97358,0.0021 -8.473421,8.656992 5.643707,5.967988 8.731922,-8.826384 z m 1.047484,5.977035 -9.907739,10.059911 -6.759792,-7.448518 9.288198,-9.605297 7.396851,-0.01484 z m -13.590285,2.754701 5.185415,-5.323903 3.948418,3.90828 -5.336087,5.379274 z"
+         style="fill:#1a1a1a;fill-opacity:1"
+         transform="matrix(0.83907455,0,0,0.82021694,136.85379,871.59613)"
+         id="path4166" />
+    </g>
+    <rect
+       transform="matrix(1,0,0,0.84848485,44,217.14578)"
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons.png"
+       y="852.36218"
+       x="1.5883562e-17"
+       height="132"
+       width="44"
+       id="rect185"
+       style="fill:#2e3436;fill-opacity:1;stroke:none;display:inline" />
+    <rect
+       transform="matrix(0.43114968,0,0,0.43114968,-179.41936,1022.6356)"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       id="rect192"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6" />
+    <rect
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect194"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       transform="matrix(0.43114968,0,0,0.43114968,-135.41936,1022.6356)" />
+    <rect
+       transform="matrix(0.43114968,0,0,0.43114968,-135.41936,999.6356)"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       id="rect196"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6" />
+    <rect
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect202"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       transform="matrix(0.43114968,0,0,0.43114968,-135.41936,933.6356)" />
+    <rect
+       transform="matrix(0.43114968,0,0,0.43114968,-201.41936,1022.6356)"
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect214"
+       style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)" />
+    <rect
+       style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       id="rect216"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6"
+       transform="matrix(0.43114968,0,0,0.43114968,-157.41936,1022.6356)" />
+    <rect
+       transform="matrix(0.43114968,0,0,0.43114968,-157.41936,999.6356)"
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect218"
+       style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)" />
+    <rect
+       style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       id="rect224"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6"
+       transform="matrix(0.43114968,0,0,0.43114968,-157.41936,933.6356)" />
+    <g
+       id="g1005">
+      <desc
+         id="desc1016">alternate housing ;)</desc>
+      <title
+         id="title1014">wikuom/wigwam</title>
+      <rect
+         transform="matrix(0.43114968,0,0,0.43114968,-157.41936,977.6356)"
+         ry="6"
+         rx="6"
+         y="18.790752"
+         x="470.35715"
+         height="44.285713"
+         width="44.285713"
+         id="rect220"
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)" />
+      <path
+         sodipodi:end="6.2831853"
+         sodipodi:start="3.1415927"
+         transform="matrix(1.2380952,0,0,1.675,-15.523193,759.33575)"
+         d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
+         sodipodi:ry="5.2590199"
+         sodipodi:rx="5.5219707"
+         sodipodi:cy="143.46553"
+         sodipodi:cx="56.797413"
+         id="path231"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5555275;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.55552751;stroke-miterlimit:4;stroke-dasharray:none"
+         id="path1003"
+         sodipodi:cx="56.797413"
+         sodipodi:cy="143.46553"
+         sodipodi:rx="5.5219707"
+         sodipodi:ry="5.2590199"
+         d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
+         transform="matrix(0.4523809,0,0,0.775,29.234821,888.45473)"
+         sodipodi:start="3.1415927"
+         sodipodi:end="6.2831853" />
+    </g>
+    <g
+       id="g1018"
+       transform="translate(22,0)"
+       style="fill:#1a1a1a">
+      <desc
+         id="desc1020">alternate housing ;)</desc>
+      <title
+         id="title1022">wikuom/wigwam</title>
+      <rect
+         style="fill:#1a1a1a;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+         id="rect1024"
+         width="44.285713"
+         height="44.285713"
+         x="470.35715"
+         y="18.790752"
+         rx="6"
+         ry="6"
+         transform="matrix(0.43114968,0,0,0.43114968,-157.41936,977.6356)" />
+      <path
+         sodipodi:type="arc"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.55552751;stroke-miterlimit:4;stroke-dasharray:none"
+         id="path1026"
+         sodipodi:cx="56.797413"
+         sodipodi:cy="143.46553"
+         sodipodi:rx="5.5219707"
+         sodipodi:ry="5.2590199"
+         d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
+         transform="matrix(1.2380952,0,0,1.675,-15.523193,759.33575)"
+         sodipodi:start="3.1415927"
+         sodipodi:end="6.2831853" />
+      <path
+         sodipodi:end="6.2831853"
+         sodipodi:start="3.1415927"
+         transform="matrix(0.4523809,0,0,0.775,29.234821,888.45473)"
+         d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
+         sodipodi:ry="5.2590199"
+         sodipodi:rx="5.5219707"
+         sodipodi:cy="143.46553"
+         sodipodi:cx="56.797413"
+         id="path1028"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.55552751;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g4160">
+      <rect
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+         id="rect210"
+         width="44.285713"
+         height="44.285713"
+         x="470.35715"
+         y="18.790752"
+         rx="6"
+         ry="6"
+         transform="matrix(0.43114968,0,0,0.43114968,-201.41936,977.6356)" />
+      <path
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         d="m 14.756588,131.15925 0,9.60545 -11.6032194,-0.0118 0,-9.58225 -2.73319221,0.79047 8.57645441,-3.98976 8.4702832,3.97497 z"
+         style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;font-family:Verdana;-inkscape-font-specification:Verdana"
+         transform="matrix(0.83752627,0,0,0.92659378,3.4546476,870.69518)"
+         id="path1037" />
+    </g>
+    <g
+       id="g4164">
+      <rect
+         ry="6"
+         rx="6"
+         y="18.790752"
+         x="470.35715"
+         height="44.285713"
+         width="44.285713"
+         id="rect188"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+         transform="matrix(0.43114968,0,0,0.43114968,-179.41936,977.6356)" />
+      <path
+         id="path4158"
+         transform="matrix(0.83752627,0,0,0.92659378,25.454648,870.69518)"
+         style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;font-family:Verdana;-inkscape-font-specification:Verdana"
+         d="m 14.756588,131.15925 0,9.60545 -11.6032194,-0.0118 0,-9.58225 -2.73319221,0.79047 8.57645441,-3.98976 8.4702832,3.97497 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccc" />
+    </g>
+    <g
+       id="g4210">
+      <rect
+         transform="matrix(0.43114968,0,0,0.43114968,-201.41936,999.6356)"
+         ry="6"
+         rx="6"
+         y="18.790752"
+         x="470.35715"
+         height="44.285713"
+         width="44.285713"
+         id="rect212"
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)" />
+      <path
+         sodipodi:nodetypes="cccccccccccccccccc"
+         transform="matrix(0.90433934,-0.00156352,-0.00156352,0.90433934,0.70503743,868.45488)"
+         inkscape:connector-curvature="0"
+         id="path4206"
+         d="m 4.1190936,170.87651 1.316683,1.26576 1.7540206,0.003 5.5819788,-5.57043 3.523532,0.006 2.853557,-2.81689 0.0014,-1.68321 -1.169094,-1.16909 -2.365502,2.3822 -2.63185,-0.005 0.09078,-2.55314 2.365531,-2.36552 -1.277858,-1.27786 -1.648714,0.0359 -2.8505569,2.8535 0.00598,3.45613 -5.5530909,5.58201 z"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    </g>
+    <g
+       id="g4214">
+      <rect
+         transform="matrix(0.43114968,0,0,0.43114968,-179.41936,999.6356)"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+         id="rect190"
+         width="44.285713"
+         height="44.285713"
+         x="470.35715"
+         y="18.790752"
+         rx="6"
+         ry="6" />
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 4.1190936,170.87651 1.316683,1.26576 1.7540206,0.003 5.5819788,-5.57043 3.523532,0.006 2.853557,-2.81689 0.0014,-1.68321 -1.169094,-1.16909 -2.365502,2.3822 -2.63185,-0.005 0.09078,-2.55314 2.365531,-2.36552 -1.277858,-1.27786 -1.648714,0.0359 -2.8505569,2.8535 0.00598,3.45613 -5.5530909,5.58201 z"
+         id="path4208"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.90433934,-0.00156352,-0.00156352,0.90433934,22.705037,868.45488)"
+         sodipodi:nodetypes="cccccccccccccccccc" />
+    </g>
+    <g
+       id="g4242"
+       transform="matrix(0.93050058,0,0,0.90640134,0.75846434,97.446032)">
+      <path
+         transform="translate(0,852.36218)"
+         d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
+         sodipodi:ry="1.5964882"
+         sodipodi:rx="2.0660436"
+         sodipodi:cy="194.45924"
+         sodipodi:cx="5.2590199"
+         id="path4218"
+         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
+      <use
+         height="200"
+         width="250"
+         transform="translate(5.698452,-13)"
+         id="use4224"
+         xlink:href="#path4218"
+         y="0"
+         x="0" />
+      <use
+         height="200"
+         width="250"
+         transform="translate(5.6280407,13)"
+         id="use4226"
+         xlink:href="#use4224"
+         y="0"
+         x="0" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         id="path4228"
+         sodipodi:cx="5.2590199"
+         sodipodi:cy="194.45924"
+         sodipodi:rx="2.0660436"
+         sodipodi:ry="1.5964882"
+         d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
+         transform="translate(5.684483,846.36218)" />
+      <path
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0"
+         id="path4230"
+         d="m 10.902837,183.0346 0,3.66687"
+         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:nodetypes="cc"
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0"
+         id="path4232"
+         d="m 9.2894123,189.68386 -2.3956906,3.56909"
+         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <path
+         sodipodi:nodetypes="cc"
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0"
+         id="path4234"
+         d="m 12.46737,189.68386 2.493472,3.5202"
+         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <path
+         sodipodi:nodetypes="cc"
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0"
+         id="path4236"
+         d="m 12.467368,182.74125 4.009116,9.925"
+         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <path
+         sodipodi:nodetypes="cc"
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0"
+         id="path4238"
+         d="m 9.4849789,182.83904 -4.2046813,9.87611"
+         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <path
+         sodipodi:nodetypes="cc"
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0"
+         id="path4240"
+         d="m 7.4315299,194.71969 7.0403961,0"
+         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    </g>
+    <g
+       transform="matrix(0.93050058,0,0,0.90640134,22.758464,97.446032)"
+       id="g4280"
+       style="fill:#1a1a1a">
+      <path
+         sodipodi:type="arc"
+         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         id="path4282"
+         sodipodi:cx="5.2590199"
+         sodipodi:cy="194.45924"
+         sodipodi:rx="2.0660436"
+         sodipodi:ry="1.5964882"
+         d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
+         transform="translate(0,852.36218)" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path4282"
+         id="use4284"
+         transform="translate(5.698452,-13)"
+         width="250"
+         height="200"
+         style="fill:#1a1a1a" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use4284"
+         id="use4286"
+         transform="translate(5.6280407,13)"
+         width="250"
+         height="200"
+         style="fill:#1a1a1a" />
+      <path
+         transform="translate(5.684483,846.36218)"
+         d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
+         sodipodi:ry="1.5964882"
+         sodipodi:rx="2.0660436"
+         sodipodi:cy="194.45924"
+         sodipodi:cx="5.2590199"
+         id="path4288"
+         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="cc"
+         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 10.902837,183.0346 0,3.66687"
+         id="path4290"
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)" />
+      <path
+         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 9.2894123,189.68386 -2.3956906,3.56909"
+         id="path4293"
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 12.46737,189.68386 2.493472,3.5202"
+         id="path4295"
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 12.467368,182.74125 4.009116,9.925"
+         id="path4297"
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 9.4849789,182.83904 -4.2046813,9.87611"
+         id="path4299"
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 7.4315299,194.71969 7.0403961,0"
+         id="path4301"
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <g
+       id="g4309"
+       transform="matrix(0.95268982,0,0,1.0934812,2.5939281,-88.949056)">
+      <path
+         id="rect4303"
+         d="m 47.594131,94.030746 14.462306,0 0,10.255094 -14.462306,0 z"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cccc"
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0"
+         id="path4305"
+         d="m 47.666782,94.03851 7.145333,5.307564 7.035032,-5.261579 z"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    </g>
+    <g
+       transform="matrix(0.95268982,0,0,1.0934812,24.593928,-88.949056)"
+       id="g4313"
+       style="fill:#1a1a1a">
+      <path
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+         d="m 47.594131,94.030746 14.462306,0 0,10.255094 -14.462306,0 z"
+         id="path4315" />
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 47.666782,94.03851 7.145333,5.307564 7.035032,-5.261579 z"
+         id="path4317"
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <g
+       id="g257">
+      <rect
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+         id="rect222"
+         width="44.285713"
+         height="44.285713"
+         x="470.35715"
+         y="18.790752"
+         rx="6"
+         ry="6"
+         transform="matrix(0.43114968,0,0,0.43114968,-157.41936,955.6356)" />
+      <text
+         transform="translate(5.2683173,850.36218)"
+         id="text247"
+         y="129.16422"
+         x="49.504551"
+         style="font-size:17px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Verdana;-inkscape-font-specification:Verdana Bold"
+         xml:space="preserve"><tspan
+           style="font-weight:bold;-inkscape-font-specification:Verdana Bold"
+           y="129.16422"
+           x="49.504551"
+           id="tspan249"
+           sodipodi:role="line">!</tspan></text>
+    </g>
+    <g
+       id="g253">
+      <rect
+         ry="6"
+         rx="6"
+         y="18.790752"
+         x="470.35715"
+         height="44.285713"
+         width="44.285713"
+         id="rect200"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+         transform="matrix(0.43114968,0,0,0.43114968,-135.41936,955.6356)" />
+      <use
+         height="200"
+         width="250"
+         transform="translate(22.268317,0)"
+         id="use251"
+         xlink:href="#text247"
+         y="0"
+         x="0" />
+    </g>
+    <path
+       sodipodi:type="star"
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.80864763;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path252"
+       sodipodi:sides="3"
+       sodipodi:cx="195.63554"
+       sodipodi:cy="63.26548"
+       sodipodi:r1="7.7793064"
+       sodipodi:r2="15.558613"
+       sodipodi:arg1="2.1025204"
+       sodipodi:arg2="3.1497179"
+       inkscape:flatsided="true"
+       inkscape:rounded="0.2"
+       inkscape:randomized="0"
+       d="m 191.69128,69.97073 c -2.32277,-1.366333 -2.23518,-12.1453 0.10948,-13.473709 2.34466,-1.328408 11.63573,4.136926 11.61383,6.831668 -0.0219,2.694741 -9.40054,8.008375 -11.72331,6.642041 z"
+       transform="matrix(1.043244,0,0,0.93815683,-5.0151639,863.01152)"
+       inkscape:transform-center-x="-4.0006141"
+       inkscape:transform-center-y="-0.059313251" />
+    <path
+       inkscape:transform-center-y="0.059308319"
+       inkscape:transform-center-x="4.0006111"
+       transform="matrix(-1.043244,0,0,-0.93815683,425.4058,981.67309)"
+       d="m 191.69128,69.97073 c -2.32277,-1.366333 -2.23518,-12.1453 0.10948,-13.473709 2.34466,-1.328408 11.63573,4.136926 11.61383,6.831668 -0.0219,2.694741 -9.40054,8.008375 -11.72331,6.642041 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0.2"
+       inkscape:flatsided="true"
+       sodipodi:arg2="3.1497179"
+       sodipodi:arg1="2.1025204"
+       sodipodi:r2="15.558613"
+       sodipodi:r1="7.7793064"
+       sodipodi:cy="63.26548"
+       sodipodi:cx="195.63554"
+       sodipodi:sides="3"
+       id="path254"
+       style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#e6e6e6;stroke-width:0.80864763;stroke-miterlimit:4;stroke-dasharray:none"
+       sodipodi:type="star" />
+    <g
+       id="g1070"
+       transform="matrix(1.1035285,0,0,1.1035285,-14.308807,-95.610044)">
+      <path
+         sodipodi:nodetypes="cscsc"
+         inkscape:connector-curvature="0"
+         id="path262"
+         d="m 148.82687,49.85498 c 0,0 -3.94234,5.723921 -8.80546,5.723921 -4.86313,0 -8.80547,-5.723921 -8.80547,-5.723921 0,0 3.94234,-5.72392 8.80547,-5.72392 4.86312,0 8.80546,5.72392 8.80546,5.72392 z"
+         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.94912058;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         transform="matrix(0.79496097,0,0,0.9062729,26.90439,859.01012)" />
+      <path
+         transform="matrix(0.89659499,0,0,0.89659499,12.90165,857.69139)"
+         d="m 144.56282,51.877872 c 0,2.665109 -2.1605,4.825606 -4.82561,4.825606 -2.66511,0 -4.8256,-2.160497 -4.8256,-4.825606 0,-2.665108 2.16049,-4.825605 4.8256,-4.825605 2.66511,0 4.82561,2.160497 4.82561,4.825605 z"
+         sodipodi:ry="4.8256054"
+         sodipodi:rx="4.8256054"
+         sodipodi:cy="51.877872"
+         sodipodi:cx="139.73721"
+         id="path1033"
+         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.86699998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path1035"
+         sodipodi:cx="139.73721"
+         sodipodi:cy="51.877872"
+         sodipodi:rx="4.8256054"
+         sodipodi:ry="4.8256054"
+         d="m 144.56282,51.877872 c 0,2.665109 -2.1605,4.825606 -4.82561,4.825606 -2.66511,0 -4.8256,-2.160497 -4.8256,-4.825606 0,-2.665108 2.16049,-4.825605 4.8256,-4.825605 2.66511,0 4.82561,2.160497 4.82561,4.825605 z"
+         transform="matrix(0.37382862,0,0,0.37382862,85.950326,884.7403)" />
+    </g>
+    <g
+       id="g321">
+      <g
+         id="g315">
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           d="m 51.71875,158.125 0,7.65625 10.1875,0 0,-7.65625 z"
+           style="fill:#333333"
+           transform="translate(1,852.36218)"
+           id="path293" />
+        <path
+           id="path278"
+           transform="translate(1,852.36218)"
+           style="fill:#e6e6e6"
+           d="m 51.71875,158.125 0,7.65625 10.1875,0 0,-7.65625 z m 0.53125,0.625 9.03125,0 -0.03125,6.4375 -9,0 z m 0.71875,0.65625 0,5.03125 4.4375,0 -0.0625,-5.03125 z m 0.59375,0.625 3.25,0 0,2.5625 -0.8125,0 0,-1.9375 -1.727964,0 0,1.9375 -0.709536,0 z"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccccccccccccccccccc" />
+      </g>
+      <use
+         height="200"
+         width="250"
+         transform="translate(-6,6)"
+         id="use319"
+         xlink:href="#g315"
+         y="0"
+         x="0" />
+    </g>
+    <g
+       id="g353">
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         d="m 51.71875,158.125 0,7.65625 10.1875,0 0,-7.65625 z"
+         style="fill:#1a1a1a"
+         transform="translate(23,852.36218)"
+         id="path333" />
+      <path
+         id="path335"
+         transform="translate(23,852.36218)"
+         style="fill:#e6e6e6"
+         d="m 51.71875,158.125 0,7.65625 10.1875,0 0,-7.65625 z m 0.53125,0.625 9.03125,0 -0.03125,6.4375 -9,0 z m 0.71875,0.65625 0,5.03125 4.4375,0 -0.0625,-5.03125 z m 0.59375,0.625 3.25,0 0,2.5625 -0.8125,0 0,-1.9375 -1.727964,0 0,1.9375 -0.709536,0 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccccccccccccccccc" />
+    </g>
+    <use
+       x="0"
+       y="0"
+       xlink:href="#g353"
+       id="use357"
+       transform="translate(-5,6)"
+       width="250"
+       height="200" />
   </g>
 </svg>
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
old mode 100755
new mode 100644
index 8dccf71ed..0a559aae7
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -1,157 +1,137 @@
 
-<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
 
 var editor=false;
 var textlen = 0;
+var plaintext = '$editselect';
+var skin = 'default';
 
-function initEditor(cb) {
-    if (editor==false) {
-        $("#profile-jot-text-loading").show();
-		$("#jot-title-desc").show();
- if(plaintext == 'none') {
-            $("#profile-jot-text-loading").hide();
-            $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-            $(".jothidden").show();
-            editor = true;
-            $("a#jot-perms-icon").fancybox({
-                'transitionIn' : 'elastic',
-                'transitionOut' : 'elastic'
-            });
-	                            $("#profile-jot-submit-wrapper").show();
-								{{ if $newpost }}
-    	                            $("#profile-upload-wrapper").show();
-        	                        $("#profile-attach-wrapper").show();
-            	                    $("#profile-link-wrapper").show();
-                	                $("#profile-video-wrapper").show();
-                    	            $("#profile-audio-wrapper").show();
-                        	        $("#profile-location-wrapper").show();
-                            	    $("#profile-nolocation-wrapper").show();
-                                	$("#profile-title-wrapper").show();
-	                                $("#profile-jot-plugin-wrapper").show();
-	                                $("#jot-preview-link").show();
-								{{ endif }}   
-
-
-            if (typeof cb!="undefined") cb();
-            return;
-        }
-        tinyMCE.init({
-                theme : "advanced",
-                mode : "specific_textareas",
-                editor_selector: /(profile-jot-text|prvmail-text)/,
-                plugins : "bbcode,paste,fullscreen,autoresize",
-                theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
-                theme_advanced_buttons2 : "",
-                theme_advanced_buttons3 : "",
-                theme_advanced_toolbar_location : "top",
-                theme_advanced_toolbar_align : "center",
-                theme_advanced_blockformats : "blockquote,code",
-                //theme_advanced_resizing : true,
-                //theme_advanced_statusbar_location : "bottom",
-                paste_text_sticky : true,
-                entity_encoding : "raw",
-                add_unload_trigger : false,
-                remove_linebreaks : false,
-                force_p_newlines : false,
-                force_br_newlines : true,
-                forced_root_block : '',
-                convert_urls: false,
-                content_css: "$baseurl/view/custom_tinymce.css",
-                theme_advanced_path : false,
-                setup : function(ed) {
-                     //Character count
-                        ed.onKeyUp.add(function(ed, e) {
-                                var txt = tinyMCE.activeEditor.getContent();
-                                textlen = txt.length;
-                                if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-                                        $('#profile-jot-desc').html(ispublic);
-                                }
-                                else {
-                                        $('#profile-jot-desc').html('&nbsp;');
-                                }
-
-                                if(textlen <= 140) {
-                                        $('#character-counter').removeClass('red');
-                                        $('#character-counter').removeClass('orange');
-                                        $('#character-counter').addClass('grey');
-                                }
-                                if((textlen > 140) && (textlen <= 420)) {
-                                        $('#character-counter').removeClass('grey');
-                                        $('#character-counter').removeClass('red');
-                                        $('#character-counter').addClass('orange');
-                                }
-                                if(textlen > 420) {
-                                        $('#character-counter').removeClass('grey');
-                                        $('#character-counter').removeClass('orange');
-                                        $('#character-counter').addClass('red');
-                                }
-                                $('#character-counter').text(textlen);
-                        });
-                        ed.onInit.add(function(ed) {
-                                ed.pasteAsPlainText = true;
-                                $("#profile-jot-text-loading").hide();
-                                $("#profile-jot-submit-wrapper").show();
-                                $("#profile-upload-wrapper").show();
-                                $("#profile-attach-wrapper").show();
-                                $("#profile-link-wrapper").show();
-                                $("#profile-youtube-wrapper").show();
-                                $("#profile-video-wrapper").show();
-                                $("#profile-audio-wrapper").show();
-                                $("#profile-location-wrapper").show();
-                                $("#profile-nolocation-wrapper").show();
-                                $("#profile-title-wrapper").show();
-                                $("#profile-jot-plugin-wrapper").show();
-                                $("#character-counter").show();
-                                if (typeof cb!="undefined") cb();
-                        });
-                }
-        });
-        editor = true;
-        // setup acl popup
-        $("a#jot-perms-icon").fancybox({
-            'transitionIn' : 'none',
-            'transitionOut' : 'none'
-        }); 
-    } else {
-        if (typeof cb!="undefined") cb();
-    }
-} // initEditor
-</script>
-<script type="text/javascript" src="js/ajaxupload.js" ></script>
-<script>
-    var ispublic = '$ispublic';
-	$(document).ready(function() {
-                /* enable tinymce on focus */
-                $("#profile-jot-text").focus(function(){
-                    if (editor) return;
-                    $(this).val("");
-                    initEditor();
-                }); 
-
-		$("#jot-title").mouseout(function() {
-			$("#jot-title").hide();
-			var ttl = $("#jot-title").val();
-			$('#jot-title-display').html(ttl);
-			if(ttl.length) {
-				$("#jot-title-display").show();
-			}
-			else {
-				$("#jot-title-desc").show();
+function initEditor(cb){
+	if (editor==false){
+		$("#profile-jot-text-loading").show();
+		if(plaintext == 'none') {
+			$("#profile-jot-text-loading").hide();
+			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+			editor = true;
+			$("a#jot-perms-icon").fancybox({
+				'transitionIn' : 'elastic',
+				'transitionOut' : 'elastic'
+			});
+			$(".jothidden").show();
+			if (typeof cb!="undefined") {
+                cb();
+            }
+			return;
+		}	
+		tinyMCE.init({
+			theme : "advanced",
+            skin : "default",
+			mode : "specific_textareas",
+			editor_selector: $editselect,
+			auto_focus: "profile-jot-text",
+			plugins : "bbcode,paste,fullscreen,autoresize",
+			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
+			theme_advanced_buttons2 : "",
+			theme_advanced_buttons3 : "",
+			theme_advanced_toolbar_location : "top",
+			theme_advanced_toolbar_align : "center",
+			theme_advanced_blockformats : "blockquote,code",
+			paste_text_sticky : true,
+			entity_encoding : "raw",
+			add_unload_trigger : false,
+			remove_linebreaks : false,
+			force_p_newlines : false,
+			force_br_newlines : true,
+			forced_root_block : '',
+			convert_urls: false,
+			content_css: "$baseurl/view/custom_tinymce.css",
+			theme_advanced_path : false,
+			setup : function(ed) {
+				cPopup = null;
+				ed.onKeyDown.add(function(ed,e) {
+					if(cPopup !== null) {
+						cPopup.onkey(e);
+                    }
+				});
+
+				ed.onKeyUp.add(function(ed, e) {
+					var txt = tinyMCE.activeEditor.getContent();
+					match = txt.match(/@([^ \n]+)$/);
+					if(match!==null) {
+						if(cPopup === null) {
+							cPopup = new ACPopup(this,baseurl+"/acl");
+						}
+						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
+						if(! cPopup.ready) { cPopup = null; }
+					}
+					else {
+						if(cPopup !== null) { cPopup.close(); cPopup = null; }
+					}
+
+					textlen = txt.length;
+					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+						$('#profile-jot-desc').html(ispublic);
+					}
+					else {
+						$('#profile-jot-desc').html('&#160;');
+					}	 
+
+				 //Character count
+
+					if(textlen <= 140) {
+						$('#character-counter').removeClass('red');
+						$('#character-counter').removeClass('orange');
+						$('#character-counter').addClass('grey');
+					}
+					if((textlen > 140) && (textlen <= 420)) {
+						$('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('red');
+						$('#character-counter').addClass('orange');
+					}
+					if(textlen > 420) {
+						$('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('orange');
+						$('#character-counter').addClass('red');
+					}
+					$('#character-counter').text(textlen);
+				});
+
+				ed.onInit.add(function(ed) {
+					ed.pasteAsPlainText = true;
+					$("#profile-jot-text-loading").hide();
+					$(".jothidden").show();
+					if (typeof cb!="undefined") cb();
+				});
 			}
 		});
+		editor = true;
+		// setup acl popup
+		$("a#jot-perms-icon").fancybox({
+			'transitionIn' : 'elastic',
+			'transitionOut' : 'elastic'
+		}); 
+	} else {
+		if (typeof cb!="undefined") cb();
+	}
+}
+
+function enableOnUser(){
+	if (editor) return;
+	$(this).val("");
+	initEditor();
+}
 
-		$("#jot-title-display").hover(function() {
-			$("#jot-title-display").hide();
-			$("#jot-title").show();
-			$("#jot-title").focus();
-		});		
+</script>
+<script type="text/javascript" src="$baseurl/js/ajaxupload.js" ></script>
+<script>
+	var ispublic = '$ispublic';
+	var addtitle = '$addtitle';
 
-		$("#jot-title-desc").click(function() {
-			$("#jot-title-desc").hide();
-			$("#jot-title").show();
-			$("#jot-title").focus();
-		});		
+	$(document).ready(function() {
+		
+		/* enable tinymce on focus and click */
+		$("#profile-jot-text").focus(enableOnUser);
+		$("#profile-jot-text").click(enableOnUser);
 
 		var uploader = new window.AjaxUpload(
 			'wall-image-upload',
@@ -174,22 +154,8 @@ function initEditor(cb) {
 					$('#profile-rotator').hide();
 				}				 
 			}
-		);		
-		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $(this).text();
-				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$('#jot-public').hide();
-				$('.profile-jot-net input').attr('disabled', 'disabled');
-			});
-			if(selstr == null) { 
-				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$('#jot-public').show();
-				$('.profile-jot-net input').attr('disabled', false);
-			}
+		);
 
-		}).trigger('change');
 
 	});
 
@@ -223,13 +189,6 @@ function initEditor(cb) {
 		}
 	}
 
-	function jotGetVideo() {
-		reply = prompt("$utubeurl");
-		if(reply && reply.length) {
-			addeditortext('[youtube]' + reply + '[/youtube]');
-		}
-	}
-
 	function jotVideoURL() {
 		reply = prompt("$vidurl");
 		if(reply && reply.length) {
@@ -252,22 +211,18 @@ function initEditor(cb) {
 		}
 	}
 
-	function jotTitle() {
-		reply = prompt("$title", $('#jot-title').val());
-		if(reply && reply.length) {
-			$('#jot-title').val(reply);
-		}
-	}
-
 	function jotShare(id) {
+		if ($('#jot-popup').length != 0) $('#jot-popup').show();
+
 		$('#like-rotator-' + id).show();
 		$.get('share/' + id, function(data) {
-				if (!editor) $("#profile-jot-text").val("");
-				initEditor(function(){
-					addeditortext(data);
-					$('#like-rotator-' + id).hide();
-					$(window).scrollTop(0);
-				});
+			if (!editor) $("#profile-jot-text").val("");
+			initEditor(function(){
+				addeditortext(data);
+				$('#like-rotator-' + id).hide();
+				$(window).scrollTop(0);
+			});
+
 		});
 	}
 
@@ -294,19 +249,36 @@ function initEditor(cb) {
 		}
 	}
 
+	function itemTag(id) {
+		reply = prompt("$term");
+		if(reply && reply.length) {
+			reply = reply.replace('#','');
+			if(reply.length) {
+
+				commentBusy = true;
+				$('body').css('cursor', 'wait');
+
+				$.get('tagger/' + id + '?term=' + reply);
+				if(timer) clearTimeout(timer);
+				timer = setTimeout(NavUpdate,3000);
+				liking = 1;
+			}
+		}
+	}
+
 	function jotClearLocation() {
 		$('#jot-coord').val('');
 		$('#profile-nolocation-wrapper').hide();
 	}
 
-  function addeditortext(data) {
-        if(plaintext == 'none') {
-            var currentText = $("#profile-jot-text").val();
-            $("#profile-jot-text").val(currentText + data);
-        }
-        else
-            tinyMCE.execCommand('mceInsertRawHTML',false,data);
-    }
+	function addeditortext(data) {
+		if(plaintext == 'none') {
+			var currentText = $("#profile-jot-text").val();
+			$("#profile-jot-text").val(currentText + data);
+		}
+		else
+			tinyMCE.execCommand('mceInsertRawHTML',false,data);
+	}	
 
 	$geotag
 
diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl
old mode 100755
new mode 100644
index c312d221a..7e0f9efa4
--- a/view/theme/dispy/jot.tpl
+++ b/view/theme/dispy/jot.tpl
@@ -1,14 +1,9 @@
+<form id="profile-jot-form" action="$action" method="post">
+	<div id="jot">
+		<div id="profile-jot-desc" class="jothidden">&#160;</div>
+		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" />
+		<div id="character-counter" class="grey jothidden"></div>
 
-<div id="profile-jot-wrapper" > 
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey" style="display: none;">0</div>
-		<div id="profile-rotator-wrapper" style="display: $visitor;" >
-			<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display:none;"  />
-		</div> 		
-	</div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
 		<input type="hidden" name="type" value="$ptyp" />
 		<input type="hidden" name="profile_uid" value="$profile_uid" />
 		<input type="hidden" name="return" value="$return_path" />
@@ -16,60 +11,47 @@
 		<input type="hidden" name="coord" id="jot-coord" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<div id="jot-title-wrapper">
-		<span id="jot-title-desc" style="display: none;">$addtitle</span>
-		<span id="jot-title-display" style="display: none;"></span>
-		<input type="text" name="title" id="jot-title" value="" style="display: none;" />
-		</div>
-
-                <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-                <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-
-
-<div id="profile-jot-submit-wrapper" style="display:none">
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" >
-            <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang</div>
-	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-</div>
 
-	<div id="profile-upload-wrapper" class="jot-tool" style="display: none;" >
-		<div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="$upload"></a></div>
-	</div>
-	<div id="profile-attach-wrapper" class="jot-tool" style="display: none;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon border attach" title="$attach"></a></div>
-	</div>  
-	<div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="icon border  link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-video" class="icon border  video" title="$video" onclick="jotVideoURL(); return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-audio" class="icon border  audio" title="$audio" onclick="jotAudioURL(); return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-location" class="icon border  globe" title="$setloc" onclick="jotGetLocation(); return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-nolocation" class="icon border  noglobe" title="$noloc" onclick="jotClearLocation(); return false;"></a>
-	</div> 
-
-	<div id="profile-jot-plugin-wrapper" style="display: none;">
-  	$jotplugins
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
+
+		<div id="jot-tools" class="jothidden" style="display:none">
+			<span class="icon border camera"><a href="#" onclick="return false;" id="wall-image-upload" title="$upload"></a></span>
+			<span class="icon border attach"><a href="#" onclick="return false;" id="wall-file-upload" title="$attach"></a></span>
+			<span class="icon border link"><a id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a></span>
+			<span class="icon border video"><a id="profile-video" onclick="jotVideoURL();return false;" title="$gvideo"></a></span>
+			<span class="icon border audio"><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio"></a></span>
+			<span class="icon border globe"><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc"></a></span>
+			<span class="icon border noglobe"><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc"></a></span>
+			$jotplugins
+			<ul id="profile-jot-submit-wrapper">
+				<li>
+					<a class="icon-text-preview pointer"></a><a id="jot-preview-link" class="pointer" onclick="preview_post(); return false;" title="$preview">$preview</a>
+				</li>
+
+				<li id="profile-jot-perms" class="profile-jot-perms">
+					<a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon $lockstate $bang" title="$permset"></a>
+				</li>
+
+				<li><input type="submit" id="profile-jot-submit" name="submit" value="$share" /></li>
+
+			</ul>
+			<span id="profile-rotator" class="loading" style="display: none">
+				<img src="images/rotator.gif" alt="$wait" title="$wait" /></span>
+		</div>
 	</div>
-	<div id="profile-jot-tools-end"></div>
 	
-        <div style="display: none;">
-            <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-                $acl
-                <hr style="clear:both"/>
-                <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-                <div id="profile-jot-email-end"></div>
-                $jotnets
-            </div>
-        </div>
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			$acl
+			<hr style="clear:both"/>
+			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
+			<div id="profile-jot-email-end"></div>
+			$jotnets
+		</div>
+	</div>
 
-<div id="profile-jot-end"></div>
 </form>
-</div>
-                {{ if $content }}<script>initEditor();</script>{{ endif }}
+
+{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/dispy/mail_head.tpl b/view/theme/dispy/mail_head.tpl
old mode 100755
new mode 100644
index 89615cbd0..d49d7c1af
--- a/view/theme/dispy/mail_head.tpl
+++ b/view/theme/dispy/mail_head.tpl
@@ -1,7 +1,5 @@
 <h3>$messages</h3>
 
-<ul class="tabs-wrapper">
-<li><a href="message" class="tabs">$inbox</a></li>
-<li><a href="message/sent" class="tabs">$outbox</a></li>
-<li><a href="message/new" class="tabs">$new</a></li>
-</ul>
+<div class="tabs-wrapper">
+$tab_content
+</div>
diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl
old mode 100755
new mode 100644
index 79852217f..67a263519
--- a/view/theme/dispy/nav.tpl
+++ b/view/theme/dispy/nav.tpl
@@ -1,57 +1,116 @@
 <nav>
-  $langselector
-
-  <span id="banner">$banner</span>
-
-  {{ if $nav.help }}<a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a>{{ endif }}
-  {{ if $nav.login }}<a id="nav-login-link" class="nav-link $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a> {{ endif }}
-  <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a>
-  <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a>
-
-  <div id="user-menu" >
-	  <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
-      
-      <ul id="user-menu-popup" 
-           onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')" 
-           onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
-
-
-		  {{ if $nav.register }}<li><a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0"  title="$nav.register.1">$nav.register.1</a></li>{{ endif }}
-	      
-	      {{ if $nav.home }}<li><a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0">$nav.home.1</a></li>{{ endif }}
-	
-	      {{ if $nav.network }}<li><a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0">$nav.network.1</a></li>{{ endif }}
-	
-              {{ if $nav.community }}
-              <li><a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
-              {{ endif }}
-	
-	      {{ if $nav.notifications }}<li><a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0">$nav.notifications.1</a></li>{{ endif }}
-	      {{ if $nav.messages }}<li><a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0">$nav.messages.1</a></li>{{ endif }}
-	      {{ if $nav.contacts }}<li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0">$nav.contacts.1</a></li>{{ endif }}
-	
-	      {{ if $nav.profiles }}<li><a id="nav-profiles-link" class="nav-commlink nav-sep $nav.profiles.2" href="$nav.profiles.0">$nav.profiles.1</a></li>{{ endif }}
-	      {{ if $nav.settings }}<li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0">$nav.settings.1</a></li>{{ endif }}
-	      
-	      {{ if $nav.manage }}<li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0">$nav.manage.1</a></li>{{ endif }}
-	
-		  {{ if $nav.admin }}<li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0">$nav.admin.1</a></li>{{ endif }}
-	
-
-	      {{ if $nav.logout }}<li><a id="nav-logout-link" class="nav-commlink nav-sep $nav.logout.2" href="$nav.logout.0">$nav.logout.1</a></li> {{ endif }}
-      </ul>
-
-	  <div id="notifications">
-      {{ if $nav.network }}<a id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
-      {{ if $nav.home }}<a id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
-      {{ if $nav.notifications }}<a id="notify-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }}
-      {{ if $nav.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
-	  </div>
-
-  </div>
-
-
-  {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a>{{ endif }}
+$langselector
+
+<span id="banner">$banner</span>
+
+<!-- yes, they're going the other way. seems that's how the template renderer
+works -->
+
+    <div id="nav-floater">
+    <div id="nav-buttons">
+    {{ if $nav.help }}
+    <a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a>
+    {{ endif }}
+    {{ if $nav.apps }}
+    <a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a>
+    {{ endif }}
+    <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a>
+    <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a>
+    {{ if $nav.messages }}
+    <a id="nav-messages-link" class="nav-link $nav.messages.2"
+    href="$nav.messages.0" title="$nav.messages.1">$nav.messages.1</a>
+    {{ endif }}
+    {{ if $nav.notifications }}
+    <a id="nav-notifications-linkmenu" class="nav-link $nav.notifications.2" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
+    <ul id="nav-notifications-menu" class="menu-popup">
+        <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+        <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
+        <li class="empty">$emptynotifications</li>
+    </ul>
+    {{ endif }}
+    {{ if $nav.community }}
+    <a id="nav-community-link" class="nav-link $nav.community.2"
+    href="$nav.community.0" title="$nav.community.1">$nav.community.1</a>
+    {{ endif }}
+    {{ if $nav.network }}
+    <a id="nav-network-link" class="nav-link $nav.network.2"
+    href="$nav.network.0" title="$nav.network.1">$nav.network.1</a>
+    {{ endif }}
+    {{ if $nav.home }}
+    <a id="nav-home-link" class="nav-link $nav.home.2"
+    href="$nav.home.0" title="$nav.home.1">$nav.home.1</a>
+    {{ endif }}
+    {{ if $nav.login }}
+    <a id="nav-login-link" class="nav-login-link $nav.login.2"
+    href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
+    {{ endif }}
+    </div>
+
+    <div id="user-menu">
+        <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
+        <ul id="user-menu-popup"
+            onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
+            onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
+
+        {{ if $nav.register }}
+        <li>
+        <a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.1"></a>
+        </li>
+        {{ endif }}
+
+{{ if $userinfo }}
+        <ul id="nav-user-menu" class="menu-popup">
+            {{ for $nav.usermenu as $usermenu }}
+                <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
+            {{ endfor }}
+        </ul>
+{{ endif }}
+
+        {{ if $nav.contacts }}
+        <li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.1">$nav.contacts.1</a></li>
+        {{ endif }}
+        {{ if $nav.profiles }}
+        <li><a id="nav-profiles-link" class="nav-commlink $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.1">$nav.profiles.1</a></li>
+        {{ endif }}
+        {{ if $nav.settings }}
+        <li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0" title="$nav.settings.1">$nav.settings.1</a></li>
+        {{ endif }}
+        {{ if $nav.manage }}
+        <li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.1">$nav.manage.1</a></li>
+        {{ endif }}
+        {{ if $nav.admin }}
+        <li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0" title="$nav.admin.1">$nav.admin.1</a></li>
+        {{ endif }}
+
+        {{ if $nav.login }}
+        <li><a id="nav-login-link" class="nav-commlink $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li>
+        {{ endif }}
+
+        {{ if $nav.logout }}
+        <li><a id="nav-logout-link" class="nav-commlink $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>
+        {{ endif }}
+        </ul>
+    </div>
+
+    <div id="notifications">
+        {{ if $nav.home }}
+        <a id="home-update" class="nav-ajax-left" href="$nav.home.0" title="$nav.home.1"></a>
+        {{ endif }}
+        {{ if $nav.network }}
+        <a id="net-update" class="nav-ajax-left" href="$nav.network.0" title="$nav.network.1"></a>
+        {{ endif }}
+        {{ if $nav.notifications }}
+        <a id="notify-update" class="nav-ajax-left" href="$nav.notifications.0" title="$nav.notifications.1"></a>
+        {{ endif }}
+        {{ if $nav.messages }}
+        <a id="mail-update" class="nav-ajax-left" href="$nav.messages.0" title="$nav.messages.1"></a>
+        {{ endif }}
+    </div>
+</div>
+    <a href="#" class="floaterflip"></a>
 </nav>
 
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
 
diff --git a/view/theme/dispy/profile_vcard.tpl b/view/theme/dispy/profile_vcard.tpl
old mode 100755
new mode 100644
index b3f5cc50d..0c289d982
--- a/view/theme/dispy/profile_vcard.tpl
+++ b/view/theme/dispy/profile_vcard.tpl
@@ -2,34 +2,53 @@
 
 	<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="175" height="175" src="$profile.photo" alt="$profile.name"></div>
-
-
+	{{ if $pdesc }}
+    <div class="title">$profile.pdesc</div>
+    {{ endif }}
+	<div id="profile-photo-wrapper">
+    <img class="photo" width="175" height="175" 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>
+		<div class="location">
+        <span class="location-label">$location</span>
+		<div class="adr">
+			{{ if $profile.address }}
+            <div class="street-address">$profile.address</div>{{ endif }}
+			<span class="city-state-zip">$profile.zip</span>
+            <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+            <span class="region">$profile.region</span>
+            <span class="postal-code">$profile.postal-code</span>
 			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-		</dd>
-		</dl>
+		</div>
+		</div>
 	{{ endif }}
 
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
+	{{ if $gender }}
+    <div class="mf">
+        <span class="gender-label">$gender</span>
+        <span class="x-gender">$profile.gender</span>
+    </div>
+    {{ endif }}
 	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ 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 $marital }}
+    <div class="marital">
+    <span class="marital-label">
+    <span class="heart">&hearts;</span>$marital</span>
+    <span class="marital-text">$profile.marital</span>
+    </div>
+    {{ 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 }}
+	{{ if $homepage }}
+    <div class="homepage">
+    <span class="homepage-label">$homepage</span>
+    <span class="homepage-url"><a href="$profile.homepage"
+    target="external-link">$profile.homepage</a></span>
+    </div>{{ endif }}
 
 	{{ inc diaspora_vcard.tpl }}{{ endinc }}
 	
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
old mode 100755
new mode 100644
index 7f563293a..f0929094c
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -1,74 +1,233 @@
-body {
-	margin: 0px;
-	padding: 0px;
-	font-family: freesans,helvetica,arial,clean,sans-serif;
-	font-size: 16px;
-}
-img {  border: 0 none; }
+/*
+ * dispy
+ *
+ * modernised, sort of, by simon <http://simon.kisikew.org/>
+ *
+ */
 
-a { color: #3465a4; text-decoration: none; margin-bottom:1px;}
-a:hover { color: #729fcf; padding-bottom: 0px; border-bottom: 1px dotted #729fcf;}
+/* from html5boilerplate */
 
+/* these are to tell browsers they should be displayed a certain way */
+article, aside, details, figcaption, figure, footer,
+header, hgroup, nav, section {
+    display: block;
+}
+audio, canvas, video, time {
+    display: inline-block;
+    *display: inline;
+    *zoom: 1;
+}
+audio:not([controls]) {
+    display: none;
+}
+[hidden] {
+    display: none;
+}
 
-.required { display: inline; color: #ff0000;}
-.fakelink { color: #3465a4; cursor: pointer; }
-.fakelink :hover{ color: #729fcf; }
+/* =============================================================================
+   Base
+   ========================================================================== */
 
+/*
+ * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units
+ * 2. Force vertical scrollbar in non-IE
+ * 3. Prevent iOS text size adjust on device orientation change, without disabling user zoom: h5bp.com/g
+ */
+
+html {
+    font-size: 100%;
+    overflow-y: scroll;
+    -webkit-text-size-adjust: 100%;
+    -ms-text-size-adjust: 100%;
+}
+body {
+    margin: 0;
+    font-size: 16px;
+    line-height: 1.1em;
+}
+
+body, button, input, select, textarea {
+    font-family: sans-serif;
+    color: #222;
+    background-color: rgb(254,254,254);
+    background-color: rgba(254,254,254,255);
+}
+/* remember to define focus styles! */
+:focus {
+    outline: 0;
+}
+
+/* remember to highlight inserts somehow! */
+ins {
+    background-color: #ff9;
+    color: #000;
+    text-decoration: none;
+}
+mark {
+    background-color: #ff9;
+    color: #000;
+    font-style: italic;
+    font-weight: bold;
+}
+ins {
+    background: #ff9;
+    color: #000;
+    text-decoration: none;
+}
+mark {
+    background: #ff0;
+    color: #000;
+    font-style: italic;
+    font-weight: bold;
+}
+/* Redeclare monospace font family: h5bp.com/j */
+pre, code, kbd, samp {
+    font-family: monospace, monospace;
+    _font-family: 'courier new', monospace;
+    font-size: 1em; }
+
+/* Improve readability of pre-formatted text in all browsers */
+pre {
+    white-space: pre;
+    white-space: pre-wrap;
+    word-wrap: break-word;
+}
+q {
+    quotes: none;
+}
+q:before, q:after {
+    content: "";
+    content: none;
+}
+small {
+    font-size: 85%;
+}
+
+/* Position subscript and superscript content without affecting line-height: h5bp.com/k */
+sub, sup {
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+    vertical-align: baseline;
+}
+sup {
+    top: -0.5em;
+}
+sub {
+    bottom: -0.25em;
+}
+img {
+    border: 0 none;
+    /*vertical-align: middle;*/
+}
+a {
+    color: #3465a4;
+    text-decoration: none;
+    margin-bottom: 1px;
+}
+a:hover img {
+    text-decoration: none;
+}
+blockquote {
+    background: #eee;
+    text-indent: 5px;
+    padding: 5px;
+    border: 1px #aaa solid;
+    border-radius: 5px;
+}
+a:hover {
+    color: #729fcf;
+    padding-bottom: 0;
+    border-bottom: 1px dotted #729fcf;
+}
+.required {
+    display: inline;
+    color: #ff0000;
+}
+.fakelink, .lockview {
+    color: #3465a4;
+    cursor: pointer;
+}
+.fakelink:hover {
+    color: #729fcf;
+}
 input[type=submit] {
-	margin-top: 20px;
-	height: 22px;
-	background-color: #555753;
-	color: #eeeeec;
-	-webkit-border-radius: 5px ;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	border: 0px;	
+    margin-top: 20px;
+    height: 22px;
+    background-color: #555753;
+    color: #eeeeec;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    border: 0;
+}
+.smalltext {
+    font-size: 0.7em;
 }
-
-.smalltext { font-size: 0.7em }
-
 #panel {
 	position: absolute;
-	font-size:0.8em;
-	-webkit-border-radius: 5px ;
+	font-size: 0.8em;
+	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	border-radius: 5px;
-	border: 1px solid #ffffff;
+	border: 1px solid #fff;
 	background-color: #2e3436;
 	color: #eeeeec;
-	padding:1em;
+	padding: 1em;
 }
-
 .pager {
 	padding-top: 30px;
-	display:block;
+	display: block;
 	clear: both;
 	text-align: center;
 }
+.pager span {
+    padding: 4px;
+    margin:4px;
+}
+.pager_current {
+    background-color: #729fcf;
+    color: #fff;
+}
 
-.pager span { padding: 4px; margin:4px; }
-.pager_current { background-color: #729fcf; color: #ffffff; }
+/**
+ * global
+ */
+/* .tool .action */
+.action {
+    float: right;
+}
 
 /**
  * 	login
  */
-#login-extra-links a { margin-right: 20px; }
+#login-extra-links a {
+    margin-right: 20px;
+}
 
 /*********
 * nav
 *********/
-
 nav {
-	height: 50px;
+	height: 60px;
 	display: block;
 	background-color: #2e3436;
 	color: #eeeeec;
 	position: relative;
-	padding: 0px 10%;
+	padding: 20px 20px 10px 95px;
+    margin-left: auto;
+    margin-right: auto;
+}
+nav a {
+	text-decoration: none;
+	color: #eeeeec;
+	border: 0px;
+}
+nav a:hover {
+	text-decoration: none;
+	color: #eeeeec;
+    border: 0px;
 }
-nav a { text-decoration: none;	color: #eeeeec; border:0px;}
-nav a:hover { text-decoration: none;	color: #eeeeec; border:0px;}
-
 nav #banner {
 	display: block;
 	position: absolute;
@@ -79,23 +238,18 @@ nav #banner #logo-text a {
 	font-weight: bold;
 	margin-left: 3px;
 }
-
 nav #user-menu {
     display: block;	
-	width: auto;
+    width: auto;
     float: right;
-    margin-top: 22px;
-    margin-right: 10px;
+    margin: 3px 68px 0 0;
     position: relative;
-    vertical-align: middle;
-
 	background-color: #555753;
-
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;
-    
     background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
+    clear: both;
 }
 nav #user-menu-label {
 	float: left;
@@ -103,63 +257,219 @@ nav #user-menu-label {
     padding: 3px 20px 9px 5px;
     height: 10px;
 }
-
 ul#user-menu-popup {
-    display: none;
-    position: absolute;
-    background-color: #555753;
-    width: 100%;
+	display: none;
+	position: absolute;
+	background-color: #555753;
+	width: 100%;
     padding: 10px 0px;
     margin: 0px;
-    top: 20px;
-	left: 0px;
-
-    -webkit-border-radius: 0px 0px 5px 5px;
-    -moz-border-radius: 0px 0px 5px 5px;    
-    border-radius: 0px 0px 5px 5px;
-    
-    z-index: 10000;
+	top: 20px;
+	left: 0;
+	-webkit-border-radius: 0 0 5px 5px;
+	-moz-border-radius: 0 0 5px 5px;
+	border-radius: 0 0 5px 5px;
+	z-index: 10000;
+}
+ul#user-menu-popup li {
+	display: block;
+}
+ul#user-menu-popup li a {
+	display: block;
+	padding: 5px;
+}
+ul#user-menu-popup li a:hover {
+	color: #2e3436;
+	background-color: #eeeeec;
+}
+ul#user-menu-popup li a.nav-sep {
+	border-top: 1px solid #eeeeec;
+}
+#nav-buttons {
+    clear: both;
 }
-
-ul#user-menu-popup li { display: block; }
-ul#user-menu-popup li a { display: block; padding: 5px; }
-ul#user-menu-popup li a:hover { color: #2e3436; background-color: #eeeeec; }
-ul#user-menu-popup li a.nav-sep { border-top: 1px solid #eeeeec; }
 nav .nav-link {
-    float: right;
-    display: block;
-    width: 22px;
-    height: 22px;
-    /*border: 1px solid #eeeeec;*/
-    overflow: hidden;
-    margin-top: 22px;
-    margin-right: 10px;
-    text-indent: 50px;
-    background: transparent url('icons.png') 0px 0px no-repeat; 
+	float: right;
+	display: block;
+	width: 22px;
+	height: 22px;
+	overflow: hidden;
+	margin: 0px 5px 5px;
+	text-indent: 50px;
+	background: transparent url(icons.png) 0 0 no-repeat;
+}
+#nav-apps-link {
+	background-position: 0 -66px;
+}
+#nav-apps-link:hover {
+	background-position: -22px -66px;
+}
+#nav-community-link {
+    background-position: 0 -22px;
+}
+#nav-community-link:hover {
+    background-position: -22px -22px;
+}
+#nav-contacts-link {
+    background-position: 0 -22px;
+}
+#nav-contacts-link:hover {
+    background-position: -22px -22px;
+}
+#nav-directory-link {
+	background-position: -44px -154px;
+}
+#nav-directory-link:hover {
+	background-position: -66px -154px;
+}
+#nav-help-link {
+	background-position: 0 -110px;
+}
+#nav-help-link:hover {
+	background-position: -22px -110px;
+}
+#nav-home-link {
+    background-position: -44px -132px;
+}
+#nav-home-link:hover {
+    background-position: -66px -132px;
+}
+#nav-login-link {
+	background-position: 0 -88px;
+}
+#nav-login-link:hover {
+	background-position: -22px -88px;
+}
+#nav-logout-link {
+	background-position: 0 -88px;
+}
+#nav-logout-link:hover {
+	background-position: -22px -88px;
+}
+#nav-messages-link {
+    background-position: -44px -88px;
+}
+#nav-messages-link:hover {
+    background-position: -66px -88px;
+}
+#nav-notify-link, #nav-notifications-linkmenu {
+    background-position: -44px -110px;
+}
+#nav-notify-link:hover {
+    background-position: -66px -110px;
+}
+#nav-network-link {
+    background-position: 0px -177px;
+}
+#nav-network-link:hover {
+    background-position: -22px -177px;
+}
+#nav-search-link {
+	background-position: 0 -44px;
+}
+#nav-search-link:hover {
+	background-position: -22px -44px;
+}
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#profile-attach-wrapper,
+#profile-audio,
+#profile-link,
+#profile-location,
+#profile-nolocation,
+#profile-title,
+#jot-title,
+#profile-upload-wrapper,
+#profile-video,
+#profile-jot-submit,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.icon, .hover, .focus, .pointer {
+    cursor: pointer;
 }
-
-#nav-directory-link 		{ background-position: 0px -22px }
-#nav-directory-link:hover	{ background-position: -22px -22px;}
-#nav-search-link 			{ background-position: 0px -44px }
-#nav-search-link:hover 		{ background-position: -22px -44px;}
-#nav-apps-link 				{ background-position: 0px -66px }
-#nav-apps-link:hover		{ background-position: -22px -66px;}
-#nav-login-link 			{ background-position: 0px -88px }
-#nav-login-link:hover 		{ background-position: -22px -88px;}
-#nav-help-link 				{ background-position: 0px -110px }
-#nav-help-link:hover 		{ background-position: -22px -110px;}
-
-
 #notifications {
-	height: 20px; width: 100%;
+	height: 20px;
+	width: 100%;
 	position: absolute;
-	top:-19px; left: 0px;
+	top: -19px;
+	left: 0;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+    background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+    color: #ffffff;
+    padding-left: 58px;
+}
+div.jGrowl div.info {
+    background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+    color: #ffffff;
+    padding-left: 58px;
+}
+#nav-notifications-menu {
+    margin-top: 30px;
+    width: 255px;
+    max-height: 400px;
+    overflow: auto;
+    font-size: 9pt;
+}
+#nav-notifications-menu .contactname {
+    font-weight: bold;
+    font-size: 0.9em;
+}
+#nav-notifications-menu img {
+    float: left;
+    margin-right: 5px;
+}
+#nav-notifications-menu .notif-when {
+    font-size: 0.8em;
+    display: block;
+}
+#nav-notifications-menu li {
+    padding: 7px 0px 7px 10px;
+    word-wrap: normal;
+    border-bottom: 1px solid #000;
+}
+#nav-notifications-menu li:hover {
+    color: black;
 }
-.nav-ajax-update {
+#nav-notifications-menu a:hover {
+    color: black;
+    text-decoration: underline;
+}
+nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
+  background-image: url("../../../images/icons/22/notify_on.png");
+}
+.show {
+    display: block;
+}
+#nav-floater {
+    position: fixed;
+    top: 20px;
+    right: 1%;
+    padding: 5px;
+    background: #2e3436;
+    border-radius: 5px;
+    z-index: 100;
+}
+.floaterflip {
+	display: block;
+    position: fixed;
+    z-index: 110;
+    top: 53px;
+    right: 19px;
+	width: 22px;
+	height: 22px;
+	overflow: hidden;
+	margin: 0px;
+	background: transparent url(icons.png) -190px -60px no-repeat;
+}
+.nav-ajax-update, .nav-ajax-left {
 	width: 30px;
 	height: 19px;
-	background: transparent url('notifications.png') 0px 0px no-repeat; 
-	color: #ffffff;
+	background: transparent url(notifications.png) 0 0 no-repeat;
+	color: #fff;
 	font-weight: bold;
 	font-size: 0.8em;
 	padding-top: 0.2em;
@@ -168,312 +478,666 @@ nav .nav-link {
 	margin-right: -4px;
     display: none;
 }
-#net-update { background-position: 0px 0px; }
-#mail-update { background-position: -30px 0px; }
-#notify-update { background-position: -60px 0px; }
-#home-update { background-position: -90px 0px; }
-
+.nav-ajax-update.show, .nav-ajax-left.show {
+    display: block;
+}
+#net-update {
+	background-position: 0px 0px;
+}
+#mail-update {
+	background-position: -30px 0;
+}
+#notify-update {
+	background-position: -60px 0px;
+}
+#home-update {
+	background-position: -90px 0px;
+}
 #lang-select-icon {
 	cursor: pointer;
 	position: absolute;
-	left: 0px;
-	top: 0px;
+	left: 0;
+	top: 0;
 }
-
 #language-selector {
-	position: absolute;
-	top: 0;
-	left: 16px;
+    position: absolute;
+    top: 0;
+    left: 16px;
+    padding-right: 50px;
+}
+.menu-popup {
+    position: absolute;
+    display: none;
+    width: 11em;
+    background: #ffffff;
+    color: #2d2d2d;
+    margin: 0px;
+    padding: 0px;
+    list-style: none;
+    border: 3px solid #364e59;
+    z-index: 100000;
+    -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+    -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+    box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.menu-popup a {
+    display: block;
+    color: #2d2d2d;
+    padding: 5px 10px;
+    text-decoration: none;
+}
+.menu-popup a:hover {
+    background-color: #bdcdd4;
+}
+.menu-popup .menu-sep {
+    border-top: 1px solid #9eabb0;
+}
+.menu-popup li {
+    float: none;
+    overflow: auto;
+    height: auto;
+    display: block;
+}
+.menu-popup li img {
+    float: left;
+    width: 16px;
+    height: 16px;
+    padding-right: 5px;
+}
+.menu-popup .empty {
+    padding: 5px;
+    text-align: center;
+    color: #9eabb0;
+}
+.notif-item {
+    font-size: small;
+}
+.notif-item a {
+    vertical-align: middle;
+}
+.notif-image {
+    width: 32px;
+    height: 32px;
+    padding: 7px 7px 0px 0px;
+}
+.notify-seen {
+    background: #ddd;
 }
-
 
 /** sysmsg **/
-#sysmsg_info{
-	position:fixed; 
-	bottom: 0px; right:20%; 
-	-moz-box-shadow: 0px 0px 5px #888;
-	-webkit-box-shadow: 0px 0px 5px #888;
-	box-shadow: 0px 0px 5px #888;
-	padding: 10px; 
-	background-color: #fcaf3e; border:2px solid #f8911b;
-	border-bottom:0px;
-	padding-bottom: 50px;	
-	z-index: 1000;
-}
-#sysmsg { 
-	position:fixed; 
-	bottom: 0px; right:10%; 
-	-moz-box-shadow: 0px 0px 5px #888;
-	-webkit-box-shadow: 0px 0px 5px #888;
-	box-shadow: 0px 0px 5px #888;
-	padding: 10px; 
-	background-color: #fcaf3e; border:2px solid #f8911b;
-	border-bottom:0px;
-	padding-bottom: 50px;	
-	z-index: 1000;
+#sysmsg_info {
+	position:fixed;
+	bottom:0;
+	-moz-box-shadow:0 0 5px #888;
+	-webkit-box-shadow:0 0 5px #888;
+	box-shadow:0 0 5px #888;
+    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:0 0 5px #888;
+	-webkit-box-shadow:0 0 5px #888;
+	box-shadow:0 0 5px #888;
+    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 #ccccce;
+	border-top:1px solid #ccccce;
 }
 
 
-
 /**
 * aside
 **/
-
 aside {
     position: absolute;
-    right: 11%;
-    width: 200px;
-    font-size: 0.7em;
-
+    right: 8%;
+    width: 20.5%;
+    font-size: smaller;
+}
+.vcard .fn {
+	font-size: 1.7em;
+	font-weight: 700;
+	border-bottom: 1px solid #729fcf;
+	padding-top: 1px;
+}
+.vcard #profile-photo-wrapper {
+	margin: 10px 0px;
+}
+aside h4 {
+	font-size: 1.2em;
 }
-.vcard .fn { font-size: 1.7em; font-weight: bold; border-bottom: 1px solid #729fcf; padding-top: 1px;}
-
-.vcard #profile-photo-wrapper { margin: 10px 0px }
-
-aside h4 { font-size: 1.2em; }
-
-aside #viewcontacts { text-align: right;}
-
-#profile-extra-links ul { margin-left: 0px; padding-left: 0px; list-style: none; }
 
+aside #viewcontacts {
+	text-align: right;
+}
+#profile-extra-links ul {
+	margin-left: 0px;
+    padding-left: 0px;
+    list-style: none;
+}
 #dfrn-request-link {
-    background: #3465A4 url('connect.png') no-repeat 95% center;
-    border-radius: 5px 5px 5px 5px;
-    color: #FFFFFF;
-    display: block;
-    font-size: 1.2em;
-    padding: 0.2em 0.5em;
+	background:#3465A4 url(connect.png) no-repeat 95% center;
+	border-radius:5px 5px 5px 5px;
+	color:#fff;
+	display:block;
+	font-size:1.2em;
+	padding:.2em .5em;
 }
-
-
 #netsearch-box {
 	margin: 30px 0px;
 }
 
+
 /**
 * contacts block
 */
-.contact-block-div { width: 50px; height: 50px; float: left; }
-.contact-block-textdiv { width: 150px; height: 34px; float: left; }
-#contact-block-end { clear: both; }
+.contact-block-div {
+    width: 50px;
+    height: 50px;
+    float: left;
+}
+.contact-block-textdiv {
+    width: 150px;
+    height: 34px;
+    float: left;
+}
+#contact-block-end {
+    clear: both;
+}
+
 
 /**
  * jot
- **/ 
-#profile-jot-text_tbl { margin-bottom: 10px; }
-#profile-jot-text_ifr { width: 99.9%!important }
-#profile-jot-submit-wrapper { float: right;}
-#profile-jot-perms { 
- 	float: right;
- 	background-color: #555753;
- 	height: 22px; width: 20px;
-    -webkit-border-radius: 0px 5px 5px 0px;
-    -moz-border-radius: 0px 5px 5px 0px;
-    border-radius: 0px 5px 5px 0px; 	
- 	overflow: hidden;
- 	border: 0px;
- 	margin-left:2px;
-}
-#profile-jot-submit { 
-	float: right;
-	height: 22px;
-	background-color: #555753;
-	color: #eeeeec;
-	-webkit-border-radius: 5px 0px 0px  5px;
-	-moz-border-radius: 5px 0px 0px  5px;
-	border-radius: 5px 0px 0px  5px;
-	border: 0px;
-	margin-top: 0px;
+ **/
+#jot {
+  /*width: 785px;*/
+  margin: 0px 0 20px 0px;
+  width: 100%;
+}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 100%;
+  /*background-color: #0e232e;*/
+  /*border-bottom: 2px solid #9eabb0;*/
+}
+#jot #jot-tools span {
+    float: left;
+    margin: 10px 20px 2px 0px;
+}
+#jot #jot-tools span a {
+    display: block;
+    /*color: #cccccc;    */
+    /*width: 100%;       */
+    /*height: 40px;      */
+    /*text-align: center;*/
+    /*line-height: 40px; */
+    /*overflow: hidden;*/
+}
+/*#jot #jot-tools li:hover {*/
+    /*background-color: #364e59;*/
+/*}*/
+#jot #jot-tools .perms {
+    float: right;
+    width: 40px;
+}
+/*#jot #jot-tools .perms a.unlock {*/
+/*    width: 30px;                    */
+/*    border-left: 10px solid #cccccc;*/
+/*    background-color: #cccccc;      */
+/*}*/
+/*#jot #jot-tools .perms a.lock {*/
+/*    width: 30px;                    */
+/*    border-left: 10px solid #666666;*/
+/*    background-color: #666666;      */
+/*}*/
+/*#jot #jot-tools li.submit {            */
+/*    float: right;                      */
+/*    background-color: #cccccc;         */
+/*    border-bottom: 2px solid #cccccc;  */
+/*    border-right: 1px solid #666666;   */
+/*    border-left: 1px solid #666666;    */
+/*}                                      */
+/*#jot #jot-tools li.submit input {      */
+/*    border: 0px;                       */
+/*    margin: 0px;                       */
+/*    padding: 0px;                      */
+/*    background-color: #cccccc;         */
+/*    color: #666666;                    */
+/*    width: 80px;                       */
+/*    height: 40px;                      */
+/*    line-height: 40px;                 */
+/*}                                      */
+/*#jot #jot-tools li.submit input:hover {*/
+/*    background-color: #bdcdd4;         */
+/*    color: #666666;                    */
+/*}                                      */
+#jot #jot-tools li.loading {
+    float: right;
+    background-color: #ffffff;
+    width: 20px;
+    vertical-align: center;
+    text-align: center;
+    border-top: 2px solid #9eabb0;
+    height: 38px;
+}
+#jot #jot-tools li.loading img {
+    margin-top: 10px;
+}
+#jot #jot-title {
+    border: 0px;
+    margin: 0px;
+    height: 20px;
+    width: 100%;
+    font-weight: bold;
+    border: 1px solid #ffffff;
+    border-radius: 5px;
+}
+#jot #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#jot #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#jot #jot-title:placeholder {
+  font-weight: normal;
+}
+#jot #jot-title:hover,
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+  border-radius: 5px;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#profile-jot-text_tbl {
+	margin-bottom: 10px;
+}
+#profile-jot-text_ifr {
+	width:99.900002% !important;
+}
+#profile-attach-wrapper,
+#profile-audio,
+#profile-link-wrapper,
+#profile-location,
+#profile-nolocation,
+#profile-title-wrapper,
+#profile-upload-wrapper,
+#profile-video {
+    float: left;
+    margin-left: 10px;
 }
 #character-counter {
- float: right; padding: 8px 10px; 
+    float:right;
+    padding:8px 10px;
 }
 #profile-rotator-wrapper {
- float: right; 
-}
-
-.jot-tool {
-	float: left;
-	margin-right: 5px;
+	float: right; 
 }
 #profile-jot-tools-end,
-#profile-jot-banner-end { clear: both; }
-
+#profile-jot-banner-end {
+	clear: both;
+}
 #profile-jot-email-wrapper {
-	margin: 10px 10% 0px 10%;
-	border: 1px solid #555753;
-	border-bottom: 0px;
+	margin:10px 10% 0;
+	border:1px solid #555753;
+	border-bottom:0;
+}
+#profile-jot-email-label {
+	background-color:#555753;
+	color:#ccccce;
+	padding:5px;
+}
+#profile-jot-email {
+	width:90%;
+	margin:5px;
 }
-#profile-jot-email-label { background-color: #555753; color: #ccccce; 	padding: 5px;}
-#profile-jot-email { margin: 5px; width: 90%; }
-	
 #profile-jot-networks {
-	margin: 0px 10%;
+	margin: 0 10%;
 	border: 1px solid #555753;
-	border-top: 0px;
-	border-bottom: 0px;
+	border-top: 0;
+	border-bottom: 0;
 	padding: 5px;
 }
+#jot-preview-link {
+    margin: 0 0 0 25px;
+    border: 0;
+    text-decoration: none;
+}
+.icon-text-preview {
+	margin: 0 0 -18px 0;
+	display: block;
+    width: 20px;
+    height: 20px;
+    background: url(icons.png) no-repeat -128px -40px;
+    border: 0;
+    text-decoration: none;
+}
+#profile-jot-perms { 
+	/*float: right;*/
+    background-color: #555753;
+    height: 22px;
+    width: 20px;
+    -webkit-border-radius: 5px 0px 0px 5px;
+    -moz-border-radius: 5px 0px 0px 5px;
+    border-radius: 5px 0px 0px 5px;     
+    overflow: hidden;
+    border: 0px;
+    margin: 0 -4px 0 10px;
+}
+#profile-jot-submit-wrapper {
+	float: right;
+	width: 30%;
+	list-style: none;
+	margin: 10px 0 0 0;
+	padding: 0;
+}
+#profile-jot-submit-wrapper li {
+	display: inline-block;
+	vertical-align: middle;
+}
+#profile-jot-submit {
+	height: 22px;
+	background-color: #555753;
+	color: #eeeeec;
+	-webkit-border-radius: 0 5px 5px 0;
+	-moz-border-radius: 0 5px 5px 0;
+	border-radius: 0 5px 5px 0;
+	border: 0;
+	margin: 0;
+}
+#jot-perms-icons {
+	background-color: #555753;
+	height: 22px;
+	width: 20px;
+	-webkit-border-radius: 0 5px 5px 0;
+	-moz-border-radius: 0 5px 5px 0;
+	border-radius: 0 5px 5px 0;
+	overflow: hidden;
+	border: 0;
+	margin: 0 0 0 94.4%;
+}
 #profile-jot-acl-wrapper {
-	margin: 0px 10px;
+	margin: 0 10px;
 	border: 1px solid #555753;
-	border-top: 0px;
-        display:block!important;
+	border-top: 0;
+	display: block !important;
 }
 #group_allow_wrapper,
 #group_deny_wrapper,
-#acl-permit-outer-wrapper { width: 47%; float: left; }
-
+#acl-permit-outer-wrapper {
+	width:47%;
+	float:left;
+}
 #contact_allow_wrapper,
 #contact_deny_wrapper,
-#acl-deny-outer-wrapper { width: 47%; float: right; }
-
-#acl-permit-text {background-color: #555753; color: #ccccce; padding: 5px; float: left;}
-#jot-public {background-color: #555753; color: #ff0000; padding: 5px; float: left;}
-#acl-deny-text {background-color: #555753; color: #ccccce; padding: 5px; float: left;}
-
+#acl-deny-outer-wrapper {
+	width:47%;
+	float:right;
+}
+#acl-permit-text {
+	background-color: #555753;
+	color: #ccccce;
+	padding: 5px;
+	float: left;
+}
+#jot-public {
+	background-color: #555753;
+	color: #ff0000;
+	padding: 5px;
+	float: left;
+}
+#acl-deny-text {
+	background-color: #555753;
+	color: #ccccce;
+	padding: 5px;
+	float: left;
+}
 #acl-permit-text-end,
-#acl-deny-text-end { clear: both; }
-
-
-#jot-title-desc {
+#acl-deny-text-end {
+	clear: both;
+}
+#jot-title-desc, #profile-jot-desc {
 	color: #cccccc;
 }
-
 #jot-title-wrapper {
 	margin-bottom: 5px;
 }
-
 #jot-title {
 	border: 1px solid #cccccc;
-	width: 530px;
+	width: 90%;
 }
 #jot-title-display {
 	font-weight: bold;
 }
+.jothidden {
+    display: none;
+}
+#jot-preview-content {
+    background-color: #ffffe0;
+    border: 1px #aaaa00 solid;
+    border-radius: 3px;
+    padding: 3px 3px 6px 10px;
+}
 
 
 /**
  * section
  */
-section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
+section {
+    margin: 20px 9% 0 9%;
+    font-size: 0.8em;
+    padding-right: 250px;
+}
 
 /** tabs **/
-.tabs {list-style: none; padding: 0px; margin: 0px; border-bottom: 1px solid #729fcf; }
-.tabs li { display: inline;}
-.tab { padding: 0px 5px; margin-right: 10px; }
-.tab:hover { background-color: #729fcf; color: #eeeeec; border: 0px; }
-.tab.active { background-color: #729fcf; color: #eeeeec; border: 0px; }
+.tabs {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+    border-bottom: 1px solid #729fcf;
+    font-size: 14px;
+}
+.tabs li {
+    display: inline;
+}
+.tab {
+    padding: 0 5px;
+}
+.tab:hover {
+    background-color: #729fcf;
+    color: #eeeeec;
+    border: 0px;
+}
+.tab:active {
+    background-color: #729fcf;
+    color: #eeeeec;
+    border: 0px;
+}
 
 
 /**
  * 	items
  */
 .wall-item-outside-wrapper { 
-	margin-top: 50px;
+	margin-top: 15px;
+}
+.wall-item-outside-wrapper-end {
+    clear: both;
+}
+.wall-item-content-wrapper {
+    position: relative;
+    border-top: 1px #aaa solid;
+    padding: 10px;
+}
+.wall-item-outside-wrapper .wall-item-comment-wrapper {
+    /*margin-left: 90px;*/
+}
+.wall-item-content-wrapper.shiny {
+    background: #efefcf;
+    border-right: 3px solid #ffd398;
+}
+.wall-item-content {
+    overflow-x: auto;
+}
+[id^="tread-wrapper"], [class^="tread-wrapper"] {
+    margin: 5px 0;
+    border: 1px #aaa solid;
+    border-radius: 5px;
+    padding: 10px;
+}
+.wall-item-photo-menu {
+    display: none;
 }
-.wall-item-outside-wrapper-end { clear: both;}
-.wall-item-content-wrapper { position: relative; }
-.wall-item-photo-menu { display: none;}
 .wall-item-photo-menu-button {
-	display:none;
-	text-indent: -99999px;
-	background: #555753 url("menu-user-pin.jpg") no-repeat 75px center;
-	position: absolute;
-	overflow: hidden;
-	height: 20px; width: 90px; 
-	top: 85px;	left: 0px;
-	-webkit-border-radius: 0px 0px 5px  5px;
-	-moz-border-radius: 0px 0px 5px  5px;
-	border-radius: 0px 0px 5px  5px;
-	
-	
-}
-
-.wall-item-info { float: left; width: 140px; }
-.wall-item-photo-wrapper { 
-	width: 80px; height: 80px;  
-	position: relative;
-	padding: 5px;
-	background-color: #555753;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;	
+    display:none;
+    text-indent:-99999px;
+    background:#555753 url(menu-user-pin.jpg) no-repeat 75px center;
+    position:absolute;
+    overflow:hidden;
+    height:20px;
+    width:90px;
+    top:85px;
+    left:0;
+    -webkit-border-radius:0 0 5px 5px;
+    -moz-border-radius:0 0 5px 5px;
+    border-radius:0 0 5px 5px;
+}
+.wall-item-info {
+    float: left;
+    width: 110px;
+}
+.wall-item-photo-wrapper {
+    width: 80px;
+    height: 80px;
+    position: relative;
+    padding: 5px;
+    background-color: #555753;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
 }
-
-
-.wall-item-tools { 
-	float: right; 
-	/*height: 0px;
-	padding-top: 20px;
-	overflow:hidden;
-	background: #ffffff url("icons.png") no-repeat  -50px  -40px;*/
-	filter: alpha(opacity=20);
-	opacity: 0.2;
-	-webkit-transition: all 1s ease-in-out;
-	-moz-transition: all 1s ease-in-out;
-	-o-transition: all 1s ease-in-out;
-	-ms-transition: all 1s ease-in-out;
-	transition: all 1s ease-in-out;	
+[class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * {
+	margin: 0 0 10px 0;
+}
+.wall-item-tools {
+    float: right;
+    filter: alpha(opacity=35);
+    opacity: 0.4;
+    -webkit-transition: all 1s ease-in-out;
+    -moz-transition: all 1s ease-in-out;
+    -o-transition: all 1s ease-in-out;
+    -ms-transition: all 1s ease-in-out;
+    transition: all 1s ease-in-out;
 }
 .wall-item-tools:hover {
-	/*height:auto;*/
-	filter: alpha(opacity=100);
-	opacity: 1;
-	-webkit-transition: all 1s ease-in-out;
-	-moz-transition: all 1s ease-in-out;
-	-o-transition: all 1s ease-in-out;
-	-ms-transition: all 1s ease-in-out;
-	transition: all 1s ease-in-out;	
-	
+    filter: alpha(opacity=100);
+    opacity: 1;
+    -webkit-transition: all 1s ease-in-out;
+    -moz-transition: all 1s ease-in-out;
+    -o-transition: all 1s ease-in-out;
+    -ms-transition: all 1s ease-in-out;
+    transition: all 1s ease-in-out;
+}
+.wall-item-title {
+	font-size: 1.2em;
+	font-weight: bold;
+    margin-bottom: 1em;
+}
+.wall-item-body {
+	margin: 10px 10px 10px 0px;
+    text-align: left;
+}
+.wall-item-lock-wrapper {
+	float: right;
 }
-
-.wall-item-title { font-size: 1.2em; font-weight: bold;}
-.wall-item-body { margin-left: 140px;}
-.wall-item-lock-wrapper { float: right; }
 .wall-item-dislike,
-.wall-item-like,
-.wall-item-author { clear: left; font-size: 0.8em; margin: 10px 0px 0px 140px; color: #babdb6;}
-.wall-item-ago { display: inline; padding-left: 10px;} 
-.wall-item-wrapper-end { clear:both; }
+.wall-item-like {
+	clear: left;
+	font-size: 0.8em;
+	color: #878883;
+	margin: 20px 0 0 140px;
+}
+.wall-item-author, .wall-item-actions-author {
+	clear: left;
+	font-size: 0.8em;
+	color: #878883;
+	margin: 20px 0 0 140px;
+}
+.wall-item-ago {
+	display: inline;
+	padding-left: 10px;
+}
+.wall-item-wrapper-end {
+	clear:both;
+}
 .wall-item-location {
-	margin-top:5px;
-	width: 100px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	-o-text-overflow: ellipsis;
+    margin-top: 5px;
+    width: 100px;
+    overflow:hidden;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+}
+.wall-item-location .icon {
+    float: left;
+}
+.wall-item-location > a {
+    margin-left: 25px;
+    font-size: 0.7em;
+    display: block;
+}
+.wall-item-location .smalltext {
+    margin-left: 25px;
+    font-size: 0.7em;
+    display: block;
+}
+.wall-item-location > br {
+    display: none;
 }
-.wall-item-location .icon { float: left; }
-.wall-item-location > a { margin-left: 25px;  font-size: 0.7em; display: block;}
-.wall-item-location .smalltext { margin-left: 25px;  font-size: 0.7em; display: block;}
-.wall-item-location > br { display: none; }
-
 .wallwall .wwto {
-    left: -10px;
+    left:-10px;
     margin: 0;
-    position: absolute;
-    top: 65px;
+    position:absolute;
+    top:65px;
     width: 30px;
-    z-index: 10001;
-	width: 30px;
-	height: 30px;
-    
+    z-index:10001;
+    width:30px;
+    height:30px;
+}
+.wallwall .wwto img {
+    width: 30px !important;
+    height: 30px !important;
+}
+.wallwall .wall-item-photo-end {
+    clear: both;
 }
-.wallwall .wwto img { width: 30px!important; height: 30px!important;}
-.wallwall .wall-item-photo-end { clear: both; }
 .wall-item-arrowphoto-wrapper {
     position: absolute;
     left: 20px;
     top: 70px;
     z-index: 10002;
 }
-
 .wall-item-photo-menu {
 	min-width: 92px;
 	border: 2px solid #FFFFFF;
@@ -487,85 +1151,158 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
 	-moz-border-radius: 0px 5px 5px 5px;
 	border-radius: 0px 5px 5px 5px;
 }
-.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none }
-.wall-item-photo-menu li a { white-space: nowrap;  display: block; padding: 5px 2px; 	color: #eeeeec;	 }
-.wall-item-photo-menu li a:hover { color: #555753; background: #eeeeec; }
+.wall-item-photo-menu ul {
+    margin:0px;
+    padding: 0px;
+    list-style: none;
+}
+.wall-item-photo-menu li a {
+    white-space: nowrap;
+    display: block;
+    padding: 5px 2px;
+    color: #eeeeec;
+}
+.wall-item-photo-menu li a:hover {
+    color: #555753;
+    background: #eeeeec;
+}
+#item-delete-selected {
+    overflow: auto;
+    width: 100%;
+}
+
 
-.icon.drop,
-.icon.drophide { float: left; }
-#item-delete-selected {	overflow: auto;	width: 100%}
 /**
  * 	comment
  */
- 
- .ccollapse-wrapper { font-size: 0.9em; margin-left: 80px; }
- 
-.wall-item-outside-wrapper.comment { margin-left: 80px; }
-.wall-item-outside-wrapper.comment .wall-item-photo { width: 40px!important; height: 40px!important;}
-.wall-item-outside-wrapper.comment .wall-item-photo-wrapper {width: 40px; height: 40px; }
+.ccollapse-wrapper {
+    font-size: 0.9em;
+    margin-left: 80px;
+}
+
+.wall-item-outside-wrapper.comment {
+    margin-left: 80px;
+}
+.wall-item-outside-wrapper.comment .wall-item-photo {
+    width: 40px!important;
+    height: 40px!important;
+}
+.wall-item-outside-wrapper.comment .wall-item-photo-wrapper {
+    width: 40px;
+    height: 40px;
+}
 .wall-item-outside-wrapper.comment .wall-item-photo-menu-button {
-	width: 50px; top: 45px; background-position: 35px center;
+	width: 50px;
+    top: 45px;
+    background-position: 35px center;
+}
+.wall-item-outside-wrapper.comment .wall-item-info {
+    width: 60px;
+}
+.wall-item-outside-wrapper.comment .wall-item-body {
+    margin-left: 10px;
+}
+.wall-item-outside-wrapper.comment .wall-item-actions-author {
+    margin-left: 60px;
 }
-.wall-item-outside-wrapper.comment .wall-item-info { width: 60px; }
-.wall-item-outside-wrapper.comment .wall-item-body { margin-left: 60px;}
-.wall-item-outside-wrapper.comment .wall-item-author { margin-left: 60px;}
 
 .wall-item-outside-wrapper.comment .wall-item-photo-menu {
-	min-width: 50px;
-	top: 60px;
+    min-width: 50px;
+    top: 60px;
+}
+.comment-wwedit-wrapper {
+    /*margin: 30px 0px 0px 80px;*/
+}
+.comment-edit-wrapper {
+    border-top: 1px #aaa solid;
 }
-
-
-.comment-wwedit-wrapper,
-.comment-edit-wrapper { margin: 30px 0px 0px 80px;}
 .comment-wwedit-wrapper img,
-.comment-edit-wrapper img { width: 20px; height: 20px; }
-.comment-edit-photo-link { float: left; width: 40px;}
-.comment-edit-text-empty {  width: 80%; height: 20px; border: 0px; color: #babdb6;
+.comment-edit-wrapper img {
+	width: 20px;
+	height: 20px;
+}
+.comment-edit-photo-link {
+	float: left;
+	width: 40px;
+}
+.my-comment-photo {
+    width: 40px;
+    height: 40px;
+    padding: 5px;
+}
+[class^="comment-edit-text"] {
+    margin: 5px 0 10px 20px;
+    width: 86.5%;
+}
+.comment-edit-text-empty {
+	height: 20px;
+	border: 2px #babdd6 solid;
+	border-radius: 5px;
+	color: #babdb6;
 	-webkit-transition: all 0.5s ease-in-out;
 	-moz-transition: all 0.5s ease-in-out;
 	-o-transition: all 0.5s ease-in-out;
 	-ms-transition: all 0.5s ease-in-out;
 	transition: all 0.5s ease-in-out;	
 }
-.comment-edit-text-empty:hover { color: #999999;}
-.comment-edit-text-full { width: 80%; height: 6em;
+.comment-edit-text-empty:hover {
+	color: #999999;
+}
+.comment-edit-text-full {
+	height: 10em;
+    border-radius: 5px;
 	-webkit-transition: all 0.5s ease-in-out;
 	-moz-transition: all 0.5s ease-in-out;
 	-o-transition: all 0.5s ease-in-out;
 	-ms-transition: all 0.5s ease-in-out;
 	transition: all 0.5s ease-in-out;	
 }
-.comment-edit-submit-wrapper { width: 80%; margin-left: 40px; text-align: right; }
+.comment-edit-submit-wrapper {
+	width: 90%;
+	margin-left: 0px;
+	text-align: right;
+}
 .comment-edit-submit {
-	height: 22px;
-	background-color: #555753;
-	color: #eeeeec;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	border: 0px;
+    height: 22px;
+    background-color: #555753;
+    color: #eeeeec;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    border: 0;
 }
 
+
 /**
  * item text style
  **/
 .wall-item-body code {
-    border-color: #CCCCCC;
-    border-style: solid;
-    border-width: 1px 1px 1px 10px;
-    display: block;
-    padding-left: 10px;
+	display:block;
+	padding-left:10px;
+	border-color:#ccc;
+	border-style:solid;
+	border-width:1px 1px 1px 10px;
 }
 
+
 /**
  * profile
  **/
- 
-div[id$="text"] { font-weight: bold; border-bottom: 1px solid #cccccc; } 
-div[id$="wrapper"] { height: 100%; margin-bottom: 1em; } 
-div[id$="wrapper"] br { clear: left; }
-#advanced-profile-with { margin-left: 200px; }
+div[id$="text"] {
+    font-weight: bold;
+    border-bottom: 1px solid #ccc;
+}
+div[id$="wrapper"] {
+    height: 100%;
+    margin-bottom: 1em;
+}
+div[id$="wrapper"] br {
+    clear: left;
+}
+#advanced-profile-with {
+    margin-left: 200px;
+}
+
 
 /**
  * photos
@@ -575,202 +1312,333 @@ div[id$="wrapper"] br { clear: left; }
 	overflow: auto;
 }
 #photo-top-links {
-	margin-bottom:30px;
+    margin-bottom: 30px;
 }
 .photo-album-image-wrapper,
-.photo-top-image-wrapper { 
-	float: left; 
-	margin: 0px 10px 10px 0px;
-	-moz-box-shadow: 0px 0px 5px #888;
-	-webkit-box-shadow: 0px 0px 5px #888;
-	box-shadow: 0px 0px 5px #888;
-	background-color: #eeeeee;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-
-	padding-bottom: 30px; 
-	position:relative;
-	
+.photo-top-image-wrapper {
+    float: left;
+    -moz-box-shadow: 0 0 5px #888;
+    -webkit-box-shadow: 0 0 5px #888;
+    box-shadow: 0 0 5px #888;
+    background-color: #eee;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    padding-bottom: 30px;
+    position: relative;
+    margin: 0 10px 10px 0;
 }
 
-#photo-photo { max-width: 100% }
-#photo-photo img { max-width: 100% }
-
+#photo-photo {
+    max-width: 100%;
+}
+#photo-photo img {
+    max-width: 100%;
+}
 .photo-top-image-wrapper a:hover,
 #photo-photo a:hover,
-.photo-album-image-wrapper a:hover { 
-	border-bottom: 0px; 
+.photo-album-image-wrapper a:hover {
+    border-bottom: 0;
 }
-
-.photo-top-photo,
-.photo-album-photo {
-    -webkit-border-radius: 5px 5px 0px 0px;
-    -moz-border-radius: 5px 5px 0px 0px;
-    border-radius: 5px 5px 0px 0px;
- } 
-
-.photo-top-album-name { position: absolute; bottom: 0px; padding: 0px 5px;} 
-.caption { position: absolute; bottom: 0px; margin: 0px 5px}
-
-
-#photo-photo{
+.photo-top-photo,.photo-album-photo {
+    -webkit-border-radius:5px 5px 0 0;
+    -moz-border-radius:5px 5px 0 0;
+    border-radius:5px 5px 0 0;
+}
+.photo-top-album-name {
+    position: absolute;
+    bottom: 0;
+    padding: 0 5px;
+}
+.caption {
+    position: absolute;
+    bottom: 0;
+    margin: 0 5px;
+}
+#photo-photo {
 	position: relative;
 	float:left;
 }
-#photo-photo-end { clear: both; }
-#photo-prev-link,
-#photo-next-link{
-	position: absolute;
-	width:30%;
-	height: 100%;
-	background-color: rgba(255,255,255,0.5);
-	opacity: 0;
-	-webkit-transition: all 0.2s ease-in-out;
-	-moz-transition: all 0.2s ease-in-out;
-	-o-transition: all 0.2s ease-in-out;
-	-ms-transition: all 0.2s ease-in-out;
-	transition: all 0.2s ease-in-out;
-	background-position: center center;
-	background-repeat: no-repeat;
-	
+#photo-photo-end {
+    clear: both;
 }
-#photo-prev-link { left:0px; top:0px; background-image: url('prev.png'); }
-#photo-next-link { right:0px; top:0px; background-image: url('next.png');}
-
-#photo-prev-link a,
-#photo-next-link a{
- display: block; width: 100%; height: 100%;
- overflow: hidden;
- text-indent: -900000px;		 
+#photo-prev-link,
+#photo-next-link {
+    position:absolute;
+    width:30%;
+    height:100%;
+    background-color:rgba(255,255,255,0.5);
+    opacity:0;
+    -webkit-transition:all .2s ease-in-out;
+    -moz-transition:all .2s ease-in-out;
+    -o-transition:all .2s ease-in-out;
+    -ms-transition:all .2s ease-in-out;
+    transition:all .2s ease-in-out;
+    background-position:center center;
+    background-repeat:no-repeat;
+}
+#photo-prev-link {
+    left:0;
+    top:0;
+    background-image:url(prev.png);
+}
+#photo-next-link {
+    right:0;
+    top:0;
+    background-image:url(next.png);
+}
+
+#photo-prev-link a,#photo-next-link a {
+    display:block;
+    width:100%;
+    height:100%;
+    overflow:hidden;
+    text-indent:-900000px;
 }
-
 #photo-prev-link:hover,
-#photo-next-link:hover{
-	opacity: 1;
-	-webkit-transition: all 0.2s ease-in-out;
-	-moz-transition: all 0.2s ease-in-out;
-	-o-transition: all 0.2s ease-in-out;
-	-ms-transition: all 0.2s ease-in-out;
-	transition: all 0.2s ease-in-out;		
+#photo-next-link:hover {
+    opacity:1;
+    -webkit-transition:all .2s ease-in-out;
+    -moz-transition:all .2s ease-in-out;
+    -o-transition:all .2s ease-in-out;
+    -ms-transition:all .2s ease-in-out;
+    transition:all .2s ease-in-out;
 }
-
 #photo-next-link .icon,
-#photo-prev-link .icon { display: none }
-
+#photo-prev-link .icon {
+    display: none;
+}
 #photos-upload-spacer,
 #photos-upload-new-wrapper,
-#photos-upload-exist-wrapper { margin-bottom: 1em; }
+#photos-upload-exist-wrapper {
+    margin-bottom: 1em;
+}
 #photos-upload-existing-album-text,
-#photos-upload-newalbum-div { 
-	background-color: #555753;
-	color: #eeeeec;
-	padding: 1px;
+#photos-upload-newalbum-div {
+    background-color:#555753;
+    color:#eeeeec;
+    padding:1px;
 }
 #photos-upload-album-select,
-#photos-upload-newalbum { width: 99% }
-#photos-upload-perms-menu { text-align: right; }
+#photos-upload-newalbum {
+    width: 99%;
+}
+#photos-upload-perms-menu {
+    text-align: right;
+}
 
 /**
  * 	message
  */
-.prvmail-text { width: 100%;}
-#prvmail-subject { width: 100%;}
-#prvmail-submit-wrapper { margin-top: 10px; }
+.prvmail-text {
+    width: 100%;
+}
+#prvmail-subject {
+    width: 100%;
+}
+#prvmail-submit-wrapper {
+    margin-top: 10px;
+}
 #prvmail-submit {
-	float: right;
-	margin-top: 0px;
+    float:right;
+    margin-top: 0;
 }
 #prvmail-submit-wrapper > div {
-	margin-right: 5px;
-	float: left;
+    margin-right:5px;
+    float:left;
+}
+.mail-list-outside-wrapper {
+    margin-top: 20px;
+}
+.mail-list-sender {
+    float: left;
+}
+.mail-list-detail {
+    margin-left: 90px;
+}
+.mail-list-sender-name {
+    display: inline;
+}
+.mail-list-date {
+    display: inline;
+    font-size: 0.8em;
+    padding-left: 10px;
+}
+.mail-list-subject {
+    font-size: 1.5em;
+}
+.mail-list-delete-wrapper {
+    float: right;
+}
+.mail-list-outside-wrapper-end {
+    clear: both;
+}
+.mail-conv-sender {
+    float: left;
+    margin: 0px 5px 5px 0px;
+}
+.mail-conv-sender-photo {
+    width: 32px;
+    height: 32px;
+}
+.mail-conv-sender-name {
+    float: left;
+}
+.mail-conv-date {
+    float: right;
+}
+.mail-conv-subject {
+    clear: right;
+    font-weight: bold;
+    font-size: 1.2em;
+}
+.mail-conv-body {
+    clear: both;
+}
+.mail-conv-delete-wrapper {
+    margin-top: 5px;
 }
-.mail-list-outside-wrapper { margin-top: 20px;}
-.mail-list-sender {	float: left; }
-.mail-list-detail {	margin-left: 90px; }
-.mail-list-sender-name { display: inline; }
-.mail-list-date { display: inline; font-size: 0.8em; padding-left: 10px;}
-.mail-list-subject { font-size: 1.5em;}
-.mail-list-delete-wrapper { float: right; }
-.mail-list-outside-wrapper-end { clear: both;}
-
-.mail-conv-sender {float: left; margin: 0px 5px 5px 0px }
-.mail-conv-sender-photo { width: 32px; height: 32px }
-.mail-conv-sender-name { float: left }
-.mail-conv-date { float: right }
-.mail-conv-subject { clear: right; font-weight: bold; font-size: 1.2em }
-.mail-conv-body { clear: both; }
-.mail-conv-delete-wrapper { margin-top: 5px; }
 
 
 /**
  * 	contacts
  */
-
 .view-contact-wrapper,
-.contact-entry-wrapper { float: left; margin-right: 20px; margin-bottom: 20px; width: 120px; height: 120px; position: relative;}
-.contact-entry-direction-wrapper {position: absolute; top: 20px;}
-.contact-entry-edit-links { position: absolute; top: 60px; }
+.contact-entry-wrapper {
+    float: left;
+    margin-right: 20px;
+    margin-bottom: 20px;
+    width: 120px;
+    /*height: 120px;*/
+    position: relative;
+}
+.contact-direction-wrapper {
+    position: absolute;
+    top: 20px;
+}
+.contact-edit-links {
+    position: absolute;
+    top: 60px;
+}
+.contact-entry-photo-wrapper {
+
+}
 .contact-entry-photo {
-	margin-left:20px;
+	margin-left: 20px;
+}
+.contact-entry-name {
+    width: 120px;
+    font-weight: bold;
+    /*overflow: hidden;*/
 }
-.contact-entry-name { width: 120px; overflow: hidden; }
 .contact-entry-photo {
 	position: relative;
 }
-
-.contact-entry-edit-links .icon {	
-	border: 1px solid #babdb6;
+.contact-entry-edit-links .icon {
+    border: 1px solid #babdb6;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
-    border-radius: 3px;	
-	background-color: #ffffff;
+    border-radius: 3px;
+    background-color: #fff;
+}
+#contact-entry-url, [id^="contact-entry-url"] {
+    font-size: smaller;
+    /*overflow: scroll;*/
+}
+#contact-entry-network, [id^="contact-entry-network"] {
+    font-size: smaller;
+    font-style: italic;
+}
+#contact-edit-banner-name {
+    font-size: 1.5em;
+}
+#contact-edit-photo-wrapper {
+    position: relative;
+    float: left;
+    padding: 20px;
+}
+#contact-edit-direction-icon {
+    position:absolute;
+    top:60px;
+    left:0;
+}
+#contact-edit-nav-wrapper {
+    margin-left: 0px;
+}
+#contact-edit-links {
+    margin-top: 23px;
+}
+#contact-edit-links ul {
+    list-style-type: none;
+}
+#contact-drop-links {
+    margin-left:5px;
 }
-
-#contact-edit-banner-name { font-size: 1.5em; }
-#contact-edit-photo-wrapper {position: relative; float: left; padding: 20px;}
-#contact-edit-direction-icon { position: absolute; top: 60px; left:0px;}
-#contact-edit-nav-wrapper { margin-left: 210px; }
-#contact-edit-links { float: left; margin-top: 23px; }
-#contact-drop-links { margin-left: 5px; }
 #contact-edit-nav-wrapper .icon {
 	border: 1px solid #babdb6;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;	
 }
-#contact-edit-poll-wrapper { margin-left: 50px; }
-#contact-edit-last-update-text { margin-bottom: 15px; }
-#contact-edit-last-updated { font-weight: bold; }
-#contact-edit-poll-text { display: inline; }
-#contact-edit-end { clear: both; margin-bottom: 65px;}
+#contact-edit-poll-wrapper {
+    margin-left: 0px;
+}
+#contact-edit-last-update-text {
+    margin-bottom: 15px;
+}
+#contact-edit-last-updated {
+    font-weight: bold;
+}
+#contact-edit-poll-text {
+    display: inline;
+}
+#contact-edit-info_tbl, #contact-edit-info_parent {
+    width: 100%;
+}
+.mceLayout {
+    width: 100%;
+}
+#contact-edit-end {
+    clear: both;
+    margin-bottom: 65px;
+}
 
 .contact-photo-menu-button {
-       position: absolute;
-       background-image: url("photo-menu.jpg");
-       background-position: top left; 
-       background-repeat: no-repeat;
-       margin: 0px; padding: 0px;
-       width: 16px;
-       height: 16px;
-       top: 64px; left:0px;
-       overflow: hidden;
-       text-indent: 40px;
-       display: none;
-       
+    position: absolute;
+    background-image: url("photo-menu.jpg");
+    background-position: top left; 
+    background-repeat: no-repeat;
+    margin: 0px; padding: 0px;
+    width: 16px;
+    height: 16px;
+    top: 64px; left:0px;
+    overflow: hidden;
+    text-indent: 40px;
+    display: none;
 }
 .contact-photo-menu {
-       width: auto;
-       border: 2px solid #444444;
-       background: #FFFFFF;
-       position: absolute;
-       left: 0px; top: 90px;
-       display: none;
-       z-index: 10000;
+    width: auto;
+    border: 2px solid #444444;
+    background: #FFFFFF;
+    position: absolute;
+    left: 0px; top: 90px;
+    display: none;
+    z-index: 10000;
+}
+.contact-photo-menu ul {
+    margin:0px;
+    padding: 0px;
+    list-style: none;
+}
+.contact-photo-menu li a {
+    display: block;
+    padding: 2px;
+}
+.contact-photo-menu li a:hover {
+    color: #fff;
+    background: #3465A4;
+    text-decoration: none;
 }
-.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
-.contact-photo-menu li a { display: block; padding: 2px; }
-.contact-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
 
 
 
@@ -779,96 +1647,121 @@ div[id$="wrapper"] br { clear: left; }
  */
 #id_openid_url,
 .openid {
-   background: url(login-bg.gif) no-repeat;
-   background-position: 0 50%;
-   padding-left: 18px;
+    background:url(login-bg.gif) no-repeat;
+    background-position:0 50%;
+    padding-left:18px;
 }
- 
+
 #settings-nickname-desc {
-	background-color: #DDEFFF;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-    border-radius: 5px;
-    padding: 5px;
+    background-color:#DDEFFF;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    border-radius:5px;
+    padding:5px;
 }
 
 #register-form div,
-#profile-edit-form div { 
-	clear: both;
+#profile-edit-form div {
+    clear: both;
 }
 
 #register-form label,
 #profile-edit-form label {
-	width: 300px; float: left;
+	width: 300px;
+    float: left;
 }
 
 #register-form span,
-#profile-edit-form span  {
-	color: #555753;
-	display:block;
-	margin-bottom: 20px;
+#profile-edit-form span {
+    color:#555753;
+    display:block;
+    margin-bottom:20px;
 }
 .settings-submit-wrapper,
-.profile-edit-submit-wrapper { margin: 30px 0px;}
-.profile-listing { float: left; margin: 20px 20px 0px 0px}
-
-#profile-edit-links ul { margin: 20px 0px; padding: 0px; list-style: none; }
+.profile-edit-submit-wrapper {
+    margin: 30px 0px;
+}
+.profile-edit-side-div {
+    margin-top: 10px;
+}
+.profile-edit-side-link {
+    float: right;
+    margin: 10px 20px -16px 0;
+}
+.profile-listing {
+    float: left;
+    margin: 20px 20px 0px 0px;
+}
 
+#profile-edit-links ul {
+    margin: 20px 0;
+    padding: 0;
+    list-style: none;
+}
 
-#register-sitename { display: inline; font-weight: bold;}
+#register-sitename {
+    display: inline;
+    font-weight: bold;
+}
 
 /**
  * 	contacts selector
  */
-#group-edit-desc { margin: 10px 0xp; }
+#group-edit-desc {
+    margin: 10px 0px;
+}
 #group-members,
 #prof-members {
-	height: 200px; 
-	overflow: auto;
-	border: 1px solid #555753;
-    -webkit-border-radius: 5px 5px 0px 0px;
-    -moz-border-radius: 5px 5px 0px 0px;
-    border-radius: 5px 5px 0px 0px;
+    height:200px;
+    overflow:auto;
+    border:1px solid #555753;
+    -webkit-border-radius:5px 5px 0 0;
+    -moz-border-radius:5px 5px 0 0;
+    border-radius:5px 5px 0 0;
 }
 #group-all-contacts,
-#prof-all-contacts { 
-	height: 200px;
-    overflow: auto;	
-	border: 1px solid #555753;
-    -webkit-border-radius: 0px 0px 5px 5px;
-    -moz-border-radius: 0px 0px 5px 5px;
-    border-radius: 0px 0px 5px 5px;
+#prof-all-contacts {
+    height:200px;
+    overflow:auto;
+    border:1px solid #555753;
+    -webkit-border-radius:0 0 5px 5px;
+    -moz-border-radius:0 0 5px 5px;
+    border-radius:0 0 5px 5px;
 }
 #group-members h3,
 #group-all-contacts h3,
 #prof-members h3,
-#prof-all-contacts h3{
-	color: #eeeeec;
-	background-color: #555753;
-	margin: 0px;
-	padding: 5px;
+#prof-all-contacts h3 {
+    color:#eeeeec;
+    background-color:#555753;
+    margin:0;
+    padding:5px;
 }
 #group-separator,
-#prof-separator { display: none;}
+#prof-separator {
+    display: none;
+}
 
 /**
  * profile
  */
-#cropimage-wrapper { float:left; }
-#crop-image-form { clear:both; }
+#cropimage-wrapper {
+    float:left;
+}
+#crop-image-form {
+    clear:both;
+}
 
 /**
  * events
  **/
- 
 .clear { clear: both; }
 .eventcal {
-	float: left;
-	font-size: 20px;
+    float:left;
+    font-size:20px;
 }
-
 .vevent {
-	border: 1px solid #CCCCCC;
+    border:1px solid #ccc;
 }
 .vevent .event-description, .vevent .event-location {
 	margin-left: 10px;
@@ -882,122 +1775,220 @@ div[id$="wrapper"] br { clear: left; }
 #new-event-link {
 	margin-bottom: 10px;
 }
-
 .edit-event-link, .plink-event-link {
 	float: left;
 	margin-top: 4px;
 	margin-right: 4px;
 	margin-bottom: 15px;
 }
-
 .event-description:before {
 	content: url('../../../images/calendar.png');
 	margin-right: 15px;
 }
-
 .event-start, .event-end {
 	margin-left: 10px;
 	width: 330px;
 }
-
 .event-start .dtstart, .event-end .dtend {
 	float: right;
 }
-
-.event-list-date {
-	margin-bottom: 10px;
+.event-list-date {
+	margin-bottom: 10px;
+}
+.prevcal, .nextcal {
+	float: left;
+	margin-left: 32px;
+	margin-right: 32px;
+	margin-top: 64px;
+}
+.event-calendar-end {
+	clear: both;
+}
+.calendar {
+    font-family: monospace;
+}
+.today {
+	font-weight: bold;
+	color: #FF0000;
+} 
+#event-start-text, 
+#event-finish-text {
+	margin-top: 10px;
+	margin-bottom: 5px;
+}
+#event-nofinish-checkbox,
+#event-nofinish-text,
+#event-adjust-checkbox,
+#event-adjust-text,
+#event-share-checkbox {
+    float:left;
+}
+#event-datetime-break {
+	margin-bottom: 10px;
+}
+#event-nofinish-break,
+#event-adjust-break,
+#event-share-break {
+	clear: both;
+}
+#event-desc-text, 
+#event-location-text {
+	margin-top: 10px;
+	margin-bottom: 5px;
+}
+#event-submit {
+	margin-top: 10px;
+}
+.body-tag {
+	margin: 10px 0;
+	opacity: 0.5;
+	filter:alpha(opacity=50);
+}
+.body-tag:hover {
+	opacity: 1.0 !important;
+	filter:alpha(opacity=100) !important;
+}
+.item-select {
+	opacity: 0.1;
+	filter:alpha(opacity=10);
+	float: right;
+	margin-right: 10px;
+
+}
+.item-select:hover, .checkeditem {
+	opacity: 1;
+	filter:alpha(opacity=100);
+}
+#item-delete-selected {
+	margin-top: 30px;
+}
+
+#item-delete-selected-end {
+	clear: both;
+}
+#item-delete-selected-icon, #item-delete-selected-desc {
+	float: left;
+	margin-right: 5px;
+}
+#item-delete-selected-desc:hover {
+	text-decoration: underline;
+}
+
+
+/**
+ * 	directory
+ */
+.directory-item {
+    float: left;
+    margin: 50px 50px 0px 0px;
+}
+
+
+/**
+ * sidebar
+ */
+#group-sidebar {
+    margin-bottom: 10px;
+}
+.group-selected, .nets-selected {
+    padding: 3px;
+    border: 1px solid #CCCCCC;
+    background: #F8F8F8;
+    font-weight: bold;
+}
+.groupsideedit {
+    margin-right: 10px;
 }
-
-.prevcal, .nextcal {
-	float: left;
-	margin-left: 32px;
-	margin-right: 32px;
-	margin-top: 64px;
+#sidebar-group-ul {
+    padding-left: 0;
 }
-.event-calendar-end {
-	clear: both;
+#sidebar-group-list {
+    margin: 0 0 5px 0;
 }
-
- 
-.calendar {
-	font-family: Courier, monospace;
+#sidebar-group-list ul {
+    list-style-type: none;
+    list-style-position: inside;
 }
-.today {
-	font-weight: bold;
-	color: #FF0000;
-} 
- 
-#event-start-text, 
-#event-finish-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
+#sidebar-group-list li {
+    margin-top: 10px;
 }
-
-#event-nofinish-checkbox, 
-#event-nofinish-text, 
-#event-adjust-checkbox, 
-#event-adjust-text,
-#event-share-checkbox
-{
-	float: left;
+#sidebar-group-list .icon {
+    display: inline-block;
+    height: 12px;
+    width: 12px;
 }
-#event-datetime-break {
-	margin-bottom: 10px;
+#sidebar-new-group {
+    margin: auto;
+    display: inline-block;
+    color: #efefef;
+    text-decoration: none;
+    text-align: center;
 }
 
-#event-nofinish-break, 
-#event-adjust-break,
-#event-share-break {
-	clear: both;
+#sidebar-new-group:hover {
+    /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/
+    /*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/
+    /*background-color: #b20202;*/
 }
 
-#event-desc-text, 
-#event-location-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
+#sidebar-new-group:active {
+    position: relative;
+    top: 1px;
 }
-#event-submit {
-	margin-top: 10px;
+.nets-ul {
+    list-style-type: none;
+    padding-left: 0px;
+}
+.nets-ul li {
+    margin: 10px 0 0;
 }
 
-/**
- * 	directory
- */
-.directory-item {float: left; margin: 50px 50px 0px 0px;}
+.nets-link {
+    margin-left: 0px;
+}
+.nets-all {
+    margin-left: 0px;
+}
+#netsearch-box {
+    margin-top: 20px;
+    width: 150px;   
+}
+#netsearch-box #search-submit {
+    margin: 5px 0px 0px 0px;
+}
 
 /**
  * ADMIN
  */
 #pending-update {
-	float:right;
-	color: #ffffff;
-	font-weight: bold;
-	background-color: #FF0000;
-	padding: 0em 0.3em;
+    float:right;
+    color: #fff;
+    font-weight: bold;
+    background-color: #ff0000;
+    padding: 0 .3em;
 }
 .admin.linklist {
-	border: 0px; padding: 0px;
+    border: 0; padding: 0;
 }
 .admin.link {
-	list-style-position: inside;
+    list-style-position: inside;
 }
-
 #adminpage dl {
-	clear: left;
-	margin-bottom: 2px;
-	padding-bottom: 2px;
-	border-bottom: 1px solid black;
+    clear:left;
+    margin-bottom: 2px;
+    padding-bottom: 2px;
+    border-bottom: 1px solid #000;
 }
 #adminpage dt {
-	width: 200px;
-	float: left;
-	font-weight: bold;
+    width: 200px;
+    float: left;
+    font-weight: bold;
 }
 #adminpage dd {
 	margin-left: 200px;
 }
 #adminpage h3 {
-	border-bottom: 1px solid #cccccc;
+    border-bottom:1px solid #ccc;
 }
 
 #adminpage .submit {
@@ -1005,283 +1996,513 @@ div[id$="wrapper"] br { clear: left; }
 }
 
 #adminpage #pluginslist {
-	margin: 0px; padding: 0px;
+    margin: 0;
+    padding: 0;
 }
 #adminpage .plugin {
-	list-style: none;
-	display: block;
-	border: 1px solid #888888;
-	padding: 1em;
-	margin-bottom: 5px;
-	clear: left;
+    list-style: none;
+    display: block;
+    border: 1px solid #888;
+    padding: 1em;
+    margin-bottom: 5px;
+    clear: left;
 }
 #adminpage .toggleplugin {
 	float:left;
 	margin-right: 1em;
 }
 
-#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
-#adminpage table th { text-align: left;}
-#adminpage td .icon { float: left;}
-#adminpage table#users img { width: 16px; height: 16px; }
-#adminpage table tr:hover { background-color: #bbc7d7; }
-#adminpage .selectall { text-align: right; }
+#adminpage table {
+    width: 100%;
+    border-bottom: 1px solid #000;
+    margin: 5px 0;
+}
+#adminpage table th {
+    text-align: left;
+}
+#adminpage td .icon {
+    float: left;
+}
+#adminpage table#users img {
+    width: 16px; height: 16px;
+}
+#adminpage table tr:hover {
+    background-color:#bbc7d7;
+}
+#adminpage .selectall {
+    text-align: right;
+}
 
 /**
  * Form fields
  */
 .field {
-	margin-bottom: 10px;
-	padding-bottom: 10px;
-	overflow: auto;
-	width: 100%
+    margin-bottom: 10px;
+    padding-bottom: 10px;
+    overflow: auto;
+    width: 100%;
 }
-
 .field label {
-	float: left;
-	width: 200px;
+    float: left;
+    width: 200px;
 }
 
 .field input,
 .field textarea {
-	width: 400px;
+    width: 400px;
+}
+.field textarea {
+    height: 100px;
 }
-.field textarea { height: 100px; }
 .field_help {
-	display: block;
-	margin-left: 200px;
-	color: #666666;
-	
+    display: block;
+    margin-left: 0px;
+    color: #666;
 }
-
-
 .field .onoff {
-	float: left;
-	width: 80px;
+    float: left;
+    width: 80px;
 }
 .field .onoff a {
-	display: block;
-	border:1px solid #666666;
-	background-image:url("../../../images/onoff.jpg");
-	background-repeat: no-repeat;
-	padding: 4px 2px 2px 2px;
-	height: 16px;
-	text-decoration: none;
+    display: block;
+    border: 1px solid #666;
+    background: url("../../../images/onoff.jpg") no-repeat;
+    padding: 4px 2px 2px;
+    height: 16px;
+    text-decoration: none;
 }
 .field .onoff .off {
-	border-color:#666666;
-	padding-left: 40px;
-	background-position: left center;
-	background-color: #cccccc;
-	color: #666666;
-	text-align: right;
+    border-color: #666;
+    padding-left: 40px;
+    background: #ccc left center;
+    color: #666;
+    text-align:right;
 }
 .field .onoff .on {
-	border-color:#204A87;
-	padding-right: 40px;
-	background-position: right center;
-	background-color: #3465A4;
-	color: #FFFFFF;
-	text-align: left;
+    border-color:#204a87;
+    padding-right:40px;
+    background-position:right center;
+    background-color:#3465A4;
+    color:#fff;
+    text-align:left;
+}
+.hidden {
+    display:none !important;
+}
+
+.field.radio .field_help {
+    margin-left:0;
+}
+
+
+/*
+ * UPDATE
+ */
+.popup { 	
+	width: 100%;
+    height: 100%;
+	top:0px;
+    left:0px;
+	position: absolute;
+	display: none;
+}
+.popup .background {
+	background-color: rgba(0,0,0,128);
+	opacity: 0.5;
+	width: 100%;
+    height: 100%;
+	position: absolute;
+	top:0px;
+    left:0px;
+}
+.popup .panel {
+	top: 25%;
+    left: 25%;
+    width: 50%;
+    height: 50%;
+	padding: 1em;
+	position: absolute;
+	border: 4px solid #000000;
+	background-color: #FFFFFF;
+}
+#panel {
+    z-index: 100;
+}
+.grey {
+    color: grey;
+}
+.orange {
+    color: orange;
+}
+.red {
+    color: red;
+}
+.popup .panel .panel_text {
+    display: block;
+    overflow: auto;
+    height: 80%;
+} 
+.popup .panel .panel_in {
+    width: 100%;
+    height: 100%;
+    position: relative;
+}
+.popup .panel .panel_actions {
+    width: 100%;
+    bottom: 4px;
+    left: 0px;
+    position: absolute;
+}
+.panel_text .progress {
+    width: 50%;
+    overflow: hidden;
+    height: auto;
+    border: 1px solid #cccccc;
+    margin-bottom: 5px;
+}
+.panel_text .progress span {
+    float: right;
+    display: block;
+    width: 25%;
+    background-color: #eeeeee;
+    text-align: right;
+}
+
+/**
+ * OAuth
+ */
+.oauthapp {
+	height: auto;
+    overflow: auto;
+	border-bottom: 2px solid #cccccc;
+	padding-bottom: 1em;
+	margin-bottom: 1em;	
+}
+.oauthapp img {
+	float: left;
+	width: 48px; height: 48px;
+	margin: 10px;
+}
+.oauthapp img.noicon {
+	background-image: url("../../../images/icons/48/plugin.png");
+	background-position: center center;
+	background-repeat: no-repeat;
+}
+.oauthapp a {
+	float: left;
 }
-.hidden { display: none!important; }
 
-.field.radio .field_help { margin-left: 0px; }
 
 /**
  * ICONS
  */
+.iconspacer {
+	display: block;
+    width: 16px;
+    height: 16px;
+}
 .icon {
-	display: block; width: 20px; height: 20px;
-	background-image: url('icons.png');
+    display: block;
+    width: 20px;
+    height: 20px;
+    background: url(icons.png) no-repeat;
+    border: 0;
+    text-decoration: none;
 }
-/*.icon:hover {
-	border-bottom: 0px;
-}*/
-
-.starred { 
-	background-image: url("star.png"); 
-	repeat: no-repeat;
+.icon:hover {
+    border: 0;
+    text-decoration: none;
 }
-.unstarred { 
-	background-image: url("premium.png");
-	repeat: no-repeat;
+.icon.drop,
+.icon.drophide, .icon.delete {
+    float: left;
+}
+.icon.s22 {
+	display: block;
+	background: url(icons.png) no-repeat;
+	width: 22px;
+	height: 22px;
+}
+.icon.s22.delete {
+	display: block;
+	background-position: -110px 0;
+}
+.icon.s22.text {
+	padding: 10px 0px 0px 25px;
+	width: 200px;
+}
+.icon.text {
+    text-indent: 0px;
+}
+.icon.s16 {
+    min-width: 16px;
+    height: 16px;
+}
+.s16 .add {
+    background: url("../../../images/icons/16/add.png") no-repeat;
+}
+.add {
+    margin: 0px 5px;    
+}
+.article {
+	background-position: -50px 0;
+}
+.audio {
+	background-position: -70px 0;
+}
+.block {
+	background-position: -90px 0px;
+}
+.drop, .delete {
+	background-position: -110px 0;
+}
+.drophide {
+	background-position: -130px 0;
+}
+.edit {
+	background-position: -150px 0;
+}
+.camera {
+	background-position: -170px 0;
+}
+.dislike {
+	background-position: -190px 0;
+}
+.like {
+	background-position: -211px 0;
+}
+.link {
+	background-position: -230px 0;
+}
+.globe, .location {
+	background-position: -50px -20px;
+}
+.noglobe, .nolocation {
+	background-position: -70px -20px;
+}
+.no {
+	background-position: -90px -20px;
+}
+.pause {
+	background-position: -110px -20px;
+}
+.play {
+	background-position: -130px -20px;
+}
+.pencil {
+	background-position: -151px -18px;
+}
+.small-pencil {
+	background-position: -170px -20px;
+}
+.recycle {
+	background-position: -190px -20px;
+}
+.remote-link {
+	background-position: -210px -20px;
+}
+.share {
+	background-position: -230px -20px;
+}
+.tools {
+	background-position: -50px -40px;
+}
+.lock {
+	background-position: -70px -40px;
+}
+.unlock {
+	background-position: -90px -40px;
+}
+.video {
+	background-position: -110px -40px;
+}
+.attach {
+	background-position: -190px -40px;
+}
+.language {
+	background-position: -210px -40px;
+}
+.starred {
+	background-position: -130px -60px;
+}
+.unstarred {
+	background-position: -150px -60px;
 }
-
 .tagged {
-	background-image: url("tag.png");
-	repeat: no-repeat;
+	background-position: -170px -60px;
 }
-
-
-
-.border {
+.on {
+	background-position: -50px  -60px;
+}
+.off {
+	background-position: -70px  -60px;
+}
+.prev {
+	background-position: -90px  -60px;
+}
+.next {
+	background-position: -110px  -60px;
+}
+.icon.dim {
+	opacity: 0.3;
+	filter: alpha(opacity=30);
+}
+.border, .border:hover {
 	border: 1px solid #babdb6;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;	
 }
-
-.article	{ background-position: -50px  0px;}
-.audio 		{ background-position: -70px  0px;}
-.block 		{ background-position: -90px  0px;}
-.drop 		{ background-position: -110px 0px;}
-.drophide 	{ background-position: -130px 0px;}
-.edit 		{ background-position: -150px 0px;}
-.camera 	{ background-position: -170px 0px;}
-.dislike 	{ background-position: -190px 0px;}
-.like 		{ background-position: -210px 0px;}
-.link 		{ background-position: -230px 0px;}
-
-.globe 		{ background-position: -50px  -20px;}
-.noglobe 	{ background-position: -70px  -20px;}
-.no 		{ background-position: -90px  -20px;}
-.pause 		{ background-position: -110px -20px;}
-.play 		{ background-position: -130px -20px;}
-.pencil 	{ background-position: -150px -20px;}
-.small-pencil	{ background-position: -170px -20px;}
-.recycle 	{ background-position: -190px -20px;}
-.remote-link	{ background-position: -210px -20px;}
-.share 		{ background-position: -230px -20px;}
-
-.tools 		{ background-position: -50px  -40px;}
-.lock 		{ background-position: -70px  -40px;}
-.unlock 	{ background-position: -90px  -40px;}
-.video 		{ background-position: -110px -40px;}
-.youtube 	{ background-position: -130px -40px;}
-
-.attach 	{ background-position: -190px -40px;}
-.language 	{ background-position: -210px -40px;}
-
-
-.on 		{ background-position: -50px  -60px;}
-.off 		{ background-position: -70px  -60px;}
-.prev 		{ background-position: -90px  -60px;}
-.next 		{ background-position: -110px  -60px;}
-
-
-.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
-
 .attachtype {
-	display: block; width: 20px; height: 23px;
-	background-image: url('../../../images/content-types.png');
+    display: block;
+    width: 20px;
+    height: 23px;
+    background-image: url(../../../images/content-types.png);
+}
+.type-video {
+    background-position: 0px 0px;
+}
+.type-image {
+    background-position: -20px 0;
+}
+.type-audio {
+    background-position: -40px 0;
+}
+.type-text {
+    background-position: -60px 0px;
+}
+.type-unkn {
+    background-position: -80px 0;
 }
-
-.type-video { background-position: 0px 0px; }
-.type-image { background-position: -20px 0px; }
-.type-audio { background-position: -40px 0px; }
-.type-text  { background-position: -60px 0px; }
-.type-unkn  { background-position: -80px 0px; }
-
 
 
 /**
  * 	footer
- */                                  
- .cc-license { margin-top: 100px; font-size: 0.7em; }                                  
-footer { display: block; margin: 50px 20%; clear: both; }
-                                  
+ */
+.cc-license {
+    margin-top: 100px;
+    font-size: 0.7em;
+}
+footer {
+    display: block;
+    margin: 50px 20%;
+    clear: both;
+}
 #profile-jot-text {
     height: 20px;
-    color:#cccccc;
-    border: 1px solid #cccccc;
+    color: #666;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    width: 99.5%;
 }
+
+
 /** acl **/
 #photo-edit-perms-select,
 #photos-upload-permissions-wrapper,
-#profile-jot-acl-wrapper{
-	display:block!important;
+#profile-jot-acl-wrapper {
+    display: block !important;
 }
-
 #acl-wrapper {
-	width: 690px;
-	float:left;
+    width: 690px;
+    float: left;
 }
 #acl-search {
-	float:right;
-	background: #ffffff url("../../../images/search_18.png") no-repeat right center;
-	padding-right:20px;
+    float: right;
+    background: #fff url("../../../images/search_18.png") no-repeat right center;
+    padding-right: 20px;
 }
 #acl-showall {
-	float: left;
-	display: block;
-	width: auto;
-	height: 18px;
-	background-color: #cccccc;
-	background-image: url("../../../images/show_all_off.png");
-	background-position: 7px 7px;
-	background-repeat: no-repeat;
-	padding: 7px 10px 7px 30px;
-	-webkit-border-radius: 5px ;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	color: #999999;
+    float:left;
+    display:block;
+    width:auto;
+    height:18px;
+    background-color:#CCC;
+    background-image:url("../../../images/show_all_off.png");
+    background-position:7px 7px;
+    background-repeat:no-repeat;
+    padding:7px 10px 7px 30px;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    border-radius:5px;
+    color:#999;
 }
 #acl-showall.selected {
-	color: #000000;
-	background-color: #ff9900;
-	background-image: url("../../../images/show_all_on.png");
+    color:#000;
+    background-color:#F90;
+    background-image:url(../../../images/show_all_on.png);
 }
-
 #acl-list {
-	height: 210px;
-	border: 1px solid #cccccc;
-	clear: both;
-	margin-top: 30px;
-	overflow: auto;
+    height:210px;
+    border:1px solid #ccc;
+    clear:both;
+    margin-top:30px;
+    overflow:auto;
 }
 #acl-list-content {
 }
 .acl-list-item {
-	display: block;
-	width: 150px;
-	height: 30px;
-	border: 1px solid #cccccc;
-	margin: 5px;
-	float: left;
+    display:block;
+    width:150px;
+    height:30px;
+    border:1px solid #ccc;
+    margin:5px;
+    float:left;
+}
+.acl-list-item img {
+    width:22px;
+    height:22px;
+    float:left;
+    margin:4px;
+}
+.acl-list-item p {
+    height: 12px;
+    font-size: 10px;
+    margin: 0;
+    padding: 2px 0 1px;
+}
+.acl-list-item a {
+    font-size:8px;
+    display:block;
+    width:40px;
+    height:10px;
+    float:left;
+    color:#999;
+    background-color:#CCC;
+    background-position:3px 3px;
+    background-repeat:no-repeat;
+    margin-right:5px;
+    -webkit-border-radius:2px;
+    -moz-border-radius:2px;
+    border-radius:2px;
+    padding-left:15px;
 }
-.acl-list-item img{
-	width:22px;
-	height: 22px;
-	float: left;
-	margin: 4px;
+#acl-wrapper a:hover {
+    text-decoration:none;
+    color:#000;
 }
-.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
-.acl-list-item a { 
-	font-size: 8px;
-	display: block;
-	width: 40px;
-	height: 10px;
-	float: left;
-	color: #999999;
-	background-color: #cccccc;
-	background-position: 3px 3px;
-	background-repeat: no-repeat;
-	margin-right: 5px;
-	-webkit-border-radius: 2px ;
-	-moz-border-radius: 2px;
-	border-radius: 2px;
-	padding-left: 15px;
+.acl-button-show {
+    background-image:url('../../../images/show_off.png');
 }
-#acl-wrapper a:hover {
-	text-decoration: none;
-	color:#000000;
+.acl-button-hide {
+    background-image:url('../../../images/hide_off.png');
 }
-.acl-button-show { background-image: url("../../../images/show_off.png"); }
-.acl-button-hide { background-image: url("../../../images/hide_off.png"); }
-
 .acl-button-show.selected {
-	color: #000000;
-	background-color: #9ade00;
-	background-image: url("../../../images/show_on.png");
+    color:#000;
+    background-color:#9ade00;
+    background-image:url(../../../images/show_on.png);
 }
 .acl-button-hide.selected {
-	color: #000000;
-	background-color: #ff4141;
-	background-image: url("../../../images/hide_on.png");
+    color:#000;
+    background-color:#ff4141;
+    background-image:url(../../../images/hide_on.png);
+}
+.acl-list-item.groupshow {
+    border-color:#9ade00;
+}
+.acl-list-item.grouphide {
+    border-color:#ff4141;
 }
-.acl-list-item.groupshow { border-color: #9ade00; }
-.acl-list-item.grouphide { border-color: #ff4141; }
 /** /acl **/
 
 
@@ -1295,22 +2516,44 @@ footer { display: block; margin: 50px 20%; clear: both; }
 	border:1px solid #cccccc;
 }
 .acpopupitem {
-	background-color:#555753; padding: 4px;
+	background-color:#555753;
+    padding: 4px;
 	clear:left;
 }
 .acpopupitem img {
 	float: left;
 	margin-right: 4px;
 }
-
 .acpopupitem.selected {
-	color: #2e3436; background-color: #eeeeec;
+	color: #2e3436;
+    background-color: #eeeeec;
+}
+.qcomment-wrapper {
+    padding: 0px;
+    margin: 2px;
+    list-style-type: none;
+}
+.qcomment, .qcomment:hover {
+    display: inline;
+    padding: 5px;
+    margin: 5px;
 }
 .qcomment {
-	opacity: 0;
-	filter:alpha(opacity=0);
+	opacity: 0.5;
+	filter:alpha(opacity=50);
 }
 .qcomment:hover {
 	opacity: 1.0;
 	filter:alpha(opacity=100);
 }
+#network-star-link {
+    margin-top: 10px;
+}
+.network-star {
+    float: left;
+    margin-right: 5px;
+}
+.network-star.icon.starred {
+    display: inline-block;
+}
+
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
new file mode 100644
index 000000000..c72884f1a
--- /dev/null
+++ b/view/theme/dispy/theme.php
@@ -0,0 +1,74 @@
+<?php
+$a->theme_info = array();
+
+$a->page['htmlhead'] .= <<< EOT
+<script>
+$(document).ready(function() {
+    $('.group-edit-icon').hover(
+        function() {
+            $(this).addClass('icon');
+            $(this).removeClass('iconspacer'); },
+
+        function() {
+            $(this).removeClass('icon');
+            $(this).addClass('iconspacer'); }
+    );
+
+    $('.sidebar-group-element').hover(
+        function() {
+            id = $(this).attr('id');
+            $('#edit-' + id).addClass('icon');
+            $('#edit-' + id).removeClass('iconspacer'); },
+
+        function() {
+            id = $(this).attr('id');
+            $('#edit-' + id).removeClass('icon');
+            $('#edit-' + id).addClass('iconspacer'); }
+    );
+
+    $('.savedsearchdrop').hover(
+        function() {
+            $(this).addClass('drop');
+            $(this).addClass('icon');
+            $(this).removeClass('iconspacer'); },
+
+        function() {
+            $(this).removeClass('drop');
+            $(this).removeClass('icon');
+            $(this).addClass('iconspacer'); }
+    );
+
+    $('.savedsearchterm').hover(
+        function() {
+            id = $(this).attr('id');
+            $('#drop-' + id).addClass('icon');
+            $('#drop-' + id).addClass('drophide');
+            $('#drop-' + id).removeClass('iconspacer'); },
+
+        function() {
+            id = $(this).attr('id');
+            $('#drop-' + id).removeClass('icon');
+            $('#drop-' + id).removeClass('drophide');
+            $('#drop-' + id).addClass('iconspacer'); }
+        );
+
+    function toggleToolbar() {
+        if ( $('#nav-floater').is(':visible') ) {
+            $('#nav-floater').slideUp('fast');
+            $('.floaterflip').css({
+                backgroundPosition: '-210px -60px' 
+            });
+        } else {
+            $('#nav-floater').slideDown('fast');
+            $('.floaterflip').css({
+                backgroundPosition: '-190px -60px'
+            });
+        }
+    };
+    $('.floaterflip').click(function() {
+        toggleToolbar();
+        return false;
+    });
+});
+</script>
+EOT;
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
old mode 100755
new mode 100644
index 09cf64397..b013cfeef
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -38,7 +38,7 @@
 				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
 			{{ endif }}
 			{{ if $item.edpost }}
-				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>'
+				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
 			{{ endif }}
 		
 			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
@@ -68,10 +68,10 @@
 	<div class="wall-item-wrapper-end"></div>
 	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
 	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
-	<div class="wall-item-comment-wrapper" >
+	<div class="wall-item-comment-wrapper">
 	$item.comment
 	</div>
 </div>
 
-<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+<div class="wall-item-outside-wrapper-end$item.indent"></div>
 
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl
old mode 100755
new mode 100644
index c3638094c..86453fad2
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/wallwall_item.tpl
@@ -43,7 +43,7 @@
 				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
 			{{ endif }}
 			{{ if $item.edpost }}
-				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>'
+				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
 			{{ endif }}
 		
 			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
@@ -59,7 +59,7 @@
 			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
 					<div class="body-tag">
 						{{ for $item.tags as $tag }}
-							<span class='tag'>$tag</span>
+							<span class="tag">$tag</span>
 						{{ endfor }}
 					</div>			
 			</div>
@@ -72,7 +72,7 @@
 	<div class="wall-item-wrapper-end"></div>
 	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
 	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
-	<div class="wall-item-comment-wrapper" >
+	<div class="wall-item-comment-wrapper">
 	$item.comment
 	</div>
 </div>
-- 
cgit v1.2.3


From c28ce8a79cae9721bc5291f7ef7d17674d29ebf3 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 4 Mar 2012 05:00:35 -0500
Subject: tweak wall items a bit (nasty-looking wall items...). jot-header
 tries to count chars and fails :P

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy/jot-header.tpl | 39 +++++++++++++++++++++++++++++++++++----
 view/theme/dispy/style.css      |  5 ++---
 2 files changed, 37 insertions(+), 7 deletions(-)

(limited to 'view/theme/dispy')

diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 0a559aae7..23883036b 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -4,10 +4,11 @@
 var editor=false;
 var textlen = 0;
 var plaintext = '$editselect';
+// this is here because of the silly tinymce error. didn't help.
 var skin = 'default';
 
-function initEditor(cb){
-	if (editor==false){
+function initEditor(cb) {
+	if (editor==false) {
 		$("#profile-jot-text-loading").show();
 		if(plaintext == 'none') {
 			$("#profile-jot-text-loading").hide();
@@ -22,7 +23,8 @@ function initEditor(cb){
                 cb();
             }
 			return;
-		}	
+		}
+
 		tinyMCE.init({
 			theme : "advanced",
             skin : "default",
@@ -100,7 +102,36 @@ function initEditor(cb){
 					ed.pasteAsPlainText = true;
 					$("#profile-jot-text-loading").hide();
 					$(".jothidden").show();
-					if (typeof cb!="undefined") cb();
+
+					if (typeof cb!="undefined") { cb(); }
+
+					// character count part deux
+					//
+					// get # of chars
+					var textlen = $('#profile-jot-text').val().length();
+					$('#character-counter').html(textlen);
+
+					$('#profile-jot-text').keyup(function() {
+						$('#character-counter').removeClass('jothidden');
+						if(textlen <= 140) {
+							$('#character-counter').removeClass('red');
+							$('#character-counter').removeClass('orange');
+							$('#character-counter').addClass('grey');
+						}
+						if((textlen > 140) && (textlen <= 420)) {
+							$('#character-counter').removeClass('grey');
+							$('#character-counter').removeClass('red');
+							$('#character-counter').addClass('orange');
+						}
+						if(textlen > 420) {
+							$('#character-counter').removeClass('grey');
+							$('#character-counter').removeClass('orange');
+							$('#character-counter').addClass('red');
+						}
+						// get new len
+						$('#character-counter').html($(this).val().length);
+					});
+
 				});
 			}
 		});
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index f0929094c..8d7bbc630 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -988,7 +988,7 @@ section {
 }
 .wall-item-content-wrapper {
     position: relative;
-    border-top: 1px #aaa solid;
+    border-left: 1px #aaa solid;
     padding: 10px;
 }
 .wall-item-outside-wrapper .wall-item-comment-wrapper {
@@ -996,7 +996,6 @@ section {
 }
 .wall-item-content-wrapper.shiny {
     background: #efefcf;
-    border-right: 3px solid #ffd398;
 }
 .wall-item-content {
     overflow-x: auto;
@@ -1039,7 +1038,7 @@ section {
     border-radius: 5px;
 }
 [class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * {
-	margin: 0 0 10px 0;
+	margin: 0 0 5px 0;
 }
 .wall-item-tools {
     float: right;
-- 
cgit v1.2.3


From cb57a0ebfd805559df8df2ac7d478dffb740fdde Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 4 Mar 2012 05:19:49 -0500
Subject: soften '.shiny' a bit to fit in with colour scheme. tweak wall boxes

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy/style.css | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'view/theme/dispy')

diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 8d7bbc630..4d5f51eb2 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -980,22 +980,25 @@ section {
 /**
  * 	items
  */
-.wall-item-outside-wrapper { 
-	margin-top: 15px;
+.wall-item-outside-wrapper {
+	border: 1px solid #aaa;
+	border-radius: 5px;
+}
+.wall-item-outside-wrapper.comment {
+	margin-top: 5px;
 }
 .wall-item-outside-wrapper-end {
     clear: both;
 }
 .wall-item-content-wrapper {
     position: relative;
-    border-left: 1px #aaa solid;
-    padding: 10px;
+	padding: 10px;
 }
 .wall-item-outside-wrapper .wall-item-comment-wrapper {
     /*margin-left: 90px;*/
 }
 .wall-item-content-wrapper.shiny {
-    background: #efefcf;
+    background: #efefdf;
 }
 .wall-item-content {
     overflow-x: auto;
-- 
cgit v1.2.3


From 5f77aff48692d7fbf286b5a1b5476c652a1b608f Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 4 Mar 2012 12:21:08 -0500
Subject: more tweakage. stylesheet and jot-header

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy/jot-header.tpl | 56 ++++++++++++++++++++---------------------
 view/theme/dispy/style.css      |  5 +++-
 2 files changed, 32 insertions(+), 29 deletions(-)

(limited to 'view/theme/dispy')

diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 23883036b..93df84aae 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -104,34 +104,6 @@ function initEditor(cb) {
 					$(".jothidden").show();
 
 					if (typeof cb!="undefined") { cb(); }
-
-					// character count part deux
-					//
-					// get # of chars
-					var textlen = $('#profile-jot-text').val().length();
-					$('#character-counter').html(textlen);
-
-					$('#profile-jot-text').keyup(function() {
-						$('#character-counter').removeClass('jothidden');
-						if(textlen <= 140) {
-							$('#character-counter').removeClass('red');
-							$('#character-counter').removeClass('orange');
-							$('#character-counter').addClass('grey');
-						}
-						if((textlen > 140) && (textlen <= 420)) {
-							$('#character-counter').removeClass('grey');
-							$('#character-counter').removeClass('red');
-							$('#character-counter').addClass('orange');
-						}
-						if(textlen > 420) {
-							$('#character-counter').removeClass('grey');
-							$('#character-counter').removeClass('orange');
-							$('#character-counter').addClass('red');
-						}
-						// get new len
-						$('#character-counter').html($(this).val().length);
-					});
-
 				});
 			}
 		});
@@ -146,10 +118,38 @@ function initEditor(cb) {
 	}
 }
 
+function charCounter() {
+	// character count part deux
+	$('#profile-jot-text').keyup(function(event) {
+		var textlen = $(this).val().length();
+		var maxLen1 = 140;
+		var maxLen2 = 420;
+
+		$('#character-counter').removeClass('jothidden');
+		if(textlen <= maxLen1) {
+			$('#character-counter').removeClass('red');
+			$('#character-counter').removeClass('orange');
+			$('#character-counter').addClass('grey');
+		}
+		if((textlen > maxLen1) && (textlen <= maxLen2)) {
+			$('#character-counter').removeClass('grey');
+			$('#character-counter').removeClass('red');
+			$('#character-counter').addClass('orange');
+		}
+		if(textlen > maxLen2) {
+			$('#character-counter').removeClass('grey');
+			$('#character-counter').removeClass('orange');
+			$('#character-counter').addClass('red');
+		}
+		$('#character-counter').html($(this).val().length);
+	});
+}
+
 function enableOnUser(){
 	if (editor) return;
 	$(this).val("");
 	initEditor();
+	charCounter();
 }
 
 </script>
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 4d5f51eb2..95bc1c6f7 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -918,9 +918,12 @@ aside #viewcontacts {
 #acl-deny-text-end {
 	clear: both;
 }
-#jot-title-desc, #profile-jot-desc {
+#jot-title-desc {
 	color: #cccccc;
 }
+#profile-jot-desc {
+	color: #a00;
+}
 #jot-title-wrapper {
 	margin-bottom: 5px;
 }
-- 
cgit v1.2.3


From 25510453bfb00b56ba8f4dd7f78c9a04542fafee Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 4 Mar 2012 14:55:09 -0500
Subject: fix up toolbar so the notifications line up better together

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy/nav.tpl   |  9 +++++----
 view/theme/dispy/style.css | 50 ++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 49 insertions(+), 10 deletions(-)

(limited to 'view/theme/dispy')

diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl
index 67a263519..867751310 100644
--- a/view/theme/dispy/nav.tpl
+++ b/view/theme/dispy/nav.tpl
@@ -11,6 +11,10 @@ works -->
     {{ if $nav.help }}
     <a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a>
     {{ endif }}
+    {{ if $nav.community }}
+    <a id="nav-community-link" class="nav-link $nav.community.2"
+    href="$nav.community.0" title="$nav.community.1">$nav.community.1</a>
+    {{ endif }}
     {{ if $nav.apps }}
     <a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a>
     {{ endif }}
@@ -28,10 +32,6 @@ works -->
         <li class="empty">$emptynotifications</li>
     </ul>
     {{ endif }}
-    {{ if $nav.community }}
-    <a id="nav-community-link" class="nav-link $nav.community.2"
-    href="$nav.community.0" title="$nav.community.1">$nav.community.1</a>
-    {{ endif }}
     {{ if $nav.network }}
     <a id="nav-network-link" class="nav-link $nav.network.2"
     href="$nav.network.0" title="$nav.network.1">$nav.network.1</a>
@@ -106,6 +106,7 @@ works -->
         <a id="mail-update" class="nav-ajax-left" href="$nav.messages.0" title="$nav.messages.1"></a>
         {{ endif }}
     </div>
+
 </div>
     <a href="#" class="floaterflip"></a>
 </nav>
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 95bc1c6f7..08db11033 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -81,17 +81,18 @@ mark {
     font-weight: bold;
 }
 /* Redeclare monospace font family: h5bp.com/j */
-pre, code, kbd, samp {
+pre, code, kbd, samp, .wall-item-body code {
     font-family: monospace, monospace;
     _font-family: 'courier new', monospace;
     font-size: 1em; }
 
 /* Improve readability of pre-formatted text in all browsers */
-pre {
+pre, .wall-item-body code {
     white-space: pre;
     white-space: pre-wrap;
     word-wrap: break-word;
 }
+
 q {
     quotes: none;
 }
@@ -287,6 +288,11 @@ ul#user-menu-popup li a.nav-sep {
 }
 #nav-buttons {
     clear: both;
+	list-style: none;
+	padding: 0px;
+}
+#nav-buttons li {
+	padding: 0;
 }
 nav .nav-link {
 	float: right;
@@ -469,17 +475,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 	width: 30px;
 	height: 19px;
 	background: transparent url(notifications.png) 0 0 no-repeat;
-	color: #fff;
+	color: #222;
 	font-weight: bold;
 	font-size: 0.8em;
 	padding-top: 0.2em;
 	text-align: center;
 	float: left;
-	margin-right: -4px;
-    display: none;
+	margin: 0 -1px 0 3px;
+	display: block;
+	visibility: hidden;
 }
 .nav-ajax-update.show, .nav-ajax-left.show {
-    display: block;
+    visibility: visible;
 }
 #net-update {
 	background-position: 0px 0px;
@@ -1431,6 +1438,37 @@ div[id$="wrapper"] br {
 #photos-upload-perms-menu {
     text-align: right;
 }
+#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
+    float: left;
+    margin-bottom: 25px;
+}
+#photo-edit-link-wrap {
+    margin-bottom: 15px;
+}
+#photo-edit-caption {
+	width: 100%;
+}
+#photo-edit-newtag {
+	width: 100%;
+}
+#photo-like-div {
+    margin-bottom: 25px;
+}
+#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end {
+    clear: both;
+}
+#photo-edit-delete-button {
+    margin-left: 200px;
+}
+#photo-edit-end {
+    margin-bottom: 35px;
+}
+#photo-caption {
+    font-size: 110%;
+    font-weight: bold;
+    margin-top: 15px;
+    margin-bottom: 15px;
+}
 
 /**
  * 	message
-- 
cgit v1.2.3


From 2441babbe92a804d9d1803a0c7c224cd0a4722da Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 4 Mar 2012 15:52:50 -0500
Subject: removed extra padding/border on tread-wrapper (heh, tea read :P)

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy/style.css | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'view/theme/dispy')

diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 08db11033..23f0539d0 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -956,9 +956,10 @@ aside #viewcontacts {
  * section
  */
 section {
-    margin: 20px 9% 0 9%;
+    margin: 20px 8% 0 6%;
     font-size: 0.8em;
     padding-right: 250px;
+	min-width: 475px;
 }
 
 /** tabs **/
@@ -1014,10 +1015,10 @@ section {
     overflow-x: auto;
 }
 [id^="tread-wrapper"], [class^="tread-wrapper"] {
-    margin: 5px 0;
-    border: 1px #aaa solid;
-    border-radius: 5px;
-    padding: 10px;
+    margin: 15px 0 0 0;
+	/*border: 1px #aaa solid;*/
+	/*border-radius: 5px;*/
+    padding: 0px;
 }
 .wall-item-photo-menu {
     display: none;
-- 
cgit v1.2.3


From 58cdf776b6f4e5f423c9ad05a5731314f64198c4 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 4 Mar 2012 22:16:10 -0500
Subject: more ui thingies with dispy - we'll get you well dispy, we promise

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy/style.css | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

(limited to 'view/theme/dispy')

diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 23f0539d0..476ba59e9 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -153,7 +153,7 @@ a:hover {
     color: #729fcf;
 }
 input[type=submit] {
-    margin-top: 20px;
+    margin-top: 10px;
     height: 22px;
     background-color: #555753;
     color: #eeeeec;
@@ -1751,6 +1751,14 @@ div[id$="wrapper"] br {
 /**
  * 	contacts selector
  */
+.group-delete-wrapper {
+	margin: -28px 150px 0 0;
+    float: right;
+}
+#group-edit-submit-wrapper {
+    margin: 0 0 10px 0;
+    display: inline;
+}
 #group-edit-desc {
     margin: 10px 0px;
 }
@@ -2081,19 +2089,29 @@ div[id$="wrapper"] br {
  * Form fields
  */
 .field {
-    margin-bottom: 10px;
-    padding-bottom: 10px;
+	/*margin-bottom: 10px;*/
+	/*padding-bottom: 10px;*/
     overflow: auto;
     width: 100%;
 }
 .field label {
     float: left;
     width: 200px;
+	display: block;
+	font-size: 1.077em;
+	margin-bottom: 0.2em;
+	margin: 0 10px 0.2em 0;
+	border: 1px #999 solid;
+	padding: 5px;
+	vertical-align: middle;
+}
+.field input {
+	width: 250px;
+	height: 25px;
+	border: 1px #666 solid;
 }
-
-.field input,
 .field textarea {
-    width: 400px;
+    width: 80%;
 }
 .field textarea {
     height: 100px;
-- 
cgit v1.2.3


From fe7a6b070d59ad1b9211ba0191e791c70cfeb90c Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 5 Mar 2012 01:08:45 -0500
Subject: yet more ui things, and bug fixing

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy/style.css | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

(limited to 'view/theme/dispy')

diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 476ba59e9..a9d680d94 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -1004,15 +1004,17 @@ section {
 .wall-item-content-wrapper {
     position: relative;
 	padding: 10px;
+	overflow-x: auto;
+	width: auto;
 }
 .wall-item-outside-wrapper .wall-item-comment-wrapper {
     /*margin-left: 90px;*/
 }
-.wall-item-content-wrapper.shiny {
+.shiny {
     background: #efefdf;
 }
 .wall-item-content {
-    overflow-x: auto;
+	overflow-x: auto;
 }
 [id^="tread-wrapper"], [class^="tread-wrapper"] {
     margin: 15px 0 0 0;
@@ -1090,13 +1092,13 @@ section {
 	clear: left;
 	font-size: 0.8em;
 	color: #878883;
-	margin: 20px 0 0 140px;
+	margin: 5px 0 5px 120px;
 }
 .wall-item-author, .wall-item-actions-author {
 	clear: left;
 	font-size: 0.8em;
 	color: #878883;
-	margin: 20px 0 0 140px;
+	margin: 20px 0 0 110px;
 }
 .wall-item-ago {
 	display: inline;
@@ -1215,8 +1217,8 @@ section {
 .wall-item-outside-wrapper.comment .wall-item-body {
     margin-left: 10px;
 }
-.wall-item-outside-wrapper.comment .wall-item-actions-author {
-    margin-left: 60px;
+.wall-item-outside-wrapper.comment .wall-item-author {
+    margin-left: 50px;
 }
 
 .wall-item-outside-wrapper.comment .wall-item-photo-menu {
@@ -1234,9 +1236,9 @@ section {
 	width: 20px;
 	height: 20px;
 }
-.comment-edit-photo-link {
+.comment-edit-photo-link, .comment-edit-photo {
 	float: left;
-	width: 40px;
+	margin-left: 10px;
 }
 .my-comment-photo {
     width: 40px;
@@ -1272,7 +1274,7 @@ section {
 }
 .comment-edit-submit-wrapper {
 	width: 90%;
-	margin-left: 0px;
+	margin: 5px 5px 10px 50px;
 	text-align: right;
 }
 .comment-edit-submit {
@@ -1290,11 +1292,13 @@ section {
  * item text style
  **/
 .wall-item-body code {
-	display:block;
-	padding-left:10px;
-	border-color:#ccc;
-	border-style:solid;
-	border-width:1px 1px 1px 10px;
+	display: block;
+	padding-left: 10px;
+	border-color: #ccc;
+	border-style: solid;
+	border-width: 1px 1px 1px 10px;
+	background: #eee;
+	width: 95%;
 }
 
 
@@ -2409,6 +2413,11 @@ div[id$="wrapper"] br {
 	opacity: 0.3;
 	filter: alpha(opacity=30);
 }
+#pause {
+	position: fixed;
+	bottom: 5px;
+	right: 5px;
+}
 .border, .border:hover {
 	border: 1px solid #babdb6;
     -webkit-border-radius: 3px;
-- 
cgit v1.2.3


From 65b6ec79ed0891a4622cbb5d8ec934e4bd8caef2 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 5 Mar 2012 10:55:26 -0500
Subject: hopefully fix the overflow issue everywhere this time

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy/style.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'view/theme/dispy')

diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index a9d680d94..01c7fe664 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -414,8 +414,8 @@ div.jGrowl div.info {
     padding-left: 58px;
 }
 #nav-notifications-menu {
-    margin-top: 30px;
-    width: 255px;
+    margin: 30px 0 0 -45px;
+    width: 300px;
     max-height: 400px;
     overflow: auto;
     font-size: 9pt;
@@ -1021,6 +1021,7 @@ section {
 	/*border: 1px #aaa solid;*/
 	/*border-radius: 5px;*/
     padding: 0px;
+	overflow-x: auto;
 }
 .wall-item-photo-menu {
     display: none;
-- 
cgit v1.2.3


From ef1d02e7bd93b6da95db2a195d22b591d0e562ed Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 5 Mar 2012 12:21:50 -0500
Subject: still working on jot-header. amending <aside> and other elements

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy/jot-header.tpl | 22 +++++++++-------------
 view/theme/dispy/style.css      | 10 +++++-----
 2 files changed, 14 insertions(+), 18 deletions(-)

(limited to 'view/theme/dispy')

diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 93df84aae..84f152340 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -19,15 +19,11 @@ function initEditor(cb) {
 				'transitionOut' : 'elastic'
 			});
 			$(".jothidden").show();
-			if (typeof cb!="undefined") {
-                cb();
-            }
+			if (typeof cb!="undefined") cb();
 			return;
 		}
-
 		tinyMCE.init({
 			theme : "advanced",
-            skin : "default",
 			mode : "specific_textareas",
 			editor_selector: $editselect,
 			auto_focus: "profile-jot-text",
@@ -51,9 +47,8 @@ function initEditor(cb) {
 			setup : function(ed) {
 				cPopup = null;
 				ed.onKeyDown.add(function(ed,e) {
-					if(cPopup !== null) {
+					if(cPopup !== null)
 						cPopup.onkey(e);
-                    }
 				});
 
 				ed.onKeyUp.add(function(ed, e) {
@@ -64,7 +59,7 @@ function initEditor(cb) {
 							cPopup = new ACPopup(this,baseurl+"/acl");
 						}
 						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-						if(! cPopup.ready) { cPopup = null; }
+						if(! cPopup.ready) cPopup = null;
 					}
 					else {
 						if(cPopup !== null) { cPopup.close(); cPopup = null; }
@@ -102,9 +97,9 @@ function initEditor(cb) {
 					ed.pasteAsPlainText = true;
 					$("#profile-jot-text-loading").hide();
 					$(".jothidden").show();
-
-					if (typeof cb!="undefined") { cb(); }
+					if (typeof cb!="undefined") cb();
 				});
+
 			}
 		});
 		editor = true;
@@ -121,7 +116,7 @@ function initEditor(cb) {
 function charCounter() {
 	// character count part deux
 	$('#profile-jot-text').keyup(function(event) {
-		var textlen = $(this).val().length();
+		var textlen = $('#profile-jot-text').val().length();
 		var maxLen1 = 140;
 		var maxLen2 = 420;
 
@@ -141,7 +136,7 @@ function charCounter() {
 			$('#character-counter').removeClass('orange');
 			$('#character-counter').addClass('red');
 		}
-		$('#character-counter').html($(this).val().length);
+		$('#character-counter').html($('#profile-jot-text').val().length);
 	});
 }
 
@@ -149,7 +144,6 @@ function enableOnUser(){
 	if (editor) return;
 	$(this).val("");
 	initEditor();
-	charCounter();
 }
 
 </script>
@@ -163,6 +157,8 @@ function enableOnUser(){
 		/* enable tinymce on focus and click */
 		$("#profile-jot-text").focus(enableOnUser);
 		$("#profile-jot-text").click(enableOnUser);
+		$("#profile-jot-text").focus(charCounter);
+		$("#profile-jot-text").click(charCounter);
 
 		var uploader = new window.AjaxUpload(
 			'wall-image-upload',
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 01c7fe664..308a2ff38 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -611,8 +611,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 **/
 aside {
     position: absolute;
-    right: 8%;
-    width: 20.5%;
+    right: 15px;
+    width: 255px;
     font-size: smaller;
 }
 .vcard .fn {
@@ -672,7 +672,7 @@ aside #viewcontacts {
  **/
 #jot {
   /*width: 785px;*/
-  margin: 0px 0 20px 0px;
+  margin: 10px 0 20px 0px;
   width: 100%;
 }
 #jot #jot-tools {
@@ -956,7 +956,7 @@ aside #viewcontacts {
  * section
  */
 section {
-    margin: 20px 8% 0 6%;
+    margin: 20px 5% 0 6%;
     font-size: 0.8em;
     padding-right: 250px;
 	min-width: 475px;
@@ -965,7 +965,7 @@ section {
 /** tabs **/
 .tabs {
     list-style: none;
-    margin: 0;
+    margin: 10px 0 10px;
     padding: 0;
     border-bottom: 1px solid #729fcf;
     font-size: 14px;
-- 
cgit v1.2.3


From 02f825ca3cc55fa0e9fe7e3e7df6a37b32968b8a Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 5 Mar 2012 13:16:28 -0500
Subject: tweak sizing of <section> and <aside> more; fix link in 'view
 contacts' in sidebar

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy/style.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'view/theme/dispy')

diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 308a2ff38..13f7d2d56 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -232,7 +232,8 @@ nav a:hover {
 nav #banner {
 	display: block;
 	position: absolute;
-	margin-left: 20px;	
+	left: 51px;
+	top: 25px;
 }
 nav #banner #logo-text a {
 	font-size: 40px;
@@ -956,7 +957,7 @@ aside #viewcontacts {
  * section
  */
 section {
-    margin: 20px 5% 0 6%;
+    margin: 20px 6% 0 4%;
     font-size: 0.8em;
     padding-right: 250px;
 	min-width: 475px;
-- 
cgit v1.2.3


From 9d461846e28f90b120292a900af1328e275496ce Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 5 Mar 2012 15:55:17 -0500
Subject: multiple fixes; the jot-header works as standalone, not sure what's
 up.

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy/contact_template.tpl |  3 +-
 view/theme/dispy/conversation.tpl     |  2 +
 view/theme/dispy/jot-header.tpl       | 69 ++++++++++++++++++-----------------
 view/theme/dispy/style.css            | 12 +++++-
 4 files changed, 49 insertions(+), 37 deletions(-)

(limited to 'view/theme/dispy')

diff --git a/view/theme/dispy/contact_template.tpl b/view/theme/dispy/contact_template.tpl
index 2aa9b88fe..fbf354b47 100644
--- a/view/theme/dispy/contact_template.tpl
+++ b/view/theme/dispy/contact_template.tpl
@@ -20,7 +20,8 @@
 	</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-details" id="contact-entry-url-$contact.id" >$contact.itemurl</div>
+	<div class="contact-entry-details" id="contact-entry-url-$contact.id" >
+		<a href="$contact.itemurl" title="$contact.itemurl">Profile URL</a></div>
 	<div class="contact-entry-details" id="contact-entry-network-$contact.id" >$contact.network</div>
 
 	<div class="contact-entry-end" ></div>
diff --git a/view/theme/dispy/conversation.tpl b/view/theme/dispy/conversation.tpl
index 0b14f1c80..41b6aeadf 100644
--- a/view/theme/dispy/conversation.tpl
+++ b/view/theme/dispy/conversation.tpl
@@ -17,5 +17,7 @@
 {{ endfor }}
 
 {{ if $dropping }}
+<div class="delete-checked">
 <a href="#" onclick="deleteCheckedItems();return false;"><span class="icon delete"></span><span class="s22 text">$dropping</span></a>
+</div>
 {{ endif }}
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 84f152340..e72000b4c 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -1,7 +1,8 @@
+<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
+<script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script>
+<script type="text/javascript">
 
-<script language="javascript" type="text/javascript">
-
-var editor=false;
+var editor = false;
 var textlen = 0;
 var plaintext = '$editselect';
 // this is here because of the silly tinymce error. didn't help.
@@ -113,47 +114,16 @@ function initEditor(cb) {
 	}
 }
 
-function charCounter() {
-	// character count part deux
-	$('#profile-jot-text').keyup(function(event) {
-		var textlen = $('#profile-jot-text').val().length();
-		var maxLen1 = 140;
-		var maxLen2 = 420;
-
-		$('#character-counter').removeClass('jothidden');
-		if(textlen <= maxLen1) {
-			$('#character-counter').removeClass('red');
-			$('#character-counter').removeClass('orange');
-			$('#character-counter').addClass('grey');
-		}
-		if((textlen > maxLen1) && (textlen <= maxLen2)) {
-			$('#character-counter').removeClass('grey');
-			$('#character-counter').removeClass('red');
-			$('#character-counter').addClass('orange');
-		}
-		if(textlen > maxLen2) {
-			$('#character-counter').removeClass('grey');
-			$('#character-counter').removeClass('orange');
-			$('#character-counter').addClass('red');
-		}
-		$('#character-counter').html($('#profile-jot-text').val().length);
-	});
-}
-
 function enableOnUser(){
 	if (editor) return;
 	$(this).val("");
 	initEditor();
 }
 
-</script>
-<script type="text/javascript" src="$baseurl/js/ajaxupload.js" ></script>
-<script>
 	var ispublic = '$ispublic';
 	var addtitle = '$addtitle';
 
 	$(document).ready(function() {
-		
 		/* enable tinymce on focus and click */
 		$("#profile-jot-text").focus(enableOnUser);
 		$("#profile-jot-text").click(enableOnUser);
@@ -309,5 +279,36 @@ function enableOnUser(){
 
 	$geotag
 
+	function charCounter() {
+		// character count part deux
+		//$(this).val().length is not a function Line 282(3)
+		$('#profile-jot-text').keyup(function() {
+			var textlen = 0;
+			var maxLen1 = 140;
+			var maxLen2 = 420;
+
+			$('#character-counter').removeClass('jothidden');
+
+			textLen = $(this).val().length;
+			if(textLen <= maxLen1) {
+				$('#character-counter').removeClass('red');
+				$('#character-counter').removeClass('orange');
+				$('#character-counter').addClass('grey');
+			}
+			if((textLen > maxLen1) && (textlen <= maxLen2)) {
+				$('#character-counter').removeClass('grey');
+				$('#character-counter').removeClass('red');
+				$('#character-counter').addClass('orange');
+			}
+			if(textLen > maxLen2) {
+				$('#character-counter').removeClass('grey');
+				$('#character-counter').removeClass('orange');
+				$('#character-counter').addClass('red');
+			}
+			$('#character-counter').text( textLen );
+		});
+		$('#profile-jot-text').keyup();
+	}
+
 </script>
 
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 13f7d2d56..177b03f4f 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -1920,7 +1920,13 @@ div[id$="wrapper"] br {
 #item-delete-selected {
 	margin-top: 30px;
 }
-
+/* was tired of having no way of moving it around, so
+ * here's a little 'hook' to do so */
+.delete-checked {
+	position: absolute;
+	left: 35px;
+	margin-top: 20px;
+}
 #item-delete-selected-end {
 	clear: both;
 }
@@ -2102,13 +2108,15 @@ div[id$="wrapper"] br {
 }
 .field label {
     float: left;
-    width: 200px;
+    width: 275px;
 	display: block;
 	font-size: 1.077em;
+	/*font-weight: bold;*/
 	margin-bottom: 0.2em;
 	margin: 0 10px 0.2em 0;
 	border: 1px #999 solid;
 	padding: 5px;
+	background: #f2eedf;
 	vertical-align: middle;
 }
 .field input {
-- 
cgit v1.2.3