Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

36 files changed, 257 insertions, 615 deletions

diff --git a/Zotlabs/Lib/System.php b/Zotlabs/Lib/System.php
index a5790fb07..c3e11eb6a 100644
--- a/Zotlabs/Lib/System.php
+++ b/Zotlabs/Lib/System.php
@@ -61,6 +61,13 @@ class System {
 		return 'pro';
 	}
 
+
+	static public function get_zot_revision() {
+		$x = [ 'revision' => ZOT_REVISION ]; 
+		call_hooks('zot_revision',$x);
+		return $x['revision'];
+	}
+
 	static public function get_std_version() {
 		if(defined('STD_VERSION'))
 			return STD_VERSION;
diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index f86801fcc..2ca9bfe50 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -770,7 +770,7 @@ class Photos extends \Zotlabs\Web\Controller {
 				if($photos) {
 					$o = replace_macros(get_markup_template('photosajax.tpl'),array(
 						'$photos' => $photos,
-						'$album_id' => bin2hex($album)
+						'$album_id' => $datum
 					));
 				}
 				else {
diff --git a/Zotlabs/Module/Post.php b/Zotlabs/Module/Post.php
index dba26075f..f67cbf020 100644
--- a/Zotlabs/Module/Post.php
+++ b/Zotlabs/Module/Post.php
@@ -24,18 +24,11 @@ class Post extends \Zotlabs\Web\Controller {
 	}
 
 	function post() {
+		if(array_key_exists('data',$_REQUEST)) {
+			$z = new \Zotlabs\Zot\Receiver($_REQUEST['data'], get_config('system', 'prvkey'), new \Zotlabs\Zot\ZotHandler());
+			exit;
+		}
 
-		
-
-
-
-
-
-
-		$z = new \Zotlabs\Zot\Receiver($_REQUEST['data'], get_config('system', 'prvkey'), new \Zotlabs\Zot\ZotHandler());
-
-		// notreached;
-		exit;
 	}
 
 }
diff --git a/Zotlabs/Web/Router.php b/Zotlabs/Web/Router.php
index b0193652b..9486130cb 100644
--- a/Zotlabs/Web/Router.php
+++ b/Zotlabs/Web/Router.php
@@ -178,24 +178,6 @@ class Router {
 		 */
 
 		if(\App::$module_loaded) {
-			if (( \App::$module === 'channel' ) && argc() > 1) {
-				\App::$channel_links = [
-					[
-						'rel' => 'lrdd',
-						'type' => 'application/xrd+xml',
-						'url' => z_root() . '/xrd?f=&uri=acct%3A' . argv(1) . '%40' . \App::get_hostname()
-					],
-					[
-						'rel' => 'jrd',
-						'type' => 'application/jrd+json',
-						'url' => z_root() . '/.well-known/webfinger?f=&resource=acct%3A' . argv(1) . '%40' . \App::get_hostname()
-					],
-				];
-				$x = [ 'channel_address' => argv(1), 'channel_links' => \App::$channel_links ]; 
-				call_hooks('channel_links', $x );
-				\App::$channel_links = $x['channel_links'];
-				header('Link: ' . \App::get_channel_links());
-			}
 
 			\App::$page['page_title'] = \App::$module;
 			$placeholder = '';
diff --git a/Zotlabs/Web/WebServer.php b/Zotlabs/Web/WebServer.php
index 8431a2e0e..65b772fee 100644
--- a/Zotlabs/Web/WebServer.php
+++ b/Zotlabs/Web/WebServer.php
@@ -107,6 +107,34 @@ class WebServer {
 
 		$Router = new Router($a);
 
+		/* Initialise the Link: response header if this is a channel page. 
+		 * This cannot be done inside the channel module because some protocol
+		 * addons over-ride the module functions and these links are common 
+		 * to all protocol drivers; thus doing it here avoids duplication.
+		 */
+
+		if (( \App::$module === 'channel' ) && argc() > 1) {
+			\App::$channel_links = [
+				[
+					'rel'  => 'lrdd',
+					'type' => 'application/xrd+xml',
+					'url'  => z_root() . '/xrd?f=&uri=acct%3A' . argv(1) . '%40' . \App::get_hostname()
+				],
+				[
+					'rel'  => 'jrd',
+					'type' => 'application/jrd+json',
+					'url'  => z_root() . '/.well-known/webfinger?f=&resource=acct%3A' . argv(1) . '%40' . \App::get_hostname()
+				],
+			];
+			$x = [ 'channel_address' => argv(1), 'channel_links' => \App::$channel_links ]; 
+			call_hooks('channel_links', $x );
+			\App::$channel_links = $x['channel_links'];
+			header('Link: ' . \App::get_channel_links());
+		}
+
+
+
+
 		/* initialise content region */
 
 		if(! x(\App::$page, 'content'))
diff --git a/boot.php b/boot.php
index df5c77e43..ce3218cd7 100755
--- a/boot.php
+++ b/boot.php
@@ -49,7 +49,7 @@ require_once('include/hubloc.php');
 require_once('include/attach.php');
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
-define ( 'STD_VERSION',             '2.7.4' );
+define ( 'STD_VERSION',             '2.7.5' );
 define ( 'ZOT_REVISION',            '1.3' );
 
 define ( 'DB_UPDATE_VERSION',       1196  );
@@ -72,8 +72,6 @@ define ( 'DIRECTORY_MODE_PRIMARY',     0x0001); // There can only be *one* prima
 define ( 'DIRECTORY_MODE_SECONDARY',   0x0002); // All other mirror directory servers
 define ( 'DIRECTORY_MODE_STANDALONE',  0x0100); // A detached (off the grid) hub with itself as directory server.
 
-define ( 'ZOT6_COMPLIANT',             0x1000);
-
 // We will look for upstream directories whenever me make contact
 // with other sites, but if this is a new installation and isn't
 // a standalone hub, we need to seed the service with a starting
@@ -923,6 +921,9 @@ class App {
 		 *
 		 * There will always be one argument. If provided a naked domain
 		 * URL, self::$argv[0] is set to "home".
+		 * 
+		 * If $argv[0] has a period in it, for example foo.json; rewrite
+		 * to module = 'foo' and set $_REQUEST['module_format'] = 'json';
 		 */
 
 		self::$argv = explode('/', self::$cmd);
diff --git a/include/zot.php b/include/zot.php
index 1a9692ae9..af7fbf8fd 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -124,7 +124,7 @@ function zot_build_packet($channel, $type = 'notify', $recipients = null, $remot
 			'sitekey' => get_config('system','pubkey')
 		],
 		'callback' => '/post',
-		'version' => ZOT_REVISION,
+		'version' => Zotlabs\Lib\System::get_zot_revision(),
 		'encryption' => crypto_methods(),
 		'signing' => signing_methods()
 	];
@@ -2894,8 +2894,9 @@ function import_site($arr, $pubkey) {
 
 	$site_flags = $site_directory;
 
-	if(array_key_exists('zot',$arr) && ((float) $arr['zot']) >= 6.0)
-		$site_flags = ($site_flags & ZOT6_COMPLIANT); 
+	if(array_key_exists('zot',$arr)) {
+		set_sconfig($arr['url'],'system','zot_version',$arr['zot']);
+	} 
 
 	if($exists) {
 		if(($siterecord['site_flags'] != $site_flags)
@@ -4183,7 +4184,7 @@ function zotinfo($arr) {
 	if($x)
 		$ret['locations'] = $x;
 
-	$ret['site'] = zot_site_info($e);
+	$ret['site'] = zot_site_info();
 
 
 	check_zotinfo($e,$x,$ret);
@@ -4195,10 +4196,10 @@ function zotinfo($arr) {
 }
 
 
-function zot_site_info($channel = null) {
+function zot_site_info() {
 
-	$signing_key = (($channel) ? $channel['channel_prvkey'] : get_config('system','prvkey'));
-	$sig_method = get_config('system','signature_algorithm','sha256');
+	$signing_key = get_config('system','prvkey');
+	$sig_method  = get_config('system','signature_algorithm','sha256');
 
 	$ret = [];
 	$ret['site'] = [];
@@ -4225,12 +4226,7 @@ function zot_site_info($channel = null) {
 
 	$ret['site']['encryption'] = crypto_methods();
 	$ret['site']['signing'] = signing_methods();
-	if(function_exists('zotvi_load')) {
-		$ret['site']['zot'] = '6.0';
-	}
-	else {
-		$ret['site']['zot'] = ZOT_REVISION;
-	}
+	$ret['site']['zot'] = Zotlabs\Lib\System::get_zot_revision();
 
 	// hide detailed site information if you're off the grid
 
diff --git a/library/jquery_ac/friendica.complete.js b/library/jquery_ac/friendica.complete.js
index 73a6e91d5..3012a754b 100644
--- a/library/jquery_ac/friendica.complete.js
+++ b/library/jquery_ac/friendica.complete.js
@@ -243,7 +243,7 @@
       } else if (!this.isBadQuery(q)) {

         me = this;

         me.options.params.query = q;

-		$('#nav-search-spinner').spin('tiny');

+		$('#nav-search-spinner').show();

         $.get(this.serviceUrl, me.options.params, function(txt) { me.processResponse(txt); }, 'text');

       }

     },

@@ -306,7 +306,7 @@
         this.data = response.data;

         this.suggest(); 

       }

-	  $('#nav-search-spinner').spin(false);

+	  $('#nav-search-spinner').hide();

     },

 

     activate: function(index) {

diff --git a/view/css/conversation.css b/view/css/conversation.css
index a5a847676..d2736acaa 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -68,10 +68,6 @@
 	border-top: 1px solid #ccc;
 }
 
-#profile-rotator {
-	padding: 15px 0px 0px 15px;
-}
-
 /* conversation */
 
 
@@ -141,11 +137,6 @@ a.wall-item-name-link {
 	cursor: pointer;
 }
 
-.like-rotator {
-	float: right;
-	margin: 16px;
-}
-
 .item-select {
 	opacity: 0.1;
 	filter:alpha(opacity=10);
diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css
index 8072b4668..bcc7a8f94 100644
--- a/view/css/mod_mail.css
+++ b/view/css/mod_mail.css
@@ -1,3 +1,7 @@
 .mail-conv-body img {
 	max-width: 100%;
 }
+
+.prvmail-rotator-wrapper {
+	margin: 1rem;
+}
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 1a507a28c..08cf97173 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -5,7 +5,7 @@
  */
 function contact_search(term, callback, backend_url, type, extra_channels, spinelement) {
 	if(spinelement) {
-		$(spinelement).spin('tiny');
+		$(spinelement).show();
 	}
 	// Check if there is a cached result that contains the same information we would get with a full server-side search
 	var bt = backend_url+type;
@@ -14,7 +14,7 @@ function contact_search(term, callback, backend_url, type, extra_channels, spine
 	var lterm = term.toLowerCase(); // Ignore case
 	for(var t in contact_search.cache[bt]) {
 		if(lterm.indexOf(t) >= 0) { // A more broad search has been performed already, so use those results
-			$(spinelement).spin(false);
+			$(spinelement).hide();
 			// Filter old results locally
 			var matching = contact_search.cache[bt][t].filter(function (x) { return (x.name.toLowerCase().indexOf(lterm) >= 0 || (typeof x.nick !== 'undefined' && x.nick.toLowerCase().indexOf(lterm) >= 0)); }); // Need to check that nick exists because groups don't have one
 			matching.unshift({taggable:false, text: term, replace: term});
@@ -47,7 +47,7 @@ function contact_search(term, callback, backend_url, type, extra_channels, spine
 			var items = data.items.slice(0);
 			items.unshift({taggable:false, text: term, replace: term});
 			callback(items);
-			$(spinelement).spin(false);
+			$(spinelement).hide();
 		},
 	}).fail(function () {callback([]); }); // Callback must be invoked even if something went wrong.
 }
diff --git a/view/js/jquery.spin.js b/view/js/jquery.spin.js
deleted file mode 100644
index 6b4fd656f..000000000
--- a/view/js/jquery.spin.js
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Copyright (c) 2011-2014 Felix Gnass
- * Licensed under the MIT license
- * http://spin.js.org/
- */
-
-/*
-
-Basic Usage:
-============
-
-$('#el').spin() // Creates a default Spinner using the text color of #el.
-$('#el').spin({ ... }) // Creates a Spinner using the provided options.
-
-$('#el').spin(false) // Stops and removes the spinner.
-
-Using Presets:
-==============
-
-$('#el').spin('small') // Creates a 'small' Spinner using the text color of #el.
-$('#el').spin('large', '#fff') // Creates a 'large' white Spinner.
-
-Adding a custom preset:
-=======================
-
-$.fn.spin.presets.flower = {
-  lines:   9
-, length: 10
-, width:  20
-, radius:  0
-}
-
-$('#el').spin('flower', 'red')
-
-*/
-
-;(function(factory) {
-
-  if (typeof exports == 'object') {
-    // CommonJS
-    factory(require('jquery'), require('spin.js'))
-  } else if (typeof define == 'function' && define.amd) {
-    // AMD, register as anonymous module
-    define(['jquery', 'spin'], factory)
-  } else {
-    // Browser globals
-    if (!window.Spinner) throw new Error('Spin.js not present')
-    factory(window.jQuery, window.Spinner)
-  }
-
-}(function($, Spinner) {
-
-  $.fn.spin = function(opts, color) {
-
-    return this.each(function() {
-      var $this = $(this)
-        , data = $this.data()
-
-      if (data.spinner) {
-        data.spinner.stop()
-        delete data.spinner
-      }
-      if (opts !== false) {
-        opts = $.extend(
-          { color: color || $this.css('color') }
-        , $.fn.spin.presets[opts] || opts
-        )
-        data.spinner = new Spinner(opts).spin(this)
-      }
-    })
-  }
-
-  $.fn.spin.presets = {
-    tiny:  { lines:  8, length: 2, width: 2, radius: 3, position: 'relative' }
-  , small: { lines:  8, length: 4, width: 3, radius: 5, position: 'relative' }
-  , large: { lines: 10, length: 8, width: 4, radius: 8, position: 'relative' }
-  }
-
-}));
diff --git a/view/js/main.js b/view/js/main.js
index 919eb282a..73b2f3616 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -414,7 +414,7 @@ $(function() {
 
 function NavUpdate() {
 	if(liking)
-		$('.like-rotator').spin(false);
+		$('.like-rotator').hide();
 
 	if((! stopped) && (! mediaPlaying)) {
 		var pingCmd = 'ping' + ((localUser != 0) ? '?f=&uid=' + localUser : '');
@@ -657,7 +657,7 @@ function updateConvItems(mode,data) {
 
 	// reset rotators and cursors we may have set before reaching this place
 
-	$('.like-rotator').spin(false);
+	$('.like-rotator').hide();
 
 	if(commentBusy) {
 		commentBusy = false;
@@ -781,7 +781,7 @@ function collapseHeight() {
 
 function liveUpdate() {
 	if(typeof profile_uid === 'undefined') profile_uid = false; /* Should probably be unified with channelId defined in head.tpl */
-	if((src === null) || (stopped) || (! profile_uid)) { $('.like-rotator').spin(false); return; }
+	if((src === null) || (stopped) || (! profile_uid)) { $('.like-rotator').hide(); return; }
 	if(($('.comment-edit-text.expanded').length) || (in_progress)) {
 		if(livetime) {
 			clearTimeout(livetime);
@@ -810,7 +810,7 @@ function liveUpdate() {
 	update_url = buildCmd();
 
 	if(page_load) {
-		$("#page-spinner").spin('small');
+		$("#page-spinner").show();
 		if(bParam_page == 1)
 			update_mode = 'replace';
 		else
@@ -859,8 +859,8 @@ function liveUpdate() {
 				page_load = false;
 				scroll_next = false;
 				updateConvItems(update_mode,data);
-				$("#page-spinner").spin(false);
-				$("#profile-jot-text-loading").spin(false);
+				$("#page-spinner").hide();
+				$("#profile-jot-text-loading").hide();
 
 				// adjust scroll position if new content was added above viewport
 				if(update_mode === 'update') {
@@ -889,8 +889,8 @@ function liveUpdate() {
 			page_load = false;
 			scroll_next = false;
 			updateConvItems(update_mode,data);
-			$("#page-spinner").spin(false);
-			$("#profile-jot-text-loading").spin(false);
+			$("#page-spinner").hide();
+			$("#profile-jot-text-loading").hide();
 
 			in_progress = false;
 
@@ -930,14 +930,14 @@ function pageUpdate() {
 
 	update_url = baseurl + '/' + page_query + '/?f=&aj=1&page=' + bParam_page + extra_args ;
 
-	$("#page-spinner").spin('small');
+	$("#page-spinner").show();
 	update_mode = 'append';
 
 	$.get(update_url,function(data) {
 		page_load = false;
 		scroll_next = false;
 		updatePageItems(update_mode,data);
-		$("#page-spinner").spin(false);
+		$("#page-spinner").hide();
 		$(".autotime").timeago();
 		in_progress = false;
 	});
@@ -945,6 +945,7 @@ function pageUpdate() {
 
 function justifyPhotos(id) {
 	justifiedGalleryActive = true;
+	$('#' + id).show();
 	$('#' + id).justifiedGallery({
 		selector: 'a, div:not(.spinner, #page-end)',
 		margins: 3,
@@ -1014,7 +1015,7 @@ function notify_popup_loader(notifyType) {
 
 function dolike(ident, verb) {
 	unpause();
-	$('#like-rotator-' + ident.toString()).spin('tiny');
+	$('#like-rotator-' + ident.toString()).show();
 	$.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
 	liking = 1;
 }
@@ -1044,7 +1045,7 @@ function dropItem(url, object) {
 
 function dosubthread(ident) {
 	unpause();
-	$('#like-rotator-' + ident.toString()).spin('tiny');
+	$('#like-rotator-' + ident.toString()).show();
 	$.get('subthread/sub/' + ident.toString(), NavUpdate );
 	liking = 1;
 }
@@ -1052,7 +1053,7 @@ function dosubthread(ident) {
 
 function dounsubthread(ident) {
 	unpause();
-	$('#like-rotator-' + ident.toString()).spin('tiny');
+	$('#like-rotator-' + ident.toString()).show();
 	$.get('subthread/unsub/' + ident.toString(), NavUpdate );
 	liking = 1;
 }
@@ -1061,7 +1062,7 @@ function dounsubthread(ident) {
 
 function dostar(ident) {
 	ident = ident.toString();
-	$('#like-rotator-' + ident).spin('tiny');
+	$('#like-rotator-' + ident).show();
 	$.get('starred/' + ident, function(data) {
 		if(data.result == 1) {
 			$('#starred-' + ident).addClass('starred');
@@ -1079,7 +1080,7 @@ function dostar(ident) {
 			$('#star-' + ident).removeClass('hidden');
 			$('#unstar-' + ident).addClass('hidden');
 		}
-		$('#like-rotator-' + ident).spin(false);
+		$('#like-rotator-' + ident).hide();
 	});
 }
 
@@ -1113,11 +1114,11 @@ function lockview(type, id) {
 function filestorage(event, nick, id) {
 	$('#cloud-index-' + last_filestorage_id).removeClass('cloud-index-active');
 	$('#perms-panel-' + last_filestorage_id).hide().html('');
-	$('#file-edit-' + id).spin('tiny');
+	$('#file-edit-' + id).show();
 	$.get('filestorage/' + nick + '/' + id + '/edit', function(data) {
 		$('#cloud-index-' + id).addClass('cloud-index-active');
 		$('#perms-panel-' + id).html(data).show();
-		$('#file-edit-' + id).spin(false);
+		$('#file-edit-' + id).hide();
 		last_filestorage_id = id;
 	});
 }
diff --git a/view/js/spin.js b/view/js/spin.js
deleted file mode 100644
index 145ce1baf..000000000
--- a/view/js/spin.js
+++ /dev/null
@@ -1,377 +0,0 @@
-/**
- * Copyright (c) 2011-2014 Felix Gnass
- * Licensed under the MIT license
- * http://spin.js.org/
- *
- * Example:
-    var opts = {
-      lines: 12,            // The number of lines to draw
-    , length: 7,            // The length of each line
-    , width: 5,             // The line thickness
-    , radius: 10            // The radius of the inner circle
-    , scale: 1.0            // Scales overall size of the spinner
-    , corners: 1            // Roundness (0..1)
-    , color: '#000'         // #rgb or #rrggbb
-    , opacity: 1/4          // Opacity of the lines
-    , rotate: 0             // Rotation offset
-    , direction: 1          // 1: clockwise, -1: counterclockwise
-    , speed: 1              // Rounds per second
-    , trail: 100            // Afterglow percentage
-    , fps: 20               // Frames per second when using setTimeout()
-    , zIndex: 2e9           // Use a high z-index by default
-    , className: 'spinner'  // CSS class to assign to the element
-    , top: '50%'            // center vertically
-    , left: '50%'           // center horizontally
-    , shadow: false         // Whether to render a shadow
-    , hwaccel: false        // Whether to use hardware acceleration (might be buggy)
-    , position: 'absolute'  // Element positioning
-    }
-    var target = document.getElementById('foo')
-    var spinner = new Spinner(opts).spin(target)
- */
-;(function (root, factory) {
-
-  /* CommonJS */
-  if (typeof exports == 'object') module.exports = factory()
-
-  /* AMD module */
-  else if (typeof define == 'function' && define.amd) define(factory)
-
-  /* Browser global */
-  else root.Spinner = factory()
-}(this, function () {
-  "use strict"
-
-  var prefixes = ['webkit', 'Moz', 'ms', 'O'] /* Vendor prefixes */
-    , animations = {} /* Animation rules keyed by their name */
-    , useCssAnimations /* Whether to use CSS animations or setTimeout */
-    , sheet /* A stylesheet to hold the @keyframe or VML rules. */
-
-  /**
-   * Utility function to create elements. If no tag name is given,
-   * a DIV is created. Optionally properties can be passed.
-   */
-  function createEl (tag, prop) {
-    var el = document.createElement(tag || 'div')
-      , n
-
-    for (n in prop) el[n] = prop[n]
-    return el
-  }
-
-  /**
-   * Appends children and returns the parent.
-   */
-  function ins (parent /* child1, child2, ...*/) {
-    for (var i = 1, n = arguments.length; i < n; i++) {
-      parent.appendChild(arguments[i])
-    }
-
-    return parent
-  }
-
-  /**
-   * Creates an opacity keyframe animation rule and returns its name.
-   * Since most mobile Webkits have timing issues with animation-delay,
-   * we create separate rules for each line/segment.
-   */
-  function addAnimation (alpha, trail, i, lines) {
-    var name = ['opacity', trail, ~~(alpha * 100), i, lines].join('-')
-      , start = 0.01 + i/lines * 100
-      , z = Math.max(1 - (1-alpha) / trail * (100-start), alpha)
-      , prefix = useCssAnimations.substring(0, useCssAnimations.indexOf('Animation')).toLowerCase()
-      , pre = prefix && '-' + prefix + '-' || ''
-
-    if (!animations[name]) {
-      sheet.insertRule(
-        '@' + pre + 'keyframes ' + name + '{' +
-        '0%{opacity:' + z + '}' +
-        start + '%{opacity:' + alpha + '}' +
-        (start+0.01) + '%{opacity:1}' +
-        (start+trail) % 100 + '%{opacity:' + alpha + '}' +
-        '100%{opacity:' + z + '}' +
-        '}', sheet.cssRules.length)
-
-      animations[name] = 1
-    }
-
-    return name
-  }
-
-  /**
-   * Tries various vendor prefixes and returns the first supported property.
-   */
-  function vendor (el, prop) {
-    var s = el.style
-      , pp
-      , i
-
-    prop = prop.charAt(0).toUpperCase() + prop.slice(1)
-    if (s[prop] !== undefined) return prop
-    for (i = 0; i < prefixes.length; i++) {
-      pp = prefixes[i]+prop
-      if (s[pp] !== undefined) return pp
-    }
-  }
-
-  /**
-   * Sets multiple style properties at once.
-   */
-  function css (el, prop) {
-    for (var n in prop) {
-      el.style[vendor(el, n) || n] = prop[n]
-    }
-
-    return el
-  }
-
-  /**
-   * Fills in default values.
-   */
-  function merge (obj) {
-    for (var i = 1; i < arguments.length; i++) {
-      var def = arguments[i]
-      for (var n in def) {
-        if (obj[n] === undefined) obj[n] = def[n]
-      }
-    }
-    return obj
-  }
-
-  /**
-   * Returns the line color from the given string or array.
-   */
-  function getColor (color, idx) {
-    return typeof color == 'string' ? color : color[idx % color.length]
-  }
-
-  // Built-in defaults
-
-  var defaults = {
-    lines: 12             // The number of lines to draw
-  , length: 7             // The length of each line
-  , width: 5              // The line thickness
-  , radius: 10            // The radius of the inner circle
-  , scale: 1.0            // Scales overall size of the spinner
-  , corners: 1            // Roundness (0..1)
-  , color: '#000'         // #rgb or #rrggbb
-  , opacity: 1/4          // Opacity of the lines
-  , rotate: 0             // Rotation offset
-  , direction: 1          // 1: clockwise, -1: counterclockwise
-  , speed: 1              // Rounds per second
-  , trail: 100            // Afterglow percentage
-  , fps: 20               // Frames per second when using setTimeout()
-  , zIndex: 2e9           // Use a high z-index by default
-  , className: 'spinner'  // CSS class to assign to the element
-  , top: '50%'            // center vertically
-  , left: '50%'           // center horizontally
-  , shadow: false         // Whether to render a shadow
-  , hwaccel: false        // Whether to use hardware acceleration (might be buggy)
-  , position: 'absolute'  // Element positioning
-  }
-
-  /** The constructor */
-  function Spinner (o) {
-    this.opts = merge(o || {}, Spinner.defaults, defaults)
-  }
-
-  // Global defaults that override the built-ins:
-  Spinner.defaults = {}
-
-  merge(Spinner.prototype, {
-    /**
-     * Adds the spinner to the given target element. If this instance is already
-     * spinning, it is automatically removed from its previous target b calling
-     * stop() internally.
-     */
-    spin: function (target) {
-      this.stop()
-
-      var self = this
-        , o = self.opts
-        , el = self.el = createEl(null, {className: o.className})
-
-      css(el, {
-        position: o.position
-      , width: 0
-      , zIndex: o.zIndex
-      , left: o.left
-      , top: o.top
-      })
-
-      if (target) {
-        target.insertBefore(el, target.firstChild || null)
-      }
-
-      el.setAttribute('role', 'progressbar')
-      self.lines(el, self.opts)
-
-      if (!useCssAnimations) {
-        // No CSS animation support, use setTimeout() instead
-        var i = 0
-          , start = (o.lines - 1) * (1 - o.direction) / 2
-          , alpha
-          , fps = o.fps
-          , f = fps / o.speed
-          , ostep = (1 - o.opacity) / (f * o.trail / 100)
-          , astep = f / o.lines
-
-        ;(function anim () {
-          i++
-          for (var j = 0; j < o.lines; j++) {
-            alpha = Math.max(1 - (i + (o.lines - j) * astep) % f * ostep, o.opacity)
-
-            self.opacity(el, j * o.direction + start, alpha, o)
-          }
-          self.timeout = self.el && setTimeout(anim, ~~(1000 / fps))
-        })()
-      }
-      return self
-    }
-
-    /**
-     * Stops and removes the Spinner.
-     */
-  , stop: function () {
-      var el = this.el
-      if (el) {
-        clearTimeout(this.timeout)
-        if (el.parentNode) el.parentNode.removeChild(el)
-        this.el = undefined
-      }
-      return this
-    }
-
-    /**
-     * Internal method that draws the individual lines. Will be overwritten
-     * in VML fallback mode below.
-     */
-  , lines: function (el, o) {
-      var i = 0
-        , start = (o.lines - 1) * (1 - o.direction) / 2
-        , seg
-
-      function fill (color, shadow) {
-        return css(createEl(), {
-          position: 'absolute'
-        , width: o.scale * (o.length + o.width) + 'px'
-        , height: o.scale * o.width + 'px'
-        , background: color
-        , boxShadow: shadow
-        , transformOrigin: 'left'
-        , transform: 'rotate(' + ~~(360/o.lines*i + o.rotate) + 'deg) translate(' + o.scale*o.radius + 'px' + ',0)'
-        , borderRadius: (o.corners * o.scale * o.width >> 1) + 'px'
-        })
-      }
-
-      for (; i < o.lines; i++) {
-        seg = css(createEl(), {
-          position: 'absolute'
-        , top: 1 + ~(o.scale * o.width / 2) + 'px'
-        , transform: o.hwaccel ? 'translate3d(0,0,0)' : ''
-        , opacity: o.opacity
-        , animation: useCssAnimations && addAnimation(o.opacity, o.trail, start + i * o.direction, o.lines) + ' ' + 1 / o.speed + 's linear infinite'
-        })
-
-        if (o.shadow) ins(seg, css(fill('#000', '0 0 4px #000'), {top: '2px'}))
-        ins(el, ins(seg, fill(getColor(o.color, i), '0 0 1px rgba(0,0,0,.1)')))
-      }
-      return el
-    }
-
-    /**
-     * Internal method that adjusts the opacity of a single line.
-     * Will be overwritten in VML fallback mode below.
-     */
-  , opacity: function (el, i, val) {
-      if (i < el.childNodes.length) el.childNodes[i].style.opacity = val
-    }
-
-  })
-
-
-  function initVML () {
-
-    /* Utility function to create a VML tag */
-    function vml (tag, attr) {
-      return createEl('<' + tag + ' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">', attr)
-    }
-
-    // No CSS transforms but VML support, add a CSS rule for VML elements:
-    sheet.addRule('.spin-vml', 'behavior:url(#default#VML)')
-
-    Spinner.prototype.lines = function (el, o) {
-      var r = o.scale * (o.length + o.width)
-        , s = o.scale * 2 * r
-
-      function grp () {
-        return css(
-          vml('group', {
-            coordsize: s + ' ' + s
-          , coordorigin: -r + ' ' + -r
-          })
-        , { width: s, height: s }
-        )
-      }
-
-      var margin = -(o.width + o.length) * o.scale * 2 + 'px'
-        , g = css(grp(), {position: 'absolute', top: margin, left: margin})
-        , i
-
-      function seg (i, dx, filter) {
-        ins(
-          g
-        , ins(
-            css(grp(), {rotation: 360 / o.lines * i + 'deg', left: ~~dx})
-          , ins(
-              css(
-                vml('roundrect', {arcsize: o.corners})
-              , { width: r
-                , height: o.scale * o.width
-                , left: o.scale * o.radius
-                , top: -o.scale * o.width >> 1
-                , filter: filter
-                }
-              )
-            , vml('fill', {color: getColor(o.color, i), opacity: o.opacity})
-            , vml('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change
-            )
-          )
-        )
-      }
-
-      if (o.shadow)
-        for (i = 1; i <= o.lines; i++) {
-          seg(i, -2, 'progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)')
-        }
-
-      for (i = 1; i <= o.lines; i++) seg(i)
-      return ins(el, g)
-    }
-
-    Spinner.prototype.opacity = function (el, i, val, o) {
-      var c = el.firstChild
-      o = o.shadow && o.lines || 0
-      if (c && i + o < c.childNodes.length) {
-        c = c.childNodes[i + o]; c = c && c.firstChild; c = c && c.firstChild
-        if (c) c.opacity = val
-      }
-    }
-  }
-
-  if (typeof document !== 'undefined') {
-    sheet = (function () {
-      var el = createEl('style', {type : 'text/css'})
-      ins(document.getElementsByTagName('head')[0], el)
-      return el.sheet || el.styleSheet
-    }())
-
-    var probe = css(createEl('group'), {behavior: 'url(#default#VML)'})
-
-    if (!vendor(probe, 'transform') && probe.adj) initVML()
-    else useCssAnimations = vendor(probe, 'animation')
-  }
-
-  return Spinner
-
-}));
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index a420323ac..1e066c570 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -15,8 +15,6 @@ head_add_js('jquery.js');
 head_add_js('/library/justifiedGallery/jquery.justifiedGallery.min.js');
 head_add_js('/library/sprintf.js/dist/sprintf.min.js');
 
-head_add_js('spin.js');
-head_add_js('jquery.spin.js');
 head_add_js('jquery.textinputs.js');
 head_add_js('autocomplete.js');
 head_add_js('/library/jquery-textcomplete/jquery.textcomplete.js');
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 3e457c621..de6f8dac1 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -7,6 +7,7 @@
 
 
 /* generals */
+
 html {
 	font-size: $font_size;
 }
@@ -228,6 +229,81 @@ nav {
 
 /* contextual help end */
 
+/* spinner */
+
+.spinner-wrapper {
+	display: none;
+}
+
+.spinner.s {
+	height: 1rem;
+	width: 1rem;
+}
+
+.spinner.m {
+	height: 2rem;
+	width: 2rem;
+}
+
+.spinner.l {
+	height: 3rem;
+	width: 3rem;
+}
+
+.spinner.s,
+.spinner.m,
+.spinner.l {
+	margin: 0 auto;
+	position: relative;
+	-webkit-animation: rotation 1s infinite linear;
+	-moz-animation: rotation 1s infinite linear;
+	-o-animation: rotation 1s infinite linear;
+	animation: rotation 1s infinite linear;
+	border-left: .2rem solid rgba(77, 77, 77, .15);
+	border-right: .2rem solid rgba(77, 77, 77, .15);
+	border-bottom: .2rem solid rgba(77, 77, 77, .15);
+	border-top: .2rem solid rgba(77, 77, 77, .5);
+	border-radius: 100%;
+}
+
+@-webkit-keyframes rotation {
+	from {
+		-webkit-transform: rotate(0deg);
+	}
+	to {
+		-webkit-transform: rotate(359deg);
+	}
+}
+
+@-moz-keyframes rotation {
+	from {
+		-moz-transform: rotate(0deg);
+	}
+	to {
+		-moz-transform: rotate(359deg);
+	}
+}
+
+@-o-keyframes rotation {
+	from {
+		-o-transform: rotate(0deg);
+	}
+	to {
+		-o-transform: rotate(359deg);
+	}
+}
+
+@keyframes rotation {
+	from {
+		transform: rotate(0deg);
+	}
+	to {
+		transform: rotate(359deg);
+	}
+}
+
+/* spinner end */
+
 /* footer */
 
 footer {
@@ -478,8 +554,8 @@ footer {
 
 #nav-search-spinner {
 	float: right;
-	margin-top: -0.85rem;
-	margin-right: 1.6rem;
+	margin-top: -1.4rem;
+	margin-right: 1rem;
 }
 
 
@@ -721,11 +797,6 @@ div.jGrowl div.jGrowl-notification {
 	display: block;
 }
 
-#page-spinner {
-	color: #777;
-	margin: 24px;
-}
-
 #acl-search::-webkit-input-placeholder {
 	/* non-fontawesome fonts set a fallback for text parts of the placeholder*/
 	font-family: FontAwesome, sans-serif, arial, freesans;
@@ -973,10 +1044,6 @@ img.mail-conv-sender-photo {
 	display: none;
 }
 
-#profile-rotator {
-	color: #777;
-}
-
 .jot-icons.jot-lock-warn {
 	color: darkorange;
 }
@@ -1194,7 +1261,8 @@ img.mail-conv-sender-photo {
 .generic-content-wrapper {
 	border: 1px solid #ccc;
 	box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.2);
-	border-radius:  $radius;
+	border-radius: $radius;
+	margin-bottom: 1.5rem;
 }
 
 .section-title-wrapper {
diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl
index fd5ae7d5e..adc0db434 100755
--- a/view/tpl/admin_plugins.tpl
+++ b/view/tpl/admin_plugins.tpl
@@ -41,8 +41,8 @@
 		{{$form}}
     </div>
       <div class="clear"></div>
-    <div id="chat-rotator-wrapper" class="center-block">
-        <div id="chat-rotator"></div>
+    <div id="chat-rotator" class="spinner-wrapper">
+        <div class="spinner s"></div>
     </div>
     <div class="clear"></div>
 	<div class="section-content-wrapper-np">
@@ -75,11 +75,11 @@
       $("#generic-modal-ok-{{$newRepoModalID}}").addClass('btn-primary');
       var repoURL = $('#id_repoURL').val();
       var repoName = $('#id_repoName').val();
-      $('#chat-rotator').spin('tiny');
+      $('#chat-rotator').show();
       $.post(
         "/admin/plugins/addrepo", {repoURL: repoURL, repoName: repoName}, 
             function(response) {
-                $('#chat-rotator').spin(false);
+                $('#chat-rotator').hide();
                 if (response.success) {
                   var modalBody = $('#generic-modal-body-{{$newRepoModalID}}');
                   modalBody.html('<div>'+response.repo.readme+'</div>');
@@ -187,4 +187,4 @@
     }
   }  
   
-</script>
\ No newline at end of file
+</script>
diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl
index 5d683d751..b0245e853 100644
--- a/view/tpl/cdav_calendar.tpl
+++ b/view/tpl/cdav_calendar.tpl
@@ -129,11 +129,11 @@ $(document).ready(function() {
 		},
 
 		loading: function(isLoading, view) {
-			$('#events-spinner').spin('tiny');
-			$('#events-spinner > i').css('color', 'transparent');
+			$('#events-spinner').show();
+			$('#today-btn > i').hide();
 			if(!isLoading) {
-				$('#events-spinner').spin(false);
-				$('#events-spinner > i').css('color', '');
+				$('#events-spinner').hide();
+				$('#today-btn > i').show();
 			}
 		}
 	});
@@ -292,7 +292,7 @@ function on_more() {
 				</div>
 				<div class="btn-group">
 					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
-					<button id="events-spinner" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
+					<button id="today-btn" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><div id="events-spinner" class="spinner s"></div><i class="fa fa-bullseye" style="display: none; width: 1rem;"></i></button>
 					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
 				</div>
 				<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index 22f3465bf..c189cbd15 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -16,6 +16,9 @@
 	</div>
 	<div id="chatContainer" class="section-content-wrapper">
 		<div id="chatTopBar">
+			<div id="chat-top-spinner" class="spinner-wrapper">
+				<div class="spinner m"></div>
+			</div>
 			<div id="chatLineHolder"></div>
 		</div>
 		<div class="clear"></div>
@@ -25,7 +28,7 @@
 				<div class="form-group">
 					<textarea id="chatText" name="chat_text" class="form-control"></textarea>
 				</div>
-				<div id="chat-submit-wrapper">
+				<div id="chat-submit-wrapper" class="clearfix">
 					<div id="chat-submit" class="dropup pull-right">
 						<button class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-toggle="dropdown"><i class="fa fa-cog"></i></button>
 						<button class="btn btn-primary btn-sm" type="submit" id="chat-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
@@ -42,7 +45,7 @@
 							{{/if}}
 						</div>
 					</div>
-					<div id="chat-tools" class="btn-toolbar pull-left">
+					<div id="chat-tools" class="btn-toolbar">
 						<div class="btn-group mr-2">
 							<button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'chatText'); return false;">
 								<i class="fa fa-bold jot-icons"></i>
@@ -84,11 +87,12 @@
 								{{/if}}
 							</div>
 						</div>
+						<div class="btn-group">
+							<div id="chat-rotator" class="mt-2 spinner-wrapper">
+								<div class="spinner s"></div>
+							</div>
+						</div>
 					</div>
-					<div id="chat-rotator-wrapper" class="pull-left">
-						<div id="chat-rotator"></div>
-					</div>
-					<div class="clear"></div>
 				</div>
 			</form>
 		</div>
@@ -101,7 +105,7 @@ var last_chat = 0;
 var chat_timer = null;
 
 $(document).ready(function() {
-	$('#chatTopBar').spin('small');
+	$('#chat-top-spinner').show();
 	chat_timer = setTimeout(load_chats,300);
 	$('#chatroom_bookmarks, #vcard').hide();
 	$('#chatroom_list, #chatroom_members').show();
@@ -134,7 +138,7 @@ function load_chats() {
 		if(data.success && (! stopped)) {
 			update_inroom(data.inroom);
 			update_chats(data.chats);
-			$('#chatTopBar').spin(false);
+			$('#chat-top-spinner').hide();
 		}
 	});
 	
@@ -293,10 +297,10 @@ function toggleChatNotifications() {
 function chatJotGetLink() {
 	reply = prompt("{{$linkurl}}");
 	if(reply && reply.length) {
-		$('#chat-rotator').spin('tiny');
+		$('#chat-rotator').show();
 		$.get('linkinfo?f=&url=' + reply, function(data) {
 			addmailtext(data);
-			$('#chat-rotator').spin(false);
+			$('#chat-rotator').hide();
 		});
 	}
 }
diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl
index 13261965a..3b152ef5e 100755
--- a/view/tpl/connections.tpl
+++ b/view/tpl/connections.tpl
@@ -33,4 +33,6 @@
 	</div>
 </div>
 <script>$(document).ready(function() { loadingPage = false;});</script>
-<div id="page-spinner"></div>
+<div id="page-spinner" class="spinner-wrapper">
+	<div class="spinner m"></div>
+</div>
diff --git a/view/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl
index 1f0e00db4..8aa865076 100755
--- a/view/tpl/conv_frame.tpl
+++ b/view/tpl/conv_frame.tpl
@@ -1,6 +1,8 @@
 <div id="threads-begin"></div>
 <div id="threads-end"></div>
 <div id="conversation-end"></div>
-<div id="page-spinner"></div>
+<div id="page-spinner" class="spinner-wrapper">
+	<div  class="spinner m"></div>
+</div>
 
 
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index b3fe60750..b0e1cb6fb 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -4,7 +4,7 @@
 </div>
 <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
 {{/if}}
-	<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} mb-4 generic-content-wrapper h-entry {{else}} u-comment h-cite {{/if}} item_{{$item.submid}}">
+	<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper h-entry {{else}} u-comment h-cite {{/if}} item_{{$item.submid}}">
 		<a name="item_{{$item.id}}" ></a>
 		<div class="wall-item-outside-wrapper{{if $item.is_comment}} comment{{/if}}{{if $item.previewing}} preview{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 			<div class="clearfix wall-item-content-wrapper{{if $item.is_comment}} comment{{/if}}" id="wall-item-content-wrapper-{{$item.id}}">
@@ -86,6 +86,11 @@
 				{{/if}}
 				<div class="p-2 clearfix wall-item-tools">
 					<div class="float-right wall-item-tools-right">
+						<div class="btn-group">
+							<div id="like-rotator-{{$item.id}}" class="spinner-wrapper">
+								<div class="spinner s"></div>
+							</div>
+						</div>
 						{{if $item.toplevel && $item.emojis && $item.reactions}}
 						<div class="btn-group">
 							<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-react-{{$item.id}}">
@@ -195,7 +200,6 @@
 							</div>
 						</div>
 					</div>
-					<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
 
 					{{if $item.responses || $item.attachments}}
 					<div class="wall-item-tools-left{{if ($item.responses.count > 1) || ($item.responses.count &&  $item.attachments)}} btn-group{{/if}}">
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index e599f84b5..97fd50d01 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -4,7 +4,7 @@
 </div>
 <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
 {{/if}}
-	<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} mb-4 generic-content-wrapper h-entry {{else}} u-comment h-cite {{/if}} item_{{$item.submid}}">
+	<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper h-entry {{else}} u-comment h-cite {{/if}} item_{{$item.submid}}">
 		<a name="item_{{$item.id}}" ></a>
 		<div class="wall-item-outside-wrapper{{if $item.is_comment}} comment{{/if}}{{if $item.previewing}} preview{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 			<div class="clearfix wall-item-content-wrapper{{if $item.is_comment}} comment{{/if}}" id="wall-item-content-wrapper-{{$item.id}}">
diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl
index 71e991f3a..3ee9ee326 100755
--- a/view/tpl/directory_header.tpl
+++ b/view/tpl/directory_header.tpl
@@ -19,4 +19,6 @@
 	<div id="page-end"></div>
 </div>
 <script>$(document).ready(function() { loadingPage = false;});</script>
-<div id="page-spinner"></div>
+<div id="page-spinner" class="spinner-wrapper">
+	<div class="spinner m"></div>
+</div>
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 3b2cb5041..2f440e826 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -67,11 +67,11 @@
 				showEvent(calEvent.id);
 			},
 			loading: function(isLoading, view) {
-				$('#events-spinner').spin('tiny');
-				$('#events-spinner > i').css('color', 'transparent');
+				$('#events-spinner').show();
+				$('#today-btn > i').hide();
 				if(!isLoading) {
-					$('#events-spinner').spin(false);
-					$('#events-spinner > i').css('color', '');
+					$('#events-spinner').hide();
+					$('#today-btn > i').show();
 					$('td.fc-day').dblclick(function() {
 						openMenu('form');
 						//window.location.href='/events/new?start='+$(this).data('date');
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index 9d32c76be..d3f3414ff 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -11,7 +11,7 @@
 				<button class="btn btn-success btn-sm" onclick="openClose('form');">{{$new_event.1}}</button>
 				<div class="btn-group">
 					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
-					<button id="events-spinner" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
+					<button id="today-btn" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><div id="events-spinner" class="spinner s"></div><i class="fa fa-bullseye" style="display: none; width: 1rem;"></i></button>
 					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
 				</div>
 				<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
diff --git a/view/tpl/events_cal-js.tpl b/view/tpl/events_cal-js.tpl
index ba9e16dd6..2c4d961f9 100755
--- a/view/tpl/events_cal-js.tpl
+++ b/view/tpl/events_cal-js.tpl
@@ -4,7 +4,7 @@
 		<div class="pull-right">
 			<div class="btn-group">
 				<button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
-				<button id="events-spinner" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
+					<button id="today-btn" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><div id="events-spinner" class="spinner s"></div><i class="fa fa-bullseye" style="display: none; width: 1rem;"></i></button>
 				<button class="btn btn-outline-secondary btn-sm" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
 			</div>
 			<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 2d37b3ca2..2f9dd9f15 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -6,10 +6,10 @@ var pretext = '{{$pretext}}';
 
 function initEditor(cb){
 	if (editor==false){
-		$("#profile-jot-text-loading").spin('small').show();
+		$("#profile-jot-text-loading").show();
 		{{$geotag}}
 		if(plaintext == 'none') {
-			$("#profile-jot-text-loading").spin(false).hide();
+			$("#profile-jot-text-loading").hide();
 			$("#profile-jot-text").css({ 'height': 200 });
 			{{if $bbco_autocomplete}}
 			$("#profile-jot-text").bbco_autocomplete('{{$bbco_autocomplete}}'); // autocomplete bbcode
@@ -80,7 +80,7 @@ function initEditor(cb){
 
 				ed.onInit.add(function(ed) {
 					ed.pasteAsPlainText = true;
-					$("#profile-jot-text-loading").spin(false).hide();
+					$("#profile-jot-text-loading").hide();
 					$(".jothidden").show();
 					if (typeof cb!="undefined") cb();
 				});
@@ -121,7 +121,7 @@ var activeCommentText = '';
 			dropZone: $('#profile-jot-text'),
 			maxChunkSize: 4 * 1024 * 1024,
 			add: function(e,data) {
-				$('#profile-rotator').spin('tiny');
+				$('#profile-rotator').show();
 				data.submit();
 			},
 			done: function(e,data) {
@@ -130,7 +130,7 @@ var activeCommentText = '';
 			},
 			stop: function(e,data) {
 				preview_post();
-				$('#profile-rotator').spin(false);
+				$('#profile-rotator').hide();
 			},
 		});
 
@@ -204,11 +204,11 @@ var activeCommentText = '';
                         reply = prompt("{{$linkurl}}");
                         if(reply && reply.length) {
                             reply = bin2hex(reply);
-                            $('#profile-rotator').spin('tiny');
+                            $('#profile-rotator').show();
                             $.get('{{$baseurl}}/linkinfo?f=&binurl=' + reply, function(data) {
                                     addeditortext(data);
 									preview_post();
-                                    $('#profile-rotator').spin(false);
+                                    $('#profile-rotator').hide();
                             });
                         }
                     }
@@ -254,12 +254,12 @@ var activeCommentText = '';
 		else {
 			if ($('#jot-popup').length != 0) $('#jot-popup').show();
 
-			$('#like-rotator-' + id).spin('tiny');
+			$('#like-rotator-' + id).show();
 			$.get('{{$baseurl}}/share/' + id, function(data) {
 				if (!editor) $("#profile-jot-text").val("");
 				initEditor(function(){
 					addeditortext(data);
-					$('#like-rotator-' + id).spin(false);
+					$('#like-rotator-' + id).hide();
 					$(window).scrollTop(0);
 				});
 			});
@@ -312,17 +312,17 @@ var activeCommentText = '';
 
 		if(reply && reply.length) {
 			reply = bin2hex(reply);
-			$('#profile-rotator').spin('tiny');
+			$('#profile-rotator').show();
 			$.get('{{$baseurl}}/linkinfo?f=&binurl=' + reply, function(data) {
 				if(commentwin) {
 					$(editwin).val( $(editwin).val() + data );
-					$('#profile-rotator').spin(false);
+					$('#profile-rotator').hide();
 				}
 				else {
 					if (!editor) $("#profile-jot-text").val("");
 					initEditor(function(){
 					addeditortext(data);
-					$('#profile-rotator').spin(false);
+					$('#profile-rotator').hide();
 					});
 				}
 			});
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index ce17f2f24..13e7602be 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -168,9 +168,11 @@
 					</div>
 				</div>
 				{{/if}}
-			</div>
-			<div id="profile-rotator-wrapper" class="float-left">
-				<div id="profile-rotator"></div>
+				<div class="btn-group">
+					<div id="profile-rotator" class="mt-2 spinner-wrapper">
+						<div class="spinner s"></div>
+					</div>
+				</div>
 			</div>
 			<div id="profile-jot-submit-right" class="btn-group float-right">
 				{{if $preview}}
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
index 48bf5de4b..d71d432fb 100755
--- a/view/tpl/msg-header.tpl
+++ b/view/tpl/msg-header.tpl
@@ -12,7 +12,7 @@
 			dropZone: $('#prvmail-text'),
 			maxChunkSize: 4 * 1024 * 1024,
 			add: function(e,data) {
-				$('#prvmail-rotator').spin('tiny');
+				$('#prvmail-rotator').show();
 				data.submit();
 			},
 			done: function(e,data) {
@@ -21,7 +21,7 @@
 			},
 			stop: function(e,data) {
 				preview_mail();
-				$('#prvmail-rotator').spin(false);
+				$('#prvmail-rotator').hide();
 			},
 		});
 
@@ -34,11 +34,11 @@
 	function prvmailJotGetLink() {
 		reply = prompt("{{$linkurl}}");
 		if(reply && reply.length) {
-			$('#prvmail-rotator').spin('tiny');
+			$('#prvmail-rotator').show();
 			$.get('linkinfo?f=&url=' + reply, function(data) {
 				addmailtext(data);
 				preview_mail();
-				$('#prvmail-rotator').spin(false);
+				$('#prvmail-rotator').hide();
 			});
 		}
 	}
@@ -61,11 +61,11 @@
 		event.target.textContent = reply;
 		event.preventDefault();
 		if(reply && reply.length) {
-			$('#prvmail-rotator').spin('tiny');
+			$('#prvmail-rotator').show();
 			$.get('linkinfo?f=&url=' + reply, function(data) {
 				addmailtext(data);
 				preview_mail();
-				$('#prvmail-rotator').spin(false);
+				$('#prvmail-rotator').hide();
 			});
 		}
 	}
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index f21017076..72860aebe 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -191,7 +191,9 @@
 			<form class="form-inline" method="get" action="search" role="search">
 				<input class="form-control form-control-sm mt-1 mr-2" id="nav-search-text" type="text" value="" placeholder="&#xf002; {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" onblur="closeMenu('nav-search'); openMenu('nav-search-btn');"/>
 			</form>
-			<div id="nav-search-spinner"></div>
+			<div id="nav-search-spinner" class="spinner-wrapper">
+				<div class="spinner s"></div>
+			</div>
 		</li>
 		<li class="nav-item" id="nav-search-btn">
 			<a class="nav-link" href="#nav-search" title="{{$nav.search.3}}" onclick="openMenu('nav-search'); closeMenu('nav-search-btn'); $('#nav-search-text').focus(); return false;"><i class="fa fa-fw fa-search"></i></a>
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index 89b169f58..58b843bf0 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -19,7 +19,7 @@
 	{{$upload_form}}
 	{{$album_edit.1}}
 	<div class="section-content-wrapper-np">
-		<div id="photo-album-contents-{{$album_id}}">
+		<div id="photo-album-contents-{{$album_id}}" style="display: none">
 			{{foreach $photos as $photo}}
 				{{include file="photo_top.tpl"}}
 			{{/foreach}}
@@ -28,8 +28,12 @@
 	</div>
 </div>
 <div class="photos-end"></div>
+<div id="page-spinner" class="spinner-wrapper">
+	<div class="spinner m"></div>
+</div>
 <script>
+$(document).ready(function() {
 	loadingPage = false;
 	justifyPhotos('photo-album-contents-{{$album_id}}');
+});
 </script>
-<div id="page-spinner"></div>
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index c6a9067c1..a9574aade 100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -10,7 +10,7 @@
 	</div>
 	{{$upload_form}}
 	<div class="section-content-wrapper-np">
-		<div id="photo-album-contents-{{$album_id}}">
+		<div id="photo-album-contents-{{$album_id}}" style="display: none">
 			{{foreach $photos as $photo}}
 				{{include file="photo_top.tpl"}}
 			{{/foreach}}
@@ -19,8 +19,12 @@
 	</div>
 </div>
 <div class="photos-end"></div>
+<div id="page-spinner" class="spinner-wrapper">
+	<div class="spinner m"></div>
+</div>
 <script>
+$(document).ready(function() {
 	loadingPage = false;
 	justifyPhotos('photo-album-contents-{{$album_id}}');
+});
 </script>
-<div id="page-spinner"></div>
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index af6315c7e..59472f7d4 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -5,7 +5,7 @@
 	</div>
 	<div class="section-content-wrapper">
 {{/if}}
-		<div id="prvmail-wrapper" >
+		<div id="prvmail-wrapper">
 			<input id="invisible-wall-file-upload" type="file" name="files" style="visibility:hidden;position:absolute;top:-50;left:-50;width:0;height:0;" multiple>
 			<form id="prvmail-form" action="mail" method="post" >
 				<input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" />
@@ -31,12 +31,12 @@
 					<label for="prvmail-text">{{$yourmessage}}</label>
 					<textarea class="form-control" id="prvmail-text" name="body"{{if $new}} style="height: 10em;"{{/if}}>{{$text}}</textarea>
 				</div>
-				<div id="prvmail-submit-wrapper" class="form-group">
+				<div id="prvmail-submit-wrapper" class="form-group clearfix">
 					<div id="prvmail-submit" class="float-right btn-group">
 						<button class="btn btn-outline-secondary btn-sm" id="prvmail-preview" title="{{$preview}}" onclick="preview_mail(); return false;"><i class="fa fa-eye"></i></button>
 						<button class="btn btn-primary btn-sm" type="submit" id="prvmail-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
 					</div>
-					<div id="prvmail-tools" class="btn-toolbar float-left">
+					<div id="prvmail-tools" class="btn-toolbar">
 						<div class="btn-group mr-2">
 							<button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'prvmail-text'); return false;">
 								<i class="fa fa-bold jot-icons"></i>
@@ -63,7 +63,7 @@
 							</button>
 						</div>
 						{{if $feature_expire || $feature_encrypt}}
-						<div class="btn-group d-none d-lg-flex mr-2">
+						<div class="btn-group d-none d-lg-flex">
 							{{if $feature_expire}}
 							<button id="prvmail-expire-wrapper" class="btn btn-outline-secondary btn-sm" onclick="prvmailGetExpiry();return false;" >
 								<i id="prvmail-expires" class="fa fa-eraser jot-icons" title="{{$expires}}" ></i>
@@ -90,11 +90,12 @@
 								{{/if}}
 							</div>
 						</div>
+						<div class="btn-group">
+							<div id="prvmail-rotator" class="m-2 spinner-wrapper">
+								<div class="spinner s"></div>
+							</div>
+						</div>
 					</div>
-					<div id="prvmail-rotator-wrapper" class="float-left">
-						<div id="prvmail-rotator"></div>
-					</div>
-					<div class="clear"></div>
 				</div>
 				<div id="mail-preview-content" style="display: none;"></div>
 			</form>
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index 50c0116fb..0a8f12d4f 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -1,4 +1,4 @@
-<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} mb-4 clearfix generic-content-wrapper{{/if}}">
+<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} clearfix generic-content-wrapper{{/if}}">
 	<a name="{{$item.id}}" ></a>
 	<div class="clearfix wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 		<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}">
diff --git a/view/tpl/viewcontact_template.tpl b/view/tpl/viewcontact_template.tpl
index 2b7144450..005fe17ce 100755
--- a/view/tpl/viewcontact_template.tpl
+++ b/view/tpl/viewcontact_template.tpl
@@ -10,4 +10,6 @@
 	</div>
 </div>
 <script>$(document).ready(function() { loadingPage = false;});</script>
-<div id="page-spinner"></div>
+<div id="page-spinner" class="spinner-wrapper">
+	<div class="spinner m"></div>
+</div>