From: Zach Prezkuta <fermion@gmx.com>
Date: Sun, 10 Feb 2013 17:21:52 +0000 (-0700)
Subject: Update Frost-mobile to v0.3
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c1c83115aded668f37418f8c965d4d09670cacb1;p=friendica.git

Update Frost-mobile to v0.3
---

diff --git a/view/theme/frost-mobile/contact_edit.tpl b/view/theme/frost-mobile/contact_edit.tpl
index d4bd41d74b..e5f12950c7 100644
--- a/view/theme/frost-mobile/contact_edit.tpl
+++ b/view/theme/frost-mobile/contact_edit.tpl
@@ -6,7 +6,7 @@
 	$tab_str
 
 	<div id="contact-edit-drop-link" >
-		<a href="contacts/$contact_id/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>
+		<a href="contacts/$contact_id/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="$delete" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#}></a>
 	</div>
 
 	<div id="contact-edit-drop-link-end"></div>
@@ -74,7 +74,7 @@
 
 <div id="contact-edit-info-wrapper">
 <h4>$lbl_info1</h4>
-	<textarea id="contact-edit-info" rows="8" cols="35" name="info">$info</textarea>
+	<textarea id="contact-edit-info" rows="8"{# cols="35"#} name="info">$info</textarea>
 	<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
 </div>
 <div id="contact-edit-info-end"></div>
diff --git a/view/theme/frost-mobile/conversation.tpl b/view/theme/frost-mobile/conversation.tpl
index 54ddafbb1d..d39976f39f 100644
--- a/view/theme/frost-mobile/conversation.tpl
+++ b/view/theme/frost-mobile/conversation.tpl
@@ -20,10 +20,10 @@ $live_update
 
 <div id="conversation-end"></div>
 
-<!--{{ if $dropping }}
+{#<!--{{ if $dropping }}
 <div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
   <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
   <div id="item-delete-selected-desc" >$dropping</div>
 </div>
-<div id="item-delete-selected-end"></div>-->
-{{ endif }}
+<div id="item-delete-selected-end"></div>
+{{ endif }}-->#}
diff --git a/view/theme/frost-mobile/default.php b/view/theme/frost-mobile/default.php
index 7a8a0494de..ad464760f7 100644
--- a/view/theme/frost-mobile/default.php
+++ b/view/theme/frost-mobile/default.php
@@ -27,7 +27,7 @@
 	<div class='main-container'>
 <!--		<div class='main-content-container'>-->
 		<div class='section-wrapper'>
-		<?php if( ($a->module === 'settings') && x($page,'aside')) echo $page['aside']; ?>
+		<?php if( ($a->module === 'settings' || $a->module === 'message' || $a->module === 'profile') && x($page,'aside')) echo $page['aside']; ?>
 		<section><?php if(x($page,'content')) echo $page['content']; ?>
 			<div id="page-footer"></div>
 		</section>
diff --git a/view/theme/frost-mobile/end.tpl b/view/theme/frost-mobile/end.tpl
index d2679935c9..8bc088421a 100644
--- a/view/theme/frost-mobile/end.tpl
+++ b/view/theme/frost-mobile/end.tpl
@@ -1,18 +1,22 @@
 <!--[if IE]>
 <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
-<!--<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
+{#<!--<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
 <script type="text/javascript">
   tinyMCE.init({ mode : "none"});
-</script>-->
-<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/main.min.js" ></script>
+</script>-->#}
+<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
+<script type="text/javascript">var $j = jQuery.noConflict();</script>
+<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
 <script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
-<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/fk.autocomplete.min.js" ></script>
-<!--<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
-<script type="text/javascript" src="$baseurl/library/colorbox/jquery.colorbox-min.js"></script>-->
-<!--<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>-->
+{#<!--<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<script type="text/javascript" src="$baseurl/library/colorbox/jquery.colorbox-min.js"></script>-->#}
+{#<!--<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>-->#}
 <script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
+
+<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/fk.autocomplete.min.js" ></script>
 <script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/acl.min.js" ></script>
 <script type="text/javascript" src="$baseurl/js/webtoolkit.base64.min.js" ></script>
+<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/main.min.js" ></script>
 <script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/theme.min.js"></script>
 
diff --git a/view/theme/frost-mobile/generic_links_widget.tpl b/view/theme/frost-mobile/generic_links_widget.tpl
index 3783467215..a976d4573c 100644
--- a/view/theme/frost-mobile/generic_links_widget.tpl
+++ b/view/theme/frost-mobile/generic_links_widget.tpl
@@ -1,11 +1,12 @@
 <div class="widget{{ if $class }} $class{{ endif }}">
-<!--	{{if $title}}<h3>$title</h3>{{endif}}-->
+{#<!--	{{if $title}}<h3>$title</h3>{{endif}}-->#}
 	{{if $desc}}<div class="desc">$desc</div>{{endif}}
 	
-	<ul class="tabs">
+	<ul class="tabs links-widget">
 		{{ for $items as $item }}
 			<li class="tool"><a href="$item.url" class="tab {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
 		{{ endfor }}
+		<div id="tabs-end"></div>
 	</ul>
 	
 </div>
diff --git a/view/theme/frost-mobile/head.tpl b/view/theme/frost-mobile/head.tpl
index edfa5e4bbf..a79b2916dd 100644
--- a/view/theme/frost-mobile/head.tpl
+++ b/view/theme/frost-mobile/head.tpl
@@ -1,15 +1,15 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<!--<meta content='width=device-width, minimum-scale=1 maximum-scale=1' name='viewport'>
+{#<!--<meta content='width=device-width, minimum-scale=1 maximum-scale=1' name='viewport'>
 <meta content='True' name='HandheldFriendly'>
-<meta content='320' name='MobileOptimized'>-->
+<meta content='320' name='MobileOptimized'>-->#}
 <meta name="viewport" content="width=device-width; initial-scale = 1.0; maximum-scale=1.0; user-scalable=no" />
-<!--<meta name="viewport" content="width=100%;  initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->
+{#<!--<meta name="viewport" content="width=100%;  initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->#}
 
 <base href="$baseurl/" />
 <meta name="generator" content="$generator" />
-<!--<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+{#<!--<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="$baseurl/library/colorbox/colorbox.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />-->
+<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />-->#}
 <link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
 
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
@@ -28,7 +28,4 @@
 	var updateInterval = $update_interval;
 	var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
 </script>
-<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
-<script type="text/javascript">var $j = jQuery.noConflict();</script>
-<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
 
diff --git a/view/theme/frost-mobile/jot-header.tpl b/view/theme/frost-mobile/jot-header.tpl
index b7aafc5ed9..5d8cfa4548 100644
--- a/view/theme/frost-mobile/jot-header.tpl
+++ b/view/theme/frost-mobile/jot-header.tpl
@@ -11,7 +11,8 @@
 	window.term = "$term";
 	window.baseURL = "$baseurl";
 	window.geoTag = function () { $geotag }
-	window.ajaxType = 'jot-header';
+	window.jotId = "#profile-jot-text";
+	window.imageUploadButton = 'wall-image-upload';
 </script>
 
 
diff --git a/view/theme/frost-mobile/jot.tpl b/view/theme/frost-mobile/jot.tpl
index d28cf57e48..b345152792 100644
--- a/view/theme/frost-mobile/jot.tpl
+++ b/view/theme/frost-mobile/jot.tpl
@@ -21,7 +21,7 @@
 		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
 		{{ endif }}
 		<div id="jot-text-wrap">
-		<!--<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />-->
+		{#<!--<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>
 
@@ -39,8 +39,10 @@
 		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon 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="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+	{#<!--<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>-->#}
+	<div id="profile-link-wrapper" style="display: $visitor;" >
+		<a id="profile-link" class="icon link" title="$weblink" onclick="jotGetLink(); return false;"></a>
 	</div> 
 	<div id="profile-video-wrapper" style="display: $visitor;" >
 		<a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
@@ -73,7 +75,7 @@
 	<div style="display: none;">
 		<div id="profile-jot-acl-wrapper">
 			$acl
-			<hr style="clear:both"/>
+			<hr/>
 			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
 			$jotnets
 			<div id="profile-jot-networks-end"></div>
diff --git a/view/theme/frost-mobile/js/acl.js b/view/theme/frost-mobile/js/acl.js
index d54df12a35..241e0c2370 100644
--- a/view/theme/frost-mobile/js/acl.js
+++ b/view/theme/frost-mobile/js/acl.js
@@ -160,7 +160,7 @@ ACL.prototype.update_view = function(){
 				$j('#jot-public').show();
 				$j('.profile-jot-net input').attr('disabled', false);			
 				if(typeof editor != 'undefined' && editor != false) {
-					$j('#profile-jot-desc').html(ispublic);
+					$j('#profile-jot-desc').html(window.isPublic);
 				}
 			
 	} else {
diff --git a/view/theme/frost-mobile/js/acl.min.js b/view/theme/frost-mobile/js/acl.min.js
index b543cbdd72..3a5d07298b 100644
--- a/view/theme/frost-mobile/js/acl.min.js
+++ b/view/theme/frost-mobile/js/acl.min.js
@@ -1 +1 @@
-function ACL(backend_url,preset){that=this;that.url=backend_url;that.kp_timer=null;if(preset==undefined)preset=[];that.allow_cid=preset[0]||[];that.allow_gid=preset[1]||[];that.deny_cid=preset[2]||[];that.deny_gid=preset[3]||[];that.group_uids=[];that.nw=2;that.list_content=$j("#acl-list-content");that.item_tpl=unescape($j(".acl-list-item[rel=acl-template]").html());that.showall=$j("#acl-showall");if(preset.length==0)that.showall.addClass("selected");that.showall.click(that.on_showall);$j(".acl-button-show").live("click",that.on_button_show);$j(".acl-button-hide").live("click",that.on_button_hide);$j("#acl-search").keypress(that.on_search);$j("#acl-wrapper").parents("form").submit(that.on_submit);that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$j("#acl-fields").html("");$j(that.allow_gid).each(function(i,v){aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>")});$j(that.allow_cid).each(function(i,v){aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>")});$j(that.deny_gid).each(function(i,v){aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>")});$j(that.deny_cid).each(function(i,v){aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>")})};ACL.prototype.search=function(){var srcstr=$j("#acl-search").val();that.list_content.html("");that.get(0,100,srcstr)};ACL.prototype.on_search=function(event){if(that.kp_timer)clearTimeout(that.kp_timer);that.kp_timer=setTimeout(that.search,1e3)};ACL.prototype.on_showall=function(event){event.preventDefault();event.stopPropagation();if(that.showall.hasClass("selected")){return false}that.showall.addClass("selected");that.allow_cid=[];that.allow_gid=[];that.deny_cid=[];that.deny_gid=[];that.update_view();return false};ACL.prototype.on_button_show=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_allow($j(this).parent().attr("id"));return false};ACL.prototype.on_button_hide=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_deny($j(this).parent().attr("id"));return false};ACL.prototype.set_allow=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.allow_gid.indexOf(id)<0){that.allow_gid.push(id)}else{that.allow_gid.remove(id)}if(that.deny_gid.indexOf(id)>=0)that.deny_gid.remove(id);break;case"c":if(that.allow_cid.indexOf(id)<0){that.allow_cid.push(id)}else{that.allow_cid.remove(id)}if(that.deny_cid.indexOf(id)>=0)that.deny_cid.remove(id);break}that.update_view()};ACL.prototype.set_deny=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.deny_gid.indexOf(id)<0){that.deny_gid.push(id)}else{that.deny_gid.remove(id)}if(that.allow_gid.indexOf(id)>=0)that.allow_gid.remove(id);break;case"c":if(that.deny_cid.indexOf(id)<0){that.deny_cid.push(id)}else{that.deny_cid.remove(id)}if(that.allow_cid.indexOf(id)>=0)that.allow_cid.remove(id);break}that.update_view()};ACL.prototype.update_view=function(){if(that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0){that.showall.addClass("selected");$j("#jot-perms-icon").removeClass("lock").addClass("unlock");$j("#jot-public").show();$j(".profile-jot-net input").attr("disabled",false);if(typeof editor!="undefined"&&editor!=false){$j("#profile-jot-desc").html(ispublic)}}else{that.showall.removeClass("selected");$j("#jot-perms-icon").removeClass("unlock").addClass("lock");$j("#jot-public").hide();$j(".profile-jot-net input").attr("disabled","disabled");$j("#profile-jot-desc").html("&nbsp;")}$j("#acl-list-content .acl-list-item").each(function(){$j(this).removeClass("groupshow grouphide")});$j("#acl-list-content .acl-list-item").each(function(){itemid=$j(this).attr("id");type=itemid[0];id=parseInt(itemid.substr(1));btshow=$j(this).children(".acl-button-show").removeClass("selected");bthide=$j(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var uclass="";if(that.allow_gid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected");uclass="groupshow"}if(that.deny_gid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected");uclass="grouphide"}$j(that.group_uids[id]).each(function(i,v){if(uclass=="grouphide")$j("#c"+v).removeClass("groupshow");if(uclass!=""){var cls=$j("#c"+v).attr("class");if(cls==undefined)return true;var hiding=cls.indexOf("grouphide");if(hiding==-1)$j("#c"+v).addClass(uclass)}});break;case"c":if(that.allow_cid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected")}if(that.deny_cid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected")}}})};ACL.prototype.get=function(start,count,search){var postdata={start:start,count:count,search:search};$j.ajax({type:"POST",url:that.url,data:postdata,dataType:"json",success:that.populate})};ACL.prototype.populate=function(data){$j(data.items).each(function(){html="<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";html=html.format(this.photo,this.name,this.type,this.id,"",this.network,this.link);if(this.uids!=undefined)that.group_uids[this.id]=this.uids;that.list_content.append(html)});$j(".acl-list-item img[data-src]",that.list_content).each(function(i,el){$j(el).attr("src",$j(el).data("src"))});that.update_view()};
\ No newline at end of file
+function ACL(backend_url,preset){that=this;that.url=backend_url;that.kp_timer=null;if(preset==undefined)preset=[];that.allow_cid=preset[0]||[];that.allow_gid=preset[1]||[];that.deny_cid=preset[2]||[];that.deny_gid=preset[3]||[];that.group_uids=[];that.nw=2;that.list_content=$j("#acl-list-content");that.item_tpl=unescape($j(".acl-list-item[rel=acl-template]").html());that.showall=$j("#acl-showall");if(preset.length==0)that.showall.addClass("selected");that.showall.click(that.on_showall);$j(".acl-button-show").live("click",that.on_button_show);$j(".acl-button-hide").live("click",that.on_button_hide);$j("#acl-search").keypress(that.on_search);$j("#acl-wrapper").parents("form").submit(that.on_submit);that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$j("#acl-fields").html("");$j(that.allow_gid).each(function(i,v){aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>")});$j(that.allow_cid).each(function(i,v){aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>")});$j(that.deny_gid).each(function(i,v){aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>")});$j(that.deny_cid).each(function(i,v){aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>")})};ACL.prototype.search=function(){var srcstr=$j("#acl-search").val();that.list_content.html("");that.get(0,100,srcstr)};ACL.prototype.on_search=function(event){if(that.kp_timer)clearTimeout(that.kp_timer);that.kp_timer=setTimeout(that.search,1e3)};ACL.prototype.on_showall=function(event){event.preventDefault();event.stopPropagation();if(that.showall.hasClass("selected")){return false}that.showall.addClass("selected");that.allow_cid=[];that.allow_gid=[];that.deny_cid=[];that.deny_gid=[];that.update_view();return false};ACL.prototype.on_button_show=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_allow($j(this).parent().attr("id"));return false};ACL.prototype.on_button_hide=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_deny($j(this).parent().attr("id"));return false};ACL.prototype.set_allow=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.allow_gid.indexOf(id)<0){that.allow_gid.push(id)}else{that.allow_gid.remove(id)}if(that.deny_gid.indexOf(id)>=0)that.deny_gid.remove(id);break;case"c":if(that.allow_cid.indexOf(id)<0){that.allow_cid.push(id)}else{that.allow_cid.remove(id)}if(that.deny_cid.indexOf(id)>=0)that.deny_cid.remove(id);break}that.update_view()};ACL.prototype.set_deny=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.deny_gid.indexOf(id)<0){that.deny_gid.push(id)}else{that.deny_gid.remove(id)}if(that.allow_gid.indexOf(id)>=0)that.allow_gid.remove(id);break;case"c":if(that.deny_cid.indexOf(id)<0){that.deny_cid.push(id)}else{that.deny_cid.remove(id)}if(that.allow_cid.indexOf(id)>=0)that.allow_cid.remove(id);break}that.update_view()};ACL.prototype.update_view=function(){if(that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0){that.showall.addClass("selected");$j("#jot-perms-icon").removeClass("lock").addClass("unlock");$j("#jot-public").show();$j(".profile-jot-net input").attr("disabled",false);if(typeof editor!="undefined"&&editor!=false){$j("#profile-jot-desc").html(window.isPublic)}}else{that.showall.removeClass("selected");$j("#jot-perms-icon").removeClass("unlock").addClass("lock");$j("#jot-public").hide();$j(".profile-jot-net input").attr("disabled","disabled");$j("#profile-jot-desc").html("&nbsp;")}$j("#acl-list-content .acl-list-item").each(function(){$j(this).removeClass("groupshow grouphide")});$j("#acl-list-content .acl-list-item").each(function(){itemid=$j(this).attr("id");type=itemid[0];id=parseInt(itemid.substr(1));btshow=$j(this).children(".acl-button-show").removeClass("selected");bthide=$j(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var uclass="";if(that.allow_gid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected");uclass="groupshow"}if(that.deny_gid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected");uclass="grouphide"}$j(that.group_uids[id]).each(function(i,v){if(uclass=="grouphide")$j("#c"+v).removeClass("groupshow");if(uclass!=""){var cls=$j("#c"+v).attr("class");if(cls==undefined)return true;var hiding=cls.indexOf("grouphide");if(hiding==-1)$j("#c"+v).addClass(uclass)}});break;case"c":if(that.allow_cid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected")}if(that.deny_cid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected")}}})};ACL.prototype.get=function(start,count,search){var postdata={start:start,count:count,search:search};$j.ajax({type:"POST",url:that.url,data:postdata,dataType:"json",success:that.populate})};ACL.prototype.populate=function(data){$j(data.items).each(function(){html="<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";html=html.format(this.photo,this.name,this.type,this.id,"",this.network,this.link);if(this.uids!=undefined)that.group_uids[this.id]=this.uids;that.list_content.append(html)});$j(".acl-list-item img[data-src]",that.list_content).each(function(i,el){$j(el).attr("src",$j(el).data("src"))});that.update_view()};
\ No newline at end of file
diff --git a/view/theme/frost-mobile/js/main.js b/view/theme/frost-mobile/js/main.js
index 4ea2f7cdad..de89ba919f 100644
--- a/view/theme/frost-mobile/js/main.js
+++ b/view/theme/frost-mobile/js/main.js
@@ -287,7 +287,7 @@
 	}
 
 	function liveUpdate() {
-		if((src == null) || (stopped) || (! profile_uid)) { $j('.like-rotator').hide(); return; }
+		if((src == null) || (stopped) || (typeof profile_uid == 'undefined') || (! profile_uid)) { $j('.like-rotator').hide(); return; }
 		if(($j('.comment-edit-text-full').length) || (in_progress)) {
 			if(livetime) {
 				clearTimeout(livetime);
@@ -407,13 +407,13 @@
 		});
 	}
 
-	function imgbright(node) {
+/*	function imgbright(node) {
 		$j(node).removeClass("drophide").addClass("drop");
 	}
 
 	function imgdull(node) {
 		$j(node).removeClass("drop").addClass("drophide");
-	}
+	}*/
 
 	// Since our ajax calls are asynchronous, we will give a few 
 	// seconds for the first ajax call (setting like/dislike), then 
@@ -456,19 +456,19 @@
 
 	function getPosition(e) {
 		var cursor = {x:0, y:0};
-		if ( e.touches[0].pageX || e.touches[0].pageY  ) {
-			cursor.x = e.touches[0].pageX;
-			cursor.y = e.touches[0].pageY;
+		if ( e.pageX || e.pageY  ) {
+			cursor.x = e.pageX;
+			cursor.y = e.pageY;
 		}
 		else {
-			if( e.touches[0].clientX || e.touches[0].clientY ) {
-				cursor.x = e.touches[0].clientX + (document.documentElement.scrollLeft || document.body.scrollLeft) - document.documentElement.clientLeft;
-				cursor.y = e.touches[0].clientY + (document.documentElement.scrollTop  || document.body.scrollTop)  - document.documentElement.clientTop;
+			if( e.clientX || e.clientY ) {
+				cursor.x = e.clientX + (document.documentElement.scrollLeft || document.body.scrollLeft) - document.documentElement.clientLeft;
+				cursor.y = e.clientY + (document.documentElement.scrollTop  || document.body.scrollTop)  - document.documentElement.clientTop;
 			}
 			else {
-				if( e.touches[0].x || e.touches[0].y ) {
-					cursor.touches[0].x = e.touches[0].x;
-					cursor.touches[0].y = e.touches[0].y;
+				if( e.x || e.y ) {
+					cursor.x = e.x;
+					cursor.y = e.y;
 				}
 			}
 		}
@@ -487,7 +487,7 @@
 			lockvisible = true;
 			$j.get('lockview/' + id, function(data) {
 				$j('#panel').html(data);
-				$j('#panel').css({ 'left': cursor.x + 5 , 'top': cursor.y + 5});
+				$j('#panel').css({ 'left': 10 , 'top': cursor.y + 20});
 				$j('#panel').show();
 			});
 		}
diff --git a/view/theme/frost-mobile/js/main.min.js b/view/theme/frost-mobile/js/main.min.js
index aa4ce44275..3f6100e442 100644
--- a/view/theme/frost-mobile/js/main.min.js
+++ b/view/theme/frost-mobile/js/main.min.js
@@ -1 +1 @@
-function openClose(listID){listID="#"+listID.replace(/:/g,"\\:");listID=listID.replace(/\./g,"\\.");listID=listID.replace(/@/g,"\\@");if($j(listID).is(":visible")){$j(listID).hide();$j(listID+"-wrapper").show();alert($j(listID+"-wrapper").attr("id"))}else{$j(listID).show();$j(listID+"-wrapper").hide()}}function openMenu(theID){document.getElementById(theID).style.display="block"}function closeMenu(theID){document.getElementById(theID).style.display="none"}var src=null;var prev=null;var livetime=null;var msie=false;var stopped=false;var totStopped=false;var timer=null;var pr=0;var liking=0;var in_progress=false;var langSelect=false;var commentBusy=false;var last_popup_menu=null;var last_popup_button=null;$j(function(){$j.ajaxSetup({cache:false});msie=$j.browser.msie;collapseHeight();$j(".onoff input").each(function(){val=$j(this).val();id=$j(this).attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$j(".onoff > a").click(function(event){event.preventDefault();var input=$j(this).siblings("input");var val=1-input.val();var id=input.attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$j("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});function close_last_popup_menu(e){if(last_popup_menu){if("#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")){last_popup_menu.hide();if(last_popup_menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}}$j("img[rel^=#]").click(function(e){close_last_popup_menu(e);menu=$j($j(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;if(menu.css("display")=="none"){$j(this).parent().addClass("selected");menu.show();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").hide();last_popup_menu=menu;last_popup_button=$j(this).parent()}else{$j(this).parent().removeClass("selected");menu.hide();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_menu=null;last_popup_button=null}return false});$j("html").click(function(e){close_last_popup_menu(e)});var notifications_tpl=unescape($j("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($j("<div>").append($j("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($j("<div>").append($j("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,data){var invalid=$j(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$j(data).find("net").text();if(net==0){net="";$j("#net-update").removeClass("show")}else{$j("#net-update").addClass("show")}$j("#net-update").html(net);var home=$j(data).find("home").text();if(home==0){home="";$j("#home-update").removeClass("show")}else{$j("#home-update").addClass("show")}$j("#home-update").html(home);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update").removeClass("show")}else{$j("#intro-update").addClass("show")}$j("#intro-update").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update").removeClass("show")}else{$j("#mail-update").addClass("show")}$j("#mail-update").html(mail);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update-li").removeClass("show")}else{$j("#intro-update-li").addClass("show")}$j("#intro-update-li").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update-li").removeClass("show")}else{$j("#mail-update-li").addClass("show")}$j("#mail-update-li").html(mail);var eNotif=$j(data).find("notif");if(eNotif.children("note").length==0){$j("#nav-notifications-menu").html(notifications_empty)}else{nnm=$j("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$j(this);text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>");html=notifications_tpl.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen"));nnm.append(html)});$j("img[data-src]",nnm).each(function(i,el){$j(el).attr("src",$j(el).data("src"))})}notif=eNotif.attr("count");if(notif>0){$j("#nav-notifications-linkmenu").addClass("on")}else{$j("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$j("#notify-update").removeClass("show")}else{$j("#notify-update").addClass("show")}$j("#notify-update").html(notif);var eSysmsg=$j(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"notice",life:1e3})});eSysmsg.children("info").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"info",life:1e3})})});NavUpdate()});function NavUpdate(){if(!stopped){var pingCmd="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(pingCmd,function(data){$j(data).find("result").each(function(){$j("nav").trigger("nav-update",this);if($j("#live-network").length){src="network";liveUpdate()}if($j("#live-profile").length){src="profile";liveUpdate()}if($j("#live-community").length){src="community";liveUpdate()}if($j("#live-notes").length){src="notes";liveUpdate()}if($j("#live-display").length){src="display";liveUpdate()}if($j("#live-photos").length){if(liking){liking=0;window.location.href=window.location.href}}})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){if(livetime){clearTimeout(livetime)}livetime=setTimeout(liveUpdate,1e4);return}if(livetime!=null)livetime=null;prev="live-"+src;in_progress=true;var udargs=netargs.length?"/"+netargs:"";var update_url="update_"+src+udargs+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(update_url,function(data){in_progress=false;$j(".toplevel_item",data).each(function(){var ident=$j(this).attr("id");if($j("#"+ident).length==0&&profile_page==1){$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("#"+prev).after($j(this))}else{var id=$j(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$j("#collapsed-comments-"+id).is(":visible")}$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("html").height($j("html").height());$j("#"+ident).replaceWith($j(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$j("html").height("auto")}prev=ident});collapseHeight();$j(".like-rotator").hide();if(commentBusy){commentBusy=false;$j("body").css("cursor","auto")}$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl")})}function collapseHeight(elems){var elemName=".wall-item-body:not(.divmore)";if(typeof elems!="undefined"){elemName=elems+" "+elemName}$j(elemName).each(function(){if($j(this).height()>350){$j("html").height($j("html").height());$j(this).divgrow({initialHeight:300,showBrackets:false,speed:0});$j(this).addClass("divmore");$j("html").height("auto")}})}function imgbright(node){$j(node).removeClass("drophide").addClass("drop")}function imgdull(node){$j(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$j("#like-rotator-"+ident.toString()).show();$j.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$j.get("starred/"+ident,function(data){if(data.match(/1/)){$j("#starred-"+ident).addClass("starred");$j("#starred-"+ident).removeClass("unstarred");$j("#star-"+ident).addClass("hidden");$j("#unstar-"+ident).removeClass("hidden")}else{$j("#starred-"+ident).addClass("unstarred");$j("#starred-"+ident).removeClass("starred");$j("#star-"+ident).removeClass("hidden");$j("#unstar-"+ident).addClass("hidden")}})}function getPosition(e){var cursor={x:0,y:0};if(e.touches[0].pageX||e.touches[0].pageY){cursor.x=e.touches[0].pageX;cursor.y=e.touches[0].pageY}else{if(e.touches[0].clientX||e.touches[0].clientY){cursor.x=e.touches[0].clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft;cursor.y=e.touches[0].clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop}else{if(e.touches[0].x||e.touches[0].y){cursor.touches[0].x=e.touches[0].x;cursor.touches[0].y=e.touches[0].y}}}return cursor}var lockvisible=false;function lockview(event,id){event=event||window.event;cursor=getPosition(event);if(lockvisible){lockviewhide()}else{lockvisible=true;$j.get("lockview/"+id,function(data){$j("#panel").html(data);$j("#panel").css({left:cursor.x+5,top:cursor.y+5});$j("#panel").show()})}}function lockviewhide(){lockvisible=false;$j("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$j("body").css("cursor","wait");$j("#comment-preview-inp-"+id).val("0");$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$j("#comment-edit-wrapper-"+id).hide();$j("#comment-edit-text-"+id).val("");var tarea=document.getElementById("comment-edit-text-"+id);if(tarea)commentClose(tarea,id);if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,10)}if(data.reload){window.location.href=data.reload}},"json");return false}function preview_comment(id){$j("#comment-preview-inp-"+id).val("1");$j("#comment-edit-preview-"+id).show();$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$j("#comment-edit-preview-"+id).html(data.preview);$j("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($j("#collapsed-comments-"+id).is(":visible")){$j("#collapsed-comments-"+id).hide();$j("#hide-comments-"+id).html(window.showMore)}else{$j("#collapsed-comments-"+id).show();$j("#hide-comments-"+id).html(window.showFewer);collapseHeight("#collapsed-comments-"+id)}}function preview_post(){$j("#jot-preview").val("1");$j("#jot-preview-content").show();tinyMCE.triggerSave();$j.post("item",$j("#profile-jot-form").serialize(),function(data){if(data.preview){$j("#jot-preview-content").html(data.preview);$j("#jot-preview-content"+" a").click(function(){return false})}},"json");$j("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$j("#pause").html("")}function bin2hex(s){var v,i,f=0,a=[];s+="";f=s.length;for(i=0;i<f;i++){a[i]=s.charCodeAt(i).toString(16).replace(/^([\da-f])$/,"0$1")}return a.join("")}function groupChangeMember(gid,cid,sec_token){$j("body .fakelink").css("cursor","wait");$j.get("group/"+gid+"/"+cid+"?t="+sec_token,function(data){$j("#group-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function profChangeMember(gid,cid){$j("body .fakelink").css("cursor","wait");$j.get("profperm/"+gid+"/"+cid,function(data){$j("#prof-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(gid,cid){$j("body").css("cursor","wait");$j.get("contactgroup/"+gid+"/"+cid,function(data){$j("body").css("cursor","auto")})}function checkboxhighlight(box){if($j(box).is(":checked")){$j(box).addClass("checkeditem")}else{$j(box).removeClass("checkeditem")}}function notifyMarkAll(){$j.get("notify/mark/all",function(data){if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(field_name,url,type,win){var cmsURL=baseurl+"/fbrowser/"+type+"/";tinyMCE.activeEditor.windowManager.open({file:cmsURL,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:win,input:field_name});return false}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,forced_root_block:"div",convert_urls:false,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,file_browser_callback:"fcFileBrowser"})}String.prototype.format=function(){var formatted=this;for(var i=0;i<arguments.length;i++){var regexp=new RegExp("\\{"+i+"\\}","gi");formatted=formatted.replace(regexp,arguments[i])}return formatted};Array.prototype.remove=function(item){to=undefined;from=this.indexOf(item);var rest=this.slice((to||from)+1||this.length);this.length=from<0?this.length+from:from;return this.push.apply(this,rest)};function previewTheme(elm){theme=$j(elm).val();$j.getJSON("pretheme?f=&theme="+theme,function(data){$j("#theme-preview").html('<div id="theme-desc">'+data.desc+'</div><div id="theme-version">'+data.version+'</div><div id="theme-credits">'+data.credits+"</div>")})}
\ No newline at end of file
+function openClose(listID){listID="#"+listID.replace(/:/g,"\\:");listID=listID.replace(/\./g,"\\.");listID=listID.replace(/@/g,"\\@");if($j(listID).is(":visible")){$j(listID).hide();$j(listID+"-wrapper").show();alert($j(listID+"-wrapper").attr("id"))}else{$j(listID).show();$j(listID+"-wrapper").hide()}}function openMenu(theID){document.getElementById(theID).style.display="block"}function closeMenu(theID){document.getElementById(theID).style.display="none"}var src=null;var prev=null;var livetime=null;var msie=false;var stopped=false;var totStopped=false;var timer=null;var pr=0;var liking=0;var in_progress=false;var langSelect=false;var commentBusy=false;var last_popup_menu=null;var last_popup_button=null;$j(function(){$j.ajaxSetup({cache:false});msie=$j.browser.msie;collapseHeight();$j(".onoff input").each(function(){val=$j(this).val();id=$j(this).attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$j(".onoff > a").click(function(event){event.preventDefault();var input=$j(this).siblings("input");var val=1-input.val();var id=input.attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$j("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});function close_last_popup_menu(e){if(last_popup_menu){if("#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")){last_popup_menu.hide();if(last_popup_menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}}$j("img[rel^=#]").click(function(e){close_last_popup_menu(e);menu=$j($j(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;if(menu.css("display")=="none"){$j(this).parent().addClass("selected");menu.show();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").hide();last_popup_menu=menu;last_popup_button=$j(this).parent()}else{$j(this).parent().removeClass("selected");menu.hide();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_menu=null;last_popup_button=null}return false});$j("html").click(function(e){close_last_popup_menu(e)});var notifications_tpl=unescape($j("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($j("<div>").append($j("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($j("<div>").append($j("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,data){var invalid=$j(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$j(data).find("net").text();if(net==0){net="";$j("#net-update").removeClass("show")}else{$j("#net-update").addClass("show")}$j("#net-update").html(net);var home=$j(data).find("home").text();if(home==0){home="";$j("#home-update").removeClass("show")}else{$j("#home-update").addClass("show")}$j("#home-update").html(home);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update").removeClass("show")}else{$j("#intro-update").addClass("show")}$j("#intro-update").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update").removeClass("show")}else{$j("#mail-update").addClass("show")}$j("#mail-update").html(mail);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update-li").removeClass("show")}else{$j("#intro-update-li").addClass("show")}$j("#intro-update-li").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update-li").removeClass("show")}else{$j("#mail-update-li").addClass("show")}$j("#mail-update-li").html(mail);var eNotif=$j(data).find("notif");if(eNotif.children("note").length==0){$j("#nav-notifications-menu").html(notifications_empty)}else{nnm=$j("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$j(this);text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>");html=notifications_tpl.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen"));nnm.append(html)});$j("img[data-src]",nnm).each(function(i,el){$j(el).attr("src",$j(el).data("src"))})}notif=eNotif.attr("count");if(notif>0){$j("#nav-notifications-linkmenu").addClass("on")}else{$j("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$j("#notify-update").removeClass("show")}else{$j("#notify-update").addClass("show")}$j("#notify-update").html(notif);var eSysmsg=$j(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"notice",life:1e3})});eSysmsg.children("info").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"info",life:1e3})})});NavUpdate()});function NavUpdate(){if(!stopped){var pingCmd="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(pingCmd,function(data){$j(data).find("result").each(function(){$j("nav").trigger("nav-update",this);if($j("#live-network").length){src="network";liveUpdate()}if($j("#live-profile").length){src="profile";liveUpdate()}if($j("#live-community").length){src="community";liveUpdate()}if($j("#live-notes").length){src="notes";liveUpdate()}if($j("#live-display").length){src="display";liveUpdate()}if($j("#live-photos").length){if(liking){liking=0;window.location.href=window.location.href}}})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||typeof profile_uid=="undefined"||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){if(livetime){clearTimeout(livetime)}livetime=setTimeout(liveUpdate,1e4);return}if(livetime!=null)livetime=null;prev="live-"+src;in_progress=true;var udargs=netargs.length?"/"+netargs:"";var update_url="update_"+src+udargs+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(update_url,function(data){in_progress=false;$j(".toplevel_item",data).each(function(){var ident=$j(this).attr("id");if($j("#"+ident).length==0&&profile_page==1){$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("#"+prev).after($j(this))}else{var id=$j(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$j("#collapsed-comments-"+id).is(":visible")}$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("html").height($j("html").height());$j("#"+ident).replaceWith($j(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$j("html").height("auto")}prev=ident});collapseHeight();$j(".like-rotator").hide();if(commentBusy){commentBusy=false;$j("body").css("cursor","auto")}$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl")})}function collapseHeight(elems){var elemName=".wall-item-body:not(.divmore)";if(typeof elems!="undefined"){elemName=elems+" "+elemName}$j(elemName).each(function(){if($j(this).height()>350){$j("html").height($j("html").height());$j(this).divgrow({initialHeight:300,showBrackets:false,speed:0});$j(this).addClass("divmore");$j("html").height("auto")}})}function dolike(ident,verb){unpause();$j("#like-rotator-"+ident.toString()).show();$j.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$j.get("starred/"+ident,function(data){if(data.match(/1/)){$j("#starred-"+ident).addClass("starred");$j("#starred-"+ident).removeClass("unstarred");$j("#star-"+ident).addClass("hidden");$j("#unstar-"+ident).removeClass("hidden")}else{$j("#starred-"+ident).addClass("unstarred");$j("#starred-"+ident).removeClass("starred");$j("#star-"+ident).removeClass("hidden");$j("#unstar-"+ident).addClass("hidden")}})}function getPosition(e){var cursor={x:0,y:0};if(e.pageX||e.pageY){cursor.x=e.pageX;cursor.y=e.pageY}else{if(e.clientX||e.clientY){cursor.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft;cursor.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop}else{if(e.x||e.y){cursor.x=e.x;cursor.y=e.y}}}return cursor}var lockvisible=false;function lockview(event,id){event=event||window.event;cursor=getPosition(event);if(lockvisible){lockviewhide()}else{lockvisible=true;$j.get("lockview/"+id,function(data){$j("#panel").html(data);$j("#panel").css({left:10,top:cursor.y+20});$j("#panel").show()})}}function lockviewhide(){lockvisible=false;$j("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$j("body").css("cursor","wait");$j("#comment-preview-inp-"+id).val("0");$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$j("#comment-edit-wrapper-"+id).hide();$j("#comment-edit-text-"+id).val("");var tarea=document.getElementById("comment-edit-text-"+id);if(tarea)commentClose(tarea,id);if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,10)}if(data.reload){window.location.href=data.reload}},"json");return false}function preview_comment(id){$j("#comment-preview-inp-"+id).val("1");$j("#comment-edit-preview-"+id).show();$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$j("#comment-edit-preview-"+id).html(data.preview);$j("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($j("#collapsed-comments-"+id).is(":visible")){$j("#collapsed-comments-"+id).hide();$j("#hide-comments-"+id).html(window.showMore)}else{$j("#collapsed-comments-"+id).show();$j("#hide-comments-"+id).html(window.showFewer);collapseHeight("#collapsed-comments-"+id)}}function preview_post(){$j("#jot-preview").val("1");$j("#jot-preview-content").show();tinyMCE.triggerSave();$j.post("item",$j("#profile-jot-form").serialize(),function(data){if(data.preview){$j("#jot-preview-content").html(data.preview);$j("#jot-preview-content"+" a").click(function(){return false})}},"json");$j("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$j("#pause").html("")}function bin2hex(s){var v,i,f=0,a=[];s+="";f=s.length;for(i=0;i<f;i++){a[i]=s.charCodeAt(i).toString(16).replace(/^([\da-f])$/,"0$1")}return a.join("")}function groupChangeMember(gid,cid,sec_token){$j("body .fakelink").css("cursor","wait");$j.get("group/"+gid+"/"+cid+"?t="+sec_token,function(data){$j("#group-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function profChangeMember(gid,cid){$j("body .fakelink").css("cursor","wait");$j.get("profperm/"+gid+"/"+cid,function(data){$j("#prof-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(gid,cid){$j("body").css("cursor","wait");$j.get("contactgroup/"+gid+"/"+cid,function(data){$j("body").css("cursor","auto")})}function checkboxhighlight(box){if($j(box).is(":checked")){$j(box).addClass("checkeditem")}else{$j(box).removeClass("checkeditem")}}function notifyMarkAll(){$j.get("notify/mark/all",function(data){if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(field_name,url,type,win){var cmsURL=baseurl+"/fbrowser/"+type+"/";tinyMCE.activeEditor.windowManager.open({file:cmsURL,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:win,input:field_name});return false}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,forced_root_block:"div",convert_urls:false,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,file_browser_callback:"fcFileBrowser"})}String.prototype.format=function(){var formatted=this;for(var i=0;i<arguments.length;i++){var regexp=new RegExp("\\{"+i+"\\}","gi");formatted=formatted.replace(regexp,arguments[i])}return formatted};Array.prototype.remove=function(item){to=undefined;from=this.indexOf(item);var rest=this.slice((to||from)+1||this.length);this.length=from<0?this.length+from:from;return this.push.apply(this,rest)};function previewTheme(elm){theme=$j(elm).val();$j.getJSON("pretheme?f=&theme="+theme,function(data){$j("#theme-preview").html('<div id="theme-desc">'+data.desc+'</div><div id="theme-version">'+data.version+'</div><div id="theme-credits">'+data.credits+"</div>")})}
\ No newline at end of file
diff --git a/view/theme/frost-mobile/js/theme.js b/view/theme/frost-mobile/js/theme.js
index 178202ce5c..bb0d9dcccd 100644
--- a/view/theme/frost-mobile/js/theme.js
+++ b/view/theme/frost-mobile/js/theme.js
@@ -4,58 +4,6 @@ $j(document).ready(function() {
 	$j("#profile-jot-text").focus(enableOnUser);
 	$j("#profile-jot-text").click(enableOnUser);
 
-	if(typeof window.AjaxUpload != "undefined") {
-		switch(window.ajaxType) {
-			case 'jot-header':
-				var uploader = new window.AjaxUpload(
-					'wall-image-upload',
-					{ action: 'wall_upload/'+window.nickname+'?nomce=1',
-						name: 'userfile',
-						onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
-						onComplete: function(file,response) {
-							addeditortext(response);
-							$j('#profile-rotator').hide();
-						}				 
-					}
-				);
-
-				var file_uploader = new window.AjaxUpload(
-					'wall-file-upload',
-					{ action: 'wall_attach/'+window.nickname+'?nomce=1',
-						name: 'userfile',
-						onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
-						onComplete: function(file,response) {
-							addeditortext(response);
-							$j('#profile-rotator').hide();
-						}				 
-					}
-				);
-				break;
-			case 'msg-header':
-				var uploader = new window.AjaxUpload(
-					'prvmail-upload',
-					{ action: 'wall_upload/'+window.nickname+'?nomce=1',
-						name: 'userfile',
-						onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
-						onComplete: function(file,response) {
-							tinyMCE.execCommand('mceInsertRawHTML',false,response);
-							$j('#profile-rotator').hide();
-						}				 
-					}
-				);
-				break;
-			default:
-				break;
-		}
-	}
-
-	if(typeof window.aclInit !="undefined" && typeof acl=="undefined"){
-		acl = new ACL(
-			baseurl+"/acl",
-			[ window.allowCID,window.allowGID,window.denyCID,window.denyGID ]
-		);
-	}
-
 /*$j('html').click(function() { $j("#nav-notifications-menu" ).hide(); });*/
 
 	/*$j('.group-edit-icon').hover(
@@ -93,11 +41,115 @@ $j(document).ready(function() {
 			$j('#drop-' + id).removeClass('icon');$j('#drop-' + id).removeClass('drophide'); $j('#drop-' + id).addClass('iconspacer');}
 	);*/
 
-	if(window.autoCompleteType == "display-head") {
+
+	$j('#event-share-checkbox').change(function() {
+
+		if ($j('#event-share-checkbox').is(':checked')) { 
+			$j('#acl-wrapper').show();
+		}
+		else {
+			$j('#acl-wrapper').hide();
+		}
+	}).trigger('change');
+
+
+	$j(".popupbox").click(function () {
+		var parent = $j( $j(this).attr('href') ).parent();
+		if (parent.css('display') == 'none') {
+			parent.show();
+		} else {
+			parent.hide();
+		}
+		return false;
+	});
+
+
+
+	if(typeof window.AjaxUpload != "undefined") {
+		var uploader = new window.AjaxUpload(
+			window.imageUploadButton,
+			{ action: 'wall_upload/'+window.nickname+'?nomce=1',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(window.jotId, response);
+					$j('#profile-rotator').hide();
+				}				 
+			}
+		);
+
+		if($j('#wall-file-upload').length) {
+			var file_uploader = new window.AjaxUpload(
+				'wall-file-upload',
+				{ action: 'wall_attach/'+window.nickname+'?nomce=1',
+					name: 'userfile',
+					onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
+					onComplete: function(file,response) {
+						addeditortext(window.jotId, response);
+						$j('#profile-rotator').hide();
+					}				 
+				}
+			);
+		}
+	}
+
+
+	if(typeof window.aclInit !="undefined" && typeof acl=="undefined"){
+		acl = new ACL(
+			baseurl+"/acl",
+			[ window.allowCID,window.allowGID,window.denyCID,window.denyGID ]
+		);
+	}
+
+	switch(window.autocompleteType) {
+		case 'msg-header':
+			var a = $j("#recip").autocomplete({ 
+				serviceUrl: baseurl + '/acl',
+				minChars: 2,
+				width: 350,
+				onSelect: function(value,data) {
+					$j("#recip-complete").val(data);
+				}			
+			});
+			break;
+		case 'contacts-head':
+			var a = $j("#contacts-search").autocomplete({ 
+				serviceUrl: baseurl + '/acl',
+				minChars: 2,
+				width: 350,
+			});
+			a.setOptions({ params: { type: 'a' }});
+			break;
+		case 'display-head':
+			$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+			break;
+		default:
+			break;
+	}
+
+
+/*	if(window.autoCompleteType == "display-head") {
 		//$j(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
 		// make auto-complete work in more places
 		//$j(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
 		$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+	}*/
+
+
+	if(window.aclType == "settings-head" || window.aclType == "photos_head" || window.aclType == "event_head") {
+		$j('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+			var selstr;
+			$j('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+				selstr = $j(this).text();
+				$j('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$j('#jot-public').hide();
+			});
+			if(selstr == null) { 
+				$j('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$j('#jot-public').show();
+			}
+
+		}).trigger('change');
 	}
 
 	if(window.aclType == "event_head") {
@@ -159,67 +211,6 @@ $j(document).ready(function() {
 		if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
 	}	
 
-	if(window.aclType == "settings-head" || window.aclType == "photos_head" || window.aclType == "event_head") {
-		$j('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$j('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $j(this).text();
-				$j('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$j('#jot-public').hide();
-			});
-			if(selstr == null) { 
-				$j('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$j('#jot-public').show();
-			}
-
-		}).trigger('change');
-	}
-
-	switch(window.autocompleteType) {
-		case 'msg-header':
-			var a = $j("#recip").autocomplete({ 
-				serviceUrl: baseurl + '/acl',
-				minChars: 2,
-				width: 350,
-				onSelect: function(value,data) {
-					$j("#recip-complete").val(data);
-				}			
-			});
-			break;
-		case 'contacts-head':
-			var a = $j("#contacts-search").autocomplete({ 
-				serviceUrl: baseurl + '/acl',
-				minChars: 2,
-				width: 350,
-			});
-			a.setOptions({ params: { type: 'a' }});
-			break;
-		default:
-			break;
-	}
-
-
-	$j('#event-share-checkbox').change(function() {
-
-		if ($j('#event-share-checkbox').is(':checked')) { 
-			$j('#acl-wrapper').show();
-		}
-		else {
-			$j('#acl-wrapper').hide();
-		}
-	}).trigger('change');
-
-
-	$j(".popupbox").click(function () {
-		var parent = $j( $j(this).attr('href') ).parent();
-		if (parent.css('display') == 'none') {
-			parent.show();
-		} else {
-			parent.hide();
-		}
-		return false;
-	});
-
 });
 
 // update pending count //
@@ -242,50 +233,52 @@ function homeRedirect() {
 }
 
 
-function insertFormatting(comment,BBcode,id) {
-	
-	var tmpStr = $j("#comment-edit-text-" + id).val();
-	if(tmpStr == comment) {
-		tmpStr = "";
-		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-		openMenu("comment-edit-submit-wrapper-" + id);
-		$j("#comment-edit-text-" + id).val(tmpStr);
+function initCrop() {
+	function onEndCrop( coords, dimensions ) {
+		$( 'x1' ).value = coords.x1;
+		$( 'y1' ).value = coords.y1;
+		$( 'x2' ).value = coords.x2;
+		$( 'y2' ).value = coords.y2;
+		$( 'width' ).value = dimensions.width;
+		$( 'height' ).value = dimensions.height;
 	}
 
-	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;
+	Event.observe( window, 'load', function() {
+		new Cropper.ImgWithPreview(
+		'croppa',
+		{
+			previewWrap: 'previewWrap',
+			minWidth: 175,
+			minHeight: 175,
+			maxWidth: 640,
+			maxHeight: 640,
+			ratioDim: { x: 100, y:100 },
+			displayOnInit: true,
+			onEndCrop: onEndCrop
+		});
+	});
 }
 
-function cmtBbOpen(id) {
-	$j(".comment-edit-bb-" + id).show();
-}
-function cmtBbClose(id) {
-	$j(".comment-edit-bb-" + id).hide();
+
+function showEvent(eventid) {
+/*	$j.get(
+		baseurl + '/events/?id='+eventid,
+		function(data){
+			$j.colorbox({html:data});
+		}
+	);*/			
 }
 
 
 
+/*
+ * TinyMCE/Editor
+ */
 
 var editor=false;
 var textlen = 0;
 var plaintext = 'none';//window.editSelect;
-	var ispublic = window.isPublic;
+//var ispublic = window.isPublic;
 
 function initEditor(cb){
 	if (editor==false){
@@ -412,7 +405,7 @@ function enableOnUser(){
 	initEditor();
 }
 
-function wallInitEditor() {
+/*function wallInitEditor() {
 	var plaintext = window.editSelect;
 
 	if(plaintext != 'none') {
@@ -454,131 +447,34 @@ function wallInitEditor() {
 	}
 	else
 		$j("#prvmail-text").contact_autocomplete(baseurl+"/acl");
-}
-
-
-
-
-function initCrop() {
-	function onEndCrop( coords, dimensions ) {
-		$( 'x1' ).value = coords.x1;
-		$( 'y1' ).value = coords.y1;
-		$( 'x2' ).value = coords.x2;
-		$( 'y2' ).value = coords.y2;
-		$( 'width' ).value = dimensions.width;
-		$( 'height' ).value = dimensions.height;
-	}
-
-	Event.observe( window, 'load', function() {
-		new Cropper.ImgWithPreview(
-		'croppa',
-		{
-			previewWrap: 'previewWrap',
-			minWidth: 175,
-			minHeight: 175,
-			maxWidth: 640,
-			maxHeight: 640,
-			ratioDim: { x: 100, y:100 },
-			displayOnInit: true,
-			onEndCrop: onEndCrop
-		});
-	});
-}
+}*/
 
 
-function confirmDelete() { return confirm(window.delItem); }
-function commentOpen(obj,id) {
-	if(obj.value == window.commentEmptyText) {
-		obj.value = "";
-		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-		$j("#mod-cmnt-wrap-" + id).show();
-		openMenu("comment-edit-submit-wrapper-" + id);
-	}
-}
-function commentClose(obj,id) {
-	if(obj.value == "") {
-		obj.value = window.commentEmptyText;
-		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
-		$j("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
-		$j("#mod-cmnt-wrap-" + id).hide();
-		closeMenu("comment-edit-submit-wrapper-" + id);
-	}
-}
 
+/*
+ * Jot
+ */
 
-function commentInsert(obj,id) {
-	var tmpStr = $j("#comment-edit-text-" + id).val();
-	if(tmpStr == window.commentEmptyText) {
-		tmpStr = "";
-		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-		openMenu("comment-edit-submit-wrapper-" + id);
-	}
-	var ins = $j(obj).html();
-	ins = ins.replace("&lt;","<");
-	ins = ins.replace("&gt;",">");
-	ins = ins.replace("&amp;","&");
-	ins = ins.replace("&quot;",'"');
-	$j("#comment-edit-text-" + id).val(tmpStr + ins);
-}
-
-function qCommentInsert(obj,id) {
-	var tmpStr = $j("#comment-edit-text-" + id).val();
-	if(tmpStr == window.commentEmptyText) {
-		tmpStr = "";
-		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-		openMenu("comment-edit-submit-wrapper-" + id);
+function addeditortext(textElem, data) {
+	if(window.editSelect == 'none') {
+		var currentText = $j(textElem).val();
+		$j(textElem).val(currentText + data);
 	}
-	var ins = $j(obj).val();
-	ins = ins.replace("&lt;","<");
-	ins = ins.replace("&gt;",">");
-	ins = ins.replace("&amp;","&");
-	ins = ins.replace("&quot;",'"');
-	$j("#comment-edit-text-" + id).val(tmpStr + ins);
-	$j(obj).val("");
+/*	else
+		tinyMCE.execCommand('mceInsertRawHTML',false,data);*/
 }
 
-/*function showHideCommentBox(id) {
-	if( $j('#comment-edit-form-' + id).is(':visible')) {
-		$j('#comment-edit-form-' + id).hide();
-	}
-	else {
-		$j('#comment-edit-form-' + id).show();
-	}
-}*/
-
-
-/*function deleteCheckedItems() {
-	var checkedstr = '';
-
-	$j('.item-select').each( function() {
-		if($j(this).is(':checked')) {
-			if(checkedstr.length != 0) {
-				checkedstr = checkedstr + ',' + $j(this).val();
-			}
-			else {
-				checkedstr = $j(this).val();
-			}
-		}	
-	});
-	$j.post('item', { dropitems: checkedstr }, function(data) {
-		window.location.reload();
-	});
-}*/
-
 function jotVideoURL() {
 	reply = prompt(window.vidURL);
 	if(reply && reply.length) {
-		addeditortext('[video]' + reply + '[/video]');
+		addeditortext("#profile-jot-text", '[video]' + reply + '[/video]');
 	}
 }
 
 function jotAudioURL() {
 	reply = prompt(window.audURL);
 	if(reply && reply.length) {
-		addeditortext('[audio]' + reply + '[/audio]');
+		addeditortext("#profile-jot-text", '[audio]' + reply + '[/audio]');
 	}
 }
 
@@ -597,7 +493,7 @@ function jotShare(id) {
 	$j.get('share/' + id, function(data) {
 		if (!editor) $j("#profile-jot-text").val("");
 		initEditor(function(){
-			addeditortext(data);
+			addeditortext("#profile-jot-text", data);
 			$j('#like-rotator-' + id).hide();
 			$j(window).scrollTop(0);
 		});
@@ -605,84 +501,73 @@ function jotShare(id) {
 	});
 }
 
-function linkdropper(event) {
+function jotGetLink() {
+	reply = prompt(window.linkURL);
+	if(reply && reply.length) {
+		reply = bin2hex(reply);
+		$j('#profile-rotator').show();
+		$j.get('parse_url?binurl=' + reply, function(data) {
+			addeditortext(window.jotId, data);
+			$j('#profile-rotator').hide();
+		});
+	}
+}
+
+/*function linkdropper(event) {
 	var linkFound = event.dataTransfer.types.contains("text/uri-list");
 	if(linkFound)
 		event.preventDefault();
 }
 
-switch(window.ajaxType) {
-	case 'jot-header':
-		function jotGetLink() {
-			reply = prompt(window.linkURL);
-			if(reply && reply.length) {
-				reply = bin2hex(reply);
-				$j('#profile-rotator').show();
-				$j.get('parse_url?binurl=' + reply, function(data) {
-					addeditortext(data);
-					$j('#profile-rotator').hide();
-				});
-			}
-		}
+function linkdrop(event) {
+	var reply = event.dataTransfer.getData("text/uri-list");
+	event.target.textContent = reply;
+	event.preventDefault();
+	if(reply && reply.length) {
+		reply = bin2hex(reply);
+		$j('#profile-rotator').show();
+		$j.get('parse_url?binurl=' + reply, function(data) {
+			//if (!editor) $j("#profile-jot-text").val("");
+			//initEditor(function(){
+			addeditortext(window.jotId, data);
+			$j('#profile-rotator').hide();
+			//});
+		});
+	}
+}*/
 
-		function linkdrop(event) {
-			var reply = event.dataTransfer.getData("text/uri-list");
-			event.target.textContent = reply;
-			event.preventDefault();
-			if(reply && reply.length) {
-				reply = bin2hex(reply);
-				$j('#profile-rotator').show();
-				$j.get('parse_url?binurl=' + reply, function(data) {
-					if (!editor) $j("#profile-jot-text").val("");
-					initEditor(function(){
-						addeditortext(data);
-						$j('#profile-rotator').hide();
-					});
-				});
-			}
-		}
-		break;
-	case 'msg-header':
-	case 'wallmsg-header':
-// TINYMCE -- BAD
-		function jotGetLink() {
-			reply = prompt(window.linkURL);
-			if(reply && reply.length) {
-				$j('#profile-rotator').show();
-				$j.get('parse_url?url=' + reply, function(data) {
-					tinyMCE.execCommand('mceInsertRawHTML',false,data);
-					$j('#profile-rotator').hide();
-				});
-			}
-		}
+function jotClearLocation() {
+	$j('#jot-coord').val('');
+	$j('#profile-nolocation-wrapper').hide();
+}
 
-		function linkdrop(event) {
-			var reply = event.dataTransfer.getData("text/uri-list");
-			event.target.textContent = reply;
-			event.preventDefault();
-			if(reply && reply.length) {
-				$j('#profile-rotator').show();
-				$j.get('parse_url?url=' + reply, function(data) {
-					tinyMCE.execCommand('mceInsertRawHTML',false,data);
-					$j('#profile-rotator').hide();
-				});
-			}
-		}
+if(typeof window.geoTag === 'function') window.geoTag();
 
-		break;
-	default:
-		break;
-}
 
-function showEvent(eventid) {
-/*	$j.get(
-		baseurl + '/events/?id='+eventid,
-		function(data){
-			$j.colorbox({html:data});
-		}
-	);*/			
-}
 
+/*
+ * Items
+ */
+
+function confirmDelete() { return confirm(window.delItem); }
+
+/*function deleteCheckedItems() {
+	var checkedstr = '';
+
+	$j('.item-select').each( function() {
+		if($j(this).is(':checked')) {
+			if(checkedstr.length != 0) {
+				checkedstr = checkedstr + ',' + $j(this).val();
+			}
+			else {
+				checkedstr = $j(this).val();
+			}
+		}	
+	});
+	$j.post('item', { dropitems: checkedstr }, function(data) {
+		window.location.reload();
+	});
+}*/
 
 function itemTag(id) {
 	reply = prompt(window.term);
@@ -750,20 +635,111 @@ function itemFiler(id) {
 */		
 }
 
-function jotClearLocation() {
-	$j('#jot-coord').val('');
-	$j('#profile-nolocation-wrapper').hide();
+
+
+/*
+ * Comments
+ */
+
+
+function commentOpen(obj,id) {
+	if(obj.value == window.commentEmptyText) {
+		obj.value = "";
+		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+		$j("#mod-cmnt-wrap-" + id).show();
+		openMenu("comment-edit-submit-wrapper-" + id);
+	}
+}
+function commentClose(obj,id) {
+	if(obj.value == "") {
+		obj.value = window.commentEmptyText;
+		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
+		$j("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
+		$j("#mod-cmnt-wrap-" + id).hide();
+		closeMenu("comment-edit-submit-wrapper-" + id);
+	}
 }
 
-function addeditortext(data) {
-	if(plaintext == 'none') {
-		var currentText = $j("#profile-jot-text").val();
-		$j("#profile-jot-text").val(currentText + data);
+
+function commentInsert(obj,id) {
+	var tmpStr = $j("#comment-edit-text-" + id).val();
+	if(tmpStr == window.commentEmptyText) {
+		tmpStr = "";
+		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+		openMenu("comment-edit-submit-wrapper-" + id);
 	}
-	/*else
-		tinyMCE.execCommand('mceInsertRawHTML',false,data);*/
+	var ins = $j(obj).html();
+	ins = ins.replace("&lt;","<");
+	ins = ins.replace("&gt;",">");
+	ins = ins.replace("&amp;","&");
+	ins = ins.replace("&quot;",'"');
+	$j("#comment-edit-text-" + id).val(tmpStr + ins);
 }
 
-if(typeof window.geoTag === 'function') window.geoTag();
+function qCommentInsert(obj,id) {
+	var tmpStr = $j("#comment-edit-text-" + id).val();
+	if(tmpStr == window.commentEmptyText) {
+		tmpStr = "";
+		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+		openMenu("comment-edit-submit-wrapper-" + id);
+	}
+	var ins = $j(obj).val();
+	ins = ins.replace("&lt;","<");
+	ins = ins.replace("&gt;",">");
+	ins = ins.replace("&amp;","&");
+	ins = ins.replace("&quot;",'"');
+	$j("#comment-edit-text-" + id).val(tmpStr + ins);
+	$j(obj).val("");
+}
+
+/*function showHideCommentBox(id) {
+	if( $j('#comment-edit-form-' + id).is(':visible')) {
+		$j('#comment-edit-form-' + id).hide();
+	}
+	else {
+		$j('#comment-edit-form-' + id).show();
+	}
+}*/
+
+
+function insertFormatting(comment,BBcode,id) {
+	
+	var tmpStr = $j("#comment-edit-text-" + id).val();
+	if(tmpStr == comment) {
+		tmpStr = "";
+		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+		openMenu("comment-edit-submit-wrapper-" + id);
+		$j("#comment-edit-text-" + id).val(tmpStr);
+	}
+
+	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;
+}
+
+function cmtBbOpen(id) {
+	$j(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+	$j(".comment-edit-bb-" + id).hide();
+}
 
 
diff --git a/view/theme/frost-mobile/js/theme.min.js b/view/theme/frost-mobile/js/theme.min.js
index a7562d5e99..47b0bb9b87 100644
--- a/view/theme/frost-mobile/js/theme.min.js
+++ b/view/theme/frost-mobile/js/theme.min.js
@@ -1 +1 @@
-$j(document).ready(function(){$j("#profile-jot-text").focus(enableOnUser);$j("#profile-jot-text").click(enableOnUser);if(typeof window.AjaxUpload!="undefined"){switch(window.ajaxType){case"jot-header":var uploader=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){addeditortext(response);$j("#profile-rotator").hide()}});var file_uploader=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){addeditortext(response);$j("#profile-rotator").hide()}});break;case"msg-header":var uploader=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){tinyMCE.execCommand("mceInsertRawHTML",false,response);$j("#profile-rotator").hide()}});break;default:break}}if(typeof window.aclInit!="undefined"&&typeof acl=="undefined"){acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])}if(window.autoCompleteType=="display-head"){$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl")}if(window.aclType=="event_head"){$j("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(calEvent,jsEvent,view){showEvent(calEvent.id)},eventRender:function(event,element,view){if(event.item["author-name"]==null)return;switch(view.name){case"month":element.find(".fc-event-title").html("<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(event.item["author-avatar"],event.item["author-name"],event.title));break;case"agendaWeek":element.find(".fc-event-title").html("<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break;case"agendaDay":element.find(".fc-event-title").html("<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break}}});var args=location.href.replace(baseurl,"").split("/");if(args.length>=4){$j("#events-calendar").fullCalendar("gotoDate",args[2],args[3]-1)}var hash=location.hash.split("-");if(hash.length==2&&hash[0]=="#link")showEvent(hash[1])}if(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head"){$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var selstr;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){selstr=$j(this).text();$j("#jot-perms-icon").removeClass("unlock").addClass("lock");$j("#jot-public").hide()});if(selstr==null){$j("#jot-perms-icon").removeClass("lock").addClass("unlock");$j("#jot-public").show()}}).trigger("change")}switch(window.autocompleteType){case"msg-header":var a=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(value,data){$j("#recip-complete").val(data)}});break;case"contacts-head":var a=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});a.setOptions({params:{type:"a"}});break;default:break}$j("#event-share-checkbox").change(function(){if($j("#event-share-checkbox").is(":checked")){$j("#acl-wrapper").show()}else{$j("#acl-wrapper").hide()}}).trigger("change");$j(".popupbox").click(function(){var parent=$j($j(this).attr("href")).parent();if(parent.css("display")=="none"){parent.show()}else{parent.hide()}return false})});$j(function(){$j("nav").bind("nav-update",function(e,data){var elm=$j("#pending-update");var register=$j(data).find("register").text();if(register=="0"){register="";elm.hide()}else{elm.show()}elm.html(register)})});function homeRedirect(){$j("html").fadeOut("slow",function(){window.location=baseurl+"/login"})}function insertFormatting(comment,BBcode,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==comment){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id);$j("#comment-edit-text-"+id).val(tmpStr)}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}function cmtBbOpen(id){$j(".comment-edit-bb-"+id).show()}function cmtBbClose(id){$j(".comment-edit-bb-"+id).hide()}var editor=false;var textlen=0;var plaintext="none";var ispublic=window.isPublic;function initEditor(cb){if(editor==false){if(plaintext=="none"){$j("#profile-jot-text").css({height:200,color:"#000"});$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");editor=true;$j("a#jot-perms-icon, a#settings-default-perms-menu").click(function(){var parent=$j("#profile-jot-acl-wrapper").parent();if(parent.css("display")=="none"){parent.show()}else{parent.hide()}return false});$j(".jothidden").show();if(typeof cb!="undefined")cb();return}}else{if(typeof cb!="undefined")cb()}}function enableOnUser(){if(editor)return;$j(this).val("");initEditor()}function wallInitEditor(){var plaintext=window.editSelect;if(plaintext!="none"){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:true,paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,forced_root_block:"div",convert_urls:false,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,setup:function(ed){ed.onInit.add(function(ed){ed.pasteAsPlainText=true;var editorId=ed.editorId;var textarea=$j("#"+editorId);if(typeof textarea.attr("tabindex")!="undefined"){$j("#"+editorId+"_ifr").attr("tabindex",textarea.attr("tabindex"));textarea.attr("tabindex",null)}})}})}else $j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function initCrop(){function onEndCrop(coords,dimensions){$("x1").value=coords.x1;$("y1").value=coords.y1;$("x2").value=coords.x2;$("y2").value=coords.y2;$("width").value=dimensions.width;$("height").value=dimensions.height}Event.observe(window,"load",function(){new Cropper.ImgWithPreview("croppa",{previewWrap:"previewWrap",minWidth:175,minHeight:175,maxWidth:640,maxHeight:640,ratioDim:{x:100,y:100},displayOnInit:true,onEndCrop:onEndCrop})})}function confirmDelete(){return confirm(window.delItem)}function commentOpen(obj,id){if(obj.value==window.commentEmptyText){obj.value="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");$j("#mod-cmnt-wrap-"+id).show();openMenu("comment-edit-submit-wrapper-"+id)}}function commentClose(obj,id){if(obj.value==""){obj.value=window.commentEmptyText;$j("#comment-edit-text-"+id).removeClass("comment-edit-text-full");$j("#comment-edit-text-"+id).addClass("comment-edit-text-empty");$j("#mod-cmnt-wrap-"+id).hide();closeMenu("comment-edit-submit-wrapper-"+id)}}function commentInsert(obj,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$j(obj).html();ins=ins.replace("&lt;","<");ins=ins.replace("&gt;",">");ins=ins.replace("&amp;","&");ins=ins.replace("&quot;",'"');$j("#comment-edit-text-"+id).val(tmpStr+ins)}function qCommentInsert(obj,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$j(obj).val();ins=ins.replace("&lt;","<");ins=ins.replace("&gt;",">");ins=ins.replace("&amp;","&");ins=ins.replace("&quot;",'"');$j("#comment-edit-text-"+id).val(tmpStr+ins);$j(obj).val("")}function jotVideoURL(){reply=prompt(window.vidURL);if(reply&&reply.length){addeditortext("[video]"+reply+"[/video]")}}function jotAudioURL(){reply=prompt(window.audURL);if(reply&&reply.length){addeditortext("[audio]"+reply+"[/audio]")}}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val());if(reply&&reply.length){$j("#jot-location").val(reply)}}function jotShare(id){if($j("#jot-popup").length!=0)$j("#jot-popup").show();$j("#like-rotator-"+id).show();$j.get("share/"+id,function(data){if(!editor)$j("#profile-jot-text").val("");initEditor(function(){addeditortext(data);$j("#like-rotator-"+id).hide();$j(window).scrollTop(0)})})}function linkdropper(event){var linkFound=event.dataTransfer.types.contains("text/uri-list");if(linkFound)event.preventDefault()}switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL);if(reply&&reply.length){reply=bin2hex(reply);$j("#profile-rotator").show();$j.get("parse_url?binurl="+reply,function(data){addeditortext(data);$j("#profile-rotator").hide()})}}function linkdrop(event){var reply=event.dataTransfer.getData("text/uri-list");event.target.textContent=reply;event.preventDefault();if(reply&&reply.length){reply=bin2hex(reply);$j("#profile-rotator").show();$j.get("parse_url?binurl="+reply,function(data){if(!editor)$j("#profile-jot-text").val("");initEditor(function(){addeditortext(data);$j("#profile-rotator").hide()})})}}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL);if(reply&&reply.length){$j("#profile-rotator").show();$j.get("parse_url?url="+reply,function(data){tinyMCE.execCommand("mceInsertRawHTML",false,data);$j("#profile-rotator").hide()})}}function linkdrop(event){var reply=event.dataTransfer.getData("text/uri-list");event.target.textContent=reply;event.preventDefault();if(reply&&reply.length){$j("#profile-rotator").show();$j.get("parse_url?url="+reply,function(data){tinyMCE.execCommand("mceInsertRawHTML",false,data);$j("#profile-rotator").hide()})}}break;default:break}function showEvent(eventid){}function itemTag(id){reply=prompt(window.term);if(reply&&reply.length){reply=reply.replace("#","");if(reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("tagger/"+id+"?term="+reply,NavUpdate);liking=1}}}function itemFiler(id){$j.get("filer/",function(data){var promptText=$j("#id_term_label",data).text();reply=prompt(promptText);if(reply&&reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("filer/"+id+"?term="+reply,NavUpdate);liking=1}})}function jotClearLocation(){$j("#jot-coord").val("");$j("#profile-nolocation-wrapper").hide()}function addeditortext(data){if(plaintext=="none"){var currentText=$j("#profile-jot-text").val();$j("#profile-jot-text").val(currentText+data)}}if(typeof window.geoTag==="function")window.geoTag();
\ No newline at end of file
+$j(document).ready(function(){$j("#profile-jot-text").focus(enableOnUser);$j("#profile-jot-text").click(enableOnUser);$j("#event-share-checkbox").change(function(){if($j("#event-share-checkbox").is(":checked")){$j("#acl-wrapper").show()}else{$j("#acl-wrapper").hide()}}).trigger("change");$j(".popupbox").click(function(){var parent=$j($j(this).attr("href")).parent();if(parent.css("display")=="none"){parent.show()}else{parent.hide()}return false});if(typeof window.AjaxUpload!="undefined"){var uploader=new window.AjaxUpload(window.imageUploadButton,{action:"wall_upload/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){addeditortext(window.jotId,response);$j("#profile-rotator").hide()}});if($j("#wall-file-upload").length){var file_uploader=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){addeditortext(window.jotId,response);$j("#profile-rotator").hide()}})}}if(typeof window.aclInit!="undefined"&&typeof acl=="undefined"){acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])}switch(window.autocompleteType){case"msg-header":var a=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(value,data){$j("#recip-complete").val(data)}});break;case"contacts-head":var a=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});a.setOptions({params:{type:"a"}});break;case"display-head":$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");break;default:break}if(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head"){$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var selstr;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){selstr=$j(this).text();$j("#jot-perms-icon").removeClass("unlock").addClass("lock");$j("#jot-public").hide()});if(selstr==null){$j("#jot-perms-icon").removeClass("lock").addClass("unlock");$j("#jot-public").show()}}).trigger("change")}if(window.aclType=="event_head"){$j("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(calEvent,jsEvent,view){showEvent(calEvent.id)},eventRender:function(event,element,view){if(event.item["author-name"]==null)return;switch(view.name){case"month":element.find(".fc-event-title").html("<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(event.item["author-avatar"],event.item["author-name"],event.title));break;case"agendaWeek":element.find(".fc-event-title").html("<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break;case"agendaDay":element.find(".fc-event-title").html("<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break}}});var args=location.href.replace(baseurl,"").split("/");if(args.length>=4){$j("#events-calendar").fullCalendar("gotoDate",args[2],args[3]-1)}var hash=location.hash.split("-");if(hash.length==2&&hash[0]=="#link")showEvent(hash[1])}});$j(function(){$j("nav").bind("nav-update",function(e,data){var elm=$j("#pending-update");var register=$j(data).find("register").text();if(register=="0"){register="";elm.hide()}else{elm.show()}elm.html(register)})});function homeRedirect(){$j("html").fadeOut("slow",function(){window.location=baseurl+"/login"})}function initCrop(){function onEndCrop(coords,dimensions){$("x1").value=coords.x1;$("y1").value=coords.y1;$("x2").value=coords.x2;$("y2").value=coords.y2;$("width").value=dimensions.width;$("height").value=dimensions.height}Event.observe(window,"load",function(){new Cropper.ImgWithPreview("croppa",{previewWrap:"previewWrap",minWidth:175,minHeight:175,maxWidth:640,maxHeight:640,ratioDim:{x:100,y:100},displayOnInit:true,onEndCrop:onEndCrop})})}function showEvent(eventid){}var editor=false;var textlen=0;var plaintext="none";function initEditor(cb){if(editor==false){if(plaintext=="none"){$j("#profile-jot-text").css({height:200,color:"#000"});$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");editor=true;$j("a#jot-perms-icon, a#settings-default-perms-menu").click(function(){var parent=$j("#profile-jot-acl-wrapper").parent();if(parent.css("display")=="none"){parent.show()}else{parent.hide()}return false});$j(".jothidden").show();if(typeof cb!="undefined")cb();return}}else{if(typeof cb!="undefined")cb()}}function enableOnUser(){if(editor)return;$j(this).val("");initEditor()}function addeditortext(textElem,data){if(window.editSelect=="none"){var currentText=$j(textElem).val();$j(textElem).val(currentText+data)}}function jotVideoURL(){reply=prompt(window.vidURL);if(reply&&reply.length){addeditortext("#profile-jot-text","[video]"+reply+"[/video]")}}function jotAudioURL(){reply=prompt(window.audURL);if(reply&&reply.length){addeditortext("#profile-jot-text","[audio]"+reply+"[/audio]")}}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val());if(reply&&reply.length){$j("#jot-location").val(reply)}}function jotShare(id){if($j("#jot-popup").length!=0)$j("#jot-popup").show();$j("#like-rotator-"+id).show();$j.get("share/"+id,function(data){if(!editor)$j("#profile-jot-text").val("");initEditor(function(){addeditortext("#profile-jot-text",data);$j("#like-rotator-"+id).hide();$j(window).scrollTop(0)})})}function jotGetLink(){reply=prompt(window.linkURL);if(reply&&reply.length){reply=bin2hex(reply);$j("#profile-rotator").show();$j.get("parse_url?binurl="+reply,function(data){addeditortext(window.jotId,data);$j("#profile-rotator").hide()})}}function jotClearLocation(){$j("#jot-coord").val("");$j("#profile-nolocation-wrapper").hide()}if(typeof window.geoTag==="function")window.geoTag();function confirmDelete(){return confirm(window.delItem)}function itemTag(id){reply=prompt(window.term);if(reply&&reply.length){reply=reply.replace("#","");if(reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("tagger/"+id+"?term="+reply,NavUpdate);liking=1}}}function itemFiler(id){$j.get("filer/",function(data){var promptText=$j("#id_term_label",data).text();reply=prompt(promptText);if(reply&&reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("filer/"+id+"?term="+reply,NavUpdate);liking=1}})}function commentOpen(obj,id){if(obj.value==window.commentEmptyText){obj.value="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");$j("#mod-cmnt-wrap-"+id).show();openMenu("comment-edit-submit-wrapper-"+id)}}function commentClose(obj,id){if(obj.value==""){obj.value=window.commentEmptyText;$j("#comment-edit-text-"+id).removeClass("comment-edit-text-full");$j("#comment-edit-text-"+id).addClass("comment-edit-text-empty");$j("#mod-cmnt-wrap-"+id).hide();closeMenu("comment-edit-submit-wrapper-"+id)}}function commentInsert(obj,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$j(obj).html();ins=ins.replace("&lt;","<");ins=ins.replace("&gt;",">");ins=ins.replace("&amp;","&");ins=ins.replace("&quot;",'"');$j("#comment-edit-text-"+id).val(tmpStr+ins)}function qCommentInsert(obj,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$j(obj).val();ins=ins.replace("&lt;","<");ins=ins.replace("&gt;",">");ins=ins.replace("&amp;","&");ins=ins.replace("&quot;",'"');$j("#comment-edit-text-"+id).val(tmpStr+ins);$j(obj).val("")}function insertFormatting(comment,BBcode,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==comment){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id);$j("#comment-edit-text-"+id).val(tmpStr)}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}function cmtBbOpen(id){$j(".comment-edit-bb-"+id).show()}function cmtBbClose(id){$j(".comment-edit-bb-"+id).hide()}
\ No newline at end of file
diff --git a/view/theme/frost-mobile/login-style.css b/view/theme/frost-mobile/login-style.css
index bbb60ebabb..4c85330716 100644
--- a/view/theme/frost-mobile/login-style.css
+++ b/view/theme/frost-mobile/login-style.css
@@ -99,7 +99,7 @@ div.section-wrapper {
 	margin-top: 50px;
 }
 
-#login_openid input {
+#login_openid input, input.openid {
 	background: url(login-bg.gif) no-repeat;
 	background-position: 0 50%;
 	width: 182px;
diff --git a/view/theme/frost-mobile/login_head.tpl b/view/theme/frost-mobile/login_head.tpl
index 47651ad8ad..14734821ce 100644
--- a/view/theme/frost-mobile/login_head.tpl
+++ b/view/theme/frost-mobile/login_head.tpl
@@ -1,2 +1,2 @@
-<!--<link rel="stylesheet" href="$baseurl/view/theme/frost-mobile/login-style.css" type="text/css" media="all" />-->
+{#<!--<link rel="stylesheet" href="$baseurl/view/theme/frost-mobile/login-style.css" type="text/css" media="all" />-->#}
 
diff --git a/view/theme/frost-mobile/mail_conv.tpl b/view/theme/frost-mobile/mail_conv.tpl
index 3529fcffa6..ed32dac5a9 100644
--- a/view/theme/frost-mobile/mail_conv.tpl
+++ b/view/theme/frost-mobile/mail_conv.tpl
@@ -12,7 +12,7 @@
 <div class="mail-conv-outside-wrapper-end"></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-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>
 
 <hr class="mail-conv-break" />
diff --git a/view/theme/frost-mobile/msg-header.tpl b/view/theme/frost-mobile/msg-header.tpl
index 5215092e45..fb6e0684b7 100644
--- a/view/theme/frost-mobile/msg-header.tpl
+++ b/view/theme/frost-mobile/msg-header.tpl
@@ -3,7 +3,8 @@
 	window.nickname = "$nickname";
 	window.linkURL = "$linkurl";
 	var plaintext = "none";
-	window.ajaxType = 'msg-header';
+	window.jotId = "#prvmail-text";
+	window.imageUploadButton = 'prvmail-upload';
 	window.autocompleteType = 'msg-header';
 </script>
 
diff --git a/view/theme/frost-mobile/nav.tpl b/view/theme/frost-mobile/nav.tpl
index 01aafabf0d..c03ea05d90 100644
--- a/view/theme/frost-mobile/nav.tpl
+++ b/view/theme/frost-mobile/nav.tpl
@@ -1,15 +1,15 @@
 <nav>
-<!--	$langselector -->
+{#<!--	$langselector -->#}
 
-<!--	<div id="site-location">$sitelocation</div> -->
+{#<!--	<div id="site-location">$sitelocation</div> -->#}
 
 	<span id="nav-link-wrapper" >
 
-<!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->
+{#<!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->#}
 	<div class="nav-button-container">
-<!--	<a class="system-menu-link nav-link" href="#system-menu" title="Menu">-->
+{#<!--	<a class="system-menu-link nav-link" href="#system-menu" title="Menu">-->#}
 	<img rel="#system-menu-list" class="nav-link" src="$baseurl/view/theme/frost-mobile/images/menu.png">
-<!--	</a>-->
+{#<!--	</a>-->#}
 	<ul id="system-menu-list" class="nav-menu-list">
 		{{ if $nav.login }}
 		<a id="nav-login-link" class="nav-load-page-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
@@ -54,11 +54,11 @@
 	</div>
 
 	{{ if $nav.notifications }}
-<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>-->
+{#<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>-->#}
 	<div class="nav-button-container">
-<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">-->
+{#<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">-->#}
 	<img rel="#nav-notifications-menu" class="nav-link" src="$baseurl/view/theme/frost-mobile/images/notifications.png">
-<!--	</a>-->
+{#<!--	</a>-->#}
 	<span id="notify-update" class="nav-ajax-left"></span>
 	<ul id="nav-notifications-menu" class="notifications-menu-popup">
 		<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
@@ -68,11 +68,11 @@
 	</div>
 	{{ endif }}		
 
-<!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->
+{#<!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->#}
 	<div class="nav-button-container">
-<!--	<a class="contacts-menu-link nav-link" href="#contacts-menu" title="Contacts">-->
+{#<!--	<a class="contacts-menu-link nav-link" href="#contacts-menu" title="Contacts">-->#}
 	<img rel="#contacts-menu-list"  class="nav-link" src="$baseurl/view/theme/frost-mobile/images/contacts.png">
-	<!--</a>-->
+	{#<!--</a>-->#}
 	{{ if $nav.introductions }}
 	<span id="intro-update" class="nav-ajax-left"></span>
 	{{ endif }}
@@ -92,7 +92,7 @@
 	</div>
 
 	{{ if $nav.messages }}
-<!--	<a id="nav-messages-link" class="nav-link $nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>-->
+{#<!--	<a id="nav-messages-link" class="nav-link $nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>-->#}
 	<div class="nav-button-container">
 	<a id="nav-messages-link" class="$nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >
 	<img src="$baseurl/view/theme/frost-mobile/images/message.png" class="nav-link">
@@ -101,11 +101,11 @@
 	</div>
 	{{ endif }}
 
-<!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->
+{#<!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->#}
 	<div class="nav-button-container">
-<!--	<a class="network-menu-link nav-link" href="#network-menu" title="Network">-->
+{#<!--	<a class="network-menu-link nav-link" href="#network-menu" title="Network">-->#}
 	<img rel="#network-menu-list" class="nav-link" src="$baseurl/view/theme/frost-mobile/images/network.png">
-<!--	</a>-->
+{#<!--	</a>-->#}
 	{{ if $nav.network }}
 	<span id="net-update" class="nav-ajax-left"></span>
 	{{ endif }}
@@ -114,7 +114,7 @@
 		<li>
 		<a id="nav-network-link" class="$nav.network.2 $sel.network nav-load-page-link" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
 		</li>
-		<!--<span id="net-update" class="nav-ajax-left"></span>-->
+		{#<!--<span id="net-update" class="nav-ajax-left"></span>-->#}
 		{{ endif }}
 
 		{{ if $nav.network }}
@@ -125,7 +125,7 @@
 
 		{{ if $nav.home }}
 		<li><a id="nav-home-link" class="$nav.home.2 $sel.home nav-load-page-link" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a></li>
-		<!--<span id="home-update" class="nav-ajax-left"></span>-->
+		{#<!--<span id="home-update" class="nav-ajax-left"></span>-->#}
 		{{ endif }}
 
 		{{ if $nav.community }}
@@ -137,7 +137,7 @@
 	</div>
 
 	</span>
-	<!--<span id="nav-end"></span>-->
+	{#<!--<span id="nav-end"></span>-->#}
 	<span id="banner">$banner</span>
 </nav>
 
diff --git a/view/theme/frost-mobile/photo_edit.tpl b/view/theme/frost-mobile/photo_edit.tpl
index 5631b2eba8..4265f8c98c 100644
--- a/view/theme/frost-mobile/photo_edit.tpl
+++ b/view/theme/frost-mobile/photo_edit.tpl
@@ -3,30 +3,35 @@
 
 	<input type="hidden" name="item_id" value="$item_id" />
 
+	<div class="photo-edit-input-text">
 	<label id="photo-edit-albumname-label" for="photo-edit-albumname">$newalbum</label>
 	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="$album" />
+	</div>
 
 	<div id="photo-edit-albumname-end"></div>
 
+	<div class="photo-edit-input-text">
 	<label id="photo-edit-caption-label" for="photo-edit-caption">$capt_label</label>
 	<input id="photo-edit-caption" type="text" size="32" name="desc" value="$caption" />
+	</div>
 
 	<div id="photo-edit-caption-end"></div>
 
+	<div class="photo-edit-input-text">
 	<label id="photo-edit-tags-label" for="photo-edit-newtag" >$tag_label</label>
 	<input name="newtag" id="photo-edit-newtag" size="32" title="$help_tags" type="text" />
+	</div>
 
 	<div id="photo-edit-tags-end"></div>
-	<div id="photo-edit-rotate-wrapper">
-		<div class="photo-edit-rotate-label">
-			$rotatecw
-		</div>
-		<input class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
 
-		<div class="photo-edit-rotate-label">
-			$rotateccw
-		</div>
-		<input class="photo-edit-rotate" type="radio" name="rotate" value="2" />
+	<div class="photo-edit-rotate-choice">
+	<label id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw">$rotatecw</label>
+	<input id="photo-edit-rotate-cw" class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
+	</div>
+
+	<div class="photo-edit-rotate-choice">
+	<label id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw">$rotateccw</label>
+	<input id="photo-edit-rotate-ccw" class="photo-edit-rotate" type="radio" name="rotate" value="2" />
 	</div>
 	<div id="photo-edit-rotate-end"></div>
 
diff --git a/view/theme/frost-mobile/settings.tpl b/view/theme/frost-mobile/settings.tpl
index 5a40b96bca..3e8b33d7f0 100644
--- a/view/theme/frost-mobile/settings.tpl
+++ b/view/theme/frost-mobile/settings.tpl
@@ -81,7 +81,7 @@ $unkmail
 	<a href="#settings-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>$permissions $permdesc</a>
 	<div id="settings-default-perms-menu-end"></div>
 
-<!--	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >-->
+{#<!--	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >-->#}
 	
 	<div style="display: none;">
 		<div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
@@ -89,7 +89,7 @@ $unkmail
 		</div>
 	</div>
 
-<!--	</div>-->
+{#<!--	</div>-->#}
 </div>
 <br/>
 <div id="settings-default-perms-end"></div>
diff --git a/view/theme/frost-mobile/smarty3/contact_edit.tpl b/view/theme/frost-mobile/smarty3/contact_edit.tpl
index b18fff6b4a..924acb0c1a 100644
--- a/view/theme/frost-mobile/smarty3/contact_edit.tpl
+++ b/view/theme/frost-mobile/smarty3/contact_edit.tpl
@@ -11,7 +11,7 @@
 	{{$tab_str}}
 
 	<div id="contact-edit-drop-link" >
-		<a href="contacts/{{$contact_id}}/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="{{$delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>
+		<a href="contacts/{{$contact_id}}/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="{{$delete}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}}></a>
 	</div>
 
 	<div id="contact-edit-drop-link-end"></div>
@@ -79,7 +79,7 @@
 
 <div id="contact-edit-info-wrapper">
 <h4>{{$lbl_info1}}</h4>
-	<textarea id="contact-edit-info" rows="8" cols="35" name="info">{{$info}}</textarea>
+	<textarea id="contact-edit-info" rows="8"{{* cols="35"*}} name="info">{{$info}}</textarea>
 	<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
 </div>
 <div id="contact-edit-info-end"></div>
diff --git a/view/theme/frost-mobile/smarty3/conversation.tpl b/view/theme/frost-mobile/smarty3/conversation.tpl
index 31cfb54d20..f6810bb100 100644
--- a/view/theme/frost-mobile/smarty3/conversation.tpl
+++ b/view/theme/frost-mobile/smarty3/conversation.tpl
@@ -25,10 +25,10 @@
 
 <div id="conversation-end"></div>
 
-<!--{{if $dropping}}
+{{*<!--{{if $dropping}}
 <div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
   <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
   <div id="item-delete-selected-desc" >{{$dropping}}</div>
 </div>
-<div id="item-delete-selected-end"></div>-->
-{{/if}}
+<div id="item-delete-selected-end"></div>
+{{/if}}-->*}}
diff --git a/view/theme/frost-mobile/smarty3/end.tpl b/view/theme/frost-mobile/smarty3/end.tpl
index c51bc4167f..435c190fb9 100644
--- a/view/theme/frost-mobile/smarty3/end.tpl
+++ b/view/theme/frost-mobile/smarty3/end.tpl
@@ -6,18 +6,22 @@
 <!--[if IE]>
 <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
-<!--<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
 <script type="text/javascript">
   tinyMCE.init({ mode : "none"});
-</script>-->
-<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/main.min.js" ></script>
+</script>-->*}}
+<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
+<script type="text/javascript">var $j = jQuery.noConflict();</script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/fk.autocomplete.min.js" ></script>
-<!--<script type="text/javascript" src="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
-<script type="text/javascript" src="{{$baseurl}}/library/colorbox/jquery.colorbox-min.js"></script>-->
-<!--<script type="text/javascript" src="{{$baseurl}}/library/tiptip/jquery.tipTip.minified.js"></script>-->
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/library/colorbox/jquery.colorbox-min.js"></script>-->*}}
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tiptip/jquery.tipTip.minified.js"></script>-->*}}
 <script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
+
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/fk.autocomplete.min.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/acl.min.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/main.min.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/theme.min.js"></script>
 
diff --git a/view/theme/frost-mobile/smarty3/generic_links_widget.tpl b/view/theme/frost-mobile/smarty3/generic_links_widget.tpl
index 6c9700764a..705ddb57cb 100644
--- a/view/theme/frost-mobile/smarty3/generic_links_widget.tpl
+++ b/view/theme/frost-mobile/smarty3/generic_links_widget.tpl
@@ -4,13 +4,14 @@
  *
  *}}
 <div class="widget{{if $class}} {{$class}}{{/if}}">
-<!--	{{if $title}}<h3>{{$title}}</h3>{{/if}}-->
+{{*<!--	{{if $title}}<h3>{{$title}}</h3>{{/if}}-->*}}
 	{{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
 	
-	<ul class="tabs">
+	<ul class="tabs links-widget">
 		{{foreach $items as $item}}
 			<li class="tool"><a href="{{$item.url}}" class="tab {{if $item.selected}}selected{{/if}}">{{$item.label}}</a></li>
 		{{/foreach}}
+		<div id="tabs-end"></div>
 	</ul>
 	
 </div>
diff --git a/view/theme/frost-mobile/smarty3/head.tpl b/view/theme/frost-mobile/smarty3/head.tpl
index 1799a74942..d11d072f26 100644
--- a/view/theme/frost-mobile/smarty3/head.tpl
+++ b/view/theme/frost-mobile/smarty3/head.tpl
@@ -4,17 +4,17 @@
  *
  *}}
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<!--<meta content='width=device-width, minimum-scale=1 maximum-scale=1' name='viewport'>
+{{*<!--<meta content='width=device-width, minimum-scale=1 maximum-scale=1' name='viewport'>
 <meta content='True' name='HandheldFriendly'>
-<meta content='320' name='MobileOptimized'>-->
+<meta content='320' name='MobileOptimized'>-->*}}
 <meta name="viewport" content="width=device-width; initial-scale = 1.0; maximum-scale=1.0; user-scalable=no" />
-<!--<meta name="viewport" content="width=100%;  initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->
+{{*<!--<meta name="viewport" content="width=100%;  initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->*}}
 
 <base href="{{$baseurl}}/" />
 <meta name="generator" content="{{$generator}}" />
-<!--<link rel="stylesheet" href="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+{{*<!--<link rel="stylesheet" href="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="{{$baseurl}}/library/colorbox/colorbox.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="{{$baseurl}}/library/tiptip/tipTip.css" type="text/css" media="screen" />-->
+<link rel="stylesheet" href="{{$baseurl}}/library/tiptip/tipTip.css" type="text/css" media="screen" />-->*}}
 <link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
 
 <link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
@@ -33,7 +33,4 @@
 	var updateInterval = {{$update_interval}};
 	var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};
 </script>
-<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
-<script type="text/javascript">var $j = jQuery.noConflict();</script>
-<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
 
diff --git a/view/theme/frost-mobile/smarty3/jot-header.tpl b/view/theme/frost-mobile/smarty3/jot-header.tpl
index d792ec1a18..bfaf3d5e06 100644
--- a/view/theme/frost-mobile/smarty3/jot-header.tpl
+++ b/view/theme/frost-mobile/smarty3/jot-header.tpl
@@ -16,7 +16,8 @@
 	window.term = "{{$term}}";
 	window.baseURL = "{{$baseurl}}";
 	window.geoTag = function () { {{$geotag}} }
-	window.ajaxType = 'jot-header';
+	window.jotId = "#profile-jot-text";
+	window.imageUploadButton = 'wall-image-upload';
 </script>
 
 
diff --git a/view/theme/frost-mobile/smarty3/jot.tpl b/view/theme/frost-mobile/smarty3/jot.tpl
index 40c4107174..1dcfc0b21c 100644
--- a/view/theme/frost-mobile/smarty3/jot.tpl
+++ b/view/theme/frost-mobile/smarty3/jot.tpl
@@ -26,7 +26,7 @@
 		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div>
 		{{/if}}
 		<div id="jot-text-wrap">
-		<!--<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />-->
+		{{*<!--<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}}{{/if}}</textarea>
 		</div>
 
@@ -44,8 +44,10 @@
 		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon 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="icon link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+	{{*<!--<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a id="profile-link" class="icon link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>-->*}}
+	<div id="profile-link-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-link" class="icon link" title="{{$weblink}}" onclick="jotGetLink(); return false;"></a>
 	</div> 
 	<div id="profile-video-wrapper" style="display: {{$visitor}};" >
 		<a id="profile-video" class="icon video" title="{{$video}}" onclick="jotVideoURL();return false;"></a>
@@ -78,7 +80,7 @@
 	<div style="display: none;">
 		<div id="profile-jot-acl-wrapper">
 			{{$acl}}
-			<hr style="clear:both"/>
+			<hr/>
 			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
 			{{$jotnets}}
 			<div id="profile-jot-networks-end"></div>
diff --git a/view/theme/frost-mobile/smarty3/login_head.tpl b/view/theme/frost-mobile/smarty3/login_head.tpl
index 86805c61f9..c2d9504ad3 100644
--- a/view/theme/frost-mobile/smarty3/login_head.tpl
+++ b/view/theme/frost-mobile/smarty3/login_head.tpl
@@ -3,5 +3,5 @@
  *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
  *
  *}}
-<!--<link rel="stylesheet" href="{{$baseurl}}/view/theme/frost-mobile/login-style.css" type="text/css" media="all" />-->
+{{*<!--<link rel="stylesheet" href="{{$baseurl}}/view/theme/frost-mobile/login-style.css" type="text/css" media="all" />-->*}}
 
diff --git a/view/theme/frost-mobile/smarty3/mail_conv.tpl b/view/theme/frost-mobile/smarty3/mail_conv.tpl
index 0e58de8f74..c6d9aa03af 100644
--- a/view/theme/frost-mobile/smarty3/mail_conv.tpl
+++ b/view/theme/frost-mobile/smarty3/mail_conv.tpl
@@ -17,7 +17,7 @@
 <div class="mail-conv-outside-wrapper-end"></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-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>
 
 <hr class="mail-conv-break" />
diff --git a/view/theme/frost-mobile/smarty3/msg-header.tpl b/view/theme/frost-mobile/smarty3/msg-header.tpl
index 977f571d15..b0a0f79457 100644
--- a/view/theme/frost-mobile/smarty3/msg-header.tpl
+++ b/view/theme/frost-mobile/smarty3/msg-header.tpl
@@ -8,7 +8,8 @@
 	window.nickname = "{{$nickname}}";
 	window.linkURL = "{{$linkurl}}";
 	var plaintext = "none";
-	window.ajaxType = 'msg-header';
+	window.jotId = "#prvmail-text";
+	window.imageUploadButton = 'prvmail-upload';
 	window.autocompleteType = 'msg-header';
 </script>
 
diff --git a/view/theme/frost-mobile/smarty3/nav.tpl b/view/theme/frost-mobile/smarty3/nav.tpl
index d570c9f265..2c9f29d503 100644
--- a/view/theme/frost-mobile/smarty3/nav.tpl
+++ b/view/theme/frost-mobile/smarty3/nav.tpl
@@ -4,17 +4,17 @@
  *
  *}}
 <nav>
-<!--	{{$langselector}} -->
+{{*<!--	{{$langselector}} -->*}}
 
-<!--	<div id="site-location">{{$sitelocation}}</div> -->
+{{*<!--	<div id="site-location">{{$sitelocation}}</div> -->*}}
 
 	<span id="nav-link-wrapper" >
 
-<!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->
+{{*<!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->*}}
 	<div class="nav-button-container">
-<!--	<a class="system-menu-link nav-link" href="#system-menu" title="Menu">-->
+{{*<!--	<a class="system-menu-link nav-link" href="#system-menu" title="Menu">-->*}}
 	<img rel="#system-menu-list" class="nav-link" src="{{$baseurl}}/view/theme/frost-mobile/images/menu.png">
-<!--	</a>-->
+{{*<!--	</a>-->*}}
 	<ul id="system-menu-list" class="nav-menu-list">
 		{{if $nav.login}}
 		<a id="nav-login-link" class="nav-load-page-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a>
@@ -59,11 +59,11 @@
 	</div>
 
 	{{if $nav.notifications}}
-<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>-->
+{{*<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>-->*}}
 	<div class="nav-button-container">
-<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">-->
+{{*<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">-->*}}
 	<img rel="#nav-notifications-menu" class="nav-link" src="{{$baseurl}}/view/theme/frost-mobile/images/notifications.png">
-<!--	</a>-->
+{{*<!--	</a>-->*}}
 	<span id="notify-update" class="nav-ajax-left"></span>
 	<ul id="nav-notifications-menu" class="notifications-menu-popup">
 		<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
@@ -73,11 +73,11 @@
 	</div>
 	{{/if}}		
 
-<!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->
+{{*<!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->*}}
 	<div class="nav-button-container">
-<!--	<a class="contacts-menu-link nav-link" href="#contacts-menu" title="Contacts">-->
+{{*<!--	<a class="contacts-menu-link nav-link" href="#contacts-menu" title="Contacts">-->*}}
 	<img rel="#contacts-menu-list"  class="nav-link" src="{{$baseurl}}/view/theme/frost-mobile/images/contacts.png">
-	<!--</a>-->
+	{{*<!--</a>-->*}}
 	{{if $nav.introductions}}
 	<span id="intro-update" class="nav-ajax-left"></span>
 	{{/if}}
@@ -97,7 +97,7 @@
 	</div>
 
 	{{if $nav.messages}}
-<!--	<a id="nav-messages-link" class="nav-link {{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>-->
+{{*<!--	<a id="nav-messages-link" class="nav-link {{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>-->*}}
 	<div class="nav-button-container">
 	<a id="nav-messages-link" class="{{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >
 	<img src="{{$baseurl}}/view/theme/frost-mobile/images/message.png" class="nav-link">
@@ -106,11 +106,11 @@
 	</div>
 	{{/if}}
 
-<!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->
+{{*<!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->*}}
 	<div class="nav-button-container">
-<!--	<a class="network-menu-link nav-link" href="#network-menu" title="Network">-->
+{{*<!--	<a class="network-menu-link nav-link" href="#network-menu" title="Network">-->*}}
 	<img rel="#network-menu-list" class="nav-link" src="{{$baseurl}}/view/theme/frost-mobile/images/network.png">
-<!--	</a>-->
+{{*<!--	</a>-->*}}
 	{{if $nav.network}}
 	<span id="net-update" class="nav-ajax-left"></span>
 	{{/if}}
@@ -119,7 +119,7 @@
 		<li>
 		<a id="nav-network-link" class="{{$nav.network.2}} {{$sel.network}} nav-load-page-link" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
 		</li>
-		<!--<span id="net-update" class="nav-ajax-left"></span>-->
+		{{*<!--<span id="net-update" class="nav-ajax-left"></span>-->*}}
 		{{/if}}
 
 		{{if $nav.network}}
@@ -130,7 +130,7 @@
 
 		{{if $nav.home}}
 		<li><a id="nav-home-link" class="{{$nav.home.2}} {{$sel.home}} nav-load-page-link" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a></li>
-		<!--<span id="home-update" class="nav-ajax-left"></span>-->
+		{{*<!--<span id="home-update" class="nav-ajax-left"></span>-->*}}
 		{{/if}}
 
 		{{if $nav.community}}
@@ -142,7 +142,7 @@
 	</div>
 
 	</span>
-	<!--<span id="nav-end"></span>-->
+	{{*<!--<span id="nav-end"></span>-->*}}
 	<span id="banner">{{$banner}}</span>
 </nav>
 
diff --git a/view/theme/frost-mobile/smarty3/photo_edit.tpl b/view/theme/frost-mobile/smarty3/photo_edit.tpl
index a6668c9f11..87df97b4bf 100644
--- a/view/theme/frost-mobile/smarty3/photo_edit.tpl
+++ b/view/theme/frost-mobile/smarty3/photo_edit.tpl
@@ -8,30 +8,35 @@
 
 	<input type="hidden" name="item_id" value="{{$item_id}}" />
 
+	<div class="photo-edit-input-text">
 	<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$newalbum}}</label>
 	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$album}}" />
+	</div>
 
 	<div id="photo-edit-albumname-end"></div>
 
+	<div class="photo-edit-input-text">
 	<label id="photo-edit-caption-label" for="photo-edit-caption">{{$capt_label}}</label>
 	<input id="photo-edit-caption" type="text" size="32" name="desc" value="{{$caption}}" />
+	</div>
 
 	<div id="photo-edit-caption-end"></div>
 
+	<div class="photo-edit-input-text">
 	<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$tag_label}}</label>
 	<input name="newtag" id="photo-edit-newtag" size="32" title="{{$help_tags}}" type="text" />
+	</div>
 
 	<div id="photo-edit-tags-end"></div>
-	<div id="photo-edit-rotate-wrapper">
-		<div class="photo-edit-rotate-label">
-			{{$rotatecw}}
-		</div>
-		<input class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
 
-		<div class="photo-edit-rotate-label">
-			{{$rotateccw}}
-		</div>
-		<input class="photo-edit-rotate" type="radio" name="rotate" value="2" />
+	<div class="photo-edit-rotate-choice">
+	<label id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw">{{$rotatecw}}</label>
+	<input id="photo-edit-rotate-cw" class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
+	</div>
+
+	<div class="photo-edit-rotate-choice">
+	<label id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw">{{$rotateccw}}</label>
+	<input id="photo-edit-rotate-ccw" class="photo-edit-rotate" type="radio" name="rotate" value="2" />
 	</div>
 	<div id="photo-edit-rotate-end"></div>
 
diff --git a/view/theme/frost-mobile/smarty3/settings.tpl b/view/theme/frost-mobile/smarty3/settings.tpl
index 8724a12443..73732e453c 100644
--- a/view/theme/frost-mobile/smarty3/settings.tpl
+++ b/view/theme/frost-mobile/smarty3/settings.tpl
@@ -86,7 +86,7 @@
 	<a href="#settings-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>{{$permissions}} {{$permdesc}}</a>
 	<div id="settings-default-perms-menu-end"></div>
 
-<!--	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >-->
+{{*<!--	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >-->*}}
 	
 	<div style="display: none;">
 		<div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
@@ -94,7 +94,7 @@
 		</div>
 	</div>
 
-<!--	</div>-->
+{{*<!--	</div>-->*}}
 </div>
 <br/>
 <div id="settings-default-perms-end"></div>
diff --git a/view/theme/frost-mobile/smarty3/threaded_conversation.tpl b/view/theme/frost-mobile/smarty3/threaded_conversation.tpl
index 801d3e179e..bf6eab47af 100644
--- a/view/theme/frost-mobile/smarty3/threaded_conversation.tpl
+++ b/view/theme/frost-mobile/smarty3/threaded_conversation.tpl
@@ -11,10 +11,10 @@
 
 <div id="conversation-end"></div>
 
-<!--{{if $dropping}}
+{{*<!--{{if $dropping}}
 <div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
   <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
   <div id="item-delete-selected-desc" >{{$dropping}}</div>
 </div>
 <div id="item-delete-selected-end"></div>
-{{/if}}-->
+{{/if}}-->*}}
diff --git a/view/theme/frost-mobile/smarty3/wall_thread.tpl b/view/theme/frost-mobile/smarty3/wall_thread.tpl
index 1bbaf4420e..18246114da 100644
--- a/view/theme/frost-mobile/smarty3/wall_thread.tpl
+++ b/view/theme/frost-mobile/smarty3/wall_thread.tpl
@@ -11,7 +11,7 @@
 {{/if}}
 <div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
 <a name="{{$item.id}}" ></a>
-<!--<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}} wallwall" id="wall-item-outside-wrapper-{{$item.id}}" >-->
+{{*<!--<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}} wallwall" id="wall-item-outside-wrapper-{{$item.id}}" >-->*}}
 	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
 		<div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
 			{{if $item.owner_url}}
@@ -22,41 +22,41 @@
 			</div>
 			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
 			{{/if}}
-			<!--<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-{{$item.id}}" 
+			{{*<!--<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-{{$item.id}}" 
 				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
-                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">-->
-			<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
+                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">-->*}}
+			{{*<!--<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">-->*}}
 				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
 				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" onError="this.src='../../../images/person-48.jpg';" />
 				</a>
-				<!--<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+				{{*<!--<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
                 <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                     <ul class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                         {{$item.item_photo_menu}}
                     </ul>
-                </div>-->
+                </div>-->*}}
 
-			</div>
-			<!--<div class="wall-item-photo-end"></div>-->
+			{{*<!--</div>-->*}}
+			{{*<!--<div class="wall-item-photo-end"></div>-->*}}
 			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}<!--<div class="wall-item-lock">--><img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /><!--</div>-->
+				{{if $item.lock}}{{*<!--<div class="wall-item-lock">-->*}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" />{{*<!--</div>-->*}}
 				{{else}}<div class="wall-item-lock"></div>{{/if}}	
 				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
 			</div>
 		</div>
-		<!--<div class="wall-item-author">-->
+		{{*<!--<div class="wall-item-author">-->*}}
 				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$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}}{{/if}}<br />
 				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>				
-		<!--</div>-->
+		{{*<!--</div>-->*}}
 		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
 			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			<!--<div class="wall-item-title-end"></div>-->
+			{{*<!--<div class="wall-item-title-end"></div>-->*}}
 			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
-					<!--<div class="body-tag">-->
+					{{*<!--<div class="body-tag">-->*}}
 						{{foreach $item.tags as $tag}}
 							<span class='body-tag tag'>{{$tag}}</span>
 						{{/foreach}}
-					<!--</div>-->
+					{{*<!--</div>-->*}}
 			{{if $item.has_cats}}
 			<div class="categorytags">{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
 			</div>
@@ -80,7 +80,7 @@
 			</div>
 			{{/if}}
 			{{if $item.plink}}
-				<!--<div class="wall-item-links-wrapper">--><a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="wall-item-links-wrapper icon remote-link{{$item.sparkle}}"></a><!--</div>-->
+				{{*<!--<div class="wall-item-links-wrapper">-->*}}<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="wall-item-links-wrapper icon remote-link{{$item.sparkle}}"></a>{{*<!--</div>-->*}}
 			{{/if}}
 			{{if $item.edpost}}
 				<a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
@@ -96,35 +96,35 @@
 			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
 			{{/if}}			
 			
-			<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
-			<!--</div>-->
+			{{*<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->*}}
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);" *}}></a>{{/if}}
+			{{*<!--</div>-->*}}
 				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
-			<!--<div class="wall-item-delete-end"></div>-->
+			{{*<!--<div class="wall-item-delete-end"></div>-->*}}
 		</div>
 	</div>	
-	<!--<div class="wall-item-wrapper-end"></div>-->
+	{{*<!--<div class="wall-item-wrapper-end"></div>-->*}}
 	<div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
 	<div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
 
 	{{if $item.threaded}}
 	{{if $item.comment}}
-	<!--<div class="wall-item-comment-wrapper {{$item.indent}}" >-->
+	{{*<!--<div class="wall-item-comment-wrapper {{$item.indent}}" >-->*}}
 		{{$item.comment}}
-	<!--</div>-->
+	{{*<!--</div>-->*}}
 	{{/if}}
 	{{/if}}
 
-<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>-->
-<!--</div>-->
+{{*<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>-->*}}
+{{*<!--</div>-->*}}
 {{foreach $item.children as $child}}
 	{{include file="{{$child.template}}" item=$child}}
 {{/foreach}}
 
 {{if $item.flatten}}
-<!--<div class="wall-item-comment-wrapper" >-->
+{{*<!--<div class="wall-item-comment-wrapper" >-->*}}
 	{{$item.comment}}
-<!--</div>-->
+{{*<!--</div>-->*}}
 {{/if}}
 </div>
 {{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/theme/frost-mobile/smarty3/wallmsg-end.tpl b/view/theme/frost-mobile/smarty3/wallmsg-end.tpl
index a0da3e095b..594f3f79b9 100644
--- a/view/theme/frost-mobile/smarty3/wallmsg-end.tpl
+++ b/view/theme/frost-mobile/smarty3/wallmsg-end.tpl
@@ -3,8 +3,5 @@
  *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
  *
  *}}
-
-<script language="javascript" type="text/javascript">
-wallInitEditor();
-</script>
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
 
diff --git a/view/theme/frost-mobile/smarty3/wallmsg-header.tpl b/view/theme/frost-mobile/smarty3/wallmsg-header.tpl
index 1d6cb69a1d..5f65cc0014 100644
--- a/view/theme/frost-mobile/smarty3/wallmsg-header.tpl
+++ b/view/theme/frost-mobile/smarty3/wallmsg-header.tpl
@@ -6,6 +6,7 @@
 
 <script language="javascript" type="text/javascript">
 window.editSelect = "none";
-window.ajaxType = "wallmsg-header";
+window.jotId = "#prvmail-text";
+window.imageUploadButton = 'prvmail-upload';
 </script>
 
diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css
index 1082c40d76..8c61a9f8b3 100644
--- a/view/theme/frost-mobile/style.css
+++ b/view/theme/frost-mobile/style.css
@@ -42,7 +42,7 @@ a:hover {text-decoration: underline; }
 
 input {
 	border: 1px solid #666666;
-/*	-moz-border-radius: 3px;*/
+	-moz-border-radius: 3px;
 	-webkit-border-radius: 3px;
 	border-radius: 3px;	
 	padding: 3px;
@@ -120,12 +120,17 @@ blockquote {
 }
 
 #panel {
-	background-color: ivory;
 	position: absolute;
-/*	z-index: 2;*/
-	width: 30%;
+	z-index: 2;
 	padding: 25px;
-	border: 1px solid #444;
+	margin-right: 10px;
+
+	/*background-color: ivory;
+	border: 1px solid #444;*/
+
+	border-radius: 7px;
+	background-color: #222;
+	color: #eee;
 }
 
 .heart {
@@ -201,7 +206,7 @@ nav #banner #logo-text a:hover { text-decoration: none; }
 	border-bottom: 0px;
 	background-color: #aec0d3;
 	color: #565854;		
-/*	-moz-border-radius: 3px 3px 0px 0px;*/
+	-moz-border-radius: 3px 3px 0px 0px;
 	-webkit-border-radius: 3px 3px 0px 0px;
 	border-radius: 3px 3px 0px 0px;	
 }
@@ -222,7 +227,7 @@ nav #banner #logo-text a:hover { text-decoration: none; }
 	right: 2px;
 	padding: 1px 2px;
 	border-radius: 4px;
-/*	-moz-border-radius: 4px;*/
+	-moz-border-radius: 4px;
 	-webkit-border-radius: 4px;
 	background-color: gold !important;
 }
@@ -270,7 +275,7 @@ nav .nav-link {
 /*	right: -33px;*/
 	padding: 1em 0px;
 
-/*	-moz-box-shadow: 3px 3px 5px #555;*/
+	-moz-box-shadow: 3px 3px 5px #555;
 	-webkit-box-shadow: 3px 3px 5px #555;
 	box-shadow: 3px 3px 5px #555;
 
@@ -323,7 +328,7 @@ div.main-container {
 	display: block;
 	color: #FFFFFF;
 	-webkit-border-radius: 5px ;
-/*	-moz-border-radius: 5px;*/
+	-moz-border-radius: 5px;
 	border-radius: 5px;
 	padding: 5px;
 	font-weight: bold;
@@ -333,7 +338,7 @@ div.main-container {
 	display: block;
 	color: #FFFFFF;
 	-webkit-border-radius: 5px ;
-/*	-moz-border-radius: 5px;*/
+	-moz-border-radius: 5px;
 	border-radius: 5px;
 	padding: 5px;
 	font-weight: bold;
@@ -383,23 +388,26 @@ section {
 	border-bottom: 1px solid #babdb6;
 	padding:0px;
 }
+.tabs.links-widget {
+	border: none;
+}
 .tabs li { margin: 0px 0px 20px 0px; padding-left: 1em; list-style: none; }
 .tabs a {
 	padding: 0.4em 2em;
 	border: 1px solid #aaa;
 	border-radius: 8px;
-/*	-moz-border-radius: 8px;*/
+	-moz-border-radius: 8px;
 	-webkit-border-radius: 8px;
 }
 .tab {
 	/*display:block;*/
-	/*float:left;*/
+	float:left;
 	padding-left: 1em;
 	padding-right: 0.4em;
 	padding-top: 0.4em;
 	padding-bottom: 0.4em;
-	/*margin-right: 1em;*/
-	margin-right: 3px ;
+	margin-right: 0.5em;
+	margin-bottom: 0.4em;
 }
 .tab.active {
 	font-weight: bold;
@@ -408,6 +416,10 @@ section {
 #events-tab {
 	display: none;
 }
+#tabs-end {
+	padding-top: 0.3em;
+	clear: both;
+}
 
 
 /* footer */
@@ -468,9 +480,9 @@ footer {
 	border: 1px solid #ffffff;
 }
 
-#jot-title::-webkit-input-placeholder{font-weight: normal;}
+/*#jot-title::-webkit-input-placeholder{font-weight: normal;}
 #jot-category::-webkit-input-placeholder{font-weight: normal;}
-/*#jot-title:-moz-placeholder{font-weight: normal;}
+#jot-title:-moz-placeholder{font-weight: normal;}
 #jot-category:-moz-placeholder{font-weight: normal;}*/
 		
 	
@@ -501,7 +513,7 @@ footer {
 
 .group-selected, .nets-selected, .fileas-selected, .categories-selected {
 	padding: 3px;
-/*	-moz-border-radius: 3px;*/
+	-moz-border-radius: 3px;
 	-webkit-border-radius: 3px;
 	border-radius: 3px;	
 	border: 1px solid #CCCCCC;
@@ -616,6 +628,7 @@ input#dfrn-url {
 	background-color: #FFFFFF;
 	color: #000000;
 	margin-bottom: 20px;
+	max-width: 90%;
 }
 
 #dfrn-url-label {
@@ -649,9 +662,16 @@ input#dfrn-url {
 #dfrn-request-message-wrapper {
 	margin-bottom: 50px;
 }
+#dfrn-request-message-wrapper textarea {
+	max-width: 90%;
+}
 #dfrn-request-submit-wrapper {
 	clear: both;
-	margin-left: 50px;
+	/*margin-left: 50px;*/
+}
+#dfrn-request-submit-wrapper input {
+	font-size: 18px;
+	padding: 5px 10px;
 }
 
 #dfrn-request-info-wrapper {
@@ -755,6 +775,9 @@ input#dfrn-url {
 
 #profile-extra-links li {
 	margin-top: 5px;
+	max-width: 300px;
+	margin-left: auto;
+	margin-right: auto;
 }
 
 #profile-edit-links ul {
@@ -944,6 +967,8 @@ input#dfrn-url {
 	margin-bottom: 20px;
 }
 
+
+
 #profile-publish-yes-reg,
 #profile-publish-no-reg {
 	float: left;
@@ -1165,20 +1190,26 @@ input#dfrn-url {
 
 .wall-item-content-wrapper {
 	padding-top: 1em;
+/*	padding-left: 0.25em;
+	padding-right: 0.25em;*/
+
 	border-top: 2px solid #AAAAAA;
 	position: relative;
-
 }
 
 .wall-item-content-wrapper.comment {
 	margin-top: 15px;
-	padding-top: 0px;
 	margin-left: 5px;
 	margin-right: 5px;
+
+	padding-top: 0px;
+/*	padding-left: 0.5em
+	padding-right: 0.5em;*/
+
 	border: 2px solid #AAAAAA;
 	border-radius: 10px;
 	-webkit-border-radius: 10px;
-/*	-moz-border-radius: 10px;*/
+	-moz-border-radius: 10px;
 /*	background: #EEEEEE;*/
 }
 
@@ -1195,17 +1226,14 @@ input#dfrn-url {
 .wall-item-info {
 	display: block;
 	float: left;
-	width:110px;
+	width:126px;
 	margin-right:10px;
+	margin-bottom:10px;
 }
 .comment .wall-item-info {
-	width: 70px;
+	width: 86px;
 }
 
-.wall-item-photo-wrapper {
-	margin-bottom: 10px;
-	width: 100px;
-}
 .wall-item-photo-menu-button {
 	display: block;
 	position: absolute;
@@ -1242,7 +1270,7 @@ input#dfrn-url {
     left: 50px;
     margin: 0;
     position: absolute;
-    top: 80px;
+    top: 67px;
     width: 30px
 }
 .wallwall .wwto img {
@@ -1257,14 +1285,15 @@ input#dfrn-url {
 .wall-item-arrowphoto-wrapper {
     position: absolute;
     left: 75px;
-    top: 80px;
+    top: 67px;
 /*    z-index: 100;*/
 }
 .wall-item-lock {
 	margin-top: 1em;
 	left: 105px;
 	position: absolute;
-	top: 1px;	
+	top: 1px;
+	width: 32px;
 }
 .comment .wall-item-lock {
 	margin-top: 0px;
@@ -1362,75 +1391,72 @@ input#dfrn-url {
 	height: 50px !important;
 }
 .wall-item-content {
-	float: left;
-	margin-left: 3px;
+/*	float: left;
+	max-width: 100%*/
 /*	padding-right: 1em;
 	max-height: 500px;
 	overflow: auto;*/
+	padding-left:0.25em;
+	padding-right:0.25em;
+	clear: left; /* I hate this, but it's the only way to keep the text from bunching to the right on the Android browser */
+}
+.comment .wall-item-content {
+	padding-left:0.5em;
+	padding-right:0.5em;
 }
 
-.wall-item-content img {
-	display: block;
+.wall-item-title {
+	/*float: left;*/
+	font-weight: bold;
+	font-size: 1.6em; 
+	/*width: 450px;*/
+}
+
+/*.wall-item-title-end {
+	clear: both;
+}*/
+
+.wall-item-body {
+	text-align: justify;
+	float: left;
+	max-width: 100%;
+	overflow: hidden;
 	margin-top: 10px;
+	line-height: 23px;
+}
+
+.wall-item-body img {
+	display: block;
+	margin-top: 2px;
 	margin-right: auto;
 	margin-left: auto;
-	max-width: 290px;
+	/*max-width: 290px;*/
+	max-width: 100%;
 	border-radius: 7px;
-/*	-moz-border-radius: 7px;*/
+	-moz-border-radius: 7px;
 	-webkit-border-radius: 7px;
 }
 
-.wall-item-content img.smiley {
+/*.comment .wall-item-body img {
+	max-width: 100%;
+}*/
+
+.wall-item-body img.smiley {
 	display: inline;
 	margin: auto;
 	border-radius: 0;
 	-webkit-border-radius: 0;
 }
 
-.wall-item-content blockquote {
+.wall-item-body blockquote {
 	margin-left: 0px;
 	margin-right: 0px;
 }
 
-.comment .wall-item-content img {
-	max-width: 280px;
-}
-
-.comment .wall-item-content ul {
+.comment .wall-item-body ul {
 	padding-left: 1.5em;
 }
 
-.divgrow-showmore {
-	display: block;
-	clear: both;
-	text-align: center;
-	outline: 0;
-	border-top: 1px dotted #888;
-}
-
-
-.wall-item-title {
-	float: left;
-	font-weight: bold;
-	font-size: 1.6em; 
-	/*width: 450px;*/
-}
-
-/*.wall-item-title-end {
-	clear: both;
-}*/
-
-.wall-item-body {
-	text-align: justify;
-	float: left;
-	clear: left;
-/*	width: 300px;*/
-	overflow: hidden;
-	margin-top: 10px;
-	padding-right: 1em;
-	line-height: 23px;
-}
-
 .wall-item-body iframe {
 	display: block;
 	clear: both;
@@ -1442,10 +1468,12 @@ input#dfrn-url {
 	overflow: hidden;
 }
 
-.comment .wall-item-body {
-	margin-left: 5px;
-	padding-right: 0.5em;
-/*	width: 280px;*/
+.divgrow-showmore {
+	display: block;
+	clear: both;
+	text-align: center;
+	outline: 0;
+	border-top: 1px dotted #888;
 }
 
 .wall-item-tools {
@@ -1484,6 +1512,8 @@ input#dfrn-url {
 	background: #f3f3f3;
 	margin-left: 10px;
 	margin-right: 10px;
+
+	max-width: 90%;
 }
 
 .comment-wwedit-wrapper.comment {
@@ -1493,10 +1523,15 @@ input#dfrn-url {
 }
 
 
+.comment-edit-form {
+	padding-left: 1em;
+	padding-right: 1.5em;
+}
+
 .comment-edit-photo {
 	margin-top: 15px;
-	margin-left: 10px;
-	margin-bottom: 10px;
+	/*margin-left: 10px;
+	margin-bottom: 10px;*/
 	width: 25px;
 	float: left;
 }
@@ -1505,7 +1540,7 @@ input#dfrn-url {
 }
 .comment-edit-text-empty, .comment-edit-text-full {
 /*	float: left;*/
-/*	-moz-border-radius: 3px;*/
+	-moz-border-radius: 3px;
 	-webkit-border-radius: 3px;
 	border-radius: 3px;	
 	border: 1px solid #cccccc;
@@ -1526,10 +1561,12 @@ input#dfrn-url {
 	color: black;
 	height: 150px;
 /*	width: 350px;
-	overflow: auto;*/
+	overflow: auto;
 	width: 250px;
 	margin-top: 15px;
-	margin-left: 20px;
+	margin-left: 20px;*/
+	width: 100%;
+	margin-top: 1.5em;
 }
 
 .comment .comment-edit-text-empty {
@@ -1548,11 +1585,33 @@ input#dfrn-url {
 .comment-edit-submit {
 	font-size: 18px;
 	padding: 5px 10px;
-	margin: 10px 0px 10px 110px;
+	margin: 10px 0px 10px 0px;
 }
 
 #profile-jot-wrapper {
-	padding-left: 10px;
+	padding-left: 1em;
+	padding-right: 1em;
+}
+
+.shared_header {
+	border-top: 1px solid #aaa;
+	color: #999;
+
+	height: 42px; /* 32 px for the image plus 10 px for the margin around the image */
+	padding-top: 0.5em;
+	margin-top: 1em;
+	margin-bottom: 1em;
+	
+}
+.shared_header img {
+	float: left;
+
+	margin: auto 1em auto auto;
+	padding: 0;
+
+	box-shadow: none;
+	-moz-box-shadow: none;
+	-webkit-box-shadow: none;
 }
 
 #profile-jot-plugin-wrapper,
@@ -1773,7 +1832,7 @@ input#profile-jot-email {
 	padding: 0.2em 1em;
 	border: 1px solid #aaa;
 	border-radius: 10px;
-/*	-moz-border-radius: 10px;*/
+	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
 }
 
@@ -1833,7 +1892,7 @@ input#profile-jot-email {
 	padding: 0.2em 1em;
 	border: 1px solid #aaa;
 	border-radius: 10px;
-/*	-moz-border-radius: 10px;*/
+	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
 }
 
@@ -1842,7 +1901,7 @@ input#profile-jot-email {
 	float: left;
 	border: 1px solid black;
 	border-radius: 7px;
-/*	-moz-border-radius: 7px;*/
+	-moz-border-radius: 7px;
 	-webkit-border-radius: 7px;
 	background: #FFCCCC;
 	font-size: 1.25em;
@@ -1857,6 +1916,7 @@ input#profile-jot-email {
 #advanced-profile-gender-wrapper,
 #advanced-profile-dob-wrapper,
 #advanced-profile-age-wrapper,
+
 #advanced-profile-marital-wrapper,
 #advanced-profile-sexual-wrapper,
 #advanced-profile-homepage-wrapper,
@@ -2031,6 +2091,10 @@ input#profile-jot-email {
 	margin-top: 30px;
 }
 
+#contact-edit-info-wrapper, #contact-edit-info {
+	width: 90%;
+}
+
 #contact-edit-end {
 	clear: both;
 	margin-top: 15px;
@@ -2042,7 +2106,11 @@ input#profile-jot-email {
 }
 
 .contact-edit-submit {
-	margin-top: 20px;
+	clear: left;
+	display: block;
+
+	margin-top: 10px;
+	margin-bottom: 45px;
 	padding: 0.2em 0.5em;
 	font-size: 18px;
 }
@@ -2070,7 +2138,7 @@ input#profile-jot-email {
 	left: -30px; top: 80px;
 	display: none;
 	z-index: 101;
-/*	-moz-box-shadow: 3px 3px 5px #555;*/
+	-moz-box-shadow: 3px 3px 5px #555;
 	-webkit-box-shadow: 3px 3px 5px #555;
 	box-shadow: 3px 3px 5px #555;
 }
@@ -2103,12 +2171,12 @@ input#profile-jot-email {
 }
 
 #profile-jot-text {
-	width: 90%;
+	width: 100%;
 	height: 20px;
 	color:#cccccc;
 	border: 1px solid #cccccc;
 	padding: 3px 0px 0px 5px;
-/*	-moz-border-radius: 3px;*/
+	-moz-border-radius: 3px;
 	-webkit-border-radius: 3px;
 	border-radius: 3px;	
 }
@@ -2118,23 +2186,34 @@ input#profile-jot-email {
 #photo-edit-perms-select,
 #photos-upload-permissions-wrapper,
 #profile-jot-acl-wrapper{
-	display:block!important;
+	/*display:block!important;*/
 }
 
 #photos-usage-message {
 	margin-bottom: 15px;
 }
 
-#profile-jot-acl-wrapper{
+#profile-jot-acl-wrapper {
 	/*width:270px;*/
-	padding-left:10px;
-	height:auto;
-	overflow:visible;
+	height: auto;
+	overflow: visible;
+	margin-top: 1em;
+	display: inline-block;
+}
+
+#profile-jot-acl-wrapper,
+#photos-upload-permissions-wrapper,
+#photo-edit-perms-select {
+	padding: 0.7em;
+	border: 1px solid #888;
+	border-radius: 10px;
 }
 
 #acl-wrapper {
-	/*width: 270px;*/
-	float:left;
+	/*width: 270px;
+	float:left;*/
+	text-align: left;
+	clear: both;
 }
 #acl-search {
 	display: none;
@@ -2151,11 +2230,12 @@ input#profile-jot-email {
 	background-image: url("../../../images/show_all_off.png");
 	background-position: 7px 7px;
 	background-repeat: no-repeat;
-	padding: 7px 5px 0px 30px;
+	padding: 7px 15px 7px 30px;
 	-webkit-border-radius: 5px ;
-/*	-moz-border-radius: 5px;*/
+	-moz-border-radius: 5px;
 	border-radius: 5px;
 	color: #999999;
+	margin-bottom: 0.3em;
 }
 #acl-showall.selected {
 	color: #000000;
@@ -2174,11 +2254,11 @@ input#profile-jot-email {
 	
 }
 .acl-list-item {
-	display: block;
-	width: 120px;
+	display: inline-block;
+	width: 190px;
 	height: 30px;
 	border: 1px solid #cccccc;
-/*	-moz-border-radius: 4px;*/
+	-moz-border-radius: 4px;
 	-webkit-border-radius: 4px;
 	border-radius: 4px;
 	margin-top: 5px;
@@ -2186,10 +2266,9 @@ input#profile-jot-email {
 	margin-right: 2px;
 	margin-left: 2px;
 	padding-left: 5px;
-	float: left;
+	/*float: left;*/
 }
 .acl-list-item img{
-	display: none;
 	width:22px;
 	height: 22px;
 	float: left;
@@ -2197,20 +2276,22 @@ input#profile-jot-email {
 }
 .acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
 .acl-list-item a { 
-	font-size: 8px;
+	font-size: 10px;
 	display: block;
-	width: 40px;
+	width: 55px;
 	height: 10px;
 	float: left;
-	color: #999999;
-	background-color: #cccccc;
+	color: rgb(153, 153, 153);
+	background-color: rgb(204, 204, 204);
 	background-position: 3px 3px;
 	background-repeat: no-repeat;
 	margin-right: 5px;
+
 	-webkit-border-radius: 2px ;
-/*	-moz-border-radius: 2px;*/
-	border-radius: 2px;
-	padding-left: 15px;
+	-moz-border-radius: 2px;
+	border-radius: 2px 2px 2px 2px;
+
+	padding: 0px 5px 3px 15px;
 }
 #acl-wrapper a:hover {
 	text-decoration: none;
@@ -2255,6 +2336,7 @@ input#profile-jot-email {
 #group-edit-name-wrapper {
 
 
+
 }
 
 
@@ -2277,6 +2359,10 @@ input#profile-jot-email {
 	clear: both;
 }
 
+#message-new {
+	font-size: 24px;
+}
+
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
 	margin-bottom: 10px;
 	margin-top: 20px;
@@ -2329,6 +2415,7 @@ a.mail-list-link {
 
 .mail-list-outside-wrapper-end {
 	clear: both;
+
 }
 
 .mail-list-outside-wrapper {
@@ -2442,6 +2529,8 @@ a.mail-list-link {
 }
 
 #search-save {
+	font-size: 18px;
+	padding: 5px 10px;
 	margin-left: 5px;
 }
 .groupsideedit {
@@ -2483,11 +2572,14 @@ aside input[type='text'] {
 	border: 1px solid #DDDDDD;
 	padding: 18px;
 	margin-top: 5px;
-/*	-moz-border-radius:5px;*/
+	-moz-border-radius:5px;
 	-webkit-border-radius:5px;
 	border-radius:5px;
-
 }
+.widget.settings-widget {
+	padding: 0;
+}
+
 
 
 /*.photos {
@@ -2529,8 +2621,10 @@ aside input[type='text'] {
 }
 
 .photo-top-image-wrapper {
-/*	position: relative; */
-	float: left;
+/*	position: relative; 
+	float: left;*/
+	display: inline-block;
+	vertical-align: top;
 	margin-top: 15px;
 	margin-right: 15px;
 	margin-left: 15px;
@@ -2541,7 +2635,7 @@ aside input[type='text'] {
 .photo-top-image-wrapper img {
 	max-width: 290px;
 	border-radius: 10px;
-/*	-moz-border-radius: 10px;*/
+	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
 }
 .photo-top-album-name {
@@ -2562,25 +2656,37 @@ aside input[type='text'] {
 	margin-left: 30px;
 }
 
-#photos-upload-newalbum-div {
-	float: left;
+#photos-upload-form {
+	text-align: center;
+}
+
+#photos-upload-newalbum-div, #photos-upload-existing-album-text {
+	/*float: left;*/
+	display: inline-block;
 	width: 175px;
+	text-align: left;
 }
 
 #photos-upload-noshare {
 	margin-bottom: 10px;
 }
-#photos-upload-existing-album-text {
-	float: left;
-	width: 175px;
+#photos-upload-noshare-div {
+	margin-top: 2em;
+	margin-bottom: 15px;
 }
+
+#photos-upload-noshare-label {
+	margin-left: 25px;
+}
+
 #photos-upload-newalbum {
-	float: left;
+	width: 15em;
 }
 #photos-upload-album-select {
-	float: left;
+	width: 15.7em;
 }
 
+
 #photos-upload-spacer {
 	margin-top: 25px;
 }
@@ -2590,9 +2696,6 @@ aside input[type='text'] {
 #photos-upload-exist-end {
 	margin-bottom: 15px;
 }
-#photos-upload-submit {
-	margin-top: 15px;
-}
 
 #photos_upload_applet_wrapper {
 	margin-bottom: 15px;
@@ -2647,26 +2750,23 @@ aside input[type='text'] {
 	margin-bottom: 15px;
 }
 
-#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, .photo-edit-rotate-label {
-	float: left;
-	width: 150px;
-}
-
-#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label {
-	font-weight: 700;
+.photo-edit-input-text {
+	display: inline-block;
+	text-align: left;
 }
 
-#photos-upload-noshare-div {
-	margin-top: 140px;
-	margin-bottom: 15px;
+#photo_edit_form {
+	text-align: center;
 }
 
-#photos-upload-noshare-label {
-	margin-left: 25px;
+#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, .photo-edit-rotate-label {
+	/*float: left;*/
+	display: inline-block;
+	width: 150px;
 }
 
-#photos-upload-noshare {
-	float: left;
+#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label {
+	font-weight: 700;
 }
 
 .photo-perms-icon {
@@ -2675,6 +2775,11 @@ aside input[type='text'] {
 
 #photo-edit-perms-menu, #photos-upload-perms-menu, #settings-default-perms-menu {
 	text-decoration: none;
+	display: inline-block;
+}
+
+#photos-upload-perms-menu #jot-perms-icon {
+	margin-right: 1em;
 }
 
 .photo-jot-perms-text {
@@ -2684,6 +2789,7 @@ aside input[type='text'] {
 
 #photo-edit-perms, #photos-upload-perms, #settings-default-perms {
 	margin-top: 30px;
+	display: inline-block;
 }
 #photos-upload-perms {
 	margin-top: 15px;
@@ -2700,7 +2806,7 @@ aside input[type='text'] {
 	margin-top: 15px;
 	border: 1px solid #aaa;
 	border-radius: 10px;
-/*	-moz-border-radius: 10px;*/
+	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
 }
 
@@ -2709,13 +2815,18 @@ aside input[type='text'] {
 }
 
 #photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
-	float: left;
+	/*float: left;*/
 	margin-bottom: 25px;
 }
 
+.photo-edit-rotate-choice {
+	display: inline-block;
+}
+
 .photo-edit-rotate {
 	float: left;
 	margin-left: 20px;
+
 }
 #photo-edit-link-wrap {
 	margin-bottom: 15px;
@@ -2745,13 +2856,13 @@ aside input[type='text'] {
 	margin-left: 45px;
 }
 #photos-upload-choose {
-	position: absolute;
+/*	position: absolute;
 	top: 460px;
-	left: 5px;
+	left: 5px;*/
+	margin-top: 1em;
 }
 #photos-upload-submit {
-	margin-top: 30px;
-	margin-left: 100px;
+	margin-top: 0px;
 	margin-bottom: 20px;
 }
 .settings-submit, .profile-edit-submit-button, .settings-features-submit {
@@ -2780,13 +2891,28 @@ aside input[type='text'] {
 	margin-bottom: 20px;
 }
 
+#photo-album-edit-form {
+	max-width: 100%;
+	padding-left: 0.5em;
+	padding-right: 0.5em;
+}
+#photo-album-edit-form input {
+	max-width: 100%;
+}
+#photo-album-edit-name-label {
+	display: block;
+}
+
 #photo-album-edit-submit, #photo-album-edit-drop {
 	margin-top: 15px;
 	margin-bottom: 15px;
+
+	padding: 0.25em 0.5em;
+	font-size: 18px;
 }
 
 #photo-album-edit-drop {
-	margin-left: 200px;
+	margin-left: 2em;
 }
 
 .group-delete-wrapper {
@@ -2888,6 +3014,8 @@ aside input[type='text'] {
 }
 
 #search-submit {
+	font-size: 18px;
+	padding: 5px 10px;
 	margin-left: 15px;
 }
 
@@ -2935,7 +3063,7 @@ aside input[type='text'] {
 	
 
 .fn {
-	padding: 0px 0px 5px 12px;
+	padding: 1em 0px 5px 12px;
 	font-size: 120%;
 	font-weight: bold;
 }
@@ -3132,8 +3260,15 @@ aside input[type='text'] {
 	float: left;
 }*/
 
+#photo-photo {
+	display: block;
+	margin-left: auto;
+	margin-right: auto;
+	text-align: center;
+}
+
 #photo-photo img {
-	max-width: 310px;
+	max-width: 100%;
 }
 
 #photo-photo-end {
@@ -3164,15 +3299,23 @@ aside input[type='text'] {
 }
 
 .profile-match-wrapper {
-	float: left;
+	display: inline-block;
 	padding: 10px;
-	width: 120px;
-	height: 120px;
+	/*width: 120px;
+	height: 120px;*/
 	scroll: auto;
+	margin-bottom: 2em;
+	vertical-align: top;
+}
+.profile-match-wrapper .icon.drophide {
+	margin-left: auto;
+	margin-right: auto;
+	margin-top: 1em;
 }
 #profile-match-wrapper-end {
 	clear: both;
 }
+
 .side-link {
 	margin-bottom: 15px;
 }
@@ -3394,6 +3537,7 @@ aside input[type='text'] {
 }
  
 
+
 /**
  * Form fields
  */
@@ -3766,8 +3910,8 @@ aside input[type='text'] {
 [class^="comment-edit-bb"] {
 	list-style: none;
 	display: none;
-	margin: 0px 0 -5px 20px;
-	width: 75%;
+	margin: 0px 0 -5px 0px;
+/*	width: 75%;*/
 }
 [class^="comment-edit-bb"] > li {
 	display: inline-block;
@@ -3847,21 +3991,66 @@ aside input[type='text'] {
 }
 
 .attachtype {
-	display: block; width: 20px; height: 23px;
+	display: block;
 	float: left;
-	background-image: url('../../../images/content-types.png');
-	background-position: -80px 0px;
+	background-size: 100% 100%;
+	width: 48px;
+	height: 48px;
+	background-image: url('images/oxygen/unknown.png');
 }
 
 .body-attach {
 	margin-top: 10px;
 }
 
-.type-video { background-position: 0px 0px; }
+/*.type-video { background-position: 0px 0px; }
 .type-image { background-position: -20px 0px; }
 .type-audio { background-position: -40px 0px; }
 .type-text  { background-position: -60px 0px; }
-.type-unkn  { background-position: -80px 0px; }
+.type-unkn  { background-position: -80px 0px; }*/
+.type-video {
+	background-image: url('images/oxygen/video-x-generic.png');
+	background-size: 100% 100%;
+	width: 48px;
+	height: 48px;
+}
+.type-image {
+	background-image: url('images/oxygen/image-x-generic.png');
+	background-size: 100% 100%;
+	width: 48px;
+	height: 48px;
+}
+.type-audio {	background-image: url('images/oxygen/audio-x-generic.png');
+	background-size: 100% 100%;
+	width: 48px;
+	height: 48px;
+}
+
+.type-text  {
+	background-image: url('images/oxygen/text-x-generic-2.png');
+	background-size: 100% 100%;
+	width: 48px;
+	height: 48px;
+}
+.subtype-msword, .subtype-vnd-openxmlformats-officedocument-wordprocessingml-document  {
+	background-image: url('images/oxygen/application-msword.png');
+	background-size: 100% 100%;
+	width: 48px;
+	height: 48px;
+}
+.subtype-pdf  {
+	background-image: url('images/oxygen/application-pdf.png');
+	background-size: 100% 100%;
+	width: 48px;
+	height: 48px;
+}
+/*.type-unkn  {
+	background-image: url('images/oxygen/unknown.png');
+	background-size: 100% 100%;
+	width: 48px;
+	height: 48px;
+}*/
+
 
 
 /* autocomplete popup */
@@ -3958,11 +4147,11 @@ ul.notifications-menu-popup {
 	height: auto;
 /*	overflow-y: scroll;overflow-style:scrollbar;*/
 	background-color:#FFFFFF;
-/*	-moz-border-radius: 5px;*/
+	-moz-border-radius: 5px;
 	-webkit-border-radius: 5px;
 	border-radius:5px;
 	border: 1px solid #AAA;
-/*	-moz-box-shadow: 3px 3px 5px #555;*/
+	-moz-box-shadow: 3px 3px 5px #555;
 	-webkit-box-shadow: 3px 3px 5px #555;
 	box-shadow: 3px 3px 5px #555;
 /*	z-index: 103;*/
diff --git a/view/theme/frost-mobile/theme.php b/view/theme/frost-mobile/theme.php
index 00a9184dc5..dd97045a68 100644
--- a/view/theme/frost-mobile/theme.php
+++ b/view/theme/frost-mobile/theme.php
@@ -4,7 +4,7 @@
  * Name: Frost--mobile version
  * Description: Like frosted glass
  * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
- * Version: Version 0.2.17
+ * Version: Version 0.3
  * Author: Zach P <techcity@f.shmuz.in>
  * Maintainer: Zach P <techcity@f.shmuz.in>
  */
diff --git a/view/theme/frost-mobile/threaded_conversation.tpl b/view/theme/frost-mobile/threaded_conversation.tpl
index 25cfe66214..9d7f5c325c 100644
--- a/view/theme/frost-mobile/threaded_conversation.tpl
+++ b/view/theme/frost-mobile/threaded_conversation.tpl
@@ -6,10 +6,10 @@ $live_update
 
 <div id="conversation-end"></div>
 
-<!--{{ if $dropping }}
+{#<!--{{ if $dropping }}
 <div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
   <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
   <div id="item-delete-selected-desc" >$dropping</div>
 </div>
 <div id="item-delete-selected-end"></div>
-{{ endif }}-->
+{{ endif }}-->#}
diff --git a/view/theme/frost-mobile/wall_thread.tpl b/view/theme/frost-mobile/wall_thread.tpl
index 901ed76c16..6d34602a79 100644
--- a/view/theme/frost-mobile/wall_thread.tpl
+++ b/view/theme/frost-mobile/wall_thread.tpl
@@ -6,7 +6,7 @@
 {{endif}}
 <div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
 <a name="$item.id" ></a>
-<!--<div class="wall-item-outside-wrapper $item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >-->
+{#<!--<div class="wall-item-outside-wrapper $item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >-->#}
 	<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
 		<div class="wall-item-info{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
 			{{ if $item.owner_url }}
@@ -17,41 +17,41 @@
 			</div>
 			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
 			{{ endif }}
-			<!--<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
+			{#<!--<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
 				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
-                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">-->
-			<div class="wall-item-photo-wrapper{{ if $item.owner_url }} wwfrom{{ endif }}" id="wall-item-photo-wrapper-$item.id">
+                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">-->#}
+			{#<!--<div class="wall-item-photo-wrapper{{ if $item.owner_url }} wwfrom{{ endif }}" id="wall-item-photo-wrapper-$item.id">-->#}
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
 				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" onError="this.src='../../../images/person-48.jpg';" />
 				</a>
-				<!--<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+				{#<!--<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
                 <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
                     <ul class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
                         $item.item_photo_menu
                     </ul>
-                </div>-->
+                </div>-->#}
 
-			</div>
-			<!--<div class="wall-item-photo-end"></div>-->
+			{#<!--</div>-->#}
+			{#<!--<div class="wall-item-photo-end"></div>-->#}
 			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}<!--<div class="wall-item-lock">--><img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /><!--</div>-->
+				{{ if $item.lock }}{#<!--<div class="wall-item-lock">-->#}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" onclick="lockview(event,$item.id);" />{#<!--</div>-->#}
 				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
 				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
 			</div>
 		</div>
-		<!--<div class="wall-item-author">-->
+		{#<!--<div class="wall-item-author">-->#}
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>{{ if $item.owner_url }} $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{{ endif }}<br />
 				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>				
-		<!--</div>-->
+		{#<!--</div>-->#}
 		<div class="wall-item-content" id="wall-item-content-$item.id" >
 			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<!--<div class="wall-item-title-end"></div>-->
+			{#<!--<div class="wall-item-title-end"></div>-->#}
 			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-					<!--<div class="body-tag">-->
+					{#<!--<div class="body-tag">-->#}
 						{{ for $item.tags as $tag }}
 							<span class='body-tag tag'>$tag</span>
 						{{ endfor }}
-					<!--</div>-->
+					{#<!--</div>-->#}
 			{{ if $item.has_cats }}
 			<div class="categorytags">$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
 			</div>
@@ -75,7 +75,7 @@
 			</div>
 			{{ endif }}
 			{{ if $item.plink }}
-				<!--<div class="wall-item-links-wrapper">--><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="wall-item-links-wrapper icon remote-link$item.sparkle"></a><!--</div>-->
+				{#<!--<div class="wall-item-links-wrapper">-->#}<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="wall-item-links-wrapper icon remote-link$item.sparkle"></a>{#<!--</div>-->#}
 			{{ endif }}
 			{{ if $item.edpost }}
 				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
@@ -91,35 +91,35 @@
 			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
 			{{ endif }}			
 			
-			<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			<!--</div>-->
+			{#<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->#}
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);" #}></a>{{ endif }}
+			{#<!--</div>-->#}
 				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			<!--<div class="wall-item-delete-end"></div>-->
+			{#<!--<div class="wall-item-delete-end"></div>-->#}
 		</div>
 	</div>	
-	<!--<div class="wall-item-wrapper-end"></div>-->
+	{#<!--<div class="wall-item-wrapper-end"></div>-->#}
 	<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
 	<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
 
 	{{ if $item.threaded }}
 	{{ if $item.comment }}
-	<!--<div class="wall-item-comment-wrapper $item.indent" >-->
+	{#<!--<div class="wall-item-comment-wrapper $item.indent" >-->#}
 		$item.comment
-	<!--</div>-->
+	{#<!--</div>-->#}
 	{{ endif }}
 	{{ endif }}
 
-<!--<div class="wall-item-outside-wrapper-end $item.indent" ></div>-->
-<!--</div>-->
+{#<!--<div class="wall-item-outside-wrapper-end $item.indent" ></div>-->#}
+{#<!--</div>-->#}
 {{ for $item.children as $child }}
 	{{ inc $child.template with $item=$child }}{{ endinc }}
 {{ endfor }}
 
 {{ if $item.flatten }}
-<!--<div class="wall-item-comment-wrapper" >-->
+{#<!--<div class="wall-item-comment-wrapper" >-->#}
 	$item.comment
-<!--</div>-->
+{#<!--</div>-->#}
 {{ endif }}
 </div>
 {{if $item.comment_lastcollapsed}}</div>{{endif}}
diff --git a/view/theme/frost-mobile/wallmsg-end.tpl b/view/theme/frost-mobile/wallmsg-end.tpl
index d9e34d6fba..6074133798 100644
--- a/view/theme/frost-mobile/wallmsg-end.tpl
+++ b/view/theme/frost-mobile/wallmsg-end.tpl
@@ -1,5 +1,2 @@
-
-<script language="javascript" type="text/javascript">
-wallInitEditor();
-</script>
+<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
 
diff --git a/view/theme/frost-mobile/wallmsg-header.tpl b/view/theme/frost-mobile/wallmsg-header.tpl
index fc95f4d6c8..8ed5ea130d 100644
--- a/view/theme/frost-mobile/wallmsg-header.tpl
+++ b/view/theme/frost-mobile/wallmsg-header.tpl
@@ -1,6 +1,7 @@
 
 <script language="javascript" type="text/javascript">
 window.editSelect = "none";
-window.ajaxType = "wallmsg-header";
+window.jotId = "#prvmail-text";
+window.imageUploadButton = 'prvmail-upload';
 </script>