Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  DE strings, correction of a typo
  diabok-themes: fixed bug in green-wide and dark-wide
  diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders
  diabook-themes: bugfix in admin-section
  allow bbcode representation of html symbols such as © by wrapping in bb brackets
  protect jappixmini/proxy from typo check, more work on email2 connector

* master:

35 files changed, 0 insertions, 2278 deletions

diff --git a/view/theme/diabook/diabook-aerith/admin_users.tpl b/view/theme/diabook/diabook-aerith/admin_users.tpl
deleted file mode 100644
index 8aabb51ec..000000000
--- a/view/theme/diabook/diabook-aerith/admin_users.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "$confirm_delete".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("$confirm_delete_multi");
-	}
-	function selectall(cls){
-		$("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/users" method="post">
-		        <input type='hidden' name='form_security_token' value='$form_security_token'>
-		<h3>$h_pending</h3>
-		{{ if $pending }}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{ for $pending as $u }}
-				<tr>
-					<td class="created">$u.created</td>
-					<td class="name">$u.name</td>
-					<td class="email">$u.email</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
-					<td class="tools">
-						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
-						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
-					</td>
-				</tr>
-			{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
-		{{ else }}
-			<p>$no_pending</p>
-		{{ endif }}
-	
-	
-		
-	
-		<h3>$h_users</h3>
-		{{ if $users }}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{ for $users as $u }}
-					<tr>
-						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-						<td class='email'>$u.email</td>
-						<td class='register_date'>$u.register_date</td>
-						<td class='login_date'>$u.login_date</td>
-						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page-flags</td>
-						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
-						<td class="tools" style="width:60px;">
-							<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-							<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
-						</td>
-					</tr>
-				{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
-		{{ else }}
-			NO USERS?!?
-		{{ endif }}
-	</form>
-</div>
diff --git a/view/theme/diabook/diabook-aerith/ch_directory_item.tpl b/view/theme/diabook/diabook-aerith/ch_directory_item.tpl
deleted file mode 100755
index db1936e4b..000000000
--- a/view/theme/diabook/diabook-aerith/ch_directory_item.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
-			</a>
-		</div>
-	</div>
-</div>
diff --git a/view/theme/diabook/diabook-aerith/comment_item.tpl b/view/theme/diabook/diabook-aerith/comment_item.tpl
deleted file mode 100644
index ee4dfba45..000000000
--- a/view/theme/diabook/diabook-aerith/comment_item.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-		<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);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea>
-				<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>	
-				<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
-				<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>														
-				<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
-				<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
-				<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
-				<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ 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/diabook/diabook-aerith/communityhome.tpl b/view/theme/diabook/diabook-aerith/communityhome.tpl
deleted file mode 100644
index 875d83f1b..000000000
--- a/view/theme/diabook/diabook-aerith/communityhome.tpl
+++ /dev/null
@@ -1,86 +0,0 @@
-<div id="close_pages">
-{{ if $page }}
-<div>$page</div>
-{{ endif }}
-</div>
-
-<div id="close_helpers">
-{{ if $lastusers_title }}
-<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
-<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
-<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
-<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
-<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
-{{ endif }}
-</div>
-
-<div id="close_services">
-{{ if $lastusers_title }}
-<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
-<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
-<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-aerith/icons/facebook.png" title="Facebook"></a>
-<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-aerith/icons/StatusNet.png?" title="StatusNet"></a>
-<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-aerith/icons/livejournal.png?" title="LiveJournal"></a>
-<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-aerith/icons/posterous.png?" title="Posterous"></a>
-<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-aerith/icons/tumblr.png?" title="Tumblr"></a>
-<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-aerith/icons/twitter.png?" title="Twitter"></a>
-<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-aerith/icons/wordpress.png?" title="WordPress"></a>
-<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-aerith/icons/email.png?" title="E-Mail"></a>
-</div>
-{{ endif }}
-</div>
-
-<div id="close_friends" style="margin-bottom:53px;">
-{{ if $nv }}
-<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
-<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
-<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
-<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
-<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
-<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>			
-$nv.search
-{{ endif }}
-</div>
-
-<div id="close_lastusers">
-{{ if $lastusers_title }}
-<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
-<div id='lastusers-wrapper' class='items-wrapper'>
-{{ for $lastusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-
-{{ if $activeusers_title }}
-<h3>$activeusers_title</h3>
-<div class='items-wrapper'>
-{{ for $activeusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-
-<div id="close_lastphotos">
-{{ if $photos_title }}
-<h3>$photos_title<a id="close_photos_icon" onClick="close_lastphotos()"  class="icon close_box" title="close"></a></h3>
-<div id='ra-photos-wrapper' class='items-wrapper'>
-{{ for $photos_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-<div id="close_lastlikes">
-{{ if $like_title }}
-<h3>$like_title<a id="close_lastlikes_icon" onClick="close_lastlikes()" class="icon close_box" title="close"></a></h3>
-<ul id='likes'>
-{{ for $like_items as $i }}
-	<li id='ra-photos-wrapper'>$i</li>
-{{ endfor }}
-</ul>
-{{ endif }}
-</div>
diff --git a/view/theme/diabook/diabook-aerith/config.php b/view/theme/diabook/diabook-aerith/config.php
deleted file mode 100644
index 0083a4df7..000000000
--- a/view/theme/diabook/diabook-aerith/config.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Theme settings
- */
-
-
-
-function theme_content(&$a){
-	if(!local_user())
-		return;		
-	
-	$font_size = get_pconfig(local_user(), 'diabook-aerith', 'font_size' );
-	$line_height = get_pconfig(local_user(), 'diabook-aerith', 'line_height' );
-	$resolution = get_pconfig(local_user(), 'diabook-aerith', 'resolution' );
-	
-	return diabook_form($a,$font_size, $line_height,$resolution);
-}
-
-function theme_post(&$a){
-	if(! local_user())
-		return;
-	
-	if (isset($_POST['diabook-aerith-settings-submit'])){
-		set_pconfig(local_user(), 'diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']);
-		set_pconfig(local_user(), 'diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']);
-		set_pconfig(local_user(), 'diabook-aerith', 'resolution', $_POST['diabook-aerith_resolution']);	
-	}
-}
-
-
-function theme_admin(&$a){
-	$font_size = get_config('diabook-aerith', 'font_size' );
-	$line_height = get_config('diabook-aerith', 'line_height' );
-	$resolution = get_config('diabook-aerith', 'resolution' );
-	
-	return diabook_form($a,$font_size, $line_height,$resolution);
-}
-
-function theme_admin_post(&$a){
-	if (isset($_POST['diabook-aerith-settings-submit'])){
-		set_config('diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']);
-		set_config('diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']);
-		set_config('diabook-aerith', 'resolution', $_POST['diabook-aerith_resolution']);
-	}
-}
-
-
-function diabook_form(&$a, $font_size, $line_height, $resolution){
-	$line_heights = array(
-		"1.3"=>"1.3",
-		"---"=>"---",
-		"1.5"=>"1.5",		
-		"1.4"=>"1.4",
-		"1.2"=>"1.2",
-		"1.1"=>"1.1",
-	);
-	
-	$font_sizes = array(
-		'13'=>'13',
-		"---"=>"---",
-		"15"=>"15",
-		'14'=>'14',
-		'13.5'=>'13.5',		
-		'12.5'=>'12.5',
-		'12'=>'12',
-		);
-	$resolutions = array(
-		'normal'=>'normal',
-		'wide'=>'wide',		
-		);
-	
-	
-	
-	$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
-	$o .= replace_macros($t, array(
-		'$submit' => t('Submit'),
-		'$baseurl' => $a->get_baseurl(),
-		'$title' => t("Theme settings"),
-		'$font_size' => array('diabook-aerith_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
-		'$line_height' => array('diabook-aerith_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
-		'$resolution' => array('diabook-aerith_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions),	
-	));
-	return $o;
-}
diff --git a/view/theme/diabook/diabook-aerith/contact_template.tpl b/view/theme/diabook/diabook-aerith/contact_template.tpl
deleted file mode 100644
index 48930b48a..000000000
--- a/view/theme/diabook/diabook-aerith/contact_template.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-                        $contact.photo_menu
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/diabook/diabook-aerith/directory_item.tpl b/view/theme/diabook/diabook-aerith/directory_item.tpl
deleted file mode 100755
index bc2af16c2..000000000
--- a/view/theme/diabook/diabook-aerith/directory_item.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
-			</a>
-		</div>
-	</div>
-	<div class="contact-name" id="directory-name-$id">$name</div>
-</div>
diff --git a/view/theme/diabook/diabook-aerith/generic_links_widget.tpl b/view/theme/diabook/diabook-aerith/generic_links_widget.tpl
deleted file mode 100644
index 001c1395e..000000000
--- a/view/theme/diabook/diabook-aerith/generic_links_widget.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div id="widget_$title">
-	{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
-	{{if $desc}}<div class="desc">$desc</div>{{endif}}
-	
-	<ul  class="rs_tabs">
-		{{ for $items as $item }}
-			<li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook/diabook-aerith/group_side.tpl b/view/theme/diabook/diabook-aerith/group_side.tpl
deleted file mode 100755
index 8600402f2..000000000
--- a/view/theme/diabook/diabook-aerith/group_side.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<div id="profile_side" >
-	<div class="">
-		<h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3>
-	</div>
-
-	<div id="sidebar-group-list">
-		<ul class="menu-profile-side">
-			{{ for $groups as $group }}
-			<li class="menu-profile-list">
-				<span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>
-				<a href="$group.href" class="menu-profile-list-item">
-					$group.text
-				</a>
-				{{ if $group.edit }}
-					<a href="$group.edit.href" class="action"><span class="icon text_edit" ></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 }}
-			</li>
-			{{ endfor }}
-		</ul>
-	</div>
-	 {{ if $ungrouped }}
-  <div id="sidebar-ungrouped">
-  <a href="nogroup">$ungrouped</a>
-  </div>
-  {{ endif }}
-</div>	
-
diff --git a/view/theme/diabook/diabook-aerith/jot.tpl b/view/theme/diabook/diabook-aerith/jot.tpl
deleted file mode 100644
index 0928c9f36..000000000
--- a/view/theme/diabook/diabook-aerith/jot.tpl
+++ /dev/null
@@ -1,85 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-	</div>
-	<div id="profile-jot-banner-end"></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" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<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" />
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>				
-		<div id="character-counter" class="grey"></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" class="jothidden">
-	
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
-	</div> 
-
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
-  
-   <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
-   
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</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>
-   <div id="profile-jot-perms-end"></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>
-
-
-
-
-</form>
-</div>
-		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/diabook/diabook-aerith/js/README b/view/theme/diabook/diabook-aerith/js/README
deleted file mode 100644
index c93b2118e..000000000
--- a/view/theme/diabook/diabook-aerith/js/README
+++ /dev/null
@@ -1,22 +0,0 @@
-jQuery Resize Plugin Demo
-
-Version: v2.1.1
-Author: Adeel Ejaz (http://adeelejaz.com/)
-License: Dual licensed under MIT and GPL licenses.
-
-Introduction
-aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions.
-
-Usage:
-.aeImageResize( height, width )
-
-height
-An integer representing the maximum height for the image.
-
-width
-An integer representing the maximum width for the image.
-
-Example
-$(function() {
-  $( ".resizeme" ).aeImageResize({ height: 250, width: 250 });
-});
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.js b/view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.js
deleted file mode 100644
index bac09cd45..000000000
--- a/view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.js
+++ /dev/null
@@ -1,69 +0,0 @@
-(function( $ ) {
-
-  $.fn.aeImageResize = function( params ) {
-
-    var aspectRatio = 0
-      // Nasty I know but it's done only once, so not too bad I guess
-      // Alternate suggestions welcome :)
-      ,	isIE6 = $.browser.msie && (6 == ~~ $.browser.version)
-      ;
-
-    // We cannot do much unless we have one of these
-    if ( !params.height && !params.width ) {
-      return this;
-    }
-
-    // Calculate aspect ratio now, if possible
-    if ( params.height && params.width ) {
-      aspectRatio = params.width / params.height;
-    }
-
-    // Attach handler to load
-    // Handler is executed just once per element
-    // Load event required for Webkit browsers
-    return this.one( "load", function() {
-
-      // Remove all attributes and CSS rules
-      this.removeAttribute( "height" );
-      this.removeAttribute( "width" );
-      this.style.height = this.style.width = "";
-
-      var imgHeight = this.height
-        , imgWidth = this.width
-        , imgAspectRatio = imgWidth / imgHeight
-        , bxHeight = params.height
-        , bxWidth = params.width
-        , bxAspectRatio = aspectRatio;
-				
-      // Work the magic!
-      // If one parameter is missing, we just force calculate it
-      if ( !bxAspectRatio ) {
-        if ( bxHeight ) {
-          bxAspectRatio = imgAspectRatio + 1;
-        } else {
-          bxAspectRatio = imgAspectRatio - 1;
-        }
-      }
-
-      // Only resize the images that need resizing
-      if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) {
-
-        if ( imgAspectRatio > bxAspectRatio ) {
-          bxHeight = ~~ ( imgHeight / imgWidth * bxWidth );
-        } else {
-          bxWidth = ~~ ( imgWidth / imgHeight * bxHeight );
-        }
-
-        this.height = bxHeight;
-        this.width = bxWidth;
-      }
-    })
-    .each(function() {
-
-      // Trigger load event (for Gecko and MSIE)
-      if ( this.complete || isIE6 ) {
-        $( this ).trigger( "load" );
-      }
-    });
-  };
-})( jQuery );
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.min.js b/view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.min.js
deleted file mode 100644
index 16c30b123..000000000
--- a/view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery);
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-aerith/js/jquery.autogrow.textarea.js b/view/theme/diabook/diabook-aerith/js/jquery.autogrow.textarea.js
deleted file mode 100644
index 806e34f51..000000000
--- a/view/theme/diabook/diabook-aerith/js/jquery.autogrow.textarea.js
+++ /dev/null
@@ -1,46 +0,0 @@
-(function($) {
-
-    /*
-     * Auto-growing textareas; technique ripped from Facebook
-     */
-    $.fn.autogrow = function(options) {
-        
-        this.filter('textarea').each(function() {
-            
-            var $this       = $(this),
-                minHeight   = $this.height(),
-                lineHeight  = $this.css('lineHeight');
-            
-            var shadow = $('<div></div>').css({
-                position:   'absolute',
-                top:        -10000,
-                left:       -10000,
-                width:      $(this).width(),
-                fontSize:   $this.css('fontSize'),
-                fontFamily: $this.css('fontFamily'),
-                lineHeight: $this.css('lineHeight'),
-                resize:     'none'
-            }).appendTo(document.body);
-            
-            var update = function() {
-                
-                var val = this.value.replace(/</g, '&lt;')
-                                    .replace(/>/g, '&gt;')
-                                    .replace(/&/g, '&amp;')
-                                    .replace(/\n/g, '<br/>');
-                
-                shadow.html(val);
-                $(this).css('height', Math.max(shadow.height() + 20, minHeight));
-            }
-            
-            $(this).change(update).keyup(update).keydown(update);
-            
-            update.apply(this);
-            
-        });
-        
-        return this;
-        
-    }
-    
-})(jQuery);
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-aerith/js/jquery.cookie.js b/view/theme/diabook/diabook-aerith/js/jquery.cookie.js
deleted file mode 100644
index 6d5974a2c..000000000
--- a/view/theme/diabook/diabook-aerith/js/jquery.cookie.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
- * jQuery Cookie Plugin
- * https://github.com/carhartl/jquery-cookie
- *
- * Copyright 2011, Klaus Hartl
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.opensource.org/licenses/GPL-2.0
- */
-(function($) {
-    $.cookie = function(key, value, options) {
-
-        // key and at least value given, set cookie...
-        if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) {
-            options = $.extend({}, options);
-
-            if (value === null || value === undefined) {
-                options.expires = -1;
-            }
-
-            if (typeof options.expires === 'number') {
-                var days = options.expires, t = options.expires = new Date();
-                t.setDate(t.getDate() + days);
-            }
-
-            value = String(value);
-
-            return (document.cookie = [
-                encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value),
-                options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
-                options.path    ? '; path=' + options.path : '',
-                options.domain  ? '; domain=' + options.domain : '',
-                options.secure  ? '; secure' : ''
-            ].join(''));
-        }
-
-        // key and possibly options given, get cookie...
-        options = value || {};
-        var decode = options.raw ? function(s) { return s; } : decodeURIComponent;
-
-        var pairs = document.cookie.split('; ');
-        for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) {
-            if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined
-        }
-        return null;
-    };
-})(jQuery);
diff --git a/view/theme/diabook/diabook-aerith/login.tpl b/view/theme/diabook/diabook-aerith/login.tpl
deleted file mode 100644
index efa7c2d6d..000000000
--- a/view/theme/diabook/diabook-aerith/login.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<form action="$dest_url" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-
-	<div id="login_standard">
-	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
-	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
-	</div>
-	
-	{{ if $openid }}
-			<div id="login_openid">
-			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
-			</div>
-	{{ endif }}
-	
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="$login" />
-	</div>
-	
-   <div id="login-extra-links">
-		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
-        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
-	</div>	
-	
-	{{ for $hiddens as $k=>$v }}
-		<input type="hidden" name="$k" value="$v" />
-	{{ endfor }}
-	
-	
-</form>
-
-
-<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>
diff --git a/view/theme/diabook/diabook-aerith/mail_conv.tpl b/view/theme/diabook/diabook-aerith/mail_conv.tpl
deleted file mode 100644
index 989f17878..000000000
--- a/view/theme/diabook/diabook-aerith/mail_conv.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				<a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id">
-					<img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" />
-				</a>
-			</div>
-		</div>
-		<div class="wall-item-content">
-			$mail.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span>
-			</div>
-			
-			<div class="wall-item-actions-social">
-			</div>
-			
-			<div class="wall-item-actions-tools">
-				<a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a>
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-	</div>
-</div>
-
-
-{#
-
-
-<div class="mail-conv-outside-wrapper">
-	<div class="mail-conv-sender" >
-		<a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
-		<div class="mail-conv-date">$mail.date</div>
-		<div class="mail-conv-subject">$mail.subject</div>
-		<div class="mail-conv-body">$mail.body</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
-</div>
-<hr class="mail-conv-break" />
-
-#}
diff --git a/view/theme/diabook/diabook-aerith/mail_display.tpl b/view/theme/diabook/diabook-aerith/mail_display.tpl
deleted file mode 100644
index 8b82e95c6..000000000
--- a/view/theme/diabook/diabook-aerith/mail_display.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="mail-display-subject">
-	<span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span>
-	<a href="message/dropconv/$thread_id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
-
-{{ for $mails as $mail }}
-	<div id="tread-wrapper-$mail.id" class="tread-wrapper">
-		{{ inc mail_conv.tpl }}{{endinc}}
-	</div>
-{{ endfor }}
-
-{{ inc prv_message.tpl }}{{ endinc }}
diff --git a/view/theme/diabook/diabook-aerith/mail_list.tpl b/view/theme/diabook/diabook-aerith/mail_list.tpl
deleted file mode 100644
index 6bc6c84f6..000000000
--- a/view/theme/diabook/diabook-aerith/mail_list.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="mail-list-wrapper">
-	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span>
-	<span class="mail-from">$from_name</span>
-	<span class="mail-date">$date</span>
-	<span class="mail-count">$count</span>
-	
-	<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
diff --git a/view/theme/diabook/diabook-aerith/message_side.tpl b/view/theme/diabook/diabook-aerith/message_side.tpl
deleted file mode 100644
index 9f1587096..000000000
--- a/view/theme/diabook/diabook-aerith/message_side.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="message-sidebar" class="widget">
-	<div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div>
-	
-	<ul class="message-ul">
-		{{ for $tabs as $t }}
-			<li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook/diabook-aerith/nav.tpl b/view/theme/diabook/diabook-aerith/nav.tpl
deleted file mode 100644
index e3aabaa8b..000000000
--- a/view/theme/diabook/diabook-aerith/nav.tpl
+++ /dev/null
@@ -1,190 +0,0 @@
-<header>
-	<div id="site-location">$sitelocation</div>
-	<div id="banner">$banner</div>
-</header>
-<nav>
-			
-			
-	<ul>
-			
-			
-			{{ if $nav.network }}
-			<li id="nav-network-link" class="nav-menu-icon">
-				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
-				<span class="icon notifications">Benachrichtigungen</span>
-				<span id="net-update" class="nav-notify"></span></a>
-			</li>
-		    {{ endif }}
-	
-			{{ if $nav.contacts }}
-			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
-				<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
-				<span class="icon contacts">$nav.contacts.1</span>
-				<span id="intro-update" class="nav-notify"></span></a>
-				<ul id="nav-contacts-menu" class="menu-popup">
-					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
-					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
-				</ul>
-			</li>	
-
-			{{ endif }}
-			
-			{{ if $nav.messages }}
-			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
-			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
-			  <span class="icon messages">$nav.messages.1</span>
-				<span id="mail-update" class="nav-notify"></span></a>
-				<ul id="nav-messages-menu" class="menu-popup">
-					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
-				</ul>
-			</li>		
-			{{ endif }}
-		
-      {{ if $nav.notifications }}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon">
-			<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
-			<span class="icon notify">$nav.notifications.1</span>
-				<span id="notify-update" class="nav-notify"></span></a>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-			</li>		
-		{{ endif }}	
-			
-		{{ if $nav.search}}
-		<li id="search-box">
-			<form method="get" action="$nav.search.0">
-				<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
-			</form>
-		</li>		
-		{{ endif }}	
-		
-		<li  style="width: 1%; height: 1px;float: right;"></li>	
-		
-		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
-			<ul id="nav-site-menu" class="menu-popup">
-				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
-
-				{{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
-										
-				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}									
-										
-										 <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
-										
-				{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
-				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
-
-				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
-
-				
-			</ul>		
-		</li>
-		
-		
-		{{ if $nav.directory }}
-		<li id="nav-directory-link" class="nav-menu $sel.directory">
-			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-		</li>
-		{{ endif }}
-		
-		{{ if $nav.apps }}
-			<li id="nav-apps-link" class="nav-menu $sel.apps">
-				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
-				<ul id="nav-apps-menu" class="menu-popup">
-					{{ for $apps as $ap }}
-					<li>$ap</li>
-					{{ endfor }}
-				</ul>
-			</li>	
-		{{ endif }}		
-		
-      {{ if $nav.home }}
-			<li id="nav-home-link" class="nav-menu $sel.home">
-				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
-				<span id="home-update" class="nav-notify"></span></a>
-			</li>
-		{{ endif }}		
-		
-		{{ if $userinfo }}
-			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
-				<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 }}
-					
-					{{ if $nav.profiles }}<li><a class="menu-sep $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.3</a></li>{{ endif }}
-					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
-					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
-					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
-				</ul>
-			</li>
-		{{ endif }}
-		
-					{{ if $nav.login }}
-					<li id="nav-home-link" class="nav-menu $sel.home">
-						<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
-					<li>
-					{{ endif }}
-		
-		
-		
-	</ul>	
-
-
-	
-</nav>
-
-
-<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;"><a href="#top"><img src="view/theme/diabook/icons/scroll_top.png" alt="back to top" title="Back to top"></a></div>
-<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
-<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
-
-
-
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-
-
-{#
-
-{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.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 }}
-
-<span id="nav-link-wrapper" >
-
-{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-	
-<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-	
-{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-{{ if $nav.notifications }}
-<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
-<span id="notify-update" class="nav-ajax-left"></span>
-{{ endif }}
-{{ if $nav.messages }}
-<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-<span id="mail-update" class="nav-ajax-left"></span>
-{{ endif }}
-
-{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-
-</span>
-<span id="nav-end"></span>
-<span id="banner">$banner</span>
-#}
diff --git a/view/theme/diabook/diabook-aerith/nets.tpl b/view/theme/diabook/diabook-aerith/nets.tpl
deleted file mode 100644
index be25ddee1..000000000
--- a/view/theme/diabook/diabook-aerith/nets.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="profile_side">
-	<h3 style="margin-left: 2px;">$title</h3>
-	<div id="nets-desc">$desc</div>
-   
-	<ul class="menu-profile-side">
-	<li class="menu-profile-list">
-	<span class="menu-profile-icon {{ if $sel_all }}group_selected{{else}}group_unselected{{ endif }}"></span>	
-	<a style="text-decoration: none;" href="$base" class="menu-profile-list-item">$all</a></li>
-	{{ for $nets as $net }}
-	<li class="menu-profile-list">
-	<span class="menu-profile-icon {{ if $net.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>	
-	<a href="$base?nets=$net.ref" class="menu-profile-list-item">$net.name</a></li>
-	{{ endfor }}
-	</ul>
-</div>
diff --git a/view/theme/diabook/diabook-aerith/oembed_video.tpl b/view/theme/diabook/diabook-aerith/oembed_video.tpl
deleted file mode 100644
index d6d29f724..000000000
--- a/view/theme/diabook/diabook-aerith/oembed_video.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
-	<img width='$tw' height='$th' src='$turl' >
-	<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
-</a>
diff --git a/view/theme/diabook/diabook-aerith/photo_item.tpl b/view/theme/diabook/diabook-aerith/photo_item.tpl
deleted file mode 100644
index 5d65a89b7..000000000
--- a/view/theme/diabook/diabook-aerith/photo_item.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-{{ if $indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-</div>
-{{ endif }}
-
-<div class="wall-item-photo-container $indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper" >
-				<a href="$profile_url" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-$id">
-					<img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id">
-				$photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$profile_url" target="redir" title="$name" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }}
-			{{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
-			$body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	
-	<div class="wall-item-bottom" style="display: table-row;">
-		<div class="wall-item-actions">
-	   </div>
-		<div class="wall-item-actions">
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $drop.dropping }}
-					<input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
-					<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drop" title="$drop.delete">$drop.delete</a>
-				{{ endif }}
-				{{ if $edpost }}
-					<a class="icon pencil" href="$edpost.0" title="$edpost.1"></a>
-				{{ endif }}
-			</div>
-
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-			
-	</div>
-</div>
-
diff --git a/view/theme/diabook/diabook-aerith/photo_view.tpl b/view/theme/diabook/diabook-aerith/photo_view.tpl
deleted file mode 100644
index 071972e0c..000000000
--- a/view/theme/diabook/diabook-aerith/photo_view.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
--
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
-</div>
-
-<div id="photo-photo">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-	<a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a>
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-</div>
-
-<div id="photo-photo-end"></div>
-<div id="photo-caption" >$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
-
-<div style="margin-top:20px">
-</div>
-<div id="wall-photo-container">
-$comments
-</div>
-
-$paginate
diff --git a/view/theme/diabook/diabook-aerith/profile_side.tpl b/view/theme/diabook/diabook-aerith/profile_side.tpl
deleted file mode 100644
index 01e80f238..000000000
--- a/view/theme/diabook/diabook-aerith/profile_side.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li>
-	<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li>		
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li>
-</ul>
-
-</div>
-
-				
diff --git a/view/theme/diabook/diabook-aerith/profile_vcard.tpl b/view/theme/diabook/diabook-aerith/profile_vcard.tpl
deleted file mode 100644
index 6fcffcc9b..000000000
--- a/view/theme/diabook/diabook-aerith/profile_vcard.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-<div class="vcard">
-
-	<div class="tool">
-		<div class="fn label">$profile.name</div>
-		{{ if $profile.edit }}
-			<div class="action">
-			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
-			<ul id="profiles-menu" class="menu-popup">
-				{{ for $profile.menu.entries as $e }}
-				<li>
-					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
-				</li>
-				{{ endfor }}
-				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
-				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-				<li><a href="profiles" >$profile.edit.3</a></li>
-								
-			</ul>
-			</div>
-		{{ endif }}
-	</div>
-				
-	
-
-	<div id="profile-photo-wrapper"><img class="photo"  src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt><br> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
-			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/diabook/diabook-aerith/right_aside.tpl b/view/theme/diabook/diabook-aerith/right_aside.tpl
deleted file mode 100644
index a65677696..000000000
--- a/view/theme/diabook/diabook-aerith/right_aside.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
-</ul>
-
-</div>
-
-				
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-aerith/screenshot.png b/view/theme/diabook/diabook-aerith/screenshot.png
deleted file mode 100644
index 4eee5be5a..000000000
--- a/view/theme/diabook/diabook-aerith/screenshot.png
+++ /dev/null
diff --git a/view/theme/diabook/diabook-aerith/search_item.tpl b/view/theme/diabook/diabook-aerith/search_item.tpl
deleted file mode 100644
index 123834064..000000000
--- a/view/theme/diabook/diabook-aerith/search_item.tpl
+++ /dev/null
@@ -1,100 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ 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">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </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 $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></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>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
diff --git a/view/theme/diabook/diabook-aerith/style.php b/view/theme/diabook/diabook-aerith/style.php
deleted file mode 100644
index b8c37fc96..000000000
--- a/view/theme/diabook/diabook-aerith/style.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-	$line_height=false;
-	$diabook_font_size=false;
-	$resolution=false;
-	$site_line_height = get_config("diabook-aerith","line_height");
-	$site_diabook_font_size = get_config("diabook-aerith", "font_size" );
-	$site_resolution = get_config("diabook-aerith", "resolution" );
-	
-	
-	if (local_user()) {
-		$line_height = get_pconfig(local_user(), "diabook-aerith","line_height");
-		$diabook_font_size = get_pconfig(local_user(), "diabook-aerith", "font_size");
-		$resolution = get_pconfig(local_user(), "diabook-aerith", "resolution");
-	}
-	
-	if ($line_height===false) $line_height=$site_line_height;
-	if ($line_height===false) $line_height="1.3";
-	if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size;
-	if ($diabook_font_size===false) $diabook_font_size="13";
-	if ($resolution===false) $resolution=$site_resolution;
-	if ($resolution===false) $resolution="normal";
-	
-	
-	if($resolution == "normal") {	
-	if (file_exists("$THEMEPATH/style.css")){
-		echo file_get_contents("$THEMEPATH/style.css");
-	}
-
-   if($diabook_font_size == "15"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 15px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 15px;
-  					}
-		";
-	}	
-	if($diabook_font_size == "14"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 14px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 14px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12px;
-  					}
-		";
-	}
-	if($line_height == "1.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.5;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.5;
-  					}
-		";
-	}	
-	if($line_height == "1.4"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.4;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.4;
-  					}
-		";
-	}
-	if($line_height == "1.3"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.3;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.3;
-  					}
-		";
-	}
-	if($line_height == "1.2"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.2;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.2;
-  					}
-		";
-	}
-	if($line_height == "1.1"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.1;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.1;
-  					}
-		";
-	}
-	}
-	
-	if($resolution == "wide") {	
-	if (file_exists("$THEMEPATH/style-wide.css")){
-		echo file_get_contents("$THEMEPATH/style-wide.css");
-	}
-	if($diabook_font_size == "15"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 15px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 15px;
-  					}
-		";
-	}
-	if($diabook_font_size == "14"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 14px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 14px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12px;
-  					}
-		";
-	}
-	if($line_height == "1.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.5;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.5;
-  					}
-		";
-	}	
-	if($line_height == "1.4"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.4;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.4;
-  					}
-		";
-	}
-	if($line_height == "1.3"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.3;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.3;
-  					}
-		";
-	}
-	if($line_height == "1.2"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.2;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.2;
-  					}
-		";
-	}
-	if($line_height == "1.1"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.1;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.1;
-  					}
-		";
-	}
-	}
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-aerith/theme.php b/view/theme/diabook/diabook-aerith/theme.php
deleted file mode 100644
index 1518d7e8e..000000000
--- a/view/theme/diabook/diabook-aerith/theme.php
+++ /dev/null
@@ -1,488 +0,0 @@
-<?php
-
-/*
- * Name: Diabook-aerith
- * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.020)
- * Author: 
- */
-
-
-//print diabook-version for debugging
-$diabook_version = "Diabook-aerith (Version: 1.020)";
-$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
-
-
-//change css on network and profilepages
-$cssFile = null;
-$resolution=false;
-$resolution = get_pconfig(local_user(), "diabook-aerith", "resolution");
-if ($resolution===false) $resolution="normal";
-
-/**
- * prints last community activity
- */
-function diabook_aerith_community_info(){
-	$a = get_app();
-
-	// last 12 users
-	$aside['$lastusers_title'] = t('Last users');
-	$aside['$lastusers_items'] = array();
-	$sql_extra = "";
-	$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
-	$order = " ORDER BY `register_date` DESC ";
-
-	$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
-			FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` 
-			WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
-		0,
-		9
-	);
-	$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
-	if(count($r)) {
-		$photo = 'thumb';
-		foreach($r as $rr) {
-			$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
-			$entry = replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$profile-link' => $profile_link,
-				'$photo' => $rr[$photo],
-				'$alt-text' => $rr['name'],
-			));
-			$aside['$lastusers_items'][] = $entry;
-		}
-	}
-	
-	
-	// last 10 liked items
-	$aside['$like_title'] = t('Last likes');
-	$aside['$like_items'] = array();
-	$r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM 
-			(SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` 
-				FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1
-			INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` 
-			WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
-			GROUP BY `uri`
-			ORDER BY `T1`.`created` DESC
-			LIMIT 0,5",
-			$a->get_baseurl(),$a->get_baseurl()
-			);
-
-	foreach ($r as $rr) {
-		$author	 = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
-		$objauthor =  '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
-		
-		//var_dump($rr['verb'],$rr['object-type']); killme();
-		switch($rr['verb']){
-			case 'http://activitystrea.ms/schema/1.0/post':
-				switch ($rr['object-type']){
-					case 'http://activitystrea.ms/schema/1.0/event':
-						$post_type = t('event');
-						break;
-					default:
-						$post_type = t('status');
-				}
-				break;
-			default:
-				if ($rr['resource-id']){
-					$post_type = t('photo');
-					$m=array();	preg_match("/\[url=([^]]*)\]/", $rr['body'], $m);
-					$rr['plink'] = $m[1];
-				} else {
-					$post_type = t('status');
-				}
-		}
-		$plink = '<a href="' . $rr['plink'] . '">' . $post_type . '</a>';
-
-		$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
-		
-	}
-	
-	
-	// last 12 photos
-	$aside['$photos_title'] = t('Last photos');
-	$aside['$photos_items'] = array();
-	$r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM 
-				(SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` 
-					WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s')
-						AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1`
-				INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`,
-				`user` 
-				WHERE `user`.`uid` = `photo`.`uid`
-				AND `user`.`blockwall`=0
-				AND `user`.`hidewall`=0
-				ORDER BY `photo`.`edited` DESC
-				LIMIT 0, 9",
-				dbesc(t('Contact Photos')),
-				dbesc(t('Profile Photos'))
-				);
-		if(count($r)) {
-		$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
-		foreach($r as $rr) {
-			$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
-			$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
-		
-			$entry = replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$profile-link' => $photo_page,
-				'$photo' => $photo_url,
-				'$alt-text' => $rr['username']." : ".$rr['desc'],
-			));
-
-			$aside['$photos_items'][] = $entry;
-		}
-	}
-	
-	
-   
-   //nav FIND FRIENDS
-	if(local_user()) {
-	$nv = array();
-   $nv['title'] = Array("", t('Find Friends'), "", "");
-	$nv['directory'] = Array('directory', t('Local Directory'), "", "");
-	$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
-	$nv['match'] = Array('match', t('Similar Interests'), "", "");
-	$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
-	$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
-	
-	$nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
-						<span class="sbox_l"></span>
-						<span class="sbox">
-						<input type="text" name="search" size="13" maxlength="50">
-						</span>
-						<span class="sbox_r" id="srch_clear"></span>';
-						
-	$aside['$nv'] = $nv;
-	};
-	//Community Page
-	if(local_user()) {
-   $page = '<div id="page-sidebar-right_aside" class="widget">
-			<div class="title tool">
-			<h3>'.t("Community Pages").'<a id="close_pages_icon"  onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
-			<div id="sidebar-page-list"><ul>';
-
-	$pagelist = array();
-
-	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
-			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
-			ORDER BY `name` ASC",
-			intval($a->user['uid'])
-	);
-
-	$pageD = array();
-
-	// Look if the profile is a community page
-	foreach($contacts as $contact) {
-		$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
-	};
-	
-
-	$contacts = $pageD;
-
-	foreach($contacts as $contact) {
-		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
-				$contact["name"]."</a></li>";
-	}
-	$page .= '</ul></div></div>';
-	//if (sizeof($contacts) > 0)
-		
-		$aside['$page'] = $page;
-	}		
-  //END Community Page	
-  //helpers
-   $helpers = array();
-	$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
-	
-	$aside['$helpers'] = $helpers;
-   //end helpers
-   //connectable services
-   $con_services = array();
-	$con_services['title'] = Array("", t('Connect Services'), "", "");
-	
-	$aside['$con_services'] = $con_services;
-   //end connectable services
-   
-  
-   //get_baseurl	      
-   $url = $a->get_baseurl($ssl_state);   
-   $aside['$url'] = $url;
-
-	$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
-	$a->page['right_aside'] = replace_macros($tpl, $aside);
-	
-}
-
-
-//profile_side at networkpages
-if ($a->argv[0] === "network" && local_user()){
-
-	// USER MENU
-	if(local_user()) {
-		
-		$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
-				
-		$userinfo = array(
-					'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
-					'name' => $a->user['username'],
-				);	
-		$ps = array('usermenu'=>array());
-		$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
-		$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
-		$ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));		
-		$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
-		$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
-		$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
-		$ps['usermenu']['community'] = Array('community/', t('Community'), "", "");
-		$ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", "");
-
-		$tpl = get_markup_template('profile_side.tpl');
-
-		$a->page['aside'] .= replace_macros($tpl, array(
-				'$userinfo' => $userinfo,
-				'$ps' => $ps,
-			));
-
-	}
-	
-	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
-	
-	if($ccCookie != "7") {
-	// COMMUNITY
-	diabook_aerith_community_info();
-	
-	// CUSTOM CSS
-	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network.css";}
-	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network-wide.css";}
-	}
-}
-
-
-
-//right_aside at profile pages
-if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-	if($ccCookie != "7") {
-	// COMMUNITY
-	diabook_aerith_community_info();
-	
-	// CUSTOM CSS
-	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile.css";}
-	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile-wide.css";}
-	}
-}
-
-
-
-// custom css
-if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
-
-//load jquery.cookie.js
-$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.cookie.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS);
-
-//load jquery.ae.image.resize.js
-$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.ae.image.resize.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
-
-//load jquery.autogrow-textarea.js
-$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.autogrow.textarea.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS);
-
-//js scripts
-//comment-edit-wrapper on photo_view
-if ($a->argv[0].$a->argv[2] === "photos"."image"){
-
-$a->page['htmlhead'] .= '
-<script>
-	$(function(){
-	
-		$(".comment-edit-form").css("display","table");
-			
-			});
-    </script>';
-	
-}
-
-$a->page['htmlhead'] .= '
-
-<script>
- $(function() {
-	$("a.lightbox").fancybox(); // Select all links with lightbox class
- });
-  
- </script>';
- 
-$a->page['htmlhead'] .= '
-
-<script type="text/javascript">
-
-function tautogrow(id){
-		$("textarea#comment-edit-text-" +id).autogrow(); 	
- 	};
- </script>';
-
-$a->page['htmlhead'] .= '
- <script>
- 
-$(document).ready(function() {
-    $("iframe").each(function(){
-        var ifr_source = $(this).attr("src");
-        var wmode = "wmode=transparent";
-        if(ifr_source.indexOf("?") != -1) {
-            var getQString = ifr_source.split("?");
-            var oldString = getQString[1];
-            var newString = getQString[0];
-            $(this).attr("src",newString+"?"+wmode+"&"+oldString);
-        }
-        else $(this).attr("src",ifr_source+"?"+wmode);
-    });
-      
-
-});
-
-function yt_iframe() {
-	
-	$("iframe").load(function() { 
-	var ifr_src = $(this).contents().find("body iframe").attr("src");
-	$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
-    });
-
-	};
-  
- </script>';
-
-if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
-$a->page['htmlhead'] .= '
-<script>
-
- $(function() {
-	$(".oembed.photo img").aeImageResize({height: 400, width: 400});
-  });
-</script>';
-
-
-	if($ccCookie != "7") {
-$a->page['htmlhead'] .= '
-<script>
-$("right_aside").ready(function(){
-	
-	if($.cookie("close_pages") == "1") 
-		{
-		document.getElementById( "close_pages" ).style.display = "none";
-			};
-	
-	if($.cookie("close_helpers") == "1") 
-		{
-		document.getElementById( "close_helpers" ).style.display = "none";
-			};
-			
-	if($.cookie("close_services") == "1") 
-		{
-		document.getElementById( "close_services" ).style.display = "none";
-			};
-			
-	if($.cookie("close_friends") == "1") 
-		{
-		document.getElementById( "close_friends" ).style.display = "none";
-			};
-	
-			
-	if($.cookie("close_lastusers") == "1") 
-		{
-		document.getElementById( "close_lastusers" ).style.display = "none";
-			};
-			
-	if($.cookie("close_lastphotos") == "1") 
-		{
-		document.getElementById( "close_lastphotos" ).style.display = "none";
-			};
-			
-	if($.cookie("close_lastlikes") == "1") 
-		{
-		document.getElementById( "close_lastlikes" ).style.display = "none";
-			};}
-
-);
-
-function close_pages(){
- document.getElementById( "close_pages" ).style.display = "none";
- $.cookie("close_pages","1", { expires: 365, path: "/" });
- };
- 
-function close_helpers(){
- document.getElementById( "close_helpers" ).style.display = "none";
-  $.cookie("close_helpers","1", { expires: 365, path: "/" });
- };
-
-function close_services(){
- document.getElementById( "close_services" ).style.display = "none";
- $.cookie("close_services","1", { expires: 365, path: "/" });
- };
- 
-function close_friends(){
- document.getElementById( "close_friends" ).style.display = "none";
- $.cookie("close_friends","1", { expires: 365, path: "/" });
- };
-
- 
-function close_lastusers(){
- document.getElementById( "close_lastusers" ).style.display = "none";
- $.cookie("close_lastusers","1", { expires: 365, path: "/" });
- };
-
-function close_lastphotos(){
- document.getElementById( "close_lastphotos" ).style.display = "none";
- $.cookie("close_lastphotos","1", { expires: 365, path: "/" });
- };
- 
-function close_lastlikes(){
- document.getElementById( "close_lastlikes" ).style.display = "none";
- $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
- };
-</script>';}
-
-$a->page['htmlhead'] .= ' 
-<script>
-function restore_boxes(){
-	$.cookie("close_pages","2", { expires: 365, path: "/" });
-	$.cookie("close_helpers","2", { expires: 365, path: "/" });
-	$.cookie("close_services","2", { expires: 365, path: "/" });
-	$.cookie("close_friends","2", { expires: 365, path: "/" });
-	$.cookie("close_lastusers","2", { expires: 365, path: "/" });
-	$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
-	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
-	alert("Right-hand column was restored. Please refresh your browser");
-  }
-</script>';}
-
-$a->page['htmlhead'] .= ' 
-
-<script type="text/javascript">
-function insertFormatting(comment,BBcode,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);
-											}
-
-	textarea = document.getElementById("comment-edit-text-" +id);
-	if (document.selection) {
-		textarea.focus();
-		selected = document.selection.createRange();
-		if (BBcode == "url"){
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-			} else			
-		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
-		var start = textarea.selectionStart;
-		var end = textarea.selectionEnd;
-		if (BBcode == "url"){
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-			} else
-		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-	}
-	return true;
-}
-</script> ';
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-aerith/theme_settings.tpl b/view/theme/diabook/diabook-aerith/theme_settings.tpl
deleted file mode 100644
index 472232cf0..000000000
--- a/view/theme/diabook/diabook-aerith/theme_settings.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{inc field_select.tpl with $field=$font_size}}{{endinc}}
-
-{{inc field_select.tpl with $field=$line_height}}{{endinc}}
-
-{{inc field_select.tpl with $field=$resolution}}{{endinc}}
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="$submit" class="settings-submit" name="diabook-aerith-settings-submit" />
-</div>
-
diff --git a/view/theme/diabook/diabook-aerith/wall_item.tpl b/view/theme/diabook/diabook-aerith/wall_item.tpl
deleted file mode 100644
index 123834064..000000000
--- a/view/theme/diabook/diabook-aerith/wall_item.tpl
+++ /dev/null
@@ -1,100 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ 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">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </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 $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></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>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
diff --git a/view/theme/diabook/diabook-aerith/wallwall_item.tpl b/view/theme/diabook/diabook-aerith/wallwall_item.tpl
deleted file mode 100644
index 6a0c93f88..000000000
--- a/view/theme/diabook/diabook-aerith/wallwall_item.tpl
+++ /dev/null
@@ -1,106 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
-					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
-				</a>
-			</div>
-			<div class="contact-photo-wrapper mframe wwfrom"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
-				$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a>
-				 $item.vwall <span class="wall-item-ago">- &nbsp;
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ 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">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </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 $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></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>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
\ No newline at end of file