diff --git a/view/theme/blog/comment_item.tpl b/view/theme/blog/comment_item.tpl
new file mode 100644
index 0000000..f933fe6
--- /dev/null
+++ b/view/theme/blog/comment_item.tpl
@@ -0,0 +1,29 @@
+<div style="{{ if $threaded }}display:none;{{ endif }}">
+ <div id="respond-$id" class="respond {{ if $threaded }}thread{{ endif }}" >
+    <h3 id="reply-title">
+      Leave a Reply 
+    </h3>
+    <form id="comment-edit-form-$item.id" class="comment-edit-form" 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" />
+            <input type="hidden" name="post_id_random" value="$rand_num" />
+            
+
+      <p class="comment-form-comment">
+        <label for="comment"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" width="16" height="16" /> $comment</label>
+        <textarea id="comment" name="body" cols="45" rows="8" aria-required="true"></textarea>
+      </p>
+
+      <p class="form-submit">
+            <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+            {{ if $preview }}<a href="#" onclick="preview_comment($id); return false;" id="comment-edit-preview-link-$id" class="button">$preview</a>{{ endif }}
+      </p>
+    </form>
+    <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+</div>
+<!-- #respond -->
+</div>
\ No newline at end of file
diff --git a/view/theme/blog/config.php b/view/theme/blog/config.php
new file mode 100644
index 0000000..7ad3538
--- /dev/null
+++ b/view/theme/blog/config.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Theme settings
+ */
+
+
+
+function theme_content(&$a){
+	if(!local_user())
+		return;		
+
+    $headimg = get_pconfig(local_user(), 'blogtheme', 'headimg');
+    $headimghome = get_pconfig(local_user(), 'blogtheme', 'headimghome');
+    
+	return blogtheme_form($a,$headimg, $headimghome);
+}
+
+function theme_post(&$a){
+	if(! local_user())
+		return;
+	
+	if (isset($_POST['blog-settings-submit'])){
+		set_pconfig(local_user(), 'blogtheme', 'headimg',  $_POST['blog_headimg']);
+		set_pconfig(local_user(), 'blogtheme', 'headimghome',  $_POST['blog_headimghome']);
+	}
+}
+
+
+function theme_admin(&$a){
+    $headimg = get_config('blogtheme', 'headimg');
+    $headimghome = get_config('blogtheme', 'headimghome');
+
+	return blogtheme_form($a,$headimg, $headimghome);
+}
+
+function theme_admin_post(&$a){
+	if (isset($_POST['blog-settings-submit'])){
+        set_config('blogtheme', 'headimg',  $_POST['blog_headimg']);
+        set_config('blogtheme', 'headimghome',  $_POST['blog_headimghome']);
+	}
+}
+
+function blogtheme_form(&$a, $headimg, $headimghome){
+    
+    if ($headimg === False) $headimg = ".willow.jpg"; 
+    $imgs = array(
+        "~none~" => t("None"),
+        ".willow.jpg" => "willow.jpg",
+        ".wheel.jpg" => "wheel.jpg",
+    );
+
+    
+	$t = get_markup_template("config.tpl" );
+	$o .= replace_macros($t, array(
+		'$submit' => t('Submit'),
+		'$baseurl' => $a->get_baseurl(),
+		'$title' => t("Theme settings"),
+		'$headimg' => array('blog_headimg', t('Header image'), $headimg, '', $imgs ),
+		'$headimghome' => array('blog_headimghome', t('Header image only on profile pages'), $headimghome, ''),
+	));
+	return $o;
+}
diff --git a/view/theme/blog/config.tpl b/view/theme/blog/config.tpl
new file mode 100644
index 0000000..3fb45e6
--- /dev/null
+++ b/view/theme/blog/config.tpl
@@ -0,0 +1,9 @@
+  
+{{inc field_select.tpl with $field=$headimg}}{{endinc}}
+
+{{inc field_yesno.tpl with $field=$headimghome}}{{endinc}}
+
+<div class="buttonbar">
+	<input type="submit" value="$submit" name="blog-settings-submit" />
+</div>
+
diff --git a/view/theme/blog/contact_template.tpl b/view/theme/blog/contact_template.tpl
new file mode 100644
index 0000000..231eb9a
--- /dev/null
+++ b/view/theme/blog/contact_template.tpl
@@ -0,0 +1,9 @@
+<div class="wp-caption alignleft contact dropmenu" style="width: 100px;">
+        <a href="$contact.url" title="$contact.img_hover" /><img class="wp-image-59" src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
+        <p class="gallery-caption">$contact.name</p>
+        {{ if $contact.photo_menu }}
+        <ul  class="menu-popup">
+                $contact.photo_menu
+        </ul>
+        {{ endif }}
+</div>
diff --git a/view/theme/blog/contacts-head.tpl b/view/theme/blog/contacts-head.tpl
new file mode 100644
index 0000000..011f55b
--- /dev/null
+++ b/view/theme/blog/contacts-head.tpl
@@ -0,0 +1,17 @@
+
+<script src="$baseurl/library/jquery_ac/friendica.complete.js" ></script>
+
+<script>
+$(document).ready(function() { 
+	var a; 
+	a = $("#contacts-search").autocomplete({ 
+		serviceUrl: '$base/acl',
+		minChars: 2,
+		width: 350,
+	});
+	a.setOptions({ params: { type: 'a' }});
+
+}); 
+
+</script>
+
diff --git a/view/theme/blog/contacts-template.tpl b/view/theme/blog/contacts-template.tpl
new file mode 100644
index 0000000..288f953
--- /dev/null
+++ b/view/theme/blog/contacts-template.tpl
@@ -0,0 +1,26 @@
+<section class="entry-content">
+<h1 class="entry-title">$header{{ if $total }} <small>($total)</small>{{ endif }}</h1>
+
+    {{ if $finding }}<h4>$finding</h4>{{ endif }}
+
+    <div class="buttonbar">
+        <form id="contacts-search-form" action="$cmd" method="get" >
+            <span class="contacts-search-desc">$desc</span>
+            <input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="$search" />
+            <input type="submit" name="submit" id="contacts-search-submit" value="$submit" />
+        </form>
+    </div>
+    
+    $tabs
+
+
+    {{ for $contacts as $contact }}
+        {{ inc contact_template.tpl }}{{ endinc }}
+    {{ endfor }}
+    <div id="contact-edit-end"></div>
+
+    $paginate
+
+
+</section>
+
diff --git a/view/theme/blog/default.php b/view/theme/blog/default.php
index bf2727e..82c868a 100755
--- a/view/theme/blog/default.php
+++ b/view/theme/blog/default.php
@@ -1,21 +1,40 @@
-<!DOCTYPE html >
+<?php 
+    $headimg = get_config('blogtheme', 'headimg');
+    $headimghome = get_config('blogtheme', 'headimghome');
+    $headimghome = get_config('blogtheme', 'headimghome');
+    if (local_user()) {
+        $headimg = get_pconfig(local_user(), 'blogtheme', 'headimg');
+        $headimghome = get_pconfig(local_user(), 'blogtheme', 'headimghome');
+    }
+    $headimg = blogtheme_imgurl($headimg);
+   
+    if ($headimghome && $a->module!='profile') $headimg="";
+    
+    if ($headimg === False) $headimg = $a->get_baseurl()."/view/theme/blog/headers/willow.jpg";
+    
+    
+   
+    // if mod==display whe are looking a single thread, delete aside content
+    if  ($a->module=='display') { unset($page['aside']); unset($page['right_aside']); }
+
+    // if no aside content, show page in singular mode
+    $bodyclass="";
+    if (!x($page,'aside') && !x($page,'right_aside')) $bodyclass.=" singular";
+    
+    
+?><!DOCTYPE html >
 <html>
 <head>
   <title><?php if(x($page,'title')) echo $page['title'] ?></title>
   <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
   <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
 </head>
-<?php 
-    $bodyclass="";
-    if (!x($page,'aside') && !x($page,'right_aside')) $bodyclass.=" singular";
-?>
 <body class="<?php echo $bodyclass;?>">
     <div id="page">
         <?php 
             if(x($page,'nav')){
                 // header image
-                $img = $a->get_baseurl()."/view/theme/blog/headers/willow.jpg";
-                echo str_replace("~blog.header.image~", $img, 
+                echo str_replace("~blog.header.image~", $headimg, 
                        str_replace("~config.sitename~",get_config('config','sitename'),
                        str_replace("~system.banner~",get_config('system','banner'),
                             $page['nav']
@@ -30,7 +49,7 @@
                 </div>
             </div>
             <?php if (x($page,'aside') || x($page,'right_aside')) { ?>
-            <div id="secondary" class="widget-area <?php if (in_array($a->module, array('profile','photos','display'))) echo 'overlap'; ?>" role="complementary">
+            <div id="secondary" class="widget-area <?php if (in_array($a->module, array('profile','photos','display'))) echo 'overlap'; if ($headimg=="") echo " lower"; ?>" role="complementary">
                 <?php if(x($page,'aside')) echo $page['aside']; ?>
                 <?php if(x($page,'right_aside')) echo $page['right_aside']; ?>
             </div>
diff --git a/view/theme/blog/directory_end.tpl b/view/theme/blog/directory_end.tpl
new file mode 100644
index 0000000..c63a94a
--- /dev/null
+++ b/view/theme/blog/directory_end.tpl
@@ -0,0 +1 @@
+</section>
\ No newline at end of file
diff --git a/view/theme/blog/directory_header.tpl b/view/theme/blog/directory_header.tpl
new file mode 100644
index 0000000..0dff344
--- /dev/null
+++ b/view/theme/blog/directory_header.tpl
@@ -0,0 +1,16 @@
+<section class="entry-content">
+<h1 class="entry-title">$sitedir</h1>
+
+$globaldir
+$admin
+
+$finding
+
+<div id="directory-search-wrapper">
+<form id="directory-search-form" action="directory" method="get" >
+<span class="dirsearch-desc">$desc</span>
+<input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="$search" />
+<input type="submit" name="submit" id="directory-search-submit" value="$submit" class="button" />
+</form>
+</div>
+<div id="directory-search-end"></div>
diff --git a/view/theme/blog/directory_item.tpl b/view/theme/blog/directory_item.tpl
new file mode 100644
index 0000000..5b86a57
--- /dev/null
+++ b/view/theme/blog/directory_item.tpl
@@ -0,0 +1,6 @@
+<div class="wp-caption alignleft contact" style="width: 185px;">
+        <a href="$profile_link" /><img class="wp-image-59" src="$photo"  alt="$alt_text" title="$alt_text" /></a>
+        <p class="gallery-caption">$name</p>
+        <div class="gallery-caption">$details</div>
+</div>
+
diff --git a/view/theme/blog/field_input.tpl b/view/theme/blog/field_input.tpl
new file mode 100644
index 0000000..850b93d
--- /dev/null
+++ b/view/theme/blog/field_input.tpl
@@ -0,0 +1,6 @@
+	
+	<div class='field input'>
+		<label for='id_$field.0'>$field.1</label>
+		<input type="text" name='$field.0' id='id_$field.0' value="$field.2">
+		<span class='field_help'>$field.3</span>
+	</div>
diff --git a/view/theme/blog/full_comment_form.tmp b/view/theme/blog/full_comment_form.tmp
new file mode 100644
index 0000000..c11bb07
--- /dev/null
+++ b/view/theme/blog/full_comment_form.tmp
@@ -0,0 +1,49 @@
+ <div id="respond">
+    <h3 id="reply-title">
+      Leave a Reply 
+      <small>
+        <a rel="nofollow" id="cancel-comment-reply-link" href="/?p=8#respond" style="display:none;">Cancel reply</a>
+      </small>
+    </h3>
+    <form action="http://wp-themes.com/wp/wp-comments-post.php" method="post" id="commentform">
+      <p class="comment-notes">
+        Your email address will not be published. Required fields are marked 
+        <span class="required">*</span>
+      </p>
+      <p class="comment-form-author">
+        <label for="author">
+          Name 
+          <span class="required">*</span>
+        </label>
+        <input id="author" name="author" type="text" value="" size="30" aria-required="true">
+      </p>
+      <p class="comment-form-email">
+        <label for="email">
+          Email 
+          <span class="required">*</span>
+        </label>
+        <input id="email" name="email" type="text" value="" size="30" aria-required="true">
+      </p>
+      <p class="comment-form-url">
+        <label for="url">Website</label>
+        <input id="url" name="url" type="text" value="" size="30">
+      </p>
+      <p class="comment-form-comment">
+        <label for="comment">Comment</label>
+        <textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea>
+      </p>
+      <p class="form-allowed-tags">
+        You may use these 
+        <abbr title="HyperText Markup Language">HTML</abbr>
+         tags and attributes:  
+        <code>&lt;a href="" title=""> &lt;abbr title=""> &lt;acronym title=""> &lt;b> &lt;blockquote cite=""> &lt;cite> &lt;code> &lt;del datetime=""> &lt;em> &lt;i> &lt;q cite=""> &lt;strike> &lt;strong> </code>
+      </p>
+      <p class="form-submit">
+        <input name="submit" type="submit" id="submit" value="Post Comment">
+        <input type="hidden" name="comment_post_ID" value="8" id="comment_post_ID">
+        <input type="hidden" name="comment_parent" id="comment_parent" value="0">
+      </p>
+    </form>
+  </div>
+  <!-- #respond -->
+</div>
diff --git a/view/theme/blog/headers/wheel.jpg b/view/theme/blog/headers/wheel.jpg
new file mode 100644
index 0000000..c5b9878
Binary files /dev/null and b/view/theme/blog/headers/wheel.jpg differ
diff --git a/view/theme/blog/icons/pencil.png b/view/theme/blog/icons/pencil.png
new file mode 100644
index 0000000..9abd765
Binary files /dev/null and b/view/theme/blog/icons/pencil.png differ
diff --git a/view/theme/blog/images/comment-arrow.png b/view/theme/blog/images/comment-arrow.png
new file mode 100644
index 0000000..60a6d5d
Binary files /dev/null and b/view/theme/blog/images/comment-arrow.png differ
diff --git a/view/theme/blog/jot.tpl b/view/theme/blog/jot.tpl
index e48fc66..4c14eff 100644
--- a/view/theme/blog/jot.tpl
+++ b/view/theme/blog/jot.tpl
@@ -21,7 +21,7 @@
             {{ endif }}
             <div id="jot-text-wrap">
             <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>
+            <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ endif }}</textarea>
             </div>
 
         <dl class="toolbox">
diff --git a/view/theme/blog/profile-hide-friends.tpl b/view/theme/blog/profile-hide-friends.tpl
new file mode 100644
index 0000000..b32c132
--- /dev/null
+++ b/view/theme/blog/profile-hide-friends.tpl
@@ -0,0 +1,8 @@
+	<div class='field yesno'>
+		<label for='id_hide-friends'>$desc</label>
+		<div class='onoff' id="id_hide-friends_onoff">
+			<input  type="hidden" name='$hide-friends' id='id_hide-friends' value="{{if $yes_selected}}1{{else}}0{{endif}}">
+			<a href="#" class='off'>$no_str</a>
+			<a href="#" class='on'>$yes_str</a>
+		</div>
+	</div>
diff --git a/view/theme/blog/profile-hide-wall.tpl b/view/theme/blog/profile-hide-wall.tpl
new file mode 100644
index 0000000..10185e2
--- /dev/null
+++ b/view/theme/blog/profile-hide-wall.tpl
@@ -0,0 +1,16 @@
+<p id="hide-wall-text">
+$desc
+</p>
+
+		<div id="hide-wall-yes-wrapper">
+		<label id="hide-wall-yes-label" for="hide-wall-yes">$yes_str</label>
+		<input type="radio" name="hidewall" id="hide-wall-yes" $yes_selected value="1" />
+
+		<div id="hide-wall-break" ></div>	
+		</div>
+		<div id="hide-wall-no-wrapper">
+		<label id="hide-wall-no-label" for="hide-wall-no">$no_str</label>
+		<input type="radio" name="hidewall" id="hide-wall-no" $no_selected value="0"  />
+
+		<div id="hide-wall-end"></div>
+		</div>
diff --git a/view/theme/blog/profile_advanced.tpl b/view/theme/blog/profile_advanced.tpl
new file mode 100644
index 0000000..1eb1525
--- /dev/null
+++ b/view/theme/blog/profile_advanced.tpl
@@ -0,0 +1,171 @@
+<section class="entry-content">
+    <h1 class="entry-title">$title</h1>
+
+    <dl id="aprofile-fullname" class="aprofile">
+     <dt>$profile.fullname.0</dt>
+     <dd>$profile.fullname.1</dd>
+    </dl>
+
+    {{ if $profile.gender }}
+    <dl id="aprofile-gender" class="aprofile">
+     <dt>$profile.gender.0</dt>
+     <dd>$profile.gender.1</dd>
+    </dl>
+    {{ endif }}
+
+    {{ if $profile.birthday }}
+    <dl id="aprofile-birthday" class="aprofile">
+     <dt>$profile.birthday.0</dt>
+     <dd>$profile.birthday.1</dd>
+    </dl>
+    {{ endif }}
+
+    {{ if $profile.age }}
+    <dl id="aprofile-age" class="aprofile">
+     <dt>$profile.age.0</dt>
+     <dd>$profile.age.1</dd>
+    </dl>
+    {{ endif }}
+
+    {{ if $profile.marital }}
+    <dl id="aprofile-marital" class="aprofile">
+     <dt><span class="heart">&hearts;</span>  $profile.marital.0</dt>
+     <dd>$profile.marital.1{{ if $profile.marital.with }} ($profile.marital.with){{ endif }}{{ if $profile.howlong }} $profile.howlong{{ endif }}</dd>
+    </dl>
+    {{ endif }}
+
+    {{ if $profile.sexual }}
+    <dl id="aprofile-sexual" class="aprofile">
+     <dt>$profile.sexual.0</dt>
+     <dd>$profile.sexual.1</dd>
+    </dl>
+    {{ endif }}
+
+    {{ if $profile.pub_keywords }}
+    <dl id="aprofile-tags" class="aprofile">
+     <dt>$profile.pub_keywords.0</dt>
+     <dd>$profile.pub_keywords.1</dd>
+    </dl>
+    {{ endif }}
+
+    {{ if $profile.homepage }}
+    <dl id="aprofile-homepage" class="aprofile">
+     <dt>$profile.homepage.0</dt>
+     <dd>$profile.homepage.1</dd>
+    </dl>
+    {{ endif }}
+
+    {{ if $profile.hometown }}
+    <dl id="aprofile-hometown" class="aprofile">
+     <dt>$profile.hometown.0</dt>
+     <dd>$profile.hometown.1</dd>
+    </dl>
+    {{ endif }}
+
+    {{ if $profile.politic }}
+    <dl id="aprofile-politic" class="aprofile">
+     <dt>$profile.politic.0</dt>
+     <dd>$profile.politic.1</dd>
+    </dl>
+    {{ endif }}
+
+    {{ if $profile.religion }}
+    <dl id="aprofile-religion" class="aprofile">
+     <dt>$profile.religion.0</dt>
+     <dd>$profile.religion.1</dd>
+    </dl>
+    {{ endif }}
+
+    {{ if $profile.about }}
+    <dl id="aprofile-about" class="aprofile">
+     <dt>$profile.about.0</dt>
+     <dd>$profile.about.1</dd>
+    </dl>
+    {{ endif }}
+
+    {{ if $profile.interest }}
+    <dl id="aprofile-interest" class="aprofile">
+     <dt>$profile.interest.0</dt>
+     <dd>$profile.interest.1</dd>
+    </dl>
+    {{ endif }}
+
+    {{ if $profile.likes }}
+    <dl id="aprofile-likes" class="aprofile">
+     <dt>$profile.likes.0</dt>
+     <dd>$profile.likes.1</dd>
+    </dl>
+    {{ endif }}
+
+    {{ if $profile.dislikes }}
+    <dl id="aprofile-dislikes" class="aprofile">
+     <dt>$profile.dislikes.0</dt>
+     <dd>$profile.dislikes.1</dd>
+    </dl>
+    {{ endif }}
+
+    {{ if $profile.contact }}
+    <dl id="aprofile-contact" class="aprofile">
+     <dt>$profile.contact.0</dt>
+     <dd>$profile.contact.1</dd>
+    </dl>
+    {{ endif }}
+
+
+    {{ if $profile.music }}
+    <dl id="aprofile-music" class="aprofile">
+     <dt>$profile.music.0</dt>
+     <dd>$profile.music.1</dd>
+    </dl>
+    {{ endif }}
+
+
+    {{ if $profile.book }}
+    <dl id="aprofile-book" class="aprofile">
+     <dt>$profile.book.0</dt>
+     <dd>$profile.book.1</dd>
+    </dl>
+    {{ endif }}
+
+
+    {{ if $profile.tv }}
+    <dl id="aprofile-tv" class="aprofile">
+     <dt>$profile.tv.0</dt>
+     <dd>$profile.tv.1</dd>
+    </dl>
+    {{ endif }}
+
+
+    {{ if $profile.film }}
+    <dl id="aprofile-film" class="aprofile">
+     <dt>$profile.film.0</dt>
+     <dd>$profile.film.1</dd>
+    </dl>
+    {{ endif }}
+
+
+    {{ if $profile.romance }}
+    <dl id="aprofile-romance" class="aprofile">
+     <dt>$profile.romance.0</dt>
+     <dd>$profile.romance.1</dd>
+    </dl>
+    {{ endif }}
+
+
+    {{ if $profile.work }}
+    <dl id="aprofile-work" class="aprofile">
+     <dt>$profile.work.0</dt>
+     <dd>$profile.work.1</dd>
+    </dl>
+    {{ endif }}
+
+    {{ if $profile.education }}
+    <dl id="aprofile-education" class="aprofile">
+     <dt>$profile.education.0</dt>
+     <dd>$profile.education.1</dd>
+    </dl>
+    {{ endif }}
+
+</section>
+
+
diff --git a/view/theme/blog/profile_edit.tpl b/view/theme/blog/profile_edit.tpl
new file mode 100644
index 0000000..fbe6d2f
--- /dev/null
+++ b/view/theme/blog/profile_edit.tpl
@@ -0,0 +1,235 @@
+<section class="entry-content">
+    $default
+
+    <div class="buttonbar">
+        <a href="profile_photo" class="button" title="$profpic">$profpic</a>
+        <a href="profile/$profile_id/view?tab=profile" class="button"  title="$viewprof">$viewprof</a>
+        <a href="$profile_clone_link" class="button"  title="$cr_prof">$cl_prof</a>
+    </div>
+    {{ if  $disabled }}{{ else }}
+    <div class="buttonbar">        
+        <a href="$profile_drop_link" class="button" title="$del_prof" >$del_prof</a>
+    </div>
+    {{ endif }}
+
+    <h1 class="entry-title">$banner</h1>
+
+    <form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
+    
+        <input type='hidden' name='form_security_token' value='$form_security_token'>
+
+        <div class='field input'>
+            <label for='id_profile_name'>* $lbl_profname</label>
+            <input type="text" name='profile_name' id='id_profile_name' value="$profile_name">
+        </div>
+        
+        <div class='field input'>
+            <label for='id_name'>$lbl_fullname</label>
+            <input type="text" name='name' id='id_name' value="$name">
+        </div>        
+
+        <div class='field input'>
+            <label for='id_pdesc'>$lbl_title</label>
+            <input type="text" name='pdesc' id='id_pdesc' value="$pdesc">
+        </div>        
+
+        <div class='field select'>
+            <label for='gender-select'>$lbl_gender</label>
+            $gender
+        </div>        
+
+        <div class='field multiselect'>
+            <label for='dob-select'>$lbl_bd</label>
+            <span class="multiselect">$dob $age</span>
+        </div>        
+
+        $hide_friends
+        
+
+    <div class="buttonbar">
+        <input type="submit" name="submit" value="$submit" />
+    </div>
+    
+        <div class='field input'>
+            <label for='id_address'>$lbl_address</label>
+            <input type="text" name='address' id='id_address' value="$address">
+        </div>
+
+        <div class='field input'>
+            <label for='id_locality'>$lbl_city</label>
+            <input type="text" name='locality' id='id_locality' value="$locality">
+        </div>
+        
+        <div class='field input'>
+            <label for='id_postal_code'>$lbl_zip</label>
+            <input type="text" name='postal_code' id='id_postal_code' value="$postal_code">
+        </div>
+        
+        <div class='field select'>
+            <label for='id_country_name'>$lbl_country</label>
+            <select name="country_name" id="id_country_name" onChange="Fill_States('$region');">
+                <option selected="selected" >$country_name</option>
+                <option>temp</option>
+            </select>
+        </div>
+        
+        <div class='field select'>
+            <label for='id_region'>$lbl_region</label>
+            <select name="region" id="id_region" onChange="Update_Globals();" >
+                <option selected="selected" >$region</option>
+                <option>temp</option>
+            </select>
+        </div>
+        
+        <div class='field input'>
+            <label for='id_hometown'>$lbl_hometown</label>
+            <input type="text" name='hometown' id='id_hometown' value="$hometown">
+        </div>
+        
+
+    <div class="buttonbar" >
+        <input type="submit" name="submit" value="$submit" />
+    </div>
+
+
+        <div class='field select'>
+            <label for='profile-edit-marital'>$lbl_marital </label>
+            $marital
+        </div>
+
+        <div class='field input'>
+            <label for='id_with'>$lbl_with</label>
+            <input type="text" name='with' id='id_with' value="$with">
+        </div>
+        
+        <div class='field input'>
+            <label for='id_howlong'>$lbl_howlong</label>
+            <input type="text" name='howlong' id='id_howlong' value="$howlong">
+        </div>
+        
+
+        <div class='field select'>
+            <label for="sexual-select" >$lbl_sexual </label>
+            $sexual
+        </div>
+
+        <div class='field input'>
+            <label for='id_homepage'>$lbl_homepage</label>
+            <input type="text" name='homepage' id='id_homepage' value="$homepage">
+        </div>
+        
+        <div class='field input'>
+            <label for='id_politic'>$lbl_politic</label>
+            <input type="text" name='politic' id='id_politic' value="$politic">
+        </div>
+        
+        <div class='field input'>
+            <label for='id_religion'>$lbl_religion</label>
+            <input type="text" name='religion' id='id_religion' value="$religion">
+        </div>
+        
+        <div class='field input'>
+            <label for='id_pub_keywords'>$lbl_pubkey</label>
+            <input type="text" name='pub_keywords' id='id_pub_keywords' value="$pub_keywords">
+            <span class='field_help'>$lbl_pubdsc</span>
+        </div>
+        
+        <div class='field input'>
+            <label for='id_prv_keywords'>$lbl_prvkey</label>
+            <input type="text" name='prv_keywords' id='id_prv_keywords' value="$prv_keywords">
+            <span class='field_help'>$lbl_prvdsc</span>
+        </div>
+        
+
+    <div class="buttonbar" >
+        <input type="submit" name="submit" value="$submit" />
+    </div>
+
+
+	
+        <div class='field textarea'>
+            <label for='id_about'>$lbl_about</label>
+            <textarea name='about' id='id_about'  rows="5">$about</textarea>
+        </div>
+
+
+        <div class='field textarea'>
+            <label for='id_interest'>$lbl_hobbies</label>
+            <textarea name='interest' id='id_interest'  rows="5">$interest</textarea>
+        </div>
+
+        <div class='field textarea'>
+            <label for='id_likes'>$lbl_likes</label>
+            <textarea name='likes' id='id_likes'  rows="5">$likes</textarea>
+        </div>
+
+        <div class='field textarea'>
+            <label for='id_dislikes'>$lbl_dislikes</label>
+            <textarea name='dislikes' id='id_dislikes'  rows="5">$dislikes</textarea>
+        </div>
+
+        <div class='field textarea'>
+            <label for='id_contact'>$lbl_social</label>
+            <textarea name='contact' id='id_contact'  rows="5">$contact</textarea>
+        </div>
+
+        <div class='field textarea'>
+            <label for='id_contact'>$lbl_social</label>
+            <textarea name='contact' id='id_contact'  rows="5">$contact</textarea>
+        </div>
+
+    <div class="buttonbar" >
+        <input type="submit" name="submit" value="$submit" />
+    </div>
+
+
+        <div class='field textarea'>
+            <label for='id_music'>$lbl_music</label>
+            <textarea name='music' id='id_music'  rows="5">$music</textarea>
+        </div>
+
+        <div class='field textarea'>
+            <label for='id_book'>$lbl_book</label>
+            <textarea name='book' id='id_book'  rows="5">$book</textarea>
+        </div>
+
+        <div class='field textarea'>
+            <label for='id_tv'>$lbl_tv</label>
+            <textarea name='tv' id='id_tv'  rows="5">$tv</textarea>
+        </div>
+
+        <div class='field textarea'>
+            <label for='id_film'>$lbl_film</label>
+            <textarea name='film' id='id_film'  rows="5">$film</textarea>
+        </div>
+
+    <div class="buttonbar" >
+        <input type="submit" name="submit" value="$submit" />
+    </div>
+    
+    
+        <div class='field textarea'>
+            <label for='id_romance'>$lbl_love</label>
+            <textarea name='romance' id='id_romance'  rows="5">$romance</textarea>
+        </div>
+
+        <div class='field textarea'>
+            <label for='id_work'>$lbl_work</label>
+            <textarea name='work' id='id_work'  rows="5">$work</textarea>
+        </div>
+
+
+        <div class='field textarea'>
+            <label for='id_education'>$lbl_school</label>
+            <textarea name='education' id='id_education'  rows="5">$education</textarea>
+        </div>
+
+
+    <div class="buttonbar" >
+        <input type="submit" name="submit" value="$submit" />
+    </div>
+    
+    </form>
+
+    <script type="text/javascript">Fill_Country('$country_name');Fill_States('$region');</script>
+</section>
\ No newline at end of file
diff --git a/view/theme/blog/profile_edlink.tpl b/view/theme/blog/profile_edlink.tpl
new file mode 100644
index 0000000..e69de29
diff --git a/view/theme/blog/profile_entry.tpl b/view/theme/blog/profile_entry.tpl
new file mode 100644
index 0000000..075a254
--- /dev/null
+++ b/view/theme/blog/profile_entry.tpl
@@ -0,0 +1,5 @@
+<div class="wp-caption alignleft" style="width: 100px;">
+        <img class="wp-image-59" alt="$alt" src="$photo">
+        <p class="wp-caption-text"><a href="profiles/$id">$profile_name</a></p>
+        $visible
+</div>
diff --git a/view/theme/blog/profile_listing_header.tpl b/view/theme/blog/profile_listing_header.tpl
new file mode 100644
index 0000000..10029cb
--- /dev/null
+++ b/view/theme/blog/profile_listing_header.tpl
@@ -0,0 +1,6 @@
+<section class="entry-content">
+    <h1 class="entry-title">$header</h1>
+    <div class="buttonbar">
+        <a href="profile_photo" class="button">$chg_photo</a>
+        <a href="$cr_new_link" id="profile-listing-new-link" title="$cr_new" class="button" >$cr_new</a>
+    </div>
\ No newline at end of file
diff --git a/view/theme/blog/profile_vcard.tpl b/view/theme/blog/profile_vcard.tpl
index c397f87..5f5fb53 100644
--- a/view/theme/blog/profile_vcard.tpl
+++ b/view/theme/blog/profile_vcard.tpl
@@ -2,6 +2,21 @@
 	
 	<div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
 
+     {{ if $profile.edit }}
+        <div class="dropmenu" style="position: relative">
+                <a href="$profile.edit.0" title="$profile.edit.3">$profile.edit.1</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.edit.0">$profile.edit.3</a></li>
+                    <li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
+                    {{ if $profile.menu.cr_new}}<li><a href="profiles/new" >$profile.menu.cr_new</a></li>{{ endif }}
+                </ul>
+        </div>
+      {{ endif }}   
 
 	<h2 class="fn label">$profile.name</h2>
 
@@ -29,6 +44,7 @@
 	{{ 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 }}
 	
diff --git a/view/theme/blog/search_item.tpl b/view/theme/blog/search_item.tpl
new file mode 100644
index 0000000..13b0235
--- /dev/null
+++ b/view/theme/blog/search_item.tpl
@@ -0,0 +1,27 @@
+      <article id="search-$item.id" class="search">
+        <footer class="search-meta">
+          <div class="search-author vcard">
+            <img class="avatar avatar-68 photo avatar-default " alt="" title="$item.name" src="$item.thumb"  height="68" width="68">
+            <span class="fn dropmenu">
+              <a href="$item.profile_url" rel="external nofollow" class="url" title="$item.linktitle">$item.name</a>
+              <ul class="menu-popup" id="author-menu-$item.id">
+                    $item.item_photo_menu
+                </ul>                                  
+            </span>
+             
+            <a href="$item.plink.href">
+              <time datetime="$item.localtime">$item.ago</time>
+            </a>
+          </div>
+          <!-- .comment-author .vcard -->
+        </footer>
+        {{ if $item.title }}
+        <header class="search-header">
+                    <h1><a rel="bookmark" title="Permalink" href="$item.plink.href">$item.title</a></h1>
+        </header>
+        {{ endif }}
+        <div class="search-content">
+          <p>$item.body</p>
+        </div>
+      </article>
+
diff --git a/view/theme/blog/style.css b/view/theme/blog/style.css
index fb5afc8..39d25a9 100755
--- a/view/theme/blog/style.css
+++ b/view/theme/blog/style.css
@@ -20,13 +20,13 @@ a.button:hover {
 
 .buttonbar {
 	clear: both;
-	margin: 5px 0px;
+	margin: 10px 0px 20px 0px;
 	padding: 10px;
 	text-align: right;
 	background: #eee;
 }
 
-footer { margin-top: 20px; } /*?*/
+footer.entry-meta { margin-top: 20px; } /*?*/
 
 /* header */
 input#search {
@@ -81,6 +81,7 @@ input#searchsubmit {
     text-align: right;
     top: 8.5em;
 }
+#headerimage img[src=""] { display: none; }
 
 /* user bar */
 #tools {
@@ -215,7 +216,8 @@ input#searchsubmit {
 /* popup menu (author link) */
 #main .dropmenu:hover { background-color: #f9f9f9; }
 #main .dropmenu:hover > ul.menu-popup { display: block; }
-span.author.vcard { position: relative; }
+span.fn.dropmenu,
+span.author.vcard.dropmenu { position: relative; }
 ul.menu-popup {
 	-webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 3px 3px;
 	-moz-box-shadow: rgba(0, 0, 0, 0.2) 0 3px 3px;
@@ -271,6 +273,7 @@ ul.menu-popup a:hover {
 #primary { float: left; margin: 0 -26.4% 0 0; width: 100%; }
 #secondary { float: right; margin-right: 7.6%; width: 18.8%;  position: relative;}
 #secondary.overlap { top: -200px; }
+#secondary.overlap.lower { top: -120px; }
 #content { margin: 0 34% 0 7.6%; width: 58.4%; }
 
 /* Singular */
@@ -373,20 +376,12 @@ ul.tabs li a.active { background-color: #1982D1; color: #ffffff; }
 .toolbox.center { text-align: center;}
 .toolbox dd { display: inline; }
 
-/* jot icons */
-.icon { display: inline-block; margin: 0px; padding: 0px; width: 16px; height: 16px; }
-.icon.camera	{ background: url(icons/image.png) transparent center center no-repeat; }
-.icon.attach 	{ background: url(icons/attachment.png) transparent center center no-repeat; }
-.icon.link		{ background: url(icons/link.png) transparent center center no-repeat; }
-.icon.video		{ background: url(icons/youtube2.png) transparent center center no-repeat; }
-.icon.audio		{ background: url(icons/headphones.png) transparent center center no-repeat; }
-.icon.globe		{ background: url(icons/location.png) transparent center center no-repeat; }
-.icon.noglobe	{ background: url(icons/globe.png) transparent center center no-repeat; }
-.icon.lock		{ background: url(icons/lock2.png) transparent center center no-repeat; }
-.icon.unlock	{ background: url(icons/unlocked.png) transparent center center no-repeat; }
+.acpopup { z-index: 12000; background-color: #ffffff; border: 1px solid #cccccc; }
+.acpopupitem.selected { background-color: #c6d8f3; }
 
 
 /* content */
+#profile-edit-default-desc, /* un'altro html da buttare */
 .info-message {
 	background-color: #E9E9E9;
 	color: #505050;
@@ -401,7 +396,8 @@ ul.tabs li a.active { background-color: #1982D1; color: #ffffff; }
 .field { margin-bottom: 0.8em;}
 .field label { display: inline-block; width: 59%; }
 .field.radio label, .field.checkbox label , .field.yesno label { width: 70% }
-.field input, .field select{ display: inline-block; width: 39%; }
+.field.textarea label { display: block; width: 100%; }
+.field input, .field select, .field span.multiselect{ display: inline-block; width: 39%; }
 .field input[type="checkbox"], .field input[type="radio"] { width: auto; }
 .field .field_help { display: block; margin-left: 10%; color: #666666; }
 /* field onoff (from duepuntozero) */
@@ -432,6 +428,7 @@ ul.tabs li a.active { background-color: #1982D1; color: #ffffff; }
 	text-align: left;
 }
 .hidden { display: none!important; }
+.field.multiselect select { width: auto;}
 
 /* oauth settings */
 .oauthapp { margin-top: 30px; height: auto; overflow: auto; }
@@ -451,3 +448,106 @@ ul.tabs li a.active { background-color: #1982D1; color: #ffffff; }
 	border-radius: 16px 16px 16px 16px;
 }
 
+/* comments thread */
+.reply li.comment { position: relative; margin-left: 40px; background-color:rgba(0, 0, 0, 0.03); padding-left: 20px;}
+.reply .avatar { left: -40px; width: 32px; height: 32px; background-color: #fff;}
+
+
+/* comment form */
+.respond { height: auto; overflow: auto; }
+.respond .form-submit { margin-top: 20px; }
+.respond.thread {
+	background-color: transparent;
+	border: 0px;
+	width: 100%;
+	margin: 0px;
+	padding: 0px;
+}
+.respond.thread textarea { width: 94% }
+.respond .comment-edit-preview { 
+	clear: both;
+	margin-top: 40px;
+}
+/* search item */
+article.search {
+	background: #F6F6F6;
+	border: 1px solid #DDDDDD;
+	border-radius: 3px;
+	margin: 0px 0px 1.63em 100px;
+	padding: 1.63em;
+	position: relative;
+}
+article.search::before {
+	content: url("images/comment-arrow.png");
+	left: -21px;
+	position: absolute;
+}
+article.search .avatar {
+	border-radius: 3px;
+	-moz-box-shadow: 0px 1px 2px #CCCCCC;
+	-webkit-box-shadow: 0px 1px 2px #CCCCCC;
+	box-shadow: 0px 1px 2px #CCCCCC;
+	left: -102px;
+	padding: 0px;
+	position: absolute;
+	top: 0px;
+}
+.search-meta { 
+	color: #666666;
+	font-size: 12px;
+	line-height: 2.2em;
+}
+.search-header h1 { font-size: 20px; font-weight: bold;}
+.search-header h1 a { color: #000; }
+
+/* search page search box */
+#search-box #search-text { display: block; }
+#search-box input[type="submit"]{ margin: 1em 2em 2em 0px; }
+#content > h2 { margin-bottom: 2em; } /* evabbe', poi tolgo l'html da 'sto schifo di php */
+
+/* profile menu */
+ul#profiles-menu { top: 2em; left: 9px; width: 176px; }
+ul#profiles-menu li img { width: 16px; vertical-align: middle; margin-right: 10px;}
+
+/* member editor */
+.contact_list,
+#prof-members, #prof-all-contacts {
+	height: 200px; overflow-y:scoll; border: 1px solid #cccccc; background-color: #efefef; 
+}
+
+/* jquery autocomplete */
+.autocomplete { background-color: #ffffff; border: 1px solid #cccccc; } 
+
+/*contact item */
+.contact.dropmenu { 
+	background: #EEEEEE !important;
+	margin-bottom: 1.63em;
+	max-width: 96%;
+	padding: 9px;
+	position: relative;
+}
+.contact.dropmenu .menu-popup { left: 120px; top: 0px;}
+
+/* icons */
+.icon { display: inline-block; margin: 0px; padding: 0px; width: 16px; height: 16px; }
+.icon.camera	{ background: url(icons/image.png) transparent center center no-repeat; }
+.icon.attach 	{ background: url(icons/attachment.png) transparent center center no-repeat; }
+.icon.link		{ background: url(icons/link.png) transparent center center no-repeat; }
+.icon.video		{ background: url(icons/youtube2.png) transparent center center no-repeat; }
+.icon.audio		{ background: url(icons/headphones.png) transparent center center no-repeat; }
+.icon.globe		{ background: url(icons/location.png) transparent center center no-repeat; }
+.icon.noglobe	{ background: url(icons/globe.png) transparent center center no-repeat; }
+.icon.lock		{ background: url(icons/lock2.png) transparent center center no-repeat; }
+.icon.unlock	{ background: url(icons/unlocked.png) transparent center center no-repeat; }
+.icon.edit	{ background: url(icons/pencil.png) transparent center center no-repeat; }
+
+.icon.on { border: 1px solid #cccccc; background-color: #56ef46;
+	-webkit-border-radius: 16px 16px 16px 16px;
+    -moz-border-radius: 16px 16px 16px 16px;
+	border-radius: 16px 16px 16px 16px;
+}
+.icon.off { border: 1px solid #cccccc; background-color: #ef4646;
+	-webkit-border-radius: 16px 16px 16px 16px;
+    -moz-border-radius: 16px 16px 16px 16px;
+	border-radius: 16px 16px 16px 16px;
+}
diff --git a/view/theme/blog/theme.php b/view/theme/blog/theme.php
index 57b86f8..4e853fd 100755
--- a/view/theme/blog/theme.php
+++ b/view/theme/blog/theme.php
@@ -1,18 +1,21 @@
 <?php
 /**
  * Name: Blog
- * Version: 0.0
+ * Version: 0.5
+ * Description: Blog theme ported from <a href='http://wordpress.org/extend/themes/twentyeleven'>Twenty Eleven wordpress theme</a>
  * Author: Fabio <http://kirgroup.com/profile/fabrixxm>
  * Maintainer: Fabio <http://kirgroup.com/profile/fabrixxm>
  */
 
-$a->theme_info = array(
-);
 
 function blog_init(&$a) {
 
+    $a->theme_info = array();
 }
 
-function blogtemplate($item) {
-    return $item['template'];
+function blogtheme_imgurl($headimg) {
+    $a = get_app();
+    if ($headimg[0]==".") return $a->get_baseurl().'/view/theme/blog/headers/'.substr($headimg,1);
+    if ($headimg == "~none~") return "";
+    return False;
 }
\ No newline at end of file
diff --git a/view/theme/blog/threaded_conversation.tpl b/view/theme/blog/threaded_conversation.tpl
index 8acc6df..eb942d6 100644
--- a/view/theme/blog/threaded_conversation.tpl
+++ b/view/theme/blog/threaded_conversation.tpl
@@ -18,14 +18,21 @@ $live_update
 <script>
 // jquery color plugin from https://raw.github.com/gist/1891361/17747b50ad87f7a59a14b4e0f38d8f3fb6a18b27/gistfile1.js
     (function(d){d.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(f,e){d.fx.step[e]=function(g){if(!g.colorInit){g.start=c(g.elem,e);g.end=b(g.end);g.colorInit=true}g.elem.style[e]="rgb("+[Math.max(Math.min(parseInt((g.pos*(g.end[0]-g.start[0]))+g.start[0]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[1]-g.start[1]))+g.start[1]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[2]-g.start[2]))+g.start[2]),255),0)].join(",")+")"}});function b(f){var e;if(f&&f.constructor==Array&&f.length==3){return f}if(e=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(f)){return[parseInt(e[1]),parseInt(e[2]),parseInt(e[3])]}if(e=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(f)){return[parseFloat(e[1])*2.55,parseFloat(e[2])*2.55,parseFloat(e[3])*2.55]}if(e=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(f)){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}if(e=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(f)){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}if(e=/rgba\(0, 0, 0, 0\)/.exec(f)){return a.transparent}return a[d.trim(f).toLowerCase()]}function c(g,e){var f;do{f=d.curCSS(g,e);if(f!=""&&f!="transparent"||d.nodeName(g,"body")){break}e="backgroundColor"}while(g=g.parentNode);return b(f)}var a={transparent:[255,255,255]}})(jQuery);
-    var colWhite = {backgroundColor:'#FFFFFF'};
+    var colWhite = {backgroundColor:'#F6F6F6'};
     var colShiny = {backgroundColor:'#FCE94F'};
+   
+    $(document).ready(function(){
+        // setup reply popup forms
+        $(".reply-link").fancybox();
+    });
 </script>
 
+{# scroll to and hiligh comment in display mode #}
 {{ if $mode == display }}
 <script>
     var id = window.location.pathname.split("/").pop();
-    $(window).scrollTop($('#item-'+id).position().top);
-    $('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);   
+    if ($('#li-comment-'+id).offset()) $(window).scrollTop($('#li-comment-'+id).offset().top-50);
+    $('#li-comment-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);   
+    
 </script>
 {{ endif }}
\ No newline at end of file
diff --git a/view/theme/blog/twentyeleven_style.css b/view/theme/blog/twentyeleven_style.css
index ea1319e..5aadbd0 100644
--- a/view/theme/blog/twentyeleven_style.css
+++ b/view/theme/blog/twentyeleven_style.css
@@ -306,7 +306,7 @@ body {
 	top: 2.2em;
 	left: 2.2em;
 }
-.one-column #respond {
+.one-column .respond {
 	width: auto;
 }
 
@@ -2048,12 +2048,12 @@ a.comment-reply-link > span {
 	width: auto;
 }
 /* And a full-width comment form */
-.page-template-sidebar-page-php #respond {
+.page-template-sidebar-page-php .respond {
 	width: auto;
 }
 
 /* Comment Form */
-#respond {
+.respond {
 	background: #ddd;
 	border: 1px solid #d3d3d3;
 	-moz-border-radius: 3px;
@@ -2063,8 +2063,8 @@ a.comment-reply-link > span {
 	position: relative;
 	width: 68.9%;
 }
-#respond input[type="text"],
-#respond textarea {
+.respond input[type="text"],
+.respond textarea {
 	background: #fff;
 	border: 4px solid #eee;
 	-moz-border-radius: 5px;
@@ -2076,16 +2076,16 @@ a.comment-reply-link > span {
 	padding: 10px;
 	text-indent: 80px;
 }
-#respond .comment-form-author,
-#respond .comment-form-email,
-#respond .comment-form-url,
-#respond .comment-form-comment {
+.respond .comment-form-author,
+.respond .comment-form-email,
+.respond .comment-form-url,
+.respond .comment-form-comment {
 	position: relative;
 }
-#respond .comment-form-author label,
-#respond .comment-form-email label,
-#respond .comment-form-url label,
-#respond .comment-form-comment label {
+.respond .comment-form-author label,
+.respond .comment-form-email label,
+.respond .comment-form-url label,
+.respond .comment-form-comment label {
 	background: #eee;
 	-webkit-box-shadow: 1px 2px 2px rgba(204,204,204,0.8);
 	-moz-box-shadow: 1px 2px 2px rgba(204,204,204,0.8);
@@ -2100,17 +2100,17 @@ a.comment-reply-link > span {
 	top: 40px;
 	z-index: 1;
 }
-#respond input[type="text"]:focus,
-#respond textarea:focus {
+.respond input[type="text"]:focus,
+.respond textarea:focus {
 	text-indent: 0;
 	z-index: 1;
 }
-#respond textarea {
+.respond textarea {
 	resize: vertical;
 	width: 95%;
 }
-#respond .comment-form-author .required,
-#respond .comment-form-email .required {
+.respond .comment-form-author .required,
+.respond .comment-form-email .required {
 	color: #bd3500;
 	font-size: 22px;
 	font-weight: bold;
@@ -2119,18 +2119,18 @@ a.comment-reply-link > span {
 	top: 45px;
 	z-index: 1;
 }
-#respond .comment-notes,
-#respond .logged-in-as {
+.respond .comment-notes,
+.respond .logged-in-as {
 	font-size: 13px;
 }
-#respond p {
+.respond p {
 	margin: 10px 0;
 }
-#respond .form-submit {
+.respond .form-submit {
 	float: right;
 	margin: -20px 0 10px;
 }
-#respond input#submit {
+.respond input#submit {
 	background: #222;
 	border: none;
 	-moz-border-radius: 3px;
@@ -2147,20 +2147,20 @@ a.comment-reply-link > span {
 	left: 30px;
 	text-shadow: 0 -1px 0 rgba(0,0,0,0.3);
 }
-#respond input#submit:active {
+.respond input#submit:active {
 	background: #1982d1;
 	color: #bfddf3;
 }
-#respond #cancel-comment-reply-link {
+.respond #cancel-comment-reply-link {
 	color: #666;
 	margin-left: 10px;
 	text-decoration: none;
 }
-#respond .logged-in-as a:hover,
-#respond #cancel-comment-reply-link:hover {
+.respond .logged-in-as a:hover,
+.respond #cancel-comment-reply-link:hover {
 	text-decoration: underline;
 }
-.commentlist #respond {
+.commentlist .respond {
 	margin: 1.625em 0 0;
 	width: auto;
 }
@@ -2188,15 +2188,15 @@ a.comment-reply-link > span {
 #cancel-comment-reply-link:hover {
 	color: #ff4b33;
 }
-#respond label {
+.respond label {
 	line-height: 2.2em;
 }
-#respond input[type=text] {
+.respond input[type=text] {
 	display: block;
 	height: 24px;
 	width: 75%;
 }
-#respond p {
+.respond p {
 	font-size: 12px;
 }
 p.comment-form-comment {
@@ -2354,7 +2354,7 @@ p.comment-form-comment {
 		width: auto;
 	}
 	/* And a full-width comment form */
-	#respond {
+	.respond {
 		width: auto;
 	}
 	/* No need to float footer widgets at this size */
@@ -2456,11 +2456,11 @@ p.comment-form-comment {
 		top: 2.2em;
 	}
 	/* Use the available space in the smaller comment form */
-	#respond input[type="text"] {
+	.respond input[type="text"] {
 		width: 95%;
 	}
-	#respond .comment-form-author .required,
-	#respond .comment-form-email .required {
+	.respond .comment-form-author .required,
+	.respond .comment-form-email .required {
 		left: 95%;
 	}
 	#content .gallery-columns-3 .gallery-item {
@@ -2595,7 +2595,7 @@ p.comment-form-comment {
 		margin: 2.2em 0 0;
 		padding: 0;
 	}
-	#respond {
+	.respond {
 		display: none;
 	}
 	.widget-area {
diff --git a/view/theme/blog/wall_thread.tpl b/view/theme/blog/wall_thread.tpl
index 1bc3795..5977448 100755
--- a/view/theme/blog/wall_thread.tpl
+++ b/view/theme/blog/wall_thread.tpl
@@ -61,6 +61,8 @@
         </footer><!-- #entry-meta -->
 </article>
 
+{{ if $mode != profile }}
+
 <div id="comments">
   <h2 id="comments-title">
         $item.total_comments_num $item.total_comments_text on &ldquo;<span>$item.title</span>&rdquo;	
@@ -73,52 +75,7 @@
   
     
   </ol>
-  <div id="respond">
-    <h3 id="reply-title">
-      Leave a Reply 
-      <small>
-        <a rel="nofollow" id="cancel-comment-reply-link" href="/?p=8#respond" style="display:none;">Cancel reply</a>
-      </small>
-    </h3>
-    <form action="http://wp-themes.com/wp/wp-comments-post.php" method="post" id="commentform">
-      <p class="comment-notes">
-        Your email address will not be published. Required fields are marked 
-        <span class="required">*</span>
-      </p>
-      <p class="comment-form-author">
-        <label for="author">
-          Name 
-          <span class="required">*</span>
-        </label>
-        <input id="author" name="author" type="text" value="" size="30" aria-required="true">
-      </p>
-      <p class="comment-form-email">
-        <label for="email">
-          Email 
-          <span class="required">*</span>
-        </label>
-        <input id="email" name="email" type="text" value="" size="30" aria-required="true">
-      </p>
-      <p class="comment-form-url">
-        <label for="url">Website</label>
-        <input id="url" name="url" type="text" value="" size="30">
-      </p>
-      <p class="comment-form-comment">
-        <label for="comment">Comment</label>
-        <textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea>
-      </p>
-      <p class="form-allowed-tags">
-        You may use these 
-        <abbr title="HyperText Markup Language">HTML</abbr>
-         tags and attributes:  
-        <code>&lt;a href="" title=""> &lt;abbr title=""> &lt;acronym title=""> &lt;b> &lt;blockquote cite=""> &lt;cite> &lt;code> &lt;del datetime=""> &lt;em> &lt;i> &lt;q cite=""> &lt;strike> &lt;strong> </code>
-      </p>
-      <p class="form-submit">
-        <input name="submit" type="submit" id="submit" value="Post Comment">
-        <input type="hidden" name="comment_post_ID" value="8" id="comment_post_ID">
-        <input type="hidden" name="comment_parent" id="comment_parent" value="0">
-      </p>
-    </form>
-  </div>
-  <!-- #respond -->
+ 
+    $item.comment
 </div>
+{{ endif }}
\ No newline at end of file
diff --git a/view/theme/blog/wall_thread_comment.tpl b/view/theme/blog/wall_thread_comment.tpl
index 1b134a4..09d3802 100644
--- a/view/theme/blog/wall_thread_comment.tpl
+++ b/view/theme/blog/wall_thread_comment.tpl
@@ -1,28 +1,38 @@
-<li class="comment even thread-even depth-1" id="li-comment-2">
-      <article id="comment-2" class="comment">
+<li class="comment even thread-even depth-$item.thread_level" id="li-comment-$item.id">
+      <article id="comment-$item.id" class="comment">
         <footer class="comment-meta">
           <div class="comment-author vcard">
-            <img alt="" src="http://0.gravatar.com/avatar/?d=identicon&s=68" class="avatar avatar-68 photo avatar-default" height="68" width="68">
-            <span class="fn">
-              <a href="http://joseph.randomnetworks.com/" rel="external nofollow" class="url">Joseph Scott</a>
+            <img class="avatar avatar-68 photo avatar-default " alt="" title="$item.name" src="$item.thumb"  height="68" width="68">
+            <span class="fn dropmenu">
+              <a href="$item.profile_url" rel="external nofollow" class="url" title="$item.linktitle">$item.name</a>
+              <ul class="menu-popup" id="author-menu-$item.id">
+                    $item.item_photo_menu
+                </ul>                                  
             </span>
-             on 
-            <a href="http://wp-themes.com/?p=8&cpage=1#comment-2">
-              <time datetime="2008-06-21T00:07:24+00:00">21 June, 2008 at 12:07 am</time>
+             
+            <a href="$item.plink.href">
+              <time datetime="$item.localtime">$item.ago</time>
             </a>
-            <span class="says">said:</span>
+            <span class="says">said:
+            {{ if $item.threaded }}
+            <a href="#respond-$item.id" class="reply-link">(reply)</a>
+            {{ endif }}
+            </span>
+            
           </div>
           <!-- .comment-author .vcard -->
         </footer>
         <div class="comment-content">
-          <p>I never could remember more than the first few lines of that nursery rhyme.</p>
+          <p>$item.body</p>
         </div>
         <div class="reply">
-							</div>
+              {{ for $item.children as $child }}
+                {{ inc wall_thread_comment.tpl with $item=$child }}{{ endinc }}
+            {{ endfor }}
+
+        </div>
         <!-- .reply -->
       </article>
       <!-- #comment-## -->
-      {{ for $item.children as $child }}
-            {{ inc wall_thread_comment.tpl with $item=$child }}{{ endinc }}
-        {{ endfor }}
-</li>
\ No newline at end of file
+      $item.comment
+</li>