diff --git a/view/sv/jot-header.tpl b/view/sv/jot-header.tpl
index fe818410e5..b6e156324e 100644
--- a/view/sv/jot-header.tpl
+++ b/view/sv/jot-header.tpl
@@ -104,6 +104,28 @@ tinyMCE.init({
 		}
 	}
 
+
+    function jotGetVideo() {
+        reply = prompt("Please enter a YouTube link:");
+        if(reply && reply.length) {
+            tinyMCE.execCommand('mceInsertRawHTML',false,'[youtube]' + reply + '[/youtube]');
+        }
+    }
+
+    function jotVideoURL() {
+        reply = prompt("Please enter a video(.ogg) link/URL:");
+        if(reply && reply.length) {
+            tinyMCE.execCommand('mceInsertRawHTML',false,'[video]' + reply + '[/video]');
+        }
+    }
+
+    function jotAudioURL() {
+        reply = prompt("Please enter an audio(.ogg) link/URL:");
+        if(reply && reply.length) {
+            tinyMCE.execCommand('mceInsertRawHTML',false,'[audio]' + reply + '[/audio]');
+        }
+    }
+
 	function jotGetLocation() {
 		reply = prompt("Where are you right now?", $('#jot-location').val());
 		if(reply && reply.length) {
@@ -111,6 +133,14 @@ tinyMCE.init({
 		}
 	}
 
+    function jotShare(id) {
+        $('#like-rotator-' + id).show();
+        $.get('share/' + id, function(data) {
+            tinyMCE.execCommand('mceInsertRawHTML',false,data);
+            $('#like-rotator-' + id).hide();
+            $(window).scrollTop(0);
+        });
+    }
 
 	function linkdropper(event) {
 		var linkFound = event.dataTransfer.types.contains("text/uri-list");
diff --git a/view/sv/profile_edit.tpl b/view/sv/profile_edit.tpl
index b0d4850d0d..6c7d74dafc 100644
--- a/view/sv/profile_edit.tpl
+++ b/view/sv/profile_edit.tpl
@@ -134,11 +134,17 @@ $sexual
 </div>
 <div id="profile-edit-religion-end"></div>
 
-<div id="profile-edit-keywords-wrapper" >
-<label id="profile-edit-keywords-label" for="profile-edit-keywords" >Keywords: </label>
-<input type="text" size="32" name="keywords" id="profile-edit-keywords" title="Example: fishing photography software" value="$keywords" />
-</div><div id="profile-edit-keywords-desc">(Used for searching public profiles, never shown to others)</div>
-<div id="profile-edit-keywords-end"></div>
+<div id="profile-edit-pubkeywords-wrapper" >
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Public Keywords: </label>
+<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Example: fishing photography software" value="$pub_keywords" />
+</div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div>
+<div id="profile-edit-pubkeywords-end"></div>
+
+<div id="profile-edit-prvkeywords-wrapper" >
+<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Private Keywords: </label>
+<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Example: fishing photography software" value="$prv_keywords" />
+</div><div id="profile-edit-prvkeywords-desc">(Used for searching profiles, never shown to others)</div>
+<div id="profile-edit-prvkeywords-end"></div>
 
 
 <div class="profile-edit-submit-wrapper" >
diff --git a/view/sv/settings.tpl b/view/sv/settings.tpl
index 97d67cbf61..ea4e2e52c8 100644
--- a/view/sv/settings.tpl
+++ b/view/sv/settings.tpl
@@ -78,7 +78,7 @@ $profile_in_net_dir
 
 
 <div id="settings-default-perms" class="settings-default-perms" >
-	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >&#x21e9; $permissions</div>
+	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</div>
 	<div id="settings-default-perms-menu-end"></div>
 
 	<div id="settings-default-perms-select" style="display: none;" >
@@ -89,6 +89,11 @@ $profile_in_net_dir
 </div>
 <div id="settings-default-perms-end"></div>
 
+<div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
+<div id="settings-expire-end"></div>
+
+
+
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="Submit" />
 </div>