Merge branch 'patch-29' into 'dev'

Patch 29

See merge request Kostikov/core!3

49 files changed, 322 insertions, 185 deletions

diff --git a/view/css/conversation.css b/view/css/conversation.css
index e6324b30d..f7804f5dd 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -31,10 +31,11 @@
 	position: relative;
 }
 
-#profile-jot-reset {
+#profile-jot-tools {
 	position: absolute;
 	top: 0px;
 	right: 0px;
+	opacity: 0.7;
 }
 
 #profile-jot-text {
diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css
index 4236b3dff..d8786eed2 100644
--- a/view/css/mod_settings.css
+++ b/view/css/mod_settings.css
@@ -9,20 +9,3 @@
 .channel-menu {
 	margin-top: 24px;
 }
-
-.zat-example {
-	color: red;
-}
-
-#atoken-index {
-	width: 100%;
-}
-
-#atoken-index td:nth-child(1){
-	padding: 7px 3px 7px 10px;
-	white-space: nowrap;
-}
-
-.atoken-index-tool {
-	padding: 7px 10px;
-}
diff --git a/view/css/mod_tokens.css b/view/css/mod_tokens.css
new file mode 100644
index 000000000..ac3bd90d7
--- /dev/null
+++ b/view/css/mod_tokens.css
@@ -0,0 +1,16 @@
+.zat-example {
+	color: red;
+}
+
+#atoken-index {
+	width: 100%;
+}
+
+#atoken-index td:nth-child(1){
+	padding: 7px 3px 7px 10px;
+	white-space: nowrap;
+}
+
+.atoken-index-tool {
+	padding: 7px 10px;
+}
diff --git a/view/css/widgets.css b/view/css/widgets.css
index e330c38e1..995647d1c 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -142,7 +142,6 @@ li:hover .group-edit-icon {
 	position: relative;
 	width: 100%;
 	height: auto;
-	cursor: pointer;
 }
 
 #cover-photo-caption {
diff --git a/view/js/main.js b/view/js/main.js
index 17f94dd16..48277f5cc 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -41,6 +41,8 @@ $.ajaxSetup({cache: false});
 $(document).ready(function() {
 
 	$(document).on('click focus', '.comment-edit-form', handle_comment_form);
+	$(document).on('click', '.conversation-settings-link', getConversationSettings);
+	$(document).on('click', '#settings_module_ajax_submit', postConversationSettings);
 
 	jQuery.timeago.settings.strings = {
 		prefixAgo     : aStr['t01'],
@@ -122,6 +124,33 @@ $(document).ready(function() {
 
 });
 
+function getConversationSettings() {
+	$.get('settings/conversation/?f=&aj=1',function(data) {
+		$('#conversation_settings_body').html(data);
+	});
+
+
+
+}
+
+function postConversationSettings() {
+	$.post(
+		'settings/conversation',
+		$('#settings_module_ajax_form').serialize() + "&auto_update=" + next_page
+	);
+
+	if(next_page === 1) {
+		page_load = true;
+	}
+
+	$('#conversation_settings').modal('hide');
+
+	if(timer) clearTimeout(timer);
+	timer = setTimeout(updateInit,100);
+
+	return false;
+}
+
 function datasrc2src(selector) {
 	$(selector).each(function(i, el) {
 		$(el).attr("src", $(el).data("src"));
diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js
index bf926c692..af675e31c 100644
--- a/view/js/mod_photos.js
+++ b/view/js/mod_photos.js
@@ -11,7 +11,8 @@ $(document).ready(function() {
 	$("#photo-edit-newtag").contact_autocomplete(baseurl + '/acl', 'a', false, function(data) {
 		$("#photo-edit-newtag").val('@' + data.name);
 	});
-
+	
+	$(".comment-edit-form  textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
 	$('textarea').bbco_autocomplete('bbcode');
 	showHideBodyTextarea();
 
diff --git a/view/php/default.php b/view/php/default.php
index 06cecc56f..60f3f6a6f 100644
--- a/view/php/default.php
+++ b/view/php/default.php
@@ -10,12 +10,12 @@
 	<header><?php if(x($page,'header')) echo $page['header']; ?></header>
 	<nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
 	<main>
-		<aside id="region_1"><div id="left_aside_spacer"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></div></aside>
+		<aside id="region_1"><div class="aside_spacer"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></div></aside>
 		<section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
 					<div id="page-footer"></div>
 			<div id="pause"></div>
 		</section>
-		<aside id="region_3" class="d-none d-xl-table-cell"><div id="right_aside_spacer"><div id="right_aside_wrapper"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></div></div></aside>
+		<aside id="region_3" class="d-none d-xl-table-cell"><div class="aside_spacer"><div id="right_aside_wrapper"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></div></div></aside>
 	</main>
 	<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
 </body>
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 943b27637..a9ea29ba1 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -32,13 +32,9 @@ aside #region_1 {
 	border-right: 1px solid transparent;
 }
 
-aside #left_aside_wrapper {
-	/*margin-bottom: 10px;*/
-        margin-bottom: $bottom_margin;
-}
+aside #left_aside_wrapper,
 aside #right_aside_wrapper {
-	/*margin-bottom: 10px;*/
-        margin-bottom: $bottom_margin;
+	margin-bottom: 10px;
 }
 
 main {
@@ -47,10 +43,6 @@ main {
 	max-width: $main_widthpx;
 }
 
-main #region_2 {
-        margin-bottom: $bottom_margin;
-}
-
 #overlay {
 	position: absolute;
 	top: 0;
@@ -1522,11 +1514,15 @@ blockquote {
 		left: 0px;
 	}
 
-	#nav-app-link-wrapper {
+	#nav-app-link-wrapper.has_location {
 		min-width: 0;
 		flex-basis: 25%;
 	}
 
+	#nav-app-link-wrapper {
+		margin-right: 0.5rem;
+	}
+
 	#navbar-collapse-2 .navbar-app i {
 		font-size: 1rem;
 		margin-right: 0.5rem;
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index c905c92cb..688e92148 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -18,26 +18,13 @@ $(document).ready(function() {
 	$('#css3-calc').remove(); // Remove the test element
 
 	if($(window).width() >= 992) {
-		$('#left_aside_wrapper').stick_in_parent({
+		$('#left_aside_wrapper, #right_aside_wrapper').stick_in_parent({
 			offset_top: parseInt($('aside').css('padding-top')),
 			parent: 'main',
-			spacer: '#left_aside_spacer'
+			spacer: '.aside_spacer'
 		});
 	}
 
-	if($(window).width() >= 992) {
-		$('#right_aside_wrapper').stick_in_parent({
-			offset_top: parseInt($('aside').css('padding-top')),
-			parent: 'main',
-			spacer: '#right_aside_spacer'
-		});
-	}
-
-
-	$('#notifications_wrapper.fs #notifications').stick_in_parent({
-		parent: '#notifications_wrapper'
-	});
-
 	$('#expand-aside').on('click', toggleAside);
 
 	$('section').on('click', function() {
@@ -56,7 +43,7 @@ $(document).ready(function() {
 	});
 
 
-	var right_aside_height = $('#rightt_aside_wrapper').height();
+	var right_aside_height = $('#right_aside_wrapper').height();
 
 	$('#right_aside_wrapper').on('click', function() {
 		if(right_aside_height != $('#right_aside_wrapper').height()) {
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index f98182739..0a779529d 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -54,6 +54,7 @@ class RedbasicConfig {
 		$arr['converse_width']=get_pconfig(local_channel(),"redbasic","converse_width");
 		$arr['top_photo']=get_pconfig(local_channel(),"redbasic","top_photo");
 		$arr['reply_photo']=get_pconfig(local_channel(),"redbasic","reply_photo");
+		$arr['advanced_theming'] = get_pconfig(local_channel(), 'redbasic', 'advanced_theming');
 		return $this->form($arr);
 	}
 
@@ -80,15 +81,15 @@ class RedbasicConfig {
 			set_pconfig(local_channel(), 'redbasic', 'converse_width', $_POST['redbasic_converse_width']);
 			set_pconfig(local_channel(), 'redbasic', 'top_photo', $_POST['redbasic_top_photo']);
 			set_pconfig(local_channel(), 'redbasic', 'reply_photo', $_POST['redbasic_reply_photo']);
+			set_pconfig(local_channel(), 'redbasic', 'advanced_theming', $_POST['redbasic_advanced_theming']);
 		}
 	}
 
 	function form($arr) {
 
-		if(feature_enabled(local_channel(),'advanced_theming')) 
+		if(get_pconfig(local_channel(), 'redbasic', 'advanced_theming'))
 			$expert = 1;
 					
-
 	  	$o .= replace_macros(get_markup_template('theme_settings.tpl'), array(
 			'$submit' => t('Submit'),
 			'$baseurl' => z_root(),
@@ -112,6 +113,7 @@ class RedbasicConfig {
 			'$converse_width' => array('redbasic_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')),
 			'$top_photo' => array('redbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
 			'$reply_photo' => array('redbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),
+			'$advanced_theming' => ['redbasic_advanced_theming', t('Show advanced settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]]
 			));
 
 		return $o;
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 0631fa142..91cc0b85b 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -106,8 +106,6 @@ if(! $top_photo)
 	$top_photo = '2.3rem';
 if(! $reply_photo)
 	$reply_photo = '2.3rem';
-if(! $bottom_margin)
-        $bottom_margin = '200px';
 
 // Apply the settings
 if(file_exists('view/theme/redbasic/css/style.css')) {
@@ -152,9 +150,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
 		'$pmenu_top' => $pmenu_top,
 		'$pmenu_reply' => $pmenu_reply,
 		'$main_width' => $main_width,
-		'$aside_width' => $aside_width,
-                '$bottom_margin' => $bottom_margin
-
+		'$aside_width' => $aside_width
 	);
 
 	echo str_replace(array_keys($options), array_values($options), $x);
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index d9750de42..5f73f6736 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -1,14 +1,14 @@
 <?php
 
 head_add_css('/library/fork-awesome/css/fork-awesome.min.css');
-head_add_css('/library/bootstrap/css/bootstrap.min.css');
+head_add_css('/vendor/twbs/bootstrap/dist/css/bootstrap.min.css');
 head_add_css('/library/bootstrap-tagsinput/bootstrap-tagsinput.css');
 head_add_css('/view/css/bootstrap-red.css');
 head_add_css('/library/datetimepicker/jquery.datetimepicker.css');
 head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
 require_once('view/php/theme_init.php');
 
-head_add_js('/library/bootstrap/js/bootstrap.bundle.min.js');
+head_add_js('/vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js');
 head_add_js('/library/bootbox/bootbox.min.js');
 head_add_js('/library/bootstrap-tagsinput/bootstrap-tagsinput.js');
 head_add_js('/library/datetimepicker/jquery.datetimepicker.js');
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index 7c552b49e..cc403f0a7 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -1,6 +1,7 @@
 {{include file="field_checkbox.tpl" field=$narrow_navbar}}
 {{include file="field_input.tpl" field=$converse_width}}
 {{include file="field_input.tpl" field=$font_size}}
+{{include file="field_checkbox.tpl" field=$advanced_theming}}
 {{if $expert}}
 	{{include file="field_colorinput.tpl" field=$nav_bg}}
 	{{include file="field_colorinput.tpl" field=$nav_icon_colour}}
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index d72258fa0..6ff7bffcd 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -485,7 +485,7 @@
 						</div>
 
 						{{if $permcat_enable}}
-						<a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a>
+						<a href="permcats" class="pull-right"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a>
 						{{include file="field_select.tpl" field=$permcat}}
 						{{/if}}
 
diff --git a/view/tpl/admin_account_edit.tpl b/view/tpl/admin_account_edit.tpl
index 239d9084a..3329c0025 100644
--- a/view/tpl/admin_account_edit.tpl
+++ b/view/tpl/admin_account_edit.tpl
@@ -13,6 +13,6 @@
 {{include file="field_input.tpl" field=$service_class}}
 
 
-<input type="submit" name="submit" value="{{$submit}}" />
+<input type="submit" name="submit" class="btn btn-primary" value="{{$submit}}" />
 
 </form>
diff --git a/view/tpl/admin_accounts.tpl b/view/tpl/admin_accounts.tpl
index d6c9591fd..2dd56c8dc 100755
--- a/view/tpl/admin_accounts.tpl
+++ b/view/tpl/admin_accounts.tpl
@@ -33,15 +33,18 @@
 					<td class="email">{{$u.account_email}}</td>
 					<td class="checkbox_bulkedit"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}"></td>
 					<td class="tools">
-						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" class="btn btn-outline-secondary btn-sm" title="{{$approve}}"><i class="fa fa-thumbs-o-up admin-icons"></i></a>
-						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" class="btn btn-outline-secondary btn-sm" title="{{$deny}}"><i class="fa fa-thumbs-o-down admin-icons"></i></a>
+						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" class="btn btn-default btn-xs" title="{{$approve}}"><i class="fa fa-thumbs-o-up admin-icons"></i></a>
+						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" class="btn btn-default btn-xs" title="{{$deny}}"><i class="fa fa-thumbs-o-down admin-icons"></i></a>
 					</td>
 				</tr>
 			{{/foreach}}
 				</tbody>
 			</table>
 			<div class="selectall"><a href="#" onclick="return toggle_selectall('pending_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_accounts_deny" value="{{$deny}}"> <input type="submit" name="page_accounts_approve" value="{{$approve}}"></div>
+			<div class="submit">
+                <input type="submit" name="page_accounts_deny" class="btn btn-primary" value="{{$deny}}" /> 
+                <input type="submit" name="page_accounts_approve" class="btn btn-primary" value="{{$approve}}" />
+            </div>
 		{{else}}
 			<p>{{$no_pending}}</p>
 		{{/if}}
@@ -73,14 +76,18 @@
 						<td class="service_class">{{$u.account_service_class}}</td>
 						<td class="checkbox_bulkedit"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.account_id}}" name="user[]" value="{{$u.account_id}}"><input type="hidden" name="blocked[]" value="{{$u.blocked}}"></td>
 						<td class="tools">
-							<a href="{{$baseurl}}/admin/accounts/{{if ($u.blocked)}}un{{/if}}block/{{$u.account_id}}?t={{$form_security_token}}"  class="btn btn-outline-secondary btn-sm" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class="fa fa-ban admin-icons{{if ($u.blocked)}} dim{{/if}}"></i></a><a href="{{$baseurl}}/admin/accounts/delete/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-outline-secondary btn-sm" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class="fa fa-trash-o admin-icons"></i></a>
+							<a href="{{$baseurl}}/admin/accounts/{{if ($u.blocked)}}un{{/if}}block/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class="fa fa-ban admin-icons{{if ($u.blocked)}} dim{{/if}}"></i></a>
+							<a href="{{$baseurl}}/admin/accounts/delete/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class="fa fa-trash-o admin-icons"></i></a>
 						</td>
 					</tr>
 				{{/foreach}}
 				</tbody>
 			</table>
 			<div class="selectall"><a href="#" onclick="return toggle_selectall('users_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_accounts_block" value="{{$block}}/{{$unblock}}"> <input type="submit" name="page_accounts_delete" value="{{$delete}}" onclick="return confirm_delete_multi()"></div>
+			<div class="submit">
+                <input type="submit" name="page_accounts_block" class="btn btn-primary" value="{{$block}}/{{$unblock}}" /> 
+                <input type="submit" name="page_accounts_delete" class="btn btn-primary" onclick="return confirm_delete_multi()" value="{{$delete}}" />
+            </div>
 		{{else}}
 			NO USERS?!?
 		{{/if}}
diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl
index 452e0eeec..f8584c84a 100755
--- a/view/tpl/admin_channels.tpl
+++ b/view/tpl/admin_channels.tpl
@@ -43,7 +43,11 @@
 				</tbody>
 			</table>
 			<div class='selectall'><a href='#' onclick="return selectall('channels_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_channels_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_channels_code" value="{{$code}}/{{$uncode}}" /> <input type="submit" name="page_channels_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
+			<div class="submit">
+                <input type="submit" name="page_channels_block" class="btn btn-primary" value="{{$block}}/{{$unblock}}" /> 
+                <input type="submit" name="page_channels_code" class="btn btn-primary" value="{{$code}}/{{$uncode}}" /> 
+                <input type="submit" name="page_channels_delete" class="btn btn-primary" onclick="return confirm_delete_multi()" value="{{$delete}}" />
+            </div>						
 		{{else}}
 			NO CHANNELS?!?
 		{{/if}}
diff --git a/view/tpl/admin_logs.tpl b/view/tpl/admin_logs.tpl
index 6d2d7834c..5643bb42f 100755
--- a/view/tpl/admin_logs.tpl
+++ b/view/tpl/admin_logs.tpl
@@ -2,13 +2,15 @@
 	<h1>{{$title}} - {{$page}}</h1>
 	
 	<form action="{{$baseurl}}/admin/logs" method="post">
-    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+    <input type='hidden' name='form_security_token' value='{{$form_security_token}}' />
 
 	{{include file="field_checkbox.tpl" field=$debugging}}
 	{{include file="field_input.tpl" field=$logfile}}
 	{{include file="field_select.tpl" field=$loglevel}}
 	
-	<div class="submit"><input type="submit" name="page_logs" value="{{$submit}}" /></div>
+	<div class="submit">
+	    <input type="submit" name="page_logs" class="btn btn-primary" value="{{$submit}}" />
+	</div>
 	
 	</form>
 	
diff --git a/view/tpl/admin_profiles.tpl b/view/tpl/admin_profiles.tpl
index e3a08449c..b3bb687c0 100644
--- a/view/tpl/admin_profiles.tpl
+++ b/view/tpl/admin_profiles.tpl
@@ -15,7 +15,7 @@
 {{include file="field_textarea.tpl" field=$basic}}
 {{include file="field_textarea.tpl" field=$advanced}}
 
-<input type="submit" name="submit" value="{{$submit}}" />
+<input type="submit" name="submit" class="btn btn-primary" value="{{$submit}}" />
 
 </form>
 
diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl
index 493707a7a..9a99c7456 100755
--- a/view/tpl/admin_security.tpl
+++ b/view/tpl/admin_security.tpl
@@ -26,8 +26,8 @@
 	{{include file="field_textarea.tpl" field=$embed_deny}}
 
 
-	<div class="admin-submit-wrapper" >
-		<input type="submit" name="submit" class="admin-submit" value="{{$submit}}" />
+	<div class="admin-submit-wrapper">
+		<input type="submit" name="submit" class="btn btn-primary" value="{{$submit}}" />
 	</div>
 
 	</form>
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 3288c2988..c3f8177c2 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -64,7 +64,9 @@
 		{{include file="field_select.tpl" field=$directory_server}}
 	{{/if}}
 	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	<div class="submit">
+	    <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}" />
+    </div>
 	
 	<h3>{{$registration}}</h3>
 	{{include file="field_input.tpl" field=$register_text}}
@@ -77,7 +79,9 @@
 	{{include file="field_input.tpl" field=$sellpage}}
 	{{include file="field_input.tpl" field=$first_page}}
 
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	<div class="submit">
+	    <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}" />
+    </div>
 
 	<h3>{{$corporate}}</h3>
 	{{include file="field_checkbox.tpl" field=$verify_email}}
@@ -89,7 +93,9 @@
 	{{include file="field_textarea.tpl" field=$incl}}
 	{{include file="field_textarea.tpl" field=$excl}}
 	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	<div class="submit">
+        <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}" /></div>
+    </div>
 	
 	<h3>{{$advanced}}</h3>
 	{{include file="field_input.tpl" field=$imagick_path}}
@@ -106,7 +112,9 @@
 	{{include file="field_input.tpl" field=$default_expire_days}}
 	{{include file="field_input.tpl" field=$active_expire_days}}
 	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	<div class="submit">
+        <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}" />
+    </div>
 	
 	</form>
 </div>
diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl
index 7d2e46c59..6013f9548 100644
--- a/view/tpl/app.tpl
+++ b/view/tpl/app.tpl
@@ -11,15 +11,16 @@
 		<a href="{{$app.page}}" class="btn btn-outline-secondary" title="{{$purchase}}" ><i class="fa fa-external"></i></a>
 	</div>
 	{{/if}}
-	{{if $install || $update || $delete || $feature}}
+	{{if $action_label || $update || $delete || $feature}}
 	<div class="text-center app-tools">
 		<form action="{{$hosturl}}appman" method="post">
 		<input type="hidden" name="papp" value="{{$app.papp}}" />
-		{{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-outline-secondary btn-sm" title="{{$install}}" ><i class="fa fa-fw fa-arrow-circle-o-down" ></i></button>{{/if}}
+		{{if $action_label}}<button type="submit" name="install" value="{{$action_label}}" class="btn btn-outline-{{if $installed}}secondary{{else}}success{{/if}} btn-sm" title="{{$action_label}}" ><i class="fa fa-fw {{if $installed}}fa-refresh{{else}}fa-arrow-circle-o-down{{/if}}" ></i> {{$action_label}}</button>{{/if}}
 		{{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-outline-secondary btn-sm" title="{{$edit}}" ><i class="fa fa-fw fa-pencil" ></i></button>{{/if}}
 		{{if $delete}}<button type="submit" name="delete" value="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" class="btn btn-outline-secondary btn-sm" title="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" ><i class="fa fa-fw fa-trash-o drop-icons"></i></button>{{/if}}
 		{{if $feature}}<button type="submit" name="feature" value="nav_featured_app" class="btn btn-outline-secondary btn-sm" title="{{if $featured}}{{$remove}}{{else}}{{$add}}{{/if}}"><i class="fa fa-fw fa-star{{if $featured}} text-warning{{/if}}"></i></button>{{/if}}
 		{{if $pin}}<button type="submit" name="pin" value="nav_pinned_app" class="btn btn-outline-secondary btn-sm" title="{{if $pinned}}{{$remove_nav}}{{else}}{{$add_nav}}{{/if}}"><i class="fa fa-fw fa-thumb-tack{{if $pinned}} text-success{{/if}}"></i></button>{{/if}}
+		{{if $settings_url}}<a href="{{$settings_url}}/?f=&rpath={{$rpath}}" class="btn btn-outline-secondary btn-sm"><i class="fa fa-fw fa-cog"></i></a>{{/if}}
 		</form>
 	</div>
 	{{/if}}
diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl
index f484b49e5..695b3b30f 100755
--- a/view/tpl/channels.tpl
+++ b/view/tpl/channels.tpl
@@ -9,9 +9,11 @@
 			{{$channel_usage_message}}
 		</div>
 		{{/if}}
+		{{if $desc}}
 		<div id="channels-desc" class="section-content-info-wrapper">
 			{{$desc}}
 		</div>
+		{{/if}}
 		{{foreach $all_channels as $chn}}
 			{{include file="channel.tpl" channel=$chn}}
 		{{/foreach}}
diff --git a/view/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl
index 8aa865076..c6b3b0d9b 100755
--- a/view/tpl/conv_frame.tpl
+++ b/view/tpl/conv_frame.tpl
@@ -4,5 +4,16 @@
 <div id="page-spinner" class="spinner-wrapper">
 	<div  class="spinner m"></div>
 </div>
-
-
+<div class="modal" id="conversation_settings" tabindex="-1" role="dialog" aria-labelledby="conversation_settings_label" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h3 class="modal-title" id="conversation_settings_label">{{$conversation_tools}}</h3>
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+			</div>
+			<div class="modal-body" id="conversation_settings_body">
+				{{$wait}}
+			</div>
+		</div><!-- /.modal-content -->
+	</div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index ac6af40e9..5720a2a5f 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -175,10 +175,18 @@
 									{{if $item.drop.dropping}}
 									<a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a>
 									{{/if}}
+									{{if $item.dropdown_extras}}
+									<div class="dropdown-divider"></div>
+                                                                        {{$item.dropdown_extras}}
+									{{/if}}
 									{{if $item.edpost && $item.dreport}}
 									<div class="dropdown-divider"></div>
 									<a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a>
 									{{/if}}
+									{{if $item.settings}}
+									<div class="dropdown-divider"></div>
+									<a class="dropdown-item conversation-settings-link" href="" data-toggle="modal" data-target="#conversation_settings">{{$item.settings}}</a>
+									{{/if}}
 								</div>
 							</div>
 						</div>
@@ -206,7 +214,7 @@
 								<div class="modal-dialog">
 									<div class="modal-content">
 										<div class="modal-header">
-											<h4 class="modal-title">{{$response.count}} {{$response.button}}</h4>
+											<h3 class="modal-title">{{$response.count}} {{$response.button}}</h3>
 											<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 										</div>
 										<div class="modal-body response-list">
diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl
index 3aaad5ae5..7739d24b8 100755
--- a/view/tpl/cover_photo_widget.tpl
+++ b/view/tpl/cover_photo_widget.tpl
@@ -2,54 +2,59 @@
 	var aside_padding_top;
 	var section_padding_top;
 	var coverSlid = false;
+	var hide_cover = Boolean({{$hide_cover}});
+	var cover_height;
 
 	$(document).ready(function() {
+		if(! $('#cover-photo').length)
+			return;
+
+		if($(window).width() < 755) {
+			$('#cover-photo').remove();
+			coverSlid = true;
+			return;
+		}
 
-		aside_padding_top = parseInt($('aside').css('padding-top'));
-		section_padding_top = parseInt($('section').css('padding-top'));
+		$('#cover-photo').removeClass('d-none');
+		cover_height = Math.ceil($(window).width()/2.75862069);
+		$('#cover-photo').css('height', cover_height + 'px');
+		datasrc2src('#cover-photo > img');
 
 		$(document).on('click mouseup keyup', slideUpCover);
 
-		if($('#cover-photo').length && $(window).width() > 755) {
-			if($(window).scrollTop() < $('#cover-photo').height()) {
-				$('.navbar').removeClass('fixed-top');
-				$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
-				$('main').css('opacity', 0);
-			}
+		if(hide_cover) {
+			hideCover();
 		}
-		else {
-			$('#cover-photo').remove();
-			coverSlid = true;
+		else if(!hide_cover && !coverSlid)  {
+			coverVisibleActions();
 		}
 	});
 
 	$(window).scroll(function () {
-		if($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() >= $('#cover-photo').height()) {
-			$('.navbar').addClass('fixed-top');
-			$('main').css('margin-top', '');
-			$('main').css('opacity', 1);
+		if($(window).scrollTop() >= cover_height) {
+			coverHiddenActions();
 			coverSlid = true;
 		}
-		else if ($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() < $('#cover-photo').height()){
+		else if ($(window).scrollTop() < cover_height){
 			if(coverSlid) {
-				$(window).scrollTop(Math.ceil($('#cover-photo').height()));
+				$(window).scrollTop(cover_height);
 				setTimeout(function(){ coverSlid = false; }, 1000);
 			}
 			else {
-				if($(window).scrollTop() < $('#cover-photo').height()) {
-					$('.navbar').removeClass('fixed-top');
-					$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
-					$('main').css('opacity', 0);
+				if($(window).scrollTop() < cover_height) {
+					coverVisibleActions();
 				}
 			}
 		}
-		if($('#cover-photo').length && $('main').css('opacity') < 1) {
-			$('main').css('opacity', ($(window).scrollTop()/$('#cover-photo').height()).toFixed(1));
+		if($('main').css('opacity') < 1) {
+			$('main').css('opacity', ($(window).scrollTop()/cover_height).toFixed(1));
 		}
 	});
 
 	$(window).resize(function () {
-		if($('#cover-photo').length && $(window).width() < 755) {
+		cover_height = Math.ceil($(window).width()/2.75862069);
+		$('#cover-photo').css('height', cover_height + 'px');
+		if($(window).width() < 755) {
 			$('#cover-photo').remove();
 			$('.navbar').addClass('fixed-top');
 			$('main').css('opacity', 1);
@@ -62,12 +67,34 @@
 		if(coverSlid) {
 			return;
 		}
-		$('html, body').animate({scrollTop: Math.ceil($('#cover-photo').height()) + 'px' }, 'fast');
+		$('html, body').animate({scrollTop: cover_height + 'px'}, 'fast');
 		return;
 	}
+
+	function hideCover() {
+		if(coverSlid) {
+			return;
+		}
+		window.scrollTo(0, cover_height);
+		return;
+	}
+
+	function coverVisibleActions() {
+		$('body').css('cursor', 'n-resize');
+		$('.navbar').removeClass('fixed-top');
+		$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
+		$('main').css('opacity', 0);
+	}
+
+	function coverHiddenActions() {
+		$('body').css('cursor', '');
+		$('.navbar').addClass('fixed-top');
+		$('main').css('margin-top', '');
+		$('main').css('opacity', 1);
+	}
 </script>
 
-<div id="cover-photo" title="{{$hovertitle}}">
+<div class="d-none" id="cover-photo" title="{{$hovertitle}}">
 	{{$photo_html}}
 	<div id="cover-photo-caption">
 		<h1>{{$title}}</h1>
diff --git a/view/tpl/defperms.tpl b/view/tpl/defperms.tpl
index 5273ee91b..29f642cff 100755
--- a/view/tpl/defperms.tpl
+++ b/view/tpl/defperms.tpl
@@ -17,7 +17,7 @@
 						<p>{{$permnote_self}}</p>
 						</div>
 						{{if $permcat_enable}}
-						<a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a>
+						<a href="permcats" class="pull-right"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a>
 						{{include file="field_select.tpl" field=$permcat}}
 						{{/if}}
 
diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl
index 2fb753784..bccb25068 100755
--- a/view/tpl/follow.tpl
+++ b/view/tpl/follow.tpl
@@ -2,7 +2,7 @@
 	<h3>{{$connect}}</h3>
 	<form action="follow" method="post" />
 		<div class="input-group">
-			<input class="form-control form-control-sm" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" />
+			<input class="form-control" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" />
 			<div class="input-group-append">
 				<button class="btn btn-success" type="submit" name="submit" value="{{$follow}}" title="{{$follow}}"><i class="fa fa-fw fa-plus"></i></button>
 			</div>
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index dd64c3454..be09fbebf 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -7,7 +7,7 @@ var pretext = '{{$pretext}}';
 function initEditor(cb){
 	if(editor == false){
 		$("#profile-jot-text-loading").show();
-		$("#profile-jot-reset").removeClass('d-none');
+		$("#profile-jot-tools").removeClass('d-none');
 		{{$geotag}}
 		if(plaintext == 'none') {
 			$("#profile-jot-text-loading").hide();
@@ -308,7 +308,7 @@ var activeCommentText = '';
 		{{if $reset}}
 		$(".jothidden").hide();
 		$("#profile-jot-text").removeClass('jot-expanded');
-		$("#profile-jot-reset").addClass('d-none');
+		$("#profile-jot-tools").addClass('d-none');
 		$("#jot-preview-content").html('').hide();
 		editor = false;
 		{{else}}
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 0d1b4bd0d..cb80c6c7e 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -42,11 +42,14 @@
 		</div>
 		{{/if}}
 		<div id="jot-text-wrap">
-			{{if $reset}}
-			<button id="profile-jot-reset" class="btn btn-outline-secondary btn-sm d-none border-0" title="{{$reset}}" onclick="itemCancel(); return false;">
-				<i class="fa fa-close"></i>
-			</button>
-			{{/if}}
+			<div id="profile-jot-tools" class="btn-group d-none">
+				<a id="profile-jot-settings" class="btn btn-outline-secondary btn-sm border-0" href="/settings/editor/?f=&rpath=/{{$return_path}}"><i class="fa fa-cog"></i></a>
+				{{if $reset}}
+				<button id="profile-jot-reset" class="btn btn-outline-secondary btn-sm border-0" title="{{$reset}}" onclick="itemCancel(); return false;">
+					<i class="fa fa-close"></i>
+				</button>
+				{{/if}}
+			</div>
 			<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$placeholdtext}}" >{{$content}}</textarea>
 		</div>
 		{{if $attachment}}
@@ -209,7 +212,7 @@
 				<div class="modal-dialog">
 					<div class="modal-content">
 						<div class="modal-header">
-							<h4 class="modal-title" id="expiryModalLabel">{{$jotnets_label}}</h4>
+							<h3 class="modal-title" id="expiryModalLabel">{{$jotnets_label}}</h3>
 							<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 						</div>
 						<div class="modal-body">
@@ -236,7 +239,7 @@
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
-				<h4 class="modal-title" id="expiryModalLabel">{{$expires}}</h4>
+				<h3 class="modal-title" id="expiryModalLabel">{{$expires}}</h3>
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 			</div>
 			<div class="modal-body form-group" style="width:90%">
@@ -263,7 +266,7 @@
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
-				<h4 class="modal-title" id="createdModalLabel">{{$future_txt}}</h4>
+				<h3 class="modal-title" id="createdModalLabel">{{$future_txt}}</h3>
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 			</div>
 			<div class="modal-body form-group" style="width:90%">
@@ -290,7 +293,7 @@
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
-				<h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
+				<h3 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h3>
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 			</div>
 			<div class="modal-body" id="embedPhotoModalBody" >
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
index 0eb0a964c..0c8be512d 100755
--- a/view/tpl/navbar_default.tpl
+++ b/view/tpl/navbar_default.tpl
@@ -63,16 +63,24 @@
 	{{/if}}
 </div>
 {{if $sel.name}}
-<div id="nav-app-link-wrapper" class="navbar-nav mr-auto">
+<div id="nav-app-link-wrapper" class="navbar-nav{{if $sitelocation || ! $settings_url}} has_location mr-auto{{/if}}">
 	<a id="nav-app-link" href="{{$url}}" class="nav-link text-truncate">
 		{{$sel.name}}
 		{{if $sitelocation}}
 		<br><small>{{$sitelocation}}</small>
 		{{/if}}
 	</a>
+
+</div>
+{{if $settings_url}}
+<div id="nav-app-settings-link-wrapper" class="navbar-nav mr-auto">
+	<a id="nav-app-settings-link" href="{{$settings_url}}/?f=&rpath={{$url}}" class="nav-link">
+		<i class="fa fa-fw fa-cog"></i>
+	</a>
 </div>
 {{/if}}
 {{/if}}
+{{/if}}
 <div class="navbar-toggler-right">
 	{{if $nav.help.6}}
 	<button id="context-help-btn" class="navbar-toggler border-0" type="button" onclick="contextualHelp(); return false;">
diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index 51880e1f6..8d72df55b 100755
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
@@ -13,23 +13,25 @@
 		</div>
 		{{/if}}
 		{{/if}}
-		<form action="new_channel" method="post" id="newchannel-form">
-			{{if $default_role}}
-				<input type="hidden" name="permissions_role" value="{{$default_role}}" />
-			{{else}}
-				{{include file="field_select_grouped.tpl" field=$role}}
-			{{/if}}
-
-			{{include file="field_input.tpl" field=$name}}
-
-			{{include file="field_input.tpl" field=$nickname}}
-			<button class="btn btn-primary" type="submit" id="newchannel-submit-button">{{$submit}}</button>
-
-
-			<div id="newchannel-submit-end" class="clear"></div>
-
-			<div id="newchannel-import-link" class="descriptive-paragraph" >{{$label_import}}</div>
-			<div id="newchannel-import-end" class="clear"></div>
-		</form>
+		{{if $canadd}}
+			<form action="new_channel" method="post" id="newchannel-form">
+				{{if $default_role}}
+					<input type="hidden" name="permissions_role" value="{{$default_role}}" />
+				{{else}}
+					{{include file="field_select_grouped.tpl" field=$role}}
+				{{/if}}
+	
+				{{include file="field_input.tpl" field=$name}}
+	
+				{{include file="field_input.tpl" field=$nickname}}
+				<button class="btn btn-primary" type="submit" id="newchannel-submit-button">{{$submit}}</button>
+	
+	
+				<div id="newchannel-submit-end" class="clear"></div>
+	
+				<div id="newchannel-import-link" class="descriptive-paragraph" >{{$label_import}}</div>
+				<div id="newchannel-import-end" class="clear"></div>
+			</form>
+		{{/if}}
 	</div>
 </div>
diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl
index c6d5d8a73..67da5ff37 100644
--- a/view/tpl/notes.tpl
+++ b/view/tpl/notes.tpl
@@ -1,5 +1,13 @@
+{{if $app}}
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$banner}}</h2>
+	</div>
+	<div class="section-content-wrapper">
+{{else}}
 <div class="widget">
 	<h3>{{$banner}}</h3>
+{{/if}}
 	<textarea name="note_text" id="note-text">{{$text}}</textarea>
 	<script>
 		var noteSaveTimer = null;
@@ -32,4 +40,7 @@
 			noteSaveTimer = setTimeout(noteSaveChanges,10000);
 		}
 	</script>
+{{if $app}}
+</div>
+{{/if}}
 </div>
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 068441997..9b3d7487e 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -5,10 +5,17 @@
 	$(document).ready(function() {
 		notifications_parent = $('#notifications_wrapper')[0].parentElement.id;
 		$('.notifications-btn').click(function() {
-			if($('#notifications_wrapper').hasClass('fs'))
+			if($('#notifications_wrapper').hasClass('fs')) {
 				$('#notifications_wrapper').prependTo('#' + notifications_parent);
-			else
+				//undo scrollbar remove
+				$('section').css('height', '');
+			}
+			else {
 				$('#notifications_wrapper').prependTo('section');
+				//remove superfluous scrollbar
+				//setting overflow to hidden here has issues with some browsers
+				$('section').css('height', '100vh');
+			}
 
 			$('#notifications_wrapper').toggleClass('fs');
 			if($('#navbar-collapse-2').hasClass('show')){
diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/oauth.tpl
index 811cfcec5..881e22e99 100755
--- a/view/tpl/settings_oauth.tpl
+++ b/view/tpl/oauth.tpl
@@ -4,13 +4,13 @@
 </div>
 
 <div class="section-content-tools-wrapper">
-<form action="settings/oauth" method="post" autocomplete="off">
+<form action="oauth" method="post" autocomplete="off">
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
 	<div id="profile-edit-links">
 		<ul>
 			<li>
-				<a id="profile-edit-view-link" href="{{$baseurl}}/settings/oauth/add">{{$add}}</a>
+				<a id="profile-edit-view-link" href="{{$baseurl}}/oauth/add">{{$add}}</a>
 			</li>
 		</ul>
 	</div>
@@ -25,8 +25,8 @@
 			{{/if}}
 		{{/if}}
 		{{if $app.my}}
-		<a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" title="{{$edit}}"><i class="fa fa-pencil btn btn-outline-secondary"></i></a>
-		<a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="fa fa-trash-o btn btn-outline-secondary"></i></a>
+		<a href="{{$baseurl}}/oauth/edit/{{$app.client_id}}" title="{{$edit}}"><i class="fa fa-pencil btn btn-outline-secondary"></i></a>
+		<a href="{{$baseurl}}/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="fa fa-trash-o btn btn-outline-secondary"></i></a>
 		{{/if}}		
 	</div>
 	{{/foreach}}
diff --git a/view/tpl/settings_oauth2.tpl b/view/tpl/oauth2.tpl
index f3bf59a12..a5b48ffce 100755
--- a/view/tpl/settings_oauth2.tpl
+++ b/view/tpl/oauth2.tpl
@@ -8,13 +8,13 @@
 	<div id="profile-edit-links">
 		<ul>
 			<li>
-				<a id="profile-edit-view-link" href="{{$baseurl}}/settings/oauth2/add">{{$add}}</a>
+				<a id="profile-edit-view-link" href="{{$baseurl}}/oauth2/add">{{$add}}</a>
 			</li>
 		</ul>
 	</div>
 
 	{{foreach $apps as $app}}
-<form action="settings/oauth2" method="post" autocomplete="off">
+<form action="oauth2" method="post" autocomplete="off">
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 <input type='hidden' name='name' value='{{$app.client_id}}'>
 	<div class='oauthapp'>
@@ -25,8 +25,8 @@
 			{{/if}}
 		{{/if}}
 		{{if $app.my}}
-		<a href="{{$baseurl}}/settings/oauth2/edit/{{$app.client_id}}" title="{{$edit}}"><i class="fa fa-pencil btn btn-outline-secondary"></i></a>
-		<a href="{{$baseurl}}/settings/oauth2/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="fa fa-trash-o btn btn-outline-secondary"></i></a>
+		<a href="{{$baseurl}}/oauth2/edit/{{$app.client_id}}" title="{{$edit}}"><i class="fa fa-pencil btn btn-outline-secondary"></i></a>
+		<a href="{{$baseurl}}/oauth2/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="fa fa-trash-o btn btn-outline-secondary"></i></a>
 		{{/if}}		
 	</div>
 </form>
diff --git a/view/tpl/settings_oauth2_edit.tpl b/view/tpl/oauth2_edit.tpl
index 399c64977..399c64977 100755
--- a/view/tpl/settings_oauth2_edit.tpl
+++ b/view/tpl/oauth2_edit.tpl
diff --git a/view/tpl/settings_oauth_edit.tpl b/view/tpl/oauth_edit.tpl
index e44b44723..e44b44723 100755
--- a/view/tpl/settings_oauth_edit.tpl
+++ b/view/tpl/oauth_edit.tpl
diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
index b4d9ef19f..206be694e 100755
--- a/view/tpl/peoplefind.tpl
+++ b/view/tpl/peoplefind.tpl
@@ -2,7 +2,7 @@
 	<h3>{{$findpeople}}</h3>
 	<form action="directory" method="post" />
 		<div class="input-group form-group">
-			<input class="form-control form-control-sm" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" />
+			<input class="form-control" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" />
 			<div class="input-group-append">
 				<button class="btn btn-outline-secondary" type="submit" name="submit"><i class="fa fa-fw fa-search"></i></button>
 			</div>
diff --git a/view/tpl/settings_permcats.tpl b/view/tpl/permcats.tpl
index bbbd41669..2cad2db5b 100644
--- a/view/tpl/settings_permcats.tpl
+++ b/view/tpl/permcats.tpl
@@ -8,7 +8,7 @@
 			{{$desc}}
 		</div>
 
-		<form action="settings/permcats" id="settings-permcats-form" method="post" autocomplete="off" >
+		<form action="permcats" id="settings-permcats-form" method="post" autocomplete="off" >
 			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 			{{include file="field_input.tpl" field=$name}}
 
@@ -50,8 +50,8 @@
 			<table id="permcat-index">
 			{{foreach $permcats as $k => $v}}
 			<tr class="permcat-row-{{$k}}">
-				<td width="99%"><a href="settings/permcats/{{$k}}">{{$v}}</a></td>
-				<td width="1%"><i class="fa fa-trash-o drop-icons" onClick="dropItem('/settings/permcats/{{$k}}/drop', '.permcat-row-{{$k}}')"></i></td>
+				<td width="99%"><a href="permcats/{{$k}}">{{$v}}</a></td>
+				<td width="1%"><i class="fa fa-trash-o drop-icons" onClick="dropItem('permcats/{{$k}}/drop', '.permcat-row-{{$k}}')"></i></td>
 			</tr>
 			{{/foreach}}
 			</table>
diff --git a/view/tpl/searchbox.tpl b/view/tpl/searchbox.tpl
index abcdb8933..2fcf3e374 100644
--- a/view/tpl/searchbox.tpl
+++ b/view/tpl/searchbox.tpl
@@ -1,7 +1,7 @@
 <form action="{{$action_url}}" method="get" >
 	<input type="hidden" name="f" value="" />
 	<div id="{{$id}}" class="input-group">
-		<input class="form-control form-control-sm" type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" />
+		<input class="form-control" type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" />
 		<div class="input-group-append">
 			<button type="submit" name="submit" class="btn btn-outline-secondary" id="search-submit" value="{{$search_label}}"><i class="fa fa-search"></i></button>
 			{{if $savedsearch}}
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 3a05ea828..74863a5db 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -186,8 +186,6 @@
 							</select>
 						</div>
 						{{/if}}
-						{{include file="field_checkbox.tpl" field=$cal_first_day}}
-
 						{{if $misc_addon}}
 						{{$misc_addon}}
 						{{/if}}
diff --git a/view/tpl/settings_addon.tpl b/view/tpl/settings_addon.tpl
new file mode 100644
index 000000000..93bf3d083
--- /dev/null
+++ b/view/tpl/settings_addon.tpl
@@ -0,0 +1,22 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<div class="section-content-wrapper">
+		{{if $action_url}}
+		<form action="{{$action_url}}" method="post" autocomplete="off">
+		{{/if}}
+			{{if $form_security_token}}
+			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+			{{/if}}
+			{{$content}}
+			{{if $submit}}
+			<div class="settings-submit-wrapper" >
+				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+			</div>
+			{{/if}}
+		{{if $action_url}}
+		</form>
+		{{/if}}
+	</div>
+</div>
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
index 7600038ea..f96e7f84c 100755
--- a/view/tpl/settings_display.tpl
+++ b/view/tpl/settings_display.tpl
@@ -68,11 +68,7 @@
 						{{include file="field_checkbox.tpl" field=$user_scalable}}
 						{{include file="field_checkbox.tpl" field=$preload_images}}
 						{{include file="field_checkbox.tpl" field=$manual_update}}
-						{{if $expert}}
-						<div class="form-group">
-							<a class="btn btn-outline-secondary "href="pdledit">{{$layout_editor}}</a>
-						</div>
-						{{/if}}
+						{{include file="field_checkbox.tpl" field=$start_menu}}
 						<div class="settings-submit-wrapper" >
 							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 						</div>
diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl
index 998199c8e..12c4f44f3 100755
--- a/view/tpl/settings_features.tpl
+++ b/view/tpl/settings_features.tpl
@@ -1,31 +1,10 @@
-<script>
-	$(document).ready(function() {
-		$('#id_techlevel').change(function() { 	
-			var techlvl = $('#id_techlevel').val();
-			window.location.href='{{$baseurl}}/settings/features?f=&techlevel=' + techlvl;
-		});
-	});
-</script>
- 
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<h2>{{$title}}</h2>
 	</div>
 	<form action="settings/features" method="post" autocomplete="off">
 	<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-	{{if ! $techlock}}
-		<div class="section-content-tools-wrapper">
-		{{include file="field_select.tpl" field=$techlevel}}
-		</div>
-	{{else}}
-		<input type="hidden" name="techlevel" value="{{$techlevel.2}}" />
-	{{/if}}
 
-	{{if $hiddens}}
-		{{foreach $hiddens as $k => $v}}
-			<input type="hidden" name="feature_{{$k}}" value="{{$v}}" />
-		{{/foreach}}
-	{{/if}}
 	<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
 		{{foreach $features as $g => $f}}
 		<div class="panel">
diff --git a/view/tpl/settings_module.tpl b/view/tpl/settings_module.tpl
new file mode 100755
index 000000000..a701ec364
--- /dev/null
+++ b/view/tpl/settings_module.tpl
@@ -0,0 +1,19 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<div class="section-content-wrapper">
+		<form action="{{$action_url}}" method="post" autocomplete="off">
+			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+			{{if $rpath}}
+			<input type='hidden' name='rpath' value='{{$rpath}}'>
+			{{/if}}
+			{{foreach $features as $feature}}
+			{{include file="field_checkbox.tpl" field=$feature}}
+			{{/foreach}}
+			<div class="settings-submit-wrapper" >
+				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+			</div>
+		</form>
+	</div>
+</div>
diff --git a/view/tpl/settings_module_ajax.tpl b/view/tpl/settings_module_ajax.tpl
new file mode 100644
index 000000000..bd7b6f3df
--- /dev/null
+++ b/view/tpl/settings_module_ajax.tpl
@@ -0,0 +1,11 @@
+<form id="settings_module_ajax_form" action="{{$action_url}}" method="post" autocomplete="off">
+	<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+	<input type='hidden' name='aj' value='1'>
+	{{foreach $features as $feature}}
+	{{include file="field_checkbox.tpl" field=$feature}}
+	{{/foreach}}
+	<div class="settings-submit-wrapper" >
+		<button id="settings_module_ajax_submit" type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+	</div>
+</form>
+
diff --git a/view/tpl/settings_tokens.tpl b/view/tpl/tokens.tpl
index 48190c00c..ccb1f8c61 100644
--- a/view/tpl/settings_tokens.tpl
+++ b/view/tpl/tokens.tpl
@@ -8,7 +8,7 @@
 			{{$desc}}
 		</div>
 
-		<form action="settings/tokens" id="settings-account-form" method="post" autocomplete="off" >
+		<form action="tokens" id="settings-account-form" method="post" autocomplete="off" >
 			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 			{{if $atoken}}<input type="hidden" name="atoken_id" value="{{$atoken.atoken_id}}" />{{/if}}
 			{{include file="field_input.tpl" field=$name}}
@@ -61,8 +61,8 @@
 		<table id="atoken-index">
 			{{foreach $tokens as $t}}
 			<tr id="atoken-index-{{$t.atoken_id}}" class="atoken-index-row">
-				<td width="99%"><a href="settings/tokens/{{$t.atoken_id}}">{{$t.atoken_name}}</a></td>
-				<td width="1%" class="atoken-index-tool"><i class="fa fa-trash-o drop-icons" onClick="dropItem('/settings/tokens/{{$t.atoken_id}}/drop', '#atoken-index-{{$t.atoken_id}}')"></i></td>
+				<td width="99%"><a href="tokens/{{$t.atoken_id}}">{{$t.atoken_name}}</a></td>
+				<td width="1%" class="atoken-index-tool"><i class="fa fa-trash-o drop-icons" onClick="dropItem('tokens/{{$t.atoken_id}}/drop', '#atoken-index-{{$t.atoken_id}}')"></i></td>
 			</tr>
 			{{/foreach}}
 		</table>
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 0f725749f..2aabc7b5f 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -66,7 +66,7 @@
 			{{if $showPageControls}}
 			<div id="id_{{$commitMsg.0}}_wrapper" class="field input" style="display: none">
 				<div class="input-group">
-					<input class="form-control form-control-sm" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}>
+					<input class="form-control" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}>
 					<div class="input-group-append">
 						<button id="save-page" type="button" class="btn btn-primary disabled">Save</button>
 					</div>