diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini
index 9906cf551..80e90fdbb 100644
--- a/.docker/release/files/usr/local/include/application.ini
+++ b/.docker/release/files/usr/local/include/application.ini
@@ -316,5 +316,5 @@ dev_email = ""
 dev_password = ""
 
 [version]
-current = "2.26.1"
+current = "2.26.4"
 saved = "Sun, 18 Dec 2022 22:10:48 +0000"
diff --git a/.htaccess b/.htaccess
index 449dcc730..faa8201c8 100644
--- a/.htaccess
+++ b/.htaccess
@@ -26,7 +26,6 @@
 #	Header set Strict-Transport-Security "max-age=31536000"
 	Header set imagetoolbar "no"
 #	Header set X-Content-Type-Options "nosniff"
-#	Header set X-Frame-Options "DENY"
 #	Header set X-XSS-Protection "1; mode=block"
 	Header set Service-Worker-Allowed "/"
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7df7ae112..7d37da660 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,104 @@
+## 2.26.4 – 2023-02-24
+
+## Added
+- Add CSP frame-ancestors for
+  [#537](https://github.com/the-djmaze/snappymail/pull/537)
+
+## Changed
+- Reduce/simplify CSS footprint
+- Use the System/Browser font by default by @HeySora
+  [#988](https://github.com/the-djmaze/snappymail/pull/988)
+- Make layout fully responsive using matchMedia('(max-width: 799px)')
+- Move brotli and gzip compress option to application.ini
+- After page refreshes in background whilst editing a draft, the space bar stops working
+  [#860](https://github.com/the-djmaze/snappymail/pull/860)
+- Updated Portuguese by @ner00
+  [#984](https://github.com/the-djmaze/snappymail/pull/984)
+- Updated French by @hguilbert
+  [#985](https://github.com/the-djmaze/snappymail/pull/985)
+
+## Fixed
+- unset border-box for message body
+  [#990](https://github.com/the-djmaze/snappymail/pull/990)
+- Unread email count badge shows -1
+  [#989](https://github.com/the-djmaze/snappymail/pull/989)
+- unicode mailto: addresses not decoded
+- Unicode email/url address matching
+  [#955](https://github.com/the-djmaze/snappymail/pull/955)
+- Invalid Token if run in IFrame
+  [#537](https://github.com/the-djmaze/snappymail/pull/537)
+
+### Removed
+- rl.initData
+
+
+## 2.26.3 – 2023-02-21
+
+## Added
+- Translate "Are you sure you want to exit?"
+- stderr as Logger
+
+## Changed
+- Moved rl.fetch and rl.fetchJSON to boot.js so that AppData can be fetched as JSON
+- Many AppData properties to JavaScript camelCase
+- Cleanup Identity handling
+- Merge GnuPG and OpenPGP.js passphrases
+
+## Fixed
+- Notification enum conflicts with window.Notification
+- language selector didn't show current language in green
+- Threads indicator got lost with new message cache handling
+- messagesBodiesDom never cached previous messages
+- Nextcloud File picker doesn't insert multiple links
+  [#981](https://github.com/the-djmaze/snappymail/pull/981)
+- Call to protected method RainLoop\Enumerations\UploadError::getUserMessage()
+  [#982](https://github.com/the-djmaze/snappymail/pull/982)
+- Issue with the top logo and text of a certain e-mail
+  [#953](https://github.com/the-djmaze/snappymail/pull/953)
+- Facebook logo missing from emails sent out by it
+  [#954](https://github.com/the-djmaze/snappymail/pull/954)
+
+### Removed
+- Unused Squire code
+
+
+
+## 2.26.2 – 2023-02-17
+
+## Added
+- Remove CSS white-space from messages to prevent annoying side scrolling
+- Show error when trying to send empty message
+  [#974](https://github.com/the-djmaze/snappymail/pull/974)
+- max_sys_loadavg as setting
+  [#971](https://github.com/the-djmaze/snappymail/pull/971)
+
+## Changed
+- Speedup and improved cleanHtml() and cleanCSS() handling
+- Better handling of upload .eml files to a mailbox
+- Rename Folder Hash to ETag as it is the more obvious name
+- Moved AllowDraftAutosave option from Settings -> Security to Settings -> General -> Compose
+- SmtpClient->Connect() use $oSettings->Ehlo
+- Improved handling of `<style>` elements in messages
+- French updated by @hguilbert
+
+## Fixed
+- Remove SVG elements properly from messages
+  [#972](https://github.com/the-djmaze/snappymail/pull/972)
+- Sending large HTML messages slow/fail
+  [#962](https://github.com/the-djmaze/snappymail/pull/962)
+- Nextcloud login failed
+  [#969](https://github.com/the-djmaze/snappymail/pull/969)
+- DoMessageList() hash check was incorrect
+- "Move to folder" button overlays folder sidebar on mobile
+  [#961](https://github.com/the-djmaze/snappymail/pull/961)
+- Spanish translation SPAM and NOT SPAM strings are reversed
+  [#964](https://github.com/the-djmaze/snappymail/pull/964)
+- Can't open Thunderbird PGP keys from decrypted message
+  [#958](https://github.com/the-djmaze/snappymail/pull/958)
+- Can't close Sieve dialog
+  [#960](https://github.com/the-djmaze/snappymail/pull/960)
+
+
 ## 2.26.1 – 2023-02-14
 
 ## Added
diff --git a/README.md b/README.md
index 2dd32ac39..a5ad4db44 100644
--- a/README.md
+++ b/README.md
@@ -141,28 +141,28 @@ RainLoop 1.17 vs SnappyMail
 
 |js/*           	|RainLoop 	|Snappy   	|
 |---------------	|--------:	|--------:	|
-|admin.js        	|2.170.153	|   81.159	|
-|app.js          	|4.207.787	|  414.949	|
-|boot.js         	|  868.735	|    2.711	|
-|libs.js         	|  658.812	|  192.392	|
-|sieve.js         	|        0	|   85.597	|
+|admin.js        	|2.170.153	|   78.971	|
+|app.js          	|4.207.787	|  409.340	|
+|boot.js         	|  868.735	|    4.142	|
+|libs.js         	|  658.812	|  185.881	|
+|sieve.js         	|        0	|   85.599	|
 |polyfills.js    	|  334.608	|        0	|
 |serviceworker.js	|        0	|      285	|
-|TOTAL           	|8.240.095	|  777.093	|
+|TOTAL           	|8.240.095	|  764.218	|
 
 |js/min/*       	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|------:	|--------:	|--------:	|
-|admin.min.js    	|  256.831	|   40.198	| 73.606	| 13.281	| 60.877  	| 11.916	|
-|app.min.js      	|  515.367	|  190.317	|139.456	| 63.879	|110.485  	| 54.792	|
-|boot.min.js     	|   84.659	|    1.600	| 26.998	|    940	| 23.643  	|    767	|
-|libs.min.js     	|  584.772	|   91.434	|180.901	| 33.893	|155.182  	| 30.383	|
-|sieve.min.js     	|        0	|   41.566	|      0	| 10.427	|      0  	|  9.413	|
+|admin.min.js    	|  256.831	|   38.936	| 73.606	| 13.036	| 60.877  	| 11.694	|
+|app.min.js      	|  515.367	|  186.883	|139.456	| 63.102	|110.485  	| 54.200	|
+|boot.min.js     	|   84.659	|    2.084	| 26.998	|  1.202	| 23.643  	|  1.003	|
+|libs.min.js     	|  584.772	|   90.445	|180.901	| 33.592	|155.182  	| 30.108	|
+|sieve.min.js     	|        0	|   41.525	|      0	| 10.435	|      0  	|  9.401	|
 |polyfills.min.js	|   32.837	|        0	| 11.406	|      0	| 10.175  	|      0	|
-|TOTAL user      	|1.217.635	|  283.351	|358.761	| 98.712	|299.485  	| 85.942	|
-|TOTAL user+sieve	|1.217.635	|  324.917	|358.761	|109.139	|299.485  	| 95.355	|
-|TOTAL admin     	|  959.099	|  133.232	|292.911	| 48.114	|249.877  	| 43.066	|
+|TOTAL user      	|1.217.635	|  279.412	|358.761	| 97.896	|299.485  	| 85.311	|
+|TOTAL user+sieve	|1.217.635	|  320.937	|358.761	|108.331	|299.485  	| 94.712	|
+|TOTAL admin     	|  959.099	|  131.465	|292.911	| 47.830	|249.877  	| 42.805	|
 
-For a user its around 70% smaller and faster than traditional RainLoop.
+For a user it is around 72% smaller and faster than traditional RainLoop.
 
 ### CSS changes
 
@@ -189,12 +189,12 @@ For a user its around 70% smaller and faster than traditional RainLoop.
 
 |css/*       	|RainLoop	|Snappy   	|RL gzip	|SM gzip	|SM brotli	|
 |------------	|-------:	|------:	|------:	|------:	|--------:	|
-|app.css     	| 340.331	| 82.134	| 46.946	| 17.067	| 14.688	|
-|app.min.css 	| 274.947	| 66.337	| 39.647	| 15.095	| 13.285	|
+|app.css     	| 340.331	| 81.526	| 46.946	| 16.960	| 14.620	|
+|app.min.css 	| 274.947	| 65.398	| 39.647	| 15.032	| 13.119	|
 |boot.css    	|       	|  1.326	|       	|    664	|    545	|
 |boot.min.css	|       	|  1.071	|       	|    590	|    474	|
-|admin.css    	|       	| 30.554	|       	|  6.984	|  6.085	|
-|admin.min.css	|       	| 24.752	|       	|  6.339	|  5.606	|
+|admin.css    	|       	| 30.296	|       	|  6.939	|  6.066	|
+|admin.min.css	|       	| 24.420	|       	|  6.272	|  5.531	|
 
 ### PGP
 RainLoop uses the old OpenPGP.js v2
@@ -208,7 +208,7 @@ See https://github.com/the-djmaze/openpgpjs for development
 
 |OpenPGP        	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|-------:	|--------:	|--------:	|
-|openpgp.min.js 	|  330.742	|  539.988	|102.388	| 167.371	| 84.241  	|  137.413	|
+|openpgp.min.js 	|  330.742	|  541.176	|102.388	| 168.266	| 84.241  	|  138.278	|
 |openpgp.worker 	|    1.499	|         	|    824	|        	|    695 	|        	|
 
 
diff --git a/_include.php b/_include.php
index 65a689ba4..de1cc3ee0 100644
--- a/_include.php
+++ b/_include.php
@@ -4,16 +4,6 @@
 
 //header('Strict-Transport-Security: max-age=31536000');
 
-/**
- * Uncomment to use gzip compressed output
- */
-//define('USE_GZIP', 1);
-
-/**
- * Uncomment to use brotli compressed output
- */
-//define('USE_BROTLI', 1);
-
 /**
  * Uncomment to enable multiple domain installation.
  */
diff --git a/cli/release.php b/cli/release.php
index a759bf8ae..378475ce0 100755
--- a/cli/release.php
+++ b/cli/release.php
@@ -160,11 +160,6 @@ $tar->addFromString('index.php', $index);
 $zip->addFile('README.md');
 $tar->addFile('README.md');
 
-$data = file_get_contents('dev/serviceworker.js');
-//$data = file_get_contents('snappymail/v/0.0.0/static/js/min/serviceworker.min.js');
-$zip->addFromString('serviceworker.js', $data);
-$tar->addFromString('serviceworker.js', $data);
-
 $zip->close();
 
 $tar->compress(Phar::GZ);
diff --git a/dev/App/Admin.js b/dev/App/Admin.js
index 47fdeed40..797e8085f 100644
--- a/dev/App/Admin.js
+++ b/dev/App/Admin.js
@@ -27,7 +27,7 @@ export class AdminApp extends AbstractApp {
 			rl.route.root();
 			setTimeout(() => location.href = '/', 1);
 		} else if (SettingsGet('Auth')) {
-			this.weakPassword(SettingsGet('WeakPassword'));
+			this.weakPassword(SettingsGet('weakPassword'));
 			startScreens([SettingsAdminScreen]);
 		} else {
 			startScreens([LoginAdminScreen]);
diff --git a/dev/App/User.js b/dev/App/User.js
index da75c23eb..f0956381f 100644
--- a/dev/App/User.js
+++ b/dev/App/User.js
@@ -1,7 +1,7 @@
 import 'External/User/ko';
 
 import { SMAudio } from 'Common/Audio';
-import { isArray, pString, pInt } from 'Common/Utils';
+import { isArray, pInt } from 'Common/Utils';
 import { mailToHelper, setLayoutResizer, dropdownsDetectVisibility } from 'Common/UtilsUser';
 
 import {
@@ -156,22 +156,11 @@ export class AppUser extends AbstractApp {
 					? items.map(oValue => new AccountModel(oValue.email, oValue.name))
 					: []
 				);
-				AccountUserStore.unshift(new AccountModel(SettingsGet('MainEmail'), '', false));
+				AccountUserStore.unshift(new AccountModel(SettingsGet('mainEmail'), '', false));
 
 				items = oData.Result.Identities;
 				IdentityUserStore(isArray(items)
-					? items.map(identityData => {
-						const identity = new IdentityModel(
-							pString(identityData.Id),
-							pString(identityData.Email)
-						);
-						identity.name(pString(identityData.Name));
-						identity.replyTo(pString(identityData.ReplyTo));
-						identity.bcc(pString(identityData.Bcc));
-						identity.signature(pString(identityData.Signature));
-						identity.signatureInsertBefore(!!identityData.SignatureInsertBefore);
-						return identity;
-					})
+					? items.map(identityData => IdentityModel.reviveFromJson(identityData))
 					: []
 				);
 			}
@@ -193,18 +182,17 @@ export class AppUser extends AbstractApp {
 	bootstart() {
 		super.bootstart();
 
-		addEventListener('resize', () => leftPanelDisabled(ThemeStore.isMobile() || 1000 > innerWidth));
 		addEventListener('beforeunload', event => {
-			if (arePopupsVisible() || (ThemeStore.isMobile() && MessageUserStore.message())) {
+			if (arePopupsVisible() || (!SettingsUserStore.layout() && MessageUserStore.message())) {
 				event.preventDefault();
-				return event.returnValue = "Are you sure you want to exit?";
+				return event.returnValue = i18n('POPUPS_ASK/EXIT_ARE_YOU_SURE');
 			}
 		}, {capture: true});
 	}
 
 	refresh() {
 		ThemeStore.populate();
-		LanguageStore.language(SettingsGet('Language'));
+		LanguageStore.language(SettingsGet('language'));
 		changeTheme(SettingsGet('Theme'));
 		this.start();
 	}
@@ -263,18 +251,15 @@ export class AppUser extends AbstractApp {
 
 						PgpUserStore.init();
 
-						// When auto-login is active
-						try {
-							navigator.registerProtocolHandler?.(
-								'mailto',
-								location.protocol + '//' + location.host + location.pathname + '?mailto&to=%s',
-								(SettingsGet('Title') || 'SnappyMail')
-							);
-						} catch (e) {
-							console.error(e);
-						}
+						setTimeout(() => mailToHelper(SettingsGet('mailToEmail')), 500);
+
+						// When auto-login is active
+						navigator.registerProtocolHandler?.(
+							'mailto',
+							location.protocol + '//' + location.host + location.pathname + '?mailto&to=%s',
+							(SettingsGet('title') || 'SnappyMail')
+						);
 
-						setTimeout(() => mailToHelper(SettingsGet('MailToEmail')), 500);
 					} else {
 						this.logout();
 					}
diff --git a/dev/Common/Cache.js b/dev/Common/Cache.js
index 9a56ccbdf..b1cbd7241 100644
--- a/dev/Common/Cache.js
+++ b/dev/Common/Cache.js
@@ -1,9 +1,5 @@
-import { MessageSetAction } from 'Common/EnumsUser';
-import { isArray } from 'Common/Utils';
-
-let FOLDERS_CACHE = {},
-	FOLDERS_NAME_CACHE = {},
-	MESSAGE_FLAGS_CACHE = {},
+let FOLDERS_CACHE = new Map,
+	FOLDERS_HASH_MAP = new Map,
 	inboxFolderName = 'INBOX';
 
 export const
@@ -11,18 +7,10 @@ export const
 	 * @returns {void}
 	 */
 	clearCache = () => {
-		FOLDERS_CACHE = {};
-		FOLDERS_NAME_CACHE = {};
-		MESSAGE_FLAGS_CACHE = {};
+		FOLDERS_CACHE.clear();
+		FOLDERS_HASH_MAP.clear();
 	},
 
-	/**
-	 * @param {string} folderFullName
-	 * @param {string} uid
-	 * @returns {string}
-	 */
-	getMessageKey = (folderFullName, uid) => folderFullName + '#' + uid,
-
 	/**
 	 * @returns {string}
 	 */
@@ -34,143 +22,35 @@ export const
 	setFolderInboxName = name => inboxFolderName = name,
 
 	/**
-	 * @param {string} folderHash
+	 * @param {string} fullNameHash
 	 * @returns {string}
 	 */
-	getFolderFullName = folderHash => (folderHash && FOLDERS_NAME_CACHE[folderHash]) || '',
+	getFolderFromHashMap = fullNameHash => getFolderFromCacheList(FOLDERS_HASH_MAP.get(fullNameHash)),
 
 	/**
-	 * @param {string} folderHash
-	 * @param {string} folderFullName
 	 * @param {?FolderModel} folder
 	 */
 	setFolder = folder => {
-		folder.hash = '';
-		FOLDERS_CACHE[folder.fullName] = folder;
-		FOLDERS_NAME_CACHE[folder.fullNameHash] = folder.fullName;
+		folder.etag = '';
+		FOLDERS_CACHE.set(folder.fullName, folder);
+		FOLDERS_HASH_MAP.set(folder.fullNameHash, folder.fullName);
 	},
 
 	/**
 	 * @param {string} folderFullName
-	 * @param {string} folderHash
+	 * @param {string} folderETag
 	 */
-	setFolderHash = (folderFullName, folderHash) =>
-		FOLDERS_CACHE[folderFullName] && (FOLDERS_CACHE[folderFullName].hash = folderHash),
+	setFolderETag = (folderFullName, folderETag) =>
+		FOLDERS_CACHE.has(folderFullName) && (FOLDERS_CACHE.get(folderFullName).etag = folderETag),
 
 	/**
 	 * @param {string} folderFullName
 	 * @returns {?FolderModel}
 	 */
 	getFolderFromCacheList = folderFullName =>
-		FOLDERS_CACHE[folderFullName] || null,
+		FOLDERS_CACHE.get(folderFullName),
 
 	/**
 	 * @param {string} folderFullName
 	 */
-	removeFolderFromCacheList = folderFullName => delete FOLDERS_CACHE[folderFullName];
-
-export class MessageFlagsCache
-{
-	/**
-	 * @param {string} folderFullName
-	 * @param {string} uid
-	 * @param {string} flag
-	 * @returns {bool}
-	 */
-	static hasFlag(folderFullName, uid, flag) {
-		return MESSAGE_FLAGS_CACHE[folderFullName]?.[uid]?.includes(flag);
-	}
-
-	/**
-	 * @param {string} folderFullName
-	 * @param {string} uid
-	 * @returns {?Array}
-	 */
-	static getFor(folderFullName, uid) {
-		return MESSAGE_FLAGS_CACHE[folderFullName]?.[uid];
-	}
-
-	/**
-	 * @param {string} folderFullName
-	 * @param {string} uid
-	 * @param {Array} flagsCache
-	 */
-	static setFor(folderFullName, uid, flags) {
-		if (isArray(flags)) {
-			if (!MESSAGE_FLAGS_CACHE[folderFullName]) {
-				MESSAGE_FLAGS_CACHE[folderFullName] = {};
-			}
-			MESSAGE_FLAGS_CACHE[folderFullName][uid] = flags;
-		}
-	}
-
-	/**
-	 * @param {string} folderFullName
-	 */
-	static clearFolder(folderFullName) {
-		MESSAGE_FLAGS_CACHE[folderFullName] = {};
-	}
-
-	/**
-	 * @param {(MessageModel|null)} message
-	 */
-	static initMessage(message) {
-		if (message) {
-			const uid = message.uid,
-				flags = this.getFor(message.folder, uid),
-				thread = message.threads();
-
-			isArray(flags) && message.flags(flags);
-
-			if (thread.length) {
-				message.hasUnseenSubMessage(!!thread.find(iSubUid =>
-					(uid !== iSubUid) && !this.hasFlag(message.folder, iSubUid, '\\seen')
-				));
-				message.hasFlaggedSubMessage(!!thread.find(iSubUid =>
-					(uid !== iSubUid) && this.hasFlag(message.folder, iSubUid, '\\flagged')
-				));
-			}
-		}
-	}
-
-	/**
-	 * @param {(MessageModel|null)} message
-	 */
-	static store(message) {
-		message && this.setFor(message.folder, message.uid, message.flags());
-	}
-
-	/**
-	 * @param {string} folder
-	 * @param {string} uid
-	 * @param {number} setAction
-	 */
-	static storeBySetAction(folder, uid, setAction) {
-		let flags = this.getFor(folder, uid) || [];
-		const
-			unread = flags.includes('\\seen') ? 0 : 1,
-			add = item => flags.includes(item) || flags.push(item),
-			remove = item => flags = flags.filter(flag => flag != item);
-
-		switch (setAction) {
-			case MessageSetAction.SetSeen:
-				add('\\seen');
-				break;
-			case MessageSetAction.UnsetSeen:
-				remove('\\seen');
-				break;
-			case MessageSetAction.SetFlag:
-				add('\\flagged');
-				break;
-			case MessageSetAction.UnsetFlag:
-				remove('\\flagged');
-				break;
-			// no default
-		}
-
-		this.setFor(folder, uid, flags);
-
-		return unread;
-	}
-
-}
+	removeFolderFromCacheList = folderFullName => FOLDERS_CACHE.delete(folderFullName);
diff --git a/dev/Common/Enums.js b/dev/Common/Enums.js
index 4726fafb4..804d10b78 100644
--- a/dev/Common/Enums.js
+++ b/dev/Common/Enums.js
@@ -39,7 +39,7 @@ SaveSettingStatus = {
 /**
  * @enum {number}
  */
-Notification = {
+Notifications = {
 	RequestError: 1,
 	RequestAborted: 2,
 	RequestTimeout: 3,
diff --git a/dev/Common/EnumsUser.js b/dev/Common/EnumsUser.js
index 326964d6d..daa637d66 100644
--- a/dev/Common/EnumsUser.js
+++ b/dev/Common/EnumsUser.js
@@ -96,7 +96,7 @@ export const EditorDefaultType = {
  * @enum {number}
  */
 export const Layout = {
-	NoPreview: 0,
+//	NoPreview: 0,
 	SidePreview: 1,
 	BottomPreview: 2
 };
diff --git a/dev/Common/Folders.js b/dev/Common/Folders.js
index 2802940f0..f00927184 100644
--- a/dev/Common/Folders.js
+++ b/dev/Common/Folders.js
@@ -1,7 +1,6 @@
 import { isArray, arrayLength } from 'Common/Utils';
 import {
-	MessageFlagsCache,
-	setFolderHash,
+	setFolderETag,
 	getFolderInboxName,
 	getFolderFromCacheList
 } from 'Common/Cache';
@@ -9,8 +8,6 @@ import { SettingsUserStore } from 'Stores/User/Settings';
 import { FolderUserStore } from 'Stores/User/Folder';
 import { MessagelistUserStore } from 'Stores/User/Messagelist';
 import { getNotification } from 'Common/Translator';
-import { Settings } from 'Common/Globals';
-import { serverRequest } from 'Common/Links';
 
 import Remote from 'Remote/User/Fetch';
 
@@ -114,8 +111,8 @@ folderInformation = (folder, list) => {
 
 		if (arrayLength(list)) {
 			list.forEach(messageListItem => {
-				MessageFlagsCache.getFor(folder, messageListItem.uid) || uids.push(messageListItem.uid);
-				messageListItem.threads.forEach(uid => MessageFlagsCache.getFor(folder, uid) || uids.push(uid));
+				uids.push(messageListItem.uid);
+				messageListItem.threads.forEach(uid => uids.push(uid));
 			});
 			count = uids.length;
 		}
@@ -124,31 +121,21 @@ folderInformation = (folder, list) => {
 			Remote.request('FolderInformation', (iError, data) => {
 				if (!iError && data.Result) {
 					const result = data.Result,
-						folderFromCache = getFolderFromCacheList(result.folder);
+						folderFromCache = getFolderFromCacheList(result.name);
 					if (folderFromCache) {
-						const oldHash = folderFromCache.hash,
+						const oldHash = folderFromCache.etag,
 							unreadCountChange = (folderFromCache.unreadEmails() !== result.unreadEmails);
 
 //						folderFromCache.revivePropertiesFromJson(result);
 						folderFromCache.expires = Date.now();
 						folderFromCache.uidNext = result.uidNext;
-						folderFromCache.hash = result.hash;
+						folderFromCache.etag = result.etag;
 						folderFromCache.totalEmails(result.totalEmails);
 						folderFromCache.unreadEmails(result.unreadEmails);
 
-						unreadCountChange && MessageFlagsCache.clearFolder(folderFromCache.fullName);
-
-						if (result.messagesFlags.length) {
-							result.messagesFlags.forEach(message =>
-								MessageFlagsCache.setFor(folderFromCache.fullName, message.uid.toString(), message.flags)
-							);
-
-							MessagelistUserStore.reloadFlagsAndCachedMessage();
-						}
-
 						MessagelistUserStore.notifyNewMessages(folderFromCache.fullName, result.newMessages);
 
-						if (!oldHash || unreadCountChange || result.hash !== oldHash) {
+						if (!oldHash || unreadCountChange || result.etag !== oldHash) {
 							if (folderFromCache.fullName === FolderUserStore.currentFolderFullName()) {
 								MessagelistUserStore.reload();
 /*
@@ -165,8 +152,6 @@ folderInformation = (folder, list) => {
 				flagsUids: uids,
 				uidNext: getFolderFromCacheList(folder)?.uidNext || 0 // Used to check for new messages
 			});
-		} else if (SettingsUserStore.useThreads()) {
-			MessagelistUserStore.reloadFlagsAndCachedMessage();
 		}
 	}
 },
@@ -181,21 +166,18 @@ folderInformationMultiply = (boot = false) => {
 			if (!iError && arrayLength(oData.Result)) {
 				const utc = Date.now();
 				oData.Result.forEach(item => {
-					const folder = getFolderFromCacheList(item.folder);
-
+					const folder = getFolderFromCacheList(item.name);
 					if (folder) {
-						const oldHash = folder.hash,
+						const oldHash = folder.etag,
 							unreadCountChange = folder.unreadEmails() !== item.unreadEmails;
 
 //						folder.revivePropertiesFromJson(item);
 						folder.expires = utc;
-						folder.hash = item.hash;
+						folder.etag = item.etag;
 						folder.totalEmails(item.totalEmails);
 						folder.unreadEmails(item.unreadEmails);
 
-						unreadCountChange && MessageFlagsCache.clearFolder(folder.fullName);
-
-						if (!oldHash || item.hash !== oldHash) {
+						if (!oldHash || item.etag !== oldHash) {
 							if (folder.fullName === FolderUserStore.currentFolderFullName()) {
 								MessagelistUserStore.reload();
 							}
@@ -217,13 +199,13 @@ folderInformationMultiply = (boot = false) => {
 
 moveOrDeleteResponseHelper = (iError, oData) => {
 	if (iError) {
-		setFolderHash(FolderUserStore.currentFolderFullName(), '');
+		setFolderETag(FolderUserStore.currentFolderFullName(), '');
 		alert(getNotification(iError));
 	} else if (FolderUserStore.currentFolder()) {
 		if (2 === arrayLength(oData.Result)) {
-			setFolderHash(oData.Result[0], oData.Result[1]);
+			setFolderETag(oData.Result[0], oData.Result[1]);
 		} else {
-			setFolderHash(FolderUserStore.currentFolderFullName(), '');
+			setFolderETag(FolderUserStore.currentFolderFullName(), '');
 		}
 		MessagelistUserStore.reload(!MessagelistUserStore.length);
 	}
@@ -286,28 +268,20 @@ moveMessagesToFolder = (sFromFolderFullName, oUids, sToFolderFullName, bCopy) =>
 },
 
 dropFilesInFolder = (sFolderFullName, files) => {
-	let count = 0,
-		fn = () => 0 == --count
-			&& FolderUserStore.currentFolderFullName() == sFolderFullName
-			&& MessagelistUserStore.reload(true, true);
+	let count = files.length;
 	for (const file of files) {
 		if ('message/rfc822' === file.type) {
-			++count;
 			let data = new FormData;
 			data.append('folder', sFolderFullName);
 			data.append('appendFile', file);
-			data.XToken = Settings.app('token');
-			fetch(serverRequest('Append'), {
-				method: 'POST',
-				mode: 'same-origin',
-				cache: 'no-cache',
-				redirect: 'error',
-				referrerPolicy: 'no-referrer',
-				credentials: 'same-origin',
-				body: data
-			})
-			.then(fn)
-			.catch(fn);
+			Remote.request('FolderAppend', (iError, data)=>{
+				iError && console.error(data.ErrorMessage);
+				0 == --count
+				&& FolderUserStore.currentFolderFullName() == sFolderFullName
+				&& MessagelistUserStore.reload(true, true);
+			}, data);
+		} else {
+			--count;
 		}
 	}
 };
diff --git a/dev/Common/Fullscreen.js b/dev/Common/Fullscreen.js
index dc7e42fb5..77cf0b599 100644
--- a/dev/Common/Fullscreen.js
+++ b/dev/Common/Fullscreen.js
@@ -1,20 +1,19 @@
-import { doc, elementById, $htmlCL } from 'Common/Globals';
+import { doc, appEl, $htmlCL } from 'Common/Globals';
 
 // Fullscreen must be on app, else other popups fail
 export const
-	app = elementById('rl-app'),
-	appFullscreen = () => (doc.fullscreenElement || doc.webkitFullscreenElement) === app,
+	appFullscreen = () => (doc.fullscreenElement || doc.webkitFullscreenElement) === appEl,
 	exitFullscreen = () => appFullscreen() && (doc.exitFullscreen || doc.webkitExitFullscreen).call(doc),
 	isFullscreen = ko.observable(false),
-	toggleFullscreen = () => isFullscreen() ? exitFullscreen() : app.requestFullscreen();
+	toggleFullscreen = () => isFullscreen() ? exitFullscreen() : appEl.requestFullscreen();
 
-if (app) {
+if (appEl) {
 	let event = 'fullscreenchange';
-	if (!app.requestFullscreen && app.webkitRequestFullscreen) {
-		app.requestFullscreen = app.webkitRequestFullscreen;
+	if (!appEl.requestFullscreen && appEl.webkitRequestFullscreen) {
+		appEl.requestFullscreen = appEl.webkitRequestFullscreen;
 		event = 'webkit'+event;
 	}
-	if (app.requestFullscreen) {
+	if (appEl.requestFullscreen) {
 		doc.addEventListener(event, () => {
 			isFullscreen(appFullscreen());
 			$htmlCL.toggle('rl-fullscreen', appFullscreen());
diff --git a/dev/Common/Globals.js b/dev/Common/Globals.js
index cd53ff55a..4d86df9dc 100644
--- a/dev/Common/Globals.js
+++ b/dev/Common/Globals.js
@@ -11,6 +11,8 @@ export const
 
 	elementById = id => doc.getElementById(id),
 
+	appEl = elementById('rl-app'),
+
 	Settings = rl.settings,
 	SettingsGet = Settings.get,
 	SettingsCapa = name => name && !!(SettingsGet('Capa') || {})[name],
@@ -31,6 +33,11 @@ export const
 		new CustomEvent(name, {detail:detail, cancelable: !!cancelable})
 	),
 
+	stopEvent = event => {
+		event.preventDefault();
+		event.stopPropagation();
+	},
+
 	formFieldFocused = () => doc.activeElement?.matches('input,textarea'),
 
 	addShortcut = (...args) => shortcuts.add(...args),
diff --git a/dev/Common/Html.js b/dev/Common/Html.js
index a9cc95753..c4180448a 100644
--- a/dev/Common/Html.js
+++ b/dev/Common/Html.js
@@ -3,7 +3,7 @@ import { forEachObjectEntry, pInt } from 'Common/Utils';
 import { SettingsUserStore } from 'Stores/User/Settings';
 
 const
-	tpl = createElement('template'),
+	tmpl = createElement('template'),
 	htmlre = /[&<>"']/g,
 	httpre = /^(https?:)?\/\//i,
 	htmlmap = {
@@ -14,10 +14,18 @@ const
 		"'": '&#x27;'
 	},
 
+	disallowedTags = [
+		'svg','script','title','link','base','meta',
+		'input','output','select','button','textarea',
+		'bgsound','keygen','source','object','embed','applet','iframe','frame','frameset','video','audio','area','map'
+		// not supported by <template> element
+//		,'html','head','body'
+	].join(','),
+
 	blockquoteSwitcher = () => {
 		SettingsUserStore.collapseBlockquotes() &&
-//		tpl.content.querySelectorAll('blockquote').forEach(node => {
-		[...tpl.content.querySelectorAll('blockquote')].reverse().forEach(node => {
+//		tmpl.content.querySelectorAll('blockquote').forEach(node => {
+		[...tmpl.content.querySelectorAll('blockquote')].reverse().forEach(node => {
 			const el = createElement('details', {class:'sm-bq-switcher'});
 			el.innerHTML = '<summary>•••</summary>';
 			node.replaceWith(el);
@@ -27,11 +35,11 @@ const
 
 	replaceWithChildren = node => node.replaceWith(...[...node.childNodes]),
 
-	url = /(^|\s|\n|\/?>)(https?:\/\/[-A-Z0-9+&#/%?=()~_|!:,.;]*[-A-Z0-9+&#/%=~()_|])/gi,
+	urlRegExp = /https?:\/\/[^\p{C}\p{Z}]+[^\p{C}\p{Z}.]/gu,
 	// eslint-disable-next-line max-len
-	email = /(^|\s|\n|\/?>)((?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x21\x23-\x5b\x5d-\x7f]|\\[\x21\x23-\x5b\x5d-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\x21-\x5a\x53-\x7f]|\\[\x21\x23-\x5b\x5d-\x7f])+)\]))/gi,
+	email = /(^|\r|\n|\p{C}\p{Z})((?:[^"(),.:;<>@[\]\\\p{C}\p{Z}]+(?:\.[^"(),.:;<>@[\]\\\p{C}\p{Z}]+)*|"(?:\\?[^"\\\p{C}\p{Z}])*")@[^@\p{C}\p{Z}]+[^@\p{C}\p{Z}.])/gui,
 	// rfc3966
-	tel = /(^|\s|\n|\/?>)(tel:(\+[0-9().-]+|[0-9*#().-]+(;phone-context=\+[0-9+().-]+)?))/g,
+	tel = /(tel:(\+[0-9().-]+|[0-9*#().-]+(;phone-context=\+[0-9+().-]+)?))/g,
 
 	// Strip tracking
 	/** TODO: implement other url strippers like from
@@ -90,6 +98,13 @@ const
 		return url;
 	},
 
+	cleanCSS = source =>
+		source.trim().replace(/-(ms|webkit)-[^;]+(;|$)/g, '')
+			.replace(/white-space[^;]+(;|$)/g, '')
+			// Drop Microsoft Office style properties
+//			.replace(/mso-[^:;]+:[^;]+/gi, '')
+	,
+
 	/*
 		Parses given css string, and returns css object
 		keys as selectors and values are css rules
@@ -161,7 +176,7 @@ const
 					// we have standard css
 					css.push({
 						selector: selector,
-						rules: arr[6]
+						rules: cleanCSS(arr[6])
 					});
 				}
 			}
@@ -239,13 +254,6 @@ export const
 				// td
 				'colspan', 'rowspan', 'headers'
 			],
-			disallowedTags = [
-				'SVG','SCRIPT','TITLE','LINK','BASE','META',
-				'INPUT','OUTPUT','SELECT','BUTTON','TEXTAREA',
-				'BGSOUND','KEYGEN','SOURCE','OBJECT','EMBED','APPLET','IFRAME','FRAME','FRAMESET','VIDEO','AUDIO','AREA','MAP'
-				// Not supported by <template> element
-//				,'HTML','HEAD','BODY'
-			],
 			nonEmptyTags = [
 				'A','B','EM','I','SPAN','STRONG'
 			];
@@ -256,9 +264,9 @@ export const
 			msgId = 0;
 		}
 
-		tpl.innerHTML = html
+		tmpl.innerHTML = html
 			// Strip Microsoft comments
-			.replace(/<!--\[if[\s\S]*?endif\]-->/gi, '')
+			.replace(/<!--\[if[\s\S]*?-->/gi, '')
 //			.replace(/<pre[^>]*>[\s\S]*?<\/pre>/gi, pre => pre.replace(/\n/g, '\n<br>'))
 			// Not supported by <template> element
 //			.replace(/<!doctype[^>]*>/gi, '')
@@ -274,16 +282,17 @@ export const
 
 		// \MailSo\Base\HtmlUtils::ClearComments()
 		// https://github.com/the-djmaze/snappymail/issues/187
-		const nodeIterator = document.createNodeIterator(tpl.content, NodeFilter.SHOW_COMMENT);
+		const nodeIterator = document.createNodeIterator(tmpl.content, NodeFilter.SHOW_COMMENT);
 		while (nodeIterator.nextNode()) {
 			nodeIterator.referenceNode.remove();
 		}
 
-		if (0 < bqLevel) {
-			tpl.content.querySelectorAll(new Array(1 + bqLevel).fill('blockquote').join(' ')).forEach(node => node.remove());
-		}
+		tmpl.content.querySelectorAll(
+			disallowedTags
+			+ (0 < bqLevel ? ',' + (new Array(1 + bqLevel).fill('blockquote').join(' ')) : '')
+		).forEach(oElement => oElement.remove());
 
-		tpl.content.querySelectorAll('*').forEach(oElement => {
+		[...tmpl.content.querySelectorAll('*')].forEach(oElement => {
 			const name = oElement.tagName,
 				oStyle = oElement.style;
 
@@ -303,8 +312,7 @@ export const
 			}
 
 			// \MailSo\Base\HtmlUtils::ClearTags()
-			if (disallowedTags.includes(name)
-			 || 'none' == oStyle.display
+			if ('none' == oStyle.display
 			 || 'hidden' == oStyle.visibility
 //			 || (oStyle.lineHeight && 1 > parseFloat(oStyle.lineHeight)
 //			 || (oStyle.maxHeight && 1 > parseFloat(oStyle.maxHeight)
@@ -320,15 +328,16 @@ export const
 				hasAttribute = name => oElement.hasAttribute(name),
 				getAttribute = name => hasAttribute(name) ? oElement.getAttribute(name).trim() : '',
 				setAttribute = (name, value) => oElement.setAttribute(name, value),
-				delAttribute = name => oElement.removeAttribute(name);
+				delAttribute = name => {
+					let value = getAttribute(name);
+					oElement.removeAttribute(name);
+					return value;
+				};
 
 			if ('mail-body' === className) {
-				forEachObjectEntry(tasks, (name, cb) => {
-					if (hasAttribute(name)) {
-						cb(getAttribute(name), oElement);
-						delAttribute(name);
-					}
-				});
+				forEachObjectEntry(tasks, (name, cb) =>
+					hasAttribute(name) && cb(delAttribute(name), oElement)
+				);
 			} else if (msgId && className) {
 				oElement.className = className.replace(/(^|\s+)/g, '$1msg-');
 			}
@@ -350,21 +359,21 @@ export const
 			if (!oStyle.backgroundImage) {
 				if ('TD' !== name && 'TH' !== name) {
 					// Make width responsive
-					if (hasAttribute('width')) {
-						value = getAttribute('width');
+					if (hasAttribute('width') && !oStyle.width) {
+						value = delAttribute('width');
 						oStyle.width = value.includes('%') ? value : value + 'px';
-						delAttribute('width');
 					}
-					value = oStyle.removeProperty('width');
-					if (parseInt(value,10) && !oStyle.maxWidth) {
+					value = oStyle.width;
+					if (100 < parseInt(value,10) && !oStyle.maxWidth) {
 						oStyle.maxWidth = value;
 						oStyle.width = '100%';
+					} else if (!value?.includes('%')) {
+						oStyle.removeProperty('width');
 					}
 					// Make height responsive
 					if (hasAttribute('height')) {
-						value = getAttribute('height');
+						value = delAttribute('height');
 						oStyle.height = value.includes('%') ? value : value + 'px';
-						delAttribute('height');
 					}
 					value = oStyle.removeProperty('height');
 					if (value && !oStyle.maxHeight) {
@@ -402,8 +411,7 @@ export const
 
 			let skipStyle = false;
 			if (hasAttribute('src')) {
-				value = stripTracking(getAttribute('src'));
-				delAttribute('src');
+				value = stripTracking(delAttribute('src'));
 
 				if ('IMG' === name) {
 					oElement.loading = 'lazy';
@@ -464,18 +472,15 @@ export const
 			}
 
 			if (hasAttribute('background')) {
-				oStyle.backgroundImage = 'url("' + getAttribute('background') + '")';
-				delAttribute('background');
+				oStyle.backgroundImage = 'url("' + delAttribute('background') + '")';
 			}
 
 			if (hasAttribute('bgcolor')) {
-				oStyle.backgroundColor = getAttribute('bgcolor');
-				delAttribute('bgcolor');
+				oStyle.backgroundColor = delAttribute('bgcolor');
 			}
 
 			if (hasAttribute('color')) {
-				oStyle.color = getAttribute('color');
-				delAttribute('color');
+				oStyle.color = delAttribute('color');
 			}
 
 			if (!skipStyle) {
@@ -540,8 +545,7 @@ export const
 					oStyle.removeProperty('color');
 				}
 
-				// Drop Microsoft Office style properties
-//				oStyle.cssText = oStyle.cssText.replace(/mso-[^:;]+:[^;]+/gi, '');
+				oStyle.cssText = cleanCSS(oStyle.cssText);
 			}
 
 			if (debug && aAttrsForRemove.length) {
@@ -551,8 +555,8 @@ export const
 
 		blockquoteSwitcher();
 
-//		return tpl.content.firstChild;
-		result.html = tpl.innerHTML.trim();
+//		return tmpl.content.firstChild;
+		result.html = tmpl.innerHTML.trim();
 		return result;
 	},
 
@@ -563,7 +567,7 @@ export const
 	htmlToPlain = html => {
 		const
 			hr = '⎯'.repeat(64),
-			forEach = (selector, fn) => tpl.content.querySelectorAll(selector).forEach(fn),
+			forEach = (selector, fn) => tmpl.content.querySelectorAll(selector).forEach(fn),
 			blockquotes = node => {
 				let bq;
 				while ((bq = node.querySelector('blockquote'))) {
@@ -591,7 +595,7 @@ export const
 			html = html.replace(/\n*<\/(div|tr)(\s[\s\S]*?)?>\n*/gi, '\n');
 		}
 
-		tpl.innerHTML = html
+		tmpl.innerHTML = html
 			.replace(/<t[dh](\s[\s\S]*?)?>/gi, '\t')
 			.replace(/<\/tr(\s[\s\S]*?)?>/gi, '\n');
 
@@ -641,16 +645,16 @@ export const
 		forEach('i,em', i => i.replaceWith(`*${i.textContent}*`));
 
 		// Convert line-breaks
-		tpl.innerHTML = tpl.innerHTML
+		tmpl.innerHTML = tmpl.innerHTML
 			.replace(/\n{3,}/gm, '\n\n')
 			.replace(/\n<br[^>]*>/g, '\n')
 			.replace(/<br[^>]*>\n/g, '\n');
 		forEach('br', br => br.replaceWith('\n'));
 
 		// Blockquotes must be last
-		blockquotes(tpl.content);
+		blockquotes(tmpl.content);
 
-		return (tpl.content.textContent || '').trim();
+		return (tmpl.content.textContent || '').trim();
 	},
 
 	/**
@@ -704,22 +708,22 @@ export const
 			aText = aNextText;
 		} while (bDo);
 
-		tpl.innerHTML = aText.join('\n')
+		tmpl.innerHTML = aText.join('\n')
 			// .replace(/~~~\/blockquote~~~\n~~~blockquote~~~/g, '\n')
 			.replace(/&/g, '&amp;')
 			.replace(/>/g, '&gt;')
 			.replace(/</g, '&lt;')
-			.replace(url, (...m) => {
-				m[2] = stripTracking(m[2]);
-				return `${m[1]}<a href="${m[2]}" target="_blank">${m[2]}</a>`;
+			.replace(urlRegExp, (...m) => {
+				m[0] = stripTracking(m[0]);
+				return `<a href="${m[0]}" target="_blank">${m[0]}</a>`;
 			})
 			.replace(email, '$1<a href="mailto:$2">$2</a>')
-			.replace(tel, '$1<a href="$2">$2</a>')
+			.replace(tel, '<a href="$1">$1</a>')
 			.replace(/~~~blockquote~~~\s*/g, '<blockquote>')
 			.replace(/\s*~~~\/blockquote~~~/g, '</blockquote>')
 			.replace(/\n/g, '<br>');
 		blockquoteSwitcher();
-		return tpl.innerHTML.trim();
+		return tmpl.innerHTML.trim();
 	},
 
 	WYSIWYGS = ko.observableArray();
diff --git a/dev/Common/Links.js b/dev/Common/Links.js
index 29934ce00..3a16ba2a8 100644
--- a/dev/Common/Links.js
+++ b/dev/Common/Links.js
@@ -31,7 +31,7 @@ export const
 	 */
 	serverRequestRaw = (type, hash) =>
 		BASE + '?/Raw/' + SUB_QUERY_PREFIX + '/'
-		+ '0/' // Settings.get('AccountHash') ?
+		+ '0/' // Settings.get('accountHash') ?
 		+ (type
 			? type + '/' + (hash ? SUB_QUERY_PREFIX + '/' + hash : '')
 			: ''),
diff --git a/dev/Common/Selector.js b/dev/Common/Selector.js
index 091e2daab..e4df8d466 100644
--- a/dev/Common/Selector.js
+++ b/dev/Common/Selector.js
@@ -87,8 +87,7 @@ export class Selector {
 		 * Below code is used to keep checked/focused/selected states when array is refreshed.
 		 */
 
-		let aCache = [],
-			aCheckedCache = [],
+		let aCheckedCache = [],
 			mFocused = null,
 			mSelected = null;
 
@@ -99,7 +98,6 @@ export class Selector {
 					items.forEach(item => {
 						const uid = this.getItemUid(item);
 						if (uid) {
-							aCache.push(uid);
 							item.checked() && aCheckedCache.push(uid);
 							if (!mFocused && item.focused()) {
 								mFocused = uid;
@@ -118,8 +116,7 @@ export class Selector {
 		koList.subscribe(aItems => {
 			selectedItemUseCallback = false;
 
-			koFocusedItem(null);
-			koSelectedItem(null);
+			this.unselect();
 
 			if (isArray(aItems)) {
 				let temp,
@@ -182,7 +179,6 @@ export class Selector {
 				}
 			}
 
-			aCache = [];
 			aCheckedCache = [];
 			mFocused = null;
 			mSelected = null;
diff --git a/dev/Common/Translator.js b/dev/Common/Translator.js
index 2ab180fcb..3eb638546 100644
--- a/dev/Common/Translator.js
+++ b/dev/Common/Translator.js
@@ -1,5 +1,5 @@
 import ko from 'ko';
-import { Notification, UploadErrorCode } from 'Common/Enums';
+import { Notifications, UploadErrorCode } from 'Common/Enums';
 import { langLink } from 'Common/Links';
 import { doc, createElement } from 'Common/Globals';
 import { getKeyByValue, forEachObjectEntry } from 'Common/Utils';
@@ -20,7 +20,7 @@ const
 	i18nKey = key => key.replace(/([a-z])([A-Z])/g, '$1_$2').toUpperCase(),
 
 	getNotificationMessage = code => {
-		let key = getKeyByValue(Notification, code);
+		let key = getKeyByValue(Notifications, code);
 		return key ? I18N_DATA.NOTIFICATIONS[i18nKey(key).replace('_NOTIFICATION', '_ERROR')] : '';
 	},
 
@@ -176,7 +176,7 @@ export const
 	 */
 	getNotification = (code, message = '', defCode = 0) => {
 		code = pInt(code);
-		if (Notification.ClientViewError === code && message) {
+		if (Notifications.ClientViewError === code && message) {
 			return message;
 		}
 
diff --git a/dev/Common/Utils.js b/dev/Common/Utils.js
index 5bd662ccb..0b51d4ba3 100644
--- a/dev/Common/Utils.js
+++ b/dev/Common/Utils.js
@@ -17,12 +17,15 @@ export const
 		item && undefined !== item.disabled && domItem?.classList.toggle('disabled', domItem.disabled = item.disabled),
 
 	// unescape(encodeURIComponent()) makes the UTF-16 DOMString to an UTF-8 string
-	b64EncodeJSON = data => btoa(unescape(encodeURIComponent(JSON.stringify(data)))),
+	b64Encode = data => btoa(unescape(encodeURIComponent(data))),
 /* 	// Without deprecated 'unescape':
-	b64EncodeJSON = data => btoa(encodeURIComponent(JSON.stringify(data)).replace(
+	b64Encode = data => btoa(encodeURIComponent(data).replace(
 		/%([0-9A-F]{2})/g, (match, p1) => String.fromCharCode('0x' + p1)
 	)),
 */
+
+	b64EncodeJSON = data => b64Encode(JSON.stringify(data)),
+
 	b64EncodeJSONSafe = data => b64EncodeJSON(data).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, ''),
 
 	getKeyByValue = (o, v) => Object.keys(o).find(key => o[key] === v);
diff --git a/dev/Common/UtilsUser.js b/dev/Common/UtilsUser.js
index 1621f1b8b..258b9238c 100644
--- a/dev/Common/UtilsUser.js
+++ b/dev/Common/UtilsUser.js
@@ -1,11 +1,9 @@
-import { MessageFlagsCache } from 'Common/Cache';
-import { Notification } from 'Common/Enums';
+import { Notifications } from 'Common/Enums';
 import { MessageSetAction, ComposeType/*, FolderType*/ } from 'Common/EnumsUser';
 import { doc, createElement, elementById, dropdowns, dropdownVisibility, SettingsGet, leftPanelDisabled } from 'Common/Globals';
 import { plainToHtml } from 'Common/Html';
 import { getNotification } from 'Common/Translator';
 import { EmailCollectionModel } from 'Model/EmailCollection';
-import { MessageModel } from 'Model/Message';
 import { MessageUserStore } from 'Stores/User/Message';
 import { MessagelistUserStore } from 'Stores/User/Messagelist';
 import { SettingsUserStore } from 'Stores/User/Settings';
@@ -43,10 +41,11 @@ download = (link, name = "") => {
 	}
 },
 
-downloadZip = (hashes, onError, fTrigger, folder) => {
+downloadZip = (name, hashes, onError, fTrigger, folder) => {
 	if (hashes.length) {
 		let params = {
 			target: 'zip',
+			filename: name,
 			hashes: hashes
 		};
 		if (!onError) {
@@ -156,7 +155,7 @@ mailToHelper = mailToUrl => {
 		mailToUrl = mailToUrl.slice(7).split('?');
 
 		const
-			email = mailToUrl[0],
+			email = decodeURIComponent(mailToUrl[0]),
 			params = new URLSearchParams(mailToUrl[1]),
 			to = params.get('to'),
 			toEmailModel = value => EmailCollectionModel.fromString(value);
@@ -246,75 +245,78 @@ setLayoutResizer = (source, sClientSideKeyName, mode) =>
 	}
 },
 
+viewMessage = (oMessage, popup) => {
+	if (popup) {
+		oMessage.viewPopupMessage();
+	} else {
+		MessageUserStore.error('');
+		let id = 'rl-msg-' + oMessage.hash,
+			body = oMessage.body || elementById(id);
+		if (!body) {
+			body = createElement('div',{
+				id:id,
+				hidden:'',
+				class:'b-text-part'
+					+ (oMessage.pgpSigned() ? ' openpgp-signed' : '')
+					+ (oMessage.pgpEncrypted() ? ' openpgp-encrypted' : '')
+			});
+			MessageUserStore.purgeCache();
+		}
+
+		body.message = oMessage;
+		oMessage.body = body;
+
+		if (!SettingsUserStore.viewHTML() || !oMessage.viewHtml()) {
+			oMessage.viewPlain();
+		}
+
+		MessageUserStore.bodiesDom().append(body);
+
+		MessageUserStore.loading(false);
+		oMessage.body.hidden = false;
+
+		if (oMessage.isUnseen()) {
+			MessageUserStore.MessageSeenTimer = setTimeout(
+				() => MessagelistUserStore.setAction(oMessage.folder, MessageSetAction.SetSeen, [oMessage]),
+				SettingsUserStore.messageReadDelay() * 1000 // seconds
+			);
+		}
+	}
+},
+
 populateMessageBody = (oMessage, popup) => {
 	if (oMessage) {
 		popup || MessageUserStore.message(oMessage);
-		popup || MessageUserStore.loading(true);
-		Remote.message((iError, oData/*, bCached*/) => {
-			if (iError) {
-				if (Notification.RequestAborted !== iError && !popup) {
-					MessageUserStore.message(null);
-					MessageUserStore.error(getNotification(iError));
-				}
-			} else {
-				let json = oData?.Result;
-				if (json
-				 && MessageModel.validJson(json)
-				 && oMessage.hash === json.hash
-//				 && oMessage.folder === json.folder
-//				 && oMessage.uid == json.uid
-				 && oMessage.revivePropertiesFromJson(json)
-				) {
+		if (oMessage.body) {
+			viewMessage(oMessage, popup);
+		} else {
+			popup || MessageUserStore.loading(true);
+			Remote.message((iError, oData/*, bCached*/) => {
+				if (iError) {
+					if (Notifications.RequestAborted !== iError && !popup) {
+						MessageUserStore.message(null);
+						MessageUserStore.error(getNotification(iError));
+					}
+				} else {
+					let json = oData?.Result;
+					if (json
+					 && oMessage.hash === json.hash
+//					 && oMessage.folder === json.folder
+//					 && oMessage.uid == json.uid
+					 && oMessage.revivePropertiesFromJson(json)
+					) {
 /*
-					if (bCached) {
-						delete json.flags;
-					}
-*/
-					if (popup) {
-						oMessage.viewPopupMessage();
-					} else {
-						MessageUserStore.error('');
-						const messagesDom = MessageUserStore.bodiesDom();
-						if (messagesDom) {
-							let id = 'rl-msg-' + oMessage.hash,
-								body = elementById(id);
-							if (body) {
-								oMessage.body = body;
-								oMessage.isHtml(body.classList.contains('html'));
-								oMessage.hasImages(body.rlHasImages);
-							} else {
-								body = createElement('div',{
-									id:id,
-									hidden:'',
-									class:'b-text-part'
-										+ (oMessage.pgpSigned() ? ' openpgp-signed' : '')
-										+ (oMessage.pgpEncrypted() ? ' openpgp-encrypted' : '')
-								});
-								oMessage.body = body;
-								if (!SettingsUserStore.viewHTML() || !oMessage.viewHtml()) {
-									oMessage.viewPlain();
-								}
-
-								MessageUserStore.purgeMessageBodyCache();
-							}
-
-							messagesDom.append(body);
-
-							oMessage.body.hidden = false;
+						if (bCached) {
+							delete json.flags;
 						}
-					}
-
-					MessageFlagsCache.initMessage(oMessage);
-					if (oMessage.isUnseen()) {
-						MessageUserStore.MessageSeenTimer = setTimeout(
-							() => MessagelistUserStore.setAction(oMessage.folder, MessageSetAction.SetSeen, [oMessage]),
-							SettingsUserStore.messageReadDelay() * 1000 // seconds
-						);
+						oMessage.body.remove();
+*/
+						viewMessage(oMessage, popup);
 					}
 				}
-			}
-			popup || MessageUserStore.loading(false);
-		}, oMessage.folder, oMessage.uid);
+				popup || MessageUserStore.loading(false);
+			}, oMessage.folder, oMessage.uid);
+		}
 	}
 };
 
diff --git a/dev/External/SquireUI.js b/dev/External/SquireUI.js
index 4a1c87ef5..ef0f638df 100644
--- a/dev/External/SquireUI.js
+++ b/dev/External/SquireUI.js
@@ -27,11 +27,6 @@ const
 
 	SquireDefaultConfig = {
 /*
-		blockTag: 'P',
-		undo: {
-			documentSizeThreshold: -1, // -1 means no threshold
-			undoLimit: -1 // -1 means no limit
-		},
 		addLinks: true // allow_smart_html_links
 */
 		sanitizeToDOMFragment: (html, isPaste/*, squire*/) => {
@@ -216,7 +211,7 @@ class SquireUI
 						cmd: () => {
 							let node = squire.getSelectionClosest('IMG'),
 								src = prompt("Image", node?.src || "https://");
-							src.length ? squire.insertImage(src) : (node && squire.detach(node));
+							src?.length ? squire.insertImage(src) : (node && squire.detach(node));
 						},
 						hint: 'Image URL'
 					},
@@ -288,11 +283,6 @@ class SquireUI
 		toolbar.className = 'squire-toolbar btn-toolbar';
 		let group, action/*, touchTap*/;
 		for (group in actions) {
-/*
-			if ('bidi' == group && !rl.settings.app('allowHtmlEditorBitiButtons')) {
-				continue;
-			}
-*/
 			let toolgroup = createElement('div');
 			toolgroup.className = 'btn-group';
 			toolgroup.id = 'squire-toolgroup-'+group;
@@ -379,7 +369,6 @@ class SquireUI
 		squire.addEventListener('cursor', );
 		squire.addEventListener('select', );
 		squire.addEventListener('input', );
-		squire.addEventListener('willPaste', );
 		squire.addEventListener( 'keydown keyup', monitorShiftKey )
 		squire.addEventListener( 'keydown', onKey )
 */
diff --git a/dev/External/ko.js b/dev/External/ko.js
index 9bd5ee698..4b8188d3a 100644
--- a/dev/External/ko.js
+++ b/dev/External/ko.js
@@ -28,6 +28,18 @@ export const
 
 	dispose = disposable => isFunction(disposable?.dispose) && disposable.dispose(),
 
+	onKey = (key, element, fValueAccessor, fAllBindings, model) => {
+		let fn = event => {
+			if (key == event.key) {
+//				stopEvent(event);
+//				element.dispatchEvent(new Event('change'));
+				fValueAccessor().call(model);
+			}
+		};
+		element.addEventListener('keydown', fn);
+		ko.utils.domNodeDisposal.addDisposeCallback(element, () => element.removeEventListener('keydown', fn));
+	},
+
 	// With this we don't need delegateRunOnDestroy
 	koArrayWithDestroy = data => {
 		data = ko.observableArray(data);
@@ -56,41 +68,18 @@ Object.assign(ko.bindingHandlers, {
 	},
 
 	onEnter: {
-		init: (element, fValueAccessor, fAllBindings, viewModel) => {
-			let fn = event => {
-				if ('Enter' == event.key) {
-					element.dispatchEvent(new Event('change'));
-					fValueAccessor().call(viewModel);
-				}
-			};
-			element.addEventListener('keydown', fn);
-			ko.utils.domNodeDisposal.addDisposeCallback(element, () => element.removeEventListener('keydown', fn));
-		}
+		init: (element, fValueAccessor, fAllBindings, model) =>
+			onKey('Enter', element, fValueAccessor, fAllBindings, model)
 	},
 
 	onEsc: {
-		init: (element, fValueAccessor, fAllBindings, viewModel) => {
-			let fn = event => {
-				if ('Escape' == event.key) {
-					element.dispatchEvent(new Event('change'));
-					fValueAccessor().call(viewModel);
-				}
-			};
-			element.addEventListener('keyup', fn);
-			ko.utils.domNodeDisposal.addDisposeCallback(element, () => element.removeEventListener('keyup', fn));
-		}
+		init: (element, fValueAccessor, fAllBindings, model) =>
+			onKey('Escape', element, fValueAccessor, fAllBindings, model)
 	},
 
 	onSpace: {
-		init: (element, fValueAccessor, fAllBindings, viewModel) => {
-			let fn = event => {
-				if (' ' == event.key) {
-					fValueAccessor().call(viewModel, event);
-				}
-			};
-			element.addEventListener('keyup', fn);
-			ko.utils.domNodeDisposal.addDisposeCallback(element, () => element.removeEventListener('keyup', fn));
-		}
+		init: (element, fValueAccessor, fAllBindings, model) =>
+			onKey(' ', element, fValueAccessor, fAllBindings, model)
 	},
 
 	i18nUpdate: {
diff --git a/dev/Knoin/Knoin.js b/dev/Knoin/Knoin.js
index d21eb3468..efeadd780 100644
--- a/dev/Knoin/Knoin.js
+++ b/dev/Knoin/Knoin.js
@@ -4,6 +4,9 @@ import { doc, $htmlCL, elementById, createElement, fireEvent } from 'Common/Glob
 import { forEachObjectEntry } from 'Common/Utils';
 import { i18nToNodes } from 'Common/Translator';
 
+import { leftPanelDisabled } from 'Common/Globals';
+import { ThemeStore } from 'Stores/Theme';
+
 let
 	currentScreen = null,
 	defaultScreenName = '';
@@ -151,6 +154,7 @@ const
 			vm.onHide?.();
 			destroy && vm.viewModelDom.remove();
 		});
+		ThemeStore.isMobile() && leftPanelDisabled(true);
 	},
 
 	/**
diff --git a/dev/Mime/Parser.js b/dev/Mime/Parser.js
index 4a9cbaa65..9ce19775b 100644
--- a/dev/Mime/Parser.js
+++ b/dev/Mime/Parser.js
@@ -1,3 +1,4 @@
+//import { b64Encode } from 'Common/Utils';
 
 const
 	// RFC2045
@@ -68,6 +69,7 @@ export function ParseMime(text)
 					body = QPDecode(body);
 				}
 				body = btoa(body);
+//				body = b64Encode(body);
 			}
 			return 'data:' + this.headerValue('content-type') + ';base64,' + body;
 		}
diff --git a/dev/Mime/Utils.js b/dev/Mime/Utils.js
index 8cf6c795e..7c038f675 100644
--- a/dev/Mime/Utils.js
+++ b/dev/Mime/Utils.js
@@ -35,9 +35,7 @@ export function MimeToMessage(data, message)
 				attachment.url = part.dataUrl;
 				attachment.estimatedSize = part.body.length;
 /*
-				attachment.isThumbnail = false;
 				attachment.contentLocation = '';
-				attachment.download = '';
 				attachment.folder = '';
 				attachment.uid = '';
 				attachment.mimeIndex = part.id;
diff --git a/dev/Model/Attachment.js b/dev/Model/Attachment.js
index 011dcd271..a69e4ba23 100644
--- a/dev/Model/Attachment.js
+++ b/dev/Model/Attachment.js
@@ -1,6 +1,8 @@
 import ko from 'ko';
 
 import { FileInfo, FileType } from 'Common/File';
+import { stopEvent, SettingsGet, SettingsCapa } from 'Common/Globals';
+import { b64EncodeJSONSafe } from 'Common/Utils';
 import {
 	attachmentDownload,
 	serverRequestRaw
@@ -22,10 +24,8 @@ export class AttachmentModel extends AbstractModel {
 		this.fileName = '';
 		this.fileNameExt = '';
 		this.fileType = FileType.Unknown;
-		this.isThumbnail = false;
 		this.cId = '';
 		this.contentLocation = '';
-		this.download = '';
 		this.folder = '';
 		this.uid = '';
 		this.url = '';
@@ -53,7 +53,7 @@ export class AttachmentModel extends AbstractModel {
 	}
 
 	toggleChecked(self, event) {
-		event.stopPropagation();
+		stopEvent(event);
 		self.checked(!self.checked());
 	}
 
@@ -125,6 +125,17 @@ export class AttachmentModel extends AbstractModel {
 		);
 	}
 
+	get download() {
+		return b64EncodeJSONSafe({
+			folder: this.folder,
+			uid: this.uid,
+			mimeIndex: this.mimeIndex,
+			mimeType: this.mimeType,
+			fileName: this.fileName,
+			accountHash: SettingsGet('accountHash')
+		});
+	}
+
 	/**
 	 * @returns {string}
 	 */
@@ -143,7 +154,7 @@ export class AttachmentModel extends AbstractModel {
 	 * @returns {boolean}
 	 */
 	hasThumbnail() {
-		return this.isThumbnail && !this.isLinked();
+		return SettingsCapa('AttachmentThumbnails') && this.isImage() && !this.isLinked();
 	}
 
 	/**
diff --git a/dev/Model/FolderCollection.js b/dev/Model/FolderCollection.js
index e94de8ff4..d66d70428 100644
--- a/dev/Model/FolderCollection.js
+++ b/dev/Model/FolderCollection.js
@@ -3,8 +3,9 @@ import { AbstractCollectionModel } from 'Model/AbstractCollection';
 import { UNUSED_OPTION_VALUE } from 'Common/Consts';
 import { isArray, getKeyByValue, forEachObjectEntry, b64EncodeJSONSafe } from 'Common/Utils';
 import { ClientSideKeyNameExpandedFolders, FolderType, FolderMetadataKeys } from 'Common/EnumsUser';
-import { getFolderFromCacheList, setFolder, setFolderInboxName } from 'Common/Cache';
+import { clearCache, getFolderFromCacheList, setFolder, setFolderInboxName, removeFolderFromCacheList } from 'Common/Cache';
 import { Settings, SettingsGet, fireEvent } from 'Common/Globals';
+import { Notifications } from 'Common/Enums';
 
 import * as Local from 'Storage/Client';
 
@@ -14,7 +15,7 @@ import { MessagelistUserStore } from 'Stores/User/Messagelist';
 import { SettingsUserStore } from 'Stores/User/Settings';
 
 import { sortFolders } from 'Common/Folders';
-import { i18n, translateTrigger } from 'Common/Translator';
+import { i18n, translateTrigger, getNotification } from 'Common/Translator';
 
 import { AbstractModel } from 'Knoin/AbstractModel';
 
@@ -91,6 +92,7 @@ export const
 		Remote.abort('Folders')
 			.post('Folders', FolderUserStore.foldersLoading)
 			.then(data => {
+				clearCache();
 				FolderCollectionModel.reviveFromJson(data.Result)?.storeIt();
 				fCallback?.(true);
 				// Repeat every 15 minutes?
@@ -127,8 +129,8 @@ export class FolderCollectionModel extends AbstractCollectionModel
 			let oCacheFolder = getFolderFromCacheList(oFolder.fullName);
 			if (oCacheFolder) {
 //				oCacheFolder.revivePropertiesFromJson(oFolder);
-				if (oFolder.hash) {
-					oCacheFolder.hash = oFolder.hash;
+				if (oFolder.etag) {
+					oCacheFolder.etag = oFolder.etag;
 				}
 				if (null != oFolder.totalEmails) {
 					oCacheFolder.totalEmails(oFolder.totalEmails);
@@ -167,22 +169,22 @@ export class FolderCollectionModel extends AbstractCollectionModel
 						break;
 				}
 				// Flags
-				if (oFolder.flags.includes('\\sentmail')) {
+				if (oFolder.attributes.includes('\\sentmail')) {
 					role = 'sent';
 				}
-				if (oFolder.flags.includes('\\spam')) {
+				if (oFolder.attributes.includes('\\spam')) {
 					role = 'junk';
 				}
-				if (oFolder.flags.includes('\\bin')) {
+				if (oFolder.attributes.includes('\\bin')) {
 					role = 'trash';
 				}
-				if (oFolder.flags.includes('\\important')) {
+				if (oFolder.attributes.includes('\\important')) {
 					role = 'important';
 				}
-				if (oFolder.flags.includes('\\starred')) {
+				if (oFolder.attributes.includes('\\starred')) {
 					role = 'flagged';
 				}
-				if (oFolder.flags.includes('\\all') || oFolder.flags.includes('\\allmail')) {
+				if (oFolder.attributes.includes('\\all') || oFolder.flags.includes('\\allmail')) {
 					role = 'all';
 				}
 			}
@@ -226,9 +228,7 @@ export class FolderCollectionModel extends AbstractCollectionModel
 										name: name,
 										fullName: parentName,
 										delimiter: delimiter,
-										exists: false,
-										isSubscribed: false,
-										flags: ['\\nonexistent']
+										attributes: ['\\nonexistent']
 									});
 									setFolder(pfolder);
 									result.splice(i, 0, pfolder);
@@ -300,7 +300,7 @@ export class FolderModel extends AbstractModel {
 
 		this.exists = true;
 
-		this.hash = '';
+		this.etag = '';
 		this.id = 0;
 		this.uidNext = 0;
 
@@ -330,7 +330,8 @@ export class FolderModel extends AbstractModel {
 			tagsAllowed: false
 		});
 
-		this.flags = ko.observableArray();
+		this.attributes = ko.observableArray();
+		// For messages
 		this.permanentFlags = ko.observableArray();
 
 		this.addSubscribables({
@@ -379,6 +380,8 @@ export class FolderModel extends AbstractModel {
 			isFlagged: () => FolderUserStore.currentFolder() === this
 				&& MessagelistUserStore.listSearch().includes('flagged'),
 
+//			isSubscribed: () => this.attributes().includes('\\subscribed'),
+
 			hasVisibleSubfolders: () => !!this.subFolders().find(folder => folder.visible()),
 
 			hasSubscriptions: () => this.isSubscribed() | !!this.subFolders().find(
@@ -465,6 +468,49 @@ export class FolderModel extends AbstractModel {
 		});
 	}
 
+	edit() {
+		this.canBeEdited() && this.editing(true);
+	}
+
+	unedit() {
+		this.editing(false);
+	}
+
+	rename() {
+		const folder = this,
+			nameToEdit = folder.nameForEdit().trim();
+		if (nameToEdit && folder.name() !== nameToEdit) {
+			Remote.abort('Folders').post('FolderRename', FolderUserStore.foldersRenaming, {
+					folder: folder.fullName,
+					newFolderName: nameToEdit,
+					subscribe: folder.isSubscribed() ? 1 : 0
+				})
+				.then(data => {
+					folder.name(nameToEdit/*data.name*/);
+					if (folder.subFolders.length) {
+						Remote.setTrigger(FolderUserStore.foldersLoading, true);
+//						clearTimeout(Remote.foldersTimeout);
+//						Remote.foldersTimeout = setTimeout(loadFolders, 500);
+						setTimeout(loadFolders, 500);
+						// TODO: rename all subfolders with folder.delimiter to prevent reload?
+					} else {
+						removeFolderFromCacheList(folder.fullName);
+						folder.fullName = data.Result.fullName;
+						setFolder(folder);
+						const parent = getFolderFromCacheList(folder.parentName);
+						sortFolders(parent ? parent.subFolders : FolderUserStore.folderList);
+					}
+				})
+				.catch(error => {
+					FolderUserStore.folderListError(
+						getNotification(error.code, '', Notifications.CantRenameFolder)
+						+ '.\n' + error.message);
+				});
+		}
+
+		folder.editing(false);
+	}
+
 	/**
 	 * For url safe '/#/mailbox/...' path
 	 */
@@ -491,6 +537,10 @@ export class FolderModel extends AbstractModel {
 			path.pop();
 			folder.parentName = path.join(folder.delimiter);
 
+			folder.isSubscribed(folder.attributes.includes('\\subscribed'));
+			folder.exists = !folder.attributes.includes('\\nonexistent');
+			folder.selectable(folder.exists && !folder.attributes.includes('\\noselect'));
+
 			type && 'mail' != type && folder.kolabType(type);
 		}
 		return folder;
diff --git a/dev/Model/Identity.js b/dev/Model/Identity.js
index c5328594b..481fe492f 100644
--- a/dev/Model/Identity.js
+++ b/dev/Model/Identity.js
@@ -6,12 +6,12 @@ export class IdentityModel extends AbstractModel {
 	 * @param {string} id
 	 * @param {string} email
 	 */
-	constructor(id, email) {
+	constructor() {
 		super();
 
 		addObservablesTo(this, {
-			id: id || '',
-			email: email,
+			id: '',
+			email: '',
 			name: '',
 
 			replyTo: '',
diff --git a/dev/Model/Message.js b/dev/Model/Message.js
index 0d62b73bc..b54868823 100644
--- a/dev/Model/Message.js
+++ b/dev/Model/Message.js
@@ -5,7 +5,7 @@ import { i18n } from 'Common/Translator';
 
 import { doc, SettingsGet } from 'Common/Globals';
 import { encodeHtml, plainToHtml, htmlToPlain, cleanHtml } from 'Common/Html';
-import { forEachObjectEntry } from 'Common/Utils';
+import { forEachObjectEntry, b64EncodeJSONSafe } from 'Common/Utils';
 import { serverRequestRaw, proxy } from 'Common/Links';
 import { addObservablesTo, addComputablesTo } from 'External/ko';
 
@@ -21,7 +21,6 @@ import PreviewHTML from 'Html/PreviewMessage.html';
 
 import { LanguageStore } from 'Stores/Language';
 
-//import { MessageFlagsCache } from 'Common/Cache';
 import Remote from 'Remote/User/Fetch';
 
 const
@@ -34,7 +33,6 @@ const
 		Remote.request('MessageSetKeyword', iError => {
 			if (!iError) {
 				isSet ? flags.remove(lower) : flags.push(lower);
-//				MessageFlagsCache.setFor(message.folder, message.uid, flags());
 			}
 		}, {
 			folder: message.folder,
@@ -61,7 +59,6 @@ export class MessageModel extends AbstractModel {
 		this.folder = '';
 		this.uid = 0;
 		this.hash = '';
-		this.requestHash = '';
 		this.from = new EmailCollectionModel;
 		this.to = new EmailCollectionModel;
 		this.cc = new EmailCollectionModel;
@@ -88,7 +85,8 @@ export class MessageModel extends AbstractModel {
 			spamResult: '',
 			isSpam: false,
 			hasVirus: null, // or boolean when scanned
-			dateTimeStampInUTC: 0,
+			dateTimestamp: 0,
+			internalTimestamp: 0,
 			priority: MessagePriority.Normal,
 
 			senderEmailsString: '',
@@ -180,6 +178,16 @@ export class MessageModel extends AbstractModel {
 		});
 	}
 
+	get requestHash() {
+		return b64EncodeJSONSafe({
+			folder: this.folder,
+			uid: this.uid,
+			mimeType: 'message/rfc822',
+			fileName: (this.subject() || 'message-' + this.hash) + '.eml',
+			accountHash: SettingsGet('accountHash')
+		});
+	}
+
 	toggleTag(keyword) {
 		toggleTag(this, keyword);
 	}
@@ -290,54 +298,51 @@ export class MessageModel extends AbstractModel {
 		return [[...toResult.values()], [...ccResult.values()]];
 	}
 
-	viewHtml() {
+	viewBody(html) {
 		const body = this.body;
-		if (body && this.html()) {
-			let result = msgHtml(this);
-			this.hasExternals(result.hasExternals);
-			this.hasImages(body.rlHasImages = !!result.hasExternals);
-
-			body.innerHTML = result.html;
-
-			body.classList.toggle('html', 1);
-			body.classList.toggle('plain', 0);
-
-			if (!this.isSpam() && FolderUserStore.spamFolder() != this.folder) {
-				if ('always' === SettingsUserStore.viewImages()) {
-					this.showExternalImages();
-				}
-				if ('match' === SettingsUserStore.viewImages()) {
-					this.showExternalImages(1);
+		if (body) {
+			if (html) {
+				let result = msgHtml(this);
+				this.hasExternals(result.hasExternals);
+				this.hasImages(!!result.hasExternals);
+				body.innerHTML = result.html;
+				if (!this.isSpam() && FolderUserStore.spamFolder() != this.folder) {
+					if ('always' === SettingsUserStore.viewImages()) {
+						this.showExternalImages();
+					}
+					if ('match' === SettingsUserStore.viewImages()) {
+						this.showExternalImages(1);
+					}
 				}
+			} else {
+				body.innerHTML = plainToHtml(
+					(this.plain()
+						? this.plain()
+							.replace(/-----BEGIN PGP (SIGNED MESSAGE-----(\r?\n[^\r\n]+)+|SIGNATURE-----[\s\S]*)/sg, '')
+							.trim()
+						: htmlToPlain(body.innerHTML)
+					)
+				);
+				this.hasImages(false);
 			}
-
-			this.isHtml(true);
+			body.classList.toggle('html', html);
+			body.classList.toggle('plain', !html);
+			this.isHtml(html);
 			return true;
 		}
 	}
 
+	viewHtml() {
+		return this.html() && this.viewBody(true);
+	}
+
 	viewPlain() {
-		const body = this.body;
-		if (body) {
-			body.classList.toggle('html', 0);
-			body.classList.toggle('plain', 1);
-			body.innerHTML = plainToHtml(
-				(this.plain()
-					? this.plain()
-						.replace(/-----BEGIN PGP (SIGNED MESSAGE-----(\r?\n[a-z][^\r\n]+)+|SIGNATURE-----[\s\S]*)/, '')
-						.trim()
-					: htmlToPlain(body.innerHTML)
-				)
-			);
-			this.isHtml(false);
-			this.hasImages(false);
-			return true;
-		}
+		return this.viewBody(false);
 	}
 
 	viewPopupMessage(print) {
 		const
-			timeStampInUTC = this.dateTimeStampInUTC() || 0,
+			timeStampInUTC = this.dateTimestamp() || 0,
 			ccLine = this.cc.toString(),
 			bccLine = this.bcc.toString(),
 			m = 0 < timeStampInUTC ? new Date(timeStampInUTC * 1000) : null,
@@ -430,7 +435,7 @@ export class MessageModel extends AbstractModel {
 					hasImages = true;
 				},
 				attr = 'data-x-src',
-				src, useProxy = !!SettingsGet('UseLocalProxyForExternalImages');
+				src, useProxy = !!SettingsGet('useLocalProxyForExternalImages');
 			body.querySelectorAll('img[' + attr + ']').forEach(node => {
 				src = node.getAttribute(attr);
 				if (isValid(src)) {
@@ -447,7 +452,6 @@ export class MessageModel extends AbstractModel {
 			});
 
 			this.hasImages(hasImages);
-			body.rlHasImages = hasImages;
 		}
 	}
 
diff --git a/dev/Model/MessageCollection.js b/dev/Model/MessageCollection.js
index a3be0fb6b..034c64aee 100644
--- a/dev/Model/MessageCollection.js
+++ b/dev/Model/MessageCollection.js
@@ -2,10 +2,6 @@ import { AbstractCollectionModel } from 'Model/AbstractCollection';
 import { MessageModel } from 'Model/Message';
 import { MessageUserStore } from 'Stores/User/Message';
 
-import {
-	MessageFlagsCache
-} from 'Common/Cache';
-
 'use strict';
 
 export class MessageCollectionModel extends AbstractCollectionModel
@@ -13,17 +9,16 @@ export class MessageCollectionModel extends AbstractCollectionModel
 /*
 	constructor() {
 		super();
-		this.Filtered
+		this.filtered
 		this.folder
-		this.folderHash
-		this.folderInfo
 		this.totalEmails
-		this.unreadEmails
+		this.totalThreads
 		this.threadUid
 		this.newMessages
 		this.offset
 		this.limit
 		this.search
+		this.limited
 	}
 */
 
@@ -31,7 +26,7 @@ export class MessageCollectionModel extends AbstractCollectionModel
 	 * @param {?Object} json
 	 * @returns {MessageCollectionModel}
 	 */
-	static reviveFromJson(object, cached) {
+	static reviveFromJson(object/*, cached*/) {
 		let msg = MessageUserStore.message();
 		return super.reviveFromJson(object, message => {
 			// If message is currently viewed, use that.
@@ -39,7 +34,6 @@ export class MessageCollectionModel extends AbstractCollectionModel
 			message = (msg && msg.hash === message.hash) ? msg : MessageModel.reviveFromJson(message);
 			if (message) {
 				message.deleted(false);
-				cached ? MessageFlagsCache.initMessage(message) : MessageFlagsCache.store(message);
 				return message;
 			}
 		});
diff --git a/dev/Remote/AbstractFetch.js b/dev/Remote/AbstractFetch.js
index 546fc26f9..03728a734 100644
--- a/dev/Remote/AbstractFetch.js
+++ b/dev/Remote/AbstractFetch.js
@@ -1,4 +1,4 @@
-import { Notification } from 'Common/Enums';
+import { Notifications } from 'Common/Enums';
 import { isArray, pInt, pString } from 'Common/Utils';
 import { serverRequest } from 'Common/Links';
 import { getNotification } from 'Common/Translator';
@@ -9,18 +9,18 @@ const getURL = (add = '') => serverRequest('Json') + pString(add),
 
 checkResponseError = data => {
 	const err = data ? data.ErrorCode : null;
-	if (Notification.InvalidToken === err) {
+	if (Notifications.InvalidToken === err) {
 		console.error(getNotification(err));
 //		alert(getNotification(err));
 		rl.logoutReload();
 	} else if ([
-			Notification.AuthError,
-			Notification.ConnectionError,
-			Notification.DomainNotAllowed,
-			Notification.AccountNotAllowed,
-			Notification.MailServerError,
-			Notification.UnknownNotification,
-			Notification.UnknownError
+			Notifications.AuthError,
+			Notifications.ConnectionError,
+			Notifications.DomainNotAllowed,
+			Notifications.AccountNotAllowed,
+			Notifications.MailServerError,
+			Notifications.UnknownNotification,
+			Notifications.UnknownError
 		].includes(err)
 	) {
 		if (7 < ++iJsonErrorCount) {
@@ -65,7 +65,7 @@ class FetchError extends Error
 {
 	constructor(code, message) {
 		super(message);
-		this.code = code || Notification.JsonFalse;
+		this.code = code || Notifications.JsonFalse;
 	}
 }
 
@@ -145,7 +145,7 @@ export class AbstractFetchRemote
 						iJsonErrorCount = 0;
 					} else {
 						checkResponseError(data);
-						iError = data.ErrorCode || Notification.UnknownError
+						iError = data.ErrorCode || Notifications.UnknownError
 					}
 				}
 
@@ -197,7 +197,7 @@ export class AbstractFetchRemote
 				abort(action, 0, 1);
 
 				if (!data) {
-					return Promise.reject(new FetchError(Notification.JsonParse));
+					return Promise.reject(new FetchError(Notifications.JsonParse));
 				}
 /*
 				let isCached = false, type = '';
diff --git a/dev/Remote/User/Fetch.js b/dev/Remote/User/Fetch.js
index e93cd9d19..614b662f7 100644
--- a/dev/Remote/User/Fetch.js
+++ b/dev/Remote/User/Fetch.js
@@ -24,7 +24,7 @@ class RemoteUserFetch extends AbstractFetchRemote {
 		const
 	//		folder = getFolderFromCacheList(params.folder.fullName),
 			folder = getFolderFromCacheList(params.folder),
-			folderHash = folder?.hash || '';
+			folderETag = folder?.etag || '';
 
 		params = Object.assign({
 			offset: 0,
@@ -40,8 +40,8 @@ class RemoteUserFetch extends AbstractFetchRemote {
 		}
 
 		let sGetAdd = '';
-		if (folderHash) {
-			params.hash = folderHash + '-' + SettingsGet('AccountHash');
+		if (folderETag) {
+			params.hash = folderETag + '-' + SettingsGet('accountHash');
 			sGetAdd = 'MessageList/' + SUB_QUERY_PREFIX + '/' + b64EncodeJSONSafe(params);
 			params = {};
 		}
@@ -77,7 +77,7 @@ class RemoteUserFetch extends AbstractFetchRemote {
 						sFolderFullName,
 						iUid,
 						AppUserStore.threadsAllowed() && SettingsUserStore.useThreads() ? 1 : 0,
-						SettingsGet('AccountHash')
+						SettingsGet('accountHash')
 					])
 			);
 
diff --git a/dev/Screen/AbstractSettings.js b/dev/Screen/AbstractSettings.js
index 4b8c9d6c6..351453faa 100644
--- a/dev/Screen/AbstractSettings.js
+++ b/dev/Screen/AbstractSettings.js
@@ -2,7 +2,7 @@ import ko from 'ko';
 
 import { pString } from 'Common/Utils';
 import { settings } from 'Common/Links';
-import { createElement, elementById } from 'Common/Globals';
+import { createElement/*, elementById*/ } from 'Common/Globals';
 
 import { AbstractScreen } from 'Knoin/AbstractScreen';
 import { i18nToNodes } from 'Common/Translator';
@@ -29,7 +29,8 @@ export class AbstractSettingsScreen extends AbstractScreen {
 			);
 
 		if (RoutedSettingsViewModel) {
-			const vmPlace = elementById('rl-settings-subscreen');
+//			const vmPlace = elementById('V-SettingsPane') || elementById('V-AdminPane);
+			const vmPlace = this.viewModels[1].__dom;
 			if (RoutedSettingsViewModel.__vm) {
 				settingsScreen = RoutedSettingsViewModel.__vm;
 			} else if (vmPlace) {
diff --git a/dev/Screen/User/MailBox.js b/dev/Screen/User/MailBox.js
index 3ab6e80ee..a6d721bd4 100644
--- a/dev/Screen/User/MailBox.js
+++ b/dev/Screen/User/MailBox.js
@@ -1,15 +1,14 @@
 import { Scope } from 'Common/Enums';
-import { doc, createElement, leftPanelDisabled, Settings } from 'Common/Globals';
+import { doc, createElement, Settings } from 'Common/Globals';
 import { pString, pInt } from 'Common/Utils';
 import { moveAction } from 'Common/UtilsUser';
-import { getFolderFromCacheList, getFolderFullName, getFolderInboxName } from 'Common/Cache';
+import { getFolderFromHashMap, getFolderInboxName } from 'Common/Cache';
 import { i18n, initOnStartOrLangChange } from 'Common/Translator';
 
 import { AppUserStore } from 'Stores/User/App';
 import { AccountUserStore } from 'Stores/User/Account';
 import { FolderUserStore } from 'Stores/User/Folder';
 import { MessagelistUserStore } from 'Stores/User/Messagelist';
-import { ThemeStore } from 'Stores/Theme';
 
 import { SystemDropDownUserView } from 'View/User/SystemDropDown';
 import { MailFolderList } from 'View/User/MailBox/FolderList';
@@ -57,11 +56,8 @@ export class MailBoxUserScreen extends AbstractScreen {
 	 */
 	onShow() {
 		this.updateWindowTitle();
-
 		AppUserStore.focusedState('none');
 		AppUserStore.focusedState(Scope.MessageList);
-
-		ThemeStore.isMobile() && leftPanelDisabled(true);
 	}
 
 	/**
@@ -71,7 +67,7 @@ export class MailBoxUserScreen extends AbstractScreen {
 	 * @returns {void}
 	 */
 	onRoute(folderHash, page, search, messageUid) {
-		const folder = getFolderFromCacheList(getFolderFullName(folderHash.replace(/~([\d]+)$/, '')));
+		const folder = getFolderFromHashMap(folderHash.replace(/~([\d]+)$/, ''));
 		if (folder) {
 			FolderUserStore.currentFolder(folder);
 			MessagelistUserStore.page(1 > page ? 1 : page);
diff --git a/dev/Screen/User/Settings.js b/dev/Screen/User/Settings.js
index 69fcafe1b..1bd88707e 100644
--- a/dev/Screen/User/Settings.js
+++ b/dev/Screen/User/Settings.js
@@ -1,11 +1,10 @@
 import { Scope } from 'Common/Enums';
-import { keyScope, leftPanelDisabled, SettingsCapa } from 'Common/Globals';
+import { keyScope, SettingsCapa } from 'Common/Globals';
 import { runSettingsViewModelHooks } from 'Common/Plugins';
 import { initOnStartOrLangChange, i18n } from 'Common/Translator';
 
 import { AppUserStore } from 'Stores/User/App';
 import { AccountUserStore } from 'Stores/User/Account';
-import { ThemeStore } from 'Stores/Theme';
 
 import { AbstractSettingsScreen, settingsAddViewModel } from 'Screen/AbstractSettings';
 
@@ -23,7 +22,7 @@ import { SettingsPaneUserView } from 'View/User/Settings/Pane';
 
 export class SettingsUserScreen extends AbstractSettingsScreen {
 	constructor() {
-		super([SystemDropDownUserView, SettingsMenuUserView, SettingsPaneUserView]);
+		super([SettingsMenuUserView, SettingsPaneUserView, SystemDropDownUserView]);
 
 		const views = [
 			UserSettingsGeneral
@@ -67,7 +66,6 @@ export class SettingsUserScreen extends AbstractSettingsScreen {
 	onShow() {
 		this.setSettingsTitle();
 		keyScope(Scope.Settings);
-		ThemeStore.isMobile() && leftPanelDisabled(true);
 	}
 
 	setSettingsTitle() {
diff --git a/dev/Settings/Admin/About.js b/dev/Settings/Admin/About.js
index 03801fce5..52208119f 100644
--- a/dev/Settings/Admin/About.js
+++ b/dev/Settings/Admin/About.js
@@ -16,6 +16,9 @@ export class AdminSettingsAbout /*extends AbstractViewSettings*/ {
 			coreWarning: false,
 			coreVersion: '',
 			coreVersionCompare: -2,
+			load1: 0,
+			load5: 0,
+			load15: 0,
 			errorDesc: ''
 		});
 		this.coreChecking = ko.observable(false).extend({ throttle: 100 });
@@ -51,18 +54,21 @@ export class AdminSettingsAbout /*extends AbstractViewSettings*/ {
 	}
 
 	onBuild() {
-		Remote.request('AdminPHPExtensions', (iError, data) => iError || this.phpextensions(data.Result));
-
 //	beforeShow() {
 		this.coreChecking(true);
-		Remote.request('AdminUpdateInfo', (iError, data) => {
+		Remote.request('AdminInfo', (iError, data) => {
 			this.coreChecking(false);
-			if (!iError && data?.Result) {
+			data = data?.Result;
+			if (!iError && data) {
+				this.load1(data.system.load?.[0]);
+				this.load5(data.system.load?.[1]);
+				this.load15(data.system.load?.[2]);
+				this.phpextensions(data.php);
 				this.coreReal(true);
-				this.coreUpdatable(!!data.Result.updatable);
-				this.coreWarning(!!data.Result.warning);
-				this.coreVersion(data.Result.version || '');
-				this.coreVersionCompare(data.Result.versionCompare);
+				this.coreUpdatable(!!data.core.updatable);
+				this.coreWarning(!!data.core.warning);
+				this.coreVersion(data.core.version || '');
+				this.coreVersionCompare(data.core.versionCompare);
 			} else {
 				this.coreReal(false);
 				this.coreWarning(false);
diff --git a/dev/Settings/Admin/Branding.js b/dev/Settings/Admin/Branding.js
index c8ad7aea1..52a673d46 100644
--- a/dev/Settings/Admin/Branding.js
+++ b/dev/Settings/Admin/Branding.js
@@ -3,8 +3,8 @@ import { AbstractViewSettings } from 'Knoin/AbstractViews';
 export class AdminSettingsBranding extends AbstractViewSettings {
 	constructor() {
 		super();
-		this.addSetting('Title');
-		this.addSetting('LoadingDescription');
-		this.addSetting('FaviconUrl');
+		this.addSetting('title');
+		this.addSetting('loadingDescription');
+		this.addSetting('faviconUrl');
 	}
 }
diff --git a/dev/Settings/Admin/Contacts.js b/dev/Settings/Admin/Contacts.js
index ea2495624..ca18c58ce 100644
--- a/dev/Settings/Admin/Contacts.js
+++ b/dev/Settings/Admin/Contacts.js
@@ -13,16 +13,16 @@ export class AdminSettingsContacts extends AbstractViewSettings {
 		super();
 		this.defaultOptionsAfterRender = defaultOptionsAfterRender;
 
-		this.addSetting('ContactsPdoDsn');
-		this.addSetting('ContactsPdoUser');
-		this.addSetting('ContactsPdoPassword');
-		this.addSetting('ContactsPdoType', () => {
+		this.addSetting('contactsPdoDsn');
+		this.addSetting('contactsPdoUser');
+		this.addSetting('contactsPdoPassword');
+		this.addSetting('contactsPdoType', () => {
 			this.testContactsSuccess(false);
 			this.testContactsError(false);
 			this.testContactsErrorMessage('');
 		});
 
-		this.addSettings(['ContactsEnable','ContactsSync']);
+		this.addSettings(['contactsEnable','contactsSync']);
 
 		addObservablesTo(this, {
 			testing: false,
@@ -31,7 +31,7 @@ export class AdminSettingsContacts extends AbstractViewSettings {
 			testContactsErrorMessage: ''
 		});
 
-		this.addSetting('ContactsSuggestionsLimit');
+		this.addSetting('contactsSuggestionsLimit');
 
 		const supportedTypes = SettingsGet('supportedPdoDrivers') || [],
 			types = [{
@@ -92,10 +92,10 @@ export class AdminSettingsContacts extends AbstractViewSettings {
 
 				this.testing(false);
 			}, {
-				ContactsPdoType: this.contactsPdoType(),
-				ContactsPdoDsn: this.contactsPdoDsn(),
-				ContactsPdoUser: this.contactsPdoUser(),
-				ContactsPdoPassword: this.contactsPdoPassword()
+				contactsPdoType: this.contactsPdoType(),
+				contactsPdoDsn: this.contactsPdoDsn(),
+				contactsPdoUser: this.contactsPdoUser(),
+				contactsPdoPassword: this.contactsPdoPassword()
 			}
 		);
 	}
diff --git a/dev/Settings/Admin/General.js b/dev/Settings/Admin/General.js
index 44781aba0..611b244ba 100644
--- a/dev/Settings/Admin/General.js
+++ b/dev/Settings/Admin/General.js
@@ -28,12 +28,12 @@ export class AdminSettingsGeneral extends AbstractViewSettings {
 
 		const aLanguagesAdmin = Settings.app('languagesAdmin');
 		this.languagesAdmin = ko.observableArray(isArray(aLanguagesAdmin) ? aLanguagesAdmin : []);
-		this.languageAdmin = ko.observable(SettingsGet('LanguageAdmin'));
+		this.languageAdmin = ko.observable(SettingsGet('languageAdmin'));
 
 		this.theme = ThemeStore.theme;
 		this.themes = ThemeStore.themes;
 
-		this.addSettings(['AllowLanguagesOnSettings']);
+		this.addSettings(['allowLanguagesOnSettings']);
 
 		addObservablesTo(this, {
 			capaThemes: SettingsCapa('Themes'),
@@ -53,14 +53,14 @@ export class AdminSettingsGeneral extends AbstractViewSettings {
 		*/
 
 		this.attachmentLimit = ko
-			.observable(SettingsGet('AttachmentLimit') / (1024 * 1024))
+			.observable(SettingsGet('attachmentLimit') / (1024 * 1024))
 			.extend({ debounce: 500 });
 
-		this.addSetting('Language');
-		this.addSetting('AttachmentLimit');
+		this.addSetting('language');
+		this.addSetting('attachmentLimit');
 		this.addSetting('Theme', value => changeTheme(value, this.themeTrigger));
 
-		this.uploadData = SettingsGet('PhpUploadSizes');
+		this.uploadData = SettingsGet('phpUploadSizes');
 		this.uploadDataDesc =
 			(this.uploadData?.upload_max_filesize || this.uploadData?.post_max_size)
 				? [
@@ -91,7 +91,7 @@ export class AdminSettingsGeneral extends AbstractViewSettings {
 				this.languageAdminTrigger(SaveSettingStatus.Saving);
 				translatorReload(value, 1)
 					.then(fReloadLanguageHelper(SaveSettingStatus.Success), fReloadLanguageHelper(SaveSettingStatus.Failed))
-					.then(() => Remote.saveSetting('LanguageAdmin', value));
+					.then(() => Remote.saveSetting('languageAdmin', value));
 			},
 
 			capaAdditionalAccounts: fSaveHelper('CapaAdditionalAccounts'),
@@ -114,7 +114,7 @@ export class AdminSettingsGeneral extends AbstractViewSettings {
 		showScreenPopup(LanguagesPopupView, [
 			this.languageAdmin,
 			this.languagesAdmin(),
-			SettingsGet('UserLanguageAdmin')
+			SettingsGet('languageUsers')
 		]);
 	}
 }
diff --git a/dev/Settings/Admin/Login.js b/dev/Settings/Admin/Login.js
index 686607252..47da49bf8 100644
--- a/dev/Settings/Admin/Login.js
+++ b/dev/Settings/Admin/Login.js
@@ -3,7 +3,7 @@ import { AbstractViewSettings } from 'Knoin/AbstractViews';
 export class AdminSettingsLogin extends AbstractViewSettings {
 	constructor() {
 		super();
-		this.addSetting('LoginDefaultDomain');
-		this.addSettings(['DetermineUserLanguage','DetermineUserDomain','AllowLanguagesOnLogin']);
+		this.addSetting('loginDefaultDomain');
+		this.addSettings(['determineUserLanguage','determineUserDomain','allowLanguagesOnLogin']);
 	}
 }
diff --git a/dev/Settings/Admin/Packages.js b/dev/Settings/Admin/Packages.js
index 3a0925880..76286d5e6 100644
--- a/dev/Settings/Admin/Packages.js
+++ b/dev/Settings/Admin/Packages.js
@@ -1,6 +1,6 @@
 import ko from 'ko';
 
-import { Notification } from 'Common/Enums';
+import { Notifications } from 'Common/Enums';
 import { getNotification } from 'Common/Translator';
 
 import { PackageAdminStore } from 'Stores/Admin/Package';
@@ -15,7 +15,7 @@ export class AdminSettingsPackages extends AbstractViewSettings {
 	constructor() {
 		super();
 
-		this.addSettings(['EnabledPlugins']);
+		this.addSettings(['pluginsEnable']);
 
 		addObservablesTo(this, {
 			packagesError: ''
@@ -67,7 +67,7 @@ export class AdminSettingsPackages extends AbstractViewSettings {
 
 			if (iError) {
 				this.packagesError(
-					getNotification(install ? Notification.CantInstallPackage : Notification.CantDeletePackage)
+					getNotification(install ? Notifications.CantInstallPackage : Notifications.CantDeletePackage)
 					+ (data.ErrorMessage ? ':\n' + data.ErrorMessage : '')
 				);
 			} else if (data.Result.Reload) {
@@ -113,7 +113,7 @@ export class AdminSettingsPackages extends AbstractViewSettings {
 				if (iError) {
 					plugin.enabled(disable);
 					this.packagesError(
-						(Notification.UnsupportedPluginPackage === iError && data?.ErrorMessage)
+						(Notifications.UnsupportedPluginPackage === iError && data?.ErrorMessage)
 						? data.ErrorMessage
 						: getNotification(iError)
 					);
diff --git a/dev/Settings/Admin/Security.js b/dev/Settings/Admin/Security.js
index 3b99c16ab..e3797b1a5 100644
--- a/dev/Settings/Admin/Security.js
+++ b/dev/Settings/Admin/Security.js
@@ -10,12 +10,12 @@ export class AdminSettingsSecurity extends AbstractViewSettings {
 	constructor() {
 		super();
 
-		this.addSettings(['UseLocalProxyForExternalImages']);
+		this.addSettings(['useLocalProxyForExternalImages']);
 
 		this.weakPassword = rl.app.weakPassword;
 
 		addObservablesTo(this, {
-			adminLogin: SettingsGet('AdminLogin'),
+			adminLogin: SettingsGet('adminLogin'),
 			adminLoginError: false,
 			adminPassword: '',
 			adminPasswordNew: '',
@@ -68,7 +68,7 @@ export class AdminSettingsSecurity extends AbstractViewSettings {
 			capaOpenPGP: value => Remote.saveSetting('CapaOpenPGP', value)
 		});
 
-		this.adminTOTP(SettingsGet('AdminTOTP'));
+		this.adminTOTP(SettingsGet('adminTOTP'));
 
 		decorateKoCommands(this, {
 			saveAdminUserCommand: self => self.adminLogin().trim() && self.adminPassword()
diff --git a/dev/Settings/User/Accounts.js b/dev/Settings/User/Accounts.js
index 1e5694dad..0e82bc6f0 100644
--- a/dev/Settings/User/Accounts.js
+++ b/dev/Settings/User/Accounts.js
@@ -21,7 +21,7 @@ export class UserSettingsAccounts /*extends AbstractViewSettings*/ {
 		this.accounts = AccountUserStore;
 		this.loading = AccountUserStore.loading;
 		this.identities = IdentityUserStore;
-		this.mainEmail = SettingsGet('MainEmail');
+		this.mainEmail = SettingsGet('mainEmail');
 
 		this.accountForDeletion = ko.observable(null).askDeleteHelper();
 		this.identityForDeletion = ko.observable(null).askDeleteHelper();
@@ -88,7 +88,7 @@ export class UserSettingsAccounts /*extends AbstractViewSettings*/ {
 
 	accountsAndIdentitiesAfterMove() {
 		Remote.request('AccountsAndIdentitiesSortOrder', null, {
-			Accounts: AccountUserStore.getEmailAddresses().filter(v => v != SettingsGet('MainEmail')),
+			Accounts: AccountUserStore.getEmailAddresses().filter(v => v != SettingsGet('mainEmail')),
 			Identities: IdentityUserStore.map(item => (item ? item.id() : ""))
 		});
 	}
diff --git a/dev/Settings/User/Folders.js b/dev/Settings/User/Folders.js
index b16443d73..a7cb877c2 100644
--- a/dev/Settings/User/Folders.js
+++ b/dev/Settings/User/Folders.js
@@ -1,12 +1,11 @@
 import ko from 'ko';
 
-import { Notification } from 'Common/Enums';
+import { Notifications } from 'Common/Enums';
 import { FolderMetadataKeys } from 'Common/EnumsUser';
 import { getNotification } from 'Common/Translator';
 
-import { setFolder, getFolderFromCacheList, removeFolderFromCacheList } from 'Common/Cache';
+import { getFolderFromCacheList, removeFolderFromCacheList } from 'Common/Cache';
 import { defaultOptionsAfterRender } from 'Common/Utils';
-import { sortFolders } from 'Common/Folders';
 import { initOnStartOrLangChange, i18n } from 'Common/Translator';
 
 import { FolderUserStore } from 'Stores/User/Folder';
@@ -18,7 +17,6 @@ import { showScreenPopup } from 'Knoin/Knoin';
 
 import { FolderCreatePopupView } from 'View/Popup/FolderCreate';
 import { FolderSystemPopupView } from 'View/Popup/FolderSystem';
-import { loadFolders } from 'Model/FolderCollection';
 
 const folderForDeletion = ko.observable(null).askDeleteHelper();
 
@@ -52,52 +50,10 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
 
 		this.folderForDeletion = folderForDeletion;
 
-		this.folderForEdit = ko.observable(null).extend({ toggleSubscribeProperty: [this, 'editing'] });
-
 		SettingsUserStore.hideUnsubscribed.subscribe(value => Remote.saveSetting('HideUnsubscribed', value));
 		SettingsUserStore.unhideKolabFolders.subscribe(value => Remote.saveSetting('UnhideKolabFolders', value));
 	}
 
-	folderEditOnEnter(folder) {
-		const nameToEdit = folder?.nameForEdit().trim();
-		if (nameToEdit && folder.name() !== nameToEdit) {
-			Remote.abort('Folders').post('FolderRename', FolderUserStore.foldersRenaming, {
-					folder: folder.fullName,
-					newFolderName: nameToEdit,
-					subscribe: folder.isSubscribed() ? 1 : 0
-				})
-				.then(data => {
-					folder.name(nameToEdit/*data.name*/);
-					if (folder.subFolders.length) {
-						Remote.setTrigger(FolderUserStore.foldersLoading, true);
-//						clearTimeout(Remote.foldersTimeout);
-//						Remote.foldersTimeout = setTimeout(loadFolders, 500);
-						setTimeout(loadFolders, 500);
-						// TODO: rename all subfolders with folder.delimiter to prevent reload?
-					} else {
-						removeFolderFromCacheList(folder.fullName);
-						folder.fullName = data.Result.fullName;
-						setFolder(folder);
-						const parent = getFolderFromCacheList(folder.parentName);
-						sortFolders(parent ? parent.subFolders : FolderUserStore.folderList);
-					}
-				})
-				.catch(error => {
-					FolderUserStore.folderListError(
-						getNotification(error.code, '', Notification.CantRenameFolder)
-						+ '.\n' + error.message);
-				});
-		}
-
-//		this.folderForEdit(null);
-		folder.editing(false);
-	}
-
-	folderEditOnEsc(folder) {
-//		this.folderForEdit(null);
-		folder?.editing(false);
-	}
-
 	onShow() {
 		FolderUserStore.folderListError('');
 	}
@@ -119,8 +75,8 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
 		 && folderToRemove.askDelete()
 		) {
 			if (0 < folderToRemove.totalEmails()) {
-//				FolderUserStore.folderListError(getNotification(Notification.CantDeleteNonEmptyFolder));
-				folderToRemove.errorMsg(getNotification(Notification.CantDeleteNonEmptyFolder));
+//				FolderUserStore.folderListError(getNotification(Notifications.CantDeleteNonEmptyFolder));
+				folderToRemove.errorMsg(getNotification(Notifications.CantDeleteNonEmptyFolder));
 			} else {
 				folderForDeletion(null);
 
@@ -129,7 +85,7 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
 							folder: folderToRemove.fullName
 						}).then(
 							() => {
-//								folderToRemove.flags.push('\\nonexistent');
+//								folderToRemove.attributes.push('\\nonexistent');
 								folderToRemove.selectable(false);
 //								folderToRemove.isSubscribed(false);
 //								folderToRemove.checkable(false);
@@ -141,7 +97,7 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
 							},
 							error => {
 								FolderUserStore.folderListError(
-									getNotification(error.code, '', Notification.CantDeleteFolder)
+									getNotification(error.code, '', Notifications.CantDeleteFolder)
 									+ '.\n' + error.message
 								);
 							}
diff --git a/dev/Settings/User/General.js b/dev/Settings/User/General.js
index 451d2b99b..4de273568 100644
--- a/dev/Settings/User/General.js
+++ b/dev/Settings/User/General.js
@@ -17,7 +17,6 @@ import { LanguageStore } from 'Stores/Language';
 import { SettingsUserStore } from 'Stores/User/Settings';
 import { IdentityUserStore } from 'Stores/User/Identity';
 import { NotificationUserStore } from 'Stores/User/Notification';
-import { MessageUserStore } from 'Stores/User/Message';
 import { MessagelistUserStore } from 'Stores/User/Messagelist';
 
 import Remote from 'Remote/User/Fetch';
@@ -35,7 +34,7 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 
 		this.soundNotification = SMAudio.notifications;
 		this.notificationSound = ko.observable(SettingsGet('NotificationSound'));
-		this.notificationSounds = ko.observableArray(SettingsGet('NewMailSounds'));
+		this.notificationSounds = ko.observableArray(SettingsGet('newMailSounds'));
 
 		this.desktopNotification = NotificationUserStore.enabled;
 		this.isDesktopNotificationAllowed = NotificationUserStore.allowed;
@@ -44,12 +43,13 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 
 		['layout', 'messageReadDelay', 'messagesPerPage', 'checkMailInterval',
 		 'editorDefaultType', 'requestReadReceipt', 'requestDsn', 'requireTLS', 'pgpSign', 'pgpEncrypt',
-		 'viewHTML', 'viewImages', 'viewImagesWhitelist', 'removeColors', 'allowStyles',
+		 'viewHTML', 'viewImages', 'viewImagesWhitelist', 'removeColors', 'allowStyles', 'allowDraftAutosave',
 		 'hideDeleted', 'listInlineAttachments', 'simpleAttachmentsList', 'collapseBlockquotes', 'maxBlockquotesLevel',
-		 'useCheckboxesInList', 'listGrouped', 'useThreads', 'replySameFolder', 'msgDefaultAction', 'allowSpellcheck'
+		 'useCheckboxesInList', 'listGrouped', 'useThreads', 'replySameFolder', 'msgDefaultAction', 'allowSpellcheck',
+		 'showNextMessage'
 		].forEach(name => this[name] = SettingsUserStore[name]);
 
-		this.allowLanguagesOnSettings = !!SettingsGet('AllowLanguagesOnSettings');
+		this.allowLanguagesOnSettings = !!SettingsGet('allowLanguagesOnSettings');
 
 		this.languageTrigger = ko.observable(SaveSettingStatus.Idle);
 
@@ -87,7 +87,7 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 			layoutTypes: () => {
 				translateTrigger();
 				return [
-					{ id: Layout.NoPreview, name: i18n('SETTINGS_GENERAL/LAYOUT_NO_SPLIT') },
+					{ id: 0, name: i18n('SETTINGS_GENERAL/LAYOUT_NO_SPLIT') },
 					{ id: Layout.SidePreview, name: i18n('SETTINGS_GENERAL/LAYOUT_VERTICAL_SPLIT') },
 					{ id: Layout.BottomPreview, name: i18n('SETTINGS_GENERAL/LAYOUT_HORIZONTAL_SPLIT') }
 				];
@@ -102,10 +102,10 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 		this.addSetting('Layout');
 		this.addSetting('MaxBlockquotesLevel');
 
-		this.addSettings(['ViewHTML', 'ViewImages', 'ViewImagesWhitelist', 'HideDeleted', 'AllowStyles',
+		this.addSettings(['ViewHTML', 'ViewImages', 'ViewImagesWhitelist', 'HideDeleted', 'RemoveColors', 'AllowStyles',
 			'ListInlineAttachments', 'simpleAttachmentsList', 'UseCheckboxesInList', 'listGrouped', 'ReplySameFolder',
 			'requestReadReceipt', 'requestDsn', 'requireTLS', 'pgpSign', 'pgpEncrypt', 'allowSpellcheck',
-			'DesktopNotifications', 'SoundNotification', 'CollapseBlockquotes']);
+			'DesktopNotifications', 'SoundNotification', 'CollapseBlockquotes', 'AllowDraftAutosave', 'showNextMessage']);
 
 		const fReloadLanguageHelper = (saveSettingsStep) => () => {
 				this.languageTrigger(saveSettingsStep);
@@ -117,20 +117,12 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 				this.languageTrigger(SaveSettingStatus.Saving);
 				translatorReload(value)
 					.then(fReloadLanguageHelper(SaveSettingStatus.Success), fReloadLanguageHelper(SaveSettingStatus.Failed))
-					.then(() => Remote.saveSetting('Language', value));
+					.then(() => Remote.saveSetting('language', value));
 			},
 
 			hourCycle: value =>
 				Remote.saveSetting('hourCycle', value),
 
-			removeColors: value => {
-				let dom = MessageUserStore.bodiesDom();
-				if (dom) {
-					dom.innerHTML = '';
-				}
-				Remote.saveSetting('RemoveColors', value);
-			},
-
 			notificationSound: value => {
 				Remote.saveSetting('NotificationSound', value);
 				Settings.set('NotificationSound', value);
diff --git a/dev/Settings/User/Security.js b/dev/Settings/User/Security.js
index d0e4a955c..58a5987de 100644
--- a/dev/Settings/User/Security.js
+++ b/dev/Settings/User/Security.js
@@ -10,13 +10,13 @@ import { SettingsUserStore } from 'Stores/User/Settings';
 import { GnuPGUserStore } from 'Stores/User/GnuPG';
 import { OpenPGPUserStore } from 'Stores/User/OpenPGP';
 
-import Remote from 'Remote/User/Fetch';
-
 import { showScreenPopup } from 'Knoin/Knoin';
 
 import { OpenPgpImportPopupView } from 'View/Popup/OpenPgpImport';
 import { OpenPgpGeneratePopupView } from 'View/Popup/OpenPgpGenerate';
 
+//import Remote from 'Remote/User/Fetch';
+
 export class UserSettingsSecurity extends AbstractViewSettings {
 	constructor() {
 		super();
@@ -46,10 +46,6 @@ export class UserSettingsSecurity extends AbstractViewSettings {
 		this.canOpenPGP = SettingsCapa('OpenPGP');
 		this.canGnuPG = GnuPGUserStore.isSupported();
 		this.canMailvelope = !!window.mailvelope;
-
-		this.allowDraftAutosave = SettingsUserStore.allowDraftAutosave;
-
-		this.allowDraftAutosave.subscribe(value => Remote.saveSetting('AllowDraftAutosave', value))
 	}
 
 	addOpenPgpKey() {
@@ -66,5 +62,11 @@ export class UserSettingsSecurity extends AbstractViewSettings {
 		 * The iframe will be injected into the container identified by selector.
 		 */
 		window.mailvelope && mailvelope.createSettingsContainer('#mailvelope-settings'/*[, keyring], options*/);
+		/**
+		 * https://github.com/the-djmaze/snappymail/issues/973
+		Remote.request('GetStoredPGPKeys', (iError, data) => {
+			console.dir([iError, data]);
+		});
+		*/
 	}
 }
diff --git a/dev/Settings/User/Themes.js b/dev/Settings/User/Themes.js
index 37134950d..041680901 100644
--- a/dev/Settings/User/Themes.js
+++ b/dev/Settings/User/Themes.js
@@ -6,6 +6,7 @@ import { i18n } from 'Common/Translator';
 import { SettingsCapa } from 'Common/Globals';
 
 import { ThemeStore, convertThemeName, changeTheme } from 'Stores/Theme';
+import { addSubscribablesTo } from 'External/ko';
 
 import Remote from 'Remote/User/Fetch';
 
@@ -24,20 +25,22 @@ export class UserSettingsThemes /*extends AbstractViewSettings*/ {
 		this.fontSansSerif = ThemeStore.fontSansSerif;
 		this.fontSerif = ThemeStore.fontSerif;
 		this.fontMono = ThemeStore.fontMono;
-		ThemeStore.fontSansSerif.subscribe(value => {
-			Remote.saveSettings(null, {
-				fontSansSerif: value
-			});
-		});
-		ThemeStore.fontSerif.subscribe(value => {
-			Remote.saveSettings(null, {
-				fontSerif: value
-			});
-		});
-		ThemeStore.fontMono.subscribe(value => {
-			Remote.saveSettings(null, {
-				fontMono: value
-			});
+		addSubscribablesTo(ThemeStore, {
+			fontSansSerif: value => {
+				Remote.saveSettings(null, {
+					fontSansSerif: value
+				});
+			},
+			fontSerif: value => {
+				Remote.saveSettings(null, {
+					fontSerif: value
+				});
+			},
+			fontMono: value => {
+				Remote.saveSettings(null, {
+					fontMono: value
+				});
+			}
 		});
 
 		this.theme = ThemeStore.theme;
diff --git a/dev/Sieve/Utils.js b/dev/Sieve/Utils.js
index 7544db465..14c58101a 100644
--- a/dev/Sieve/Utils.js
+++ b/dev/Sieve/Utils.js
@@ -25,13 +25,13 @@ export const
 		arr.map(item => item.toString?.() || item).join(separator),
 /*
 	getNotificationMessage = code => {
-		let key = getKeyByValue(Notification, code);
+		let key = getKeyByValue(Notifications, code);
 		return key ? I18N_DATA.NOTIFICATIONS[i18nKey(key).replace('_NOTIFICATION', '_ERROR')] : '';
 		rl.i18n('NOTIFICATIONS/')
 	},
 	getNotification = (code, message = '', defCode = 0) => {
 		code = parseInt(code, 10) || 0;
-		if (Notification.ClientViewError === code && message) {
+		if (Notifications.ClientViewError === code && message) {
 			return message;
 		}
 
diff --git a/dev/Sieve/View/Filter.js b/dev/Sieve/View/Filter.js
index d541a584e..98431cf9a 100644
--- a/dev/Sieve/View/Filter.js
+++ b/dev/Sieve/View/Filter.js
@@ -84,7 +84,7 @@ export class FilterPopupView extends rl.pluginPopupView {
 		this.defaultOptionsAfterRender = defaultOptionsAfterRender;
 		this.folderSelectList = koComputable(() =>
 			folderListOptionsBuilder(
-				[rl.settings.get('SieveAllowFileintoInbox') ? '' : 'INBOX'],
+				[rl.settings.get('sieveAllowFileintoInbox') ? '' : 'INBOX'],
 				[['', '']],
 				item => item?.localName() || ''
 			)
diff --git a/dev/Storage/Client.js b/dev/Storage/Client.js
index b8bb55060..f40553a10 100644
--- a/dev/Storage/Client.js
+++ b/dev/Storage/Client.js
@@ -27,8 +27,8 @@ try {
 		setItem: (key, value) => {
 			data[key] = ''+value; // forces the value to a string
 			document.cookie = sName+'='+encodeURIComponent(JSON.stringify(data))
-				+"; expires="+((new Date(Date.now()+(365*24*60*60*1000))).toGMTString())
-				+"; path=/; samesite=strict";
+				+";expires="+((new Date(Date.now()+(365*24*60*60*1000))).toGMTString())
+				+";path=/;samesite=strict";
 		}
 	};
 }
diff --git a/dev/Storage/Passphrases.js b/dev/Storage/Passphrases.js
new file mode 100644
index 000000000..4ecf6ccda
--- /dev/null
+++ b/dev/Storage/Passphrases.js
@@ -0,0 +1 @@
+export const Passphrases = new Map();
diff --git a/dev/Stores/Language.js b/dev/Stores/Language.js
index 844f961f8..df27841e7 100644
--- a/dev/Stores/Language.js
+++ b/dev/Stores/Language.js
@@ -11,8 +11,8 @@ export const LanguageStore = {
 	populate: function() {
 		const aLanguages = Settings.app('languages');
 		this.languages(isArray(aLanguages) ? aLanguages : []);
-		this.language(SettingsGet('Language'));
-		this.userLanguage(SettingsGet('UserLanguage'));
+		this.language(SettingsGet('language'));
+		this.userLanguage(SettingsGet('userLanguage'));
 		this.hourCycle(SettingsGet('hourCycle'));
 	}
 }
diff --git a/dev/Stores/Theme.js b/dev/Stores/Theme.js
index 36883c251..b8d49809b 100644
--- a/dev/Stores/Theme.js
+++ b/dev/Stores/Theme.js
@@ -1,13 +1,15 @@
 import ko from 'ko';
-import { $htmlCL, elementById, leftPanelDisabled, Settings, SettingsGet } from 'Common/Globals';
+import { $htmlCL, appEl, elementById, leftPanelDisabled, Settings, SettingsGet } from 'Common/Globals';
 import { isArray, arrayLength } from 'Common/Utils';
 import { cssLink, serverRequestRaw } from 'Common/Links';
 import { SaveSettingStatus } from 'Common/Enums';
+import { addSubscribablesTo } from 'External/ko';
 
 let __themeTimer = 0;
 
 export const
-	appEl = () => elementById('rl-app'),
+	// Also see Styles/_Values.less @maxMobileWidth
+	isMobile = matchMedia('(max-width: 799px)'),
 
 	ThemeStore = {
 		theme: ko.observable(''),
@@ -17,7 +19,7 @@ export const
 		fontSansSerif: ko.observable(''),
 		fontSerif: ko.observable(''),
 		fontMono: ko.observable(''),
-		isMobile: ko.observable($htmlCL.contains('rl-mobile')),
+		isMobile: ko.observable(false),
 
 		populate: () => {
 			const themes = Settings.app('themes');
@@ -25,8 +27,8 @@ export const
 			ThemeStore.themes(isArray(themes) ? themes : []);
 			ThemeStore.theme(SettingsGet('Theme'));
 			if (!ThemeStore.isMobile()) {
-				ThemeStore.userBackgroundName(SettingsGet('UserBackgroundName'));
-				ThemeStore.userBackgroundHash(SettingsGet('UserBackgroundHash'));
+				ThemeStore.userBackgroundName(SettingsGet('userBackgroundName'));
+				ThemeStore.userBackgroundHash(SettingsGet('userBackgroundHash'));
 			}
 			ThemeStore.fontSansSerif(SettingsGet('fontSansSerif'));
 			ThemeStore.fontSerif(SettingsGet('fontSerif'));
@@ -62,35 +64,44 @@ export const
 
 	convertThemeName = theme => theme.replace(/@[a-z]+$/, '').replace(/([A-Z])/g, ' $1').trim();
 
-ThemeStore.isMobile.subscribe(value => $htmlCL.toggle('rl-mobile', value));
+addSubscribablesTo(ThemeStore, {
+	fontSansSerif: value => {
+		if (null != value) {
+			let cl = appEl.classList;
+			cl.forEach(name => {
+				if (name.startsWith('font') && !/font(Serif|Mono)/.test(name)) {
+					cl.remove(name);
+				}
+			});
+			value && cl.add('font'+value);
+		}
+	},
 
-ThemeStore.fontSansSerif.subscribe(value => {
-	if (null != value) {
-		let cl = appEl().classList;
-		cl.forEach(name => {
-			if (name.startsWith('font') && !/font(Serif|Mono)/.test(name)) {
-				cl.remove(name);
-			}
-		});
-		value && cl.add('font'+value);
-	}
-});
-ThemeStore.fontSerif.subscribe(value => {
-	if (null != value) {
-		let cl = appEl().classList;
-		cl.forEach(name => name.startsWith('fontSerif') && cl.remove(name));
-		value && cl.add('fontSerif'+value);
-	}
-});
-ThemeStore.fontMono.subscribe(value => {
-	if (null != value) {
-		let cl = appEl().classList;
-		cl.forEach(name => name.startsWith('fontMono') && cl.remove(name));
-		value && cl.add('fontMono'+value);
+	fontSerif: value => {
+		if (null != value) {
+			let cl = appEl.classList;
+			cl.forEach(name => name.startsWith('fontSerif') && cl.remove(name));
+			value && cl.add('fontSerif'+value);
+		}
+	},
+
+	fontMono: value => {
+		if (null != value) {
+			let cl = appEl.classList;
+			cl.forEach(name => name.startsWith('fontMono') && cl.remove(name));
+			value && cl.add('fontMono'+value);
+		}
+	},
+
+	userBackgroundHash: value => {
+		appEl.classList.toggle('UserBackground', !!value);
+		appEl.style.backgroundImage = value ? "url("+serverRequestRaw('UserBackground', value)+")" : null;
 	}
 });
 
-ThemeStore.userBackgroundHash.subscribe(value => {
-	appEl().classList.toggle('UserBackground', !!value);
-	appEl().style.backgroundImage = value ? "url("+serverRequestRaw('UserBackground', value)+")" : null;
-});
+isMobile.onchange = e => {
+	ThemeStore.isMobile(e.matches);
+	$htmlCL.toggle('rl-mobile', e.matches);
+	leftPanelDisabled(e.matches);
+};
+isMobile.onchange(isMobile);
diff --git a/dev/Stores/User/App.js b/dev/Stores/User/App.js
index 102a56d83..9825c8951 100644
--- a/dev/Stores/User/App.js
+++ b/dev/Stores/User/App.js
@@ -1,9 +1,10 @@
 import { keyScope, leftPanelDisabled, SettingsGet, elementById } from 'Common/Globals';
 import { addObservablesTo } from 'External/ko';
 import { ThemeStore } from 'Stores/Theme';
+import { arePopupsVisible } from 'Knoin/Knoin';
 
 export const AppUserStore = {
-	allowContacts: () => !!SettingsGet('ContactsIsAllowed')
+	allowContacts: () => !!SettingsGet('contactsAllowed')
 };
 
 addObservablesTo(AppUserStore, {
@@ -15,10 +16,9 @@ addObservablesTo(AppUserStore, {
 AppUserStore.focusedState.subscribe(value => {
 	['FolderList','MessageList','MessageView'].forEach(name => {
 		if (name === value) {
-			keyScope(value);
+			arePopupsVisible() || keyScope(value);
 			ThemeStore.isMobile() && leftPanelDisabled('FolderList' !== value);
 		}
-		let dom = elementById('V-Mail'+name);
-		dom?.classList.toggle('focused', name === value);
+		elementById('V-Mail'+name).classList.toggle('focused', name === value);
 	});
 });
diff --git a/dev/Stores/User/Contact.js b/dev/Stores/User/Contact.js
index 863759787..89f1b01dd 100644
--- a/dev/Stores/User/Contact.js
+++ b/dev/Stores/User/Contact.js
@@ -2,6 +2,7 @@ import ko from 'ko';
 import { SettingsGet } from 'Common/Globals';
 import { koComputable, addObservablesTo, koArrayWithDestroy } from 'External/ko';
 import Remote from 'Remote/User/Fetch';
+import { Notifications } from 'Common/Enums';
 
 export const ContactUserStore = koArrayWithDestroy();
 
@@ -43,7 +44,7 @@ ContactUserStore.sync = fResultFunc => {
 			} catch (e) {
 				ContactUserStore.syncing(false);
 				console.error(e);
-				fResultFunc?.(Notification.UnknownError);
+				fResultFunc?.(Notifications.UnknownError);
 			}
 		}, 'ContactsSync');
 	}
diff --git a/dev/Stores/User/Folder.js b/dev/Stores/User/Folder.js
index 123c221e2..36ea0da3f 100644
--- a/dev/Stores/User/Folder.js
+++ b/dev/Stores/User/Folder.js
@@ -199,11 +199,11 @@ FolderUserStore = new class {
 
 	saveSystemFolders(folders) {
 		folders = folders || {
-			Sent: FolderUserStore.sentFolder(),
-			Drafts: FolderUserStore.draftsFolder(),
-			Spam: FolderUserStore.spamFolder(),
-			Trash: FolderUserStore.trashFolder(),
-			Archive: FolderUserStore.archiveFolder()
+			sent: FolderUserStore.sentFolder(),
+			drafts: FolderUserStore.draftsFolder(),
+			junk: FolderUserStore.spamFolder(),
+			trash: FolderUserStore.trashFolder(),
+			archive: FolderUserStore.archiveFolder()
 		};
 		forEachObjectEntry(folders, (k,v)=>Settings.set(k+'Folder',v));
 		rl.app.Remote.request('SystemFoldersUpdate', null, folders);
diff --git a/dev/Stores/User/GnuPG.js b/dev/Stores/User/GnuPG.js
index c85490921..5057ce25c 100644
--- a/dev/Stores/User/GnuPG.js
+++ b/dev/Stores/User/GnuPG.js
@@ -11,14 +11,15 @@ import { showScreenPopup } from 'Knoin/Knoin';
 import { OpenPgpKeyPopupView } from 'View/Popup/OpenPgpKey';
 import { AskPopupView } from 'View/Popup/Ask';
 
+import { Passphrases } from 'Storage/Passphrases';
+
 const
-	passphrases = new Map(),
 	askPassphrase = async (privateKey, btnTxt = 'LABEL_SIGN') => {
 		const key = privateKey.id,
-			pass = passphrases.has(key)
-				? {password:passphrases.get(key), remember:false}
+			pass = Passphrases.has(key)
+				? {password:Passphrases.get(key), remember:false}
 				: await AskPopupView.password('GnuPG key<br>' + key + ' ' + privateKey.emails[0], 'OPENPGP/'+btnTxt);
-		pass && pass.remember && passphrases.set(key, pass.password);
+		pass && pass.remember && Passphrases.set(key, pass.password);
 		return pass.password;
 	},
 
@@ -83,7 +84,7 @@ export const GnuPGUserStore = new class {
 											key.armor = oData.Result;
 											showScreenPopup(OpenPgpKeyPopupView, [key]);
 										} else {
-											passphrases.delete(key.id);
+											Passphrases.delete(key.id);
 										}
 									}, {
 										keyId: key.id,
@@ -198,7 +199,7 @@ export const GnuPGUserStore = new class {
 					if (result?.Result && false !== result.Result.data) {
 						return result.Result;
 					}
-					passphrases.delete(key.id);
+					Passphrases.delete(key.id);
 				}
 			}
 		}
diff --git a/dev/Stores/User/Message.js b/dev/Stores/User/Message.js
index e9345936b..a2376c4a6 100644
--- a/dev/Stores/User/Message.js
+++ b/dev/Stores/User/Message.js
@@ -30,25 +30,21 @@ export const MessageUserStore = new class {
 					AppUserStore.focusedState(Scope.MessageList);
 					exitFullscreen();
 				}
-				this.hideMessageBodies();
+				[...(this.bodiesDom()?.children || [])].forEach(el => el.hidden = true);
 			},
 		});
 
-		this.purgeMessageBodyCache = this.purgeMessageBodyCache.throttle(30000);
+		this.purgeCache = this.purgeCache.throttle(30000);
 	}
 
-	purgeMessageBodyCache() {
-		const messagesDom = this.bodiesDom(),
-			children = messagesDom?.children;
-		if (children) {
-			while (15 < children.length) {
-				children[0].remove();
+	purgeCache(all) {
+		const children = this.bodiesDom()?.children || [];
+		let i = Math.max(0, children.length - (all ? 0 : 15));
+		while (i--) {
+			children[i].remove();
+			if (children[i].message) {
+				children[i].message.body = null;
 			}
 		}
 	}
-
-	hideMessageBodies() {
-		const messagesDom = this.bodiesDom();
-		messagesDom && Array.from(messagesDom.children).forEach(el => el.hidden = true);
-	}
 };
diff --git a/dev/Stores/User/Messagelist.js b/dev/Stores/User/Messagelist.js
index 469efeaac..4cf5dee32 100644
--- a/dev/Stores/User/Messagelist.js
+++ b/dev/Stores/User/Messagelist.js
@@ -1,17 +1,16 @@
 import { koComputable, addObservablesTo, addComputablesTo } from 'External/ko';
 
 import { SMAudio } from 'Common/Audio';
-import { Notification } from 'Common/Enums';
+import { Notifications } from 'Common/Enums';
 import { MessageSetAction } from 'Common/EnumsUser';
-import { $htmlCL } from 'Common/Globals';
-import { arrayLength, pInt, pString } from 'Common/Utils';
+import { $htmlCL, fireEvent } from 'Common/Globals';
+import { arrayLength, pString } from 'Common/Utils';
 import { UNUSED_OPTION_VALUE } from 'Common/Consts';
 
 import {
 	getFolderInboxName,
 	getFolderFromCacheList,
-	setFolderHash,
-	MessageFlagsCache
+	setFolderETag
 } from 'Common/Cache';
 
 import { mailBox } from 'Common/Links';
@@ -174,7 +173,7 @@ MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrentFolderCach
 	let iOffset = (MessagelistUserStore.page() - 1) * SettingsUserStore.messagesPerPage();
 
 	if (bDropCurrentFolderCache) {
-		setFolderHash(FolderUserStore.currentFolderFullName(), '');
+		setFolderETag(FolderUserStore.currentFolderFullName(), '');
 	}
 
 	if (bDropPagePosition) {
@@ -198,7 +197,7 @@ MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrentFolderCach
 			let error = '';
 			if (iError) {
 				error = getNotification(iError);
-				if (Notification.RequestAborted !== iError) {
+				if (Notifications.RequestAborted !== iError) {
 					MessagelistUserStore([]);
 				}
 			} else {
@@ -207,27 +206,24 @@ MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrentFolderCach
 					error = '';
 
 					const
-						folder = getFolderFromCacheList(collection.folder),
-						folderInfo = collection.folderInfo;
+						folderInfo = collection.folder,
+						folder = getFolderFromCacheList(folderInfo.name);
+					collection.folder = folderInfo.name;
 					if (folder && !bCached) {
 //						folder.revivePropertiesFromJson(result);
 						folder.expires = Date.now();
 						folder.uidNext = folderInfo.uidNext;
-						folder.hash = collection.folderHash;
+						folder.etag = folderInfo.etag;
 
 						if (null != folderInfo.totalEmails) {
 							folder.totalEmails(folderInfo.totalEmails);
 						}
 
 						if (null != folderInfo.unreadEmails) {
-							if (pInt(folder.unreadEmails()) !== pInt(folderInfo.unreadEmails)) {
-								MessageFlagsCache.clearFolder(folder.fullName);
-							}
 							folder.unreadEmails(folderInfo.unreadEmails);
 						}
 
-						folder.flags(folderInfo.flags);
-						let flags = folderInfo.permanentFlags;
+						let flags = folderInfo.permanentFlags || [];
 						if (flags.includes('\\*')) {
 							let i = 6;
 							while (--i) {
@@ -251,14 +247,14 @@ MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrentFolderCach
 					MessagelistUserStore.threadUid(collection.threadUid);
 
 					MessagelistUserStore.endHash(
-						collection.folder +
+						folderInfo.name +
 						'|' + collection.search +
 						'|' + MessagelistUserStore.threadUid() +
 						'|' + MessagelistUserStore.page()
 					);
 					MessagelistUserStore.endThreadUid(collection.threadUid);
 					const message = MessageUserStore.message();
-					if (message && collection.folder !== message.folder) {
+					if (message && folderInfo.name !== message.folder) {
 						MessageUserStore.message(null);
 					}
 
@@ -280,7 +276,7 @@ MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrentFolderCach
 				} else {
 					MessagelistUserStore.count(0);
 					MessagelistUserStore([]);
-					error = getNotification(Notification.CantGetMessageList);
+					error = getNotification(Notifications.CantGetMessageList);
 				}
 				MessagelistUserStore.error(error);
 			}
@@ -306,22 +302,38 @@ MessagelistUserStore.setAction = (sFolderFullName, iSetAction, messages) => {
 	messages = messages || MessagelistUserStore.listChecked();
 
 	let folder,
-		alreadyUnread = 0,
-		rootUids = messages.map(oMessage => oMessage?.uid).validUnique(),
-		length = rootUids.length;
+		rootUids = [],
+		length;
+
+	if (iSetAction == MessageSetAction.SetSeen) {
+		messages.forEach(oMessage =>
+			oMessage.isUnseen() && rootUids.push(oMessage.uid) && oMessage.flags.push('\\seen')
+		);
+	} else if (iSetAction == MessageSetAction.UnsetSeen) {
+		messages.forEach(oMessage =>
+			!oMessage.isUnseen() && rootUids.push(oMessage.uid) && oMessage.flags.remove('\\seen')
+		);
+	} else if (iSetAction == MessageSetAction.SetFlag) {
+		messages.forEach(oMessage =>
+			!oMessage.isFlagged() && rootUids.push(oMessage.uid) && oMessage.flags.push('\\flagged')
+		);
+	} else if (iSetAction == MessageSetAction.UnsetFlag) {
+		messages.forEach(oMessage =>
+			oMessage.isFlagged() && rootUids.push(oMessage.uid) && oMessage.flags.remove('\\flagged')
+		);
+	}
+	rootUids = rootUids.validUnique();
+	length = rootUids.length;
 
 	if (sFolderFullName && length) {
-		rootUids.forEach(sSubUid =>
-			alreadyUnread += MessageFlagsCache.storeBySetAction(sFolderFullName, sSubUid, iSetAction)
-		);
 		switch (iSetAction) {
 			case MessageSetAction.SetSeen:
-				length = 0;
+				length = -length;
 				// fallthrough is intentionally
 			case MessageSetAction.UnsetSeen:
 				folder = getFolderFromCacheList(sFolderFullName);
 				if (folder) {
-					folder.unreadEmails(folder.unreadEmails() - alreadyUnread + length);
+					folder.unreadEmails(Math.max(0, folder.unreadEmails() + length));
 				}
 				Remote.request('MessageSetSeen', null, {
 					folder: sFolderFullName,
@@ -340,8 +352,6 @@ MessagelistUserStore.setAction = (sFolderFullName, iSetAction, messages) => {
 				break;
 			// no default
 		}
-
-		MessagelistUserStore.reloadFlagsAndCachedMessage();
 	}
 };
 
@@ -370,22 +380,20 @@ MessagelistUserStore.removeMessagesFromList = (
 	messages.forEach(item => item?.isUnseen() && ++unseenCount);
 
 	if (fromFolder) {
-		fromFolder.hash = '';
+		fromFolder.etag = '';
 		if (!copy) {
 			fromFolder.totalEmails(
 				0 <= fromFolder.totalEmails() - oUids.size ? fromFolder.totalEmails() - oUids.size : 0
 			);
 
 			if (0 < unseenCount) {
-				fromFolder.unreadEmails(
-					0 <= fromFolder.unreadEmails() - unseenCount ? fromFolder.unreadEmails() - unseenCount : 0
-				);
+				fromFolder.unreadEmails(Math.max(0, fromFolder.unreadEmails() - unseenCount));
 			}
 		}
 	}
 
 	if (toFolder) {
-		toFolder.hash = '';
+		toFolder.etag = '';
 
 		if (trashFolder === toFolder.fullName || spamFolder === toFolder.fullName) {
 			unseenCount = 0;
@@ -405,6 +413,18 @@ MessagelistUserStore.removeMessagesFromList = (
 		} else {
 			MessagelistUserStore.isIncomplete(true);
 
+			// Select next email https://github.com/the-djmaze/snappymail/issues/968
+			if (currentMessage && 1 == messages.length && SettingsUserStore.showNextMessage()) {
+				let next = MessagelistUserStore.indexOf(currentMessage) + 1;
+				if (0 < next && (next = MessagelistUserStore()[next])) {
+					currentMessage = null;
+					fireEvent('mailbox.message.show', {
+						folder: next.folder,
+						uid: next.uid
+					});
+				}
+			}
+
 			messages.forEach(item => {
 				if (currentMessage && currentMessage.hash === item.hash) {
 					currentMessage = null;
@@ -455,9 +475,4 @@ MessagelistUserStore.removeMessagesFromList = (
 			)
 		);
 	}
-},
-
-MessagelistUserStore.reloadFlagsAndCachedMessage = () => {
-	MessagelistUserStore.forEach(message => MessageFlagsCache.initMessage(message));
-	MessageFlagsCache.initMessage(MessageUserStore.message());
 };
diff --git a/dev/Stores/User/Notification.js b/dev/Stores/User/Notification.js
index 32335ef33..f126ba0ab 100644
--- a/dev/Stores/User/Notification.js
+++ b/dev/Stores/User/Notification.js
@@ -1,4 +1,4 @@
-import * as Links from 'Common/Links';
+import { staticLink } from 'Common/Links';
 import { addObservablesTo } from 'External/ko';
 import { fireEvent } from 'Common/Globals';
 
@@ -22,15 +22,19 @@ let DesktopNotifications = false,
 	WorkerNotifications = navigator.serviceWorker;
 
 // Are Notifications supported in the service worker?
-if (WorkerNotifications && ServiceWorkerRegistration && ServiceWorkerRegistration.prototype.showNotification) {
-	/* Listen for close requests from the ServiceWorker */
-	WorkerNotifications.addEventListener('message', event => {
-		const obj = JSON.parse(event.data);
-		'notificationclick' === obj?.action && dispatchMessage(obj.data);
-	});
+if (WorkerNotifications) {
+	if (ServiceWorkerRegistration && ServiceWorkerRegistration.prototype.showNotification) {
+		/* Listen for close requests from the ServiceWorker */
+		WorkerNotifications.addEventListener('message', event => {
+			const obj = JSON.parse(event.data);
+			'notificationclick' === obj?.action && dispatchMessage(obj.data);
+		});
+	} else {
+		console.log('ServiceWorkerRegistration.showNotification undefined');
+		WorkerNotifications = null;
+	}
 } else {
-	WorkerNotifications = null;
-	console.log('ServiceWorker Notifications not supported');
+	console.log('ServiceWorker undefined');
 }
 
 export const NotificationUserStore = new class {
@@ -57,7 +61,7 @@ export const NotificationUserStore = new class {
 		if (DesktopNotifications && NotificationsGranted()) {
 			const options = {
 				body: text,
-				icon: imageSrc || Links.staticLink('images/icon-message-notification.png'),
+				icon: imageSrc || staticLink('images/icon-message-notification.png'),
 				data: messageData
 			};
 			if (messageData?.uid) {
@@ -65,8 +69,7 @@ export const NotificationUserStore = new class {
 			}
 			if (WorkerNotifications) {
 				// Service-Worker-Allowed HTTP header to allow the scope.
-				WorkerNotifications.register('/serviceworker.js')
-//				WorkerNotifications.register(Links.staticLink('js/serviceworker.js'), {scope:'/'})
+				WorkerNotifications.register(staticLink('js/serviceworker.js'), {scope:'/'})
 				.then(() =>
 					WorkerNotifications.ready.then(registration =>
 						/* Show the notification */
@@ -80,7 +83,10 @@ export const NotificationUserStore = new class {
 							)
 					)
 				)
-				.catch(e => console.error(e));
+				.catch(e => {
+					console.error(e);
+					WorkerNotifications = null;
+				});
 			} else {
 				const notification = new HTML5Notification(title, options);
 				notification.show?.();
diff --git a/dev/Stores/User/OpenPGP.js b/dev/Stores/User/OpenPGP.js
index fd649b3b3..49b6ab633 100644
--- a/dev/Stores/User/OpenPGP.js
+++ b/dev/Stores/User/OpenPGP.js
@@ -12,22 +12,23 @@ import { showScreenPopup } from 'Knoin/Knoin';
 import { OpenPgpKeyPopupView } from 'View/Popup/OpenPgpKey';
 import { AskPopupView } from 'View/Popup/Ask';
 
+import { Passphrases } from 'Storage/Passphrases';
+
 const
 	findOpenPGPKey = (keys, query/*, sign*/) =>
 		keys.find(key =>
 			key.emails.includes(query) || query == key.id || query == key.fingerprint
 		),
 
-	passphrases = new Map(),
 	decryptKey = async (privateKey, btnTxt = 'LABEL_SIGN') => {
 		if (privateKey.key.isDecrypted()) {
 			return privateKey.key;
 		}
 		const key = privateKey.id,
-			pass = passphrases.has(key)
-				? {password:passphrases.get(key), remember:false}
+			pass = Passphrases.has(key)
+				? {password:Passphrases.get(key), remember:false}
 				: await AskPopupView.password(
-					'OpenPGP.js key<br>' + privateKey.id + ' ' + privateKey.emails[0],
+					'OpenPGP.js key<br>' + key + ' ' + privateKey.emails[0],
 					'OPENPGP/'+btnTxt
 				);
 		if (pass) {
@@ -36,7 +37,7 @@ const
 					privateKey: privateKey.key,
 					passphrase
 				});
-			result && pass.remember && passphrases.set(key, passphrase);
+			result && pass.remember && Passphrases.set(key, passphrase);
 			return result;
 		}
 	},
diff --git a/dev/Stores/User/Pgp.js b/dev/Stores/User/Pgp.js
index a18047f6d..59178b277 100644
--- a/dev/Stores/User/Pgp.js
+++ b/dev/Stores/User/Pgp.js
@@ -9,17 +9,15 @@ import { SettingsCapa, SettingsGet } from 'Common/Globals';
 import { GnuPGUserStore } from 'Stores/User/GnuPG';
 import { OpenPGPUserStore } from 'Stores/User/OpenPGP';
 
+// https://mailvelope.github.io/mailvelope/Keyring.html
+let mailvelopeKeyring = null;
+
 export const
 	BEGIN_PGP_MESSAGE = '-----BEGIN PGP MESSAGE-----',
 //	BEGIN_PGP_SIGNATURE = '-----BEGIN PGP SIGNATURE-----',
 //	BEGIN_PGP_SIGNED = '-----BEGIN PGP SIGNED MESSAGE-----',
 
 	PgpUserStore = new class {
-		constructor() {
-			// https://mailvelope.github.io/mailvelope/Keyring.html
-			this.mailvelopeKeyring = null;
-		}
-
 		init() {
 			if (SettingsCapa('OpenPGP') && window.crypto && crypto.getRandomValues) {
 				rl.loadScript(SettingsGet('StaticLibsJs').replace('/libs.', '/openpgp.'))
@@ -38,7 +36,7 @@ export const
 			identifier = identifier || SettingsGet('Email');
 			if (window.mailvelope) {
 				const fn = keyring => {
-						this.mailvelopeKeyring = keyring;
+						mailvelopeKeyring = keyring;
 						console.log('mailvelope ready');
 					};
 				mailvelope.getKeyring().then(fn, err => {
@@ -79,8 +77,7 @@ export const
 
 		async mailvelopeHasPublicKeyForEmails(recipients) {
 			const
-				keyring = this.mailvelopeKeyring,
-				mailvelope = keyring && await keyring.validKeyForAddress(recipients)
+				mailvelope = mailvelopeKeyring && await mailvelopeKeyring.validKeyForAddress(recipients)
 					/*.then(LookupResult => Object.entries(LookupResult))*/,
 				entries = mailvelope && Object.entries(mailvelope);
 			return entries && entries.filter(value => value[1]).length === recipients.length;
@@ -104,8 +101,7 @@ export const
 		}
 
 		async getMailvelopePrivateKeyFor(email/*, sign*/) {
-			let keyring = this.mailvelopeKeyring;
-			if (keyring && await keyring.hasPrivateKey({email:email})) {
+			if (mailvelopeKeyring && await mailvelopeKeyring.hasPrivateKey({email:email})) {
 				return ['mailvelope', email];
 			}
 			return false;
@@ -145,46 +141,48 @@ export const
 			}
 
 			// Try Mailvelope (does not support inline images)
-			try {
-				let emails = [...message.from,...message.to,...message.cc].validUnique(),
-					i = emails.length;
-				while (i--) {
-					if (await this.getMailvelopePrivateKeyFor(emails[i].email)) {
-						/**
-						* https://mailvelope.github.io/mailvelope/Mailvelope.html#createEncryptedFormContainer
-						* Creates an iframe to display an encrypted form
-						*/
-	//					mailvelope.createEncryptedFormContainer('#mailvelope-form');
-						/**
-						* https://mailvelope.github.io/mailvelope/Mailvelope.html#createDisplayContainer
-						* Creates an iframe to display the decrypted content of the encrypted mail.
-						*/
-						const body = message.body;
-						body.textContent = '';
-						let result = await mailvelope.createDisplayContainer(
-							'#'+body.id,
-							armoredText,
-							this.mailvelopeKeyring,
-							{
-								senderAddress: sender
-								// emails[i].email
-							}
-						);
-						if (result) {
-							if (result.error?.message) {
-								if ('PWD_DIALOG_CANCEL' !== result.error.code) {
-									alert(result.error.code + ': ' + result.error.message);
+			if (mailvelopeKeyring) {
+				try {
+					let emails = [...message.from,...message.to,...message.cc].validUnique(),
+						i = emails.length;
+					while (i--) {
+						if (await this.getMailvelopePrivateKeyFor(emails[i].email)) {
+							/**
+							* https://mailvelope.github.io/mailvelope/Mailvelope.html#createEncryptedFormContainer
+							* Creates an iframe to display an encrypted form
+							*/
+		//					mailvelope.createEncryptedFormContainer('#mailvelope-form');
+							/**
+							* https://mailvelope.github.io/mailvelope/Mailvelope.html#createDisplayContainer
+							* Creates an iframe to display the decrypted content of the encrypted mail.
+							*/
+							const body = message.body;
+							body.textContent = '';
+							let result = await mailvelope.createDisplayContainer(
+								'#'+body.id,
+								armoredText,
+								mailvelopeKeyring,
+								{
+									senderAddress: sender
+									// emails[i].email
+								}
+							);
+							if (result) {
+								if (result.error?.message) {
+									if ('PWD_DIALOG_CANCEL' !== result.error.code) {
+										alert(result.error.code + ': ' + result.error.message);
+									}
+								} else {
+									body.classList.add('mailvelope');
+									return true;
 								}
-							} else {
-								body.classList.add('mailvelope');
-								return true;
 							}
+							break;
 						}
-						break;
 					}
+				} catch (err) {
+					console.error(err);
 				}
-			} catch (err) {
-				console.error(err);
 			}
 
 			// Now try GnuPG
@@ -217,19 +215,19 @@ export const
 		 * So far this is only the autocrypt header.
 		 */
 	/*
-		this.mailvelopeKeyring.additionalHeadersForOutgoingEmail(headers)
-		this.mailvelopeKeyring.addSyncHandler(syncHandlerObj)
-		this.mailvelopeKeyring.createKeyBackupContainer(selector, options)
-		this.mailvelopeKeyring.createKeyGenContainer(selector, {
+		mailvelopeKeyring.additionalHeadersForOutgoingEmail(headers)
+		mailvelopeKeyring.addSyncHandler(syncHandlerObj)
+		mailvelopeKeyring.createKeyBackupContainer(selector, options)
+		mailvelopeKeyring.createKeyGenContainer(selector, {
 	//		userIds: [],
 			keySize: 4096
 		})
 
-		this.mailvelopeKeyring.exportOwnPublicKey(emailAddr).then(<AsciiArmored, Error>)
-		this.mailvelopeKeyring.importPublicKey(armored)
+		mailvelopeKeyring.exportOwnPublicKey(emailAddr).then(<AsciiArmored, Error>)
+		mailvelopeKeyring.importPublicKey(armored)
 
 		// https://mailvelope.github.io/mailvelope/global.html#SyncHandlerObject
-		this.mailvelopeKeyring.addSyncHandler({
+		mailvelopeKeyring.addSyncHandler({
 			uploadSync
 			downloadSync
 			backup
diff --git a/dev/Stores/User/Settings.js b/dev/Stores/User/Settings.js
index cd8b76188..e72cd4ab7 100644
--- a/dev/Stores/User/Settings.js
+++ b/dev/Stores/User/Settings.js
@@ -26,6 +26,7 @@ export const SettingsUserStore = new class {
 			simpleAttachmentsList: 0,
 			useCheckboxesInList: 1,
 			listGrouped: 0,
+			showNextMessage: 0,
 			allowDraftAutosave: 1,
 			useThreads: 0,
 			replySameFolder: 0,
@@ -49,13 +50,12 @@ export const SettingsUserStore = new class {
 
 		self.init();
 
-		self.usePreviewPane = koComputable(() => Layout.NoPreview !== self.layout() && !ThemeStore.isMobile());
+		self.usePreviewPane = koComputable(() => self.layout() && !ThemeStore.isMobile());
 
 		const toggleLayout = () => {
-			const value = ThemeStore.isMobile() ? Layout.NoPreview : self.layout();
-			$htmlCL.toggle('rl-no-preview-pane', Layout.NoPreview === value);
-			$htmlCL.toggle('rl-side-preview-pane', Layout.SidePreview === value);
-			$htmlCL.toggle('rl-bottom-preview-pane', Layout.BottomPreview === value);
+			const value = ThemeStore.isMobile() ? 0 : self.layout();
+			$htmlCL.toggle('sm-msgView-side', Layout.SidePreview === value);
+			$htmlCL.toggle('sm-msgView-bottom', Layout.BottomPreview === value);
 			fireEvent('rl-layout', value);
 		};
 		self.layout.subscribe(toggleLayout);
@@ -65,7 +65,7 @@ export const SettingsUserStore = new class {
 		let iAutoLogoutTimer;
 		self.delayLogout = (() => {
 			clearTimeout(iAutoLogoutTimer);
-			if (0 < self.autoLogout() && !SettingsGet('AccountSignMe')) {
+			if (0 < self.autoLogout() && !SettingsGet('accountSignMe')) {
 				iAutoLogoutTimer = setTimeout(
 					rl.app.logout,
 					self.autoLogout() * 60000
@@ -96,6 +96,7 @@ export const SettingsUserStore = new class {
 		self.simpleAttachmentsList(SettingsGet('simpleAttachmentsList'));
 		self.useCheckboxesInList(SettingsGet('UseCheckboxesInList'));
 		self.listGrouped(SettingsGet('listGrouped'));
+		self.showNextMessage(SettingsGet('showNextMessage'));
 		self.allowDraftAutosave(SettingsGet('AllowDraftAutosave'));
 		self.useThreads(SettingsGet('UseThreads'));
 		self.replySameFolder(SettingsGet('ReplySameFolder'));
diff --git a/dev/Styles/@Boot.css b/dev/Styles/@Boot.css
index ba116e1da..f542b909c 100644
--- a/dev/Styles/@Boot.css
+++ b/dev/Styles/@Boot.css
@@ -1,7 +1,7 @@
 :root {
-	--fontSans: Verdana, Geneva, "Bitstream Vera Sans", "DejaVu LGC Sans", Arial, sans-serif;
-	--fontSerif: "Nimbus Roman No9 L", "Times New Roman", Times, FreeSerif, serif;
-	--fontMono: "Liberation Mono", Monaco, Menlo, Consolas, "Courier New", FreeMono, Courier, monospace;
+	--fontSans: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+	--fontSerif: ui-serif, Georgia, Cambria, "Times New Roman", Times, serif;
+	--fontMono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
 }
 
 #rl-app.fontArial {
diff --git a/dev/Styles/Admin/Layout.less b/dev/Styles/Admin/Layout.less
index 0d5e9ae48..cb4be27a3 100644
--- a/dev/Styles/Admin/Layout.less
+++ b/dev/Styles/Admin/Layout.less
@@ -39,6 +39,14 @@
 	height: calc(100% - 50px - @rlLowMargin);
 	margin: 50px @rlLowMargin 0 0;
 
+	background-color: var(--panel-bg-clr, #fff);
+	border: 1px solid var(--border-color, #aaa);
+	border-radius: var(--border-radius, 5px);
+	box-shadow: var(--smMainShadow);
+	overflow-y: auto;
+	padding: 20px;
+	scroll-behavior: smooth;
+
 	> .b-toolbar {
 		color: #fff;
 		display: flex;
@@ -56,28 +64,13 @@
 	}
 }
 
-.rl-mobile #V-AdminPane {
-	margin-right: 0;
-}
-
 .btn.btn-logout {
 	padding-left: 12px;
 	padding-right: 12px;
 }
 
-#rl-settings-subscreen {
-	background-color: var(--settings-bg-clr, #fff);
-	border: 1px solid var(--border-color, #aaa);
-	border-radius: var(--border-radius, 5px);
-	box-shadow: var(--smMainShadow);
-	height: 100%;
-	overflow-y: auto;
-	padding: 20px;
-	scroll-behavior: smooth;
-}
-
 /* desktop */
-@media screen and (min-width: 1000px) {
+@media screen and (min-width: @maxMobileWidth + 1px) {
 	.toggleLeft {
 		display: none;
 	}
@@ -90,16 +83,16 @@
 	}
 }
 
-/* mobile and tablet */
-@media screen and (max-width: 999px) {
-	#rl-settings-subscreen {
-		padding: 10px;
-	}
-
+@media screen and (max-width: @maxMobileWidth) {
 	#rl-right {
 		min-width: calc(100% - @rlLowMargin);
 	}
 
+	#V-AdminPane {
+		margin-right: 0;
+		padding: 10px;
+	}
+
 	html.rl-left-panel-disabled {
 		#rl-left {
 			width: 0;
diff --git a/dev/Styles/Languages.less b/dev/Styles/Languages.less
index 69a962767..ae5b95eb7 100644
--- a/dev/Styles/Languages.less
+++ b/dev/Styles/Languages.less
@@ -34,7 +34,7 @@
 	}
 }
 
-@media screen and (max-width: 733px) {
+@media screen and (max-width: 480px) {
 	#V-PopupsLanguages label {
 		width: 100%;
 	}
diff --git a/dev/Styles/Login.less b/dev/Styles/Login.less
index 120962a63..48e9ee3b8 100644
--- a/dev/Styles/Login.less
+++ b/dev/Styles/Login.less
@@ -10,10 +10,6 @@
 	z-index: 5;
 }
 
-@glass-color: #fff;
-@glass-error-color: #f76260;
-@glass-m-color: rgba(255, 255, 255, .8);
-
 .LoginView {
 
 	.descWrapper {
@@ -29,18 +25,18 @@
 		border: var(--login-border, 1px solid rgba(255, 255, 255, .2));
 		border-radius: var(--login-border-radius, 7px);
 		box-shadow: var(--login-box-shadow);
-		color: var(--login-color, @glass-m-color);
+		color: var(--login-color, rgba(255, 255, 255, .8));
 		margin: 0;
 		padding: 40px 40px 20px 40px;
 		position: relative;
 
 		* {
-			color: var(--login-color, @glass-m-color);
+			color: var(--login-color, rgba(255, 255, 255, .8));
 		}
 
 		.controls.error * {
-			color: @glass-error-color;
-			border-color: @glass-error-color;
+			color: #f76260;
+			border-color: #f76260;
 		}
 
 		&.submitting > * {
@@ -77,17 +73,17 @@
 		padding-right: 30px;
 
 		&:placeholder {
-			color: @glass-color;
+			color: #fff;
 		}
 
 		&:focus, &:hover {
-			border-color: @glass-color;
+			border-color: #fff;
 		}
 	}
 
 	input, .btn {
 		background: none;
-		border: 1px solid @glass-m-color;
+		border: 1px solid rgba(255, 255, 255, .8);
 	}
 
 	.fontastic + input {
@@ -107,7 +103,7 @@
 		font-size: 13px;
 
 		&:hover, &:active {
-			border-color: @glass-color;
+			border-color: #fff;
 		}
 	}
 
diff --git a/dev/Styles/Main.less b/dev/Styles/Main.less
index 318ee0dd5..ba75cb7f7 100644
--- a/dev/Styles/Main.less
+++ b/dev/Styles/Main.less
@@ -4,7 +4,7 @@ html.list-loading body {
 	cursor: progress;
 }
 
-@media screen and (min-width: 1000px) {
+@media screen and (min-width: @maxMobileWidth + 1px) {
 	#rl-app {
 		background-image: var(--main-bg-image);
 		background-size: var(--main-bg-size);
@@ -73,13 +73,14 @@ dialog:not(.animate) {
 
 /**
  * https://github.com/the-djmaze/snappymail/issues/686
-@media screen and (max-width: 999px) {
  */
-.rl-mobile dialog {
-	margin: 0 auto;
-/*	max-height: calc(100vh - 86px);*/
-/*	max-height: 100dvh;*/
-	width: 100%;
+@media screen and (max-width: @maxMobileWidth) {
+	dialog {
+		margin: 0 auto;
+/*		max-height: calc(100vh - 86px);*/
+/*		max-height: 100dvh;*/
+		width: 100%;
+	}
 }
 
 dialog > header {
diff --git a/dev/Styles/Ui.less b/dev/Styles/Ui.less
index 29cae25ed..d3387f2aa 100644
--- a/dev/Styles/Ui.less
+++ b/dev/Styles/Ui.less
@@ -1,5 +1,4 @@
 
-#rl-settings-subscreen,
 .g-ui-user-select-none {
 	user-select: none;
 	-webkit-touch-callout: none;
@@ -159,20 +158,7 @@ summary.legend {
 	padding: 0 9px;
 }
 
-.alert a:not(.close) {
-	text-decoration: underline;
-}
-
-.alert.alert-info a:not(.close) {
-	color: var(--info-clr, #3a87ad);
-}
-
-.alert.alert-error a:not(.close) {
-	color: var(--error-clr, #b94a48);
-}
-
-/* mobile and tablet */
-@media screen and (max-width: 999px) {
+@media screen and (max-width: @maxMobileWidth) {
 	.form-horizontal {
 		.control-group {
 			> label {
diff --git a/dev/Styles/User/AdvancedSearch.less b/dev/Styles/User/AdvancedSearch.less
index cac4a1c1f..005e02f57 100644
--- a/dev/Styles/User/AdvancedSearch.less
+++ b/dev/Styles/User/AdvancedSearch.less
@@ -10,7 +10,7 @@
 	margin-right:1em;
 }
 
-@media screen and (max-width: 410px) {
+@media screen and (max-width: 480px) {
 	#advancedsearchform label {
 		width: 100%;
 	}
diff --git a/dev/Styles/User/Animations.less b/dev/Styles/User/Animations.less
index da155da61..317c98a24 100644
--- a/dev/Styles/User/Animations.less
+++ b/dev/Styles/User/Animations.less
@@ -10,7 +10,7 @@
 	100% {background-position: 60px 0;}
 }
 
-@media screen and (min-width: 1000px) {
+@media screen and (min-width: @maxMobileWidth + 1px) {
 
 	.b-folders li .anim-action-class {
 		animation: highlight-folder-row 0.5s linear;
diff --git a/dev/Styles/User/Compose.less b/dev/Styles/User/Compose.less
index 5ce9ce2a1..e6a290d91 100644
--- a/dev/Styles/User/Compose.less
+++ b/dev/Styles/User/Compose.less
@@ -45,7 +45,7 @@
 		padding-top: 50px;
 		text-align: center;
 		font-size: 24px;
-		color: #666;
+		opacity: 0.5;
 		text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
 	}
 
@@ -131,18 +131,20 @@
 		top: 5px;
 		bottom: 5px;
 
-		border: 2px #777 dashed;
+		border: 2px var(--border-color, #ddd) dashed;
 		z-index: 300;
 
 		line-height: 119px;
 		text-align: center;
-		background-color: #efefef;
+		background-color: var(--dialog-bg-clr, #fff);
 		font-size: 24px;
 
 		border-radius: 10px;
 
+		opacity: 0.9;
 		&.dragAndDropOver {
-			background-color: #fff;
+			border-color: var(--main-color, #fff);
+			opacity: 1;
 		}
 	}
 }
diff --git a/dev/Styles/User/Contacts.less b/dev/Styles/User/Contacts.less
index d070e72e9..67857248e 100644
--- a/dev/Styles/User/Contacts.less
+++ b/dev/Styles/User/Contacts.less
@@ -195,7 +195,7 @@
 	}
 }
 
-html:not(rl-mobile) {
+@media screen and (min-width: @maxMobileWidth + 1px) {
 	.hideContactListCheckbox {
 		.checkboxItem {
 			visibility: hidden;
@@ -203,7 +203,7 @@ html:not(rl-mobile) {
 	}
 }
 
-@media screen and (max-width: 900px) {
+@media screen and (max-width: @maxMobileWidth) {
 	#V-PopupsContacts {
 		width: 100%;
 	}
diff --git a/dev/Styles/User/FolderList.less b/dev/Styles/User/FolderList.less
index 6e5ef1b3f..fdf4c6ce1 100644
--- a/dev/Styles/User/FolderList.less
+++ b/dev/Styles/User/FolderList.less
@@ -7,6 +7,12 @@
 	height: 100%;
 }
 
+.focused .b-folders a.focused {
+	background-color: var(--folders-focused-bg-color, #333);
+	border-left-color: #fff;
+	color: var(--folders-focused-color, #eee);
+}
+
 .b-folders {
 	display: flex;
 	flex-direction: column;
@@ -38,7 +44,6 @@
 	}
 
 	.b-toolbar {
-		padding: 10px 0 10px @rlLowMargin;
 		color: #fff;
 	}
 
@@ -56,7 +61,6 @@
 
 	hr {
 		margin: 10px;
-		border-color: #999;
 	}
 
 	li {
@@ -101,22 +105,12 @@
 					background-color: var(--folders-selected-bg-color, #333);
 					color: var(--folders-selected-color, #eee);
 				}
-
-				&.focused {
-					background-color: var(--folders-focused-bg-color, #333);
-					color: var(--folders-focused-color, #eee);
-				}
 			}
 			&:not(.selectable) {
 				cursor: default;
 				font-style: italic;
 			}
 
-			&.focused {
-				background-color: #888;
-				border-left-color: #fff;
-			}
-
 			&.unread-sub {
 				font-weight: bold;
 			}
@@ -213,24 +207,19 @@
 /**/
 }
 
-.btn {
-	&.buttonCompose {
-		max-height: 2em;
-		max-width: fit-content;
-		overflow: hidden;
-		width: calc(100% - 48px);
-	}
+#rl-left .buttonCompose {
+	max-height: 2em;
+	max-width: fit-content;
+	overflow: hidden;
+	width: calc(100% - 48px);
 }
 
 html.rl-left-panel-disabled {
-	.buttonComposeText{
+	.buttonComposeText,
+	.buttonContacts {
 		display: none;
 	}
-	.btn.buttonCompose {
+	#rl-left .buttonCompose {
 		width: auto;
 	}
-	.btn.buttonContacts {
-		margin-top: 10px !important;
-		margin-left: 0 !important;
-	}
 }
diff --git a/dev/Styles/User/Layout.less b/dev/Styles/User/Layout.less
index e5fb91357..4f6bf4487 100644
--- a/dev/Styles/User/Layout.less
+++ b/dev/Styles/User/Layout.less
@@ -12,6 +12,10 @@
 /*	transition: width 0.3s ease-out;*/
 	width: @rlLeftWidth;
 	z-index: 0;
+
+	.b-toolbar {
+		padding: 10px 0 10px @rlLowMargin;
+	}
 }
 
 #rl-right:not([hidden]) {
@@ -19,9 +23,6 @@
 	flex-grow: 1;
 	width: 20%;
 }
-.rl-bottom-preview-pane #rl-right {
-	flex-direction: column;
-}
 
 /*
 .resizable::after {
@@ -41,47 +42,12 @@
 }
 */
 
-.resizer {
-	background: #aaa;
-	background: rgba(255,255,255,0.5);
-	display: none;
-	opacity: 0;
-	position: absolute;
-	z-index: 102;
-}
-.resizer:hover {
-	opacity: 1;
-}
-
 html:not(.rl-left-panel-disabled) #rl-left {
 	resize: horizontal; overflow: auto;
 	min-width: 155px;
 	max-width: 350px;
 }
 
-#rl-left > .resizer,
-.rl-side-preview-pane #V-MailMessageList .resizer {
-	cursor: ew-resize;
-	cursor: col-resize;
-	right: 0;
-	top: 0;
-	bottom: 0;
-	width: 5px;
-}
-.rl-bottom-preview-pane #V-MailMessageList .resizer {
-	cursor: ns-resize;
-	cursor: row-resize;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	height: 5px;
-}
-
-html:not(.rl-left-panel-disabled) #rl-left > .resizer,
-#V-MailMessageList .resizer {
-	display: block;
-}
-
 #top-system-dropdown-id::after,
 #button-add-prop-dropdown-id::after {
 	content: '▼';
@@ -140,32 +106,6 @@ html:not(.rl-left-panel-disabled) #rl-left > .resizer,
 	margin-right: 8px;
 }
 
-/* desktop */
-@media screen and (min-width: 1000px) {
-}
-
-/* desktop-large */
-@media screen and (min-width: 1401px) {
-	#rl-left {
-		width: @rlLeftWidth + 20;
-	}
-}
-
-/* mobile and tablet */
-@media screen and (max-width: 999px) {
-	#rl-left {
-		width: 155px;
-	}
-
-	#rl-settings-subscreen {
-		padding: 10px;
-	}
-
-	.dropdown-menu a {
-		line-height: 2.5;
-	}
-}
-
 html:not(.rl-ctrl-key-pressed) .visible-on-ctrl-btn,
 html.rl-ctrl-key-pressed .hidden-on-ctrl-btn,
 .show-on-panel-disabled {
@@ -191,32 +131,6 @@ html.rl-left-panel-disabled {
 	}
 }
 
-html.rl-mobile #rl-left > .resizer,
-html.rl-no-preview-pane #rl-right .resizer {
-	display: none !important;
-}
-
-html.rl-mobile {
-	#rl-left {
-		background: var(--main-bg-color, #aaa);
-		border-right: 1px solid var(--border-color, #ddd);
-		position: fixed;
-		left: 0;
-		top: 0;
-		bottom: 0;
-		width: 50vw;
-		z-index: 3;
-	}
-	&.rl-left-panel-disabled #rl-left {
-		display: none;
-	}
-}
-
-html.rl-mobile .hide-mobile,
-html:not(.rl-mobile) .show-mobile {
-	display: none !important;
-}
-
 .e-paginator {
 
 	a {
@@ -237,3 +151,85 @@ html:not(.rl-mobile) .show-mobile {
 		}
 	}
 }
+
+.resizer {
+	display: none;
+}
+
+@media screen and (max-width: @maxMobileWidth) {
+	#rl-app {
+		#V-SettingsPane {
+			margin-right: 0;
+			padding: 10px;
+		}
+	}
+
+	#rl-left {
+		background: var(--main-bg-color, #aaa);
+		border-right: 1px solid var(--border-color, #ddd);
+		position: fixed;
+		left: 0;
+		top: 0;
+		bottom: 0;
+		width: 50vw;
+		z-index: 3;
+	}
+	.rl-left-panel-disabled #rl-left {
+		display: none;
+	}
+
+	.dropdown-menu a {
+		line-height: 2.5;
+	}
+
+	.hide-mobile {
+		display: none !important;
+	}
+}
+
+/* desktop */
+@media screen and (min-width: @maxMobileWidth + 1px) {
+	.toggleLeft,
+	#V-MailMessageList .buttonCompose {
+		display: none !important;
+	}
+
+	.sm-msgView-bottom #rl-right {
+		flex-direction: column;
+	}
+
+	.resizer {
+		background: #aaa;
+		background: rgba(255,255,255,0.5);
+		opacity: 0;
+		position: absolute;
+		bottom: 0;
+		right: 0;
+		z-index: 102;
+	}
+	.resizer:hover {
+		opacity: 1;
+	}
+	html:not(.rl-left-panel-disabled) #rl-left > .resizer,
+	.sm-msgView-side #V-MailMessageList .resizer {
+		cursor: ew-resize;
+		cursor: col-resize;
+		display: block;
+		top: 0;
+		width: 5px;
+	}
+	.sm-msgView-bottom #V-MailMessageList .resizer {
+		cursor: ns-resize;
+		cursor: row-resize;
+		display: block;
+		left: 0;
+		height: 5px;
+	}
+}
+
+/* desktop-large */
+@media screen and (min-width: 1401px) {
+	#rl-left {
+		width: @rlLeftWidth + 20;
+	}
+}
diff --git a/dev/Styles/User/MessageList.less b/dev/Styles/User/MessageList.less
index e5ae5b3e8..c0b6a8f57 100644
--- a/dev/Styles/User/MessageList.less
+++ b/dev/Styles/User/MessageList.less
@@ -1,34 +1,9 @@
 
-html.rl-mobile, html.rl-no-preview-pane {
-	.message-selected #V-MailMessageList {
-		display: none;
-	}
-}
-
 #V-MailMessageList {
 	position: relative;
-}
-.rl-side-preview-pane #V-MailMessageList {
-	height: 100%;
-}
-.rl-no-preview-pane #V-MailMessageList {
 	height: 100%;
 	width: 100%;
 }
-.rl-side-preview-pane #V-MailMessageList .messageList {
-	max-width: 50vw;
-	min-width: 320px;
-	overflow: auto;
-	resize: horizontal;
-	width: 35vw;
-}
-.rl-bottom-preview-pane #V-MailMessageList .messageList {
-	height: 35vh;
-	max-height: 50vh;
-	min-height: 200px;
-	overflow: auto;
-	resize: vertical;
-}
 
 #V-MailMessageList.focused .messageList {
 	border-color: #9d9d9d;
@@ -47,7 +22,7 @@ html.rl-mobile, html.rl-no-preview-pane {
 
 .messageList {
 	height: calc(100% - 60px);
-	background-color: #fff;
+	background-color: var(--panel-bg-clr, #fff);
 	border: 1px solid var(--border-color, #aaa);
 	border-radius: var(--border-radius, 5px);
 	display: flex;
@@ -71,7 +46,7 @@ html.rl-mobile, html.rl-no-preview-pane {
 	}
 
 	.b-footer {
-	    display: flex;
+		display: flex;
 		flex-shrink: 0;
 		padding: 7px;
 
@@ -196,18 +171,6 @@ html.rl-mobile, html.rl-no-preview-pane {
 	}
 }
 
-html:not(rl-mobile) {
-	.hideMessageListCheckbox {
-		.checkboxCheckAll {
-			visibility: hidden;
-		}
-
-		.messageCheckbox {
-			display: none;
-		}
-	}
-}
-
 .messageListItem > div + div {
 	display: flex;
 	overflow: hidden;
@@ -396,20 +359,55 @@ html:not(rl-mobile) {
 	}
 }
 
-@media screen and (min-width: 1000px) {
+html:not(.sm-msgView-bottom):not(.sm-msgView-side) .message-selected #V-MailMessageList {
+	display: none;
+}
+
+@media screen and (max-width: @maxMobileWidth) {
+	#V-MailMessageList .btn-toolbar:not(.hasChecked) .onCheckedShow,
+	#V-MailMessageList .hasChecked .onCheckedHide {
+		display: none;
+	}
+}
+
+@media screen and (min-width: @maxMobileWidth + 1px) {
 	.messageList {
 		.listDragOver {
 			transition: all 400ms ease;
 		}
 	}
-}
 
-/* desktop-large */
-@media screen and (min-width: 1401px) {
-	.messageListItem {
-		font-size: 13px;
-		time {
-			font-size: 13px;
+	.hideMessageListCheckbox {
+		.checkboxCheckAll {
+			visibility: hidden;
+		}
+		.checkboxMessage {
+			display: none;
+		}
+	}
+
+	.sm-msgView-side #V-MailMessageList {
+		width: unset;
+
+		.messageList {
+			max-width: 50vw;
+			min-width: 320px;
+			overflow: auto;
+			resize: horizontal;
+			width: 35vw;
+		}
+	}
+
+	.sm-msgView-bottom #V-MailMessageList {
+		height: unset;
+		width: unset;
+
+		.messageList {
+			height: 35vh;
+			max-height: 50vh;
+			min-height: 200px;
+			overflow: auto;
+			resize: vertical;
 		}
 	}
 }
@@ -425,7 +423,7 @@ html:not(rl-mobile) {
 	top: 0;
 }
 
-.rl-side-preview-pane, .rl-mobile {
+.sm-msgView-side, .rl-mobile {
 
 	.messageListItem > div + div {
 		flex-wrap: wrap;
diff --git a/dev/Styles/User/MessageView.less b/dev/Styles/User/MessageView.less
index d84d14533..535aa0420 100644
--- a/dev/Styles/User/MessageView.less
+++ b/dev/Styles/User/MessageView.less
@@ -30,28 +30,14 @@
 	}
 }
 
-html.rl-no-preview-pane {
-	#rl-right:not(.message-selected) #V-MailMessageView {
-		display: none;
-	}
-}
-
 #V-MailMessageView .top-toolbar {
 	color: #fff;
 	padding: 10px 0;
-}
-html.rl-no-preview-pane #V-MailMessageView .top-toolbar {
-	padding-left: 1px;
-}
-html:not(.rl-mobile):not(.rl-no-preview-pane) #V-MailMessageView .top-toolbar {
-	visibility: hidden;
-}
-html.rl-bottom-preview-pane #V-MailMessageView .top-toolbar {
-	display: none;
+	visibility: visible;
 }
 
 .messageView {
-	background-color: #fff;
+	background-color: var(--panel-bg-clr, #fff);
 	border: 1px solid var(--border-color, #aaa);
 	border-radius: var(--border-radius, 5px);
 	height: calc(100% - 50px);
@@ -140,7 +126,7 @@ html.rl-bottom-preview-pane #V-MailMessageView .top-toolbar {
 
 	.messageItemHeader {
 
-		background-color: #f8f8f8;
+		background-color: var(--message-header-bg-clr, #eee);
 		border-bottom: 1px solid var(--border-color, #bbb);
 		border-radius: var(--border-radius, 5px) var(--border-radius, 5px) 0 0;
 		padding: 10px;
@@ -215,7 +201,6 @@ html.rl-bottom-preview-pane #V-MailMessageView .top-toolbar {
 	}
 
 	.openpgp-control {
-		margin: 0.5em;
 		padding: 0.5em;
 
 		span {
@@ -248,9 +233,6 @@ html.rl-bottom-preview-pane #V-MailMessageView .top-toolbar {
 			display: none;
 		}
 	}
-	.b-text-part > iframe {
-		min-height: 50vh;
-	}
 
 	.thread-controls {
 		.dropdown-toggle {
@@ -271,7 +253,6 @@ html.rl-bottom-preview-pane #V-MailMessageView .top-toolbar {
 
 #messageItem {
 
-	color: #000;
 	height: 100%;
 	overflow: auto;
 	scroll-behavior: smooth;
@@ -283,11 +264,13 @@ html.rl-bottom-preview-pane #V-MailMessageView .top-toolbar {
 		padding: 50px 0;
 	}
 
+	.bodySubHeader {
+		background-color: var(--message-header-bg-clr, #eee);
+	}
 	.bodySubHeader > * {
-		background-color: #eee;
 		border-bottom: 1px solid var(--border-color, #bbb);
 		cursor: pointer;
-		padding: 10px 15px;
+		padding: 10px;
 	}
 
 	.pgpInfo {
@@ -300,14 +283,8 @@ html.rl-bottom-preview-pane #V-MailMessageView .top-toolbar {
 		}
 	}
 
-	.readReceipt {
-		background-color: #ffffd9;
-	}
-
 	.attachmentsPlace {
 
-		padding: 10px 10px 6px 10px;
-		background: #eee;
 		border-bottom: 1px solid var(--border-color, #bbb);
 		position: relative;
 
@@ -336,9 +313,8 @@ html.rl-bottom-preview-pane #V-MailMessageView .top-toolbar {
 	}
 
 	.attachmentsControls {
-		padding: 7px 5px 7px 14px;
-		background: #e8e8e8;
-		border-bottom: 1px solid var(--border-color, #bbb);
+		padding-top: 7px;
+		border-top: 1px solid var(--border-color, #bbb);
 	}
 	.attachmentsControls > * {
 		display: inline-block;
@@ -365,8 +341,12 @@ html.rl-bottom-preview-pane #V-MailMessageView .top-toolbar {
 		height: 100%;
 		padding: 10px;
 
+		* {
+			box-sizing: unset;
+		}
+
 		a {
-			color: blue;
+			color: var(--link-color, blue);
 			text-decoration: underline;
 
 			&:visited {
@@ -382,6 +362,10 @@ html.rl-bottom-preview-pane #V-MailMessageView .top-toolbar {
 			opacity: 0.8;
 			padding: 0 10px;
 			margin: 0;
+
+			blockquote {
+				opacity: 1;
+			}
 		}
 
 		&.html {
@@ -471,15 +455,34 @@ html.rl-bottom-preview-pane #V-MailMessageView .top-toolbar {
 	}
 }
 
-html.rl-no-preview-pane .messageView {
-	border: 1px solid var(--border-color, #aaa);
-	box-shadow: var(--smMainShadow);
+.mailvelope iframe {
+	min-height: 400px;
 }
 
-html.rl-bottom-preview-pane .messageView {
-	height: 100%;
+html:not(.sm-msgView-bottom):not(.sm-msgView-side) {
+	#rl-right:not(.message-selected) #V-MailMessageView {
+		display: none;
+	}
 }
 
+@media screen and (max-width: 1400px) {
+	html.sm-msgView-side #V-MailMessageView .top-toolbar {
+		visibility: hidden;
+	}
+}
+
+html.sm-msgView-bottom {
+	#V-MailMessageView .top-toolbar {
+		display: none;
+	}
+	.messageView {
+		height: 100%;
+	}
+}
+
+/*
+@media all and (display-mode: fullscreen) {
+*/
 html.rl-fullscreen {
 
 	#rl-left,
diff --git a/dev/Styles/User/OpenPgpKey.less b/dev/Styles/User/OpenPgpKey.less
index c318b157d..c7404e6ab 100644
--- a/dev/Styles/User/OpenPgpKey.less
+++ b/dev/Styles/User/OpenPgpKey.less
@@ -3,9 +3,10 @@
 }
 
 #V-PopupsOpenPgpKey {
-	.key-viewer {
+	pre {
 		margin: 0;
 		max-height: 500px;
+		padding: 0;
 		overflow: auto;
 	}
 }
@@ -13,9 +14,8 @@
 #V-PopupsOpenPgpImport {
 	max-width: 645px;
 
-	.inputKey {
+	textarea {
 		font-family: var(--fontMono);
 		width: 600px;
-
 	}
 }
diff --git a/dev/Styles/User/Settings.less b/dev/Styles/User/Settings.less
index 45f225092..7f0a4a09c 100644
--- a/dev/Styles/User/Settings.less
+++ b/dev/Styles/User/Settings.less
@@ -1,24 +1,5 @@
 
 #V-SettingsMenu {
-
-	.b-footer {
-		position: absolute;
-		bottom: 10px;
-		right: 0;
-		left: 0;
-		padding: 0 10px 0 5px;
-		z-index: 101;
-	}
-
-	.b-content {
-		position: absolute;
-		top: 50px + @rlLowMargin + 10px;
-		bottom: @rlLowMargin;
-		left: 0;
-		right: 0;
-		overflow: hidden;
-	}
-
 	nav {
 
 		a {
@@ -51,15 +32,20 @@
 #V-SettingsPane {
 	height: calc(100% - 50px - @rlLowMargin);
 	margin: 50px @rlLowMargin 0 0;
+	padding:20px;
 	width: 100%;
 
+	background-color: var(--panel-bg-clr, #fff);
+	border: 1px solid var(--border-color, #aaa);
+	border-radius: var(--border-radius, 5px);
+	box-shadow: var(--smMainShadow);
+	overflow-y: auto;
+	scroll-behavior: smooth;
+
 	.btn-toolbar {
 		position: absolute;
-		top: 0;
-		right: 0;
-		left: 0;
-		padding: 8px 0;
-		color: #fff;
+		top: 8px;
+		left: @rlLowMargin;
 	}
 
 	td {
@@ -68,22 +54,7 @@
 	}
 }
 
-.rl-mobile #V-SettingsPane {
-	margin-right: 0;
-}
-
-#rl-settings-subscreen {
-	background-color: var(--settings-bg-clr, #fff);
-	border: 1px solid var(--border-color, #aaa);
-	border-radius: var(--border-radius, 5px);
-	box-shadow: var(--smMainShadow);
-	height: 100%;
-	overflow-y: auto;
-	padding:20px;
-	scroll-behavior: smooth;
-}
-
-.firefox-drag #rl-settings-subscreen,
+.firefox-drag #V-SettingsPane,
 .firefox-drag .modal-body {
 	overflow: hidden;
 }
diff --git a/dev/Styles/User/SystemDropDown.less b/dev/Styles/User/SystemDropDown.less
index 1d484432c..be702aad8 100644
--- a/dev/Styles/User/SystemDropDown.less
+++ b/dev/Styles/User/SystemDropDown.less
@@ -1,8 +1,6 @@
 
 #top-system-dropdown-id {
-	overflow: hidden;
-	padding-left: 8px;
-	padding-right: 6px;
+	padding: 0 6px;
 }
 
 .rl-left-panel-disabled #more-list-dropdown-id + .dropdown-menu {
@@ -50,16 +48,15 @@
 	}
 
 	.accountPlace {
-		background-color: rgba(0, 0, 0, 0.5);
-		border-radius: 4px;
-		color: #fff;
+		border-right: 1px solid var(--btn-border-clr, rgba(0, 0, 0, 0.2));
 		display: inline-block;
 		font-weight: bold;
 		font-size: 16px;
-		line-height: 29px;
+		line-height: 22px;
+		margin: 0 6px -3px 0;
 		max-width: 25vw;
-		overflow: hidden;
-		padding: 1px 8px;
+		overflow-x: hidden;
+		padding-right: 6px;
 		text-overflow: ellipsis;
 		text-shadow: 0 1px 0 #000;
 		white-space: nowrap;
diff --git a/dev/Styles/_End.less b/dev/Styles/_End.less
index 00d0219b0..ee0cb55a4 100644
--- a/dev/Styles/_End.less
+++ b/dev/Styles/_End.less
@@ -19,7 +19,7 @@
 	white-space: nowrap;
 	z-index: 2001;
 }
-@media only screen and (max-width: 600px) {
+@media screen and (max-width: @maxMobileWidth) {
 	[data-rainloopErrorTip]::before {
 		min-width: 60vw;
 		white-space: normal;
diff --git a/dev/Styles/_Values.less b/dev/Styles/_Values.less
index f1af0a24d..11dd6cb05 100644
--- a/dev/Styles/_Values.less
+++ b/dev/Styles/_Values.less
@@ -2,11 +2,16 @@
 @rlLeftWidth: 200px;
 @rlLowMargin: 8px;
 
+/* mobile and tablet */
+@maxMobileWidth: 799px;
+
 :root {
 	--smDialogShrink: 20px;
 	--smMainShadow: 0 2px 8px rgba(0, 0, 0, 0.2);
 }
-.rl-mobile {
-	/* For Firefox */
-	--smDialogShrink: 25px;
+/* For Firefox */
+@media screen and (max-width: @maxMobileWidth) {
+	:root {
+		--smDialogShrink: 25px;
+	}
 }
diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index 8eda55fc5..53ec466c1 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -1,7 +1,7 @@
 import ko from 'ko';
 
 import {
-	Notification,
+	Notifications,
 	UploadErrorCode
 } from 'Common/Enums';
 
@@ -11,7 +11,7 @@ import {
 	FolderType
 } from 'Common/EnumsUser';
 
-import { pInt, isArray, arrayLength } from 'Common/Utils';
+import { pInt, isArray, arrayLength, b64Encode } from 'Common/Utils';
 import { encodeHtml, HtmlEditor, htmlToPlain } from 'Common/Html';
 import { koArrayWithDestroy, addObservablesTo, addComputablesTo, addSubscribablesTo } from 'External/ko';
 
@@ -19,8 +19,8 @@ import { UNUSED_OPTION_VALUE } from 'Common/Consts';
 import { folderInformation, messagesDeleteHelper } from 'Common/Folders';
 import { serverRequest } from 'Common/Links';
 import { i18n, getNotification, getUploadErrorDescByCode, timestampToString } from 'Common/Translator';
-import { MessageFlagsCache, setFolderHash } from 'Common/Cache';
-import { Settings, SettingsCapa, SettingsGet, elementById, addShortcut, createElement } from 'Common/Globals';
+import { setFolderETag } from 'Common/Cache';
+import { SettingsCapa, SettingsGet, elementById, addShortcut, createElement } from 'Common/Globals';
 //import { exitFullscreen, isFullscreen, toggleFullscreen } from 'Common/Fullscreen';
 
 import { AppUserStore } from 'Stores/User/App';
@@ -57,7 +57,7 @@ const
 
 	tpl = createElement('template'),
 
-	base64_encode = text => btoa(unescape(encodeURIComponent(text))).match(/.{1,76}/g).join('\r\n'),
+	base64_encode = text => b64Encode(text).match(/.{1,76}/g).join('\r\n'),
 
 	getEmail = value => addressparser(value)[0]?.email || false,
 
@@ -72,7 +72,7 @@ const
 	reloadDraftFolder = () => {
 		const draftsFolder = FolderUserStore.draftsFolder();
 		if (draftsFolder && UNUSED_OPTION_VALUE !== draftsFolder) {
-			setFolderHash(draftsFolder, '');
+			setFolderETag(draftsFolder, '');
 			if (FolderUserStore.currentFolderFullName() === draftsFolder) {
 				MessagelistUserStore.reload(true);
 			} else {
@@ -441,16 +441,6 @@ export class ComposePopupView extends AbstractViewPopup {
 				this.sendError(false);
 				this.sending(true);
 
-				if (3 === arrayLength(this.aDraftInfo)) {
-					const flagsCache = MessageFlagsCache.getFor(this.aDraftInfo[2], this.aDraftInfo[1]);
-					if (isArray(flagsCache)) {
-						flagsCache.push(('forward' === this.aDraftInfo[0]) ? '$forwarded' : '\\answered');
-						MessageFlagsCache.setFor(this.aDraftInfo[2], this.aDraftInfo[1], flagsCache);
-						MessagelistUserStore.reloadFlagsAndCachedMessage();
-						setFolderHash(this.aDraftInfo[2], '');
-					}
-				}
-
 				sSentFolder = UNUSED_OPTION_VALUE === sSentFolder ? '' : sSentFolder;
 
 				this.getMessageRequestParams(sSentFolder).then(params => {
@@ -458,19 +448,23 @@ export class ComposePopupView extends AbstractViewPopup {
 						(iError, data) => {
 							this.sending(false);
 							if (iError) {
-								if (Notification.CantSaveMessage === iError) {
+								if (Notifications.CantSaveMessage === iError) {
 									this.sendSuccessButSaveError(true);
 									this.savedErrorDesc(i18n('COMPOSE/SAVED_ERROR_ON_SEND').trim());
 								} else {
 									this.sendError(true);
 									this.sendErrorDesc(getNotification(iError, data?.ErrorMessage)
-										|| getNotification(Notification.CantSendMessage));
+										|| getNotification(Notifications.CantSendMessage));
 								}
 							} else {
 								this.close();
 							}
-							setFolderHash(this.draftsFolder(), '');
-							setFolderHash(sSentFolder, '');
+							setFolderETag(this.draftsFolder(), '');
+							setFolderETag(sSentFolder, '');
+							if (3 === arrayLength(this.aDraftInfo)) {
+								const folder = this.aDraftInfo[2];
+								setFolderETag(folder, '');
+							}
 							reloadDraftFolder();
 						},
 						params,
@@ -492,57 +486,59 @@ export class ComposePopupView extends AbstractViewPopup {
 	}
 
 	saveCommand() {
-		if (FolderUserStore.draftsFolderNotEnabled()) {
-			showScreenPopup(FolderSystemPopupView, [FolderType.Drafts]);
-		} else {
-			this.savedError(false);
-			this.saving(true);
-			this.autosaveStart();
-			this.getMessageRequestParams(FolderUserStore.draftsFolder(), 1).then(params => {
-				Remote.request('SaveMessage',
-					(iError, oData) => {
-						let result = false;
+		if (!this.saving() && !this.sending()) {
+			if (FolderUserStore.draftsFolderNotEnabled()) {
+				showScreenPopup(FolderSystemPopupView, [FolderType.Drafts]);
+			} else {
+				this.savedError(false);
+				this.saving(true);
+				this.autosaveStart();
+				this.getMessageRequestParams(FolderUserStore.draftsFolder(), 1).then(params => {
+					Remote.request('SaveMessage',
+						(iError, oData) => {
+							let result = false;
 
-						this.saving(false);
+							this.saving(false);
 
-						if (!iError) {
-							if (oData.Result.folder && oData.Result.uid) {
-								result = true;
+							if (!iError) {
+								if (oData.Result.folder && oData.Result.uid) {
+									result = true;
 
-								if (this.bFromDraft) {
-									const message = MessageUserStore.message();
-									if (message && this.draftsFolder() === message.folder && this.draftUid() == message.uid) {
-										MessageUserStore.message(null);
+									if (this.bFromDraft) {
+										const message = MessageUserStore.message();
+										if (message && this.draftsFolder() === message.folder && this.draftUid() == message.uid) {
+											MessageUserStore.message(null);
+										}
 									}
+
+									this.draftsFolder(oData.Result.folder);
+									this.draftUid(oData.Result.uid);
+
+									this.savedTime(new Date);
+
+									if (this.bFromDraft) {
+										setFolderETag(this.draftsFolder(), '');
+									}
+									setFolderETag(FolderUserStore.draftsFolder(), '');
 								}
-
-								this.draftsFolder(oData.Result.folder);
-								this.draftUid(oData.Result.uid);
-
-								this.savedTime(new Date);
-
-								if (this.bFromDraft) {
-									setFolderHash(this.draftsFolder(), '');
-								}
-								setFolderHash(FolderUserStore.draftsFolder(), '');
 							}
-						}
 
-						if (!result) {
-							this.savedError(true);
-							this.savedErrorDesc(getNotification(Notification.CantSaveMessage));
-						}
+							if (!result) {
+								this.savedError(true);
+								this.savedErrorDesc(getNotification(Notifications.CantSaveMessage));
+							}
 
-						reloadDraftFolder();
-					},
-					params,
-					200000
-				);
-			}).catch(e => {
-				this.saving(false);
-				this.savedError(true);
-				this.savedErrorDesc(getNotification(Notification.CantSaveMessage) + ': ' + e);
-			});
+							reloadDraftFolder();
+						},
+						params,
+						200000
+					);
+				}).catch(e => {
+					this.saving(false);
+					this.savedError(true);
+					this.savedErrorDesc(getNotification(Notifications.CantSaveMessage) + ': ' + e);
+				});
+			}
 		}
 	}
 
@@ -569,12 +565,7 @@ export class ComposePopupView extends AbstractViewPopup {
 	skipCommand() {
 		ComposePopupView.inEdit(true);
 
-		if (
-			!this.saving() &&
-			!this.sending() &&
-			!FolderUserStore.draftsFolderNotEnabled() &&
-			SettingsUserStore.allowDraftAutosave()
-		) {
+		if (!FolderUserStore.draftsFolderNotEnabled() && SettingsUserStore.allowDraftAutosave()) {
 			this.saveCommand();
 		}
 
@@ -597,8 +588,6 @@ export class ComposePopupView extends AbstractViewPopup {
 				&& !FolderUserStore.draftsFolderNotEnabled()
 				&& SettingsUserStore.allowDraftAutosave()
 				&& !this.isEmptyForm(false)
-				&& !this.saving()
-				&& !this.sending()
 				&& !this.savedError()
 			) {
 				this.saveCommand();
@@ -617,7 +606,7 @@ export class ComposePopupView extends AbstractViewPopup {
 						data.Result.map(item => (item?.[0] ? (new EmailModel(item[0], item[1])).toLine() : null))
 						.filter(v => v)
 					);
-				} else if (Notification.RequestAborted !== iError) {
+				} else if (Notifications.RequestAborted !== iError) {
 					fResponse([]);
 				}
 			},
@@ -870,9 +859,9 @@ export class ComposePopupView extends AbstractViewPopup {
 
 			// https://github.com/the-djmaze/snappymail/issues/491
 			tpl.innerHTML = message.bodyAsHTML();
-			tpl.content.querySelectorAll('img').forEach(img =>
-				img.dataset.xSrcCid || img.dataset.xSrc || img.replaceWith(img.alt || img.title)
-			);
+			tpl.content.querySelectorAll('img').forEach(img => {
+				img.src || img.dataset.xSrcCid || img.dataset.xSrc || img.replaceWith(img.alt || img.title)
+			});
 			sText = tpl.innerHTML.trim();
 
 			switch (msgComposeType) {
@@ -1010,7 +999,7 @@ export class ComposePopupView extends AbstractViewPopup {
 				clickElement: dom.querySelector('#composeUploadButton'),
 				dragAndDropElement: dom.querySelector('.b-attachment-place')
 			}),
-			attachmentSizeLimit = pInt(SettingsGet('AttachmentLimit'));
+			attachmentSizeLimit = pInt(SettingsGet('attachmentLimit'));
 
 		oJua
 			.on('onDragEnter', () => {
@@ -1124,12 +1113,12 @@ export class ComposePopupView extends AbstractViewPopup {
 			return false;
 		});
 
-		if (Settings.app('allowCtrlEnterOnCompose')) {
-			addShortcut('enter', 'meta', ScopeCompose, () => {
+		addShortcut('enter', 'meta', ScopeCompose, () => {
+//			if (SettingsUserStore.allowCtrlEnterOnCompose()) {
 				this.sendCommand();
 				return false;
-			});
-		}
+//			}
+		});
 		addShortcut('mailsend', '', ScopeCompose, () => {
 			this.sendCommand();
 			return false;
@@ -1297,7 +1286,7 @@ export class ComposePopupView extends AbstractViewPopup {
 			 */
 			let text = this.oEditor.getData(),
 				encrypted = PgpUserStore.isEncrypted(text),
-				size = SettingsGet('PhpUploadSizes')['post_max_size'],
+				size = SettingsGet('phpUploadSizes')['post_max_size'],
 				quota = pInt(size);
 			switch (size.slice(-1)) {
 				case 'G': quota *= 1024; // fallthrough
@@ -1409,7 +1398,10 @@ export class ComposePopupView extends AbstractViewPopup {
 			encrypt = this.pgpEncrypt() && this.canPgpEncrypt(),
 			isHtml = this.oEditor.isHtml();
 
-		let Text = this.oEditor.getData();
+		let Text = this.oEditor.getData().trim();
+		if (!Text.length) {
+			throw 'Message body is empty';
+		}
 		if (isHtml) {
 			let l;
 			do {
diff --git a/dev/View/Popup/FolderCreate.js b/dev/View/Popup/FolderCreate.js
index 9087a8690..341294329 100644
--- a/dev/View/Popup/FolderCreate.js
+++ b/dev/View/Popup/FolderCreate.js
@@ -1,6 +1,6 @@
 import { koComputable, addObservablesTo } from 'External/ko';
 
-import { Notification } from 'Common/Enums';
+import { Notifications } from 'Common/Enums';
 import { defaultOptionsAfterRender } from 'Common/Utils';
 import { folderListOptionsBuilder, sortFolders } from 'Common/Folders';
 import { getNotification } from 'Common/Translator';
@@ -65,7 +65,7 @@ export class FolderCreatePopupView extends AbstractViewPopup {
 					},
 					error => {
 						FolderUserStore.folderListError(
-							getNotification(error.code, '', Notification.CantCreateFolder)
+							getNotification(error.code, '', Notifications.CantCreateFolder)
 							+ '.\n' + error.message);
 					}
 				);
diff --git a/dev/View/Popup/Identity.js b/dev/View/Popup/Identity.js
index c4f2d3c8e..61ec7a3a3 100644
--- a/dev/View/Popup/Identity.js
+++ b/dev/View/Popup/Identity.js
@@ -1,4 +1,5 @@
-import { addObservablesTo, addSubscribablesTo } from 'External/ko';
+
+import { addObservablesTo } from 'External/ko';
 
 import { getNotification } from 'Common/Translator';
 
@@ -6,49 +7,34 @@ import Remote from 'Remote/User/Fetch';
 
 import { AbstractViewPopup } from 'Knoin/AbstractViews';
 
+import { IdentityModel } from 'Model/Identity';
+
 export class IdentityPopupView extends AbstractViewPopup {
 	constructor() {
 		super('Identity');
 
-		this.id = '';
 		addObservablesTo(this, {
+			id: '',
 			edit: false,
-			owner: false,
 
 			email: '',
 			emailFocused: false,
 
 			name: '',
+			nameFocused: false,
 
 			replyTo: '',
-			replyToFocused: false,
+			showReplyTo: false,
 
 			bcc: '',
-			bccFocused: false,
-			bccHasError: false,
+			showBcc: false,
 
 			signature: '',
 			signatureInsertBefore: false,
 
-			showBcc: false,
-			showReplyTo: false,
-
 			submitRequest: false,
 			submitError: ''
 		});
-
-		addSubscribablesTo(this, {
-			replyTo: value => {
-				if (false === this.showReplyTo() && value.length) {
-					this.showReplyTo(true);
-				}
-			},
-			bcc: value => {
-				if (false === this.showBcc() && value.length) {
-					this.showBcc(true);
-				}
-			}
-		});
 /*
 		this.email.valueHasMutated();
 		this.replyTo.valueHasMutated();
@@ -61,9 +47,8 @@ export class IdentityPopupView extends AbstractViewPopup {
 			this.signature?.__fetchEditorValue?.();
 			this.submitRequest(true);
 			const data = new FormData(form);
-			data.set('Id', this.id);
+			data.set('Id', this.id());
 			data.set('Signature', this.signature());
-			data.set('SignatureInsertBefore', this.signatureInsertBefore() ? 1 : 0);
 			Remote.request('IdentityUpdate', iError => {
 					this.submitRequest(false);
 					if (iError) {
@@ -89,32 +74,23 @@ export class IdentityPopupView extends AbstractViewPopup {
 
 		if (identity) {
 			this.edit(true);
-
-			this.id = identity.id() || '';
-			this.name(identity.name());
-			this.email(identity.email());
-			this.replyTo(identity.replyTo());
-			this.bcc(identity.bcc());
-			this.signature(identity.signature());
-			this.signatureInsertBefore(identity.signatureInsertBefore());
-
-			this.owner(!this.id);
 		} else {
 			this.edit(false);
-
-			this.id = Jua.randomId();
-			this.name('');
-			this.email('');
-			this.replyTo('');
-			this.bcc('');
-			this.signature('');
-			this.signatureInsertBefore(false);
-
-			this.owner(false);
+			identity = new IdentityModel;
+			identity.id(Jua.randomId());
 		}
+		this.id(identity.id() || '');
+		this.name(identity.name());
+		this.email(identity.email());
+		this.replyTo(identity.replyTo());
+		this.showReplyTo(0 < identity.replyTo().length);
+		this.bcc(identity.bcc());
+		this.showBcc(0 < identity.bcc().length);
+		this.signature(identity.signature());
+		this.signatureInsertBefore(identity.signatureInsertBefore());
 	}
 
 	afterShow() {
-		this.owner() || this.emailFocused(true);
+		this.id() ? this.emailFocused(true) : this.nameFocused(true);
 	}
 }
diff --git a/dev/View/Popup/Languages.js b/dev/View/Popup/Languages.js
index f7d33327c..7bcf2b719 100644
--- a/dev/View/Popup/Languages.js
+++ b/dev/View/Popup/Languages.js
@@ -1,5 +1,4 @@
 import ko from 'ko';
-import { koComputable } from 'External/ko';
 
 import { convertLangName } from 'Common/Translator';
 
@@ -8,46 +7,19 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews';
 export class LanguagesPopupView extends AbstractViewPopup {
 	constructor() {
 		super('Languages');
-
 		this.fLang = null;
-		this.userLanguage = ko.observable('');
-
-		this.langs = ko.observableArray();
-
-		this.languages = koComputable(() => {
-			const userLanguage = this.userLanguage();
-			return this.langs.map(language => ({
-				key: language,
-				user: language === userLanguage,
-				selected: ko.observable(false),
-				fullName: convertLangName(language)
-			}));
-		});
-
-		this.langs.subscribe(() => this.setLanguageSelection());
-	}
-
-	languageTooltipName(language) {
-		return convertLangName(language, true);
-	}
-
-	setLanguageSelection() {
-		const currentLang = this.fLang ? ko.unwrap(this.fLang) : '';
-		this.languages().forEach(item => item.selected(item.key === currentLang));
-	}
-
-	beforeShow() {
-		this.fLang = null;
-		this.userLanguage('');
-
-		this.langs([]);
+		this.languages = ko.observableArray();
 	}
 
 	onShow(fLanguage, langs, userLanguage) {
 		this.fLang = fLanguage;
-		this.userLanguage(userLanguage || '');
-
-		this.langs(langs);
+		this.languages(langs.map(language => ({
+			key: language,
+			user: userLanguage === language,
+			selected: fLanguage?.() === language,
+			fullName: convertLangName(language),
+			title: convertLangName(language, true)
+		})));
 	}
 
 	changeLanguage(lang) {
diff --git a/dev/View/User/Login.js b/dev/View/User/Login.js
index 017a98534..3cde435cc 100644
--- a/dev/View/User/Login.js
+++ b/dev/View/User/Login.js
@@ -1,4 +1,4 @@
-import { Notification } from 'Common/Enums';
+import { Notifications } from 'Common/Enums';
 import { ClientSideKeyNameLastSignMe } from 'Common/EnumsUser';
 import { SettingsGet, fireEvent } from 'Common/Globals';
 import { getNotification, translatorReload, convertLangName } from 'Common/Translator';
@@ -26,7 +26,7 @@ export class LoginUserView extends AbstractViewLogin {
 		super();
 
 		addObservablesTo(this, {
-			loadingDesc: SettingsGet('LoadingDescription'),
+			loadingDesc: SettingsGet('loadingDescription'),
 
 			email: SettingsGet('DevEmail'),
 			password: SettingsGet('DevPassword'),
@@ -44,7 +44,7 @@ export class LoginUserView extends AbstractViewLogin {
 			signMeType: SignMeUnused
 		});
 
-		this.allowLanguagesOnLogin = !!SettingsGet('AllowLanguagesOnLogin');
+		this.allowLanguagesOnLogin = !!SettingsGet('allowLanguagesOnLogin');
 
 		this.language = LanguageStore.language;
 		this.languages = LanguageStore.languages;
@@ -110,8 +110,8 @@ export class LoginUserView extends AbstractViewLogin {
 
 		if (valid) {
 			this.submitRequest(true);
-			data.set('Language', this.bSendLanguage ? this.language() : '');
-			data.set('SignMe', this.signMe() ? 1 : 0);
+			data.set('language', this.bSendLanguage ? this.language() : '');
+			data.set('signMe', this.signMe() ? 1 : 0);
 			Remote.request('Login',
 				(iError, oData) => {
 					fireEvent('sm-user-login-response', {
@@ -120,11 +120,11 @@ export class LoginUserView extends AbstractViewLogin {
 					});
 					if (iError) {
 						this.submitRequest(false);
-						if (Notification.InvalidInputArgument == iError) {
-							iError = Notification.AuthError;
+						if (Notifications.InvalidInputArgument == iError) {
+							iError = Notifications.AuthError;
 						}
 						this.submitError(getNotification(iError, oData?.ErrorMessage,
-							Notification.UnknownNotification));
+							Notifications.UnknownNotification));
 						this.submitErrorAdditional(oData?.ErrorMessageAdditional);
 					} else {
 						rl.setData(oData.Result);
@@ -142,7 +142,7 @@ export class LoginUserView extends AbstractViewLogin {
 	onBuild(dom) {
 		super.onBuild(dom);
 
-		const signMe = (SettingsGet('SignMe') || '').toLowerCase();
+		const signMe = (SettingsGet('signMe') || '').toLowerCase();
 
 		switch (signMe) {
 			case 'defaultoff':
diff --git a/dev/View/User/MailBox/FolderList.js b/dev/View/User/MailBox/FolderList.js
index 3acab9bd1..dce24ed33 100644
--- a/dev/View/User/MailBox/FolderList.js
+++ b/dev/View/User/MailBox/FolderList.js
@@ -1,9 +1,9 @@
 import ko from 'ko';
 
 import { Scope } from 'Common/Enums';
-import { addShortcut } from 'Common/Globals';
+import { addShortcut, stopEvent } from 'Common/Globals';
 import { mailBox, settings } from 'Common/Links';
-//import { setFolderHash } from 'Common/Cache';
+//import { setFolderETag } from 'Common/Cache';
 import { addComputablesTo } from 'External/ko';
 
 import { AppUserStore } from 'Stores/User/App';
@@ -80,8 +80,7 @@ export class MailFolderList extends AbstractViewLeft {
 					setExpandedFolder(folder.fullName, collapsed);
 
 					folder.collapsed(!collapsed);
-					event.preventDefault();
-					event.stopPropagation();
+					stopEvent(event);
 					return;
 				}
 			}
@@ -105,7 +104,7 @@ export class MailFolderList extends AbstractViewLeft {
 						}
 /*
 						if (folder.fullName === FolderUserStore.currentFolderFullName()) {
-							setFolderHash(folder.fullName, '');
+							setFolderETag(folder.fullName, '');
 						}
 */
 						let search = '';
@@ -174,15 +173,6 @@ export class MailFolderList extends AbstractViewLeft {
 			moveAction(false);
 			return false;
 		});
-
-		AppUserStore.focusedState.subscribe(value => {
-			let el = qs('li a.focused');
-			el?.classList.remove('focused');
-			if (Scope.FolderList === value) {
-				el = qs('li a.selected');
-				el?.classList.add('focused');
-			}
-		});
 	}
 
 	scrollToFocused() {
diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index 5542b66da..670e5890e 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -8,7 +8,7 @@ import { ComposeType, FolderType, MessageSetAction } from 'Common/EnumsUser';
 import { doc,
 	leftPanelDisabled, toggleLeftPanel,
 	Settings, SettingsCapa,
-	addEventsListeners,
+	addEventsListeners, stopEvent,
 	addShortcut, registerShortcut, formFieldFocused
 } from 'Common/Globals';
 
@@ -24,10 +24,7 @@ import { i18n } from 'Common/Translator';
 
 import { dropFilesInFolder } from 'Common/Folders';
 
-import {
-	getFolderFromCacheList,
-	MessageFlagsCache
-} from 'Common/Cache';
+import { getFolderFromCacheList } from 'Common/Cache';
 
 import { AppUserStore } from 'Stores/User/App';
 import { SettingsUserStore } from 'Stores/User/Settings';
@@ -90,7 +87,7 @@ export class MailMessageList extends AbstractViewRight {
 
 		this.composeInEdit = ComposePopupView.inEdit;
 
-		this.isMobile = ThemeStore.isMobile;
+		this.isMobile = ThemeStore.isMobile; // Obsolete
 		this.leftPanelDisabled = leftPanelDisabled;
 		this.toggleLeftPanel = toggleLeftPanel;
 
@@ -146,10 +143,6 @@ export class MailMessageList extends AbstractViewRight {
 				return c && MessagelistUserStore().length > c;
 			},
 
-			mobileCheckedStateShow: () => ThemeStore.isMobile() ? MessagelistUserStore.hasChecked() : 1,
-
-			mobileCheckedStateHide: () => ThemeStore.isMobile() ? !MessagelistUserStore.hasChecked() : 1,
-
 			listGrouped: () => {
 				let uid = MessagelistUserStore.threadUid(),
 					sort = FolderUserStore.sortMode() || 'DATE';
@@ -179,7 +172,7 @@ export class MailMessageList extends AbstractViewRight {
 						rtf = Intl.RelativeTimeFormat
 							? new Intl.RelativeTimeFormat(doc.documentElement.lang, { numeric: "auto" }) : 0;
 					MessagelistUserStore.forEach(msg => {
-						let dt = (new Date(msg.dateTimeStampInUTC() * 1000)),
+						let dt = (new Date(msg.dateTimestamp() * 1000)),
 							date,
 							ymd = Ymd(dt);
 						if (!current || ymd != current.id) {
@@ -367,13 +360,19 @@ export class MailMessageList extends AbstractViewRight {
 		]);
 	}
 
+	/**
+	 * Download selected messages
+	 */
 	downloadZipCommand() {
 		let hashes = []/*, uids = []*/;
 //		MessagelistUserStore.forEach(message => message.checked() && uids.push(message.uid));
 		MessagelistUserStore.forEach(message => message.checked() && hashes.push(message.requestHash));
-		downloadZip(hashes, null, null, MessagelistUserStore().folder);
+		downloadZip(null, hashes, null, null, MessagelistUserStore().folder);
 	}
 
+	/**
+	 * Download attachments of selected messages
+	 */
 	downloadAttachCommand() {
 		let hashes = [];
 		MessagelistUserStore.forEach(message => {
@@ -385,7 +384,7 @@ export class MailMessageList extends AbstractViewRight {
 				});
 			}
 		});
-		downloadZip(hashes);
+		downloadZip(null, hashes);
 	}
 
 	deleteWithoutMoveCommand() {
@@ -410,10 +409,9 @@ export class MailMessageList extends AbstractViewRight {
 	}
 
 	moveCommand(vm, event) {
-		if (this.mobileCheckedStateShow()) {
+		if (MessagelistUserStore.hasChecked()) {
 			if (vm && event?.preventDefault) {
-				event.preventDefault();
-				event.stopPropagation();
+				stopEvent(event);
 			}
 
 			let b = moveAction();
@@ -475,15 +473,11 @@ export class MailMessageList extends AbstractViewRight {
 					folder.unreadEmails(0);
 				}
 
-				MessageFlagsCache.clearFolder(sFolderFullName);
-
 				Remote.request('MessageSetSeenToAll', null, {
 					folder: sFolderFullName,
 					setAction: 1,
 					threadUids: uids.join(',')
 				});
-
-				MessagelistUserStore.reloadFlagsAndCachedMessage();
 			}
 		}
 	}
@@ -574,7 +568,7 @@ export class MailMessageList extends AbstractViewRight {
 				fToggle = () => {
 					let layout = SettingsUserStore.layout();
 					setLayoutResizer(top, ClientSideKeyNameMessageListSize,
-						(ThemeStore.isMobile() || Layout.NoPreview === layout)
+						(ThemeStore.isMobile() || !layout)
 							? 0
 							: (Layout.SidePreview === layout ? 'Width' : 'Height')
 					);
diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js
index 10fa06b4e..ff7bd4caa 100644
--- a/dev/View/User/MailBox/MessageView.js
+++ b/dev/View/User/MailBox/MessageView.js
@@ -13,11 +13,11 @@ import {
 
 import {
 	elementById,
-	leftPanelDisabled,
 	keyScopeReal,
 	Settings,
 	SettingsCapa,
 	fireEvent,
+	stopEvent,
 	addShortcut,
 	registerShortcut
 } from 'Common/Globals';
@@ -30,15 +30,12 @@ import { SMAudio } from 'Common/Audio';
 
 import { i18n } from 'Common/Translator';
 
-import { MessageFlagsCache } from 'Common/Cache';
-
 import { AppUserStore } from 'Stores/User/App';
 import { SettingsUserStore } from 'Stores/User/Settings';
 import { AccountUserStore } from 'Stores/User/Account';
 import { FolderUserStore, isAllowedKeyword } from 'Stores/User/Folder';
 import { MessageUserStore } from 'Stores/User/Message';
 import { MessagelistUserStore } from 'Stores/User/Messagelist';
-import { ThemeStore } from 'Stores/Theme';
 
 import * as Local from 'Storage/Client';
 
@@ -128,7 +125,6 @@ export class MailMessageView extends AbstractViewRight {
 
 		this.message = currentMessage;
 		this.messageLoadingThrottle = MessageUserStore.loading;
-		this.messagesBodiesDom = MessageUserStore.bodiesDom;
 		this.messageError = MessageUserStore.error;
 
 		this.fullScreenMode = isFullscreen;
@@ -166,7 +162,7 @@ export class MailMessageView extends AbstractViewRight {
 
 			listAttachments: () => currentMessage()?.attachments()
 				.filter(item => SettingsUserStore.listInlineAttachments() || !item.isLinked()),
-			hasAttachments: () => this.listAttachments().length,
+			hasAttachments: () => this.listAttachments()?.length,
 
 			canBeRepliedOrForwarded: () => !MessagelistUserStore.isDraftFolder() && this.messageVisibility(),
 
@@ -280,23 +276,19 @@ export class MailMessageView extends AbstractViewRight {
 	onBuild(dom) {
 		const eqs = (ev, s) => ev.target.closestWithin(s, dom);
 		dom.addEventListener('click', event => {
-			ThemeStore.isMobile() && leftPanelDisabled(true);
-
 			let el = eqs(event, 'a');
 			if (el && 0 === event.button && mailToHelper(el.href)) {
-				event.preventDefault();
-				event.stopPropagation();
+				stopEvent(event);
 				return;
 			}
 
 			if (eqs(event, '.attachmentsPlace .showPreview')) {
-				event.stopPropagation();
 				return;
 			}
 
 			el = eqs(event, '.attachmentsPlace .showPreplay');
 			if (el) {
-				event.stopPropagation();
+				stopEvent(event);
 				const attachment = ko.dataFor(el);
 				if (attachment && SMAudio.supported) {
 					switch (true) {
@@ -343,13 +335,6 @@ export class MailMessageView extends AbstractViewRight {
 			}
 		});
 
-		AppUserStore.focusedState.subscribe(value => {
-			if (Scope.MessageView !== value) {
-				this.scrollMessageToTop();
-				this.scrollMessageToLeft();
-			}
-		});
-
 		keyScopeReal.subscribe(value => this.messageDomFocused(Scope.MessageView === value));
 
 		// initShortcuts
@@ -459,10 +444,12 @@ export class MailMessageView extends AbstractViewRight {
 			}
 			return false;
 		});
+
+		MessageUserStore.bodiesDom(dom.querySelector('.bodyText'));
 	}
 
 	scrollMessageToTop() {
-		oMessageScrollerDom().scrollTop = (50 < oMessageScrollerDom().scrollTop) ? 50 : 0;
+		oMessageScrollerDom().scrollTop = 0;
 	}
 
 	scrollMessageToLeft() {
@@ -479,7 +466,9 @@ export class MailMessageView extends AbstractViewRight {
 		const hashes = (currentMessage()?.attachments || [])
 			.map(item => item?.checked() /*&& !item?.isLinked()*/ ? item.download : '')
 			.filter(v => v);
-		downloadZip(hashes,
+		downloadZip(
+			currentMessage().subject(),
+			hashes,
 			() => this.downloadAsZipError(true),
 			this.downloadAsZipLoading
 		);
@@ -524,8 +513,6 @@ export class MailMessageView extends AbstractViewRight {
 				if (!iError) {
 					oMessage.flags.push('$mdnsent');
 //					oMessage.flags.valueHasMutated();
-					MessageFlagsCache.store(oMessage);
-					MessagelistUserStore.reloadFlagsAndCachedMessage();
 				}
 			}, {
 				messageFolder: oMessage.folder,
diff --git a/dev/View/User/Settings/Menu.js b/dev/View/User/Settings/Menu.js
index efc5f69ef..a0ef39e6a 100644
--- a/dev/View/User/Settings/Menu.js
+++ b/dev/View/User/Settings/Menu.js
@@ -1,5 +1,6 @@
 import { settings } from 'Common/Links';
-
+import { mailbox } from 'Common/Links';
+import { getFolderInboxName } from 'Common/Cache';
 import { AbstractViewLeft } from 'Knoin/AbstractViews';
 
 export class SettingsMenuUserView extends AbstractViewLeft {
@@ -15,4 +16,8 @@ export class SettingsMenuUserView extends AbstractViewLeft {
 	link(route) {
 		return settings(route);
 	}
+
+	backToInbox() {
+		hasher.setHash(mailbox(getFolderInboxName()));
+	}
 }
diff --git a/dev/View/User/Settings/Pane.js b/dev/View/User/Settings/Pane.js
index 0c7c43f2c..dccaf9de0 100644
--- a/dev/View/User/Settings/Pane.js
+++ b/dev/View/User/Settings/Pane.js
@@ -1,5 +1,3 @@
-import { mailbox } from 'Common/Links';
-import { getFolderInboxName } from 'Common/Cache';
 import { leftPanelDisabled, toggleLeftPanel } from 'Common/Globals';
 
 import { MessageUserStore } from 'Stores/User/Message';
@@ -11,7 +9,6 @@ export class SettingsPaneUserView extends AbstractViewRight {
 	constructor() {
 		super();
 
-		this.isMobile = ThemeStore.isMobile;
 		this.leftPanelDisabled = leftPanelDisabled;
 		this.toggleLeftPanel = toggleLeftPanel;
 	}
@@ -25,8 +22,4 @@ export class SettingsPaneUserView extends AbstractViewRight {
 			ThemeStore.isMobile() && !event.target.closestWithin('.toggleLeft', dom) && leftPanelDisabled(true)
 		);
 	}
-
-	backToInbox() {
-		hasher.setHash(mailbox(getFolderInboxName()));
-	}
 }
diff --git a/dev/View/User/SystemDropDown.js b/dev/View/User/SystemDropDown.js
index e847df172..9d57e1458 100644
--- a/dev/View/User/SystemDropDown.js
+++ b/dev/View/User/SystemDropDown.js
@@ -12,13 +12,10 @@ import { KeyboardShortcutsHelpPopupView } from 'View/Popup/KeyboardShortcutsHelp
 import { AccountPopupView } from 'View/Popup/Account';
 import { ContactsPopupView } from 'View/Popup/Contacts';
 
-import { doc, leftPanelDisabled, fireEvent, SettingsCapa, registerShortcut } from 'Common/Globals';
-
-import { ThemeStore } from 'Stores/Theme';
+import { fireEvent, stopEvent, SettingsCapa, registerShortcut } from 'Common/Globals';
 
 import Remote from 'Remote/User/Fetch';
 import { getNotification } from 'Common/Translator';
-//import { clearCache } from 'Common/Cache';
 //import { koComputable } from 'External/ko';
 import { addObservablesTo } from 'External/ko';
 
@@ -56,8 +53,7 @@ export class SystemDropDownUserView extends AbstractViewRight {
 		let email = account?.email;
 		if (email && 0 === event.button && AccountUserStore.email() != email) {
 			AccountUserStore.loading(true);
-			event.preventDefault();
-			event.stopPropagation();
+			stopEvent(event);
 			Remote.request('AccountSwitch',
 				(iError/*, oData*/) => {
 					if (iError) {
@@ -69,10 +65,8 @@ export class SystemDropDownUserView extends AbstractViewRight {
 					} else {
 /*						// Not working yet
 						forEachObjectEntry(oData.Result, (key, value) => rl.settings.set(key, value));
-						clearCache();
-//						MessageUserStore.setMessage();
-//						MessageUserStore.purgeMessageBodyCache();
-//						MessageUserStore.hideMessageBodies();
+//						MessageUserStore.message();
+//						MessageUserStore.purgeCache();
 						MessagelistUserStore([]);
 //						FolderUserStore.folderList([]);
 						loadFolders(value => {
@@ -113,14 +107,6 @@ export class SystemDropDownUserView extends AbstractViewRight {
 		this.allowContacts && showScreenPopup(ContactsPopupView);
 	}
 
-	toggleLayout()
-	{
-		const mobile = !ThemeStore.isMobile();
-		doc.cookie = 'rllayout=' + (mobile ? 'mobile' : 'desktop') + '; samesite=strict';
-		ThemeStore.isMobile(mobile);
-		leftPanelDisabled(mobile);
-	}
-
 	logoutClick() {
 		rl.app.logout();
 	}
diff --git a/dev/boot.js b/dev/boot.js
index be27098dd..1ca127e04 100644
--- a/dev/boot.js
+++ b/dev/boot.js
@@ -3,30 +3,26 @@
 const
 	qUri = path => doc.location.pathname.replace(/\/+$/,'') + '/?/' + path,
 	eId = id => doc.getElementById('rl-'+id),
-	app = eId('app'),
-	admin = app && '1' == app.dataset.admin,
-	layout = doc.cookie.match(/(^|;) ?rllayout=([^;]+)/) || '',
+	admin = '1' == eId('app')?.dataset?.admin,
 
-	showError = msg => {
-		let div = eId('loading-error');
-		div.append(msg);
+	toggle = div => {
 		eId('loading').hidden = true;
 		div.hidden = false;
 	},
+	showError = msg => {
+		let div = eId('loading-error');
+		div.append(msg);
+		toggle(div);
+	},
 
-	loadScript = src => {
-		if (!src) {
-			throw new Error('src should not be empty.');
-		}
-		return new Promise((resolve, reject) => {
+	loadScript = src => src ? new Promise((resolve, reject) => {
 			const script = doc.createElement('script');
 			script.onload = () => resolve();
 			script.onerror = () => reject('Failed loading ' + src);
 			script.src = src;
 //			script.async = true;
 			doc.head.append(script);
-		});
-	};
+		}) : Promise.reject('src is empty');
 
 try {
 	let smctoken = doc.cookie.match(/(^|;) ?smctoken=([^;]+)/);
@@ -37,8 +33,6 @@ try {
 		smctoken = encodeURIComponent(btoa(String.fromCharCode(...data)));
 	}
 	localStorage.setItem('smctoken', smctoken);
-//	doc.cookie = `smctoken=${smctoken};path=${doc.location.pathname};samesite=strict;secure";
-//	doc.cookie = 'smctoken='+smctoken+";path=/;samesite=lax";
 	doc.cookie = 'smctoken='+smctoken+";path=/;samesite=strict";
 } catch (e) {
 	console.error(e);
@@ -46,8 +40,6 @@ try {
 
 let RL_APP_DATA = {};
 
-doc.documentElement.classList.toggle('rl-mobile', 'mobile' === layout[2] || (!layout && 1000 > innerWidth));
-
 window.rl = {
 	adminArea: () => admin,
 
@@ -58,9 +50,94 @@ window.rl = {
 	},
 
 	setTitle: title =>
-		doc.title = (title || '') + (RL_APP_DATA.Title ? (title ? ' - ' : '') + RL_APP_DATA.Title : ''),
+		doc.title = (title || '') + (RL_APP_DATA.title ? (title ? ' - ' : '') + RL_APP_DATA.title : ''),
 
-	initData: appData => {
+	setData: appData => {
+		RL_APP_DATA = appData;
+		rl.app.refresh();
+	},
+
+	loadScript: loadScript,
+
+	fetch: (resource, init, postData) => {
+		init = Object.assign({
+			mode: 'same-origin',
+			cache: 'no-cache',
+			redirect: 'error',
+			referrerPolicy: 'no-referrer',
+			credentials: 'same-origin',
+			headers: {}
+		}, init);
+		let asJSON = 1,
+			XToken = RL_APP_DATA.System?.token,
+			object = {};
+		if (postData) {
+			init.method = 'POST';
+			if (postData instanceof FormData) {
+				postData.forEach((value, key) => {
+					if (value instanceof File) {
+						asJSON = 0;
+					} else if (!Reflect.has(object, key)) {
+						object[key] = value;
+					} else {
+						Array.isArray(object[key]) || (object[key] = [object[key]]);
+						object[key].push(value);
+					}
+				});
+				if (asJSON) {
+					postData = object;
+//					postData.XToken = XToken;
+				} else {
+					XToken && postData.set('XToken', XToken);
+				}
+			}
+			if (asJSON) {
+				init.headers['Content-Type'] = 'application/json';
+				postData = JSON.stringify(postData);
+			}
+			init.body = postData;
+		}
+		XToken && (init.headers['X-SM-Token'] = XToken);
+//		init.headers = new Headers(init.headers);
+		return fetch(resource, init);
+	},
+
+	fetchJSON: (resource, init, postData) => {
+		init = Object.assign({ headers: {} }, init);
+		init.headers.Accept = 'application/json';
+		return rl.fetch(resource, init, postData).then(response => {
+			if (response.ok) {
+				/* TODO: use this for non-developers?
+				response.clone()
+				let data = response.text();
+				try {
+					return JSON.parse(data);
+				} catch (e) {
+					console.error(e);
+//					console.log(data);
+					return Promise.reject(Notifications.JsonParse);
+					return {
+						Result: false,
+						ErrorCode: 952, // Notifications.JsonParse
+						ErrorMessage: e.message,
+						ErrorMessageAdditional: data
+					}
+				}
+				*/
+				return response.json();
+			}
+			return Promise.reject('Network response error: ' + response.status);
+		});
+	}
+};
+
+if (!navigator.cookieEnabled) {
+	toggle(eId('NoCookie'));
+} else if (![].flat) {
+	toggle(eId('BadBrowser'));
+} else {
+	rl.fetchJSON(qUri(`${admin ? 'Admin' : ''}AppData/0/${Math.random().toString().slice(2)}/`))
+	.then(appData => {
 		RL_APP_DATA = appData;
 		const url = appData.StaticLibsJs,
 			cb = () => rl.app.bootstart();
@@ -68,31 +145,14 @@ window.rl = {
 			.then(() => loadScript(url.replace('/libs.', `/${admin?'admin':'app'}.`)))
 			.then(() => appData.PluginsLink ? loadScript(qUri(appData.PluginsLink)) : Promise.resolve())
 			.then(() => rl.app
-					? cb()
-					: doc.addEventListener('readystatechange', () => 'complete' == doc.readyState && cb())
+				? cb()
+				: doc.addEventListener('readystatechange', () => 'complete' == doc.readyState && cb())
 			)
 			.catch(e => {
 				showError(e);
 				throw e;
 			});
-	},
-
-	setData: appData => {
-		RL_APP_DATA = appData;
-		rl.app.refresh();
-	},
-
-	loadScript: loadScript
-};
-
-if (!navigator.cookieEnabled) {
-	eId('loading').hidden = true;
-	eId('NoCookie').hidden = false;
-} else if (![].flat) {
-	eId('loading').hidden = true;
-	eId('BadBrowser').hidden = false;
-} else {
-	loadScript(qUri(`${admin ? 'Admin' : ''}AppData/0/${Math.random().toString().slice(2)}/`))
+	})
 	.catch(e => showError(e));
 }
 
diff --git a/dev/bootstrap.js b/dev/bootstrap.js
index 6f0afbeaa..dd2cd0218 100644
--- a/dev/bootstrap.js
+++ b/dev/bootstrap.js
@@ -1,10 +1,6 @@
-import { Settings } from 'Common/Globals';
 import { i18n } from 'Common/Translator';
-
 import { root } from 'Common/Links';
 
-import { isArray } from 'Common/Utils';
-
 export default App => {
 
 	rl.app = App;
@@ -33,64 +29,4 @@ export default App => {
 		on: () => hasher.active = true
 	};
 
-	rl.fetch = (resource, init, postData) => {
-		init = Object.assign({
-			mode: 'same-origin',
-			cache: 'no-cache',
-			redirect: 'error',
-			referrerPolicy: 'no-referrer',
-			credentials: 'same-origin',
-			headers: {}
-		}, init);
-		if (postData) {
-			init.method = 'POST';
-			init.headers['Content-Type'] = 'application/json';
-			if (postData instanceof FormData) {
-				const object = {};
-				postData.forEach((value, key) => {
-					if (!Reflect.has(object, key)){
-						object[key] = value;
-					} else {
-						isArray(object[key]) || (object[key] = [object[key]]);
-						object[key].push(value);
-					}
-				});
-				postData = object;
-			}
-			postData.XToken = Settings.app('token');
-			init.body = JSON.stringify(postData);
-		}
-		init.headers['X-SM-Token'] = Settings.app('token');
-//		init.headers = new Headers(init.headers);
-		return fetch(resource, init);
-	};
-
-	rl.fetchJSON = (resource, init, postData) => {
-		init = Object.assign({ headers: {} }, init);
-		init.headers.Accept = 'application/json';
-		return rl.fetch(resource, init, postData).then(response => {
-			if (!response.ok) {
-				return Promise.reject('Network response error: ' + response.status);
-			}
-			/* TODO: use this for non-developers?
-			response.clone()
-			let data = response.text();
-			try {
-				return JSON.parse(data);
-			} catch (e) {
-				console.error(e);
-//				console.log(data);
-				return Promise.reject(Notification.JsonParse);
-				return {
-					Result: false,
-					ErrorCode: 952, // Notification.JsonParse
-					ErrorMessage: e.message,
-					ErrorMessageAdditional: data
-				}
-			}
-			*/
-			return response.json();
-		});
-	};
-
 };
diff --git a/dev/prototype.js b/dev/prototype.js
index 78f5c57a1..cec93864d 100644
--- a/dev/prototype.js
+++ b/dev/prototype.js
@@ -53,7 +53,7 @@
 			return function(...args) {
 				timer && clearTimeout(timer);
 				timer = setTimeout(()=>{
-					func.apply(this, args)
+					func.apply(this, args);
 					timer = 0;
 				}, ms);
 			};
@@ -68,12 +68,10 @@
 		Function.prototype.throttle = function(ms) {
 			let func = this, timer;
 			return function(...args) {
-				if (!timer) {
-					timer = setTimeout(()=>{
-						func.apply(this, args)
+				timer = timer || setTimeout(()=>{
+						func.apply(this, args);
 						timer = 0;
 					}, ms);
-				}
 			};
 		};
 	}
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index 7846c92d6..2734581bf 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.26.1</upstream>.
+This app packages SnappyMail <upstream>2.26.4</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index 2df0e5681..2ca24fdce 100644
--- a/integrations/cloudron/Dockerfile
+++ b/integrations/cloudron/Dockerfile
@@ -4,7 +4,7 @@ RUN mkdir -p /app/code
 WORKDIR /app/code
 
 # If you change the extraction below, be sure to test on scaleway
-VERSION=2.26.1
+VERSION=2.26.4
 RUN wget https://github.com/the-djmaze/snappymail/releases/download/v${VERSION}/snappymail-${VERSION}.zip -O /tmp/snappymail.zip && \
     unzip /tmp/snappymail.zip -d /app/code && \
     rm /tmp/snappymail.zip && \
diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml
index 57f7cb080..e3b0394a0 100644
--- a/integrations/nextcloud/snappymail/appinfo/info.xml
+++ b/integrations/nextcloud/snappymail/appinfo/info.xml
@@ -3,7 +3,7 @@
 	<id>snappymail</id>
 	<name>SnappyMail</name>
 	<summary>SnappyMail Webmail</summary>
-	<version>2.26.1</version>
+	<version>2.26.4</version>
 	<licence>agpl</licence>
 	<author>SnappyMail, RainLoop Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli</author>
 	<description><![CDATA[**Simple, modern, lightweight & fast web-based email client.**
@@ -39,7 +39,7 @@ There, click on the link to go to the SnappyMail admin panel.
 	<repository>https://github.com/the-djmaze/snappymail/tree/master/integrations/nextcloud</repository>
 	<bugs>https://github.com/the-djmaze/snappymail/issues</bugs>
 	<dependencies>
-		<php min-version="7.4" min-int-size="64" />
+		<php min-version="7.4" min-int-size="32" />
 		<lib>mbstring</lib>
 		<lib>zlib</lib>
 <!--
diff --git a/integrations/nextcloud/snappymail/lib/ContentSecurityPolicy.php b/integrations/nextcloud/snappymail/lib/ContentSecurityPolicy.php
index b0b0ca201..27a9c44d1 100644
--- a/integrations/nextcloud/snappymail/lib/ContentSecurityPolicy.php
+++ b/integrations/nextcloud/snappymail/lib/ContentSecurityPolicy.php
@@ -16,7 +16,7 @@ class ContentSecurityPolicy extends \OCP\AppFramework\Http\ContentSecurityPolicy
 	function __construct() {
 		$CSP = \RainLoop\Api::getCSP();
 
-		$this->allowedScriptDomains = \array_unique(\array_merge($this->allowedScriptDomains, $CSP->script));
+		$this->allowedScriptDomains = \array_unique(\array_merge($this->allowedScriptDomains, $CSP->get('script-src')));
 		$this->allowedScriptDomains = \array_diff($this->allowedScriptDomains, ["'unsafe-inline'", "'unsafe-eval'"]);
 
 		// Nextcloud only sets 'strict-dynamic' when browserSupportsCspV3() ?
@@ -24,12 +24,12 @@ class ContentSecurityPolicy extends \OCP\AppFramework\Http\ContentSecurityPolicy
 			? $this->useStrictDynamic(true) // NC24+
 			: $this->addAllowedScriptDomain("'strict-dynamic'");
 
-		$this->allowedImageDomains = \array_unique(\array_merge($this->allowedImageDomains, $CSP->img));
+		$this->allowedImageDomains = \array_unique(\array_merge($this->allowedImageDomains, $CSP->get('img-src')));
 
-		$this->allowedStyleDomains = \array_unique(\array_merge($this->allowedStyleDomains, $CSP->style));
+		$this->allowedStyleDomains = \array_unique(\array_merge($this->allowedStyleDomains, $CSP->get('style-src')));
 		$this->allowedStyleDomains = \array_diff($this->allowedStyleDomains, ["'unsafe-inline'"]);
 
-		$this->allowedFrameDomains = \array_unique(\array_merge($this->allowedFrameDomains, $CSP->frame));
+		$this->allowedFrameDomains = \array_unique(\array_merge($this->allowedFrameDomains, $CSP->get('frame-src')));
 
 		$this->reportTo = \array_unique(\array_merge($this->reportTo, $CSP->report_to));
 	}
diff --git a/integrations/nextcloud/snappymail/lib/Controller/PageController.php b/integrations/nextcloud/snappymail/lib/Controller/PageController.php
index e2b8a5309..3630ac891 100644
--- a/integrations/nextcloud/snappymail/lib/Controller/PageController.php
+++ b/integrations/nextcloud/snappymail/lib/Controller/PageController.php
@@ -38,6 +38,7 @@ class PageController extends Controller
 			]);
 			$csp = new ContentSecurityPolicy();
 			$csp->addAllowedFrameDomain("'self'");
+//			$csp->addAllowedFrameAncestorDomain("'self'");
 			$response->setContentSecurityPolicy($csp);
 			return $response;
 		}
diff --git a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
index de34d71e7..f5ffd278c 100644
--- a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
+++ b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
@@ -73,11 +73,18 @@ class SnappyMailHelper
 				}
 */
 				if ($doLogin && $aCredentials[1] && $aCredentials[2]) {
-					$oActions->Logger()->AddSecret($aCredentials[2]);
-					$oAccount = $oActions->LoginProcess($aCredentials[1], $aCredentials[2], false);
-					if ($oAccount) {
-						$oActions->Plugins()->RunHook('login.success', array($oAccount));
-						$oActions->SetAuthToken($oAccount);
+					try {
+						$oActions->Logger()->AddSecret($aCredentials[2]);
+						$oAccount = $oActions->LoginProcess($aCredentials[1], $aCredentials[2], false);
+						if ($oAccount) {
+							$oActions->Plugins()->RunHook('login.success', array($oAccount));
+							$oActions->SetAuthToken($oAccount);
+						}
+					} catch (\Throwable $e) {
+						// Login failure, reset password to prevent more attempts
+						$sUID = \OC::$server->getUserSession()->getUser()->getUID();
+						\OC::$server->getSession()['snappymail-password'] = '';
+						\OC::$server->getConfig()->setUserValue($sUID, 'snappymail', 'snappymail-password', '');
 					}
 				}
 			}
diff --git a/integrations/virtualmin/snappymail.pl b/integrations/virtualmin/snappymail.pl
index c718f86ab..92a764869 100644
--- a/integrations/virtualmin/snappymail.pl
+++ b/integrations/virtualmin/snappymail.pl
@@ -20,7 +20,7 @@ return "SnappyMail Webmail is a browser-based multilingual IMAP client with an a
 # script_snappymail_versions()
 sub script_snappymail_versions
 {
-return ( "2.26.1" );
+return ( "2.26.4" );
 }
 
 sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index 4ed9a3b4b..fb6a2923f 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "title": "SnappyMail",
   "description": "Simple, modern & fast web-based email client",
   "private": true,
-  "version": "2.26.1",
+  "version": "2.26.4",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",
@@ -41,35 +41,29 @@
     "openpgp"
   ],
   "readmeFilename": "README.md",
-  "devDependencies": {
-    "babel-eslint": "10.1.0",
-    "core-js": "3.16.3",
-    "eslint": "7.32.0",
-    "gulp": "4.0.2",
-    "gulp-cached": "1.1.1",
-    "gulp-clean-css": "4.3.0",
-    "gulp-eol": "0.2.0",
-    "gulp-eslint": "6.0.0",
-    "gulp-expect-file": "2.0.0",
-    "gulp-filter": "7.0.0",
-    "gulp-header": "2.0.9",
-    "gulp-less": "5.0.0",
-    "gulp-rename": "2.0.0",
-    "gulp-replace": "1.1.3",
-    "gulp-size": "4.0.1",
-    "gulp-stripbom": "1.0.5",
-    "gulp-terser": "2.0.1",
-    "gulp-util": "3.0.8"
-  },
   "dependencies": {
     "@rollup/plugin-node-resolve": "^13.1.3",
     "@rollup/plugin-replace": "^3.0.1",
+    "babel-eslint": "^10.1.0",
     "del": "^6.0.0",
-    "fs": "^0.0.1-security",
+    "eslint": "^7.32.0",
+    "gulp": "^4.0.2",
+    "gulp-cached": "^1.1.1",
+    "gulp-clean-css": "^4.3.0",
     "gulp-concat": "^2.6.1",
+    "gulp-eol": "^0.2.0",
+    "gulp-eslint": "^6.0.0",
+    "gulp-expect-file": "^2.0.0",
+    "gulp-filter": "^6.0.0",
     "gulp-group-css-media-queries": "^1.2.2",
+    "gulp-header": "^2.0.9",
+    "gulp-less": "^5.0.0",
+    "gulp-rename": "^2.0.0",
+    "gulp-replace": "^1.1.3",
     "gulp-rollup-2": "^1.2.1",
-    "rollup": "2.56.3",
+    "gulp-size": "^3.0.0",
+    "gulp-terser": "^2.1.0",
+    "rollup": "^2.56.3",
     "rollup-plugin-external-globals": "^0.6.1",
     "rollup-plugin-html": "^0.2.1",
     "rollup-plugin-includepaths": "^0.2.4",
diff --git a/plugins/avatars/avatars.js b/plugins/avatars/avatars.js
index 8b969b51c..4fd61a924 100644
--- a/plugins/avatars/avatars.js
+++ b/plugins/avatars/avatars.js
@@ -32,8 +32,6 @@
 		</svg>`;
 	};
 
-	let isMobile;
-
 	const
 		size = 50,
 		getEl = id => document.getElementById(id),
@@ -63,11 +61,11 @@
 			.slice(0,2)
 			.toUpperCase(),
 		setIdenticon = (from, fn) => hash(from.email).then(hash =>
-			fn('data:image/svg+xml;base64,' + btoa(window.identiconSvg(
+			fn('data:image/svg+xml;base64,' + btoa(unescape(encodeURIComponent(window.identiconSvg(
 				hash,
 				fromChars(from),
 				window.getComputedStyle(getEl('rl-app'), null).getPropertyValue('font-family')
-			)))
+			)))))
 		),
 		addQueue = (msg, fn) => {
 			msg.from?.[0] && setIdenticon(msg.from[0], fn);
@@ -171,11 +169,9 @@
 						fn = url=>{element.src = url};
 					if (url) {
 						fn(url);
-					} else if (msg.avatar || isMobile()) {
+					} else if (msg.avatar) {
 						if (msg.avatar?.startsWith('data:')) {
 							fn(msg.avatar);
-						} else if (isMobile()) {
-							setIdenticon(from, fn);
 						} else {
 							element.onerror = () => setIdenticon(from, fn);
 							fn(`?Avatar/${'pass' == from.dkimStatus ? 1 : 0}/${msg.avatar}`);
@@ -231,7 +227,6 @@
 		}
 
 		if ('MailMessageList' === e.detail.viewModelTemplateID) {
-			isMobile = e.detail.isMobile;
 			getEl('MailMessageList').content.querySelectorAll('.messageCheckbox')
 				.forEach(el => el.append(Element.fromHTML(`<img class="fromPic" data-bind="fromPic:$data" loading="lazy">`)));
 		}
diff --git a/plugins/avatars/index.php b/plugins/avatars/index.php
index 0eecc9c18..06f8496e9 100644
--- a/plugins/avatars/index.php
+++ b/plugins/avatars/index.php
@@ -10,8 +10,8 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
 		NAME     = 'Avatars',
 		AUTHOR   = 'SnappyMail',
 		URL      = 'https://snappymail.eu/',
-		VERSION  = '1.9',
-		RELEASE  = '2023-02-01',
+		VERSION  = '1.11',
+		RELEASE  = '2023-02-23',
 		REQUIRED = '2.25.0',
 		CATEGORY = 'Contacts',
 		LICENSE  = 'MIT',
diff --git a/plugins/login-external/index.php b/plugins/login-external/index.php
index 922f802be..609aaae81 100644
--- a/plugins/login-external/index.php
+++ b/plugins/login-external/index.php
@@ -6,9 +6,9 @@ class LoginExternalPlugin extends \RainLoop\Plugins\AbstractPlugin
 		NAME     = 'Login External',
 		AUTHOR   = 'SnappyMail',
 		URL      = 'https://snappymail.eu/',
-		VERSION  = '1.1',
-		RELEASE  = '2022-12-24',
-		REQUIRED = '2.21.0',
+		VERSION  = '1.2',
+		RELEASE  = '2023-03-14',
+		REQUIRED = '2.27.0',
 		CATEGORY = 'Login',
 		LICENSE  = 'MIT',
 		DESCRIPTION = 'Login with $_POST["Email"] and $_POST["Password"] from anywhere';
@@ -60,7 +60,7 @@ class LoginExternalPlugin extends \RainLoop\Plugins\AbstractPlugin
 			}
 			echo \json_encode($aResult);
 		} else {
-			$oActions->Location('./');
+			\MailSo\Base\Http::Location('./');
 		}
 		return true;
 	}
diff --git a/plugins/login-remote/index.php b/plugins/login-remote/index.php
index a2e4f1991..365700077 100644
--- a/plugins/login-remote/index.php
+++ b/plugins/login-remote/index.php
@@ -6,9 +6,9 @@ class LoginRemotePlugin extends \RainLoop\Plugins\AbstractPlugin
 		NAME     = 'Login Remote',
 		AUTHOR   = 'SnappyMail',
 		URL      = 'https://snappymail.eu/',
-		VERSION  = '1.2',
-		RELEASE  = '2022-11-24',
-		REQUIRED = '2.21.0',
+		VERSION  = '1.3',
+		RELEASE  = '2023-03-14',
+		REQUIRED = '2.27.0',
 		CATEGORY = 'Login',
 		LICENSE  = 'MIT',
 		DESCRIPTION = 'Tries to login using the $_ENV["REMOTE_*"] variables';
@@ -55,7 +55,7 @@ class LoginRemotePlugin extends \RainLoop\Plugins\AbstractPlugin
 			}
 		}
 
-		$oActions->Location('./');
+		\MailSo\Base\Http::Location('./');
 		return true;
 	}
 
diff --git a/plugins/mailbox-detect/index.php b/plugins/mailbox-detect/index.php
index e59d90c86..04ffe68d0 100644
--- a/plugins/mailbox-detect/index.php
+++ b/plugins/mailbox-detect/index.php
@@ -9,9 +9,9 @@ class MailboxDetectPlugin extends \RainLoop\Plugins\AbstractPlugin
 		NAME     = 'MailboxDetect',
 		AUTHOR   = 'SnappyMail',
 		URL      = 'https://snappymail.eu/',
-		VERSION  = '2.4',
-		RELEASE  = '2023-02-08',
-		REQUIRED = '2.25.0',
+		VERSION  = '2.6',
+		RELEASE  = '2023-03-13',
+		REQUIRED = '2.27.0',
 		CATEGORY = 'General',
 		LICENSE  = 'MIT',
 		DESCRIPTION = 'Autodetect system folders and/or create them when needed';
@@ -48,8 +48,8 @@ class MailboxDetectPlugin extends \RainLoop\Plugins\AbstractPlugin
 			$roles = [
 				'inbox'   => false,
 				'sent'    => !!$oSettingsLocal->GetConf('SentFolder', ''),
-				'drafts'  => !!$oSettingsLocal->GetConf('DraftFolder', ''),
-				'junk'    => !!$oSettingsLocal->GetConf('SpamFolder', ''),
+				'drafts'  => !!$oSettingsLocal->GetConf('DraftsFolder', ''),
+				'junk'    => !!$oSettingsLocal->GetConf('JunkFolder', ''),
 				'trash'   => !!$oSettingsLocal->GetConf('TrashFolder', ''),
 				'archive' => !!$oSettingsLocal->GetConf('ArchiveFolder', '')
 			];
@@ -74,13 +74,13 @@ class MailboxDetectPlugin extends \RainLoop\Plugins\AbstractPlugin
 				$sDelimiter || ($sDelimiter = $folder['delimiter']);
 				if ($folder['role']) {
 					$roles[$folder['role']] = true;
-				} else if (\in_array('\\sentmail', $folder['flags'])) {
+				} else if (\in_array('\\sentmail', $folder['attributes'])) {
 					$found['sent'][] = $i;
-				} else if (\in_array('\\spam', $folder['flags'])) {
+				} else if (\in_array('\\spam', $folder['attributes'])) {
 					$found['junk'][] = $i;
-				} else if (\in_array('\\bin', $folder['flags'])) {
+				} else if (\in_array('\\bin', $folder['attributes'])) {
 					$found['trash'][] = $i;
-				} else if (\in_array('\\starred', $folder['flags'])) {
+				} else if (\in_array('\\starred', $folder['attributes'])) {
 					$found['flagged'][] = $i;
 				} else {
 					// Kolab
diff --git a/plugins/nextcloud/index.php b/plugins/nextcloud/index.php
index f1c48564a..71e08ea4c 100644
--- a/plugins/nextcloud/index.php
+++ b/plugins/nextcloud/index.php
@@ -4,8 +4,8 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME = 'Nextcloud',
-		VERSION = '2.17',
-		RELEASE  = '2023-01-31',
+		VERSION = '2.20',
+		RELEASE  = '2023-02-22',
 		CATEGORY = 'Integrations',
 		DESCRIPTION = 'Integrate with Nextcloud v20+',
 		REQUIRED = '2.25.1';
@@ -33,6 +33,17 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
 
 			$this->addTemplate('templates/PopupsNextcloudFiles.html');
 			$this->addTemplate('templates/PopupsNextcloudCalendars.html');
+
+		} else {
+			// \OC::$server->getConfig()->getAppValue('snappymail', 'snappymail-no-embed');
+			$this->addHook('main.content-security-policy', 'ContentSecurityPolicy');
+		}
+	}
+
+	public function ContentSecurityPolicy(\SnappyMail\HTTP\CSP $CSP)
+	{
+		if (\method_exists($CSP, 'add')) {
+			$CSP->add('frame-ancestors', "'self'");
 		}
 	}
 
@@ -187,6 +198,31 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
 					$sEmail = $sCustomEmail;
 				}
 				$aResult['DevEmail'] = $sEmail ?: '';
+			} else if (!empty($aResult['ContactsSync'])) {
+				$bSave = false;
+				if (empty($aResult['ContactsSync']['Url'])) {
+					$aResult['ContactsSync']['Url'] = "{$sWebDAV}/addressbooks/users/{$sUID}/contacts/";
+					$bSave = true;
+				}
+				if (empty($aResult['ContactsSync']['User'])) {
+					$aResult['ContactsSync']['User'] = $sUID;
+					$bSave = true;
+				}
+				if (empty($aResult['ContactsSync']['Password'])) {
+					$aResult['ContactsSync']['Password'] = '';
+				}
+				if ($bSave) {
+					$oActions = \RainLoop\Api::Actions();
+					$oActions->setContactsSyncData(
+						$oActions->getAccountFromToken(),
+						array(
+							'Mode' => $aResult['ContactsSync']['Mode'],
+							'User' => $aResult['ContactsSync']['User'],
+							'Password' => $aResult['ContactsSync']['Password'],
+							'Url' => $aResult['ContactsSync']['Url']
+						)
+					);
+				}
 			}
 		}
 	}
diff --git a/plugins/nextcloud/js/composer.js b/plugins/nextcloud/js/composer.js
index 7ee5f015d..5c2ab7662 100644
--- a/plugins/nextcloud/js/composer.js
+++ b/plugins/nextcloud/js/composer.js
@@ -6,6 +6,7 @@
 			let view = e.detail;
 			view.nextcloudAttach = () => {
 				rl.nextcloud.selectFiles().then(files => {
+					let urls = [];
 					files && files.forEach(file => {
 						if (file.name) {
 							let attachment = view.addAttachmentHelper(
@@ -29,10 +30,14 @@
 								}
 							);
 						} else if (file.url) {
-							// TODO: other editors and text/plain
-							view.oEditor.editor.squire.makeLink(file.url);
+							urls.push(file.url);
 						}
 					});
+					if (urls.length) {
+						// TODO: other editors and text/plain
+						// https://github.com/the-djmaze/snappymail/issues/981
+						view.oEditor.editor.squire.insertHTML(urls.join("<br>"));
+					}
 				});
 			};
 		}
diff --git a/plugins/recaptcha/index.php b/plugins/recaptcha/index.php
index d4935b8e8..9d76e4a7d 100644
--- a/plugins/recaptcha/index.php
+++ b/plugins/recaptcha/index.php
@@ -6,9 +6,9 @@ class RecaptchaPlugin extends \RainLoop\Plugins\AbstractPlugin
 		NAME     = 'reCaptcha',
 		AUTHOR   = 'SnappyMail',
 		URL      = 'https://snappymail.eu/',
-		VERSION  = '2.14',
-		RELEASE  = '2023-01-11',
-		REQUIRED = '2.23',
+		VERSION  = '2.15',
+		RELEASE  = '2023-02-22',
+		REQUIRED = '2.26.4',
 		CATEGORY = 'General',
 		LICENSE  = 'MIT',
 		DESCRIPTION = 'A CAPTCHA (v2) is a program that can generate and grade tests that humans can pass but current computer programs cannot. For example, humans can read distorted text as the one shown below, but current computer programs can\'t. More info at https://developers.google.com/recaptcha';
@@ -141,12 +141,9 @@ class RecaptchaPlugin extends \RainLoop\Plugins\AbstractPlugin
 
 	public function ContentSecurityPolicy(\SnappyMail\HTTP\CSP $CSP)
 	{
-//		$CSP->script[] = 'https://www.google.com/recaptcha/';
-		$CSP->script[] = 'https://www.gstatic.com/recaptcha/';
-		$CSP->script[] = 'https://www.recaptcha.net/recaptcha/';
-//		$CSP->frame[] = 'https://www.google.com/recaptcha/';
-//		$CSP->frame[] = 'https://recaptcha.google.com/recaptcha/';
-		$CSP->frame[] = 'https://www.recaptcha.net/recaptcha/';
+		$CSP->add('script-src', 'https://www.gstatic.com/recaptcha/');
+		$CSP->add('script-src', 'https://www.recaptcha.net/recaptcha/');
+		$CSP->add('frame-src', 'https://www.recaptcha.net/recaptcha/');
 	}
 
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Collection.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Collection.php
index 0605b89cc..634c5a3c7 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Collection.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Collection.php
@@ -39,6 +39,11 @@ abstract class Collection extends \ArrayObject implements \JsonSerializable
 		}
 	}
 
+	public function keys() : array
+	{
+		return \array_keys($this->getArrayCopy());
+	}
+
 	public function Add($mItem, bool $bToTop = false) : self
 	{
 		$this->append($mItem, $bToTop);
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php
index 6ae0e13ec..794f4c760 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php
@@ -101,44 +101,47 @@ abstract class HtmlUtils
 			'object', 'embed', 'applet', 'mocha', 'iframe', 'frame', 'frameset', 'video', 'audio', 'area', 'map',
 			'head', 'style'
 		);
-
-		$aRemove = array();
-
-		$sIdRight = \md5(\microtime());
-
-		$aNodes = $oBody->getElementsByTagName('*');
-		foreach ($aNodes as /* @var $oElement \DOMElement */ $oElement) {
-			$sTagNameLower = \strtolower($oElement->nodeName);
-
-			if (\in_array($sTagNameLower, $aRemoveTags)) {
-				$aRemove[] = $oElement;
-				continue;
-			}
-
-			// images
-			if ($oElement->hasAttribute('data-x-src-broken') || $oElement->hasAttribute('data-x-src-hidden')) {
-				$aRemove[] = $oElement;
-				continue;
-			}
-			if ($oElement->hasAttribute('data-x-src-cid')) {
-				$sCid = $oElement->getAttribute('data-x-src-cid');
-				$oElement->removeAttribute('data-x-src-cid');
-				if (!empty($sCid)) {
-					$aFoundCids[] = $sCid;
-					$oElement->setAttribute('src', 'cid:'.$sCid);
+		foreach ($aRemoveTags as $name) {
+			$aNodes = $oBody->getElementsByTagName($name);
+			foreach ($aNodes as /* @var $oElement \DOMElement */ $oElement) {
+				if (isset($oElement->parentNode)) {
+					@$oElement->parentNode->removeChild($oElement);
 				}
 			}
-			if ($oElement->hasAttribute('data-x-src')) {
-				$oElement->setAttribute('src', $oElement->getAttribute('data-x-src'));
-				$oElement->removeAttribute('data-x-src');
-			}
+		}
 
-			// style attribute images
-			$aCid = array();
-			if ($oElement->hasAttribute('data-x-style-url')) {
-				$aCid = \array_merge($aCid, \json_decode($oElement->getAttribute('data-x-style-url'), true));
-				$oElement->removeAttribute('data-x-style-url');
+		$xpath = new \DomXpath($oDoc);
+
+		foreach ($xpath->query('//*[@data-x-src-broken]') as $oElement) {
+			if (isset($oElement->parentNode)) {
+				@$oElement->parentNode->removeChild($oElement);
 			}
+		}
+
+		foreach ($xpath->query('//*[@data-x-src-hidden]') as $oElement) {
+			if (isset($oElement->parentNode)) {
+				@$oElement->parentNode->removeChild($oElement);
+			}
+		}
+
+		foreach ($xpath->query('//*[@data-x-src-cid]') as $oElement) {
+			$sCid = $oElement->getAttribute('data-x-src-cid');
+			$oElement->removeAttribute('data-x-src-cid');
+			if (!empty($sCid)) {
+				$aFoundCids[] = $sCid;
+				$oElement->setAttribute('src', 'cid:'.$sCid);
+			}
+		}
+
+		foreach ($xpath->query('//*[@data-x-src]') as $oElement) {
+			$oElement->setAttribute('src', $oElement->getAttribute('data-x-src'));
+			$oElement->removeAttribute('data-x-src');
+		}
+
+		// style attribute images
+		foreach ($xpath->query('//*[@data-x-style-url]') as $oElement) {
+			$aCid = \json_decode($oElement->getAttribute('data-x-style-url'), true);
+			$oElement->removeAttribute('data-x-style-url');
 			if ($aCid) {
 				foreach ($aCid as $sCidName => $sCid) {
 					$sCidName = \strtolower(\preg_replace('/([A-Z])/', '-\1', $sCidName));
@@ -158,8 +161,11 @@ abstract class HtmlUtils
 					}
 				}
 			}
+		}
 
-			// Remove all remaining data-* attributes
+		// Remove all remaining data-* attributes
+		foreach ($xpath->query('//*[@*[starts-with(name(), "data-")]]') as $oElement) {
+			$sTagNameLower = \strtolower($oElement->nodeName);
 			if ($oElement->hasAttributes()) {
 				foreach ($oElement->attributes as $oAttr) {
 					if ('data-' === \substr(\strtolower($oAttr->nodeName), 0, 5)) {
@@ -167,20 +173,16 @@ abstract class HtmlUtils
 					}
 				}
 			}
-
-			if ('img' === $sTagNameLower) {
-				$sSrc = $oElement->getAttribute('src');
-				if ('data:image/' === \strtolower(\substr($sSrc, 0, 11))) {
-					$sHash = \md5($sSrc) . '@' . $sIdRight;
-					$aFoundDataURL[$sHash] = $sSrc;
-					$oElement->setAttribute('src', 'cid:'.$sHash);
-				}
-			}
 		}
 
-		foreach ($aRemove as /* @var $oElement \DOMElement */ $oElement) {
-			if (isset($oElement->parentNode)) {
-				@$oElement->parentNode->removeChild($oElement);
+		$sIdRight = \md5(\microtime());
+		$aNodes = $oBody->getElementsByTagName('img');
+		foreach ($aNodes as /* @var $oElement \DOMElement */ $oElement) {
+			$sSrc = $oElement->getAttribute('src');
+			if ('data:image/' === \strtolower(\substr($sSrc, 0, 11))) {
+				$sHash = \md5($sSrc) . '@' . $sIdRight;
+				$aFoundDataURL[$sHash] = $sSrc;
+				$oElement->setAttribute('src', 'cid:'.$sHash);
 			}
 		}
 
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Http.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Http.php
index bab9de700..788932ae0 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Http.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Http.php
@@ -139,6 +139,7 @@ class Http
 
 	public static function checkETag(string $ETag) : void
 	{
+		// $ETag . APP_VERSION
 		$sIfNoneMatch = static::GetHeader('If-None-Match');
 		if ($sIfNoneMatch && false !== \strpos($sIfNoneMatch, $ETag)) {
 			static::StatusHeader(304);
@@ -153,6 +154,7 @@ class Http
 
 	public static function setETag(string $ETag) : void
 	{
+		// $ETag . APP_VERSION
 		static::checkETag($ETag);
 		\header("ETag: \"{$ETag}\"");
 	}
@@ -208,6 +210,7 @@ class Http
 				200 => 'OK',
 				206 => 'Partial Content',
 				301 => 'Moved Permanently',
+				302 => 'Found',
 				304 => 'Not Modified',
 				400 => 'Bad Request',
 				401 => 'Unauthorized',
@@ -231,6 +234,12 @@ class Http
 		}
 	}
 
+	public static function Location(string $sUrl, int $iStatus = 302): void
+	{
+		static::StatusHeader($iStatus);
+		\header('Location: ' . $sUrl);
+	}
+
 	public function GetPath() : string
 	{
 		$sUrl = \ltrim(\substr(static::GetServer('SCRIPT_NAME', ''), 0, \strrpos(static::GetServer('SCRIPT_NAME', ''), '/')), '/');
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php
index 3ddedc05f..a0017950b 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php
@@ -13,6 +13,7 @@
 namespace MailSo\Imap\Commands;
 
 use MailSo\Imap\Folder;
+use MailSo\Imap\FolderCollection;
 use MailSo\Imap\FolderInformation;
 use MailSo\Imap\SequenceSet;
 use MailSo\Imap\Enumerations\FolderStatus;
@@ -171,7 +172,11 @@ trait Folders
 		$oFolderInfo = $this->oCurrentFolderInfo;
 		$bReselect = false;
 		$bWritable = false;
-		if ($oFolderInfo && $sFolderName === $oFolderInfo->FolderName) {
+		if ($oFolderInfo && $sFolderName === $oFolderInfo->FullName) {
+			if ($oFolderInfo->hasStatus) {
+				return $oFolderInfo;
+			}
+
 			/**
 			 * There's a long standing IMAP CLIENTBUG where STATUS command is executed
 			 * after SELECT/EXAMINE on same folder (it should not).
@@ -196,21 +201,24 @@ trait Folders
 
 		if ($bReselect || $bSelect) {
 			// Don't use FolderExamine, else PERMANENTFLAGS is empty in Dovecot
-			$oFolderInformation = $this->selectOrExamineFolder($sFolderName, $bSelect || $bWritable, false);
-			$oFolderInformation->MESSAGES = \max(0, $oFolderInformation->MESSAGES, $oInfo->MESSAGES);
+			$oFolderInfo = $this->selectOrExamineFolder($sFolderName, $bSelect || $bWritable, false);
+			$oFolderInfo->MESSAGES = \max(0, $oFolderInfo->MESSAGES, $oInfo->MESSAGES);
 			// SELECT or EXAMINE command then UNSEEN is the message sequence number of the first unseen message.
 			// And deprecated in IMAP4rev2, so we set it to the amount of unseen messages
-			$oFolderInformation->UNSEEN = \max(0, $oInfo->UNSEEN);
-			$oFolderInformation->UIDNEXT = \max(0, $oFolderInformation->UIDNEXT, $oInfo->UIDNEXT);
-			$oFolderInformation->UIDVALIDITY = \max(0, $oFolderInformation->UIDVALIDITY, $oInfo->UIDVALIDITY);
-			$oFolderInformation->HIGHESTMODSEQ = \max(0, $oInfo->HIGHESTMODSEQ);
-			$oFolderInformation->APPENDLIMIT = \max(0, $oFolderInformation->APPENDLIMIT, $oInfo->APPENDLIMIT);
-			$oFolderInformation->MAILBOXID = $oFolderInformation->MAILBOXID ?: $oInfo->MAILBOXID;
-//			$oFolderInformation->SIZE = \max($oFolderInformation->SIZE, $oInfo->SIZE);
-//			$oFolderInformation->RECENT = \max(0, $oFolderInformation->RECENT, $oInfo->RECENT);
-			return $oFolderInformation;
+			$oFolderInfo->UNSEEN = \max(0, $oInfo->UNSEEN);
+			$oFolderInfo->UIDNEXT = \max(0, $oFolderInfo->UIDNEXT, $oInfo->UIDNEXT);
+			$oFolderInfo->UIDVALIDITY = \max(0, $oFolderInfo->UIDVALIDITY, $oInfo->UIDVALIDITY);
+			$oFolderInfo->HIGHESTMODSEQ = \max(0, $oInfo->HIGHESTMODSEQ);
+			$oFolderInfo->APPENDLIMIT = \max(0, $oFolderInfo->APPENDLIMIT, $oInfo->APPENDLIMIT);
+			$oFolderInfo->MAILBOXID = $oFolderInfo->MAILBOXID ?: $oInfo->MAILBOXID;
+//			$oFolderInfo->SIZE = \max($oFolderInfo->SIZE, $oInfo->SIZE);
+//			$oFolderInfo->RECENT = \max(0, $oFolderInfo->RECENT, $oInfo->RECENT);
+			$oFolderInfo->hasStatus = $oInfo->hasStatus;
+			$oFolderInfo->generateETag($this);
+			return $oFolderInfo;
 		}
 
+		$oInfo->generateETag($this);
 		return $oInfo;
 	}
 
@@ -258,19 +266,16 @@ trait Folders
 		if ($this->IsSelected()) {
 			if ($this->hasCapability('UNSELECT')) {
 				$this->SendRequestGetResponse('UNSELECT');
-				$this->oCurrentFolderInfo = null;
 			} else {
 				try {
 					$this->SendRequestGetResponse('SELECT', ['""']);
 					// * OK [CLOSED] Previous mailbox closed.
 					// 3 NO [CANNOT] Invalid mailbox name: Name is empty
 				} catch (\MailSo\Imap\Exceptions\NegativeResponseException $oException) {
-					if ('NO' === $oException->GetResponseStatus()) {
-						$this->oCurrentFolderInfo = null;
-					}
 				}
 			}
 		}
+		$this->oCurrentFolderInfo = null;
 	}
 
 	/**
@@ -315,9 +320,9 @@ trait Folders
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function FolderSelect(string $sFolderName, bool $bReSelectSameFolders = false) : FolderInformation
+	public function FolderSelect(string $sFolderName, bool $bForceReselect = false) : FolderInformation
 	{
-		return $this->selectOrExamineFolder($sFolderName, true, $bReSelectSameFolders);
+		return $this->selectOrExamineFolder($sFolderName, true, $bForceReselect);
 	}
 
 	/**
@@ -331,9 +336,9 @@ trait Folders
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function FolderExamine(string $sFolderName, bool $bReSelectSameFolders = false) : FolderInformation
+	public function FolderExamine(string $sFolderName, bool $bForceReselect = false) : FolderInformation
 	{
-		return $this->selectOrExamineFolder($sFolderName, $this->Settings->force_select, $bReSelectSameFolders);
+		return $this->selectOrExamineFolder($sFolderName, $this->Settings->force_select, $bForceReselect);
 	}
 
 	/**
@@ -345,11 +350,11 @@ trait Folders
 	 * REQUIRED IMAP4rev2 untagged responses:  FLAGS, EXISTS, LIST
 	 * REQUIRED IMAP4rev2 OK untagged responses:  PERMANENTFLAGS, UIDNEXT, UIDVALIDITY
 	 */
-	protected function selectOrExamineFolder(string $sFolderName, bool $bIsWritable, bool $bReSelectSameFolders) : FolderInformation
+	protected function selectOrExamineFolder(string $sFolderName, bool $bIsWritable, bool $bForceReselect) : FolderInformation
 	{
-		if (!$bReSelectSameFolders
+		if (!$bForceReselect
 		  && $this->oCurrentFolderInfo
-		  && $sFolderName === $this->oCurrentFolderInfo->FolderName
+		  && $sFolderName === $this->oCurrentFolderInfo->FullName
 		  && ($bIsWritable === $this->oCurrentFolderInfo->IsWritable || $this->oCurrentFolderInfo->IsWritable)
 		) {
 			return $this->oCurrentFolderInfo;
@@ -407,9 +412,9 @@ trait Folders
 							$oResult->PermanentFlags = \array_map('\\MailSo\\Base\\Utils::Utf7ModifiedToUtf8', $oResponse->OptionalResponse[1]);
 						}
 					} else if ('READ-ONLY' === $key) {
-//						$oResult->IsWritable = false;
+						$oResult->IsWritable = false;
 					} else if ('READ-WRITE' === $key) {
-//						$oResult->IsWritable = true;
+						$oResult->IsWritable = true;
 					} else if ('NOMODSEQ' === $key) {
 						// https://datatracker.ietf.org/doc/html/rfc4551#section-3.1.2
 					}
@@ -419,7 +424,8 @@ trait Folders
 				else if (\count($oResponse->ResponseList) > 2
 				 && 'FLAGS' === $oResponse->ResponseList[1]
 				 && \is_array($oResponse->ResponseList[2])) {
-					$oResult->Flags = \array_map('\\MailSo\\Base\\Utils::Utf7ModifiedToUtf8', $oResponse->ResponseList[2]);
+					// These could be not permanent, so we don't use them
+//					$oResult->Flags = \array_map('\\MailSo\\Base\\Utils::Utf7ModifiedToUtf8', $oResponse->ResponseList[2]);
 				}
 			}
 		}
@@ -442,7 +448,7 @@ trait Folders
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function FolderList(string $sParentFolderName, string $sListPattern, bool $bIsSubscribeList = false, bool $bUseListStatus = false) : array
+	public function FolderList(string $sParentFolderName, string $sListPattern, bool $bIsSubscribeList = false, bool $bUseListStatus = false) : FolderCollection
 	{
 		$sCmd = 'LIST';
 
@@ -502,16 +508,18 @@ trait Folders
 		$aMetadata = $bMetadata ? $this->getAllMetadata() : null;
 
 		$this->SendRequest($sCmd, $aParameters);
-		$aReturn = array();
+		$aFolders = array();
+		$oFolderCollection = new FolderCollection;
 		$sDelimiter = '';
 		$bInbox = false;
 		foreach ($this->yieldUntaggedResponses() as $oResponse) {
 			if ('STATUS' === $oResponse->StatusOrIndex && isset($oResponse->ResponseList[2])) {
 				$sFullName = $this->toUTF8($oResponse->ResponseList[2]);
-				if (!isset($aReturn[$sFullName])) {
-					$aReturn[$sFullName] = new Folder($sFullName);
+				if (!isset($oFolderCollection[$sFullName])) {
+					$oFolderCollection[$sFullName] = new Folder($sFullName);
 				}
-				$aReturn[$sFullName]->setStatusFromResponse($oResponse);
+				$oFolderCollection[$sFullName]->setStatusFromResponse($oResponse);
+				$oFolderCollection[$sFullName]->generateETag($this);
 			}
 			else if ($sCmd === $oResponse->StatusOrIndex && 5 === \count($oResponse->ResponseList)) {
 				try
@@ -521,22 +529,20 @@ trait Folders
 					/**
 					 * $oResponse->ResponseList[0] = *
 					 * $oResponse->ResponseList[1] = LIST (all) | LSUB (subscribed)
-					 * $oResponse->ResponseList[2] = Flags
+					 * $oResponse->ResponseList[2] = Attribute flags
 					 * $oResponse->ResponseList[3] = Delimiter
 					 * $oResponse->ResponseList[4] = FullName
 					 */
-					if (isset($aReturn[$sFullName])) {
-						$oFolder = $aReturn[$sFullName];
+					if (isset($oFolderCollection[$sFullName])) {
+						$oFolder = $oFolderCollection[$sFullName];
 						$oFolder->setDelimiter($oResponse->ResponseList[3]);
-						$oFolder->setFlags($oResponse->ResponseList[2]);
+						$oFolder->setAttributes($oResponse->ResponseList[2]);
 					} else {
 						$oFolder = new Folder($sFullName, $oResponse->ResponseList[3], $oResponse->ResponseList[2]);
-						$aReturn[$sFullName] = $oFolder;
+						$oFolderCollection[$sFullName] = $oFolder;
 					}
 
-					if ($oFolder->IsInbox()) {
-						$bInbox = true;
-					}
+					$bInbox = $bInbox || $oFolder->IsInbox();
 
 					if (!$sDelimiter) {
 						$sDelimiter = $oFolder->Delimiter();
@@ -545,8 +551,6 @@ trait Folders
 					if (isset($aMetadata[$oResponse->ResponseList[4]])) {
 						$oFolder->SetAllMetadata($aMetadata[$oResponse->ResponseList[4]]);
 					}
-
-					$aReturn[$sFullName] = $oFolder;
 				}
 				catch (\Throwable $oException)
 				{
@@ -555,13 +559,16 @@ trait Folders
 			}
 		}
 
+//		$iOptimizationLimit = $this->Settings->folder_list_limit;
+//		$oFolderCollection->Optimized = 10 < $iOptimizationLimit && $oFolderCollection->count() > $iOptimizationLimit;
+
 		// RFC 5464
-		if ($bMetadata && !$aMetadata /*&& 50 < \count($aReturn)*/) {
-			foreach ($aReturn as $oFolder) {
-//				if (2 > \substr_count($oFolder->FullName(), $oFolder->Delimiter()))
+		if ($bMetadata && !$aMetadata /*&& 50 < $oFolderCollection->count()*/) {
+			foreach ($oFolderCollection as $oFolder) {
+//				if (2 > \substr_count($oFolder->FullName, $oFolder->Delimiter()))
 				try {
 					$oFolder->SetAllMetadata(
-						$this->getMetadata($oFolder->FullName(), ['/shared', '/private'], ['DEPTH'=>'infinity'])
+						$this->getMetadata($oFolder->FullName, ['/shared', '/private'], ['DEPTH'=>'infinity'])
 					);
 				} catch (\Throwable $oException) {
 					// Ignore error
@@ -569,11 +576,11 @@ trait Folders
 			}
 		}
 
-		if (!$bInbox && !$sParentFolderName && !isset($aReturn['INBOX'])) {
-			$aReturn['INBOX'] = new Folder('INBOX', $sDelimiter);
+		if (!$bInbox && !$sParentFolderName && !isset($oFolderCollection['INBOX'])) {
+			$oFolderCollection['INBOX'] = new Folder('INBOX', $sDelimiter);
 		}
 
-		return $aReturn;
+		return $oFolderCollection;
 	}
 
 	/**
@@ -581,7 +588,7 @@ trait Folders
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function FolderSubscribeList(string $sParentFolderName, string $sListPattern) : array
+	public function FolderSubscribeList(string $sParentFolderName, string $sListPattern) : FolderCollection
 	{
 		return $this->FolderList($sParentFolderName, $sListPattern, true);
 	}
@@ -591,7 +598,7 @@ trait Folders
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function FolderStatusList(string $sParentFolderName, string $sListPattern) : array
+	public function FolderStatusList(string $sParentFolderName, string $sListPattern) : FolderCollection
 	{
 		return $this->FolderList($sParentFolderName, $sListPattern, false, true);
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Messages.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Messages.php
index ffd1aeb37..51630cddc 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Messages.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Messages.php
@@ -135,15 +135,19 @@ trait Messages
 	/**
 	 * Appends message to specified folder
 	 *
-	 * @param resource $rMessageAppendStream
+	 * @param resource $rMessageStream
 	 *
 	 * @throws \InvalidArgumentException
 	 * @throws \MailSo\RuntimeException
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function MessageAppendStream(string $sFolderName, $rMessageAppendStream, int $iStreamSize, array $aFlagsList = null, int $iDateTime = 0) : ?int
+	public function MessageAppendStream(string $sFolderName, $rMessageStream, int $iStreamSize, array $aFlagsList = null, int $iDateTime = 0) : ?int
 	{
+		if (!\is_resource($rMessageStream) || !\strlen($sFolderName) || 1 > $iStreamSize) {
+			throw new \InvalidArgumentException;
+		}
+
 		$aParams = array(
 			$this->EscapeFolderName($sFolderName),
 			$aFlagsList
@@ -162,7 +166,7 @@ trait Messages
 
 		$this->SendRequestGetResponse('APPEND', $aParams);
 
-		return $this->writeMessageStream($rMessageAppendStream);
+		return $this->writeMessageStream($rMessageStream);
 	}
 
 	private function writeMessageStream($rMessageStream) : ?int
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Folder.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Folder.php
index 920150ca5..e53fb887d 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Folder.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Folder.php
@@ -24,7 +24,7 @@ class Folder implements \JsonSerializable
 
 	private ?string $sDelimiter;
 
-	private array $aFlagsLowerCase;
+	private array $aAttributes;
 
 	/**
 	 * RFC 5464
@@ -34,31 +34,31 @@ class Folder implements \JsonSerializable
 	/**
 	 * @throws \InvalidArgumentException
 	 */
-	function __construct(string $sFullName, string $sDelimiter = null, array $aFlags = array())
+	function __construct(string $sFullName, string $sDelimiter = null, array $aAttributes = array())
 	{
 		if (!\strlen($sFullName)) {
 			throw new \InvalidArgumentException;
 		}
-		$this->FolderName = $sFullName;
+		$this->FullName = $sFullName;
 		$this->setDelimiter($sDelimiter);
-		$this->setFlags($aFlags);
+		$this->setAttributes($aAttributes);
 /*
 		// RFC 5738
-		if (\in_array('\\noutf8', $this->aFlagsLowerCase)) {
+		if (\in_array('\\noutf8', $this->aAttributes)) {
 		}
-		if (\in_array('\\utf8only', $this->aFlagsLowerCase)) {
+		if (\in_array('\\utf8only', $this->aAttributes)) {
 		}
 */
 	}
 
-	public function setFlags(array $aFlags) : void
+	public function setAttributes(array $aAttributes) : void
 	{
-		$this->aFlagsLowerCase = \array_map('mb_strtolower', $aFlags);
+		$this->aAttributes = \array_map('mb_strtolower', $aAttributes);
 	}
 
 	public function setSubscribed() : void
 	{
-		$this->aFlagsLowerCase = \array_unique(\array_merge($this->aFlagsLowerCase, ['\\subscribed']));
+		$this->aAttributes = \array_unique(\array_merge($this->aAttributes, ['\\subscribed']));
 	}
 
 	public function setDelimiter(?string $sDelimiter) : void
@@ -68,7 +68,7 @@ class Folder implements \JsonSerializable
 
 	public function Name() : string
 	{
-		$sNameRaw = $this->FolderName;
+		$sNameRaw = $this->FullName;
 		if ($this->sDelimiter) {
 			$aNames = \explode($this->sDelimiter, $sNameRaw);
 			return \end($aNames);
@@ -76,39 +76,25 @@ class Folder implements \JsonSerializable
 		return $sNameRaw;
 	}
 
-	public function FullName() : string
-	{
-		return $this->FolderName;
-	}
-
 	public function Delimiter() : ?string
 	{
 		return $this->sDelimiter;
 	}
 
-	public function FlagsLowerCase() : array
-	{
-		return $this->aFlagsLowerCase;
-	}
-
-	public function Exists() : bool
-	{
-		return !\in_array('\\nonexistent', $this->aFlagsLowerCase);
-	}
-
 	public function Selectable() : bool
 	{
-		return !\in_array('\\noselect', $this->aFlagsLowerCase) && $this->Exists();
+		return !\in_array('\\noselect', $this->aAttributes)
+			&& !\in_array('\\nonexistent', $this->aAttributes);
 	}
 
 	public function IsSubscribed() : bool
 	{
-		return \in_array('\\subscribed', $this->aFlagsLowerCase);
+		return \in_array('\\subscribed', $this->aAttributes);
 	}
 
 	public function IsInbox() : bool
 	{
-		return 'INBOX' === \strtoupper($this->FolderName) || \in_array('\\inbox', $this->aFlagsLowerCase);
+		return 'INBOX' === \strtoupper($this->FullName) || \in_array('\\inbox', $this->aAttributes);
 	}
 
 	public function SetMetadata(string $sName, string $sData) : void
@@ -146,53 +132,32 @@ class Folder implements \JsonSerializable
 				'\\junk',      // '\\spam'
 				'\\sent',      // '\\sentmail'
 				'\\trash',     // '\\bin'
-			], $this->aFlagsLowerCase);
+			], $this->aAttributes);
 			if ($match) {
 				$role = \array_shift($match);
 			}
-			if (!$role && 'INBOX' === \strtoupper($this->FolderName)) {
+			if (!$role && 'INBOX' === \strtoupper($this->FullName)) {
 				return 'inbox';
 			}
 		}
 		return $role ? \ltrim($role, '\\') : null;
 	}
 
-	public function Hash(string $sClientHash) : ?string
-	{
-		return $this->getHash($sClientHash);
-	}
-
 	#[\ReturnTypeWillChange]
 	public function jsonSerialize()
 	{
-/*
-		$aExtended = null;
-		if (isset($this->MESSAGES, $this->UNSEEN, $this->UIDNEXT)) {
-			$aExtended = array(
-				'totalEmails' => (int) $this->MESSAGES,
-				'unreadEmails' => (int) $this->UNSEEN,
-				'uidNext' => (int) $this->UIDNEXT,
-//				'hash' => $this->Hash($this->ImapClient()->Hash())
-			);
-		}
-*/
 /*
 		if ($this->ImapClient->hasCapability('ACL') || $this->ImapClient->CapabilityValue('RIGHTS')) {
 			// MailSo\Imap\Responses\ACL
-			$rights = $this->ImapClient->FolderMyRights($this->FolderName);
+			$rights = $this->ImapClient->FolderMyRights($this->FullName);
 		}
 */
-		return array(
+		$result = array(
 			'@Object' => 'Object/Folder',
 			'name' => $this->Name(),
-			'fullName' => $this->FolderName,
+			'fullName' => $this->FullName,
 			'delimiter' => (string) $this->sDelimiter,
-			'isSubscribed' => $this->IsSubscribed(),
-			'exists' => $this->Exists(),
-			'selectable' => $this->Selectable(),
-			'flags' => $this->aFlagsLowerCase,
-//			'extended' => $aExtended,
-//			'permanentFlags' => $this->PermanentFlags,
+			'attributes' => $this->aAttributes,
 			'metadata' => $this->aMetadata,
 			'uidNext' => $this->UIDNEXT,
 			// https://datatracker.ietf.org/doc/html/rfc8621#section-2
@@ -214,5 +179,9 @@ class Folder implements \JsonSerializable
 			]
 */
 		);
+		if ($this->etag) {
+			$result['etag'] = $this->etag;
+		}
+		return $result;
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/FolderCollection.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FolderCollection.php
similarity index 70%
rename from snappymail/v/0.0.0/app/libraries/MailSo/Mail/FolderCollection.php
rename to snappymail/v/0.0.0/app/libraries/MailSo/Imap/FolderCollection.php
index 9c6265997..8e2d9d8c2 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/FolderCollection.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FolderCollection.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace MailSo\Mail;
+namespace MailSo\Imap;
 
 /**
  * @category MailSo
@@ -21,22 +21,16 @@ class FolderCollection extends \MailSo\Base\Collection
 
 	public function append($oFolder, bool $bToTop = false) : void
 	{
-		assert($oFolder instanceof \MailSo\Imap\Folder);
+		assert($oFolder instanceof Folder);
 		parent::append($oFolder, $bToTop);
 	}
 
-	public function FindDelimiter() : string
-	{
-		$oFolder = $this['INBOX'] ?? $this[0] ?? null;
-		return $oFolder ? $oFolder->Delimiter() : '/';
-	}
-
 	#[\ReturnTypeWillChange]
 	public function jsonSerialize()
 	{
 		return array(
 			'@Object' => 'Collection/FolderCollection',
-			'@Collection' => $this->getArrayCopy(),
+			'@Collection' => \array_values($this->getArrayCopy()),
 //			'optimized' => $this->Optimized
 		);
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FolderInformation.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FolderInformation.php
index a853d191b..a26eab696 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FolderInformation.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FolderInformation.php
@@ -23,25 +23,28 @@ class FolderInformation implements \JsonSerializable
 
 	/**
 	 * Message flags
+	 * https://www.rfc-editor.org/rfc/rfc3501#section-7.2.6
+	 * These could be not permanent so we don't use them
 	 */
 	public array $Flags = array();
 
 	/**
 	 * NOTE: Empty when FolderExamine is used
+	 * https://www.rfc-editor.org/rfc/rfc3501#page-64
 	 */
 	public array $PermanentFlags = array();
 
-	function __construct(string $sFolderName, bool $bIsWritable)
+	function __construct(string $sFullName, bool $bIsWritable)
 	{
-		$this->FolderName = $sFolderName;
+		$this->FullName = $sFullName;
 		$this->IsWritable = $bIsWritable;
 	}
 
 	public function IsFlagSupported(string $sFlag) : bool
 	{
-		return \in_array('\\*', $this->PermanentFlags) ||
-			\in_array($sFlag, $this->PermanentFlags) ||
-			\in_array($sFlag, $this->Flags);
+		return \in_array('\\*', $this->PermanentFlags)
+			|| \in_array($sFlag, $this->PermanentFlags);
+//			|| \in_array($sFlag, $this->Flags);
 	}
 
 	#[\ReturnTypeWillChange]
@@ -49,9 +52,7 @@ class FolderInformation implements \JsonSerializable
 	{
 		$result = array(
 			'id' => $this->MAILBOXID,
-			'name' => $this->FolderName,
-			'flags' => $this->Flags,
-			'permanentFlags' => $this->PermanentFlags,
+			'name' => $this->FullName,
 			'uidNext' => $this->UIDNEXT,
 			'uidValidity' => $this->UIDVALIDITY
 		);
@@ -68,6 +69,17 @@ class FolderInformation implements \JsonSerializable
 		if (isset($this->SIZE)) {
 			$result['size'] = $this->SIZE;
 		}
+		if ($this->etag) {
+			$result['etag'] = $this->etag;
+		}
+/*
+		if ($this->Flags) {
+			$result['flags'] = $this->Flags;
+		}
+*/
+		if ($this->PermanentFlags) {
+			$result['permanentFlags'] = $this->PermanentFlags;
+		}
 		return $result;
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
index f4a1ac8ec..72a993d62 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
@@ -49,24 +49,17 @@ class ImapClient extends \MailSo\Net\NetClient
 
 	private bool $bIsLoggined = false;
 
-	private string $sLogginedUser = '';
-
 	private bool $UTF8 = false;
 
 	public function Hash() : string
 	{
 		return \md5('ImapClientHash/'.
-			$this->GetLogginedUser() . '@' .
-			$this->GetConnectedHost() . ':' .
-			$this->GetConnectedPort()
+			$this->Settings->Login . '@' .
+			$this->Settings->host . ':' .
+			$this->Settings->port
 		);
 	}
 
-	public function GetLogginedUser() : string
-	{
-		return $this->sLogginedUser;
-	}
-
 	/**
 	 * @throws \InvalidArgumentException
 	 * @throws \MailSo\RuntimeException
@@ -109,23 +102,26 @@ class ImapClient extends \MailSo\Net\NetClient
 	 */
 	public function Login(Settings $oSettings) : self
 	{
+		if ($this->bIsLoggined) {
+			return $this;
+		}
+
 		if (!empty($oSettings->ProxyAuthUser) && !empty($oSettings->ProxyAuthPassword)) {
-			$sLogin = \MailSo\Base\Utils::IdnToAscii(\MailSo\Base\Utils::Trim($oSettings->ProxyAuthUser));
+			$sLogin = $oSettings->ProxyAuthUser;
 			$sPassword = $oSettings->ProxyAuthPassword;
 			$sProxyAuthUser = $oSettings->Login;
 		} else {
-			$sLogin = \MailSo\Base\Utils::IdnToAscii(\MailSo\Base\Utils::Trim($oSettings->Login));
+			$sLogin = $oSettings->Login;
 			$sPassword = $oSettings->Password;
 			$sProxyAuthUser = '';
 		}
 
-		if (!\strlen($sLogin) || !\strlen($sPassword))
-		{
+		$sLogin = \MailSo\Base\Utils::IdnToAscii(\MailSo\Base\Utils::Trim($sLogin));
+
+		if (!\strlen($sLogin) || !\strlen($sPassword)) {
 			$this->writeLogException(new \InvalidArgumentException, \LOG_ERR);
 		}
 
-		$this->sLogginedUser = $sLogin;
-
 		$type = '';
 		foreach ($oSettings->SASLMechanisms as $sasl_type) {
 			if ($this->hasCapability("AUTH={$sasl_type}") && \SnappyMail\SASL::isSupported($sasl_type)) {
@@ -222,8 +218,7 @@ class ImapClient extends \MailSo\Net\NetClient
 
 			$this->setCapabilities($oResponse);
 
-			if (\strlen($sProxyAuthUser))
-			{
+			if (\strlen($sProxyAuthUser)) {
 				$this->SendRequestGetResponse('PROXYAUTH', array($this->EscapeString($sProxyAuthUser)));
 			}
 /*
@@ -319,6 +314,9 @@ class ImapClient extends \MailSo\Net\NetClient
 			if ($this->Settings->disable_list_status) {
 				$aList = \array_diff($aList, ['LIST-STATUS']);
 			}
+			if (8 > PHP_INT_SIZE) {
+				$aList = \array_diff($aList, ['CONDSTORE']);
+			}
 		}
 		$this->aCapabilityItems = $aList;
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/Status.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/Status.php
index b7e948468..4cef499c3 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/Status.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/Status.php
@@ -22,95 +22,94 @@ namespace MailSo\Imap\Traits;
  */
 trait Status
 {
-	public string $FolderName;
+	public string $FullName;
 
-	public
-		/**
-		 * The number of messages in the mailbox.
-		 * This response is named EXISTS as a result of a SELECT or EXAMINE command.
-		 * @var int
-		 */
-		$MESSAGES,
+	public bool $hasStatus = false;
 
-		/**
-		 * The number of messages with the \Recent flag set.
-		 * This response also occurs as a result of a SELECT or EXAMINE command.
-		 * IMAP4rev2 deprecated.
-		 * @var int
-		 */
-		$RECENT,
+	/**
+	 * The number of messages in the mailbox.
+	 * This response is named EXISTS as a result of a SELECT or EXAMINE command.
+	 */
+	public ?int $MESSAGES = null;
 
-		/**
-		 * The next unique identifier value of the mailbox.
-		 * A 32-bit value
-		 * This response also occurs as a result of a SELECT or EXAMINE command.
-		 * @var int
-		 */
-		$UIDNEXT,
+	/**
+	 * The number of messages with the \Recent flag set.
+	 * This response also occurs as a result of a SELECT or EXAMINE command.
+	 * IMAP4rev2 deprecated.
+	 */
+	public ?int $RECENT = null;
 
-		/**
-		 * The unique identifier validity value of the mailbox.
-		 * This response also occurs as a result of a SELECT or EXAMINE command.
-		 * @var int
-		 */
-		$UIDVALIDITY,
+	/**
+	 * The next unique identifier value of the mailbox.
+	 * A 32-bit value
+	 * This response also occurs as a result of a SELECT or EXAMINE command.
+	 */
+	public ?int $UIDNEXT = null;
 
-		/**
-		 * The number of messages which do not have the \Seen flag set.
-		 * This response also occurs as a result of a IMAP4rev1 SELECT or EXAMINE command,
-		 * but then it is the message sequence number of the first unseen message.
-		 * IMAP4rev2 deprecated on SELECT/EXAMINE.
-		 * @var int
-		 */
-		$UNSEEN,
+	/**
+	 * The unique identifier validity value of the mailbox.
+	 * This response also occurs as a result of a SELECT or EXAMINE command.
+	 */
+	public ?int $UIDVALIDITY = null;
 
-		/**
-		 * RFC 4551
-		 * The highest mod-sequence value of all messages in the mailbox.
-		 * This response also occurs as a result of a SELECT or EXAMINE command.
-		 * @var int 1*DIGIT Positive unsigned 64-bit integer
-		 */
-		$HIGHESTMODSEQ,
+	/**
+	 * The number of messages which do not have the \Seen flag set.
+	 * This response also occurs as a result of a IMAP4rev1 SELECT or EXAMINE command,
+	 * but then it is the message sequence number of the first unseen message.
+	 * IMAP4rev2 deprecated on SELECT/EXAMINE.
+	 */
+	public ?int $UNSEEN = null;
 
-		/**
-		 * RFC 7889
-		 * Message upload size limit.
-		 * @var int
-		 */
-		$APPENDLIMIT,
+	/**
+	 * RFC 4551
+	 * The highest mod-sequence value of all messages in the mailbox.
+	 * This response also occurs as a result of a SELECT or EXAMINE command.
+	 * 1*DIGIT Positive unsigned 64-bit integer
+	 */
+	public ?int $HIGHESTMODSEQ = null;
 
-		/**
-		 * RFC 8474
-		 * A server-allocated unique identifier for the mailbox.
-		 * This response also occurs as a result of a CREATE, SELECT or EXAMINE command.
-		 * @var string
-		 */
-		$MAILBOXID,
+	/**
+	 * RFC 7889
+	 * Message upload size limit.
+	 */
+	public ?int $APPENDLIMIT = null;
 
-		/**
-		 * RFC 9051
-		 * The total size of the mailbox in octets.
-		 * @var int
-		 */
-		$SIZE;
+	/**
+	 * RFC 8474
+	 * A server-allocated unique identifier for the mailbox.
+	 * This response also occurs as a result of a CREATE, SELECT or EXAMINE command.
+	 */
+	public ?string $MAILBOXID = null;
 
-	public function getHash(string $sClientHash) : ?string
+	/**
+	 * RFC 9051
+	 * The total size of the mailbox in octets.
+	 */
+	public ?int $SIZE = null;
+
+	public ?string $etag = null;
+	public function generateETag(\MailSo\Imap\ImapClient $oImapClient) : void
 	{
-		if (!isset($this->MESSAGES, $this->UIDNEXT)) {
-			return null;
+		if (!$this->hasStatus) {
+			// UNSEEN undefined when only SELECT/EXAMINE is used
+			\error_log("{$this->FullName} STATUS missing " . \print_r(\debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS),true));
+			return;
 		}
-		return \md5('FolderHash/'. \implode('-', [
-				$this->FolderName,
-				$this->MESSAGES,
-				$this->UIDNEXT,
-				$this->UIDVALIDITY,
-//				$this->UNSEEN, // undefined when SELECT/EXAMINE
-				$this->HIGHESTMODSEQ,
-				$sClientHash
+		if (!isset($this->MESSAGES, $this->UIDNEXT)) {
+			return;
+		}
+		$this->etag = \md5('FolderHash/'. \implode('-', [
+			$this->FullName,
+			$this->MESSAGES,
+			$this->UIDNEXT,
+			$this->UIDVALIDITY,
+			$this->UNSEEN,
+			$this->HIGHESTMODSEQ,
+			$oImapClient->Hash()
 		]));
 	}
 
-	public function setStatus(string $name, $value) : bool
+	private function setStatusItem(string $name, $value) : bool
 	{
 		if ('EXISTS' === $name) {
 			$name = 'MESSAGES';
@@ -148,7 +147,7 @@ trait Status
 		// OK untagged responses
 		if (\is_array($oResponse->OptionalResponse)) {
 			if (\count($oResponse->OptionalResponse) > 1) {
-				$bResult = $this->setStatus($oResponse->OptionalResponse[0], $oResponse->OptionalResponse[1]);
+				$bResult = $this->setStatusItem($oResponse->OptionalResponse[0], $oResponse->OptionalResponse[1]);
 			}
 		}
 
@@ -160,17 +159,18 @@ trait Status
 			 && \is_array($oResponse->ResponseList[3])) {
 				$c = \count($oResponse->ResponseList[3]);
 				for ($i = 0; $i < $c; $i += 2) {
-					$bResult |= $this->setStatus(
+					$bResult |= $this->setStatusItem(
 						$oResponse->ResponseList[3][$i],
 						$oResponse->ResponseList[3][$i+1]
 					);
 				}
+				$this->hasStatus = $bResult;
 			}
 			// SELECT or EXAMINE command
 			else if (\is_numeric($oResponse->ResponseList[1]) && \is_string($oResponse->ResponseList[2])) {
 				// UNSEEN deprecated in IMAP4rev2
 				if ('UNSEEN' !== $oResponse->ResponseList[2]) {
-					$bResult |= $this->setStatus($oResponse->ResponseList[2], $oResponse->ResponseList[1]);
+					$bResult |= $this->setStatusItem($oResponse->ResponseList[2], $oResponse->ResponseList[1]);
 				}
 			}
 		}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/File.php b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/File.php
index 47aa51db8..5f4ca9018 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/File.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/File.php
@@ -23,11 +23,7 @@ class File extends \MailSo\Log\Driver
 	function __construct(string $sLoggerFileName)
 	{
 		parent::__construct();
-		$this->SetLoggerFileName($sLoggerFileName);
-	}
 
-	public function SetLoggerFileName(string $sLoggerFileName)
-	{
 		$sLogFileDir = \dirname($sLoggerFileName);
 		if (!\is_dir($sLogFileDir)) {
 			\mkdir($sLogFileDir, 0755, true);
@@ -37,19 +33,14 @@ class File extends \MailSo\Log\Driver
 
 	protected function writeImplementation($mDesc) : bool
 	{
-		return $this->writeToLogFile($mDesc);
+		if (\is_array($mDesc)) {
+			$mDesc = \implode("\n\t", $mDesc);
+		}
+		return \error_log($mDesc . "\n", 3, $this->sLoggerFileName);
 	}
 
 	protected function clearImplementation() : bool
 	{
 		return \unlink($this->sLoggerFileName);
 	}
-
-	private function writeToLogFile($mDesc) : bool
-	{
-		if (\is_array($mDesc)) {
-			$mDesc = \implode("\n\t", $mDesc);
-		}
-		return \error_log($mDesc . "\n", 3, $this->sLoggerFileName);
-	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/StderrStream.php b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/StderrStream.php
new file mode 100644
index 000000000..89b56d886
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/StderrStream.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of MailSo.
+ *
+ * (c) 2023 DJMaze
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace MailSo\Log\Drivers;
+
+/**
+ * @category MailSo
+ * @package Log
+ * @subpackage Drivers
+ */
+class StderrStream extends \MailSo\Log\Driver
+{
+	protected function writeImplementation($mDesc) : bool
+	{
+		if (!\defined('STDERR')) {
+			\define('STDERR', \fopen('php://stderr', 'wb'));
+		}
+		return 0 < \fwrite(STDERR, $mDesc . "\n");
+	}
+
+	protected function clearImplementation() : bool
+	{
+		return true;
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
index 3921e5f8e..07a43c323 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
@@ -11,6 +11,7 @@
 
 namespace MailSo\Mail;
 
+use MailSo\Imap\FolderCollection;
 use MailSo\Imap\FolderInformation;
 use MailSo\Imap\Enumerations\FetchType;
 use MailSo\Imap\Enumerations\MessageFlag;
@@ -257,23 +258,7 @@ class MailClient
 		return ($aFetchResponse && 1 === \count($aFetchResponse));
 	}
 
-	/**
-	 * @param resource $rMessageStream
-	 */
-	public function MessageAppendStream($rMessageStream, int $iMessageStreamSize, string $sFolderToSave, array $aAppendFlags = null, int &$iUid = null) : self
-	{
-		if (!\is_resource($rMessageStream) || !\strlen($sFolderToSave))
-		{
-			throw new \InvalidArgumentException;
-		}
-
-		$iUid = $this->oImapClient->MessageAppendStream(
-			$sFolderToSave, $rMessageStream, $iMessageStreamSize, $aAppendFlags);
-
-		return $this;
-	}
-
-	public function MessageAppendFile(string $sMessageFileName, string $sFolderToSave, array $aAppendFlags = null, int &$iUid = null) : self
+	public function MessageAppendFile(string $sMessageFileName, string $sFolderToSave, array $aAppendFlags = null) : int
 	{
 		if (!\is_file($sMessageFileName) || !\is_readable($sMessageFileName)) {
 			throw new \InvalidArgumentException;
@@ -282,13 +267,11 @@ class MailClient
 		$iMessageStreamSize = \filesize($sMessageFileName);
 		$rMessageStream = \fopen($sMessageFileName, 'rb');
 
-		$this->MessageAppendStream($rMessageStream, $iMessageStreamSize, $sFolderToSave, $aAppendFlags, $iUid);
+		$iUid = $this->oImapClient->MessageAppendStream($sFolderToSave, $rMessageStream, $iMessageStreamSize, $aAppendFlags);
 
-		if (\is_resource($rMessageStream)) {
-			\fclose($rMessageStream);
-		}
+		\fclose($rMessageStream);
 
-		return $this;
+		return $iUid;
 	}
 
 	/**
@@ -347,45 +330,38 @@ class MailClient
 	 */
 	public function FolderInformation(string $sFolderName, int $iPrevUidNext = 0, SequenceSet $oRange = null) : array
 	{
-		$aFlags = array();
-		if ($oRange && \count($oRange)) {
-//			$oInfo = $this->oImapClient->FolderExamine($sFolderName);
-			$oInfo = $this->oImapClient->FolderStatusAndSelect($sFolderName);
-			$aFetchResponse = $this->oImapClient->Fetch(array(
-				FetchType::UID,
-				FetchType::FLAGS
-			), (string) $oRange, $oRange->UID);
-			foreach ($aFetchResponse as $oFetchResponse) {
-				$iUid = (int) $oFetchResponse->GetFetchValue(FetchType::UID);
-				$aLowerFlags = \array_map('mb_strtolower', \array_map('\\MailSo\\Base\\Utils::Utf7ModifiedToUtf8', $oFetchResponse->GetFetchValue(FetchType::FLAGS)));
-				$aFlags[] = array(
-					'uid' => $iUid,
-					'flags' => $aLowerFlags
-				);
+		if ($oRange) {
+//			$aInfo = $this->oImapClient->FolderExamine($sFolderName)->jsonSerialize();
+			$aInfo = $this->oImapClient->FolderStatusAndSelect($sFolderName)->jsonSerialize();
+			$aInfo['messagesFlags'] = array();
+			if (\count($oRange)) {
+				$aFetchResponse = $this->oImapClient->Fetch(array(
+					FetchType::UID,
+					FetchType::FLAGS
+				), (string) $oRange, $oRange->UID);
+				foreach ($aFetchResponse as $oFetchResponse) {
+					$iUid = (int) $oFetchResponse->GetFetchValue(FetchType::UID);
+					$aLowerFlags = \array_map('mb_strtolower', \array_map('\\MailSo\\Base\\Utils::Utf7ModifiedToUtf8', $oFetchResponse->GetFetchValue(FetchType::FLAGS)));
+					$aInfo['messagesFlags'][] = array(
+						'uid' => $iUid,
+						'flags' => $aLowerFlags
+					);
+				}
 			}
 		} else {
-			$oInfo = $this->oImapClient->FolderStatus($sFolderName);
+			$aInfo = $this->oImapClient->FolderStatus($sFolderName)->jsonSerialize();
 		}
 
-		return array(
-			'folder' => $sFolderName,
-			'totalEmails' => $oInfo->MESSAGES,
-			'unreadEmails' => $oInfo->UNSEEN,
-			'uidNext' => $oInfo->UIDNEXT,
-			'uidValidity' => $oInfo->UIDVALIDITY,
-			'highestModSeq' => $oInfo->HIGHESTMODSEQ,
-			'appendLimit' => $oInfo->APPENDLIMIT ?: $this->oImapClient->AppendLimit(),
-			'mailboxId' => $oInfo->MAILBOXID ?: '',
-//			'flags' => $oInfo->Flags,
-//			'permanentFlags' => $oInfo->PermanentFlags,
-			'hash' => $oInfo->getHash($this->oImapClient->Hash()),
-			'messagesFlags' => $aFlags,
-			'newMessages' => $this->getFolderNextMessageInformation(
+		if ($iPrevUidNext) {
+			$aInfo['newMessages'] = $this->getFolderNextMessageInformation(
 				$sFolderName,
 				$iPrevUidNext,
-				\intval($oInfo->UIDNEXT)
-			)
-		);
+				\intval($aInfo['uidNext'])
+			);
+		}
+
+//		$aInfo['appendLimit'] = $aInfo['appendLimit'] ?: $this->oImapClient->AppendLimit();
+		return $aInfo;
 	}
 
 	/**
@@ -396,7 +372,8 @@ class MailClient
 	 */
 	public function FolderHash(string $sFolderName) : string
 	{
-		return $this->oImapClient->FolderStatus($sFolderName)->getHash($this->oImapClient->Hash());
+		return $this->oImapClient->FolderStatus($sFolderName)->etag;
+//		return $this->oImapClient->FolderStatusAndSelect($sFolderName)->etag;
 	}
 
 	/**
@@ -420,8 +397,8 @@ class MailClient
 		$sSerializedHashKey = null;
 		if ($oCacher && $oCacher->IsInited()) {
 			$sSerializedHashKey =
-				"ThreadsMapSorted/{$sSearch}/{$sFolderName}/{$oMessageCollection->FolderHash}";
-//				"ThreadsMapSorted/{$sSearch}/{$iThreadLimit}/{$sFolderName}/{$oMessageCollection->FolderHash}";
+				"ThreadsMapSorted/{$sSearch}/{$sFolderName}/{$oMessageCollection->FolderInfo->etag}";
+//				"ThreadsMapSorted/{$sSearch}/{$iThreadLimit}/{$sFolderName}/{$oMessageCollection->FolderInfo->etag}";
 
 			if ($this->oLogger) {
 				$this->oLogger->Write($sSerializedHashKey);
@@ -602,6 +579,8 @@ class MailClient
 			}
 		}
 
+		$this->oImapClient->FolderExamine($sFolderName);
+
 		$aResultUids = [];
 		if ($bUseSort) {
 			$aSortTypes = [];
@@ -668,8 +647,6 @@ class MailClient
 			throw new \InvalidArgumentException('THREAD not supported');
 		}
 
-		$oMessageCollection->FolderHash = $oInfo->getHash($this->oImapClient->Hash());
-
 		if (!$oParams->iThreadUid) {
 			$oMessageCollection->NewMessages = $this->getFolderNextMessageInformation(
 				$oParams->sFolderName, $oParams->iPrevUidNext, $oInfo->UIDNEXT
@@ -692,7 +669,7 @@ class MailClient
 				}
 				if (\strlen($sSearch)) {
 					// Don't use SORT for speed
-					$aUids = $this->GetUids($oParams, $sSearch, $oMessageCollection->FolderHash/*, $bUseSort*/);
+					$aUids = $this->GetUids($oParams, $sSearch, $oInfo->etag/*, $bUseSort*/);
 				} else {
 					$bUseSort = $this->oImapClient->hasCapability('SORT');
 					if (2 > $oInfo->MESSAGES) {
@@ -702,7 +679,7 @@ class MailClient
 						$end = \min($oInfo->MESSAGES, \max(1, $oInfo->MESSAGES - $oParams->iOffset + $oParams->iLimit));
 						$start = \max(1, $end - ($oParams->iLimit * 3) + 1);
 						$oParams->oSequenceSet = new SequenceSet(\range($end, $start), false);
-						$aRequestIndexes = $this->GetUids($oParams, '', $oMessageCollection->FolderHash, $bUseSort);
+						$aRequestIndexes = $this->GetUids($oParams, '', $oInfo->etag, $bUseSort);
 						// Attempt to get the correct $oParams->iLimit slice
 						$aRequestIndexes = \array_slice($aRequestIndexes, $oParams->iOffset ? $oParams->iLimit : 0, $oParams->iLimit);
 					} else {
@@ -716,7 +693,7 @@ class MailClient
 			} else {
 				$aUids = ($bUseThreads && $oParams->iThreadUid)
 					? [$oParams->iThreadUid]
-					: $this->GetUids($oParams, '', $oMessageCollection->FolderHash, $bUseSort);
+					: $this->GetUids($oParams, '', $oInfo->etag, $bUseSort);
 
 				if ($bUseThreads) {
 					$aAllThreads = $this->MessageListThreadsMap($oMessageCollection, $oParams->oCacher);
@@ -745,7 +722,7 @@ class MailClient
 				}
 
 				if ($aUids && \strlen($sSearch)) {
-					$aSearchedUids = $this->GetUids($oParams, $sSearch, $oMessageCollection->FolderHash/*, $bUseSort*/);
+					$aSearchedUids = $this->GetUids($oParams, $sSearch, $oInfo->etag/*, $bUseSort*/);
 					if ($bUseThreads && !$oParams->iThreadUid) {
 						$matchingThreadUids = [];
 						foreach ($aAllThreads as $aMap) {
@@ -791,45 +768,32 @@ class MailClient
 
 	public function Folders(string $sParent, string $sListPattern, bool $bUseListSubscribeStatus) : ?FolderCollection
 	{
-		$aImapSubscribedFoldersHelper = null;
-		if ($this->oImapClient->hasCapability('LIST-EXTENDED')) {
-			$bUseListSubscribeStatus = false;
-		} else if ($bUseListSubscribeStatus) {
+//		$this->oImapClient->Settings->disable_list_status
+		$oFolderCollection = $this->oImapClient->FolderStatusList($sParent, $sListPattern);
+		if (!$oFolderCollection->count()) {
+			return null;
+		}
+
+		if ($bUseListSubscribeStatus && !$this->oImapClient->hasCapability('LIST-EXTENDED')) {
 //			$this->oLogger && $this->oLogger->Write('RFC5258 not supported, using LSUB');
 //			\SnappyMail\Log::warning('IMAP', 'RFC5258 not supported, using LSUB');
 			try
 			{
-				$aSubscribedFolders = $this->oImapClient->FolderSubscribeList($sParent, $sListPattern);
-				$aImapSubscribedFoldersHelper = array();
-				foreach ($aSubscribedFolders as /* @var $oImapFolder \MailSo\Imap\Folder */ $oImapFolder) {
-					$aImapSubscribedFoldersHelper[] = $oImapFolder->FullName();
+				$oSubscribedFolders = $this->oImapClient->FolderSubscribeList($sParent, $sListPattern);
+				foreach ($oSubscribedFolders as /* @var $oImapFolder \MailSo\Imap\Folder */ $oImapFolder) {
+					isset($oFolderCollection[$oImapFolder->FullName])
+					&& $oFolderCollection[$oImapFolder->FullName]->setSubscribed();
 				}
 			}
 			catch (\Throwable $oException)
 			{
 				\SnappyMail\Log::error('IMAP', 'FolderSubscribeList: ' . $oException->getMessage());
-			}
-		}
-
-//		$this->oImapClient->Settings->disable_list_status
-		$aFolders = $this->oImapClient->FolderStatusList($sParent, $sListPattern);
-		if (!$aFolders) {
-			return null;
-		}
-
-		if ($bUseListSubscribeStatus) {
-			foreach ($aFolders as $sFullName => /* @var $oImapFolder \MailSo\Imap\Folder */ $oImapFolder) {
-				if (null === $aImapSubscribedFoldersHelper || \in_array($sFullName, $aImapSubscribedFoldersHelper)) {
+				foreach ($oFolderCollection as /* @var $oImapFolder \MailSo\Imap\Folder */ $oImapFolder) {
 					$oImapFolder->setSubscribed();
 				}
 			}
 		}
 
-		$oFolderCollection = new FolderCollection;
-//		$iOptimizationLimit = $this->oImapClient->Settings->folder_list_limit;
-//		$oFolderCollection->Optimized = 10 < $iOptimizationLimit && \count($aFolders) > $iOptimizationLimit;
-		$oFolderCollection->exchangeArray(\array_values($aFolders));
-
 		return $oFolderCollection;
 	}
 
@@ -927,23 +891,22 @@ class MailClient
 			throw new \InvalidArgumentException;
 		}
 
-		$aSubscribeFolders = array();
+		$oSubscribedFolders = array();
 		if ($bSubscribe) {
-			$aSubscribeFolders = $this->oImapClient->FolderSubscribeList($sPrevFolderFullName, '*');
-			foreach ($aSubscribeFolders as /* @var $oFolder \MailSo\Imap\Folder */ $oFolder) {
-				$this->oImapClient->FolderUnsubscribe($oFolder->FullName());
+			$oSubscribedFolders = $this->oImapClient->FolderSubscribeList($sPrevFolderFullName, '*');
+			foreach ($oSubscribedFolders as /* @var $oFolder \MailSo\Imap\Folder */ $oFolder) {
+				$this->oImapClient->FolderUnsubscribe($oFolder->FullName);
 			}
 		}
 
 		$this->oImapClient->FolderRename($sPrevFolderFullName, $sNewFolderFullName);
 
-		foreach ($aSubscribeFolders as /* @var $oFolder \MailSo\Imap\Folder */ $oFolder) {
-			$sFolderFullNameForResubscribe = $oFolder->FullName();
+		foreach ($oSubscribedFolders as /* @var $oFolder \MailSo\Imap\Folder */ $oFolder) {
+			$sFolderFullNameForResubscribe = $oFolder->FullName;
 			if (\str_starts_with($sFolderFullNameForResubscribe, $sPrevFolderFullName)) {
-				$sNewFolderFullNameForResubscribe = $sNewFolderFullName.
-					\substr($sFolderFullNameForResubscribe, \strlen($sPrevFolderFullName));
-
-				$this->oImapClient->FolderSubscribe($sNewFolderFullNameForResubscribe);
+				$this->oImapClient->FolderSubscribe(
+					$sNewFolderFullName . \substr($sFolderFullNameForResubscribe, \strlen($sPrevFolderFullName))
+				);
 			}
 		}
 
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
index 1bb620a4d..252438df1 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
@@ -48,7 +48,7 @@ class Message implements \JsonSerializable
 		$iSize = 0,
 		$SpamScore = 0,
 		$iInternalTimeStampInUTC = 0,
-		$HeaderTimeStampInUTC = 0,
+		$iHeaderTimeStampInUTC = 0,
 		$iPriority = \MailSo\Mime\Enumerations\MessagePriority::NORMAL;
 
 	private bool
@@ -107,26 +107,11 @@ class Message implements \JsonSerializable
 		return $this->Uid;
 	}
 
-	public function HeaderTimeStampInUTC() : int
-	{
-		return $this->HeaderTimeStampInUTC;
-	}
-
 	public function Attachments() : ?AttachmentCollection
 	{
 		return $this->Attachments;
 	}
 
-	public function Plain() : string
-	{
-		return $this->sPlain;
-	}
-
-	public function Html() : string
-	{
-		return $this->sHtml;
-	}
-
 	private function setSpamScore($value) : void
 	{
 		$this->SpamScore = \intval(\max(0, \min(100, $value)));
@@ -200,7 +185,7 @@ class Message implements \JsonSerializable
 			$oMessage->References = Utils::StripSpaces(
 				$oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::REFERENCES));
 
-			$oMessage->HeaderTimeStampInUTC = \MailSo\Base\DateTimeHelper::ParseRFC2822DateString(
+			$oMessage->iHeaderTimeStampInUTC = \MailSo\Base\DateTimeHelper::ParseRFC2822DateString(
 				$oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::DATE)
 			);
 
@@ -465,6 +450,29 @@ class Message implements \JsonSerializable
 		return $oMessage;
 	}
 
+	public function ETag(string $sClientHash) : string
+	{
+		return \md5('MessageHash/' . \implode('/', [
+			$this->sFolder,
+			$this->Uid,
+			\implode(',', $this->getFlags()),
+//			\implode(',', $this->aThreads),
+			$sClientHash
+		]));
+	}
+
+	// https://datatracker.ietf.org/doc/html/rfc5788#section-3.4.1
+	// Thunderbird $label1 is same as $Important?
+	// Thunderbird $label4 is same as $todo?
+	protected function getFlags() : array
+	{
+		return \array_unique(\str_replace(
+			['$readreceipt', '$replied',  /* 'junk',  'nonjunk',  '$queued',        '$sent',      'sent'*/],
+			['$mdnsent',     '\\answered',/* '$junk', '$notjunk', '$submitpending', '$submitted', '$submitted'*/],
+			$this->aFlagsLowerCase
+		));
+	}
+
 	#[\ReturnTypeWillChange]
 	public function jsonSerialize()
 	{
@@ -476,15 +484,6 @@ class Message implements \JsonSerializable
 			$this->aFlagsLowerCase
 		), true);
 */
-		// https://datatracker.ietf.org/doc/html/rfc5788#section-3.4.1
-		// Thunderbird $label1 is same as $Important?
-		// Thunderbird $label4 is same as $todo?
-		$aFlags = \array_unique(\str_replace(
-			['$readreceipt', '$replied',  /* 'junk',  'nonjunk',  '$queued',        '$sent',      'sent'*/],
-			['$mdnsent',     '\\answered',/* '$junk', '$notjunk', '$submitpending', '$submitted', '$submitted'*/],
-			$this->aFlagsLowerCase
-		));
-
 		$aAutocrypt = [];
 		if ($this->sAutocrypt) {
 			foreach (\explode(';', $this->sAutocrypt) as $entry) {
@@ -493,10 +492,26 @@ class Message implements \JsonSerializable
 			}
 		}
 
-		return array(
+		$aFlags = $this->getFlags();
+		$sReadReceipt = $this->ReadReceipt;
+		if (\strlen($sReadReceipt) && !\in_array('$forwarded', $aFlags)) {
+			try
+			{
+				if (!\MailSo\Mime\Email::Parse($sReadReceipt)) {
+					$sReadReceipt = '';
+				}
+			}
+			catch (\Throwable $oException)
+			{
+				$sReadReceipt = '';
+			}
+		}
+
+		$result = array(
 			'@Object' => 'Object/Message',
 			'folder' => $this->sFolder,
 			'uid' => $this->Uid,
+			'hash' => \md5($this->sFolder . $this->Uid),
 			'subject' => \trim(Utils::Utf8Clear($this->sSubject)),
 			'encrypted' => 'multipart/encrypted' == $this->sContentType || $this->pgpEncrypted,
 			'messageId' => $this->sMessageId,
@@ -505,7 +520,8 @@ class Message implements \JsonSerializable
 			'isSpam' => $this->bIsSpam,
 			'hasVirus' => $this->bHasVirus,
 //			'virusScanned' => $this->sVirusScanned,
-			'dateTimeStampInUTC' => $this->iInternalTimeStampInUTC,
+			'dateTimestamp' => $this->iHeaderTimeStampInUTC ?: $this->iInternalTimeStampInUTC,
+			'internalTimestamp' => $this->iInternalTimeStampInUTC,
 
 			// \MailSo\Mime\EmailCollection
 			'from' => $this->oFrom,
@@ -517,9 +533,7 @@ class Message implements \JsonSerializable
 			'deliveredTo' => $this->oDeliveredTo,
 
 			'priority' => $this->iPriority,
-			'threads' => $this->aThreads,
-			'unsubsribeLinks' => $this->UnsubsribeLinks,
-			'readReceipt' => '',
+			'readReceipt' => $sReadReceipt,
 			'autocrypt' => $aAutocrypt ?: null,
 
 			'attachments' => $this->Attachments,
@@ -540,5 +554,32 @@ class Message implements \JsonSerializable
 //			'keywords' => $keywords,
 			'size' => $this->iSize
 		);
+
+		if ($this->DraftInfo) {
+			$result['draftInfo'] = $this->DraftInfo;
+		}
+		if ($this->UnsubsribeLinks) {
+			$result['unsubsribeLinks'] = $this->UnsubsribeLinks;
+		}
+		if ($this->References) {
+			$result['references'] = $this->References;
+		}
+		if ($this->sHtml || $this->sPlain) {
+			$result['html'] = $this->sHtml;
+			$result['plain'] = $this->sPlain;
+		}
+//		$this->GetCapa(Capa::OPEN_PGP) || $this->GetCapa(Capa::GNUPG)
+		if ($this->pgpSigned) {
+			$result['pgpSigned'] = $this->pgpSigned;
+		}
+		if ($this->pgpEncrypted) {
+			$result['pgpEncrypted'] = $this->pgpEncrypted;
+		}
+
+		if ($this->aThreads) {
+			$result['threads'] = $this->aThreads;
+		}
+
+		return $result;
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php
index a461fea33..50587840d 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php
@@ -17,8 +17,6 @@ namespace MailSo\Mail;
  */
 class MessageCollection extends \MailSo\Base\Collection
 {
-	public string $FolderHash = '';
-
 	/**
 	 * Amount of UIDs in this list (could be less then total messages when using threads)
 	 */
@@ -62,16 +60,14 @@ class MessageCollection extends \MailSo\Base\Collection
 		return array_merge(parent::jsonSerialize(), array(
 			'totalEmails' => $this->totalEmails,
 			'totalThreads' => $this->totalThreads,
-			'folder' => $this->FolderName,
-			'folderHash' => $this->FolderHash,
-			'folderInfo' => $this->FolderInfo,
 			'threadUid' => $this->ThreadUid,
 			'newMessages' => $this->NewMessages,
 //			'filtered' => $this->Filtered,
 			'offset' => $this->Offset,
 			'limit' => $this->Limit,
 			'search' => $this->Search,
-			'limited' => $this->Limited
+			'limited' => $this->Limited,
+			'folder' => $this->FolderInfo
 		));
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/EmailCollection.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/EmailCollection.php
index adda686d7..ba60a0887 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/EmailCollection.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/EmailCollection.php
@@ -164,4 +164,11 @@ class EmailCollection extends \MailSo\Base\Collection
 			catch (\InvalidArgumentException $oException) {}
 		}
 	}
+
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
+	{
+		return \array_slice($this->getArrayCopy(), 0, 100);
+	}
+
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/NetClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/NetClient.php
index 53afe8c8e..4595ffaf0 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Net/NetClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Net/NetClient.php
@@ -55,11 +55,6 @@ abstract class NetClient
 		return $this->sConnectedHost;
 	}
 
-	public function GetConnectedPort() : int
-	{
-		return $this->Settings->port;
-	}
-
 	public function SetTimeOuts(int $iConnectTimeOut = 10) : void
 	{
 		$this->iConnectTimeOut = \max(5, $iConnectTimeOut);
@@ -93,6 +88,7 @@ abstract class NetClient
 
 		if ($this->IsConnected()) {
 			$this->writeLogException(new Exceptions\SocketAlreadyConnectedException, \LOG_ERR, false);
+//			$this->Disconnect();
 			return;
 		}
 
@@ -202,6 +198,7 @@ abstract class NetClient
 		}
 	}
 
+//	abstract public function Login(ConnectSettings $oSettings) : self;
 	abstract public function Logout() : void;
 
 	public function IsConnected(bool $bThrowExceptionOnFalse = false) : bool
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
index 2e2efd590..18bee7c6e 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
@@ -78,6 +78,10 @@ class SieveClient extends \MailSo\Net\NetClient
 	 */
 	public function Login(Settings $oSettings) : self
 	{
+		if ($this->bIsLoggined) {
+			return $this;
+		}
+
 		$sLogin = $oSettings->Login;
 		$sPassword = $oSettings->Password;
 		$sLoginAuthKey = '';
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
index 50c30009c..fc7dd3c81 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
@@ -19,6 +19,8 @@ use MailSo\Net\Enumerations\ConnectionSecurityType;
  */
 class SmtpClient extends \MailSo\Net\NetClient
 {
+	private bool $bIsLoggined = false;
+
 	private string $sEhlo = '';
 
 	private bool $bRcpt = false;
@@ -72,14 +74,14 @@ class SmtpClient extends \MailSo\Net\NetClient
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Smtp\Exceptions\*
 	 */
-	public function Connect(\MailSo\Net\ConnectSettings $oSettings, string $sEhloHost = '[127.0.0.1]') : void
+	public function Connect(\MailSo\Net\ConnectSettings $oSettings) : void
 	{
 		parent::Connect($oSettings);
 
 		$this->validateResponse(220);
 
-		$this->ehloOrHelo($sEhloHost);
-		$this->sEhlo = $sEhloHost;
+		$this->ehloOrHelo($oSettings->Ehlo);
+		$this->sEhlo = $oSettings->Ehlo;
 
 		if (ConnectionSecurityType::STARTTLS === $this->Settings->type
 		 || (ConnectionSecurityType::AUTO_DETECT === $this->Settings->type && $this->hasCapability('STARTTLS'))) {
@@ -103,11 +105,15 @@ class SmtpClient extends \MailSo\Net\NetClient
 	/**
 	 * @throws \InvalidArgumentException
 	 * @throws \MailSo\RuntimeException
-	 * @throws \MailSo\Net\*
+	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Smtp\Exceptions\*
 	 */
 	public function Login(Settings $oSettings) : self
 	{
+		if ($this->bIsLoggined) {
+			return $this;
+		}
+
 		$sLogin = \MailSo\Base\Utils::IdnToAscii(\MailSo\Base\Utils::Trim($oSettings->Login));
 		$sPassword = $oSettings->Password;
 
@@ -183,6 +189,8 @@ class SmtpClient extends \MailSo\Net\NetClient
 			);
 		}
 
+		$this->bIsLoggined = true;
+
 		return $this;
 	}
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
index 070016feb..fa02acefd 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -2,8 +2,6 @@
 
 namespace RainLoop;
 
-use RainLoop\Enumerations\UploadError;
-
 class Actions
 {
 	use Actions\Admin;
@@ -129,6 +127,8 @@ class Actions
 			$sLogFileName = $this->oConfig->Get('logs', 'filename', '');
 			if ('syslog' === $sLogFileName) {
 				$oDriver = new \MailSo\Log\Drivers\Syslog();
+			} else if ('stderr' === $sLogFileName) {
+				$oDriver = new \MailSo\Log\Drivers\StderrStream();
 			} else {
 				$sLogFileFullPath = \trim($this->oConfig->Get('logs', 'path', '')) ?: \APP_PRIVATE_DATA . 'logs';
 				\is_dir($sLogFileFullPath) || \mkdir($sLogFileFullPath, 0700, true);
@@ -245,8 +245,8 @@ class Actions
 	public function BootEnd(): void
 	{
 		try {
-			if ($this->MailClient()->IsLoggined()) {
-				$this->MailClient()->Disconnect();
+			if ($this->ImapClient()->IsLoggined()) {
+				$this->ImapClient()->Disconnect();
 			}
 		} catch (\Throwable $oException) {
 			unset($oException);
@@ -610,8 +610,8 @@ class Actions
 
 		$aResult = array(
 			'Auth' => false,
-			'Title' => $oConfig->Get('webmail', 'title', 'SnappyMail Webmail'),
-			'LoadingDescription' => $oConfig->Get('webmail', 'loading_description', 'SnappyMail'),
+			'title' => $oConfig->Get('webmail', 'title', 'SnappyMail Webmail'),
+			'loadingDescription' => $oConfig->Get('webmail', 'loading_description', 'SnappyMail'),
 			'Plugins' => array(),
 			'System' => \array_merge(
 				array(
@@ -626,7 +626,7 @@ class Actions
 					'adminAllowed' => (bool)$oConfig->Get('security', 'allow_admin_panel', true)
 				) : array()
 			),
-			'AllowLanguagesOnLogin' => (bool) $oConfig->Get('login', 'allow_languages_on_login', true)
+			'allowLanguagesOnLogin' => (bool) $oConfig->Get('login', 'allow_languages_on_login', true)
 		);
 
 		$sLanguage = $oConfig->Get('webmail', 'language', 'en');
@@ -635,32 +635,32 @@ class Actions
 		if ($bAdmin) {
 			$aResult['Auth'] = $this->IsAdminLoggined(false);
 			if ($aResult['Auth']) {
-				$aResult['AdminLogin'] = (string)$oConfig->Get('security', 'admin_login', '');
-				$aResult['AdminTOTP'] = (string)$oConfig->Get('security', 'admin_totp', '');
-				$aResult['EnabledPlugins'] = (bool)$oConfig->Get('plugins', 'enable', false);
+				$aResult['adminLogin'] = (string)$oConfig->Get('security', 'admin_login', '');
+				$aResult['adminTOTP'] = (string)$oConfig->Get('security', 'admin_totp', '');
+				$aResult['pluginsEnable'] = (bool)$oConfig->Get('plugins', 'enable', false);
 
-				$aResult['LoginDefaultDomain'] = $oConfig->Get('login', 'default_domain', '');
-				$aResult['DetermineUserLanguage'] = (bool)$oConfig->Get('login', 'determine_user_language', true);
-				$aResult['DetermineUserDomain'] = (bool)$oConfig->Get('login', 'determine_user_domain', false);
+				$aResult['loginDefaultDomain'] = $oConfig->Get('login', 'default_domain', '');
+				$aResult['determineUserLanguage'] = (bool)$oConfig->Get('login', 'determine_user_language', true);
+				$aResult['determineUserDomain'] = (bool)$oConfig->Get('login', 'determine_user_domain', false);
 
 				$aResult['supportedPdoDrivers'] = \RainLoop\Common\PdoAbstract::getAvailableDrivers();
 
-				$aResult['ContactsEnable'] = (bool)$oConfig->Get('contacts', 'enable', false);
-				$aResult['ContactsSync'] = (bool)$oConfig->Get('contacts', 'allow_sync', false);
-				$aResult['ContactsPdoType'] = Providers\AddressBook\PdoAddressBook::validPdoType($this->oConfig->Get('contacts', 'type', 'sqlite'));
-				$aResult['ContactsPdoDsn'] = (string)$oConfig->Get('contacts', 'pdo_dsn', '');
-				$aResult['ContactsPdoType'] = (string)$oConfig->Get('contacts', 'type', '');
-				$aResult['ContactsPdoUser'] = (string)$oConfig->Get('contacts', 'pdo_user', '');
-				$aResult['ContactsPdoPassword'] = static::APP_DUMMY;
-				$aResult['ContactsSuggestionsLimit'] = (int)$oConfig->Get('contacts', 'suggestions_limit', 20);
+				$aResult['contactsEnable'] = (bool)$oConfig->Get('contacts', 'enable', false);
+				$aResult['contactsSync'] = (bool)$oConfig->Get('contacts', 'allow_sync', false);
+				$aResult['contactsPdoType'] = Providers\AddressBook\PdoAddressBook::validPdoType($this->oConfig->Get('contacts', 'type', 'sqlite'));
+				$aResult['contactsPdoDsn'] = (string)$oConfig->Get('contacts', 'pdo_dsn', '');
+				$aResult['contactsPdoType'] = (string)$oConfig->Get('contacts', 'type', '');
+				$aResult['contactsPdoUser'] = (string)$oConfig->Get('contacts', 'pdo_user', '');
+				$aResult['contactsPdoPassword'] = static::APP_DUMMY;
+				$aResult['contactsSuggestionsLimit'] = (int)$oConfig->Get('contacts', 'suggestions_limit', 20);
 
-				$aResult['FaviconUrl'] = $oConfig->Get('webmail', 'favicon_url', '');
+				$aResult['faviconUrl'] = $oConfig->Get('webmail', 'favicon_url', '');
 
-				$aResult['WeakPassword'] = \is_file(APP_PRIVATE_DATA.'admin_password.txt');
+				$aResult['weakPassword'] = \is_file(APP_PRIVATE_DATA.'admin_password.txt');
 
 				$aResult['System']['languagesAdmin'] = \SnappyMail\L10n::getLanguages(true);
-				$aResult['LanguageAdmin'] = $this->ValidateLanguage($oConfig->Get('webmail', 'language_admin', 'en'), '', true);
-				$aResult['UserLanguageAdmin'] = $this->ValidateLanguage($UserLanguageRaw, '', true, true);
+				$aResult['languageAdmin'] = $this->ValidateLanguage($oConfig->Get('webmail', 'language_admin', 'en'), '', true);
+				$aResult['languageUsers'] = $this->ValidateLanguage($UserLanguageRaw, '', true, true);
 			} else {
 				$passfile = APP_PRIVATE_DATA.'admin_password.txt';
 				$sPassword = $oConfig->Get('security', 'admin_password', '');
@@ -678,12 +678,11 @@ class Actions
 				$aResult = \array_merge($aResult, [
 					'Auth' => true,
 					'Email' => \MailSo\Base\Utils::IdnToUtf8($oAccount->Email()),
-					'AccountHash' => $oAccount->Hash(),
-					'AccountSignMe' => isset($_COOKIE[self::AUTH_SIGN_ME_TOKEN_KEY]),
-					'MainEmail' => \MailSo\Base\Utils::IdnToUtf8($this->getMainAccountFromToken()->Email()),
-					'MailToEmail' => '',
+					'accountHash' => $oAccount->Hash(),
+					'accountSignMe' => isset($_COOKIE[self::AUTH_SIGN_ME_TOKEN_KEY]),
+					'mainEmail' => \MailSo\Base\Utils::IdnToUtf8($this->getMainAccountFromToken()->Email()),
 
-					'ContactsIsAllowed' => $this->AddressBookProvider($oAccount)->IsActive(),
+					'contactsAllowed' => $this->AddressBookProvider($oAccount)->IsActive(),
 
 					'ViewHTML' => (bool) $oConfig->Get('defaults', 'view_html', true),
 					'ViewImages' => 'ask',
@@ -704,6 +703,7 @@ class Actions
 					'Layout' => (int) $oConfig->Get('defaults', 'view_layout', Enumerations\Layout::SIDE_PREVIEW),
 					'EditorDefaultType' => \str_replace('Forced', '', $oConfig->Get('defaults', 'view_editor_type', '')),
 					'UseCheckboxesInList' => (bool) $oConfig->Get('defaults', 'view_use_checkboxes', true),
+					'showNextMessage' => false,
 					'AutoLogout' => (int) $oConfig->Get('defaults', 'autologout', 30),
 					'UseThreads' => (bool) $oConfig->Get('defaults', 'mail_use_threads', false),
 					'AllowDraftAutosave' => (bool) $oConfig->Get('defaults', 'allow_draft_autosave', true),
@@ -714,9 +714,7 @@ class Actions
 					'ShowUnreadCount' => false,
 					'UnhideKolabFolders' => false,
 					'CheckMailInterval' => 15,
-					'UserBackgroundName' => '',
-					'UserBackgroundHash' => '',
-					'SieveAllowFileintoInbox' => (bool)$oConfig->Get('labs', 'sieve_allow_fileinto_inbox', false)
+					'sieveAllowFileintoInbox' => (bool)$oConfig->Get('labs', 'sieve_allow_fileinto_inbox', false)
 				]);
 
 				$aAttachmentsActions = array();
@@ -727,8 +725,6 @@ class Actions
 				}
 				$aResult['System'] = \array_merge(
 					$aResult['System'], array(
-						'allowHtmlEditorBitiButtons' => (bool)$oConfig->Get('labs', 'allow_html_editor_biti_buttons', false),
-						'allowCtrlEnterOnCompose' => (bool)$oConfig->Get('labs', 'allow_ctrl_enter_on_compose', false),
 						'allowAppendMessage' => (bool)$oConfig->Get('labs', 'allow_message_append', false),
 						'folderSpecLimit' => (int)$oConfig->Get('labs', 'folders_spec_limit', 50),
 						'listPermanentFiltered' => '' !== \trim($oConfig->Get('imap', 'message_list_permanent_filter', '')),
@@ -737,7 +733,7 @@ class Actions
 					)
 				);
 
-				if ($aResult['ContactsIsAllowed'] && $oConfig->Get('contacts', 'allow_sync', false)) {
+				if ($aResult['contactsAllowed'] && $oConfig->Get('contacts', 'allow_sync', false)) {
 					$aData = $this->getContactsSyncData($oAccount) ?: [
 						'Mode' => 0,
 						'Url' => '',
@@ -745,6 +741,7 @@ class Actions
 					];
 					$aData['Password'] = empty($aData['Password']) ? '' : static::APP_DUMMY;
 					$aData['Interval'] = \max(20, \min(320, (int) $oConfig->Get('contacts', 'sync_interval', 20)));
+					unset($aData['PasswordHMAC']);
 					$aResult['ContactsSync'] = $aData;
 				}
 
@@ -754,15 +751,28 @@ class Actions
 
 					$mMailToData = Utils::DecodeKeyValuesQ($sToken);
 					if (!empty($mMailToData['MailTo']) && 'MailTo' === $mMailToData['MailTo'] && !empty($mMailToData['To'])) {
-						$aResult['MailToEmail'] = \MailSo\Base\Utils::IdnToUtf8($mMailToData['To']);
+						$aResult['mailToEmail'] = \MailSo\Base\Utils::IdnToUtf8($mMailToData['To']);
 					}
 				}
 
+				if ($oConfig->Get('login', 'determine_user_language', true)) {
+					$sLanguage = $this->ValidateLanguage($UserLanguageRaw, $sLanguage, false);
+				}
+
+				// MainAccount or AdditionalAccount
 				$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
 				if ($oSettingsLocal instanceof Settings) {
+/*
+					foreach ($oSettingsLocal->toArray() as $key => $value) {
+						$aResult[\lcfirst($key)] = $value;
+					}
+					$aResult['junkFolder'] = $aResult['spamFolder'];
+					unset($aResult['checkableFolder']);
+					unset($aResult['theme']);
+*/
 					$aResult['SentFolder'] = (string)$oSettingsLocal->GetConf('SentFolder', '');
-					$aResult['DraftsFolder'] = (string)$oSettingsLocal->GetConf('DraftFolder', '');
-					$aResult['JunkFolder'] = (string)$oSettingsLocal->GetConf('SpamFolder', '');
+					$aResult['DraftsFolder'] = (string)$oSettingsLocal->GetConf('DraftsFolder', '');
+					$aResult['JunkFolder'] = (string)$oSettingsLocal->GetConf('JunkFolder', '');
 					$aResult['TrashFolder'] = (string)$oSettingsLocal->GetConf('TrashFolder', '');
 					$aResult['ArchiveFolder'] = (string)$oSettingsLocal->GetConf('ArchiveFolder', '');
 					$aResult['HideUnsubscribed'] = (bool)$oSettingsLocal->GetConf('HideUnsubscribed', $aResult['HideUnsubscribed']);
@@ -774,14 +784,16 @@ class Actions
 					$aResult['CheckMailInterval'] = (int)$oSettingsLocal->GetConf('CheckMailInterval', $aResult['CheckMailInterval']);
 				}
 
-				if ($oConfig->Get('login', 'determine_user_language', true)) {
-					$sLanguage = $this->ValidateLanguage($UserLanguageRaw, $sLanguage, false);
-				}
-
+				// MainAccount
 				$oSettings = $this->SettingsProvider()->Load($oAccount);
 				if ($oSettings instanceof Settings) {
+/*
+					foreach ($oSettings->toArray() as $key => $value) {
+						$aResult[\lcfirst($key)] = $value;
+					}
+*/
 					if ($oConfig->Get('webmail', 'allow_languages_on_settings', true)) {
-						$sLanguage = (string) $oSettings->GetConf('Language', $sLanguage);
+						$sLanguage = (string) $oSettings->GetConf('language', $sLanguage);
 					}
 					$aResult['hourCycle'] = $oSettings->GetConf('hourCycle', '');
 
@@ -796,6 +808,7 @@ class Actions
 					$aResult['pgpSign'] = (bool) $oSettings->GetConf('pgpSign', false);
 					$aResult['pgpEncrypt'] = (bool) $oSettings->GetConf('pgpEncrypt', false);
 					$aResult['allowSpellcheck'] = (bool) $oSettings->GetConf('allowSpellcheck', false);
+//					$aResult['allowCtrlEnterOnCompose'] = (bool) $oSettings->GetConf('allowCtrlEnterOnCompose', true);
 
 					$aResult['ViewHTML'] = (bool)$oSettings->GetConf('ViewHTML', $aResult['ViewHTML']);
 					$show_images = (bool) $oSettings->GetConf('ShowImages', false);
@@ -816,6 +829,7 @@ class Actions
 					$aResult['NotificationSound'] = (string)$oSettings->GetConf('NotificationSound', $aResult['NotificationSound']);
 					$aResult['DesktopNotifications'] = (bool)$oSettings->GetConf('DesktopNotifications', $aResult['DesktopNotifications']);
 					$aResult['UseCheckboxesInList'] = (bool)$oSettings->GetConf('UseCheckboxesInList', $aResult['UseCheckboxesInList']);
+					$aResult['showNextMessage'] = (bool)$oSettings->GetConf('showNextMessage', $aResult['showNextMessage']);
 					$aResult['AllowDraftAutosave'] = (bool)$oSettings->GetConf('AllowDraftAutosave', $aResult['AllowDraftAutosave']);
 					$aResult['AutoLogout'] = (int)$oSettings->GetConf('AutoLogout', $aResult['AutoLogout']);
 					$aResult['Layout'] = (int)$oSettings->GetConf('Layout', $aResult['Layout']);
@@ -828,14 +842,14 @@ class Actions
 					$aResult['fontMono'] = $oSettings->GetConf('fontMono', '');
 
 					if ($this->GetCapa(Enumerations\Capa::USER_BACKGROUND)) {
-						$aResult['UserBackgroundName'] = (string)$oSettings->GetConf('UserBackgroundName', $aResult['UserBackgroundName']);
-						$aResult['UserBackgroundHash'] = (string)$oSettings->GetConf('UserBackgroundHash', $aResult['UserBackgroundHash']);
+						$aResult['userBackgroundName'] = (string)$oSettings->GetConf('UserBackgroundName', '');
+						$aResult['userBackgroundHash'] = (string)$oSettings->GetConf('UserBackgroundHash', '');
 					}
 				}
 
-				$aResult['NewMailSounds'] = [];
+				$aResult['newMailSounds'] = [];
 				foreach (\glob(APP_VERSION_ROOT_PATH.'static/sounds/*.mp3') as $file) {
-					$aResult['NewMailSounds'][] = \basename($file, '.mp3');
+					$aResult['newMailSounds'][] = \basename($file, '.mp3');
 				}
 			}
 			else {
@@ -851,13 +865,13 @@ class Actions
 					$aResult['DevPassword'] = '';
 				}
 
-				$aResult['SignMe'] = (string) $oConfig->Get('login', 'sign_me_auto', Enumerations\SignMeType::DEFAULT_OFF);
+				$aResult['signMe'] = (string) $oConfig->Get('login', 'sign_me_auto', Enumerations\SignMeType::DEFAULT_OFF);
 			}
 		}
 
 		if ($aResult['Auth']) {
-			$aResult['UseLocalProxyForExternalImages'] = (bool)$oConfig->Get('labs', 'use_local_proxy_for_external_images', false);
-			$aResult['AllowLanguagesOnSettings'] = (bool) $oConfig->Get('webmail', 'allow_languages_on_settings', true);
+			$aResult['useLocalProxyForExternalImages'] = (bool)$oConfig->Get('labs', 'use_local_proxy_for_external_images', false);
+			$aResult['allowLanguagesOnSettings'] = (bool) $oConfig->Get('webmail', 'allow_languages_on_settings', true);
 			$aResult['Capa'] = $this->Capa($bAdmin, $oAccount);
 			$value = \ini_get('upload_max_filesize');
 			$upload_max_filesize = \intval($value);
@@ -866,8 +880,8 @@ class Actions
 				case 'M': $upload_max_filesize *= 1024;
 				case 'K': $upload_max_filesize *= 1024;
 			}
-			$aResult['AttachmentLimit'] = \min($upload_max_filesize, ((int) $oConfig->Get('webmail', 'attachment_size_limit', 10)) * 1024 * 1024);
-			$aResult['PhpUploadSizes'] = array(
+			$aResult['attachmentLimit'] = \min($upload_max_filesize, ((int) $oConfig->Get('webmail', 'attachment_size_limit', 10)) * 1024 * 1024);
+			$aResult['phpUploadSizes'] = array(
 				'upload_max_filesize' => $value,
 				'post_max_size' => \ini_get('post_max_size')
 			);
@@ -876,11 +890,11 @@ class Actions
 
 		$aResult['Theme'] = $this->GetTheme($bAdmin);
 
-		$aResult['Language'] = $this->ValidateLanguage($sLanguage, '', false);
-		$aResult['UserLanguage'] = $this->ValidateLanguage($UserLanguageRaw, '', false, true);
+		$aResult['language'] = $this->ValidateLanguage($sLanguage, '', false);
+		$aResult['userLanguage'] = $this->ValidateLanguage($UserLanguageRaw, '', false, true);
 
 		$aResult['PluginsLink'] = $this->oPlugins->HaveJs($bAdmin)
-			? 'Plugins/0/' . ($bAdmin ? 'Admin' : 'User') . '/' . $this->StaticCache() . '/'
+			? 'Plugins/0/' . ($bAdmin ? 'Admin' : 'User') . '/' . $this->etag($this->oPlugins->Hash()) . '/'
 			: '';
 
 		$bAppJsDebug = $this->oConfig->Get('debug', 'javascript', false)
@@ -942,52 +956,6 @@ class Actions
 		return \MailSo\Base\Utils::SecureFileName(\MailSo\Base\Utils::Utf8Clear($sClearedFileName));
 	}
 
-	protected function getUploadErrorMessageByCode(int $iError, int &$iClientError): string
-	{
-		$sError = '';
-		$iClientError = UploadError::NORMAL;
-		switch ($iError) {
-			case UPLOAD_ERR_OK:
-				break;
-			case UPLOAD_ERR_INI_SIZE:
-			case UPLOAD_ERR_FORM_SIZE:
-			case UploadError::CONFIG_SIZE:
-			case UploadError::EMPTY_FILES_DATA:
-				$sError = 'File is too big';
-				$iClientError = UploadError::FILE_IS_TOO_BIG;
-				break;
-			case UPLOAD_ERR_PARTIAL:
-				$sError = 'File partially uploaded';
-				$iClientError = UploadError::FILE_PARTIALLY_UPLOADED;
-				break;
-			case UPLOAD_ERR_NO_FILE:
-				$sError = 'No file uploaded';
-				$iClientError = UploadError::FILE_NO_UPLOADED;
-				break;
-			case UPLOAD_ERR_NO_TMP_DIR:
-			case UPLOAD_ERR_CANT_WRITE:
-			case UPLOAD_ERR_EXTENSION:
-				$sError = 'Missing temp folder';
-				$iClientError = UploadError::MISSING_TEMP_FOLDER;
-				break;
-			case UploadError::ON_SAVING:
-				$sError = 'Error on saving file';
-				$iClientError = UploadError::FILE_ON_SAVING_ERROR;
-				break;
-			case UploadError::FILE_TYPE:
-				$sError = 'Invalid file type';
-				$iClientError = UploadError::FILE_TYPE;
-				break;
-			case UploadError::UNKNOWN:
-			default:
-				$sError = 'Unknown error';
-				$iClientError = UploadError::UNKNOWN;
-				break;
-		}
-
-		return $sError;
-	}
-
 	public function Upload(?array $aFile, int $iError): array
 	{
 		$oAccount = $this->getAccountFromToken();
@@ -1018,8 +986,8 @@ class Actions
 		}
 
 		if (UPLOAD_ERR_OK !== $iError) {
-			$iClientError = Enumerations\UploadError::NORMAL;
-			$sError = $this->getUploadErrorMessageByCode($iError, $iClientError);
+			$iClientError = 0;
+			$sError = Enumerations\UploadError::getUserMessage($iError, $iClientError);
 
 			if (!empty($sError)) {
 				$aResponse['ErrorCode'] = $iClientError;
@@ -1037,7 +1005,12 @@ class Actions
 			$oConfig = $this->oConfig;
 			$aResult = array(
 				'AdditionalAccounts'   => (bool) $oConfig->Get('webmail', 'allow_additional_accounts', false),
-				'AttachmentThumbnails' => (bool) $oConfig->Get('interface', 'show_attachment_thumbnail', true),
+				'AttachmentThumbnails' => (bool) $oConfig->Get('interface', 'show_attachment_thumbnail', true)
+					&& ($bAdmin
+						|| \extension_loaded('gd')
+						|| \extension_loaded('gmagick')
+						|| \extension_loaded('imagick')
+					),
 				'AttachmentsActions'   => (bool) $oConfig->Get('capa', 'attachments_actions', false),
 				'Contacts'             => (bool) $oConfig->Get('contacts', 'enable', false),
 				'DangerousActions'     => (bool) $oConfig->Get('capa', 'dangerous_actions', true),
@@ -1062,7 +1035,8 @@ class Actions
 
 	public function etag(string $sKey): string
 	{
-		return \md5($sKey . $this->oConfig->Get('cache', 'index', ''));
+//		if ($sKey && $this->oConfig->Get('cache', 'enable', true) && $this->oConfig->Get('cache', 'http', true)) {
+		return \md5($sKey . $this->oConfig->Get('cache', 'index', '') . APP_VERSION);
 	}
 
 	public function cacheByKey(string $sKey): bool
@@ -1070,7 +1044,7 @@ class Actions
 		if ($sKey && $this->oConfig->Get('cache', 'enable', true) && $this->oConfig->Get('cache', 'http', true)) {
 			\MailSo\Base\Http::ServerUseCache(
 				$this->etag($sKey),
-				1382478804,
+				0, // issue with messages
 				$this->oConfig->Get('cache', 'http_expires', 3600)
 			);
 			return true;
@@ -1083,7 +1057,7 @@ class Actions
 	{
 		if ($sKey && $this->oConfig->Get('cache', 'enable', true) && $this->oConfig->Get('cache', 'http', true)) {
 			\MailSo\Base\Http::checkETag($this->etag($sKey));
-//			\MailSo\Base\Http::checkLastModified(1382478804);
+//			\MailSo\Base\Http::checkLastModified(0);
 		}
 	}
 
@@ -1094,9 +1068,9 @@ class Actions
 	{
 		$oAccount = $this->getAccountFromToken();
 
-		if (!$this->MailClient()->IsLoggined()) {
+		if (!$this->ImapClient()->IsLoggined()) {
 			try {
-				$oAccount->ImapConnectAndLogin($this->oPlugins, $this->MailClient()->ImapClient(), $this->oConfig);
+				$oAccount->ImapConnectAndLogin($this->oPlugins, $this->ImapClient(), $this->oConfig);
 			} catch (\MailSo\Net\Exceptions\ConnectionException $oException) {
 				throw new Exceptions\ClientException(Notifications::ConnectionError, $oException);
 			} catch (\Throwable $oException) {
@@ -1107,24 +1081,21 @@ class Actions
 		return $oAccount;
 	}
 
-	protected function encodeRawKey(?Model\Account $oAccount, array $aValues): string
+	public function encodeRawKey(array $aValues): string
 	{
-		return \SnappyMail\Crypt::EncryptUrlSafe($aValues, \sha1(APP_SALT . ($oAccount ? $oAccount->Hash() : '')));
+		$aValues['accountHash'] = $this->getAccountFromToken()->Hash();
+		return \MailSo\Base\Utils::UrlSafeBase64Encode(\json_encode($aValues));
 	}
 
-	protected function decodeRawKey(?Model\Account $oAccount, string $sRawKey): array
+	protected function decodeRawKey(string $sRawKey): array
 	{
 		return empty($sRawKey) ? []
-			: (\SnappyMail\Crypt::DecryptUrlSafe($sRawKey, \sha1(APP_SALT . ($oAccount ? $oAccount->Hash() : ''))) ?: []);
-	}
-
-	public function StaticCache(): string
-	{
-		static $sCache = null;
-		if (!$sCache) {
-			$sCache = \md5(APP_VERSION . $this->oPlugins->Hash());
+			: (\json_decode(\MailSo\Base\Utils::UrlSafeBase64Decode($sRawKey), true) ?: []);
+/*
+		if (empty($aValues['accountHash']) || $aValues['accountHash'] !== $oAccount->Hash()) {
+			return [];
 		}
-		return $sCache;
+*/
 	}
 
 	public function SetActionParams(array $aCurrentActionParams, string $sMethodName = ''): self
@@ -1157,10 +1128,10 @@ class Actions
 		return isset($this->aCurrentActionParams[$sKey]);
 	}
 
-	public function Location(string $sUrl): void
+	public function Location(string $sUrl, int $iStatus = 302): void
 	{
-		$this->oLogger->Write('Location: ' . $sUrl);
-		\header('Location: ' . $sUrl);
+		$this->oLogger->Write("{$iStatus} Location: {$sUrl}");
+		\MailSo\Base\Http::Location($sUrl, $iStatus);
 	}
 
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php
index 40766ffb9..0d3e164f7 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php
@@ -202,16 +202,16 @@ trait Accounts
 		if ($this->switchAccount(\trim($this->GetActionParam('Email', '')))) {
 			$oAccount = $this->getAccountFromToken();
 			$aResult['Email'] = $oAccount->Email();
-			$aResult['AccountHash'] = $oAccount->Hash();
-			$aResult['MainEmail'] = ($oAccount instanceof AdditionalAccount)
+			$aResult['accountHash'] = $oAccount->Hash();
+			$aResult['mainEmail'] = ($oAccount instanceof AdditionalAccount)
 				? $oAccount->ParentEmail() : '';
-			$aResult['ContactsIsAllowed'] = $this->AddressBookProvider($oAccount)->IsActive();
+			$aResult['contactsAllowed'] = $this->AddressBookProvider($oAccount)->IsActive();
 			$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
 			if ($oSettingsLocal instanceof \RainLoop\Settings) {
 				$oConfig = $this->Config();
 				$aResult['SentFolder'] = (string) $oSettingsLocal->GetConf('SentFolder', '');
-				$aResult['DraftsFolder'] = (string) $oSettingsLocal->GetConf('DraftFolder', '');
-				$aResult['JunkFolder'] = (string) $oSettingsLocal->GetConf('SpamFolder', '');
+				$aResult['DraftsFolder'] = (string) $oSettingsLocal->GetConf('DraftsFolder', '');
+				$aResult['JunkFolder'] = (string) $oSettingsLocal->GetConf('JunkFolder', '');
 				$aResult['TrashFolder'] = (string) $oSettingsLocal->GetConf('TrashFolder', '');
 				$aResult['ArchiveFolder'] = (string) $oSettingsLocal->GetConf('ArchiveFolder', '');
 				$aResult['HideUnsubscribed'] = (bool) $oSettingsLocal->GetConf('HideUnsubscribed', false);
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/AdminDomains.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/AdminDomains.php
index 70e5b0554..461c29651 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/AdminDomains.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/AdminDomains.php
@@ -132,7 +132,8 @@ trait AdminDomains
 					$oSmtpClient->SetLogger($this->Logger());
 
 					$oSettings = $oDomain->SmtpSettings();
-					$oSmtpClient->Connect($oSettings, \MailSo\Smtp\SmtpClient::EhloHelper());
+					$oSettings->Ehlo = \MailSo\Smtp\SmtpClient::EhloHelper();
+					$oSmtpClient->Connect($oSettings);
 
 					if (!empty($aAuth['user'])) {
 						$oSettings->Login = $aAuth['user'];
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Attachments.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Attachments.php
index 32baab49d..387a97b59 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Attachments.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Attachments.php
@@ -14,6 +14,7 @@ trait Attachments
 	{
 		$sAction = $this->GetActionParam('target', '');
 		$sFolder = $this->GetActionParam('folder', '');
+		$sFilename = \MailSo\Base\Utils::SecureFileName($this->GetActionParam('filename', ''));
 		$aHashes = $this->GetActionParam('hashes', null);
 		$oFilesProvider = $this->FilesProvider();
 		if (empty($sAction) || !$this->GetCapa(Capa::ATTACHMENTS_ACTIONS) || !$oFilesProvider || !$oFilesProvider->IsActive()) {
@@ -107,8 +108,8 @@ trait Attachments
 
 					if (!$bError) {
 						$mResult = array(
-							'fileHash' => $this->encodeRawKey($oAccount, array(
-								'fileName' => ($sFolder ? 'messages' : 'attachments') . \date('-YmdHis') . '.zip',
+							'fileHash' => $this->encodeRawKey(array(
+								'fileName' => ($sFilename ?: ($sFolder ? 'messages' : 'attachments')) . \date('-YmdHis') . '.zip',
 								'mimeType' => 'application/zip',
 								'fileHash' => $sZipHash
 							))
@@ -133,7 +134,7 @@ trait Attachments
 
 	private function getMimeFileByHash(\RainLoop\Model\Account $oAccount, string $sHash) : array
 	{
-		$aValues = $this->decodeRawKey($oAccount, $sHash);
+		$aValues = $this->decodeRawKey($sHash);
 
 		$sFolder = isset($aValues['folder']) ? (string) $aValues['folder'] : '';
 		$iUid = isset($aValues['uid']) ? (int) $aValues['uid'] : 0;
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php
index 2805556df..81eaaa058 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php
@@ -157,8 +157,8 @@ trait Contacts
 		}
 
 		if (UPLOAD_ERR_OK !== $iError) {
-			$iClientError = \RainLoop\Enumerations\UploadError::NORMAL;
-			$sError = $this->getUploadErrorMessageByCode($iError, $iClientError);
+			$iClientError = 0;
+			$sError = \RainLoop\Enumerations\UploadError::getUserMessage($iError, $iClientError);
 			if (!empty($sError)) {
 				return $this->FalseResponse($iClientError, $sError);
 			}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
index e964e52c1..c0297f941 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
@@ -14,31 +14,35 @@ trait Folders
 	 * Appends uploaded rfc822 message to mailbox
 	 * @throws \MailSo\RuntimeException
 	 */
-	public function Append(): bool
+	public function DoFolderAppend(): array
 	{
 		$oAccount = $this->initMailClientConnection();
 
 		$sFolderFullName = $this->GetActionParam('folder', '');
 
-		if ($oAccount
-		 && !empty($sFolderFullName)
-		 && !empty($_FILES['appendFile'])
-		 && \is_uploaded_file($_FILES['appendFile']['tmp_name'])
-		 && \UPLOAD_ERR_OK == $_FILES['appendFile']['error']
-		 && $this->oConfig->Get('labs', 'allow_message_append', false)
-		) {
+		if (!$this->oConfig->Get('labs', 'allow_message_append', false)) {
+			return $this->FalseResponse(999, 'Permission denied');
+		}
+
+		if (empty($_FILES['appendFile'])) {
+			return $this->FalseResponse(999, 'No file');
+		}
+
+		if (\UPLOAD_ERR_OK != $_FILES['appendFile']['error']) {
+			return $this->FalseResponse($iErrorCode, \RainLoop\Enumerations\UploadError::getMessage($iErrorCode));
+		}
+
+		if ($oAccount && !empty($sFolderFullName) && \is_uploaded_file($_FILES['appendFile']['tmp_name'])) {
 			$sSavedName = 'append-post-' . \md5($sFolderFullName . $_FILES['appendFile']['name'] . $_FILES['appendFile']['tmp_name']);
 			if ($this->FilesProvider()->MoveUploadedFile($oAccount, $sSavedName, $_FILES['appendFile']['tmp_name'])) {
 				$iMessageStreamSize = $this->FilesProvider()->FileSize($oAccount, $sSavedName);
 				$rMessageStream = $this->FilesProvider()->GetFile($oAccount, $sSavedName);
-
-				$this->MailClient()->MessageAppendStream($rMessageStream, $iMessageStreamSize, $sFolderFullName);
-
+				$this->ImapClient()->MessageAppendStream($sFolderFullName, $rMessageStream, $iMessageStreamSize);
 				$this->FilesProvider()->Clear($oAccount, $sSavedName);
+				return $this->TrueResponse();
 			}
 		}
-
-		return $this->TrueResponse();
+		return $this->FalseResponse(999);
 	}
 
 	public function DoFolders() : array
@@ -57,14 +61,14 @@ trait Folders
 			$aQuota = null;
 			if ($this->GetCapa(Capa::QUOTA)) {
 				try {
-//					$aQuota = $this->MailClient()->Quota();
-					$aQuota = $this->MailClient()->QuotaRoot();
+//					$aQuota = $this->ImapClient()->Quota();
+					$aQuota = $this->ImapClient()->QuotaRoot();
 				} catch (\Throwable $oException) {
 					// ignore
 				}
 			}
 
-			$aCapabilities = \array_values(\array_filter($this->MailClient()->Capability(), function ($item) {
+			$aCapabilities = \array_values(\array_filter($this->ImapClient()->Capability(), function ($item) {
 				return !\preg_match('/^(IMAP|AUTH|LOGIN|SASL)/', $item);
 			}));
 
@@ -73,7 +77,7 @@ trait Folders
 				array(
 					'quotaUsage' => $aQuota ? $aQuota[0] * 1024 : null,
 					'quotaLimit' => $aQuota ? $aQuota[1] * 1024 : null,
-					'namespace' => $this->MailClient()->GetPersonalNamespace(),
+					'namespace' => $this->ImapClient()->GetPersonalNamespace(),
 					'capabilities' => $aCapabilities
 				)
 			);
@@ -109,7 +113,7 @@ trait Folders
 		$sFolderFullName = $this->GetActionParam('folder');
 		$sMetadataKey = $this->GetActionParam('key');
 		if ($sFolderFullName && $sMetadataKey) {
-			$this->MailClient()->FolderSetMetadata($sFolderFullName, [
+			$this->ImapClient()->FolderSetMetadata($sFolderFullName, [
 				$sMetadataKey => $this->GetActionParam('value') ?: null
 			]);
 		}
@@ -125,7 +129,7 @@ trait Folders
 
 		try
 		{
-			$this->MailClient()->{$bSubscribe ? 'FolderSubscribe' : 'FolderUnsubscribe'}($sFolderFullName);
+			$this->ImapClient()->{$bSubscribe ? 'FolderSubscribe' : 'FolderUnsubscribe'}($sFolderFullName);
 		}
 		catch (\Throwable $oException)
 		{
@@ -147,26 +151,17 @@ trait Folders
 		$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
 
 		$aCheckableFolder = \json_decode($oSettingsLocal->GetConf('CheckableFolder', '[]'));
-
 		if (!\is_array($aCheckableFolder)) {
 			$aCheckableFolder = array();
 		}
 
 		if (!empty($this->GetActionParam('checkable', '0'))) {
 			$aCheckableFolder[] = $sFolderFullName;
-		} else {
-			$aCheckableFolderNew = array();
-			foreach ($aCheckableFolder as $sFolder) {
-				if ($sFolder !== $sFolderFullName) {
-					$aCheckableFolderNew[] = $sFolder;
-				}
-			}
-			$aCheckableFolder = $aCheckableFolderNew;
+		} else if (($key = \array_search($sFolderFullName, $aCheckableFolder)) !== false) {
+			\array_splice($aCheckableFolder, $key, 1);
 		}
 
-		$aCheckableFolder = \array_unique($aCheckableFolder);
-
-		$oSettingsLocal->SetConf('CheckableFolder', \json_encode($aCheckableFolder));
+		$oSettingsLocal->SetConf('CheckableFolder', \json_encode(\array_unique($aCheckableFolder)));
 
 		return $this->DefaultResponse($this->SettingsProvider(true)->Save($oAccount, $oSettingsLocal));
 	}
@@ -231,7 +226,7 @@ trait Folders
 
 		try
 		{
-			$this->MailClient()->FolderDelete($this->GetActionParam('folder', ''));
+			$this->ImapClient()->FolderDelete($this->GetActionParam('folder', ''));
 		}
 		catch (\MailSo\Mail\Exceptions\NonEmptyFolder $oException)
 		{
@@ -254,7 +249,7 @@ trait Folders
 
 		try
 		{
-			$this->MailClient()->FolderClear($this->GetActionParam('folder', ''));
+			$this->ImapClient()->FolderClear($this->GetActionParam('folder', ''));
 		}
 		catch (\Throwable $oException)
 		{
@@ -298,23 +293,13 @@ trait Folders
 
 			$aFolders = \array_unique($aFolders);
 			foreach ($aFolders as $sFolder) {
-				if (\strlen($sFolder) && 'INBOX' !== \strtoupper($sFolder)) {
-					try
-					{
-						$aInboxInformation = $this->MailClient()->FolderInformation($sFolder);
-						if (isset($aInboxInformation['folder'])) {
-							$aResult[] = [
-								'folder' => $aInboxInformation['folder'],
-								'hash' => $aInboxInformation['hash'],
-								'totalEmails' => $aInboxInformation['totalEmails'],
-								'unreadEmails' => $aInboxInformation['unreadEmails'],
-							];
-						}
-					}
-					catch (\Throwable $oException)
-					{
-						$this->Logger()->WriteException($oException);
-					}
+				try
+				{
+					$aResult[] = $this->MailClient()->FolderInformation($sFolder);
+				}
+				catch (\Throwable $oException)
+				{
+					$this->Logger()->WriteException($oException);
 				}
 			}
 		}
@@ -328,11 +313,11 @@ trait Folders
 
 		$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
 
-		$oSettingsLocal->SetConf('SentFolder', $this->GetActionParam('Sent', ''));
-		$oSettingsLocal->SetConf('DraftFolder', $this->GetActionParam('Drafts', ''));
-		$oSettingsLocal->SetConf('SpamFolder', $this->GetActionParam('Spam', ''));
-		$oSettingsLocal->SetConf('TrashFolder', $this->GetActionParam('Trash', ''));
-		$oSettingsLocal->SetConf('ArchiveFolder', $this->GetActionParam('Archive', ''));
+		$oSettingsLocal->SetConf('SentFolder', $this->GetActionParam('sent', ''));
+		$oSettingsLocal->SetConf('DraftsFolder', $this->GetActionParam('drafts', ''));
+		$oSettingsLocal->SetConf('JunkFolder', $this->GetActionParam('junk', ''));
+		$oSettingsLocal->SetConf('TrashFolder', $this->GetActionParam('trash', ''));
+		$oSettingsLocal->SetConf('ArchiveFolder', $this->GetActionParam('archive', ''));
 
 		return $this->DefaultResponse($this->SettingsProvider(true)->Save($oAccount, $oSettingsLocal));
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Localization.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Localization.php
index 4d8d15c91..d31974601 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Localization.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Localization.php
@@ -14,7 +14,7 @@ trait Localization
 			if ($oAccount = $this->getAccountFromToken(false)) {
 				if ($oConfig->Get('webmail', 'allow_languages_on_settings', true)
 				 && ($oSettings = $this->SettingsProvider()->Load($oAccount))) {
-					$sLanguage = $oSettings->GetConf('Language', $sLanguage);
+					$sLanguage = $oSettings->GetConf('language', $sLanguage);
 				}
 			} else if ($oConfig->Get('login', 'allow_languages_on_login', true) && $oConfig->Get('login', 'determine_user_language', true)) {
 				$sLanguage = $this->ValidateLanguage($this->detectUserLanguage($bAdmin), $sLanguage, false);
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
index 4128692f6..324565321 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
@@ -62,11 +62,12 @@ trait Messages
 		$oAccount = $this->initMailClientConnection();
 
 		if ($sHash) {
+//			$oInfo = $this->MailClient()->FolderHash($oParams->sFolderName);
 			$oInfo = $this->ImapClient()->FolderStatusAndSelect($oParams->sFolderName);
 			$aRequestHash = \explode('-', $sHash);
-			$sFolderHash = $oInfo->getHash($this->ImapClient()->Hash());
+			$sFolderHash = $oInfo->etag;
 			$sHash = $oParams->hash() . '-' . $sFolderHash;
-			if ($aRequestHash[0] == $sFolderHash) {
+			if ($aRequestHash[1] == $sFolderHash) {
 				$this->verifyCacheByKey($sHash);
 			}
 		}
@@ -121,9 +122,8 @@ trait Messages
 
 				\rewind($rMessageStream);
 
-				$iNewUid = 0;
-				$this->MailClient()->MessageAppendStream(
-					$rMessageStream, $iMessageStreamSize, $sDraftFolder, array(MessageFlag::SEEN), $iNewUid
+				$iNewUid = $this->ImapClient()->MessageAppendStream(
+					$sDraftFolder, $rMessageStream, $iMessageStreamSize, array(MessageFlag::SEEN)
 				);
 
 				if (!empty($sMessageId) && (null === $iNewUid || 0 === $iNewUid)) {
@@ -135,7 +135,7 @@ trait Messages
 				$sMessageFolder = $this->GetActionParam('messageFolder', '');
 				$iMessageUid = (int) $this->GetActionParam('messageUid', 0);
 				if (\strlen($sMessageFolder) && 0 < $iMessageUid) {
-					$this->MailClient()->MessageDelete($sMessageFolder, new SequenceSet($iMessageUid));
+					$this->ImapClient()->MessageDelete($sMessageFolder, new SequenceSet($iMessageUid));
 				}
 
 				if (null !== $iNewUid && 0 < $iNewUid) {
@@ -212,8 +212,8 @@ trait Messages
 								$this->Plugins()->RunHook('filter.send-message-stream',
 									array($oAccount, &$rMessageStream, &$iMessageStreamSize));
 
-								$this->MailClient()->MessageAppendStream(
-									$rMessageStream, $iMessageStreamSize, $sSentFolder, array(MessageFlag::SEEN)
+								$this->ImapClient()->MessageAppendStream(
+									$sSentFolder, $rMessageStream, $iMessageStreamSize, array(MessageFlag::SEEN)
 								);
 							} else {
 								$rAppendMessageStream = \MailSo\Base\ResourceRegistry::CreateMemoryResource();
@@ -224,8 +224,8 @@ trait Messages
 								$this->Plugins()->RunHook('filter.send-message-stream',
 									array($oAccount, &$rAppendMessageStream, &$iAppendMessageStreamSize));
 
-								$this->MailClient()->MessageAppendStream(
-									$rAppendMessageStream, $iAppendMessageStreamSize, $sSentFolder, array(MessageFlag::SEEN)
+								$this->ImapClient()->MessageAppendStream(
+									$sSentFolder, $rAppendMessageStream, $iAppendMessageStreamSize, array(MessageFlag::SEEN)
 								);
 
 								if (\is_resource($rAppendMessageStream)) {
@@ -250,7 +250,7 @@ trait Messages
 					if (\strlen($sDraftFolder) && 0 < $iDraftUid) {
 						try
 						{
-							$this->MailClient()->MessageDelete($sDraftFolder, new SequenceSet($iDraftUid));
+							$this->ImapClient()->MessageDelete($sDraftFolder, new SequenceSet($iDraftUid));
 						}
 						catch (\Throwable $oException)
 						{
@@ -406,15 +406,12 @@ trait Messages
 	{
 		$sRawKey = (string) $this->GetActionParam('RawKey', '');
 
-		$sFolder = '';
-		$iUid = 0;
-
 		$aValues = \json_decode(\MailSo\Base\Utils::UrlSafeBase64Decode($sRawKey), true);
 		if ($aValues && 2 <= \count($aValues)) {
 			$sFolder = (string) $aValues[0];
 			$iUid = (int) $aValues[1];
-
-			$this->verifyCacheByKey($sRawKey);
+//			$useThreads = !empty($aValues[2]);
+//			$accountHash = $aValues[3];
 		} else {
 			$sFolder = $this->GetActionParam('folder', '');
 			$iUid = (int) $this->GetActionParam('uid', 0);
@@ -432,9 +429,10 @@ trait Messages
 		}
 
 		if ($oMessage) {
+			$ETag = $oMessage->ETag($this->getAccountFromToken()->IncLogin());
+			$this->verifyCacheByKey($ETag);
 			$this->Plugins()->RunHook('filter.result-message', array($oMessage));
-
-			$this->cacheByKey($sRawKey);
+			$this->cacheByKey($ETag);
 		}
 
 		return $this->DefaultResponse($oMessage);
@@ -452,7 +450,7 @@ trait Messages
 
 		try
 		{
-			$this->MailClient()->MessageDelete($sFolder, new SequenceSet($aUids), true);
+			$this->ImapClient()->MessageDelete($sFolder, new SequenceSet($aUids), true);
 		}
 		catch (\Throwable $oException)
 		{
@@ -517,7 +515,7 @@ trait Messages
 
 		try
 		{
-			$this->MailClient()->MessageMove($sFromFolder, $sToFolder, $oUids);
+			$this->ImapClient()->MessageMove($sFromFolder, $sToFolder, $oUids);
 		}
 		catch (\Throwable $oException)
 		{
@@ -546,7 +544,7 @@ trait Messages
 
 		try
 		{
-			$this->MailClient()->MessageCopy(
+			$this->ImapClient()->MessageCopy(
 				$this->GetActionParam('fromFolder', ''),
 				$this->GetActionParam('toFolder', ''),
 				new SequenceSet(\explode(',', (string) $this->GetActionParam('uids', '')))
@@ -577,7 +575,7 @@ trait Messages
 				$oFilesProvider = $this->FilesProvider();
 				foreach ($aAttachments as $mIndex => $sAttachment) {
 					$aAttachments[$mIndex] = false;
-					if ($aValues = $this->decodeRawKey($oAccount, $sAttachment)) {
+					if ($aValues = $this->decodeRawKey($sAttachment)) {
 						$sFolder = isset($aValues['folder']) ? (string) $aValues['folder'] : '';
 						$iUid = isset($aValues['uid']) ? (int) $aValues['uid'] : 0;
 						$sMimeIndex = isset($aValues['mimeIndex']) ? (string) $aValues['mimeIndex'] : '';
@@ -651,7 +649,7 @@ trait Messages
 
 			$oAccount = $this->initMailClientConnection();
 
-			$oImapClient = $this->MailClient()->ImapClient();
+			$oImapClient = $this->ImapClient();
 			$oImapClient->FolderExamine($sFolderName);
 
 			$aParts = [
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php
index 030ef8aee..945b81a48 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php
@@ -2,6 +2,8 @@
 
 namespace RainLoop\Actions;
 
+use SnappyMail\PGP\Backup;
+
 trait Pgp
 {
 	/**
@@ -191,35 +193,7 @@ trait Pgp
 	 */
 	public function DoGetStoredPGPKeys() : array
 	{
-		$oAccount = $this->getMainAccountFromToken();
-		if (!$oAccount) {
-			return null;
-		}
-
-		$dir = $this->StorageProvider()->GenerateFilePath(
-			$oAccount,
-			\RainLoop\Providers\Storage\Enumerations\StorageType::PGP
-		);
-
-		$keys = [];
-		foreach (\glob("{$dir}/*") as $file) {
-			if (\is_file($file)) {
-				if ('.asc' === \substr($file, -4)) {
-					$keys[] = \file_get_contents($file);
-				} else if ('.key' === \substr($file, -4)) {
-					$key = \json_decode(\file_get_contents($file), true);
-					$mac = \array_pop($key);
-					$hash = $oAccount->CryptKey();
-					if ($mac === \hash_hmac('sha1', $key[2], $hash)) {
-						$key[1] = \base64_decode($key[1]);
-						$key[2] = \base64_decode($key[2]);
-						$keys[] = \SnappyMail\Crypt::Decrypt($key, $hash);
-					}
-				}
-			}
-		}
-
-		return $this->DefaultResponse($keys);
+		return $this->DefaultResponse(\SnappyMail\PGP\Backup::getKeys());
 	}
 
 	/**
@@ -232,16 +206,16 @@ trait Pgp
 		$privateKey = $this->GetActionParam('privateKey', '');
 
 		$result = [
-			'onServer' => [false, false, false],
-			'inGnuPG'  => [false, false, false]
+			'onServer' => [false, false],
+			'inGnuPG'  => [false, false]
 		];
 
 		$onServer = (int) $this->GetActionParam('onServer', 0);
 		if ($publicKey && $onServer & 1) {
-			$result['onServer'][0] = $this->StorePGPKey($publicKey);
+			$result['onServer'][0] = Backup::PGPKey($publicKey);
 		}
 		if ($privateKey && $onServer & 2) {
-			$result['onServer'][1] = $this->StorePGPKey($privateKey);
+			$result['onServer'][1] = Backup::PGPKey($privateKey);
 		}
 
 		$inGnuPG = (int) $this->GetActionParam('inGnuPG', 0);
@@ -267,32 +241,6 @@ trait Pgp
 	{
 		$key = $this->GetActionParam('key', '');
 		$keyId = $this->GetActionParam('keyId', '');
-		return $this->DefaultResponse(($key && $keyId && $this->StorePGPKey($key, $keyId)));
+		return $this->DefaultResponse(($key && $keyId && Backup::PGPKey($key, $keyId)));
 	}
-
-	private function StorePGPKey(string $key, string $keyId = '') : bool
-	{
-		$oAccount = $this->getMainAccountFromToken();
-		if ($oAccount) {
-			$keyId = $keyId ? "0x{$keyId}" : \sha1($key);
-			$dir = $this->StorageProvider()->GenerateFilePath(
-				$oAccount,
-				\RainLoop\Providers\Storage\Enumerations\StorageType::PGP,
-				true
-			);
-			if (\str_contains($key, 'PGP PRIVATE KEY')) {
-				$hash = $oAccount->CryptKey();
-				$key = \SnappyMail\Crypt::Encrypt($key, $hash);
-				$key[1] = \base64_encode($key[1]);
-				$key[2] = \base64_encode($key[2]);
-				$key[] = \hash_hmac('sha1', $key[2], $hash);
-				return !!\file_put_contents("{$dir}{$keyId}.key", \json_encode($key));
-			}
-			if (\str_contains($key, 'PGP PUBLIC KEY')) {
-				return !!\file_put_contents("{$dir}{$keyId}_public.asc", $key);
-			}
-		}
-		return false;
-	}
-
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php
index 423d49af0..58fda8ab7 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php
@@ -9,24 +9,28 @@ trait Raw
 	 */
 	public function RawViewAsPlain() : bool
 	{
-		$oAccount = $this->initMailClientConnection();
-
-		$aValues = $this->decodeRawKey(
-			$oAccount,
-			(string) $this->GetActionParam('RawKey', '')
-		);
-
-		$sFolder = isset($aValues['folder']) ? (string) $aValues['folder'] : '';
-		$iUid = isset($aValues['uid']) ? (int) $aValues['uid'] : 0;
-		$sMimeIndex = isset($aValues['mimeIndex']) ? (string) $aValues['mimeIndex'] : '';
-
-		\header('Content-Type: text/plain');
-
-		return $this->MailClient()->MessageMimeStream(function ($rResource) {
-			if (\is_resource($rResource)) {
-				\MailSo\Base\Utils::FpassthruWithTimeLimitReset($rResource);
-			}
-		}, $sFolder, $iUid, $sMimeIndex);
+		$oAccount = $this->getAccountFromToken();
+		$sRawKey = $this->GetActionParam('RawKey', '');
+		$aValues = $this->decodeRawKey($sRawKey);
+		if (!empty($aValues['folder']) && !empty($aValues['uid'])
+		 && !empty($aValues['accountHash']) && $aValues['accountHash'] === $oAccount->Hash()
+		) {
+			$this->verifyCacheByKey($sRawKey);
+			$this->initMailClientConnection();
+			\header('Content-Type: text/plain');
+			return $this->MailClient()->MessageMimeStream(
+				function ($rResource) use ($sRawKey) {
+					if (\is_resource($rResource)) {
+						$this->cacheByKey($sRawKey);
+						\MailSo\Base\Utils::FpassthruWithTimeLimitReset($rResource);
+					}
+				},
+				(string) $aValues['folder'],
+				(int) $aValues['uid'],
+				isset($aValues['mimeIndex']) ? (string) $aValues['mimeIndex'] : ''
+			);
+		}
+		return false;
 	}
 
 	public function RawDownload() : bool
@@ -72,71 +76,36 @@ trait Raw
 		return false;
 	}
 
-	public function RawPublic() : bool
-	{
-		$sRawKey = (string) $this->GetActionParam('RawKey', '');
-		$this->verifyCacheByKey($sRawKey);
-
-		$sHash = $sRawKey;
-		$sData = '';
-
-		if (!empty($sHash)) {
-			$sData = $this->StorageProvider()->Get(null,
-				\RainLoop\Providers\Storage\Enumerations\StorageType::NOBODY,
-				\RainLoop\KeyPathHelper::PublicFile($sHash)
-			);
-		}
-
-		$aMatch = array();
-		if (!empty($sData) && 0 === \strpos($sData, 'data:') &&
-			\preg_match('/^data:([^:]+):/', $sData, $aMatch) && !empty($aMatch[1]))
-		{
-			$sContentType = \trim($aMatch[1]);
-			if (\in_array($sContentType, array('image/png', 'image/jpg', 'image/jpeg'))) {
-				$this->cacheByKey($sRawKey);
-
-				\header('Content-Type: '.$sContentType);
-				echo \preg_replace('/^data:[^:]+:/', '', $sData);
-				unset($sData);
-
-				return true;
-			}
-		}
-
-		return false;
-	}
-
+	/**
+	 * Message, Message Attachment or Zip
+	 */
 	private function rawSmart(bool $bDownload, bool $bThumbnail = false) : bool
 	{
 		$sRawKey = (string) $this->GetActionParam('RawKey', '');
 
 		$oAccount = $this->getAccountFromToken();
-		$aValues = $this->decodeRawKey($oAccount, $sRawKey);
+		$aValues = $this->decodeRawKey($sRawKey);
+		if (empty($aValues['accountHash']) || $aValues['accountHash'] !== $oAccount->Hash()) {
+			return false;
+		}
 
 		$sRange = \MailSo\Base\Http::GetHeader('Range');
-
 		$aMatch = array();
 		$sRangeStart = $sRangeEnd = '';
 		$bIsRangeRequest = false;
-
 		if (!empty($sRange) && 'bytes=0-' !== \strtolower($sRange)
 		 && \preg_match('/^bytes=([0-9]+)-([0-9]*)/i', \trim($sRange), $aMatch))
 		{
 			$sRangeStart = $aMatch[1];
 			$sRangeEnd = $aMatch[2];
-
 			$bIsRangeRequest = true;
 		}
 
-		$sFolder = isset($aValues['folder']) ? (string) $aValues['folder'] : '';
-		$iUid = isset($aValues['uid']) ? (int) $aValues['uid'] : 0;
 		$sMimeIndex = isset($aValues['mimeIndex']) ? (string) $aValues['mimeIndex'] : '';
-
 		$sContentTypeIn = isset($aValues['mimeType']) ? (string) $aValues['mimeType'] : '';
 		$sFileNameIn = isset($aValues['fileName']) ? (string) $aValues['fileName'] : '';
-		$sFileHashIn = isset($aValues['fileHash']) ? (string) $aValues['fileHash'] : '';
 
-		if (!empty($sFileHashIn)) {
+		if (!empty($aValues['fileHash'])) {
 			$this->verifyCacheByKey($sRawKey);
 
 			// https://github.com/the-djmaze/snappymail/issues/144
@@ -150,7 +119,7 @@ trait Raw
 
 			$sFileNameOut = $this->MainClearFileName($sFileNameIn, $sContentTypeIn, $sMimeIndex);
 
-			$rResource = $this->FilesProvider()->GetFile($oAccount, $sFileHashIn);
+			$rResource = $this->FilesProvider()->GetFile($oAccount, (string) $aValues['fileHash']);
 			if (\is_resource($rResource)) {
 				\header('Content-Type: '.$sContentTypeOut);
 				\header('Content-Disposition: attachment; '.
@@ -165,11 +134,15 @@ trait Raw
 
 			return false;
 		}
-		else if (!empty($sFolder) && 0 < $iUid)
-		{
-			$this->verifyCacheByKey($sRawKey);
+
+		$sFolder = isset($aValues['folder']) ? (string) $aValues['folder'] : '';
+		$iUid = isset($aValues['uid']) ? (int) $aValues['uid'] : 0;
+		if (empty($sFolder) || 1 > $iUid) {
+			return false;
 		}
 
+		$this->verifyCacheByKey($sRawKey);
+
 		$this->initMailClientConnection();
 
 		$self = $this;
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php
index a80b8236f..567e64112 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php
@@ -69,26 +69,6 @@ trait Response
 		]);
 	}
 
-	private function isFileHasThumbnail(string $sFileName) : bool
-	{
-		static $aCache = array();
-
-		$sExt = \MailSo\Base\Utils::GetFileExtension($sFileName);
-		if (isset($aCache[$sExt])) {
-			return $aCache[$sExt];
-		}
-
-		$bResult = (
-			\extension_loaded('gd')
-			|| \extension_loaded('gmagick')
-			|| \extension_loaded('imagick')
-		) && \in_array($sExt, ['png', 'gif', 'jpg', 'jpeg']);
-
-		$aCache[$sExt] = $bResult;
-
-		return $bResult;
-	}
-
 	/**
 	 * @param mixed $mResponse
 	 *
@@ -112,90 +92,22 @@ trait Response
 		}
 
 		if ($mResponse instanceof \MailSo\Mail\Message) {
-			$mResult = $mResponse->jsonSerialize();
-
-			$oAccount = $this->getAccountFromToken();
-
-			if (!$mResult['dateTimeStampInUTC'] || $this->Config()->Get('labs', 'date_from_headers', true)) {
-				$iDateTimeStampInUTC = $mResponse->HeaderTimeStampInUTC;
-				if ($iDateTimeStampInUTC) {
-					$mResult['dateTimeStampInUTC'] = $iDateTimeStampInUTC;
+			$aResult = $mResponse->jsonSerialize();
+			if (!$this->Config()->Get('labs', 'date_from_headers', true) && $aResult['internalTimestamp']) {
+				$aResult['dateTimestamp'] = $aResult['internalTimestamp'];
+			}
+			if (!$sParent && \strlen($aResult['readReceipt']) && !\in_array('$forwarded', $aResult['flags'])) {
+				$oAccount = $this->getAccountFromToken();
+				if ('1' === $this->Cacher($oAccount)->Get(\RainLoop\KeyPathHelper::ReadReceiptCache($oAccount->Email(), $aResult['folder'], $aResult['uid']), '0')) {
+					$aResult['readReceipt'] = '';
 				}
 			}
-
-			// \MailSo\Mime\EmailCollection
-			foreach (['replyTo','from','to','cc','bcc','sender','deliveredTo'] as $prop) {
-				$mResult[$prop] = $this->responseObject($mResult[$prop], $prop);
-			}
-
-			$sSubject = $mResult['subject'];
-			$mResult['hash'] = \md5($mResult['folder'].$mResult['uid']);
-			$mResult['requestHash'] = $this->encodeRawKey($oAccount, array(
-				'folder' => $mResult['folder'],
-				'uid' => $mResult['uid'],
-				'mimeType' => 'message/rfc822',
-				'fileName' => (\strlen($sSubject) ? \MailSo\Base\Utils::SecureFileName($sSubject) : 'message-'.$mResult['uid']) . '.eml'
-			));
-
-			$mResult['attachments'] = $this->responseObject($mResponse->Attachments, 'attachments');
-
-			if (!$sParent) {
-				$mResult['draftInfo'] = $mResponse->DraftInfo;
-				$mResult['unsubsribeLinks'] = $mResponse->UnsubsribeLinks;
-				$mResult['references'] = $mResponse->References;
-
-				$mResult['html'] = $mResponse->Html();
-				$mResult['plain'] = $mResponse->Plain();
-
-//				$this->GetCapa(Capa::OPEN_PGP) || $this->GetCapa(Capa::GNUPG)
-				$mResult['pgpSigned'] = $mResponse->pgpSigned;
-				$mResult['pgpEncrypted'] = $mResponse->pgpEncrypted;
-
-				$mResult['readReceipt'] = $mResponse->ReadReceipt;
-				if (\strlen($mResult['readReceipt']) && !\in_array('$forwarded', $mResult['flags'])) {
-					// \in_array('$mdnsent', $mResult['flags'])
-					if (\strlen($mResult['readReceipt'])) {
-						try
-						{
-							$oReadReceipt = \MailSo\Mime\Email::Parse($mResult['readReceipt']);
-							if (!$oReadReceipt) {
-								$mResult['readReceipt'] = '';
-							}
-						}
-						catch (\Throwable $oException) { unset($oException); }
-					}
-
-					if (\strlen($mResult['readReceipt']) && '1' === $this->Cacher($oAccount)->Get(
-						\RainLoop\KeyPathHelper::ReadReceiptCache($oAccount->Email(), $mResult['folder'], $mResult['uid']), '0'))
-					{
-						$mResult['readReceipt'] = '';
-					}
-				}
-			}
-			return $mResult;
-		}
-
-		if ($mResponse instanceof \MailSo\Mail\Attachment) {
-			$mResult = $mResponse->jsonSerialize();
-			$mResult['isThumbnail'] = $this->GetCapa(Capa::ATTACHMENT_THUMBNAILS) && $this->isFileHasThumbnail($mResult['fileName']);
-			$mResult['download'] = $this->encodeRawKey($this->getAccountFromToken(), array(
-				'folder' => $mResult['folder'],
-				'uid' => $mResult['uid'],
-				'mimeIndex' => $mResult['mimeIndex'],
-				'mimeType' => $mResult['mimeType'],
-				'fileName' => $mResult['fileName']
-			));
-			return $mResult;
+			return $aResult;
 		}
 
 		if ($mResponse instanceof \MailSo\Imap\Folder) {
 			$aResult = $mResponse->jsonSerialize();
 
-			$sHash = $mResponse->Hash($this->MailClient()->ImapClient()->Hash());
-			if ($sHash) {
-				$aResult['hash'] = $sHash;
-			}
-
 			if (null === $this->aCheckableFolder) {
 				$aCheckable = \json_decode(
 					$this->SettingsProvider(true)
@@ -204,26 +116,11 @@ trait Response
 				);
 				$this->aCheckableFolder = \is_array($aCheckable) ? $aCheckable : array();
 			}
-			$aResult['checkable'] = \in_array($mResponse->FullName(), $this->aCheckableFolder);
+			$aResult['checkable'] = \in_array($mResponse->FullName, $this->aCheckableFolder);
 
 			return $aResult;
 		}
 
-		if ($mResponse instanceof \MailSo\Base\Collection) {
-			$mResult = $mResponse->jsonSerialize();
-			$mResult['@Collection'] = $this->responseObject($mResult['@Collection'], 'Collection');
-			if ($mResponse instanceof \MailSo\Mail\EmailCollection) {
-				return \array_slice($mResult['@Collection'], 0, 100);
-			}
-			if ($mResponse instanceof \MailSo\Mail\AttachmentCollection
-			 || $mResponse instanceof \MailSo\Mail\FolderCollection
-			 || $mResponse instanceof \MailSo\Mail\MessageCollection
-			) {
-				return $mResult;
-			}
-			return $mResult['@Collection'];
-		}
-
 		return $mResponse;
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Themes.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Themes.php
index 6b26f36c8..3fa64a8f1 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Themes.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Themes.php
@@ -209,8 +209,8 @@ trait Themes
 		}
 
 		if (UPLOAD_ERR_OK !== $iError) {
-			$iClientError = \RainLoop\Enumerations\UploadError::NORMAL;
-			$sError = $this->getUploadErrorMessageByCode($iError, $iClientError);
+			$iClientError = 0;
+			$sError = \RainLoop\Enumerations\UploadError::getUserMessage($iError, $iClientError);
 			if (!empty($sError)) {
 				return $this->FalseResponse($iClientError, $sError);
 			}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
index 64f291d8b..1a699337c 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
@@ -36,25 +36,30 @@ trait User
 	{
 		$sEmail = \MailSo\Base\Utils::Trim($this->GetActionParam('Email', ''));
 		$sPassword = $this->GetActionParam('Password', '');
-		$bSignMe = !empty($this->GetActionParam('SignMe', 0));
+		$bSignMe = !empty($this->GetActionParam('signMe', 0));
 
 		$this->Logger()->AddSecret($sPassword);
 
-		$oAccount = $this->LoginProcess($sEmail, $sPassword, $bSignMe);
+		try {
+			$oAccount = $this->LoginProcess($sEmail, $sPassword, $bSignMe);
+		} catch (\Throwable $oException) {
+			$this->loginErrorDelay();
+			throw $oException;
+		}
 
 		$this->SetAuthToken($oAccount);
 
 		$this->Plugins()->RunHook('login.success', array($oAccount));
 
-		$sLanguage = $this->GetActionParam('Language', '');
+		$sLanguage = $this->GetActionParam('language', '');
 		if ($oAccount && $sLanguage) {
 			$oSettings = $this->SettingsProvider()->Load($oAccount);
 			if ($oSettings) {
 				$sLanguage = $this->ValidateLanguage($sLanguage);
-				$sCurrentLanguage = $oSettings->GetConf('Language', '');
+				$sCurrentLanguage = $oSettings->GetConf('language', '');
 
 				if ($sCurrentLanguage !== $sLanguage) {
-					$oSettings->SetConf('Language', $sLanguage);
+					$oSettings->SetConf('language', $sLanguage);
 					$this->SettingsProvider()->Save($oAccount, $oSettings);
 				}
 			}
@@ -140,11 +145,11 @@ trait User
 		$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
 
 		if ($oConfig->Get('webmail', 'allow_languages_on_settings', true)) {
-			$this->setSettingsFromParams($oSettings, 'Language', 'string', function ($sLanguage) use ($self) {
+			$this->setSettingsFromParams($oSettings, 'language', 'string', function ($sLanguage) use ($self) {
 				return $self->ValidateLanguage($sLanguage);
 			});
 		} else {
-//			$oSettings->SetConf('Language', $this->ValidateLanguage($oConfig->Get('webmail', 'language', 'en')));
+//			$oSettings->SetConf('language', $this->ValidateLanguage($oConfig->Get('webmail', 'language', 'en')));
 		}
 		$this->setSettingsFromParams($oSettings, 'hourCycle', 'string');
 
@@ -196,6 +201,7 @@ trait User
 		$this->setSettingsFromParams($oSettings, 'AutoLogout', 'int');
 		$this->setSettingsFromParams($oSettings, 'MessageReadDelay', 'int');
 		$this->setSettingsFromParams($oSettings, 'MsgDefaultAction', 'int');
+		$this->setSettingsFromParams($oSettings, 'showNextMessage', 'bool');
 
 		$this->setSettingsFromParams($oSettings, 'Resizer4Width', 'int');
 		$this->setSettingsFromParams($oSettings, 'Resizer5Width', 'int');
@@ -223,7 +229,7 @@ trait User
 
 		try
 		{
-			$aQuota = $this->MailClient()->QuotaRoot();
+			$aQuota = $this->ImapClient()->QuotaRoot();
 		}
 		catch (\Throwable $oException)
 		{
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
index f1a2b7bde..77ba1bebc 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
@@ -121,7 +121,6 @@ trait UserAuth
 		$this->resolveLoginCredentials($sEmail, $sPassword, $sLogin);
 
 		if (!\str_contains($sEmail, '@') || !\strlen($sPassword)) {
-			$this->loginErrorDelay();
 			throw new ClientException(Notifications::InvalidInputArgument);
 		}
 
@@ -135,20 +134,13 @@ trait UserAuth
 			}
 		} catch (\Throwable $oException) {
 			$this->LoggerAuthHelper($oAccount, $this->getAdditionalLogParamsByUserLogin($sInputEmail));
-			$this->loginErrorDelay();
 			throw $oException;
 		}
 
-		try {
-			$this->imapConnect($oAccount, true);
-			if ($bMainAccount) {
-				$bSignMe && $this->SetSignMeToken($oAccount);
-				$this->StorageProvider()->Put($oAccount, StorageType::SESSION, Utils::GetSessionToken(), 'true');
-			}
-		} catch (\Throwable $oException) {
-			$this->loginErrorDelay();
-
-			throw $oException;
+		$this->imapConnect($oAccount, true);
+		if ($bMainAccount) {
+			$bSignMe && $this->SetSignMeToken($oAccount);
+			$this->StorageProvider()->Put($oAccount, StorageType::SESSION, Utils::GetSessionToken(), 'true');
 		}
 
 		return $oAccount;
@@ -421,7 +413,7 @@ trait UserAuth
 	{
 		try {
 			if (!$oImapClient) {
-				$oImapClient = $this->MailClient()->ImapClient();
+				$oImapClient = $this->ImapClient();
 			}
 			$oAccount->ImapConnectAndLogin($this->Plugins(), $oImapClient, $this->Config());
 		} catch (ClientException $oException) {
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
index ac3d3f1a0..1e7cfeebd 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
@@ -48,11 +48,11 @@ class ActionsAdmin extends Actions
 
 		$self = $this;
 
-		$this->setConfigFromParams($oConfig, 'Language', 'webmail', 'language', 'string', function ($sLanguage) use ($self) {
+		$this->setConfigFromParams($oConfig, 'language', 'webmail', 'language', 'string', function ($sLanguage) use ($self) {
 			return $self->ValidateLanguage($sLanguage, '', false);
 		});
 
-		$this->setConfigFromParams($oConfig, 'LanguageAdmin', 'webmail', 'language_admin', 'string', function ($sLanguage) use ($self) {
+		$this->setConfigFromParams($oConfig, 'languageAdmin', 'webmail', 'language_admin', 'string', function ($sLanguage) use ($self) {
 			return $self->ValidateLanguage($sLanguage, '', true);
 		});
 
@@ -60,22 +60,21 @@ class ActionsAdmin extends Actions
 			return $self->ValidateTheme($sTheme);
 		});
 
-		$this->setConfigFromParams($oConfig, 'UseLocalProxyForExternalImages', 'labs', 'use_local_proxy_for_external_images', 'bool');
+		$this->setConfigFromParams($oConfig, 'useLocalProxyForExternalImages', 'labs', 'use_local_proxy_for_external_images', 'bool');
 
-		$this->setConfigFromParams($oConfig, 'AllowLanguagesOnSettings', 'webmail', 'allow_languages_on_settings', 'bool');
-		$this->setConfigFromParams($oConfig, 'AllowLanguagesOnLogin', 'login', 'allow_languages_on_login', 'bool');
-		$this->setConfigFromParams($oConfig, 'AttachmentLimit', 'webmail', 'attachment_size_limit', 'int');
+		$this->setConfigFromParams($oConfig, 'allowLanguagesOnSettings', 'webmail', 'allow_languages_on_settings', 'bool');
+		$this->setConfigFromParams($oConfig, 'allowLanguagesOnLogin', 'login', 'allow_languages_on_login', 'bool');
+		$this->setConfigFromParams($oConfig, 'attachmentLimit', 'webmail', 'attachment_size_limit', 'int');
 
-		$this->setConfigFromParams($oConfig, 'LoginDefaultDomain', 'login', 'default_domain', 'string');
+		$this->setConfigFromParams($oConfig, 'loginDefaultDomain', 'login', 'default_domain', 'string');
 
-		$this->setConfigFromParams($oConfig, 'ContactsEnable', 'contacts', 'enable', 'bool');
-		$this->setConfigFromParams($oConfig, 'ContactsSync', 'contacts', 'allow_sync', 'bool');
-		$this->setConfigFromParams($oConfig, 'ContactsPdoDsn', 'contacts', 'pdo_dsn', 'string');
-		$this->setConfigFromParams($oConfig, 'ContactsPdoUser', 'contacts', 'pdo_user', 'string');
-		$this->setConfigFromParams($oConfig, 'ContactsPdoPassword', 'contacts', 'pdo_password', 'dummy');
-		$this->setConfigFromParams($oConfig, 'ContactsSuggestionsLimit', 'contacts', 'suggestions_limit', 'int');
-
-		$this->setConfigFromParams($oConfig, 'ContactsPdoType', 'contacts', 'type', 'string', function ($sType) use ($self) {
+		$this->setConfigFromParams($oConfig, 'contactsEnable', 'contacts', 'enable', 'bool');
+		$this->setConfigFromParams($oConfig, 'contactsSync', 'contacts', 'allow_sync', 'bool');
+		$this->setConfigFromParams($oConfig, 'contactsPdoDsn', 'contacts', 'pdo_dsn', 'string');
+		$this->setConfigFromParams($oConfig, 'contactsPdoUser', 'contacts', 'pdo_user', 'string');
+		$this->setConfigFromParams($oConfig, 'contactsPdoPassword', 'contacts', 'pdo_password', 'dummy');
+		$this->setConfigFromParams($oConfig, 'contactsSuggestionsLimit', 'contacts', 'suggestions_limit', 'int');
+		$this->setConfigFromParams($oConfig, 'contactsPdoType', 'contacts', 'type', 'string', function ($sType) use ($self) {
 			return Providers\AddressBook\PdoAddressBook::validPdoType($sType);
 		});
 
@@ -86,14 +85,14 @@ class ActionsAdmin extends Actions
 		$this->setConfigFromParams($oConfig, 'CapaUserBackground', 'webmail', 'allow_user_background', 'bool');
 		$this->setConfigFromParams($oConfig, 'CapaOpenPGP', 'security', 'openpgp', 'bool');
 
-		$this->setConfigFromParams($oConfig, 'DetermineUserLanguage', 'login', 'determine_user_language', 'bool');
-		$this->setConfigFromParams($oConfig, 'DetermineUserDomain', 'login', 'determine_user_domain', 'bool');
+		$this->setConfigFromParams($oConfig, 'determineUserLanguage', 'login', 'determine_user_language', 'bool');
+		$this->setConfigFromParams($oConfig, 'determineUserDomain', 'login', 'determine_user_domain', 'bool');
 
-		$this->setConfigFromParams($oConfig, 'Title', 'webmail', 'title', 'string');
-		$this->setConfigFromParams($oConfig, 'LoadingDescription', 'webmail', 'loading_description', 'string');
-		$this->setConfigFromParams($oConfig, 'FaviconUrl', 'webmail', 'favicon_url', 'string');
+		$this->setConfigFromParams($oConfig, 'title', 'webmail', 'title', 'string');
+		$this->setConfigFromParams($oConfig, 'loadingDescription', 'webmail', 'loading_description', 'string');
+		$this->setConfigFromParams($oConfig, 'faviconUrl', 'webmail', 'favicon_url', 'string');
 
-		$this->setConfigFromParams($oConfig, 'EnabledPlugins', 'plugins', 'enable', 'bool');
+		$this->setConfigFromParams($oConfig, 'pluginsEnable', 'plugins', 'enable', 'bool');
 
 		return $this->DefaultResponse($oConfig->Save());
 	}
@@ -142,10 +141,10 @@ class ActionsAdmin extends Actions
 		$this->IsAdminLoggined();
 
 		$oConfig = $this->Config();
-		$this->setConfigFromParams($oConfig, 'ContactsPdoDsn', 'contacts', 'pdo_dsn', 'string');
-		$this->setConfigFromParams($oConfig, 'ContactsPdoUser', 'contacts', 'pdo_user', 'string');
-		$this->setConfigFromParams($oConfig, 'ContactsPdoPassword', 'contacts', 'pdo_password', 'dummy');
-		$this->setConfigFromParams($oConfig, 'ContactsPdoType', 'contacts', 'type', 'string', function ($sType) {
+		$this->setConfigFromParams($oConfig, 'contactsPdoDsn', 'contacts', 'pdo_dsn', 'string');
+		$this->setConfigFromParams($oConfig, 'contactsPdoUser', 'contacts', 'pdo_user', 'string');
+		$this->setConfigFromParams($oConfig, 'contactsPdoPassword', 'contacts', 'pdo_password', 'dummy');
+		$this->setConfigFromParams($oConfig, 'contactsPdoType', 'contacts', 'type', 'string', function ($sType) {
 			return Providers\AddressBook\PdoAddressBook::validPdoType($sType);
 		});
 
@@ -205,40 +204,6 @@ class ActionsAdmin extends Actions
 			: false);
 	}
 
-	public function DoAdminPHPExtensions() : array
-	{
-		$aResult = [
-			[
-				'name' => 'PHP ' . PHP_VERSION,
-				'loaded' => true,
-				'version' => PHP_VERSION
-			],
-			[
-				'name' => 'PHP 64bit',
-				'loaded' => PHP_INT_SIZE == 8,
-				'version' => PHP_INT_SIZE
-			]
-		];
-		foreach (['APCu', 'cURL','GnuPG','GD','Gmagick','Imagick','iconv','intl','LDAP','OpenSSL','pdo_mysql','pdo_pgsql','pdo_sqlite','redis','Sodium','Tidy','uuid','XXTEA','Zip'] as $name) {
-			$aResult[] = [
-				'name' => ('OpenSSL' === $name && \defined('OPENSSL_VERSION_TEXT')) ? OPENSSL_VERSION_TEXT : $name,
-				'loaded' => \extension_loaded(\strtolower($name)),
-				'version' => \phpversion($name)
-			];
-		}
-		$aResult[] = [
-			'name' => 'Fileinfo',
-			'loaded' => \class_exists('finfo'),
-			'version' => \phpversion('fileinfo')
-		];
-		$aResult[] = [
-			'name' => 'Phar',
-			'loaded' => \class_exists('PharData'),
-			'version' => \phpversion('phar')
-		];
-		return $this->DefaultResponse($aResult);
-	}
-
 	// /?admin/Backup
 	public function DoAdminBackup() : void
 	{
@@ -261,7 +226,7 @@ class ActionsAdmin extends Actions
 		exit;
 	}
 
-	public function DoAdminUpdateInfo() : array
+	public function DoAdminInfo() : array
 	{
 		$this->IsAdminLoggined();
 
@@ -294,13 +259,50 @@ class ActionsAdmin extends Actions
 			$aWarnings[] = 'Can not edit: ' . APP_INDEX_ROOT_PATH . 'index.php';
 		}
 
-		return $this->DefaultResponse(array(
-			 'updatable' => \SnappyMail\Repository::canUpdateCore(),
-			 'warning' => $bShowWarning,
-			 'version' => $sVersion,
-			 'versionCompare' => \version_compare(APP_VERSION, $sVersion),
-			 'warnings' => $aWarnings
-		));
+		$aResult = [
+			'system' => [
+				'load' => \is_callable('sys_getloadavg') ? \sys_getloadavg() : null
+			],
+			'core' => [
+				 'updatable' => \SnappyMail\Repository::canUpdateCore(),
+				 'warning' => $bShowWarning,
+				 'version' => $sVersion,
+				 'versionCompare' => \version_compare(APP_VERSION, $sVersion),
+				 'warnings' => $aWarnings
+			],
+			'php' => [
+				[
+					'name' => 'PHP ' . PHP_VERSION,
+					'loaded' => true,
+					'version' => PHP_VERSION
+				],
+				[
+					'name' => 'PHP 64bit',
+					'loaded' => PHP_INT_SIZE == 8,
+					'version' => PHP_INT_SIZE
+				]
+			]
+		];
+
+		foreach (['APCu', 'cURL','GnuPG','GD','Gmagick','Imagick','iconv','intl','LDAP','OpenSSL','pdo_mysql','pdo_pgsql','pdo_sqlite','redis','Sodium','Tidy','uuid','XXTEA','Zip'] as $name) {
+			$aResult['php'][] = [
+				'name' => ('OpenSSL' === $name && \defined('OPENSSL_VERSION_TEXT')) ? OPENSSL_VERSION_TEXT : $name,
+				'loaded' => \extension_loaded(\strtolower($name)),
+				'version' => \phpversion($name)
+			];
+		}
+		$aResult['php'][] = [
+			'name' => 'Fileinfo',
+			'loaded' => \class_exists('finfo'),
+			'version' => \phpversion('fileinfo')
+		];
+		$aResult['php'][] = [
+			'name' => 'Phar',
+			'loaded' => \class_exists('PharData'),
+			'version' => \phpversion('phar')
+		];
+
+		return $this->DefaultResponse($aResult);
 	}
 
 	public function DoAdminUpgradeCore() : array
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
index 783465e8d..16200a64e 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
@@ -41,15 +41,14 @@ abstract class Api
 		$CSP = new \SnappyMail\HTTP\CSP(\trim($oConfig->Get('security', 'content_security_policy', '')));
 		$CSP->report = $oConfig->Get('security', 'csp_report', false);
 		$CSP->report_only = $oConfig->Get('debug', 'enable', false); // || SNAPPYMAIL_DEV
-//		$CSP->frame = \explode(' ', $oConfig->Get('security', 'csp_frame', ''));
 
 		// Allow https: due to remote images in e-mails or use proxy
 		if (!$oConfig->Get('security', 'use_local_proxy_for_external_images', '')) {
-			$CSP->img[] = 'https:';
-			$CSP->img[] = 'http:';
+			$CSP->add('img-src', 'https:');
+			$CSP->add('img-src', 'http:');
 		}
 		if ($sScriptNonce) {
-			$CSP->script[] = "'nonce-{$sScriptNonce}'";
+			$CSP->add('script-src', "'nonce-{$sScriptNonce}'");
 		}
 
 		static::Actions()->Plugins()->RunHook('main.content-security-policy', array($CSP));
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php
index 483c165db..279ad0725 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php
@@ -2,7 +2,7 @@
 
 namespace RainLoop\Config;
 
-abstract class AbstractConfig implements \JsonSerializable
+abstract class AbstractConfig implements \ArrayAccess, \JsonSerializable
 {
 	private string $sFile;
 
@@ -33,6 +33,27 @@ abstract class AbstractConfig implements \JsonSerializable
 			\MailSo\Base\Utils::FunctionsCallable(array('apcu_fetch', 'apcu_store'));
 	}
 
+	public function offsetExists($offset) : bool
+	{
+	}
+
+	#[\ReturnTypeWillChange]
+	public function offsetGet($offset)
+	{
+		$offset = \explode('/', $offset, 2);
+		$this->Get($offset[0], $offset[1]);
+	}
+
+	public function offsetSet($offset, $value) : void
+	{
+		$offset = \explode('/', $offset, 2);
+		$this->Set($offset[0], $offset[1], $value);
+	}
+
+	public function offsetUnset($offset) : void
+	{
+	}
+
 	protected abstract function defaultValues() : array;
 
 	public function IsInited() : bool
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
index 405602381..eee57dbb3 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -18,6 +18,16 @@ class Application extends \RainLoop\Config\AbstractConfig
 	{
 		$bResult = parent::Load();
 
+		$max = \floatval($this->Get('security', 'max_sys_getloadavg', 0));
+		if ($max && \is_callable('sys_getloadavg')) {
+			$load = \sys_getloadavg();
+			if ($load && $load[0] > $max) {
+				\header('HTTP/1.1 503 Service Unavailable', true, 503);
+				\header('Retry-After: 120');
+				exit("Mailserver too busy ({$load[0]}). Please try again later.");
+			}
+		}
+
 		$this->aReplaceEnv = null;
 		if ((isset($_ENV) && \is_array($_ENV) && \count($_ENV)) ||
 			(isset($_SERVER) && \is_array($_SERVER) && \count($_SERVER)))
@@ -161,7 +171,10 @@ class Application extends \RainLoop\Config\AbstractConfig
 				'message_read_delay'          => array(5, 'Mark message read after N seconds'),
 
 				'attachment_size_limit'       => array(\min($upload_max_filesize, 25), 'File size limit (MB) for file upload on compose screen
-0 for unlimited.')
+0 for unlimited.'),
+
+				'compress_output' => array(false, 'brotli or gzip compress the output.
+Warning: only enable when server does not do this, else double compression errors occur')
 			),
 
 			'interface' => array(
@@ -194,6 +207,7 @@ class Application extends \RainLoop\Config\AbstractConfig
 
 				'force_https'             => array(false),
 				'hide_x_mailer_header'    => array(true),
+				'max_sys_getloadavg'      => array(0.0, 'https://en.m.wikipedia.org/wiki/Load_(computing)'),
 				'content_security_policy' => array('', 'For example to allow all images use "img-src https:". More info at https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy#directives'),
 				'csp_report'              => array(false, 'Report CSP errors to PHP and/or SnappyMail Log'),
 				'encrypt_cipher'          => array('aes-256-cbc-hmac-sha1', 'A valid cipher method from https://php.net/openssl_get_cipher_methods'),
@@ -329,7 +343,8 @@ Examples:
   filename = "log-{date:Y-m-d}.txt"
   filename = "{date:Y-m-d}/{user:domain}/{user:email}_{user:uid}.log"
   filename = "{user:email}-{date:Y-m-d}.txt"
-  filename = "syslog"'),
+  filename = "syslog"
+  filename = "stderr"'),
 
 				'auth_logging' => array(false, 'Enable auth logging in a separate file (for fail2ban)'),
 				'auth_logging_filename' => array('fail2ban/auth-{date:Y-m-d}.txt'),
@@ -381,8 +396,6 @@ Enables caching in the system'),
 				'allow_message_append' => array(false),
 				'login_fault_delay' => array(5, 'When login fails, wait N seconds before responding'),
 				'log_ajax_response_write_limit' => array(300),
-				'allow_html_editor_biti_buttons' => array(false),
-				'allow_ctrl_enter_on_compose' => array(true),
 				'smtp_show_server_errors' => array(false),
 				'sieve_auth_plain_initial' => array(true),
 				'sieve_allow_fileinto_inbox' => array(false),
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/UploadError.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/UploadError.php
index eb7160c36..20d7cc623 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/UploadError.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/UploadError.php
@@ -4,27 +4,62 @@ namespace RainLoop\Enumerations;
 
 abstract class UploadError
 {
-	// UPLOAD_ERR_OK; There is no error, the file uploaded with success.
-	const NORMAL = 0;
-	// UPLOAD_ERR_INI_SIZE; The uploaded file exceeds the upload_max_filesize directive in php.ini.
-	const FILE_IS_TOO_BIG = 1;
-	// UPLOAD_ERR_FORM_SIZE; The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.
-//	const FORM_SIZE = 2;
-	// UPLOAD_ERR_PARTIAL; The uploaded file was only partially uploaded.
-	const FILE_PARTIALLY_UPLOADED = 3;
-	// UPLOAD_ERR_NO_FILE; No file was uploaded.
-	const FILE_NO_UPLOADED = 4;
-	// UPLOAD_ERR_NO_TMP_DIR; Missing a temporary folder.
-	const MISSING_TEMP_FOLDER = 6;
-	// UPLOAD_ERR_CANT_WRITE; Failed to write file to disk.
-	const FILE_ON_SAVING_ERROR = 7;
-	// UPLOAD_ERR_EXTENSION; A PHP extension stopped the file upload
-//	const EXTENSION = 8;
-
 	const FILE_TYPE = 98;
 	const UNKNOWN = 99;
 
 	const CONFIG_SIZE = 1001;
 	const ON_SAVING = 1002;
 	const EMPTY_FILES_DATA = 1003;
+
+	private static $messages = [
+		\UPLOAD_ERR_INI_SIZE   => 'Filesize exceeds the upload_max_filesize directive in php.ini',
+		\UPLOAD_ERR_FORM_SIZE  => 'Filesize exceeds the MAX_FILE_SIZE directive that was specified in the html form',
+		\UPLOAD_ERR_PARTIAL    => 'File was only partially uploaded',
+		\UPLOAD_ERR_NO_FILE    => 'No file was uploaded',
+		\UPLOAD_ERR_NO_TMP_DIR => 'Missing a temporary folder',
+		\UPLOAD_ERR_CANT_WRITE => 'Failed to write file to disk',
+		\UPLOAD_ERR_EXTENSION  => 'File upload stopped by extension',
+		98   => 'Invalid file type',
+		99   => 'Unknown error',
+		1001 => 'Filesize exceeds the config setting',
+		1002 => 'Error saving file',
+		1003 => 'File is empty'
+	];
+
+	public static function getMessage(int $code): string
+	{
+		return isset(static::$messages[$code]) ? static::$messages[$code] : 0;
+	}
+
+	public static function getUserMessage(int $iError, int &$iClientError): string
+	{
+		$iClientError = $iError;
+		switch ($iError) {
+			case \UPLOAD_ERR_OK:
+			case \UPLOAD_ERR_PARTIAL:
+			case \UPLOAD_ERR_NO_FILE:
+			case static::FILE_TYPE:
+				break;
+
+			case \UPLOAD_ERR_INI_SIZE:
+			case \UPLOAD_ERR_FORM_SIZE:
+			case static::CONFIG_SIZE:
+			case static::EMPTY_FILES_DATA:
+				return 'File is too big';
+
+			case \UPLOAD_ERR_NO_TMP_DIR:
+			case \UPLOAD_ERR_CANT_WRITE:
+			case \UPLOAD_ERR_EXTENSION:
+			case static::ON_SAVING:
+				$iClientError = static::FILE_ON_SAVING_ERROR;
+				break;
+
+			default:
+				$iClientError = static::UNKNOWN;
+				break;
+		}
+
+		return static::getMessage($iClientError);
+	}
+
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/KeyPathHelper.php b/snappymail/v/0.0.0/app/libraries/RainLoop/KeyPathHelper.php
index cd341aa10..509711925 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/KeyPathHelper.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/KeyPathHelper.php
@@ -4,12 +4,6 @@ namespace RainLoop;
 
 class KeyPathHelper
 {
-
-	static public function PublicFile(string $sHash) : string
-	{
-		return '/Public/Files/'.\sha1($sHash).'/Data/';
-	}
-
 	static public function SsoCacherKey(string $sSsoHash) : string
 	{
 		return '/Sso/Data/'.$sSsoHash.'/Login/';
@@ -30,11 +24,6 @@ class KeyPathHelper
 		return '/LangCache/'.$sPluginsHash.'/'.$sLanguage.'/'.($bAdmim ? 'Admin' : 'App').'/'.APP_VERSION.'/';
 	}
 
-	static public function TemplatesCache(bool $bAdmin, string $sPluginsHash) : string
-	{
-		return '/TemplatesCache/'.$sPluginsHash.'/'.($bAdmin ? 'Admin' : 'App').'/'.APP_VERSION.'/';
-	}
-
 	static public function PluginsJsCache(string $sPluginsHash) : string
 	{
 		return '/PluginsJsCache/'.$sPluginsHash.'/'.APP_VERSION.'/';
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
index 7b2268be1..a9eb452bf 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
@@ -63,7 +63,7 @@ abstract class Account implements \JsonSerializable
 	{
 		return \sha1(\implode(APP_SALT, [
 			$this->sEmail,
-			APP_VERSION
+			$this->sLogin,
 //			\json_encode($this->Domain()),
 //			$this->sPassword
 		]));
@@ -235,7 +235,7 @@ abstract class Account implements \JsonSerializable
 		$oPlugins->RunHook('imap.after-connect', array($this, $oImapClient, $oSettings));
 
 		$oSettings->Password = $this->IncPassword();
-		return $this->netClientLogin($oImapClient, $oPlugins, $oSettings);
+		return $this->netClientLogin($oImapClient, $oPlugins);
 	}
 
 	public function SmtpConnectAndLogin(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Smtp\SmtpClient $oSmtpClient) : bool
@@ -251,7 +251,7 @@ abstract class Account implements \JsonSerializable
 			$oSettings->useAuth = false;
 			return true;
 		}
-		$oSmtpClient->Connect($oSettings, $oSettings->Ehlo);
+		$oSmtpClient->Connect($oSettings);
 		$oPlugins->RunHook('smtp.after-connect', array($this, $oSmtpClient, $oSettings));
 /*
 		if ($this->oDomain->OutAskCredentials() && !($this->sSmtpPassword && $this->sSmtpLogin)) {
@@ -259,7 +259,7 @@ abstract class Account implements \JsonSerializable
 		}
 */
 		$oSettings->Password = $this->sSmtpPassword ?: $this->sPassword;
-		return $this->netClientLogin($oSmtpClient, $oPlugins, $oSettings);
+		return $this->netClientLogin($oSmtpClient, $oPlugins);
 	}
 
 	public function SieveConnectAndLogin(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Sieve\SieveClient $oSieveClient, \RainLoop\Config\Application $oConfig)
@@ -274,10 +274,10 @@ abstract class Account implements \JsonSerializable
 		$oPlugins->RunHook('sieve.after-connect', array($this, $oSieveClient, $oSettings));
 
 		$oSettings->Password = $this->IncPassword();
-		return $this->netClientLogin($oSieveClient, $oPlugins, $oSettings);
+		return $this->netClientLogin($oSieveClient, $oPlugins);
 	}
 
-	private function netClientLogin(\MailSo\Net\NetClient $oClient, \RainLoop\Plugins\Manager $oPlugins, \MailSo\Net\ConnectSettings $oSettings) : bool
+	private function netClientLogin(\MailSo\Net\NetClient $oClient, \RainLoop\Plugins\Manager $oPlugins) : bool
 	{
 /*
 		$encrypted = !empty(\stream_get_meta_data($oClient->ConnectionResource())['crypto']);
@@ -288,6 +288,7 @@ abstract class Account implements \JsonSerializable
 			[cipher_version] => TLSv1.3
 		)
 */
+		$oSettings = $oClient->Settings;
 		$oSettings->ProxyAuthUser = $this->sProxyAuthUser;
 		$oSettings->ProxyAuthPassword = $this->sProxyAuthPassword;
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Identity.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Identity.php
index 45ddf142d..921d73b6d 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Identity.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Identity.php
@@ -103,8 +103,7 @@ class Identity implements \JsonSerializable
 			$this->sReplyTo = !empty($aData['ReplyTo']) ? $aData['ReplyTo'] : '';
 			$this->sBcc = !empty($aData['Bcc']) ? $aData['Bcc'] : '';
 			$this->sSignature = !empty($aData['Signature']) ? $aData['Signature'] : '';
-			$this->bSignatureInsertBefore = isset($aData['SignatureInsertBefore']) ?
-				!empty($aData['SignatureInsertBefore']) : true;
+			$this->bSignatureInsertBefore = !empty($aData['SignatureInsertBefore']);
 
 			return true;
 		}
@@ -112,6 +111,7 @@ class Identity implements \JsonSerializable
 		return false;
 	}
 
+	// Used to store
 	public function ToSimpleJSON(): array
 	{
 		return array(
@@ -129,13 +129,14 @@ class Identity implements \JsonSerializable
 	public function jsonSerialize()
 	{
 		return array(
-			'Id' => $this->sId,
-			'Email' => Utils::IdnToUtf8($this->sEmail),
-			'Name' => $this->sName,
-			'ReplyTo' => $this->sReplyTo,
-			'Bcc' => $this->sBcc,
-			'Signature' => $this->sSignature,
-			'SignatureInsertBefore' => $this->bSignatureInsertBefore
+			'@Object' => 'Object/Identity',
+			'id' => $this->sId,
+			'email' => Utils::IdnToUtf8($this->sEmail),
+			'name' => $this->sName,
+			'replyTo' => $this->sReplyTo,
+			'bcc' => $this->sBcc,
+			'signature' => $this->sSignature,
+			'signatureInsertBefore' => $this->bSignatureInsertBefore
 		);
 	}
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings.php
index d913b36da..b10a50307 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings.php
@@ -21,7 +21,7 @@ class Settings extends \RainLoop\Providers\AbstractProvider
 
 	public function Save(\RainLoop\Model\Account $oAccount, \RainLoop\Settings $oSettings) : bool
 	{
-		return $this->oDriver->Save($oAccount, $oSettings->DataAsArray());
+		return $this->oDriver->Save($oAccount, $oSettings);
 	}
 
 	public function IsActive() : bool
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/DefaultSettings.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/DefaultSettings.php
index 53e04b73e..1ea00d7a2 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/DefaultSettings.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/DefaultSettings.php
@@ -26,11 +26,9 @@ class DefaultSettings implements ISettings
 				self::FILE_NAME
 		);
 
-		if (\is_string($sValue))
-		{
+		if (\is_string($sValue)) {
 			$aData = \json_decode($sValue, true);
-			if (\is_array($aData))
-			{
+			if (\is_array($aData)) {
 				return $aData;
 			}
 		}
@@ -38,14 +36,14 @@ class DefaultSettings implements ISettings
 		return array();
 	}
 
-	public function Save(\RainLoop\Model\Account $oAccount, array $aSettings) : bool
+	public function Save(\RainLoop\Model\Account $oAccount, \RainLoop\Settings $oSettings) : bool
 	{
 		return $this->oStorageProvider->Put($oAccount,
 			\RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG,
 			$this->oStorageProvider->IsLocal() ?
 				self::FILE_NAME_LOCAL :
 				self::FILE_NAME,
-			\json_encode($aSettings));
+			\json_encode($oSettings));
 	}
 
 	public function Delete(\RainLoop\Model\Account $oAccount) : bool
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/ISettings.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/ISettings.php
index b1d1a7f8d..0199d1b5e 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/ISettings.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/ISettings.php
@@ -6,7 +6,7 @@ interface ISettings
 {
 	public function Load(\RainLoop\Model\Account $oAccount) : array;
 
-	public function Save(\RainLoop\Model\Account $oAccount, array $aSettings) : bool;
+	public function Save(\RainLoop\Model\Account $oAccount, \RainLoop\Settings $oSettings) : bool;
 
 	public function Delete(\RainLoop\Model\Account $oAccount) : bool;
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
index 62200f351..599eb2ddc 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
@@ -39,8 +39,28 @@ abstract class Service
 
 		$oHttp = \MailSo\Base\Http::SingletonInstance();
 		if ($oConfig->Get('security', 'force_https', false) && !$oHttp->IsSecure()) {
-			\header('Location: https://'.$oHttp->GetHost(false).$oHttp->GetUrl());
-			exit;
+			\MailSo\Base\Http::Location('https://'.$oHttp->GetHost(false).$oHttp->GetUrl());
+			return true;
+		}
+
+		// See https://github.com/kjdev/php-ext-brotli
+		if (!empty($_SERVER['HTTP_ACCEPT_ENCODING'])
+		 && $oConfig->Get('webmail', 'compress_output', false)
+		 && !\ini_get('zlib.output_compression')
+		 && !\ini_get('brotli.output_compression')
+		) {
+			if (\is_callable('brotli_compress_add') && false !== \stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'br')) {
+				\ob_start(function(string $buffer, int $phase){
+					static $resource;
+					if ($phase & PHP_OUTPUT_HANDLER_START) {
+						\header('Content-Encoding: br');
+						$resource = \brotli_compress_init(/*int $quality = 11, int $mode = BROTLI_GENERIC*/);
+					}
+					return \brotli_compress_add($resource, $buffer, ($phase & PHP_OUTPUT_HANDLER_FINAL) ? BROTLI_FINISH : BROTLI_PROCESS);
+				});
+			} else {
+				\ob_start('ob_gzhandler');
+			}
 		}
 
 		$sQuery = \trim($_SERVER['QUERY_STRING'] ?? '');
@@ -119,21 +139,21 @@ abstract class Service
 			if (!$bAdmin) {
 				$login = $oConfig->Get('labs', 'custom_login_link', '');
 				if ($login && !$oActions->getAccountFromToken(false)) {
-					\header("Location: {$login}");
-					exit;
+					$oHttp->ServerNoCache();
+					\MailSo\Base\Http::Location($login);
+					return true;
 				}
 			}
 
 //			if (!\SnappyMail\HTTP\SecFetch::isEntering()) {
 			\header('Content-Type: text/html; charset=utf-8');
-			$oHttp->ServerNoCache();
 
 			if (!\is_dir(APP_DATA_FOLDER_PATH) || !\is_writable(APP_DATA_FOLDER_PATH)) {
+				$oHttp->ServerNoCache();
 				echo $oServiceActions->ErrorTemplates(
 					'Permission denied!',
 					'SnappyMail can not access the data folder "'.APP_DATA_FOLDER_PATH.'"'
 				);
-
 				return false;
 			}
 
@@ -162,18 +182,19 @@ abstract class Service
 				'{{BaseAppAdmin}}' => $bAdmin ? 1 : 0
 			);
 
-			$sCacheFileName = '';
+			$sCacheFileName = 'TMPL:' . \sha1(
+				Utils::jsonEncode(array(
+					$sLanguage,
+					$oConfig->Get('cache', 'index', ''),
+					$oActions->Plugins()->Hash(),
+					$sAppJsMin,
+					$sAppCssMin,
+					$aTemplateParameters,
+					APP_VERSION
+				))
+			);
+			$oActions->verifyCacheByKey($sCacheFileName);
 			if ($oConfig->Get('cache', 'system_data', true)) {
-				$sCacheFileName = 'TMPL:' . $sLanguage . \sha1(
-					Utils::jsonEncode(array(
-						$oConfig->Get('cache', 'index', ''),
-						$oActions->Plugins()->Hash(),
-						$sAppJsMin,
-						$sAppCssMin,
-						$aTemplateParameters,
-						APP_VERSION
-					))
-				);
 				$sResult = $oActions->Cacher()->Get($sCacheFileName);
 			}
 
@@ -198,6 +219,10 @@ abstract class Service
 				}
 			}
 
+			$SameSite = \strtolower($oConfig->Get('security', 'cookie_samesite', 'Strict'));
+			$Secure = (isset($_SERVER['HTTPS']) || 'none' == $SameSite) ? ';secure' : '';
+			$sResult = \str_replace('samesite=strict', "samesite={$SameSite}{$Secure}", $sResult);
+
 			$sScriptNonce = \SnappyMail\UUID::generate();
 			static::setCSP($sScriptNonce);
 			$sResult = \str_replace('nonce=""', 'nonce="'.$sScriptNonce.'"', $sResult);
@@ -206,6 +231,7 @@ abstract class Service
 			$sScriptHash = 'sha256-'.\base64_encode(\hash('sha256', $script[1], true));
 			static::setCSP(null, $sScriptHash);
 */
+			$oActions->cacheByKey($sCacheFileName);
 		} else if (!\headers_sent()) {
 			\header('X-XSS-Protection: 1; mode=block');
 		}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
index b8d59ad16..85aaf1c95 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
@@ -77,7 +77,9 @@ class ServiceActions
 		$aResponse = null;
 		$oException = null;
 
-		$_POST = \json_decode(\file_get_contents('php://input'), true);
+		if (empty($_POST) || (!empty($_SERVER['CONTENT_TYPE']) && \str_contains($_SERVER['CONTENT_TYPE'], 'application/json'))) {
+			$_POST = \json_decode(\file_get_contents('php://input'), true);
+		}
 
 		$sAction = $_POST['Action'] ?? '';
 		if (empty($sAction) && $this->oHttp->IsGet() && !empty($this->aPaths[2])) {
@@ -195,40 +197,6 @@ class ServiceActions
 		return $sResult;
 	}
 
-	public function ServiceAppend() : string
-	{
-		\ob_start();
-		$bResponse = false;
-		$oException = null;
-		try
-		{
-			if (\method_exists($this->oActions, 'Append') && \is_callable(array($this->oActions, 'Append'))) {
-				isset($_POST) && $this->oActions->SetActionParams($_POST, 'Append');
-				$bResponse = $this->oActions->Append();
-			}
-		}
-		catch (\Throwable $oException)
-		{
-			$bResponse = false;
-		}
-
-		\header('Content-Type: text/plain; charset=utf-8');
-		$sResult = true === $bResponse ? '1' : '0';
-
-		$sObResult = \ob_get_clean();
-		if (\strlen($sObResult)) {
-			$this->Logger()->Write($sObResult, \LOG_ERR, 'OB-DATA');
-		}
-
-		if ($oException) {
-			$this->Logger()->WriteException($oException, \LOG_ERR);
-		}
-
-		$this->Logger()->Write($sResult, \LOG_INFO, 'APPEND');
-
-		return $sResult;
-	}
-
 	private function privateUpload(string $sAction, int $iSizeLimit = 0) : string
 	{
 		$oConfig = $this->Config();
@@ -239,10 +207,8 @@ class ServiceActions
 		{
 			$aFile = null;
 			$sInputName = 'uploader';
-			$iError = Enumerations\UploadError::UNKNOWN;
 			$iSizeLimit = (0 < $iSizeLimit ? $iSizeLimit : ((int) $oConfig->Get('webmail', 'attachment_size_limit', 0))) * 1024 * 1024;
 
-			$iError = UPLOAD_ERR_OK;
 			$_FILES = isset($_FILES) ? $_FILES : null;
 			if (isset($_FILES[$sInputName], $_FILES[$sInputName]['name'], $_FILES[$sInputName]['tmp_name'], $_FILES[$sInputName]['size'])) {
 				$iError = (isset($_FILES[$sInputName]['error'])) ? (int) $_FILES[$sInputName]['error'] : UPLOAD_ERR_OK;
@@ -414,7 +380,6 @@ class ServiceActions
 
 	public function ServiceLang() : string
 	{
-//		sleep(2);
 		$sResult = '';
 		\header('Content-Type: application/javascript; charset=utf-8');
 
@@ -423,27 +388,22 @@ class ServiceActions
 			$sLanguage = $this->oActions->ValidateLanguage($this->aPaths[3], '', $bAdmin);
 
 			$bCacheEnabled = $this->Config()->Get('cache', 'system_data', true);
-			if (!empty($sLanguage) && $bCacheEnabled) {
-				$this->oActions->verifyCacheByKey($this->sQuery);
-			}
-
 			$sCacheFileName = '';
 			if ($bCacheEnabled) {
-				$sCacheFileName = KeyPathHelper::LangCache(
-					$sLanguage, $bAdmin, $this->oActions->Plugins()->Hash());
-
+				$sCacheFileName = KeyPathHelper::LangCache($sLanguage, $bAdmin, $this->oActions->Plugins()->Hash());
+				$this->oActions->verifyCacheByKey(\md5($sCacheFileName));
 				$sResult = $this->Cacher()->Get($sCacheFileName);
 			}
 
 			if (!\strlen($sResult)) {
 				$sResult = $this->oActions->compileLanguage($sLanguage, $bAdmin);
-				if ($bCacheEnabled && \strlen($sCacheFileName)) {
+				if ($sCacheFileName) {
 					$this->Cacher()->Set($sCacheFileName, $sResult);
 				}
 			}
 
-			if ($bCacheEnabled) {
-				$this->oActions->cacheByKey($this->sQuery);
+			if ($sCacheFileName) {
+				$this->oActions->cacheByKey(\md5($sCacheFileName));
 			}
 		}
 
@@ -461,13 +421,10 @@ class ServiceActions
 		$sMinify = ($bAppDebug || $this->Config()->Get('debug', 'javascript', false)) ? '' : 'min';
 
 		$bCacheEnabled = !$bAppDebug && $this->Config()->Get('cache', 'system_data', true);
-		if ($bCacheEnabled) {
-			$this->oActions->verifyCacheByKey($this->sQuery . $sMinify);
-		}
-
 		$sCacheFileName = '';
 		if ($bCacheEnabled) {
 			$sCacheFileName = KeyPathHelper::PluginsJsCache($this->oActions->Plugins()->Hash()) . $sMinify;
+			$this->oActions->verifyCacheByKey(\md5($sCacheFileName));
 			$sResult = $this->Cacher()->Get($sCacheFileName);
 		}
 
@@ -478,8 +435,8 @@ class ServiceActions
 			}
 		}
 
-		if ($bCacheEnabled) {
-			$this->oActions->cacheByKey($this->sQuery . $sMinify);
+		if ($sCacheFileName) {
+			$this->oActions->cacheByKey(\md5($sCacheFileName));
 		}
 
 		return $sResult;
@@ -505,13 +462,10 @@ class ServiceActions
 			$sMinify = ($bAppDebug || $this->Config()->Get('debug', 'css', false)) ? '' : 'min';
 
 			$bCacheEnabled = !$bAppDebug && $this->Config()->Get('cache', 'system_data', true);
-			if ($bCacheEnabled) {
-				$this->oActions->verifyCacheByKey($this->sQuery . $sMinify);
-			}
-
 			$sCacheFileName = '';
 			if ($bCacheEnabled) {
 				$sCacheFileName = KeyPathHelper::CssCache($sTheme, $this->oActions->Plugins()->Hash()) . $sMinify;
+				$this->oActions->verifyCacheByKey(\md5($sCacheFileName . ($bJson ? 1 : 0)));
 				$sResult = $this->Cacher()->Get($sCacheFileName);
 			}
 
@@ -529,8 +483,8 @@ class ServiceActions
 				}
 			}
 
-			if ($bCacheEnabled) {
-				$this->oActions->cacheByKey($this->sQuery . $sMinify);
+			if ($sCacheFileName) {
+				$this->oActions->cacheByKey(\md5($sCacheFileName . ($bJson ? 1 : 0 )));
 			}
 		}
 
@@ -561,7 +515,7 @@ class ServiceActions
 				))
 			);
 		}
-		$this->oActions->Location('./');
+		\MailSo\Base\Http::Location('./');
 		return '';
 	}
 
@@ -612,14 +566,14 @@ class ServiceActions
 
 							$oSettings = $this->SettingsProvider()->Load($oAccount);
 							if ($oSettings) {
-								$sLanguage = isset($aAdditionalOptions['Language']) ?
-									$aAdditionalOptions['Language'] : '';
+								$sLanguage = isset($aAdditionalOptions['language']) ?
+									$aAdditionalOptions['language'] : '';
 
 								if ($sLanguage) {
 									$sLanguage = $this->oActions->ValidateLanguage($sLanguage);
-									if ($sLanguage !== $oSettings->GetConf('Language', '')) {
+									if ($sLanguage !== $oSettings->GetConf('language', '')) {
 										$bNeedToSettings = true;
-										$oSettings->SetConf('Language', $sLanguage);
+										$oSettings->SetConf('language', $sLanguage);
 									}
 								}
 							}
@@ -641,7 +595,7 @@ class ServiceActions
 			}
 		}
 
-		$this->oActions->Location('./');
+		\MailSo\Base\Http::Location('./');
 		return '';
 	}
 
@@ -665,18 +619,16 @@ class ServiceActions
 
 	private function localAppData(bool $bAdmin = false) : string
 	{
-		\header('Content-Type: application/javascript; charset=utf-8');
+		\header('Content-Type: application/json; charset=utf-8');
 		$this->oHttp->ServerNoCache();
 		try {
-			$sResult = 'rl.initData('
-				. Utils::jsonEncode($this->oActions->AppData($bAdmin))
-				. ');';
-
+			$sResult = Utils::jsonEncode($this->oActions->AppData($bAdmin));
 			$this->Logger()->Write($sResult, \LOG_INFO, 'APPDATA');
-
 			return $sResult;
-		} catch (\Throwable $e) {
-			return 'alert(' . \json_encode('ERROR: ' . $e->getMessage()) . ');';
+		} catch (\Throwable $oException) {
+			$this->Logger()->WriteExceptionShort($oException);
+			\MailSo\Base\Http::StatusHeader(500);
+			return $oException->getMessage();
 		}
 	}
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Settings.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Settings.php
index f1e8c4683..b2791824b 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Settings.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Settings.php
@@ -2,23 +2,36 @@
 
 namespace RainLoop;
 
-class Settings
+class Settings implements \JsonSerializable
 {
-	/**
-	 * @var array
-	 */
-	protected $aData = array();
+	protected array $aData = array();
 
 	public function __construct(array $aData)
 	{
+		if (isset($aData['SpamFolder']) && !isset($aData['JunkFolder'])) {
+			$aData['JunkFolder'] = $aData['SpamFolder'];
+		}
+		if (isset($aData['DraftFolder']) && !isset($aData['DraftsFolder'])) {
+			$aData['DraftsFolder'] = $aData['DraftFolder'];
+		}
+		if (isset($aData['Language']) && !isset($aData['language'])) {
+			$aData['language'] = $aData['Language'];
+			unset($aData['Language']);
+		}
 		$this->aData = $aData;
 	}
 
-	public function DataAsArray() : array
+	public function toArray() : array
 	{
 		return $this->aData;
 	}
 
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
+	{
+		return $this->aData;;
+	}
+
 	/**
 	 * @param mixed $mDefValue = null
 	 *
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php b/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php
index 8dd4ce235..74246a40a 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php
@@ -49,7 +49,7 @@ abstract class Crypt
 			if (empty($_COOKIE['smctoken'])) {
 				throw new \RuntimeException('Missing smctoken');
 			}
-			$key = $_COOKIE['smctoken'];
+			$key = $_COOKIE['smctoken'] . APP_VERSION;
 		}
 		return \sha1($key . APP_SALT, true);
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/http/csp.php b/snappymail/v/0.0.0/app/libraries/snappymail/http/csp.php
index 9b4542d44..3d6502943 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/http/csp.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/http/csp.php
@@ -8,60 +8,69 @@ namespace SnappyMail\HTTP;
 class CSP
 {
 	public
-		$base = ["'self'"],
-		$default = ["'self'", 'data:'],
-		// Knockout.js requires eval() for observable binding purposes
-		// Safari < 15.4 does not support strict-dynamic
-//		$script  = ["'strict-dynamic'", "'unsafe-eval'"],
-		$script  = ["'self'", "'unsafe-eval'"],
-		// Knockout.js requires unsafe-inline?
-//		$script  = ["'self'", "'unsafe-inline'", "'unsafe-eval'"],
-		$img     = ["'self'", 'data:'],
-		$style   = ["'self'", "'unsafe-inline'"],
-		$frame   = [],
-
 		$report = false,
 		$report_to = [],
 		$report_only = false;
 
+	private $directives = [
+		'base-uri' => ["'self'"],
+		'default-src' => ["'self'", 'data:'],
+		// Knockout.js requires eval() for observable binding purposes
+		// Safari < 15.4 does not support strict-dynamic
+//		'script-src' => ["'strict-dynamic'", "'unsafe-eval'"],
+		'script-src' => ["'self'", "'unsafe-eval'"],
+		// Knockout.js requires unsafe-inline?
+//		'script-src' => ["'self'", "'unsafe-inline'", "'unsafe-eval'"],
+		'img-src' => ["'self'", 'data:'],
+		'style-src' => ["'self'", "'unsafe-inline'"],
+	];
+
 	function __construct(string $default = '')
 	{
 		if ($default) {
 			foreach (\explode(';', $default) as $directive) {
-				$values = \explode(' ', $directive);
-				$name = \preg_replace('/-.+/', '', \trim(\array_shift($values)));
-				$this->$name = \array_unique(\array_merge($this->$name, $values));
+				$sources = \preg_split('/\\s+/', \trim($directive));
+				$directive = \array_shift($sources);
+				if (!isset($this->directives[$directive])) {
+					$this->directives[$directive] = [];
+				}
+				$this->directives[$directive] = \array_merge($this->directives[$directive], $sources);
 			}
 		}
 	}
 
 	function __toString() : string
 	{
-		$params = [
-			'base-uri ' . \implode(' ', \array_unique($this->base)),
-			'default-src ' . \implode(' ', \array_unique($this->default))
-		];
-		if ($this->script) {
-			$params[] = 'script-src ' . \implode(' ', \array_unique($this->script));
-		}
-		if ($this->img) {
-			$params[] = 'img-src ' . \implode(' ', \array_unique($this->img));
-		}
-		if ($this->style) {
-			$params[] = 'style-src ' . \implode(' ', \array_unique($this->style));
-		}
-		if ($this->frame) {
-			$params[] = 'frame-src ' . \implode(' ', \array_unique($this->frame));
-		}
-
-		// Deprecated
+		// report-uri deprecated
+		unset($this->directives['report-uri']);
 		if ($this->report) {
-			$params[] = 'report-uri ./?/CspReport';
+			$this->directives['report-uri'] = [\RainLoop\Utils::WebPath() . '?/CspReport'];
 		}
-
+		$params = [];
+		foreach ($this->directives as $directive => $sources) {
+			$params[] = $directive . ' ' . \implode(' ', \array_unique($sources));
+		}
+//		if (empty($this->directives['frame-ancestors'])) {
+//			$params[] = "frame-ancestors 'none';";
+//		}
 		return \implode('; ', $params);
 	}
 
+	public function add(string $directive, string $source) : void
+	{
+		if (!isset($this->directives[$directive])) {
+			$this->directives[$directive] = [];
+		}
+		$this->directives[$directive][] = $source;
+	}
+
+	public function get(string $directive) : array
+	{
+		return isset($this->directives[$directive])
+			? $this->directives[$directive]
+			: [];
+	}
+
 	public function setHeaders() : void
 	{
 		if ($this->report_only) {
@@ -69,6 +78,11 @@ class CSP
 		} else {
 			\header('Content-Security-Policy: ' . $this);
 		}
+		if (empty($this->directives['frame-ancestors'])) {
+			\header('X-Frame-Options: DENY');
+		} else {
+//			\header('X-Frame-Options: SAMEORIGIN');
+		}
 	}
 
 	public static function logReport() : void
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/imap/sync.php b/snappymail/v/0.0.0/app/libraries/snappymail/imap/sync.php
index 4c9f2bbae..f042c27bc 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/imap/sync.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/imap/sync.php
@@ -9,9 +9,8 @@ use MailSo\Mime\Enumerations\Header;
 
 class Sync
 {
-	public
-		$oImapSource,
-		$oImapTarget;
+	public \MailSo\Imap\ImapClient $oImapSource;
+	public \MailSo\Imap\ImapClient $oImapTarget;
 
 	function import(string $sTargetRootFolderName = '')
 	{
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/backup.php b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/backup.php
new file mode 100644
index 000000000..280724f80
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/backup.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * This class is inspired by PEAR Crypt_GPG and PECL gnupg
+ * It does not support gpg v1 because that is missing ECDH, ECDSA, EDDSA
+ * It does not support gpg < v2.2.5 as they are from before 2018
+ */
+
+namespace SnappyMail\PGP;
+
+class Backup
+{
+	public static function PGPKey(string $key, string $keyId = '') : bool
+	{
+		$oActions = \RainLoop\Api::Actions();
+		$oAccount = $oActions->getMainAccountFromToken();
+		if ($oAccount) {
+			$keyId = $keyId ? "0x{$keyId}" : \sha1($key);
+			$dir = $oActions->StorageProvider()->GenerateFilePath(
+				$oAccount,
+				\RainLoop\Providers\Storage\Enumerations\StorageType::PGP,
+				true
+			);
+			if (\str_contains($key, 'PGP PRIVATE KEY')) {
+				$hash = $oAccount->CryptKey();
+				$key = \SnappyMail\Crypt::Encrypt($key, $hash);
+				$key[1] = \base64_encode($key[1]);
+				$key[2] = \base64_encode($key[2]);
+				$key[] = \hash_hmac('sha1', $key[2], $hash);
+				return !!\file_put_contents("{$dir}{$keyId}.key", \json_encode($key));
+			}
+			if (\str_contains($key, 'PGP PUBLIC KEY')) {
+				return !!\file_put_contents("{$dir}{$keyId}_public.asc", $key);
+			}
+		}
+		return false;
+	}
+
+	public static function getKeys() : array
+	{
+		$result = [
+			'public' => [],
+			'private' => []
+		];
+		$oActions = \RainLoop\Api::Actions();
+		$oAccount = $oActions->getMainAccountFromToken();
+		if ($oAccount) {
+			$keyId = $keyId ? "0x{$keyId}" : \sha1($key);
+			$dir = $oActions->StorageProvider()->GenerateFilePath(
+				$oAccount,
+				\RainLoop\Providers\Storage\Enumerations\StorageType::PGP,
+				true
+			);
+			$hash = $oAccount->CryptKey();
+			foreach (\glob("{$dir}*") as $file) {
+				if (\is_file($file)) {
+					if ('_public.asc' === \substr($file, -11)) {
+						$result['public'][] = [
+							'id' => \basename($file),
+							'value' => \file_get_contents($file),
+						];
+					} else if ('.key' === \substr($file, -4)) {
+						$key = \json_decode(\file_get_contents($file));
+						if (\is_array($key)) {
+							$mac = \array_pop($key);
+							if (!empty($key[2]) && \hash_hmac('sha1', $key[2], $hash) === $mac) {
+								$key[1] = \base64_decode($key[1]);
+								$key[2] = \base64_decode($key[2]);
+								$result['private'][] = [
+									'id' => \basename($file),
+									'value' => \SnappyMail\Crypt::Decrypt($key, $hash),
+								];
+							}
+						}
+					}
+				}
+			}
+		}
+		return $result;
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php b/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php
index 8586e1590..715815dad 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php
@@ -130,13 +130,14 @@ abstract class Upgrade
 			if (!$aData) {
 				$aData = static::DecodeKeyValues($sData);
 				if ($aData) {
-					$oActions->setContactsSyncData($oAccount, $aData);
-					return array(
+					$aData = array(
 						'Mode' => empty($aData['Enable']) ? 0 : 1,
 						'Url' => isset($aData['Url']) ? \trim($aData['Url']) : '',
 						'User' => isset($aData['User']) ? \trim($aData['User']) : '',
 						'Password' => isset($aData['Password']) ? $aData['Password'] : ''
 					);
+					$oActions->setContactsSyncData($oAccount, $aData);
+					return $aData;
 				}
 			}
 		}
diff --git a/snappymail/v/0.0.0/app/localization/ar-SA/user.json b/snappymail/v/0.0.0/app/localization/ar-SA/user.json
index f043cad32..93ed31fc4 100644
--- a/snappymail/v/0.0.0/app/localization/ar-SA/user.json
+++ b/snappymail/v/0.0.0/app/localization/ar-SA/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "ضفّ حساب"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobile version",
-		"BUTTON_DESKTOP_VERSION": "Desktop version"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "البحث المطور",
 		"TEXT": "النص",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "تحذير! لم يتم إرفاق جميع المرفقات",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "لم تنتهي عملية الإرفاق بعد",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"BUTTON_REQUEST_READ_RECEIPT": "اطلب اعلاماً بالقراءة",
 		"BUTTON_MARK_AS_IMPORTANT": "تحديده كـ هام",
 		"BUTTON_REQUEST_DSN": "اطلب اعلاماً بايصال البريد",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "هل أنت متأكد من رغبتك باغلاق هذه النافذة؟",
 		"DESC_WANT_DELETE_MESSAGES": "هل أنت متأكد من رغبتك بحذف هذه الرسائل؟"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "بدون إنقسام",
 		"LAYOUT_VERTICAL_SPLIT": "إنقسام عمودي",
 		"LAYOUT_HORIZONTAL_SPLIT": "إنقسام أفقي",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "المحرر النصي الأساسي",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "عادي",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": " توليد مفتاح",
 		"TITLE_PRIVATE": "خاص",
 		"TITLE_PUBLIC": "عام",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/bg-BG/user.json b/snappymail/v/0.0.0/app/localization/bg-BG/user.json
index cd05a03b8..60821d489 100644
--- a/snappymail/v/0.0.0/app/localization/bg-BG/user.json
+++ b/snappymail/v/0.0.0/app/localization/bg-BG/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Добави акаунт"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Мобилна версия",
-		"BUTTON_DESKTOP_VERSION": "Десктоп версия"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Разширено търсене",
 		"TEXT": "Текст",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Внимание! Не всички прикачени файлове са качени.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Все още не са качени всички прикрепени файлове",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Автоматично запазване на чернова",
 		"BUTTON_REQUEST_READ_RECEIPT": "Поискайте разписка за прочитане на съобщението",
 		"BUTTON_MARK_AS_IMPORTANT": "Отбележи като важно",
 		"BUTTON_REQUEST_DSN": "Уведомяване при доставка",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Сигурни ли сте, че желаете да затворите този прозорец?",
 		"DESC_WANT_DELETE_MESSAGES": "Сигурни ли сте, че желаете да изтриете съобщението\/съобщенията?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Не разделяй",
 		"LAYOUT_VERTICAL_SPLIT": "Вертикално разделяне",
 		"LAYOUT_HORIZONTAL_SPLIT": "Хоризонтално разделяне",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Текстов редактор по подразбиране",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Чист текст",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Генерирай ключ",
 		"TITLE_PRIVATE": "Частен",
 		"TITLE_PUBLIC": "Публичен",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Автоматично запазване на чернова",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
index 51ca5bfe7..3a00d277d 100644
--- a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
+++ b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Přidat účet"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobilní verze",
-		"BUTTON_DESKTOP_VERSION": "Desktop verze"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Rozšířené hledání",
 		"TEXT": "Text",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Upozornění! Některé přílohy nebyly nahrány.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Některé přílohy ještě nebyly nahrány",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automaticky uložit koncept",
 		"BUTTON_REQUEST_READ_RECEIPT": "Vyžádat si potvrzení o přečtení",
 		"BUTTON_MARK_AS_IMPORTANT": "Označit jako důležité",
 		"BUTTON_REQUEST_DSN": "Vyžádat si potvrzení o přijetí",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Opravdu chcete zavřít toto okno?",
 		"DESC_WANT_DELETE_MESSAGES": "Opravdu chcete odstranit tyto zprávy?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Nerozdělovat",
 		"LAYOUT_VERTICAL_SPLIT": "Vertikální rozdělení",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontální rozdělení",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Přednastavený editor zpráv",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Text",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Generovat klíče",
 		"TITLE_PRIVATE": "Soukromý",
 		"TITLE_PUBLIC": "Veřejný",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automaticky uložit koncept",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/da-DK/user.json b/snappymail/v/0.0.0/app/localization/da-DK/user.json
index e41fe4431..e6f503be8 100644
--- a/snappymail/v/0.0.0/app/localization/da-DK/user.json
+++ b/snappymail/v/0.0.0/app/localization/da-DK/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Tilføj konto"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobil udgave",
-		"BUTTON_DESKTOP_VERSION": "Desktop udgave"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Avanceret søgning",
 		"TEXT": "Tekst",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Advarsels! Ikke alle vedhæftninger er overført.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Overførsel af vedhæftninger igang.",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Gem kladde automatisk",
 		"BUTTON_REQUEST_READ_RECEIPT": "Bed om kvittering for læsning",
 		"BUTTON_MARK_AS_IMPORTANT": "Markér som vigtig",
 		"BUTTON_REQUEST_DSN": "Bed om kvittering for modtagelse",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Vil du lukke vinduet?",
 		"DESC_WANT_DELETE_MESSAGES": "Vil du slette denne\/disse meddelelse(r)?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Del ikke",
 		"LAYOUT_VERTICAL_SPLIT": "Del lodret",
 		"LAYOUT_HORIZONTAL_SPLIT": "Del vandret",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Standard tekst program",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Plain",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Generer nøgler",
 		"TITLE_PRIVATE": "Privat",
 		"TITLE_PUBLIC": "Offentlig",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Gem kladde automatisk",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/de-DE/user.json b/snappymail/v/0.0.0/app/localization/de-DE/user.json
index d2421af1a..287deef0b 100644
--- a/snappymail/v/0.0.0/app/localization/de-DE/user.json
+++ b/snappymail/v/0.0.0/app/localization/de-DE/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Konto hinzufügen"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobile Version",
-		"BUTTON_DESKTOP_VERSION": "Desktop Version"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Erweiterte Suche",
 		"TEXT": "Text",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Warnung! Nicht alle Anhänge wurden hochgeladen.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Es wurden noch nicht alle Anhänge hochgeladen.",
 		"ALLOW_SPELLCHECK": "Rechtschreibprüfung durch den Browser zulassen",
+		"ALLOW_DRAFT_AUTOSAVE": "Entwurf automatisch speichern",
 		"BUTTON_REQUEST_READ_RECEIPT": "Empfangsbestätigung anfordern",
 		"BUTTON_MARK_AS_IMPORTANT": "Als Wichtig markieren",
 		"BUTTON_REQUEST_DSN": "Übermittlungsstatus anfordern",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Sind Sie sicher, dass Sie dieses Fenster schließen möchten?",
 		"DESC_WANT_DELETE_MESSAGES": "Sind Sie sicher, dass Sie diese Nachricht(en) löschen möchten?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Keine Aufteilung",
 		"LAYOUT_VERTICAL_SPLIT": "Vertikale Aufteilung",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontale Aufteilung",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Standard-Texteditor",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Unformatierter Text",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Schlüssel generieren",
 		"TITLE_PRIVATE": "Privat",
 		"TITLE_PUBLIC": "Öffentlich",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Entwurf automatisch speichern",
 		"GET_MAILVELOPE": "Lade das Mailvelope Browser Addon herunter."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/el-GR/user.json b/snappymail/v/0.0.0/app/localization/el-GR/user.json
index 55c23e253..6f5606842 100644
--- a/snappymail/v/0.0.0/app/localization/el-GR/user.json
+++ b/snappymail/v/0.0.0/app/localization/el-GR/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Προσθήκη λογαριασμού"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobile version",
-		"BUTTON_DESKTOP_VERSION": "Desktop version"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Προχωρημένη αναζήτηση",
 		"TEXT": "Κείμενο",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Προειδοποίηση! Δεν έχουν μεταφορτωθεί όλα τα συνημμένα.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Δεν έχουν μεταφορτωθεί ακόμη όλα τα συνημμένα.",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"BUTTON_REQUEST_READ_RECEIPT": "Ζητήστε αποδεικτικό ανάγνωσης",
 		"BUTTON_MARK_AS_IMPORTANT": "Σημειώστε το σαν σημαντικό",
 		"BUTTON_REQUEST_DSN": "Ζητήστε αποδεικτικό παράδοσης",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Είστε σίγουροι πως θέλετε να κλείσετε αυτό το παράθυρο;",
 		"DESC_WANT_DELETE_MESSAGES": "Είστε σίγουροι πως θέλετε να διαγράψετε το (τα) μήνυμα(τα);"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Χωρίς χώρισμα",
 		"LAYOUT_VERTICAL_SPLIT": "Κάθετο χώρισμα",
 		"LAYOUT_HORIZONTAL_SPLIT": "Οριζόντιο χώρισμα",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Προεπιλεγμένος συντάκτης κειμένου",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Απλό",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Generate Keys",
 		"TITLE_PRIVATE": "Private",
 		"TITLE_PUBLIC": "Public",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/en-GB/user.json b/snappymail/v/0.0.0/app/localization/en-GB/user.json
index 933980260..7ff63f786 100644
--- a/snappymail/v/0.0.0/app/localization/en-GB/user.json
+++ b/snappymail/v/0.0.0/app/localization/en-GB/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Add Account"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobile version",
-		"BUTTON_DESKTOP_VERSION": "Desktop version"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Advanced Search",
 		"TEXT": "Text",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Warning! Not all attachments have been uploaded.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet.",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"BUTTON_REQUEST_READ_RECEIPT": "Request a read receipt",
 		"BUTTON_MARK_AS_IMPORTANT": "Mark as important",
 		"BUTTON_REQUEST_DSN": "Request a delivery receipt",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Are you sure you want to close this window?",
 		"DESC_WANT_DELETE_MESSAGES": "Are you sure you want to delete the message(s)?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "No Split",
 		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Default text editor",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Plain",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Generate Key Pair",
 		"TITLE_PRIVATE": "Private",
 		"TITLE_PUBLIC": "Public",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/en/user.json b/snappymail/v/0.0.0/app/localization/en/user.json
index ac2320991..eb9f1b0c8 100644
--- a/snappymail/v/0.0.0/app/localization/en/user.json
+++ b/snappymail/v/0.0.0/app/localization/en/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Add Account"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobile version",
-		"BUTTON_DESKTOP_VERSION": "Desktop version"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Advanced Search",
 		"TEXT": "Text",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Warning! Not all attachments have been uploaded.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet.",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"BUTTON_REQUEST_READ_RECEIPT": "Request a read receipt",
 		"BUTTON_MARK_AS_IMPORTANT": "Mark as important",
 		"BUTTON_REQUEST_DSN": "Request a delivery receipt",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Are you sure you want to close this window?",
 		"DESC_WANT_DELETE_MESSAGES": "Are you sure you want to delete the message(s)?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "No Split",
 		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Default text editor",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Plain",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Generate Key Pair",
 		"TITLE_PRIVATE": "Private",
 		"TITLE_PUBLIC": "Public",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/es-ES/user.json b/snappymail/v/0.0.0/app/localization/es-ES/user.json
index 43b49cbe2..d4c1b198b 100644
--- a/snappymail/v/0.0.0/app/localization/es-ES/user.json
+++ b/snappymail/v/0.0.0/app/localization/es-ES/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Agregar cuenta"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Versión móvil",
-		"BUTTON_DESKTOP_VERSION": "Versión escritorio"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Búsqueda avanzada",
 		"TEXT": "Texto",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "¡Atención! No se han subido todos los archivos adjuntos.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "No se han subido todos los archivos adjuntos.",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"BUTTON_REQUEST_READ_RECEIPT": "Solicitar confirmación de lectura",
 		"BUTTON_MARK_AS_IMPORTANT": "Marcar como importante",
 		"BUTTON_REQUEST_DSN": "Solicitar una confirmación de entrega",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "¿Está seguro de que desea cerrar esta ventana?",
 		"DESC_WANT_DELETE_MESSAGES": "¿Está seguro de que desea eliminar los mensajes?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Sin División",
 		"LAYOUT_VERTICAL_SPLIT": "División Vertical",
 		"LAYOUT_HORIZONTAL_SPLIT": "División Horizontal",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Editor de texto predeterminado",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Texto plano",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Generar llaves",
 		"TITLE_PRIVATE": "Privado",
 		"TITLE_PUBLIC": "Público",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/et-EE/user.json b/snappymail/v/0.0.0/app/localization/et-EE/user.json
index 0b5474294..77509a464 100644
--- a/snappymail/v/0.0.0/app/localization/et-EE/user.json
+++ b/snappymail/v/0.0.0/app/localization/et-EE/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Lisa konto"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobiiliversioon",
-		"BUTTON_DESKTOP_VERSION": "Töölauaversioon"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Täpsem otsing",
 		"TEXT": "Tekst",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Tähelepanu! Kõiki manuseid ei ole üles laetud.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Kõiki manuseid ei ole veel üles laetud.",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"BUTTON_REQUEST_READ_RECEIPT": "Palu lugemise kohta kinnitust",
 		"BUTTON_MARK_AS_IMPORTANT": "Tähista olulisena",
 		"BUTTON_REQUEST_DSN": "Palu kättesaamise kohta kinnitust",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Kas oled kindel, et soovid akna sulgeda?",
 		"DESC_WANT_DELETE_MESSAGES": "Kas oled kindel, et soovid sõnumi(d) kustutada?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Jaotuseta",
 		"LAYOUT_VERTICAL_SPLIT": "Vertikaalse jaotusega",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horisontaalse jaotusega",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Vaikimisi tekstiredaktor",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Lihttekst",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Genereeri võti",
 		"TITLE_PRIVATE": "Privaatne",
 		"TITLE_PUBLIC": "Avalik",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/eu/user.json b/snappymail/v/0.0.0/app/localization/eu/user.json
index e1c65ebc9..68f8cceb2 100644
--- a/snappymail/v/0.0.0/app/localization/eu/user.json
+++ b/snappymail/v/0.0.0/app/localization/eu/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Gehitu kontua"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mugikorreko bertsioa",
-		"BUTTON_DESKTOP_VERSION": "Mahaigaineko bertsioa"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Bilaketa aurreratua",
 		"TEXT": "Testua",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Kontuz! Eranskin guztiak ez dira kargatu.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Eranskin guztiak ez dira kargatu oraindik.",
 		"ALLOW_SPELLCHECK": "Gaitu nabigatzaileko hizkuntza-zuzentzailea",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatikoi gorde zirriborroa",
 		"BUTTON_REQUEST_READ_RECEIPT": "Eskatu irakurketa-agiria",
 		"BUTTON_MARK_AS_IMPORTANT": "MArkatu garrantzitsu bezala",
 		"BUTTON_REQUEST_DSN": "Eskatu jasotze-agiria",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Ziur zaude leiho hau itxi nahi duzula?",
 		"DESC_WANT_DELETE_MESSAGES": "Ziur zaude mezua(k) ezabatu nahi d(it)uzula?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Zatitu gabe",
 		"LAYOUT_VERTICAL_SPLIT": "Zatiketa bertikala",
 		"LAYOUT_HORIZONTAL_SPLIT": "Zatiketa horizontala",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Berezko testu editorea",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Formaturik gabea",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Sortu Gako Parea",
 		"TITLE_PRIVATE": "Pribatua",
 		"TITLE_PUBLIC": "Publikoa",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatikoi gorde zirriborroa",
 		"GET_MAILVELOPE": "Lortu Mailvelope nabigatzaileko gehigarria."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/user.json b/snappymail/v/0.0.0/app/localization/fa-IR/user.json
index 1ff3f2870..f2914e80a 100644
--- a/snappymail/v/0.0.0/app/localization/fa-IR/user.json
+++ b/snappymail/v/0.0.0/app/localization/fa-IR/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "ساخت کاربر"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "نسخه موبایل",
-		"BUTTON_DESKTOP_VERSION": "نسخه رومیزی"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "جستجوی پیشرفته",
 		"TEXT": "متن",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "اخطار! همه پیوست‌ها هنوز بارگذاری نشده است.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "همه پیوست‌ها هنوز بارگذاری نشده است.",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "ذخیره خودکار پیش‌نویس",
 		"BUTTON_REQUEST_READ_RECEIPT": "درخواست دریافت رسید خواندن",
 		"BUTTON_MARK_AS_IMPORTANT": "علامت زدن به عنوان مهم",
 		"BUTTON_REQUEST_DSN": "درخواست دریافت رسید تحویل درمقصد",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "آیا از بستن این پنجره مطمئن هستید؟",
 		"DESC_WANT_DELETE_MESSAGES": "آیا از حذف این پیام(ها) اطمینان دارید؟"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "بدون تقسیم",
 		"LAYOUT_VERTICAL_SPLIT": "تقسیم عمودی",
 		"LAYOUT_HORIZONTAL_SPLIT": "تقسیم افقی",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "ویرایشگر پیش‌فرض",
 		"EDITOR_HTML": "تحت فرمت Html",
 		"EDITOR_PLAIN": "ساده",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "تولید کلیدهای",
 		"TITLE_PRIVATE": "خصوصی",
 		"TITLE_PUBLIC": "عمومی",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "ذخیره خودکار پیش‌نویس",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/user.json b/snappymail/v/0.0.0/app/localization/fi-FI/user.json
index b8364eaf8..a29e4e846 100644
--- a/snappymail/v/0.0.0/app/localization/fi-FI/user.json
+++ b/snappymail/v/0.0.0/app/localization/fi-FI/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Lisää tili"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobiiliversio",
-		"BUTTON_DESKTOP_VERSION": "Työpöytäversio"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Tarkka haku",
 		"TEXT": "Teksti",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Huom! Yhtään liitetiedostoa ei ole ladattu.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Kaikkia liitetiedostoja ei ole vielä ladattu.",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"BUTTON_REQUEST_READ_RECEIPT": "Pyydä kuittaus",
 		"BUTTON_MARK_AS_IMPORTANT": "Merkitse tärkeäksi",
 		"BUTTON_REQUEST_DSN": "Pyydä toimituskuittaus",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Haluatko varmasti sulkea tämän ikkunan?",
 		"DESC_WANT_DELETE_MESSAGES": "Haluatko varmasti poistaa viestin\/viestit?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Ei jakoa",
 		"LAYOUT_VERTICAL_SPLIT": "Pystysuora jako",
 		"LAYOUT_HORIZONTAL_SPLIT": "Vaakataso jako",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Oletus tekstieditori",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Pelkkä teksti",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Luo avain",
 		"TITLE_PRIVATE": "Yksityinen",
 		"TITLE_PUBLIC": "Julkinen",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json b/snappymail/v/0.0.0/app/localization/fr-FR/admin.json
index 947fb06cf..5cb3f3b12 100644
--- a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fr-FR/admin.json
@@ -125,8 +125,8 @@
 		"LABEL_PORT": "Port",
 		"LABEL_SECURE": "Sécurité",
 		"TIMEOUT": "Timeout",
-		"DISABLE_CAPABILITIES": "Disable capabilities",
-		"LIMITS": "Limits",
+		"DISABLE_CAPABILITIES": "Désactiver les fonctionnalités",
+		"LIMITS": "Limites",
 		"FOLDERS": "Folders",
 		"MESSAGES": "Messages",
 		"LABEL_WHITE_LIST": "Liste Blanche",
diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/user.json b/snappymail/v/0.0.0/app/localization/fr-FR/user.json
index 6162589f2..0fb02cb90 100644
--- a/snappymail/v/0.0.0/app/localization/fr-FR/user.json
+++ b/snappymail/v/0.0.0/app/localization/fr-FR/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Ajouter un compte"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Version mobile",
-		"BUTTON_DESKTOP_VERSION": "Version grand écran"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Recherche avancée",
 		"TEXT": "Texte",
@@ -103,10 +99,10 @@
 		"EMPTY_LIST": "Liste vide.",
 		"EMPTY_SEARCH_LIST": "Aucun message ne correspond à votre recherche.",
 		"SEARCH_RESULT_FOR": "Résultats de recherche pour \"%SEARCH%\"",
-		"BACK_TO_MESSAGE_LIST": "retour à la liste des messages",
+		"BACK_TO_MESSAGE_LIST": "Retour à la liste des messages",
 		"PUT_MESSAGE_HERE": "Glisser un message ici pour l'afficher dans la liste",
-		"TODAY_AT": "aujourd'hui à %TIME%",
-		"YESTERDAY_AT": "hier à %TIME%",
+		"TODAY_AT": "Aujourd'hui à %TIME%",
+		"YESTERDAY_AT": "Hier à %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "Vous avez %COUNT% nouveaux messages !",
 		"QUOTA_SIZE": "Vous utilisez <strong>%SIZE% (%PROC%%)<\/strong> sur <strong>%LIMIT%<\/strong>",
 		"SORT": "Trier",
@@ -173,7 +169,7 @@
 	"CONTACTS": {
 		"TAB_CONTACT": "Contact",
 		"TAB_LOCATIONS": "Localisations",
-		"TAB_BUSINESS": "Professionel",
+		"TAB_BUSINESS": "professionnel",
 		"LABEL_ORGANIZATION": "Entreprise",
 		"LABEL_DEPARTMENT": "Service",
 		"LABEL_TITLE": "Titre",
@@ -211,7 +207,7 @@
 		"BUTTON_SYNC": "Synchronisation (CardDAV)"
 	},
 	"COMPOSE": {
-		"LINK_SHOW_INPUTS": "voir tous les champs",
+		"LINK_SHOW_INPUTS": "Voir tous les champs",
 		"BUTTON_SEND": "Envoyer",
 		"BUTTON_MINIMIZE": "Réduire",
 		"SAVED_TIME": "Enregistré à %TIME%",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Attention ! Toutes les pièces jointes n'ont pas été téléchargées.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Toutes les pièces jointes n'ont pas encore été téléchargées",
 		"ALLOW_SPELLCHECK": "Activer le vérificateur d'orthographe du navigateur",
+		"ALLOW_DRAFT_AUTOSAVE": "Brouillon sauvegardé automatiquement",
 		"BUTTON_REQUEST_READ_RECEIPT": "Demander une confirmation de lecture",
 		"BUTTON_MARK_AS_IMPORTANT": "Marquer comme important",
 		"BUTTON_REQUEST_DSN": "Demander un accusé de réception",
 		"BUTTON_REQUIRE_TLS": "Exiger une livraison sécurisée"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Êtes-vous sûr de vouloir quitter ?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Êtes-vous sûr de vouloir fermer cette fenêtre ?",
 		"DESC_WANT_DELETE_MESSAGES": "Êtes-vous sûr de vouloir supprimer ce(s) message(s) ?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Pas de séparation",
 		"LAYOUT_VERTICAL_SPLIT": "Séparation verticale",
 		"LAYOUT_HORIZONTAL_SPLIT": "Séparation horizontale",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Éditeur de texte par défaut",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Non-formaté",
@@ -403,7 +402,7 @@
 		"PREFER_HTML": "Préférer le HTML au texte brut",
 		"PREFER_HTML_INFO": "Les messages arrivent parfois dans les deux formats. Cette option contrôle si vous voulez que la partie HTML ou la partie texte brut soit affichée.",
 		"REMOVE_COLORS": "Supprimer les couleurs d'arrière-plan et de texte du message",
-		"ALLOW_STYLES": "Autoriser <style> CSS",
+		"ALLOW_STYLES": "Allow <style> CSS",
 		"MESSAGE_PER_PAGE": "Messages par page",
 		"CHECK_MAIL_INTERVAL": "Vérifier le messagerie à l'intervalle",
 		"MARK_MESSAGE_READ_AFTER": "Marquer le message comme lu après",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Générer les clés",
 		"TITLE_PRIVATE": "Privée",
 		"TITLE_PUBLIC": "Publique",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Brouillon sauvegardé automatiquement",
 		"GET_MAILVELOPE": "Obtenez le module complémentaire de navigateur Mailvelope"
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/user.json b/snappymail/v/0.0.0/app/localization/hu-HU/user.json
index 9dcfd868d..39e950a95 100644
--- a/snappymail/v/0.0.0/app/localization/hu-HU/user.json
+++ b/snappymail/v/0.0.0/app/localization/hu-HU/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Fiók hozzáadás"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobil verzió",
-		"BUTTON_DESKTOP_VERSION": "Asztali verzió"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Részletes keresés",
 		"TEXT": "Szöveg",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Figyelem! Még nem lett feltöltve minden melléklet.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Még nem lett feltöltve minden melléklet.",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Piszkozat automatikus mentése",
 		"BUTTON_REQUEST_READ_RECEIPT": "Olvasási visszaigazolás kérése",
 		"BUTTON_MARK_AS_IMPORTANT": "Megjelölés fontosként",
 		"BUTTON_REQUEST_DSN": "Továbbítási visszaigazolás kérés",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Biztos, hogy be akarod zárni ezt az ablakot?",
 		"DESC_WANT_DELETE_MESSAGES": "Biztos, hogy törölni akarod az üzenete(ke)t?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Felosztás nélkül",
 		"LAYOUT_VERTICAL_SPLIT": "Függőleges felosztás",
 		"LAYOUT_HORIZONTAL_SPLIT": "Vízszintes felosztás",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Alapértelmezett szövegszerkesztő",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Egyszerű",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Kulcs generálás",
 		"TITLE_PRIVATE": "Privát",
 		"TITLE_PUBLIC": "Publikus",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Piszkozat automatikus mentése",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/id-ID/user.json b/snappymail/v/0.0.0/app/localization/id-ID/user.json
index 17c54d199..4bb0c583c 100644
--- a/snappymail/v/0.0.0/app/localization/id-ID/user.json
+++ b/snappymail/v/0.0.0/app/localization/id-ID/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Tambah Akun"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Versi Mobile",
-		"BUTTON_DESKTOP_VERSION": "Versi Desktop"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Pencarian Rinci",
 		"TEXT": "Teks",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Peringatan! belum semua lampiran terunggah.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Belum semua lampiran terunggah.",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Simpan konsep otomatis",
 		"BUTTON_REQUEST_READ_RECEIPT": "Minta pemberitahuan telah dibaca",
 		"BUTTON_MARK_AS_IMPORTANT": "Tandai sebagai pesan penting",
 		"BUTTON_REQUEST_DSN": "Minta pemberitahuan berhasil kirim",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Anda yakin untuk menutup jendela ini?",
 		"DESC_WANT_DELETE_MESSAGES": "Anda yakin menghapus permanen pesan ini?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Tanpa pemisah",
 		"LAYOUT_VERTICAL_SPLIT": "Pemisah vertikal",
 		"LAYOUT_HORIZONTAL_SPLIT": "Pemisah horizontal",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Editor teks bawaan",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Polos",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Buat kunci",
 		"TITLE_PRIVATE": "Pribadi",
 		"TITLE_PUBLIC": "Publik",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Simpan konsep otomatis",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/is-IS/user.json b/snappymail/v/0.0.0/app/localization/is-IS/user.json
index 5bada4e3f..cff781729 100644
--- a/snappymail/v/0.0.0/app/localization/is-IS/user.json
+++ b/snappymail/v/0.0.0/app/localization/is-IS/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Bæta við aðgangi"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Farsímaútgáfa",
-		"BUTTON_DESKTOP_VERSION": "Vinnutölvuútgáfa"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Ítarleg leit",
 		"TEXT": "Texti",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Aðvörun! Ekki er búið að senda inn öll viðhengi.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Ekki er búið að senda inn öll viðhengi.",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Vista drög sjálfkrafa",
 		"BUTTON_REQUEST_READ_RECEIPT": "Biðja um staðfestingu á lestri",
 		"BUTTON_MARK_AS_IMPORTANT": "Merkja sem mikilvægt",
 		"BUTTON_REQUEST_DSN": "Biðja um staðfestingu á afhendingu",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Ertu viss um að þú viljir loka þessum glugga?",
 		"DESC_WANT_DELETE_MESSAGES": "Ertu viss um að þú viljir eyða skeytunum?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Ekki klofið",
 		"LAYOUT_VERTICAL_SPLIT": "Klofið lóðrétt",
 		"LAYOUT_HORIZONTAL_SPLIT": "Klofið lárétt",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Sjálfgefinn textaritill",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Venjulegt",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Búa til lykla",
 		"TITLE_PRIVATE": "Einkalykill",
 		"TITLE_PUBLIC": "Dreifilykill",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Vista drög sjálfkrafa",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/it-IT/user.json b/snappymail/v/0.0.0/app/localization/it-IT/user.json
index 164703d7d..f061d13e4 100644
--- a/snappymail/v/0.0.0/app/localization/it-IT/user.json
+++ b/snappymail/v/0.0.0/app/localization/it-IT/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Aggiungi account"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Versione mobile",
-		"BUTTON_DESKTOP_VERSION": "Versione desktop"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Ricerca avanzata",
 		"TEXT": "Messaggio",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Attenzione! Non tutti gli allegati sono stati caricati.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Non tutti gli allegati sono stati caricati al momento.",
 		"ALLOW_SPELLCHECK": "Abilita il controllo ortografico del browser",
+		"ALLOW_DRAFT_AUTOSAVE": "Salva automaticamente la bozza",
 		"BUTTON_REQUEST_READ_RECEIPT": "Richiedi conferma di lettura",
 		"BUTTON_MARK_AS_IMPORTANT": "Marca come importante",
 		"BUTTON_REQUEST_DSN": "Richiedi conferma del ricevimento",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Sei sicuro di voler chiudere questa finestra?",
 		"DESC_WANT_DELETE_MESSAGES": "Sei sicuro di voler eliminare il messaggio?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "A pagina intera",
 		"LAYOUT_VERTICAL_SPLIT": "Divisione verticale",
 		"LAYOUT_HORIZONTAL_SPLIT": "Divisione orizzontale",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Editor di testo predefinito",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Testo semplice",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Genera chiave",
 		"TITLE_PRIVATE": "Privata",
 		"TITLE_PUBLIC": "Pubblica",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Salva automaticamente la bozza",
 		"GET_MAILVELOPE": "Installa l'estensione browser Mailvelope."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/user.json b/snappymail/v/0.0.0/app/localization/ja-JP/user.json
index 6472f2549..6e5adcc4f 100644
--- a/snappymail/v/0.0.0/app/localization/ja-JP/user.json
+++ b/snappymail/v/0.0.0/app/localization/ja-JP/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "アカウントを追加"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "モバイル版",
-		"BUTTON_DESKTOP_VERSION": "デスクトップ版"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "高度な検索",
 		"TEXT": "キーワード",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "警告！すべての添付ファイルがアップロードされているわけではありません。",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "すべての添付ファイルがアップロードされているわけではありません。",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "下書きを自動的に保存する",
 		"BUTTON_REQUEST_READ_RECEIPT": "開封確認を要求する",
 		"BUTTON_MARK_AS_IMPORTANT": "重要フラグをつける",
 		"BUTTON_REQUEST_DSN": "配信確認を要求する",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "このウインドウを閉じていいですか？",
 		"DESC_WANT_DELETE_MESSAGES": "メッセージを削除していいですか？"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "分割しない",
 		"LAYOUT_VERTICAL_SPLIT": "縦に分割",
 		"LAYOUT_HORIZONTAL_SPLIT": "横に分割",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "メール形式",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "プレーンテキスト",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "キーを生成",
 		"TITLE_PRIVATE": "プライベート",
 		"TITLE_PUBLIC": "パブリック",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "下書きを自動的に保存する",
 		"GET_MAILVELOPE": "Mailvelopeのブラウザアドオンを入手する"
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/ko-KR/user.json b/snappymail/v/0.0.0/app/localization/ko-KR/user.json
index a5f962ac5..65d1d06b0 100644
--- a/snappymail/v/0.0.0/app/localization/ko-KR/user.json
+++ b/snappymail/v/0.0.0/app/localization/ko-KR/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "계정 추가"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "모바일 버전",
-		"BUTTON_DESKTOP_VERSION": "데스크탑 버전"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "고급 검색",
 		"TEXT": "본문",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "경고! 모든 첨부파일이 업로드 되지 않습니다.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "첨부파일이 아직 업로드되지 않았습니다.",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "작성 중인 메시지 자동 저장",
 		"BUTTON_REQUEST_READ_RECEIPT": "수신 확인 요청",
 		"BUTTON_MARK_AS_IMPORTANT": "중요 표시",
 		"BUTTON_REQUEST_DSN": "수신 확인 요청",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "정말로 이 페이지를 닫으시겠습니까 ?",
 		"DESC_WANT_DELETE_MESSAGES": "정말로 선택한 메세지를 삭제하시겠습니까 ?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "분할 해제",
 		"LAYOUT_VERTICAL_SPLIT": "세로 분할",
 		"LAYOUT_HORIZONTAL_SPLIT": "가로 분할",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "기본 텍스트 편집기",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "평문",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "키 생성",
 		"TITLE_PRIVATE": "비공개",
 		"TITLE_PUBLIC": "공개",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "작성 중인 메시지 자동 저장",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/user.json b/snappymail/v/0.0.0/app/localization/lt-LT/user.json
index 42b794081..cf8daede8 100644
--- a/snappymail/v/0.0.0/app/localization/lt-LT/user.json
+++ b/snappymail/v/0.0.0/app/localization/lt-LT/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Pridėti paskyrą"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobili versija",
-		"BUTTON_DESKTOP_VERSION": "Standartinė versija"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Detali paieška",
 		"TEXT": "Laiško Tekstas",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Dėmesio! Ne visi priedai buvo įkelti.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Dar ne visi priedai buvo įkelti",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"BUTTON_REQUEST_READ_RECEIPT": "Prašyti pranešti kada bus perskaitytas",
 		"BUTTON_MARK_AS_IMPORTANT": "Žymėti svarbiu",
 		"BUTTON_REQUEST_DSN": "Prašyti laiško gavimo pažymos",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Ar tikrai norite uždaryti šį langą??",
 		"DESC_WANT_DELETE_MESSAGES": "Ar tikrai norite ištrinti pranešimą(us)?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Skaidymo nėra",
 		"LAYOUT_VERTICAL_SPLIT": "Vertikalus skaidymas",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontalus skaidymas",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Numatytas teksto redaktorius",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Paprastas",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Sukurti raktus",
 		"TITLE_PRIVATE": "Privatus",
 		"TITLE_PUBLIC": "Viešas",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/lv-LV/user.json b/snappymail/v/0.0.0/app/localization/lv-LV/user.json
index 646af4515..d7cf21ae5 100644
--- a/snappymail/v/0.0.0/app/localization/lv-LV/user.json
+++ b/snappymail/v/0.0.0/app/localization/lv-LV/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Pievienot kontu"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobilā versija",
-		"BUTTON_DESKTOP_VERSION": "Darba virsmas versija"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Papildus meklēšana",
 		"TEXT": "Teksts",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Warning! Not all attachments have been uploaded.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"BUTTON_REQUEST_READ_RECEIPT": "Request a read receipt",
 		"BUTTON_MARK_AS_IMPORTANT": "Mark as important",
 		"BUTTON_REQUEST_DSN": "Request a delivery receipt",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Are you sure you want to close this window?",
 		"DESC_WANT_DELETE_MESSAGES": "Are you sure you want to delete the message(s)?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "No Split",
 		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Galvenais teksta editors",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Teksts",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Generate Keys",
 		"TITLE_PRIVATE": "Private",
 		"TITLE_PUBLIC": "Public",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/user.json b/snappymail/v/0.0.0/app/localization/nb-NO/user.json
index 430b88ef1..37614ddbc 100644
--- a/snappymail/v/0.0.0/app/localization/nb-NO/user.json
+++ b/snappymail/v/0.0.0/app/localization/nb-NO/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Legg til konto"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobilversjon",
-		"BUTTON_DESKTOP_VERSION": "Skrivebordsversjon"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Avansert søk",
 		"TEXT": "Tekst",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Advarsel: ett eller flere vedlegg er ikke blitt lastet opp enda.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Ett eller flere vedlegg er ikke blitt lastet opp enda",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Lagre utkast automatisk",
 		"BUTTON_REQUEST_READ_RECEIPT": "Be om en bekreftelse fra mottaker på at meldinga er lest",
 		"BUTTON_MARK_AS_IMPORTANT": "Marker som viktig",
 		"BUTTON_REQUEST_DSN": "Be om leveringsbekreftelse",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Er du sikker på at du vil lukke dette vinduet?",
 		"DESC_WANT_DELETE_MESSAGES": "Er du sikker på at du vil slette meldingen(e)?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Ingen deling",
 		"LAYOUT_VERTICAL_SPLIT": "Vertikal deling",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horisontal deling",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Standard tekstbehandler",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Ren tekst",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Lag nøkler",
 		"TITLE_PRIVATE": "Privat",
 		"TITLE_PUBLIC": "Offentlig",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Lagre utkast automatisk",
 		"GET_MAILVELOPE": "Få nettlesertillegg Mailvelope."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/user.json b/snappymail/v/0.0.0/app/localization/nl-NL/user.json
index 98d79c36b..85f81b194 100644
--- a/snappymail/v/0.0.0/app/localization/nl-NL/user.json
+++ b/snappymail/v/0.0.0/app/localization/nl-NL/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Account toevoegen"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobiele versie",
-		"BUTTON_DESKTOP_VERSION": "Desktop versie"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Geavanceerd zoeken",
 		"TEXT": "Tekst",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Waarschuwing! Nog niet alle bijlagen zijn klaar met uploaden",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Toevoegen van bijlage(n) is nog niet gereed",
 		"ALLOW_SPELLCHECK": "De browser spellingcontrole toestaan",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatisch opslaan as concept",
 		"BUTTON_REQUEST_READ_RECEIPT": "Leesbevestiging vragen",
 		"BUTTON_MARK_AS_IMPORTANT": "Markeer als belangrijk",
 		"BUTTON_REQUEST_DSN": "Ontvangstbevestiging vragen",
 		"BUTTON_REQUIRE_TLS": "Veilige bezorging vereisen"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Weet u zeker dat u dit venster wilt sluiten?",
 		"DESC_WANT_DELETE_MESSAGES": "Weet u zeker dat u dit\/deze bericht\/berichten wilt verwijderen?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Geen splitsing",
 		"LAYOUT_VERTICAL_SPLIT": "Verticale splitsing",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontale splitsing",
+		"SHOW_NEXT_MESSAGE": "Toon volgende bericht bij verplaatsen huidige bericht",
 		"EDITOR": "Standaard tekst editor",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Platte tekst",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Genereer sleutels",
 		"TITLE_PRIVATE": "Privé sleutel",
 		"TITLE_PUBLIC": "Publieke sleutel",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatisch opslaan as concept",
 		"GET_MAILVELOPE": "Verkrijg Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/user.json b/snappymail/v/0.0.0/app/localization/pl-PL/user.json
index 679f83659..eab1baae8 100644
--- a/snappymail/v/0.0.0/app/localization/pl-PL/user.json
+++ b/snappymail/v/0.0.0/app/localization/pl-PL/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Dodaj konto"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Wersja mobilna",
-		"BUTTON_DESKTOP_VERSION": "Wersja desktopowa"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Wyszukiwanie zaawansowane",
 		"TEXT": "Tekst",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Ostrzeżenie! Nie wszystkie załączniki zostały przesłane na serwer.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Jeszcze nie wszystkie załączniki zostały przesłane na serwer.",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatycznie zapisuj szkic",
 		"BUTTON_REQUEST_READ_RECEIPT": "Żądaj potwierdzenia przeczytania wiadomości",
 		"BUTTON_MARK_AS_IMPORTANT": "Oznacz jako ważną",
 		"BUTTON_REQUEST_DSN": "Żądaj potwierdzenia dostarczenia wiadomości",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Na pewno chcesz zamknąć to okno?",
 		"DESC_WANT_DELETE_MESSAGES": "Na pewno chcesz usunąć wiadomość(-ci)?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "bez podziału",
 		"LAYOUT_VERTICAL_SPLIT": "podział w pionie",
 		"LAYOUT_HORIZONTAL_SPLIT": "podział w poziomie",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Format wiadomości",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "zwykły tekst",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Generuj klucz",
 		"TITLE_PRIVATE": "Prywatny",
 		"TITLE_PUBLIC": "Publiczny",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatycznie zapisuj szkic",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/user.json b/snappymail/v/0.0.0/app/localization/pt-BR/user.json
index bedb39200..c581d7540 100644
--- a/snappymail/v/0.0.0/app/localization/pt-BR/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt-BR/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Adicionar Conta"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Versão Mobile",
-		"BUTTON_DESKTOP_VERSION": "Versão Desktop"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Pesquisa Avançada",
 		"TEXT": "Texto",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Alerta! Nem todos os arquivos foram anexados.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Alguns anexos ainda não foram completamente enviados",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Salvar automaticamente rascunho",
 		"BUTTON_REQUEST_READ_RECEIPT": "Pedir recibo de leitura",
 		"BUTTON_MARK_AS_IMPORTANT": "Marcar como importante",
 		"BUTTON_REQUEST_DSN": "Pedir recibo de entrega",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Você tem certeza que deseja fechar esta janela?",
 		"DESC_WANT_DELETE_MESSAGES": "Você tem certeza de que deseja excluir essa(s) mensagem(s)?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Sem divisão",
 		"LAYOUT_VERTICAL_SPLIT": "Divisão Vertical",
 		"LAYOUT_HORIZONTAL_SPLIT": "Divisão Horizontal",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Editor de texto padrão",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Texto Simples",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Gerar chave",
 		"TITLE_PRIVATE": "Privado",
 		"TITLE_PUBLIC": "Público",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Salvar automaticamente rascunho",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/pt-PT/admin.json b/snappymail/v/0.0.0/app/localization/pt-PT/admin.json
index 15b3156d4..dd4661f96 100644
--- a/snappymail/v/0.0.0/app/localization/pt-PT/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt-PT/admin.json
@@ -151,7 +151,7 @@
 	"POPUPS_ASK": {
 		"BUTTON_YES": "Sim",
 		"BUTTON_NO": "Não",
-		"DESC_WANT_CLOSE_THIS_WINDOW": "Tem a certeza de que quer fechar esta janela?"
+		"DESC_WANT_CLOSE_THIS_WINDOW": "Quer mesmo fechar esta janela?"
 	},
 	"POPUPS_LANGUAGES": {
 		"TITLE_LANGUAGES": "Escolha o seu idioma"
diff --git a/snappymail/v/0.0.0/app/localization/pt-PT/user.json b/snappymail/v/0.0.0/app/localization/pt-PT/user.json
index efdd3d5b1..00275c851 100644
--- a/snappymail/v/0.0.0/app/localization/pt-PT/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt-PT/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Adicionar conta"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Versão móvel",
-		"BUTTON_DESKTOP_VERSION": "Versão computador"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Pesquisa avançada",
 		"TEXT": "Texto",
@@ -69,13 +65,13 @@
 		"SUBFOLDERS_SUBTREE": "Todas",
 		"SUBFOLDERS_SUBTREE_ONE": "Um nível",
 		"REPLIED": "Respondidas",
-		"KEYWORD": "Tag"
+		"KEYWORD": "Etiqueta"
 	},
 	"FOLDER_LIST": {
-		"BUTTON_COMPOSE": "Compor",
+		"BUTTON_COMPOSE": "Escrever",
 		"BUTTON_NEW_MESSAGE": "Nova mensagem",
 		"INBOX_NAME": "Caixa de entrada",
-		"SENT_NAME": "Correio enviado",
+		"SENT_NAME": "Enviadas",
 		"DRAFTS_NAME": "Rascunhos",
 		"TRASH_NAME": "Lixo",
 		"ARCHIVE_NAME": "Arquivo"
@@ -95,14 +91,14 @@
 		"MENU_UNSET_FLAG": "Remover sinalização",
 		"MENU_SELECT_ALL": "Todas",
 		"MENU_SELECT_INVERT": "Inverter",
-		"MENU_SELECT_UNSEEN": "Não lida",
-		"MENU_SELECT_SEEN": "Lida",
-		"MENU_SELECT_FLAGGED": "Sinalizada",
-		"MENU_SELECT_UNFLAGGED": "Não sinalizada",
-		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
+		"MENU_SELECT_UNSEEN": "Não lidas",
+		"MENU_SELECT_SEEN": "Lidas",
+		"MENU_SELECT_FLAGGED": "Sinalizadas",
+		"MENU_SELECT_UNFLAGGED": "Não sinalizadas",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Descarregar todos os anexos",
 		"EMPTY_LIST": "Lista vazia.",
 		"EMPTY_SEARCH_LIST": "Nenhuma mensagem corresponde à sua pesquisa.",
-		"SEARCH_RESULT_FOR": "Resultados de pesquisa para \"%SEARCH%\"",
+		"SEARCH_RESULT_FOR": "Resultados da pesquisa para \"%SEARCH%\"",
 		"BACK_TO_MESSAGE_LIST": "voltar à lista de mensagens",
 		"PUT_MESSAGE_HERE": "Coloque a mensagem aqui para vê-la na lista",
 		"TODAY_AT": "hoje às %TIME%",
@@ -146,13 +142,13 @@
 		"LABEL_FROM_SHORT": "de",
 		"LABEL_TO_SHORT": "para",
 		"PRINT_LABEL_ATTACHMENTS": "Anexos",
-		"MESSAGE_VIEW_DESC": "Selecione uma mensagem na lista para ver o conteúdo aqui.",
+		"MESSAGE_VIEW_DESC": "Escolha uma mensagem na lista para ver o conteúdo aqui.",
 		"MESSAGE_VIEW_MOVE_DESC": "Clique no nome da pasta no painel da esquerda para escolher o destino.",
 		"LINK_DOWNLOAD_AS_ZIP": "Transferir em arquivo zip",
 		"SPAM_SCORE": "Pontuação de Spam",
 		"HAS_VIRUS_WARNING": "AVISO: vírus detetado",
-		"TAGS": "Marcadores",
-		"NEW_TAG": "Novo marcador"
+		"TAGS": "Etiquetas",
+		"NEW_TAG": "Nova etiqueta"
 	},
 	"MESSAGE_TAGS": {
 		"$important": "Importante",
@@ -192,7 +188,7 @@
 		"EMPTY_LIST": "Nenhum contacto aqui",
 		"EMPTY_SEARCH": "Nenhum contacto encontrado",
 		"CLEAR_SEARCH": "Limpar pesquisa",
-		"CONTACT_VIEW_DESC": "Selecione o contacto na lista para visualizá-lo.",
+		"CONTACT_VIEW_DESC": "Escolha o contacto na lista para visualizá-lo.",
 		"LABEL_BIRTHDAY": "Aniversário",
 		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Introduza o nome a apresentar",
 		"PLACEHOLDER_ENTER_LAST_NAME": "Introduza o último nome",
@@ -206,7 +202,7 @@
 		"ADD_MENU_URL": "Website",
 		"ADD_MENU_ADDRESS": "Morada",
 		"ADD_MENU_BIRTHDAY": "Aniversário",
-		"ADD_MENU_TAGS": "Marcadores",
+		"ADD_MENU_TAGS": "Etiquetas",
 		"BUTTON_SHARE_ALL": "Todos",
 		"BUTTON_SYNC": "Sincronização (CardDAV)"
 	},
@@ -214,8 +210,8 @@
 		"LINK_SHOW_INPUTS": "Mostrar todos os campos",
 		"BUTTON_SEND": "Enviar",
 		"BUTTON_MINIMIZE": "Minimizar",
-		"SAVED_TIME": "Guardado às %TIME%",
-		"SAVED_ERROR_ON_SEND": "A sua mensagem foi enviada, mas não foi guardada na pasta dos itens enviados.",
+		"SAVED_TIME": "Guardada às %TIME%",
+		"SAVED_ERROR_ON_SEND": "A sua mensagem foi enviada, mas não foi guardada na pasta das mensagens enviadas.",
 		"DISCARD_UNSAVED_DATA": "Rejeitar o conteúdo que não foi guardado?",
 		"ATTACH_FILES": "Anexar ficheiros",
 		"ATTACH_DROP_FILES_DESC": "Arraste os ficheiros para aqui",
@@ -227,14 +223,16 @@
 		"ATTACHMENTS_ERROR_DESC": "Aviso! Nem todos os anexos foram carregados.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Ainda não foram carregados todos os anexos",
 		"ALLOW_SPELLCHECK": "Ativar corretor ortográfico do navegador",
+		"ALLOW_DRAFT_AUTOSAVE": "Guardar rascunho automaticamente",
 		"BUTTON_REQUEST_READ_RECEIPT": "Pedir um recibo de leitura",
 		"BUTTON_MARK_AS_IMPORTANT": "Marcar como importante",
 		"BUTTON_REQUEST_DSN": "Pedir um recibo de entrega",
 		"BUTTON_REQUIRE_TLS": "Exigir entrega segura"
 	},
 	"POPUPS_ASK": {
-		"DESC_WANT_CLOSE_THIS_WINDOW": "Tem a certeza de que quer fechar esta janela?",
-		"DESC_WANT_DELETE_MESSAGES": "Tem a certeza de que quer eliminar a(s) mensagem(s)?"
+		"EXIT_ARE_YOU_SURE": "Quer mesmo sair?",
+		"DESC_WANT_CLOSE_THIS_WINDOW": "Quer mesmo fechar esta janela?",
+		"DESC_WANT_DELETE_MESSAGES": "Quer mesmo eliminar a(s) mensagem(ns)?"
 	},
 	"POPUPS_LANGUAGES": {
 		"TITLE_LANGUAGES": "Escolha o seu idioma"
@@ -261,7 +259,7 @@
 	"POPUPS_CLEAR_FOLDER": {
 		"TITLE_CLEAR_FOLDER": "Eliminar todas as mensagens da pasta?",
 		"DANGER_DESC_WARNING": "Aviso!",
-		"DANGER_DESC_HTML_1": "Esta ação irá resultar na remoção definitiva de todos os e-mails na pasta <strong>%FOLDER%<\/strong>.",
+		"DANGER_DESC_HTML_1": "Esta ação irá resultar na eliminação definitiva de todos os e-mails na pasta <strong>%FOLDER%<\/strong>.",
 		"DANGER_DESC_HTML_2": "Uma vez iniciado, o processo não pode ser interrompido ou cancelado.",
 		"TITLE_CLEARING_PROCESS": "A eliminar a pasta..."
 	},
@@ -332,14 +330,14 @@
 		"CHANGES_NEED_TO_BE_SAVED_DESC": "Estas alterações têm que ser guardadas no sevidor."
 	},
 	"POPUPS_SYSTEM_FOLDERS": {
-		"TITLE_SYSTEM_FOLDERS": "Selecione as pastas de sistema",
+		"TITLE_SYSTEM_FOLDERS": "Escolha as pastas de sistema",
 		"SELECT_CHOOSE_ONE": "Escolha uma",
 		"SELECT_UNUSE_NAME": "Não usar",
-		"NOTIFICATION_SENT": "Você não selecionou a pasta \"Sent\" de sistema, onde as mensagens enviadas são colocadas.\nSe você não quiser guardar as mensagens enviadas, por favor selecione a opção \"Não usar\".\n",
-		"NOTIFICATION_DRAFTS": "Você não selecionou a pasta \"Drafts\" de sistema, onde as mensagens são guardadas enquanto são escritas.",
-		"NOTIFICATION_SPAM": "Você não selecionou a pasta \"Spam\" de sistema, onde as mensagens de spam são colocadas.\nSe você deseja remover as mensagens definitivamente, por favor selecione a opção \"Não usar\".\n",
-		"NOTIFICATION_TRASH": "Você não selecionou a pasta \"Trash\" de sistema, onde as mensagens eliminadas são colocadas.\nSe você deseja remover as mensagens definitivamente, por favor selecione a opção \"Não usar\".\n",
-		"NOTIFICATION_ARCHIVE": "Você não selecionou a pasta \"Archive\" de sistema, onde as mensagens arquivadas são colocadas."
+		"NOTIFICATION_SENT": "Não escolheu a pasta de sistema \"Enviadas\", onde as mensagens enviadas são colocadas.\nSe não quiser guardar as mensagens enviadas, por favor escolha a opção \"Não usar\".\n",
+		"NOTIFICATION_DRAFTS": "Não escolheu a pasta de sistema \"Rascunhos\", onde as mensagens são guardadas enquanto são escritas.",
+		"NOTIFICATION_SPAM": "Não escolheu a pasta de sistema \"Spam\", onde as mensagens de spam são colocadas.\nSe quiser eliminar as mensagens definitivamente, por favor escolha a opção \"Não usar\".\n",
+		"NOTIFICATION_TRASH": "Não escolheu a pasta de sistema \"Lixo\", onde as mensagens eliminadas são colocadas.\nSe quiser eliminar as mensagens definitivamente, por favor escolha a opção \"Não usar\".\n",
+		"NOTIFICATION_ARCHIVE": "Não escolheu a pasta de sistema \"Arquivo\", onde as mensagens arquivadas são colocadas."
 	},
 	"TITLES": {
 		"MAILBOX": "Caixa de correio",
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Sem separação",
 		"LAYOUT_VERTICAL_SPLIT": "Separação vertical",
 		"LAYOUT_HORIZONTAL_SPLIT": "Separação horizontal",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Editor de texto padrão",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Texto simples",
@@ -403,7 +402,7 @@
 		"PREFER_HTML": "Preferir HTML em vez de texto simples",
 		"PREFER_HTML_INFO": "Por vezes as mensagens são recebidas em ambos os formatos. Esta opção determina se prefere apresentar o conteúdo em HTML ou em texto simples.",
 		"REMOVE_COLORS": "Retirar imagens de fundo e coloração de texto do corpo das mensagens",
-		"ALLOW_STYLES": "Allow <style> CSS",
+		"ALLOW_STYLES": "Permitir estilos CSS",
 		"MESSAGE_PER_PAGE": "Mensagens por página",
 		"CHECK_MAIL_INTERVAL": "Intervalo de verificação do correio",
 		"MARK_MESSAGE_READ_AFTER": "Marcar mensagem como lida após",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Gerar chaves",
 		"TITLE_PRIVATE": "Privada",
 		"TITLE_PUBLIC": "Pública",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Guardar rascunho automaticamente",
 		"GET_MAILVELOPE": "Obter extensão Mailvelope para o navegador."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/pt/admin.json b/snappymail/v/0.0.0/app/localization/pt/admin.json
index 15b3156d4..dd4661f96 100644
--- a/snappymail/v/0.0.0/app/localization/pt/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt/admin.json
@@ -151,7 +151,7 @@
 	"POPUPS_ASK": {
 		"BUTTON_YES": "Sim",
 		"BUTTON_NO": "Não",
-		"DESC_WANT_CLOSE_THIS_WINDOW": "Tem a certeza de que quer fechar esta janela?"
+		"DESC_WANT_CLOSE_THIS_WINDOW": "Quer mesmo fechar esta janela?"
 	},
 	"POPUPS_LANGUAGES": {
 		"TITLE_LANGUAGES": "Escolha o seu idioma"
diff --git a/snappymail/v/0.0.0/app/localization/pt/user.json b/snappymail/v/0.0.0/app/localization/pt/user.json
index efdd3d5b1..00275c851 100644
--- a/snappymail/v/0.0.0/app/localization/pt/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Adicionar conta"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Versão móvel",
-		"BUTTON_DESKTOP_VERSION": "Versão computador"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Pesquisa avançada",
 		"TEXT": "Texto",
@@ -69,13 +65,13 @@
 		"SUBFOLDERS_SUBTREE": "Todas",
 		"SUBFOLDERS_SUBTREE_ONE": "Um nível",
 		"REPLIED": "Respondidas",
-		"KEYWORD": "Tag"
+		"KEYWORD": "Etiqueta"
 	},
 	"FOLDER_LIST": {
-		"BUTTON_COMPOSE": "Compor",
+		"BUTTON_COMPOSE": "Escrever",
 		"BUTTON_NEW_MESSAGE": "Nova mensagem",
 		"INBOX_NAME": "Caixa de entrada",
-		"SENT_NAME": "Correio enviado",
+		"SENT_NAME": "Enviadas",
 		"DRAFTS_NAME": "Rascunhos",
 		"TRASH_NAME": "Lixo",
 		"ARCHIVE_NAME": "Arquivo"
@@ -95,14 +91,14 @@
 		"MENU_UNSET_FLAG": "Remover sinalização",
 		"MENU_SELECT_ALL": "Todas",
 		"MENU_SELECT_INVERT": "Inverter",
-		"MENU_SELECT_UNSEEN": "Não lida",
-		"MENU_SELECT_SEEN": "Lida",
-		"MENU_SELECT_FLAGGED": "Sinalizada",
-		"MENU_SELECT_UNFLAGGED": "Não sinalizada",
-		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
+		"MENU_SELECT_UNSEEN": "Não lidas",
+		"MENU_SELECT_SEEN": "Lidas",
+		"MENU_SELECT_FLAGGED": "Sinalizadas",
+		"MENU_SELECT_UNFLAGGED": "Não sinalizadas",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Descarregar todos os anexos",
 		"EMPTY_LIST": "Lista vazia.",
 		"EMPTY_SEARCH_LIST": "Nenhuma mensagem corresponde à sua pesquisa.",
-		"SEARCH_RESULT_FOR": "Resultados de pesquisa para \"%SEARCH%\"",
+		"SEARCH_RESULT_FOR": "Resultados da pesquisa para \"%SEARCH%\"",
 		"BACK_TO_MESSAGE_LIST": "voltar à lista de mensagens",
 		"PUT_MESSAGE_HERE": "Coloque a mensagem aqui para vê-la na lista",
 		"TODAY_AT": "hoje às %TIME%",
@@ -146,13 +142,13 @@
 		"LABEL_FROM_SHORT": "de",
 		"LABEL_TO_SHORT": "para",
 		"PRINT_LABEL_ATTACHMENTS": "Anexos",
-		"MESSAGE_VIEW_DESC": "Selecione uma mensagem na lista para ver o conteúdo aqui.",
+		"MESSAGE_VIEW_DESC": "Escolha uma mensagem na lista para ver o conteúdo aqui.",
 		"MESSAGE_VIEW_MOVE_DESC": "Clique no nome da pasta no painel da esquerda para escolher o destino.",
 		"LINK_DOWNLOAD_AS_ZIP": "Transferir em arquivo zip",
 		"SPAM_SCORE": "Pontuação de Spam",
 		"HAS_VIRUS_WARNING": "AVISO: vírus detetado",
-		"TAGS": "Marcadores",
-		"NEW_TAG": "Novo marcador"
+		"TAGS": "Etiquetas",
+		"NEW_TAG": "Nova etiqueta"
 	},
 	"MESSAGE_TAGS": {
 		"$important": "Importante",
@@ -192,7 +188,7 @@
 		"EMPTY_LIST": "Nenhum contacto aqui",
 		"EMPTY_SEARCH": "Nenhum contacto encontrado",
 		"CLEAR_SEARCH": "Limpar pesquisa",
-		"CONTACT_VIEW_DESC": "Selecione o contacto na lista para visualizá-lo.",
+		"CONTACT_VIEW_DESC": "Escolha o contacto na lista para visualizá-lo.",
 		"LABEL_BIRTHDAY": "Aniversário",
 		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Introduza o nome a apresentar",
 		"PLACEHOLDER_ENTER_LAST_NAME": "Introduza o último nome",
@@ -206,7 +202,7 @@
 		"ADD_MENU_URL": "Website",
 		"ADD_MENU_ADDRESS": "Morada",
 		"ADD_MENU_BIRTHDAY": "Aniversário",
-		"ADD_MENU_TAGS": "Marcadores",
+		"ADD_MENU_TAGS": "Etiquetas",
 		"BUTTON_SHARE_ALL": "Todos",
 		"BUTTON_SYNC": "Sincronização (CardDAV)"
 	},
@@ -214,8 +210,8 @@
 		"LINK_SHOW_INPUTS": "Mostrar todos os campos",
 		"BUTTON_SEND": "Enviar",
 		"BUTTON_MINIMIZE": "Minimizar",
-		"SAVED_TIME": "Guardado às %TIME%",
-		"SAVED_ERROR_ON_SEND": "A sua mensagem foi enviada, mas não foi guardada na pasta dos itens enviados.",
+		"SAVED_TIME": "Guardada às %TIME%",
+		"SAVED_ERROR_ON_SEND": "A sua mensagem foi enviada, mas não foi guardada na pasta das mensagens enviadas.",
 		"DISCARD_UNSAVED_DATA": "Rejeitar o conteúdo que não foi guardado?",
 		"ATTACH_FILES": "Anexar ficheiros",
 		"ATTACH_DROP_FILES_DESC": "Arraste os ficheiros para aqui",
@@ -227,14 +223,16 @@
 		"ATTACHMENTS_ERROR_DESC": "Aviso! Nem todos os anexos foram carregados.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Ainda não foram carregados todos os anexos",
 		"ALLOW_SPELLCHECK": "Ativar corretor ortográfico do navegador",
+		"ALLOW_DRAFT_AUTOSAVE": "Guardar rascunho automaticamente",
 		"BUTTON_REQUEST_READ_RECEIPT": "Pedir um recibo de leitura",
 		"BUTTON_MARK_AS_IMPORTANT": "Marcar como importante",
 		"BUTTON_REQUEST_DSN": "Pedir um recibo de entrega",
 		"BUTTON_REQUIRE_TLS": "Exigir entrega segura"
 	},
 	"POPUPS_ASK": {
-		"DESC_WANT_CLOSE_THIS_WINDOW": "Tem a certeza de que quer fechar esta janela?",
-		"DESC_WANT_DELETE_MESSAGES": "Tem a certeza de que quer eliminar a(s) mensagem(s)?"
+		"EXIT_ARE_YOU_SURE": "Quer mesmo sair?",
+		"DESC_WANT_CLOSE_THIS_WINDOW": "Quer mesmo fechar esta janela?",
+		"DESC_WANT_DELETE_MESSAGES": "Quer mesmo eliminar a(s) mensagem(ns)?"
 	},
 	"POPUPS_LANGUAGES": {
 		"TITLE_LANGUAGES": "Escolha o seu idioma"
@@ -261,7 +259,7 @@
 	"POPUPS_CLEAR_FOLDER": {
 		"TITLE_CLEAR_FOLDER": "Eliminar todas as mensagens da pasta?",
 		"DANGER_DESC_WARNING": "Aviso!",
-		"DANGER_DESC_HTML_1": "Esta ação irá resultar na remoção definitiva de todos os e-mails na pasta <strong>%FOLDER%<\/strong>.",
+		"DANGER_DESC_HTML_1": "Esta ação irá resultar na eliminação definitiva de todos os e-mails na pasta <strong>%FOLDER%<\/strong>.",
 		"DANGER_DESC_HTML_2": "Uma vez iniciado, o processo não pode ser interrompido ou cancelado.",
 		"TITLE_CLEARING_PROCESS": "A eliminar a pasta..."
 	},
@@ -332,14 +330,14 @@
 		"CHANGES_NEED_TO_BE_SAVED_DESC": "Estas alterações têm que ser guardadas no sevidor."
 	},
 	"POPUPS_SYSTEM_FOLDERS": {
-		"TITLE_SYSTEM_FOLDERS": "Selecione as pastas de sistema",
+		"TITLE_SYSTEM_FOLDERS": "Escolha as pastas de sistema",
 		"SELECT_CHOOSE_ONE": "Escolha uma",
 		"SELECT_UNUSE_NAME": "Não usar",
-		"NOTIFICATION_SENT": "Você não selecionou a pasta \"Sent\" de sistema, onde as mensagens enviadas são colocadas.\nSe você não quiser guardar as mensagens enviadas, por favor selecione a opção \"Não usar\".\n",
-		"NOTIFICATION_DRAFTS": "Você não selecionou a pasta \"Drafts\" de sistema, onde as mensagens são guardadas enquanto são escritas.",
-		"NOTIFICATION_SPAM": "Você não selecionou a pasta \"Spam\" de sistema, onde as mensagens de spam são colocadas.\nSe você deseja remover as mensagens definitivamente, por favor selecione a opção \"Não usar\".\n",
-		"NOTIFICATION_TRASH": "Você não selecionou a pasta \"Trash\" de sistema, onde as mensagens eliminadas são colocadas.\nSe você deseja remover as mensagens definitivamente, por favor selecione a opção \"Não usar\".\n",
-		"NOTIFICATION_ARCHIVE": "Você não selecionou a pasta \"Archive\" de sistema, onde as mensagens arquivadas são colocadas."
+		"NOTIFICATION_SENT": "Não escolheu a pasta de sistema \"Enviadas\", onde as mensagens enviadas são colocadas.\nSe não quiser guardar as mensagens enviadas, por favor escolha a opção \"Não usar\".\n",
+		"NOTIFICATION_DRAFTS": "Não escolheu a pasta de sistema \"Rascunhos\", onde as mensagens são guardadas enquanto são escritas.",
+		"NOTIFICATION_SPAM": "Não escolheu a pasta de sistema \"Spam\", onde as mensagens de spam são colocadas.\nSe quiser eliminar as mensagens definitivamente, por favor escolha a opção \"Não usar\".\n",
+		"NOTIFICATION_TRASH": "Não escolheu a pasta de sistema \"Lixo\", onde as mensagens eliminadas são colocadas.\nSe quiser eliminar as mensagens definitivamente, por favor escolha a opção \"Não usar\".\n",
+		"NOTIFICATION_ARCHIVE": "Não escolheu a pasta de sistema \"Arquivo\", onde as mensagens arquivadas são colocadas."
 	},
 	"TITLES": {
 		"MAILBOX": "Caixa de correio",
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Sem separação",
 		"LAYOUT_VERTICAL_SPLIT": "Separação vertical",
 		"LAYOUT_HORIZONTAL_SPLIT": "Separação horizontal",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Editor de texto padrão",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Texto simples",
@@ -403,7 +402,7 @@
 		"PREFER_HTML": "Preferir HTML em vez de texto simples",
 		"PREFER_HTML_INFO": "Por vezes as mensagens são recebidas em ambos os formatos. Esta opção determina se prefere apresentar o conteúdo em HTML ou em texto simples.",
 		"REMOVE_COLORS": "Retirar imagens de fundo e coloração de texto do corpo das mensagens",
-		"ALLOW_STYLES": "Allow <style> CSS",
+		"ALLOW_STYLES": "Permitir estilos CSS",
 		"MESSAGE_PER_PAGE": "Mensagens por página",
 		"CHECK_MAIL_INTERVAL": "Intervalo de verificação do correio",
 		"MARK_MESSAGE_READ_AFTER": "Marcar mensagem como lida após",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Gerar chaves",
 		"TITLE_PRIVATE": "Privada",
 		"TITLE_PUBLIC": "Pública",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Guardar rascunho automaticamente",
 		"GET_MAILVELOPE": "Obter extensão Mailvelope para o navegador."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/ro-RO/user.json b/snappymail/v/0.0.0/app/localization/ro-RO/user.json
index a1e440942..8284e233f 100644
--- a/snappymail/v/0.0.0/app/localization/ro-RO/user.json
+++ b/snappymail/v/0.0.0/app/localization/ro-RO/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Adaugă un cont"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Versiunea de mobil",
-		"BUTTON_DESKTOP_VERSION": "Versiunea desktop"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Căutare avansată",
 		"TEXT": "Conținut",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Warning! Not all attachments have been uploaded.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Salvează ciorna automat",
 		"BUTTON_REQUEST_READ_RECEIPT": "Cere confirmare de citire",
 		"BUTTON_MARK_AS_IMPORTANT": "Mark as important",
 		"BUTTON_REQUEST_DSN": "Request a delivery receipt",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Sigur doriți să închideți această fereastră?",
 		"DESC_WANT_DELETE_MESSAGES": "Sigur doriți să ștergeți mesajul(e)?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "No Split",
 		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Editor de text implicit",
 		"EDITOR_HTML": "Formatat",
 		"EDITOR_PLAIN": "Simplu",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Generate Keys",
 		"TITLE_PRIVATE": "Private",
 		"TITLE_PUBLIC": "Public",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Salvează ciorna automat",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/admin.json b/snappymail/v/0.0.0/app/localization/ru-RU/admin.json
index a85e85d9d..39ee8c21b 100644
--- a/snappymail/v/0.0.0/app/localization/ru-RU/admin.json
+++ b/snappymail/v/0.0.0/app/localization/ru-RU/admin.json
@@ -16,7 +16,7 @@
 		"BUTTON_LOGIN": "Войти в админ панель"
 	},
 	"TOP_PANEL": {
-		"LABEL_ADMIN_PANEL": "Админка"
+		"LABEL_ADMIN_PANEL": "Панель управления администратора"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Основные",
@@ -25,18 +25,18 @@
 		"CONTACTS": "Контакты",
 		"DOMAINS": "Домены",
 		"SECURITY": "Безопасность",
-		"PACKAGES": "Пакеты",
-		"CONFIG": "Config",
+		"PACKAGES": "Плагины",
+		"CONFIG": "Файл конфигурации",
 		"ABOUT": "О Программе"
 	},
 	"TAB_GENERAL": {
 		"LEGEND_INTERFACE": "Интерфейс",
 		"LABEL_LANGUAGE": "Язык",
-		"LABEL_LANGUAGE_ADMIN": "Язык (Админ)",
-		"LABEL_THEME": "Тема",
+		"LABEL_LANGUAGE_ADMIN": "Язык (Панели Администратора)",
+		"LABEL_THEME": "Темы",
 		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Разрешить выбор языка на экране настроек",
 		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Разрешить выбор темы на экране настроек",
-		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Allow background selection on settings screen",
+		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Разрешить выбор фона на экране настроек",
 		"LABEL_SHOW_THUMBNAILS": "Показывать миниатюры (для вложений)",
 		"LEGEND_MAIN": "Основное",
 		"LABEL_ATTACHMENT_SIZE_LIMIT": "Предельный размер вложений",
@@ -76,7 +76,7 @@
 	"TAB_DOMAINS": {
 		"LEGEND_DOMAINS": "Домены",
 		"BUTTON_ADD_DOMAIN": "Добавить домен",
-		"BUTTON_ADD_ALIAS": "Добавить Алиас",
+		"BUTTON_ADD_ALIAS": "Добавить псевдоним",
 		"DELETE_ARE_YOU_SURE": "Вы уверены?",
 		"HTML_DOMAINS_HELPER": "Список доменов к которым разрешен доступ.\n<br>\nНажмите на имя, чтобы настроить домен.\n"
 	},
@@ -85,7 +85,7 @@
 		"LABEL_USE_IMAGE_PROXY": "Использовать локальный прокси для внешних изображений",
 		"LABEL_ALLOW_OPEN_PGP": "Разрешить OpenPGP",
 		"LABEL_SHOW_PHP_INFO": "Показать PHP информацию",
-		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Admin Panel Access Credentials",
+		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Учетные данные для доступа к панели администратора",
 		"LABEL_CURRENT_PASSWORD": "Текущий пароль",
 		"LABEL_NEW_PASSWORD": "Новый пароль",
 		"LABEL_REPEAT_PASSWORD": "Повторить пароль",
@@ -108,11 +108,11 @@
 		"HTML_NEW_VERSION": "Новая <b>%VERSION%<\/b> версия доступна.",
 		"LABEL_UPDATING": "Обновление",
 		"LABEL_CHECKING": "Проверка",
-		"BUTTON_RELEASES": "Releases"
+		"BUTTON_RELEASES": "Релизы"
 	},
 	"POPUPS_DOMAIN_ALIAS": {
-		"TITLE_ADD_DOMAIN_ALIAS": "Добавить Алиас",
-		"LABEL_ALIAS": "Алиас",
+		"TITLE_ADD_DOMAIN_ALIAS": "Добавить псевдоним",
+		"LABEL_ALIAS": "Псевдоним",
 		"LABEL_DOMAIN": "Домен"
 	},
 	"POPUPS_DOMAIN": {
@@ -124,20 +124,20 @@
 		"LABEL_SERVER": "Сервер",
 		"LABEL_PORT": "Порт",
 		"LABEL_SECURE": "Безопасность",
-		"TIMEOUT": "Timeout",
-		"DISABLE_CAPABILITIES": "Disable capabilities",
+		"TIMEOUT": "Тайм-аут",
+		"DISABLE_CAPABILITIES": "Отключить функции",
 		"LIMITS": "Limits",
 		"FOLDERS": "Folders",
 		"MESSAGES": "Messages",
 		"LABEL_WHITE_LIST": "Белый список",
 		"SECURE_OPTION_NONE": "Нет",
-		"LABEL_ALLOW_SIEVE_SCRIPTS": "Разрешить sieve скрипты",
+		"LABEL_ALLOW_SIEVE_SCRIPTS": "Разрешить Sieve сценарии",
 		"LABEL_USE_SHORT_LOGIN": "Использовать короткий логин",
 		"LABEL_USE_AUTH": "Использовать аутентификацию",
-		"LABEL_SET_SENDER": "Use login as sender",
+		"LABEL_SET_SENDER": "Использовать логин в качестве отправителя",
 		"LABEL_USE_PHP_MAIL": "Использовать mail() функцию",
 		"BUTTON_WHITE_LIST": "Белый список",
-		"BUTTON_SIEVE_CONFIGURATION": "настройки Sieve",
+		"BUTTON_SIEVE_CONFIGURATION": "Настройки Sieve",
 		"BUTTON_BACK_TO_IMAP": "Назад к IMAP настройкам",
 		"BUTTON_BACK": "Назад",
 		"BUTTON_UPDATE": "Обновить",
@@ -149,8 +149,8 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Без настроек"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
+		"BUTTON_YES": "Да",
+		"BUTTON_NO": "Нет",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Вы уверены, что хотите закрыть это окно?"
 	},
 	"POPUPS_LANGUAGES": {
@@ -165,15 +165,15 @@
 		"UNKNOWN_ERROR": "Неизвестная ошибка"
 	},
 	"NOTIFICATIONS": {
-		"REQUEST_ERROR": "Request failed",
-		"REQUEST_ABORTED": "Request is aborted",
-		"REQUEST_TIMEOUT": "Request timed out",
+		"REQUEST_ERROR": "Запрос не выполнен",
+		"REQUEST_ABORTED": "Запрос прерван",
+		"REQUEST_TIMEOUT": "Истекло время запроса",
 		"INVALID_TOKEN": "Неверный токен запроса",
 		"AUTH_ERROR": "Не удалось авторизоваться",
 		"DOMAIN_ALREADY_EXISTS": "Домен уже существует",
 		"CANT_SAVE_PLUGIN_SETTINGS": "Не могу сохранить настройки",
-		"CANT_INSTALL_PACKAGE": "Ошибка установки пакета",
-		"CANT_DELETE_PACKAGE": "Ошибка удаления пакета",
+		"CANT_INSTALL_PACKAGE": "Ошибка установки плагина",
+		"CANT_DELETE_PACKAGE": "Ошибка удаления плагина",
 		"INVALID_PLUGIN_PACKAGE": "Ошибка пакета плагина",
 		"UNSUPPORTED_PLUGIN_PACKAGE": "Для работы плагина необходима полная поддержка сервера",
 		"UNKNOWN_ERROR": "Неизвестная ошибка"
diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/user.json b/snappymail/v/0.0.0/app/localization/ru-RU/user.json
index cc409eb78..0e3a31b9b 100644
--- a/snappymail/v/0.0.0/app/localization/ru-RU/user.json
+++ b/snappymail/v/0.0.0/app/localization/ru-RU/user.json
@@ -1,7 +1,7 @@
 {
 	"GLOBAL": {
-		"TO_ARCHIVE": "Архивирование",
-		"ARE_YOU_SURE": "Точно?",
+		"TO_ARCHIVE": "В архив",
+		"ARE_YOU_SURE": "Вы уверены?",
 		"BACK": "Назад",
 		"BCC": "Скрытая",
 		"CANCEL": "Отменить",
@@ -10,14 +10,14 @@
 		"CLOSE": "Закрыть (Esc)",
 		"CONTACTS": "Контакты",
 		"DELETE": "Удалить",
-		"DONE": "Закончить",
+		"DONE": "Завершить",
 		"EMAIL": "Почта",
 		"FROM": "От",
 		"LOADING": "Загрузка...",
 		"LOGOUT": "Выйти",
 		"MORE": "Еще",
-		"MOVE_TO": "Переместить",
-		"NAME": "Входящие",
+		"MOVE_TO": "Переместить в",
+		"NAME": "Имя отправителя",
 		"NONE": "Ничего",
 		"NOT_SPAM": "Не спам",
 		"USERNAME": "Имя пользователя",
@@ -25,17 +25,17 @@
 		"REMEMBER": "Remember",
 		"REPLY_TO": "Ответить-на",
 		"SAVE": "Сохранить",
-		"SAVE_CHANGES": "Save changes?",
-		"SEARCH": "Контакты не найдены",
+		"SAVE_CHANGES": "Сохранить изменения?",
+		"SEARCH": "Поиск",
 		"SPAM": "В спам",
 		"SUBJECT": "Тема",
 		"TEST": "Тест",
 		"TO": "Кому",
-		"SERVER_MESSAGE": "Server message",
+		"SERVER_MESSAGE": "Сообщение сервера",
 		"YES": "Да",
 		"NO": "Нет",
-		"INACTIVE": "Inactive",
-		"DEFAULT": "основной",
+		"INACTIVE": "Неактивно",
+		"DEFAULT": "По умолчанию",
 		"HELP": "Помощь"
 	},
 	"LOGIN": {
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Добавить ещё аккаунт"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Мобильная версия",
-		"BUTTON_DESKTOP_VERSION": "Полная версия"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Расширенный поиск писем",
 		"TEXT": "Текст",
@@ -64,12 +60,12 @@
 		"DATE_3_MONTHS": "За 3 месяца",
 		"DATE_6_MONTHS": "За полгода",
 		"DATE_YEAR": "За год",
-		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS": "Подпапки",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
 		"SUBFOLDERS_SUBTREE_ONE": "One level",
 		"REPLIED": "Ответил",
-		"KEYWORD": "Tag"
+		"KEYWORD": "Ключевое слово"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Написать",
@@ -93,31 +89,31 @@
 		"MENU_UNSET_SEEN": "Отметить как непрочитанное",
 		"MENU_SET_FLAG": "Установить флаг",
 		"MENU_UNSET_FLAG": "Снять флаг",
-		"MENU_SELECT_ALL": "Все",
+		"MENU_SELECT_ALL": "Выбрать все",
 		"MENU_SELECT_INVERT": "Инвентировать",
 		"MENU_SELECT_UNSEEN": "Непрочитанные",
 		"MENU_SELECT_SEEN": "Прочитанные",
 		"MENU_SELECT_FLAGGED": "Помеченные",
 		"MENU_SELECT_UNFLAGGED": "Без пометок",
-		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Скачать все вложения",
 		"EMPTY_LIST": "В папке нет писем.",
 		"EMPTY_SEARCH_LIST": "Письма не найдены.",
 		"SEARCH_RESULT_FOR": "Результат поиска \"%SEARCH%\"",
-		"BACK_TO_MESSAGE_LIST": "back to message list",
+		"BACK_TO_MESSAGE_LIST": "Вернуться к списку писем",
 		"PUT_MESSAGE_HERE": "Киньте сообщение сюда, чтобы посмотреть его в списке",
 		"TODAY_AT": "сегодня в %TIME%",
 		"YESTERDAY_AT": "вчера в %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "У вас %COUNT% новых сообщений!",
 		"QUOTA_SIZE": "Использовано <strong>%SIZE% (%PROC%%)<\/strong> из <strong>%LIMIT%<\/strong>",
-		"SORT": "Sort",
-		"SORT_DATE_ASC": "Date ascending",
-		"SORT_DATE_DESC": "Date descending",
-		"SORT_SIZE_ASC": "Size ascending",
-		"SORT_SIZE_DESC": "Size descending",
-		"SORT_SUBJECT_ASC": "Subject A-Z",
-		"SORT_SUBJECT_DESC": "Subject Z-A",
-		"SORT_FROM_ASC": "From A-Z",
-		"SORT_FROM_DESC": "From Z-A"
+		"SORT": "Сортировка",
+		"SORT_DATE_ASC": "Дата по возрастанию",
+		"SORT_DATE_DESC": "Дата по убыванию",
+		"SORT_SIZE_ASC": "Размер по возрастанию",
+		"SORT_SIZE_DESC": "Размер по убыванию",
+		"SORT_SUBJECT_ASC": "Тема А-Я",
+		"SORT_SUBJECT_DESC": "Тема Я-А",
+		"SORT_FROM_ASC": "От А-Я",
+		"SORT_FROM_DESC": "От Я-А"
 	},
 	"MESSAGE": {
 		"BUTTON_EDIT": "Редактировать",
@@ -137,29 +133,29 @@
 		"MENU_HEADERS": "Просмотреть заголовки",
 		"MENU_VIEW_ORIGINAL": "Просмотреть оригинал",
 		"HTML_VIEW": "View HTML message",
-		"PLAIN_VIEW": "View plain text message",
+		"PLAIN_VIEW": "Просмотр простого текстового сообщения",
 		"MENU_DOWNLOAD_ORIGINAL": "Скачать как .eml файл",
 		"MENU_FILTER_SIMILAR": "Фильтровать похожие",
 		"MENU_PRINT": "Распечатать",
 		"EMPTY_SUBJECT_TEXT": "(Без темы)",
 		"LABEL_DATE": "Дата",
-		"LABEL_FROM_SHORT": "от",
-		"LABEL_TO_SHORT": "кому",
+		"LABEL_FROM_SHORT": "От",
+		"LABEL_TO_SHORT": "Кому",
 		"PRINT_LABEL_ATTACHMENTS": "Файлы",
 		"MESSAGE_VIEW_DESC": "Выберите сообщение для просмотра.",
 		"MESSAGE_VIEW_MOVE_DESC": "Выберите имя папки в левой панели, чтобы переместить сообщение.",
 		"LINK_DOWNLOAD_AS_ZIP": "Сохранить как zip",
-		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected",
-		"TAGS": "Tags",
-		"NEW_TAG": "New tag"
+		"SPAM_SCORE": "Оценка спама",
+		"HAS_VIRUS_WARNING": "ВНИМАНИЕ: Обнаружен вирус!",
+		"TAGS": "Метки",
+		"NEW_TAG": "Новая метка"
 	},
 	"MESSAGE_TAGS": {
 		"$important": "Important",
 		"$todo": "To Do",
-		"$label1": "Important",
-		"$label2": "Work",
-		"$label3": "Personal",
+		"$label1": "Важное",
+		"$label2": "Работа",
+		"$label3": "Личное",
 		"$label4": "To Do",
 		"$label5": "Later"
 	},
@@ -213,10 +209,10 @@
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "Показать все поля",
 		"BUTTON_SEND": "Отправить",
-		"BUTTON_MINIMIZE": "Minimize",
+		"BUTTON_MINIMIZE": "Свернуть",
 		"SAVED_TIME": "Сохранено в %TIME%",
 		"SAVED_ERROR_ON_SEND": "Сообщение было отправлено, но не было сохранено",
-		"DISCARD_UNSAVED_DATA": "Discard unsaved data?",
+		"DISCARD_UNSAVED_DATA": "Удалить несохраненные данные?",
 		"ATTACH_FILES": "Прикрепить файлы",
 		"ATTACH_DROP_FILES_DESC": "Поместите файлы сюда",
 		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% написал",
@@ -226,13 +222,15 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Прикреплённые файлы отсутствуют.",
 		"ATTACHMENTS_ERROR_DESC": "Внимание! Не все прикреплённые файлы были загружены.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Не все прикреплённые файлы были загружены",
-		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_SPELLCHECK": "Включить проверку орфографии в браузере",
+		"ALLOW_DRAFT_AUTOSAVE": "Автоматически сохранять черновик",
 		"BUTTON_REQUEST_READ_RECEIPT": "Запрос о прочтении письма",
 		"BUTTON_MARK_AS_IMPORTANT": "Отметить как важное",
 		"BUTTON_REQUEST_DSN": "Запросить уведомление о доставке",
-		"BUTTON_REQUIRE_TLS": "Require secure delivery"
+		"BUTTON_REQUIRE_TLS": "Требовать безопасную доставку"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Вы уверены, что хотите выйти?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Вы уверены, что хотите закрыть это окно?",
 		"DESC_WANT_DELETE_MESSAGES": "Вы уверены, что хотите удалить сообщение(я)?"
 	},
@@ -316,7 +314,7 @@
 		"MARK_AS_READ_LABEL": "Отметить как прочитанное",
 		"REPLY_INTERVAL_LABEL": "Отвечать каждые (в днях)",
 		"KEEP_LABEL": "Сохранить копию",
-		"STOP_LABEL": "Stop further processing of rules",
+		"STOP_LABEL": "Остановить дальнейшую обработку правил",
 		"VACATION_SUBJECT_LABEL": "Тема (необязательно)",
 		"VACATION_MESSAGE_LABEL": "Сообщение",
 		"VACATION_RECIPIENTS_LABEL": "Получатели (через запятую)",
@@ -324,12 +322,12 @@
 		"ALL_INCOMING_MESSAGES_DESC": "Все входящие сообщения"
 	},
 	"POPUPS_SIEVE_SCRIPT": {
-		"TITLE_CREATE": "Create Script",
-		"TITLE_EDIT": "Edit Script",
-		"BUTTON_ADD_FILTER": "Add a Filter",
-		"BUTTON_RAW_SCRIPT": "Use Custom User Script",
-		"CAPABILITY_LABEL": "Capabilities",
-		"CHANGES_NEED_TO_BE_SAVED_DESC": "These changes need to be saved to the server."
+		"TITLE_CREATE": "Создать сценарий",
+		"TITLE_EDIT": "Редактировать сценарий",
+		"BUTTON_ADD_FILTER": "Добавить фильтр",
+		"BUTTON_RAW_SCRIPT": "Использовать собственный сценарий",
+		"CAPABILITY_LABEL": "Возможности",
+		"CHANGES_NEED_TO_BE_SAVED_DESC": "Эти изменения необходимо сохранить на сервере."
 	},
 	"POPUPS_SYSTEM_FOLDERS": {
 		"TITLE_SYSTEM_FOLDERS": "Выберите системые папки",
@@ -385,12 +383,13 @@
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Основные Настройки",
 		"LANGUAGE": "Язык",
-		"HOUR_FORMAT": "Hour format",
+		"HOUR_FORMAT": "Формат времени",
 		"IDENTITY": "Профиль",
 		"LAYOUT": "Разметка",
 		"LAYOUT_NO_SPLIT": "Одна панель",
 		"LAYOUT_VERTICAL_SPLIT": "Вертикальные панели",
 		"LAYOUT_HORIZONTAL_SPLIT": "Горизонтальные панели",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Редактор текста по умолчанию",
 		"EDITOR_HTML": "Форматированный",
 		"EDITOR_PLAIN": "Простой",
@@ -400,16 +399,16 @@
 		"USE_CHECKBOXES_IN_LIST": "Показывать чекбоксы в списках",
 		"USE_THREADS": "Сворачивать письма в переписках",
 		"REPLY_SAME_FOLDER": "Помещать ответы в ту же папку, где находится оригинал",
-		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML": "Предпочитать HTML обычному тексту",
 		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"REMOVE_COLORS": "Remove background and text colors from message body",
-		"ALLOW_STYLES": "Allow <style> CSS",
+		"REMOVE_COLORS": "Удалить цвет фона и текста из тела сообщения",
+		"ALLOW_STYLES": "Разрешить <style> CSS",
 		"MESSAGE_PER_PAGE": "Cообщений на одной странице",
-		"CHECK_MAIL_INTERVAL": "Check mail interval",
-		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"MSG_DEFAULT_ACTION": "Default action",
-		"SECONDS": "seconds",
-		"MINUTES": "minutes",
+		"CHECK_MAIL_INTERVAL": "Интервал проверки почты",
+		"MARK_MESSAGE_READ_AFTER": "Отметить сообщение как прочитанное после",
+		"MSG_DEFAULT_ACTION": "Действие по умолчанию",
+		"SECONDS": "Секунд",
+		"MINUTES": "Минут",
 		"NOTIFICATIONS": "Уведомления",
 		"SOUND_NOTIFICATION": "Звуковые уведомления",
 		"CHROME_NOTIFICATION_DESC": "Показывать уведомления о новых сообщениях в всплывающих подсказках",
@@ -419,11 +418,11 @@
 		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
 		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
 		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
-		"EXTERNAL_IMAGES": "External images",
-		"IMAGES_OPTION_ASK": "Always ask",
-		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
-		"IMAGES_OPTION_ALWAYS": "Show always",
-		"IMAGES_WHITELIST": "Images whitelist"
+		"EXTERNAL_IMAGES": "Внешние изображения",
+		"IMAGES_OPTION_ASK": "Всегда спрашивать",
+		"IMAGES_OPTION_WHITELIST": "Белый список или спрашивать",
+		"IMAGES_OPTION_ALWAYS": "Показать всегда",
+		"IMAGES_WHITELIST": "Форматы из белого списка"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Автоматически добавлять получателей писем в адресную книгу",
@@ -432,12 +431,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Сервер",
 		"LABEL_CONTACTS_SYNC_AB_URL": "Адресная книга (URL)",
 		"LABEL_CONTACTS_SYNC_USER": "Пользователь",
-		"SYNC_READ": "Read only"
+		"SYNC_READ": "Только чтение"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Темы Оформления",
 		"LABEL_BACKGROUND": "Картинка на фоне",
-		"LABEL_FONTS": "Fonts",
+		"LABEL_FONTS": "Шрифты",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Загрузить фоновую картинку (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Файл слишком большой",
 		"ERROR_FILE_TYPE_ERROR": "Неверный тип файла (только JPG и PNG)",
@@ -475,15 +474,14 @@
 		"BUTTON_ADD_ACCOUNT": "Добавить ещё аккаунт",
 		"BUTTON_ADD_IDENTITY": "Добавить персону",
 		"LOADING_PROCESS": "Обновление списка аккаунтов",
-		"SHOW_UNREAD": "Show unread messages count"
+		"SHOW_UNREAD": "Количество непрочитанных сообщений"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Ипортировать ключ",
 		"BUTTON_GENERATE_KEY_PAIR": "Новый ключ",
 		"TITLE_PRIVATE": "Приватный",
 		"TITLE_PUBLIC": "Публичный",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Автоматически сохранять черновик",
-		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
+		"GET_MAILVELOPE": "Получить дополнение для браузера Mailvelope."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Сочетания клавиш",
@@ -498,7 +496,7 @@
 		"LABEL_FORWARD_MULTIPLY": "Переслать все выбранные сообщения",
 		"LABEL_CHECK_ALL": "Выбрать все сообщения",
 		"LABEL_DELETE": "Удалить",
-		"LABEL_OPEN_THREAD": "Open selected thread",
+		"LABEL_OPEN_THREAD": "Открыть выбранную ветку",
 		"LABEL_MOVE": "Переместить",
 		"LABEL_READ": "Пометить выбранные письма прочитанными",
 		"LABEL_UNREAD": "Пометить выбранные письма непрочитанными",
@@ -523,9 +521,9 @@
 		"LABEL_CLOSE_COMPOSE": "Закрыть сообщение"
 	},
 	"NOTIFICATIONS": {
-		"REQUEST_ERROR": "Request failed",
-		"REQUEST_ABORTED": "Request is aborted",
-		"REQUEST_TIMEOUT": "Request timed out",
+		"REQUEST_ERROR": "Запрос не выполнен",
+		"REQUEST_ABORTED": "Запрос прерван",
+		"REQUEST_TIMEOUT": "Истекло время запроса",
 		"INVALID_TOKEN": "Неверный токен запроса",
 		"AUTH_ERROR": "Не удалось авторизоваться",
 		"CONNECTION_ERROR": "Ошибка соединения с сервером.",
@@ -536,15 +534,15 @@
 		"CANT_GET_MESSAGE_LIST": "Не могу получить список писем",
 		"CANT_GET_MESSAGE": "Не могу получить письмо",
 		"CANT_DELETE_MESSAGE": "Не могу удалить письмо",
-		"CANT_COPY_MESSAGE": "Can't copy message",
+		"CANT_COPY_MESSAGE": "Не могу скопировать сообщение",
 		"CANT_MOVE_MESSAGE": "Не могу переместить письмо",
 		"CANT_SAVE_MESSAGE": "Не могу сохранить письмо",
 		"CANT_SEND_MESSAGE": "Не могу отправить письмо",
 		"INVALID_RECIPIENTS": "Проверьте правильность ввода всех адресов.",
 		"CANT_SAVE_FILTERS": "Не могу сохранить фильтры",
 		"CANT_GET_FILTERS": "Не могу загрузить фильтры",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
+		"CANT_ACTIVATE_FILTERS_SCRIPT": "Не могу активировать сценарий фильтров",
+		"CANT_DELETE_FILTERS_SCRIPT": "Не могу удалить сценарий фильтров",
 		"FILTERS_ARE_NOT_CORRECT": "Фильтры неправильны",
 		"CANT_CREATE_FOLDER": "Не могу создать папку",
 		"CANT_RENAME_FOLDER": "Не могу переименовать папку",
@@ -556,7 +554,7 @@
 		"DEMO_ACCOUNT_ERROR": "По соображениям безопасности данный аккаунт не может выполнить это действие.",
 		"ACCOUNT_ALREADY_EXISTS": "Аккаунт уже добавлен",
 		"ACCOUNT_DOES_NOT_EXIST": "Аккаунт не существует",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
+		"ACCOUNT_SWITCH_FAILED": "Не удалось переключиться на учетную запись \"%EMAIL%\"",
 		"MAIL_SERVER_ERROR": "Ошибка доступа к почтовому серверу",
 		"INVALID_INPUT_ARGUMENT": "Неверный параметр",
 		"UNKNOWN_ERROR": "Неизвестная ошибка"
diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/user.json b/snappymail/v/0.0.0/app/localization/sk-SK/user.json
index f07b3f8e3..8a143b3ae 100644
--- a/snappymail/v/0.0.0/app/localization/sk-SK/user.json
+++ b/snappymail/v/0.0.0/app/localization/sk-SK/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Pridať účet"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Verzia pre mobil",
-		"BUTTON_DESKTOP_VERSION": "Verzia pre desktop"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Rozšírené hľadanie",
 		"TEXT": "Text",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Pozor! Nie všetky prílohy boli nahraté.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Nie všetky prílohy boli už nahraté na server.",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automaticky uložiť koncept.",
 		"BUTTON_REQUEST_READ_RECEIPT": "Vyžiadať potvrdenie o prečítaní",
 		"BUTTON_MARK_AS_IMPORTANT": "Označiť ako dôležité",
 		"BUTTON_REQUEST_DSN": "Vyžiadať potvrdenie o doručení",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Ste si istý že chcete zatvoriť toto okno?",
 		"DESC_WANT_DELETE_MESSAGES": "Ste si istý že chcete odstrániť tieto správy?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "No Split",
 		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Predvolený editor správ",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Text",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Generate Keys",
 		"TITLE_PRIVATE": "Private",
 		"TITLE_PUBLIC": "Public",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automaticky uložiť koncept.",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/user.json b/snappymail/v/0.0.0/app/localization/sl-SI/user.json
index 60ced08aa..ea3dcc8b9 100644
--- a/snappymail/v/0.0.0/app/localization/sl-SI/user.json
+++ b/snappymail/v/0.0.0/app/localization/sl-SI/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Dodaj račun"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobilna različica",
-		"BUTTON_DESKTOP_VERSION": "Namizna različica"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Napredno iskanje",
 		"TEXT": "Besedilo",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Pozor! Priloge niso bile vse naložene.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Priloge še niso bile naložene v celoti.",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Samodejno shrani osnutek",
 		"BUTTON_REQUEST_READ_RECEIPT": "Zahtevaj potrdilo o branju",
 		"BUTTON_MARK_AS_IMPORTANT": "Označi kot pomembno",
 		"BUTTON_REQUEST_DSN": "Zahtevaj potrdilo o dostavi",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Želite zapreti to okno?",
 		"DESC_WANT_DELETE_MESSAGES": "Želite izbrisati sporočilo\/-a?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Brez razdelitve",
 		"LAYOUT_VERTICAL_SPLIT": "Navpično razdeljeno",
 		"LAYOUT_HORIZONTAL_SPLIT": "Vodoravno razdeljeno",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Privzeta vrsta besedila",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Navadno besedilo",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Generiraj ključe",
 		"TITLE_PRIVATE": "Zasebni",
 		"TITLE_PUBLIC": "Javni",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Samodejno shrani osnutek",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/user.json b/snappymail/v/0.0.0/app/localization/sv-SE/user.json
index 1e8e39489..f9115f491 100644
--- a/snappymail/v/0.0.0/app/localization/sv-SE/user.json
+++ b/snappymail/v/0.0.0/app/localization/sv-SE/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Lägg till konto"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobilversion",
-		"BUTTON_DESKTOP_VERSION": "Datorversion"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Avancerad sök",
 		"TEXT": "Text",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Varning! Inte alla bilagor har överförts.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Alla bilagor är inte uppladddade än",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Spara utkast automatiskt",
 		"BUTTON_REQUEST_READ_RECEIPT": "Begär mottagningskvitto",
 		"BUTTON_MARK_AS_IMPORTANT": "Markera som viktigt",
 		"BUTTON_REQUEST_DSN": "Begär ett leveranskvitto",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Vill du stänga detta fönster?",
 		"DESC_WANT_DELETE_MESSAGES": "Är du säker att du vill ta bort meddelandet?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Utan delad vy",
 		"LAYOUT_VERTICAL_SPLIT": "Vertikalt delad vy",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horisontellt delad vy",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Textredigerare",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Oformaterad text",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Skapa nycklar",
 		"TITLE_PRIVATE": "Privat",
 		"TITLE_PUBLIC": "Publik",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Spara utkast automatiskt",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/tr-TR/user.json b/snappymail/v/0.0.0/app/localization/tr-TR/user.json
index 2187be45c..ce27920ac 100644
--- a/snappymail/v/0.0.0/app/localization/tr-TR/user.json
+++ b/snappymail/v/0.0.0/app/localization/tr-TR/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Hesap Ekle"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobil versiyonu",
-		"BUTTON_DESKTOP_VERSION": "Masaüstü versiyonu"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Detaylı Arama",
 		"TEXT": "Metin",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Warning! Not all attachments have been uploaded.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"BUTTON_REQUEST_READ_RECEIPT": "Okundu bilgisi iste",
 		"BUTTON_MARK_AS_IMPORTANT": "Mark as important",
 		"BUTTON_REQUEST_DSN": "Request a delivery receipt",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Bu pencereyi kapatmak istediğinizden emin misiniz?",
 		"DESC_WANT_DELETE_MESSAGES": "Mesaj(ları) silmek istediğinizden emin misiniz?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "No Split",
 		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Varsayılan text editör",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Düz",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Key Oluştur",
 		"TITLE_PRIVATE": "Private",
 		"TITLE_PUBLIC": "Public",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/uk-UA/user.json b/snappymail/v/0.0.0/app/localization/uk-UA/user.json
index 14f4456a5..fe8d6cd65 100644
--- a/snappymail/v/0.0.0/app/localization/uk-UA/user.json
+++ b/snappymail/v/0.0.0/app/localization/uk-UA/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Додати ще акаунт"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Мобільна версія",
-		"BUTTON_DESKTOP_VERSION": "Повна версія"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Розширений пошук листів",
 		"TEXT": "Текст",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Warning! Not all attachments have been uploaded.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"BUTTON_REQUEST_READ_RECEIPT": "Запит про прочитання листа",
 		"BUTTON_MARK_AS_IMPORTANT": "Mark as important",
 		"BUTTON_REQUEST_DSN": "Request a delivery receipt",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Ви впевнені, що хочете закрити це вікно?",
 		"DESC_WANT_DELETE_MESSAGES": "Ви впевнені, що хочете видалити повідомлення?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "No Split",
 		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Редактор тексту за змовчуванням",
 		"EDITOR_HTML": "Форматований",
 		"EDITOR_PLAIN": "Простий",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Новий ключ",
 		"TITLE_PRIVATE": "Приватний",
 		"TITLE_PUBLIC": "Публічний",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/vi-VN/user.json b/snappymail/v/0.0.0/app/localization/vi-VN/user.json
index 809fd1088..e8fdc86ec 100644
--- a/snappymail/v/0.0.0/app/localization/vi-VN/user.json
+++ b/snappymail/v/0.0.0/app/localization/vi-VN/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "Thêm tài khoản"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Phiên bản điện thoại",
-		"BUTTON_DESKTOP_VERSION": "Phiên bản máy tính"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "Tìm kiếm nâng cao",
 		"TEXT": "Nội dung trong mail",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Cảnh báo! Các tập tin đính kèm chưa được tải lên hết.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Các tập tin đính kèm chưa được tải lên hết.",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Tự động lưu nháp",
 		"BUTTON_REQUEST_READ_RECEIPT": "Yêu cầu thông báo khi người nhận đã đọc thư",
 		"BUTTON_MARK_AS_IMPORTANT": "Đánh dấu thư quan trọng",
 		"BUTTON_REQUEST_DSN": "Yêu cầu thông báo thư đã gửi thành công",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Bạn có chắc muốn đóng bảng này chứ?",
 		"DESC_WANT_DELETE_MESSAGES": "Bạn có chắc muốn xóa thư này chứ?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Không phân màn hình",
 		"LAYOUT_VERTICAL_SPLIT": "Phân dọc màn hình",
 		"LAYOUT_HORIZONTAL_SPLIT": "Phân ngang màn hình",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Chỉnh dạng văn bản mặc định",
 		"EDITOR_HTML": "Dạng Html",
 		"EDITOR_PLAIN": "Dạng chữ viết thường",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "Tạo một đôi mật mã",
 		"TITLE_PRIVATE": "Mã lưu riêng",
 		"TITLE_PUBLIC": "Mã chia sẻ công cộng",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Tự động lưu nháp",
 		"GET_MAILVELOPE": "Tải về tiện ích trình duyệt cài thêm tên Mailvelope."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
index c6cc26ab9..28b5875d0 100644
--- a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
+++ b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
@@ -69,7 +69,7 @@
 		"LABEL_STORAGE_USER": "用户",
 		"LABEL_STORAGE_PASSWORD": "密码",
 		"ALERT_NOTICE": "提示!",
-		"SUGGESTIONS_LIMIT": "Suggestions limit",
+		"SUGGESTIONS_LIMIT": "建议数量上限",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "如果有大量的活跃用户，请不要选择此数据库类型。",
 		"HTML_ALERT_DOES_NOT_SUPPORTED": "您的系统不支持联系人\n<br>\n您需要在您的服务器上安装或启用<strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> 组件。\n"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/user.json b/snappymail/v/0.0.0/app/localization/zh-CN/user.json
index bee3c9f60..3864f4a20 100644
--- a/snappymail/v/0.0.0/app/localization/zh-CN/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh-CN/user.json
@@ -22,7 +22,7 @@
 		"NOT_SPAM": "非垃圾邮件",
 		"USERNAME": "用户名",
 		"PASSWORD": "密码",
-		"REMEMBER": "Remember",
+		"REMEMBER": "记住",
 		"REPLY_TO": "回复",
 		"SAVE": "保存",
 		"SAVE_CHANGES": "是否保存修改？",
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "添加账户"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "移动端版本",
-		"BUTTON_DESKTOP_VERSION": "桌面端版本"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "高级搜索",
 		"TEXT": "内容",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "注意！还有正在上传的附件。",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "还有附件正在上传。",
 		"ALLOW_SPELLCHECK": "启用浏览器拼写检查器",
+		"ALLOW_DRAFT_AUTOSAVE": "自动保存草稿",
 		"BUTTON_REQUEST_READ_RECEIPT": "要求已读回执",
 		"BUTTON_MARK_AS_IMPORTANT": "标记为“重要”",
 		"BUTTON_REQUEST_DSN": "要求送达回执",
-		"BUTTON_REQUIRE_TLS": "Require secure delivery"
+		"BUTTON_REQUIRE_TLS": "要求安全送达"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "您确定要退出吗？",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "您确定要关闭此窗口吗？",
 		"DESC_WANT_DELETE_MESSAGES": "您确定要删除这条消息吗？"
 	},
@@ -316,7 +314,7 @@
 		"MARK_AS_READ_LABEL": "标记为已读",
 		"REPLY_INTERVAL_LABEL": "答复间隔 (天) ",
 		"KEEP_LABEL": "保留邮件",
-		"STOP_LABEL": "Stop further processing of rules",
+		"STOP_LABEL": "停止处理更多规则",
 		"VACATION_SUBJECT_LABEL": "主题 (可选)",
 		"VACATION_MESSAGE_LABEL": "内容",
 		"VACATION_RECIPIENTS_LABEL": "收件人 (半角逗号“,”分隔)",
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "不分隔",
 		"LAYOUT_VERTICAL_SPLIT": "垂直分隔",
 		"LAYOUT_HORIZONTAL_SPLIT": "水平分隔",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "默认文本编辑器",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "纯文本",
@@ -403,27 +402,27 @@
 		"PREFER_HTML": "相比纯文本优先使用 HTML",
 		"PREFER_HTML_INFO": "消息有时以两种格式传送。该选项控制您希望显示 HTML 部分还是纯文本部分。",
 		"REMOVE_COLORS": "从消息中删除背景和文本颜色",
-		"ALLOW_STYLES": "Allow <style> CSS",
+		"ALLOW_STYLES": "允许 <style> CSS",
 		"MESSAGE_PER_PAGE": "每页消息数",
-		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"CHECK_MAIL_INTERVAL": "邮件检查间隔",
 		"MARK_MESSAGE_READ_AFTER": "将消息标记为已读",
 		"MSG_DEFAULT_ACTION": "默认操作",
 		"SECONDS": "秒",
-		"MINUTES": "minutes",
+		"MINUTES": "分",
 		"NOTIFICATIONS": "通知",
 		"SOUND_NOTIFICATION": "提示音",
 		"CHROME_NOTIFICATION_DESC": "显示新邮件弹窗",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(被浏览器阻止)",
-		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
-		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"COLLAPSE_BLOCKQUOTES": "折叠引用文本",
+		"MAX_QUOTE_LEVEL": "最多显示的引用文本层级",
 		"LIST_INLINE_ATTACHMENTS": "在列表中显示内联附件",
 		"LIST_SIMPLE_ATTACHMENTS": "简洁附件列表",
-		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
-		"EXTERNAL_IMAGES": "External images",
-		"IMAGES_OPTION_ASK": "Always ask",
-		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
-		"IMAGES_OPTION_ALWAYS": "Show always",
-		"IMAGES_WHITELIST": "Images whitelist"
+		"LIST_MESSAGES_GROUPED": "按分组显示消息 (按时间或发件人排序时)",
+		"EXTERNAL_IMAGES": "外部图片",
+		"IMAGES_OPTION_ASK": "总是询问",
+		"IMAGES_OPTION_WHITELIST": "白名单或询问",
+		"IMAGES_OPTION_ALWAYS": "总是显示",
+		"IMAGES_WHITELIST": "图片白名单"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "自动添加到您的地址簿",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "生成 密钥",
 		"TITLE_PRIVATE": "私有",
 		"TITLE_PUBLIC": "公开",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "自动保存草稿",
 		"GET_MAILVELOPE": "获取 Mailvelope 浏览器扩展。"
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/localization/zh-TW/user.json b/snappymail/v/0.0.0/app/localization/zh-TW/user.json
index 414ade55e..b84894478 100644
--- a/snappymail/v/0.0.0/app/localization/zh-TW/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh-TW/user.json
@@ -46,10 +46,6 @@
 	"TOP_TOOLBAR": {
 		"BUTTON_ADD_ACCOUNT": "添加帳戶"
 	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobile version",
-		"BUTTON_DESKTOP_VERSION": "Desktop version"
-	},
 	"SEARCH": {
 		"TITLE_ADV": "高級搜索",
 		"TEXT": "內容",
@@ -227,12 +223,14 @@
 		"ATTACHMENTS_ERROR_DESC": "Warning! Not all attachments have been uploaded.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet",
 		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"BUTTON_REQUEST_READ_RECEIPT": "Request a read receipt",
 		"BUTTON_MARK_AS_IMPORTANT": "Mark as important",
 		"BUTTON_REQUEST_DSN": "Request a delivery receipt",
 		"BUTTON_REQUIRE_TLS": "Require secure delivery"
 	},
 	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "你確定要關閉此窗口嗎?",
 		"DESC_WANT_DELETE_MESSAGES": "你確定你要刪除這條消息嗎?"
 	},
@@ -391,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "No Split",
 		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "默認格式",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Plain",
@@ -482,7 +481,6 @@
 		"BUTTON_GENERATE_KEY_PAIR": "生成 密鑰",
 		"TITLE_PRIVATE": "私有",
 		"TITLE_PUBLIC": "公開",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html
index dc46592eb..d9f410e46 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html
@@ -3,4 +3,3 @@
 	<h4>SnappyMail - <span data-i18n="TOP_PANEL/LABEL_ADMIN_PANEL"></span></h4>
 	<a class="btn btn-logout fontastic" data-bind="click: logoutClick">⏻</a>
 </div>
-<div id="rl-settings-subscreen"></div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
index 656120ba7..0dba1b4dd 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
@@ -51,6 +51,23 @@
 				</div>
 			</div>
 
+			<h3>System</h3>
+			<table class="table table-hover table-bordered"><tbody>
+				<tr>
+					<td>Average load past minute</td>
+					<td data-bind="text: load1"></td>
+				</tr>
+				<tr>
+					<td>Average load past 5 minutes</td>
+					<td data-bind="text: load5"></td>
+				</tr>
+				<tr>
+					<td>Average load past 15 minutes</td>
+					<td data-bind="text: load15"></td>
+				</tr>
+			</tbody>
+			</table>
+
 			<h3>PHP optional extensions</h3>
 			<table class="table table-hover table-bordered"><thead><tr>
 				<th>Extension</th>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html
index 96f289b6a..b9bc9e544 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html
@@ -15,7 +15,7 @@
 
 <div data-bind="component: {
 	name: 'Checkbox',
-	params: { value: enabledPlugins, label: 'TAB_PACKAGES/LABEL_ENABLE_PLUGINS' }
+	params: { value: pluginsEnable, label: 'TAB_PACKAGES/LABEL_ENABLE_PLUGINS' }
 }"></div>
 
 <br>
@@ -28,7 +28,7 @@
 	<div data-bind="template: { name: 'AdminSettingsPackagesTable', data: {f: packagesUpdate} }"></div>
 </div>
 
-<div id="packages-installed" data-bind="visible: packagesCurrent().length, css: {'disabled': !enabledPlugins()}">
+<div id="packages-installed" data-bind="visible: packagesCurrent().length, css: {'disabled': !pluginsEnable()}">
 	<div class="legend" data-i18n="TAB_PACKAGES/LEGEND_INSTALLED_PACKAGES"></div>
 	<div data-bind="template: { name: 'AdminSettingsPackagesTable', data: {f: packagesCurrent} }"></div>
 </div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html
index 0df6a301b..7df69e7f7 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html
@@ -4,7 +4,7 @@
 </header>
 <div class="modal-body" style="min-height: 150px;" data-bind="foreach: languages">
 	<label data-bind="click: function () { $root.changeLanguage(key); }, css: {'selected': selected, 'user': user},
-		attr: { title: $root.languageTooltipName(key) },
+		attr: { title: title },
 		text: fullName">
 	</label>
 </div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
index e6487eb4e..473835439 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
@@ -1,20 +1,16 @@
-<div class="btn-toolbar">
-	<!-- ko if: isMobile() -->
+<div class="btn-toolbar" data-bind="css: {'hasChecked':checkAll}">
 	<a class="btn btn-thin fontastic toggleLeft" data-bind="click: toggleLeftPanel, text: leftPanelDisabled() ? '❯' : '❮'">❮</a>
-	<a class="btn buttonCompose" data-bind="click: composeClick, css: {'btn-warning': composeInEdit, 'btn-success': !composeInEdit()}, visible: mobileCheckedStateHide()" data-i18n="[title]FOLDER_LIST/BUTTON_NEW_MESSAGE">
+	<a class="btn buttonCompose onCheckedHide" data-bind="click: composeClick, css: {'btn-warning': composeInEdit, 'btn-success': !composeInEdit()}" data-i18n="[title]FOLDER_LIST/BUTTON_NEW_MESSAGE">
 		<i class="icon-paper-plane"></i>
 	</a>
-	<!-- /ko -->
-	<a class="btn" data-bind="click: reload, visible: mobileCheckedStateHide()" data-i18n="[title]MESSAGE_LIST/BUTTON_RELOAD">
+	<a class="btn onCheckedHide" data-bind="click: reload" data-i18n="[title]MESSAGE_LIST/BUTTON_RELOAD">
 		<i class="icon-spinner not-animated"></i>
 	</a>
-	<div class="btn-group" data-bind="visible: mobileCheckedStateShow()">
-		<a href="#" tabindex="-1" class="btn" data-bind="command: moveCommand" data-i18n="[title]GLOBAL/MOVE_TO">
-			<i class="icon-copy visible-on-ctrl-btn"></i>
-			<i class="fontastic hidden-on-ctrl-btn">📁</i>
-		</a>
-	</div>
-	<div class="btn-group" data-bind="visible: mobileCheckedStateShow()">
+	<a href="#" tabindex="-1" class="btn onCheckedShow" data-bind="command: moveCommand" data-i18n="[title]GLOBAL/MOVE_TO">
+		<i class="icon-copy visible-on-ctrl-btn"></i>
+		<i class="fontastic hidden-on-ctrl-btn">📁</i>
+	</a>
+	<div class="btn-group onCheckedShow">
 		<a class="btn fontastic" data-bind="visible: archiveAllowed, command: archiveCommand" data-i18n="[title]GLOBAL/TO_ARCHIVE">🗄</a>
 		<a class="btn fontastic" data-bind="visible: canMarkAsSpam, command: spamCommand" data-i18n="[title]GLOBAL/SPAM">⚠</a>
 		<a class="btn" data-bind="visible: isSpamFolder, command: notSpamCommand" data-i18n="[title]GLOBAL/NOT_SPAM">
@@ -72,7 +68,7 @@
 			</li>
 		</menu>
 	</div>
-	<div class="btn-group dropdown sortFolder" data-bind="visible: sortSupported() && mobileCheckedStateHide(), registerBootstrapDropdown: true, openDropdownTrigger: sortDropdownTrigger">
+	<div class="btn-group dropdown onCheckedHide" data-bind="visible: sortSupported(), registerBootstrapDropdown: true, openDropdownTrigger: sortDropdownTrigger">
 		<a id="sort-list-dropdown-id" class="btn dropdown-toggle fontastic" href="#" tabindex="-1" data-i18n="[title]MESSAGE_LIST/SORT" data-bind="text: sortText">⬇</a>
 		<menu class="dropdown-menu" role="menu" aria-labelledby="sort-list-dropdown-id">
 			<li role="presentation" data-sort="" data-bind="click: changeSort">
@@ -145,7 +141,7 @@
 						<i data-bind="css: attachmentIconClass"></i>
 					</div>
 					<div class="sizeParent actionHandle" data-bind="text: friendlySize()"></div>
-					<time class="actionHandle" data-bind="attr:{'data-moment-format':$root.timeFormat()}, moment: dateTimeStampInUTC"></time>
+					<time class="actionHandle" data-bind="attr:{'data-moment-format':$root.timeFormat()}, moment: dateTimestamp"></time>
 				</div>
 			</div>
 			<!-- /ko -->
@@ -165,7 +161,7 @@
 						<i data-bind="css: attachmentIconClass"></i>
 					</div>
 					<div class="sizeParent actionHandle" data-bind="text: friendlySize()"></div>
-					<time class="actionHandle" data-moment-format="AUTO" data-bind="moment: dateTimeStampInUTC"></time>
+					<time class="actionHandle" data-moment-format="AUTO" data-bind="moment: dateTimestamp"></time>
 				</div>
 			</div>
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
index c65f8f7e4..bd45573ac 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
@@ -30,8 +30,7 @@
 	<div class="b-message-view-desc" data-i18n="MESSAGE/MESSAGE_VIEW_DESC" data-bind="visible: !message() && '' === messageError() && !hasCheckedMessages()">
 	</div>
 
-	<!-- ko if: message -->
-	<div class="b-message" data-bind="i18nUpdate: message, css: message()?.lineAsCss(0)">
+	<div class="b-message" data-bind="visible: message, i18nUpdate: message, css: message()?.lineAsCss(0)">
 		<div class="message-fixed-button-toolbar">
 			<a class="btn btn-success buttonEdit fontastic hide-mobile" data-bind="visible: isDraftFolder(), command: editCommand">🖉</a>
 			<div class="btn-group" style="margin-right: -8px; display: inline;">
@@ -121,7 +120,7 @@
 			</div>
 		</div>
 
-		<div class="messageItemHeader">
+		<div class="messageItemHeader" data-bind="if: message, i18nUpdate: message">
 			<div class="subjectParent">
 				<span class="infoParent g-ui-user-select-none fontastic" data-bind="click: toggleFullInfo">ℹ</span>
 				<span class="flagParent g-ui-user-select-none flagOff fontastic" data-bind="text: message().isFlagged() ? '★' : '☆', css: {'flagOn': message().isFlagged(), 'flagOff': !message().isFlagged()}"></span>
@@ -156,12 +155,12 @@
 						<td data-i18n="GLOBAL/REPLY_TO"></td>
 						<td data-bind="text: replyTo"></td>
 					</tr>
-					<tr data-bind="visible: dateTimeStampInUTC">
+					<tr data-bind="visible: dateTimestamp">
 						<td data-i18n="MESSAGE/LABEL_DATE"></td>
 						<td>
-							<time data-moment-format="FULL" data-bind="moment: dateTimeStampInUTC"></time>
+							<time data-moment-format="FULL" data-bind="moment: dateTimestamp"></time>
 							&nbsp;
-							(<time data-moment-format="FROMNOW" data-bind="moment: dateTimeStampInUTC"></time>)
+							(<time data-moment-format="FROMNOW" data-bind="moment: dateTimestamp"></time>)
 						</td>
 					</tr>
 					<tr data-bind="visible: spamResult">
@@ -176,9 +175,9 @@
 			</div>
 		</div>
 		<div id="messageItem">
-			<div class="messageItemHeader">
+			<div class="messageItemHeader" data-bind="if: message, i18nUpdate: message">
 				<div data-bind="hidden: showFullInfo">
-					<time class="date" data-moment-format="FULL" data-bind="visible: 0 < message().dateTimeStampInUTC(), moment: message().dateTimeStampInUTC()"></time>
+					<time class="date" data-moment-format="FULL" data-bind="visible: 0 < message().dateTimestamp(), moment: message().dateTimestamp()"></time>
 					<div class="informationShortWrp">
 						<div class="informationShort" data-bind="visible: message().to.length">
 							<span data-i18n="GLOBAL/TO"></span>:
@@ -223,7 +222,7 @@
 				</div>
 
 				<div data-bind="hidden: messageLoadingThrottle">
-					<div class="bodySubHeader">
+					<div class="bodySubHeader" data-bind="if: message, i18nUpdate: message">
 						<div class="readReceipt" data-bind="visible: askReadReceipt, click: readReceipt"
 							data-icon="✉" data-i18n="MESSAGE/BUTTON_NOTIFY_READ_RECEIPT"></div>
 						<details class="attachmentsPlace" data-bind="visible: hasAttachments, css: {'selection-mode' : showAttachmentControls}">
@@ -264,21 +263,18 @@
 								</li>
 							</ul>
 							<!-- /ko -->
-							<i class="fontastic controls-handle" data-bind="visible: allowAttachmentControls(), click: toggleAttachmentControls">⚙</i>
+							<i class="fontastic controls-handle" data-bind="visible: allowAttachmentControls, click: toggleAttachmentControls">⚙</i>
+							<div class="attachmentsControls" data-bind="visible: showAttachmentControls">
+								<span data-bind="visible: downloadAsZipAllowed">
+									<i class="fontastic iconcolor-red" data-bind="visible: downloadAsZipError">✖</i>
+									<i class="icon-file-archive" data-bind="visible: !downloadAsZipError(),
+										css: {'icon-file-archive': !downloadAsZipLoading(), 'icon-spinner': downloadAsZipLoading()}"></i>
+									<span class="g-ui-link" data-bind="click: downloadAsZip"
+										data-i18n="MESSAGE/LINK_DOWNLOAD_AS_ZIP"></span>
+								</span>
+							</div>
 						</details>
 
-						<div class="attachmentsControls"
-							data-bind="visible: showAttachmentControls() && hasAttachments()">
-
-							<span data-bind="visible: downloadAsZipAllowed">
-								<i class="fontastic iconcolor-red" data-bind="visible: downloadAsZipError">✖</i>
-								<i class="icon-file-archive" data-bind="visible: !downloadAsZipError(),
-									css: {'icon-file-archive': !downloadAsZipLoading(), 'icon-spinner': downloadAsZipLoading()}"></i>
-								<span class="g-ui-link" data-bind="click: downloadAsZip"
-									data-i18n="MESSAGE/LINK_DOWNLOAD_AS_ZIP"></span>
-							</span>
-						</div>
-
 						<div class="btn-toolbar showImages" data-bind="visible: message().hasImages()">
 							<div class="btn" data-bind="click: showImages" data-icon="🖼" data-i18n="MESSAGE/BUTTON_SHOW_IMAGES"></div>
 							<div class="btn-group dropdown" data-bind="registerBootstrapDropdown: true, visible: showWhitelistOptions" style="display: inline-block">
@@ -292,21 +288,24 @@
 								</menu>
 							</div>
 						</div>
+
+						<div data-bind="visible: message().pgpEncrypted()">
+							<div class="openpgp-control encrypted" data-bind="css: {'success': message().pgpDecrypted()}">
+								<span data-icon="🔒" data-i18n="OPENPGP/ENCRYPTED_MESSAGE"></span>
+								<button class="btn" data-bind="visible: pgpSupported, click: pgpDecrypt" data-i18n="OPENPGP/BUTTON_DECRYPT"></button>
+							</div>
+						</div>
+						<div data-bind="visible: message().pgpSigned()">
+							<div class="openpgp-control signed" data-bind="css: {'success': message().pgpVerified() && message().pgpVerified().success, 'error': message().pgpVerified() && !message().pgpVerified().success}">
+								<span data-icon="✍" data-i18n="OPENPGP/SIGNED_MESSAGE"></span>
+								<button class="btn" data-bind="visible: pgpSupported, click: pgpVerify" data-i18n="OPENPGP/BUTTON_VERIFY"></button>
+							</div>
+						</div>
 					</div>
 
-					<div class="openpgp-control encrypted" data-bind="visible: message().pgpEncrypted(), css: {'success': message().pgpDecrypted()}">
-						<span data-icon="🔒" data-i18n="OPENPGP/ENCRYPTED_MESSAGE"></span>
-						<button class="btn" data-bind="visible: pgpSupported, click: pgpDecrypt" data-i18n="OPENPGP/BUTTON_DECRYPT"></button>
-					</div>
-					<div class="openpgp-control signed" data-bind="visible: message().pgpSigned(), css: {'success': message().pgpVerified() && message().pgpVerified().success, 'error': message().pgpVerified() && !message().pgpVerified().success}">
-						<span data-icon="✍" data-i18n="OPENPGP/SIGNED_MESSAGE"></span>
-						<button class="btn" data-bind="visible: pgpSupported, click: pgpVerify" data-i18n="OPENPGP/BUTTON_VERIFY"></button>
-					</div>
-
-					<div class="bodyText" data-bind="initDom: messagesBodiesDom"></div>
+					<div class="bodyText"></div>
 				</div>
 			</div>
 		</div>
 	</div>
-	<!-- /ko -->
 </div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html
index 39f0d5034..484da4202 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html
@@ -12,29 +12,29 @@
 		<div class="control-group">
 			<label data-i18n="GLOBAL/EMAIL"></label>
 			<div>
-				<div class="textEmail" data-bind="text: email, visible: owner"></div>
+				<div class="textEmail" data-bind="text: email, visible: !id()"></div>
 				<input name="Email" type="email" class="input-xlarge" autofocus=""
 					autocomplete="off" autocorrect="off" autocapitalize="off"
-					data-bind="visible: !owner(), value: email, hasfocus: emailFocused, attr: {required: !owner()}">
+					data-bind="visible: id, value: email, hasfocus: emailFocused, attr: {required: id}">
 			</div>
 		</div>
 		<div class="control-group">
 			<label data-i18n="GLOBAL/NAME"></label>
 			<input name="Name" type="text" class="input-xlarge"
 				autocomplete="off" autocorrect="off" autocapitalize="off"
-				data-bind="value: name">
+				data-bind="value: name, hasfocus: nameFocused">
 		</div>
 		<div class="control-group" data-bind="visible: showReplyTo">
 			<label data-i18n="GLOBAL/REPLY_TO"></label>
 			<input name="ReplyTo" type="email" class="inputReplyTo input-xlarge"
 				autocomplete="off" autocorrect="off" autocapitalize="off"
-				data-bind="value: replyTo, hasfocus: replyToFocused">
+				data-bind="value: replyTo">
 		</div>
 		<div class="control-group" data-bind="visible: showBcc">
 			<label data-i18n="GLOBAL/BCC"></label>
 			<input name="Bcc" type="email" class="inputBcc input-xlarge"
 				autocomplete="off" autocorrect="off" autocapitalize="off"
-				data-bind="value: bcc, hasfocus: bccFocused">
+				data-bind="value: bcc">
 		</div>
 		<div class="control-group" data-bind="visible: !showReplyTo() || !showBcc()">
 			<div>
@@ -56,7 +56,8 @@
 			name: 'Checkbox',
 			params: {
 				label: 'POPUPS_IDENTITY/LABEL_SIGNATURE_INSERT_BEFORE',
-				value: signatureInsertBefore
+				value: signatureInsertBefore,
+				name: 'SignatureInsertBefore'
 			}
 		}"></div>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpImport.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpImport.html
index bb06dc592..cfe8f1cb1 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpImport.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpImport.html
@@ -2,10 +2,10 @@
 	<a href="#" class="close" data-bind="click: close">×</a>
 	<h3 data-i18n="OPENPGP/POPUP_IMPORT_TITLE"></h3>
 </header>
-<form id="openpgp-import" class="modal-body form-horizontal" autocomplete="off" data-bind="submit: submitForm">
+<form id="openpgp-import" class="modal-body" autocomplete="off" data-bind="submit: submitForm">
 	<div class="alert"  data-bind="visible: keyError() && keyErrorMessage(), text: keyErrorMessage"></div>
 	<div class="control-group" data-bind="css: {'error': keyError}">
-		<textarea class="inputKey input-xxlarge" rows="14" autofocus="" autocomplete="off" data-bind="value: key" required=""></textarea>
+		<textarea class="input-xxlarge" rows="14" autofocus="" autocomplete="off" data-bind="value: key" required=""></textarea>
 	</div>
 	<div class="control-group">
 <!--
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpKey.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpKey.html
index 1445aad25..fdd7ecb81 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpKey.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpKey.html
@@ -3,11 +3,7 @@
 	<h3 data-i18n="OPENPGP/POPUP_VIEW_TITLE"></h3>
 </header>
 <div class="modal-body">
-	<div class="form-horizontal">
-		<div class="control-group">
-			<pre class="key-viewer" data-bind="initDom: keyDom, text: key"></pre>
-		</div>
-	</div>
+	<pre data-bind="initDom: keyDom, text: key"></pre>
 </div>
 <footer>
 	<a class="btn buttonClose" data-bind="click: close" data-icon="✖" data-i18n="GLOBAL/CLOSE"></a>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html
index 9e5357f2d..0432e202b 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html
@@ -1,11 +1,11 @@
 <tr data-bind="css: { 'selectable': selectable, 'system': isSystemFolder }">
 	<td data-bind="css: 'deep-' + deep">
 		<span class="folder-name" data-bind="text: name, visible: !editing(), css: { 'can-be-edited': canBeEdited },
-			click: function (oFolder) { oFolder.canBeEdited() && $root.folderForEdit(oFolder); },
+			click: edit,
 			tooltipErrorTip: errorMsg"></span>
 		<input type="text"
 			autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-			data-bind="value: nameForEdit, visible: editing, hasfocus: editing, onEnter: function () { $root.folderEditOnEnter($data); }, onEsc: function () { $root.folderEditOnEsc($data); }">
+			data-bind="textInput: nameForEdit, visible: editing, hasfocus: editing, onEnter: rename, onEsc: unedit">
 		&nbsp;
 		<span class="folder-system-name" data-bind="text: manageFolderSystemName, visible: isSystemFolder"></span>
 	</td>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
index d5c474dd0..6e6387930 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
@@ -36,14 +36,6 @@
 			}
 		}"></div>
 	</div>
-	<div class="control-group">
-		<label data-i18n="SETTINGS_GENERAL/MESSAGE_PER_PAGE"></label>
-		<div>
-			<input type="number" min="10" max="50" step="1" class="span1" data-bind="textInput: messagesPerPage">
-			&nbsp;
-			<span data-bind="saveTrigger: messagesPerPageTrigger"></span>
-		</div>
-	</div>
 	<div class="control-group">
 		<label data-i18n="SETTINGS_GENERAL/CHECK_MAIL_INTERVAL"></label>
 		<div>
@@ -52,6 +44,34 @@
 			<span data-bind="saveTrigger: checkMailIntervalTrigger"></span>
 		</div>
 	</div>
+	<div class="control-group">
+		<div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/REPLY_SAME_FOLDER',
+					value: replySameFolder
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/SHOW_NEXT_MESSAGE',
+					value: showNextMessage
+				}
+			}"></div>
+		</div>
+	</div>
+
+	<div class="legend" data-i18n="SHORTCUTS_HELP/TAB_MESSAGE_LIST"></div>
+	<div class="control-group">
+		<label data-i18n="SETTINGS_GENERAL/MESSAGE_PER_PAGE"></label>
+		<div>
+			<input type="number" min="10" max="50" step="1" class="span1" data-bind="textInput: messagesPerPage">
+			&nbsp;
+			<span data-bind="saveTrigger: messagesPerPageTrigger"></span>
+		</div>
+	</div>
 	<div class="control-group">
 		<div>
 			<div data-bind="component: {
@@ -82,13 +102,6 @@
 					value: useThreads
 				}
 			}"></div>
-			<div data-bind="component: {
-				name: 'Checkbox',
-				params: {
-					label: 'SETTINGS_GENERAL/REPLY_SAME_FOLDER',
-					value: replySameFolder
-				}
-			}"></div>
 		</div>
 	</div>
 
@@ -108,6 +121,13 @@
 	</div>
 	<div class="control-group">
 		<div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'COMPOSE/ALLOW_DRAFT_AUTOSAVE',
+					value: allowDraftAutosave
+				}
+			}"></div>
 			<div data-bind="component: {
 				name: 'Checkbox',
 				params: {
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html
index a2143ff34..b99833618 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html
@@ -1,7 +1,7 @@
-<nav class="b-content" data-bind="foreach: menu">
+<div class="b-toolbar btn-toolbar">
+	<a class="btn btn-thin fontastic toggleLeft" data-bind="click: toggleLeftPanel, text: leftPanelDisabled() ? '❯' : '❮'"></a>
+	<a class="btn" data-bind="click: backToInbox" data-icon="⬅" data-i18n="GLOBAL/BACK"></a>
+</div>
+<nav data-bind="foreach: menu">
 	<a data-bind="css: {'selected': selected }, attr: { 'href': $root.link(route), 'data-i18n': label }"></a>
 </nav>
-<div class="b-content show-on-panel-disabled" data-bind="click: toggleLeftPanel"></div>
-<div class="b-footer">
-	<a class="btn fontastic" data-bind="click: toggleLeftPanel, text: leftPanelDisabled() ? '❯' : '❮'"></a>
-</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html
index 55557fd5a..a892c53d9 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html
@@ -1,9 +1,3 @@
-<div class="btn-toolbar">
-	<!-- ko if: isMobile() -->
-	<div class="btn-group" style="margin-left: -1px">
-		<a class="btn btn-thin fontastic toggleLeft" data-bind="click: toggleLeftPanel, text: leftPanelDisabled() ? '❯' : '❮'">❮</a>
-	</div>
-	<!-- /ko -->
-	<a class="btn" data-bind="click: backToInbox" data-icon="⬅" data-i18n="GLOBAL/BACK"></a>
+<div class="btn-toolbar" data-bind="visible: leftPanelDisabled">
+	<a class="btn btn-thin fontastic toggleLeft" data-bind="click: toggleLeftPanel">❯</a>
 </div>
-<div id="rl-settings-subscreen"></div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
index 45a67e77b..7aa449d84 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
@@ -22,19 +22,6 @@
 <button class="btn" data-bind="click: generateOpenPgpKey" data-icon="🔑" data-i18n="SETTINGS_OPENPGP/BUTTON_GENERATE_KEY_PAIR"></button>
 <!-- /ko -->
 
-<br>
-<br>
-<div class="control-group">
-	<div data-bind="component: {
-		name: 'Checkbox',
-		params: {
-			label: 'SETTINGS_OPENPGP/LABEL_ALLOW_DRAFT_AUTOSAVE',
-			value: allowDraftAutosave
-		}
-	}"></div>
-</div>
-<br>
-
 <!-- ko if: canGnuPG -->
 <details>
 <summary class="legend">GnuPG</summary>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsThemes.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsThemes.html
index 6b6d78fd5..b274a0821 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsThemes.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsThemes.html
@@ -15,7 +15,7 @@
 	<div class="control-group">
 		<label>Sans-serif</label>
 		<select data-bind="value: fontSansSerif">
-			<option value=""></option>
+			<option value="" data-i18n="GLOBAL/DEFAULT"></option>
 			<option value="Arial">Arial</option>
 			<option value="Lucida">Lucida</option>
 			<option value="Tahoma">Tahoma</option>
@@ -26,7 +26,7 @@
 	<div class="control-group">
 		<label>Serif</label>
 		<select data-bind="value: fontSerif">
-			<option value=""></option>
+			<option value="" data-i18n="GLOBAL/DEFAULT"></option>
 			<option value="Times">Times</option>
 			<option value="Palatino">Palatino</option>
 			<option value="Georgia">Georgia</option>
@@ -35,7 +35,7 @@
 	<div class="control-group">
 		<label>Mono</label>
 		<select data-bind="value: fontMono">
-			<option value=""></option>
+			<option value="" data-i18n="GLOBAL/DEFAULT"></option>
 			<option value="Courier">Courier</option>
 			<option value="Lucida">Lucida</option>
 		</select>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html b/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html
index 3df18a93e..5eeb051be 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html
@@ -4,10 +4,10 @@
 		<div class="playIcon"><div></div></div>
 		<i class="stopIcon fontastic">⏸</i>
 	</div>
-	<div class="accountPlace hide-mobile" data-bind="text: accountName(), title: accountEmail"></div>
 	<div class="btn-group dropdown" data-bind="registerBootstrapDropdown: true, openDropdownTrigger: accountMenuDropdownTrigger">
 		<a id="top-system-dropdown-id" href="#" tabindex="-1" class="btn single btn-block dropdown-toggle">
-			<i style="vertical-align:middle" class="fontastic" data-bind="css: {'icon-spinner': accountsLoading()}">👤</i>
+			<span class="accountPlace hide-mobile" data-bind="text: accountName(), title: accountEmail"></span>
+			<i class="fontastic" data-bind="css: {'icon-spinner': accountsLoading()}">👤</i>
 <!--
 			<b data-bind="text: accountsUnreadCount, visible: 100 > accountsUnreadCount() && accountsUnreadCount()"></b>
 			<b data-bind="visible: 99 < accountsUnreadCount()">99+</b>
@@ -36,10 +36,6 @@
 				<a href="#" tabindex="-1" data-bind="click: settingsHelp" data-icon="🛈" data-i18n="GLOBAL/HELP"></a>
 			</li>
 			<li class="dividerbar" role="presentation">
-				<a href="#" tabindex="-1" data-bind="click: toggleLayout" data-icon="💻" class="show-mobile" data-i18n="MOBILE/BUTTON_DESKTOP_VERSION"></a>
-				<a href="#" tabindex="-1" data-bind="click: toggleLayout" data-icon="📱" class="hide-mobile" data-i18n="MOBILE/BUTTON_MOBILE_VERSION"></a>
-			</li>
-			<li role="presentation">
 				<a href="#" tabindex="-1" data-bind="click: logoutClick" data-icon="⏻" data-i18n="GLOBAL/LOGOUT"></a>
 			</li>
 		</menu>
diff --git a/snappymail/v/0.0.0/include.php b/snappymail/v/0.0.0/include.php
index 4b89e6ec7..8e4d71db0 100644
--- a/snappymail/v/0.0.0/include.php
+++ b/snappymail/v/0.0.0/include.php
@@ -3,16 +3,6 @@ if (defined('APP_VERSION_ROOT_PATH')) {
 	return;
 }
 
-if (function_exists('sys_getloadavg')) {
-	$load = sys_getloadavg();
-	if ($load && $load[0] > 95) {
-		header('HTTP/1.1 503 Service Unavailable');
-		header('Retry-After: 120');
-		exit('Mailserver too busy. Please try again later.');
-	}
-	unset($load);
-}
-
 // PHP 8
 if (!function_exists('str_contains')) {
 	function str_contains(string $haystack, string $needle) : bool
@@ -144,28 +134,11 @@ if (isset($_SERVER['HTTPS'])) {
 	header('Strict-Transport-Security: max-age=31536000');
 }
 
-// See https://github.com/kjdev/php-ext-brotli
-if (!ini_get('zlib.output_compression') && !ini_get('brotli.output_compression')) {
-	if (defined('USE_BROTLI') && is_callable('brotli_compress_add') && false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'br')) {
-		ob_start(function(string $buffer, int $phase){
-			static $resource;
-			if ($phase & PHP_OUTPUT_HANDLER_START) {
-				header('Content-Encoding: br');
-				$resource = brotli_compress_init(/*int $quality = 11, int $mode = BROTLI_GENERIC*/);
-			}
-			return brotli_compress_add($resource, $buffer, ($phase & PHP_OUTPUT_HANDLER_FINAL) ? BROTLI_FINISH : BROTLI_PROCESS);
-		});
-	} else if (defined('USE_GZIP')) {
-		ob_start('ob_gzhandler');
-	}
-}
-
 // cPanel https://github.com/the-djmaze/snappymail/issues/697
 if (!empty($_ENV['CPANEL']) && !is_dir(APP_PLUGINS_PATH.'login-remote')) {
 	require __DIR__ . '/cpanel.php';
 }
 
-if (class_exists('RainLoop\\Api') && empty($_ENV['SNAPPYMAIL_INCLUDE_AS_API'])) {
+if (empty($_ENV['SNAPPYMAIL_INCLUDE_AS_API'])) {
 	RainLoop\Service::Handle();
-	exit;
 }
diff --git a/snappymail/v/0.0.0/themes/BlackWood/styles.css b/snappymail/v/0.0.0/themes/BlackWood/styles.css
index d32c2e427..e1ecf4126 100644
--- a/snappymail/v/0.0.0/themes/BlackWood/styles.css
+++ b/snappymail/v/0.0.0/themes/BlackWood/styles.css
@@ -6,6 +6,11 @@
 	--main-bg-color: #48525C;
 	--main-bg-image: url("images/background.jpg");
 	--main-bg-size: cover;
+	--link-color: #6AE;
+	--border-color: #555;
+	--hr-color: #666;
+
+	--panel-bg-clr: #333;
 
 	/* LOADING */
 	--loading-color: #ddd;
@@ -44,8 +49,23 @@
 	--settings-menu-hover-color: #fff;
 	--settings-menu-hover-bg-color: rgba(0,0,0,0.5);
 
-	/* MESSAGE LIST */
-	--message-list-toolbar-bg-color: #eee;
+	/* MESSAGES */
+	--message-list-toolbar-bg-color: #111;
+	--message-header-bg-clr: #222;
+
+	/* DIALOGS */
+	--dialog-clr: #fff;
+	--dialog-bg-clr: #333;
+	--dialog-border-clr: #555;
+
+	/* FORMS */
+	--btn-clr: #fff;
+	--btn-bg-clr: #222;
+	--btn-border-clr: rgba(255,255,255,.20);
+
+	--input-clr: #fff;
+	--input-bg-clr: #222;
+	--input-border-clr: #aaa;
 }
 
 ::-webkit-scrollbar {
@@ -73,17 +93,9 @@
 	color: #ccc;
 }
 
-.thm-message-list-top-toolbar, .thm-message-list-bottom-toolbar {
-    background-color: #111 !important;
-	color: var(--main-color);
-}
-
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger) {
-	border-color: rgba(255,255,255,.15) rgba(255,255,255,.15) rgba(255,255,255,.25);
 	box-shadow: inset 0 1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(255,255,255,.05);
-	color: var(--main-color);
 	text-shadow: 0 -1px 0 rgba(255,255,255,.25);
-	background-color: #222;
 }
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger).active,
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger):active {
@@ -93,57 +105,9 @@
     border-color: #333;
     border-top-color: #ccc;
 }
-.btn .caret {
-	border-top-color: var(--main-color);
-}
-
-#rl-popups > dialog,
-#rl-settings-subscreen,
-.messageList,
-.messageView,
-.alert-info,
-#V-PopupsCompose .b-attachment-place {
-	background-color: #333;
-	border-color: #555;
-	color: var(--main-color);
-}
-
-.legend,
-dialog header, dialog footer,
-.table td, .table th {
-	border-color: #555 !important;
-}
-
-.legend,
-.messageView #messageItem {
-	color: var(--main-color);
-}
-
-.rl-mobile .squire-toolbar,
-#V-PopupsCompose .b-attachment-place.dragAndDropOver {
-	background-color: #222;
-}
-
-.g-ui-link,
-.messageView .messageItemHeader .informationShort a,
-.messageView #messageItem .bodyText .b-text-part a {
-	color: #6AE;
-}
-
-.messageView .messageItemHeader,
-.messageView #messageItem .pgpEncrypted,
-.messageView #messageItem .pgpSigned,
-.messageView #messageItem .readReceipt,
-.messageView #messageItem .showImages,
-.messageView #messageItem .attachmentsPlace,
-.messageView #messageItem .attachmentsControls {
-	background-color: #222;
-	border-bottom-color: #444;
-}
 
 .messageListItem {
 	border-left-color: #111;
-    color: #EEE;
 }
 
 .table-hover tbody tr:hover td,
@@ -160,28 +124,15 @@ dialog header, dialog footer,
 	filter: invert(1);
 }
 
-.b-folders li a.focused {
-	background-color: #111;
-}
-
 .tabs [id^="tab"]:checked + label {
 	background: linear-gradient(#555 0%, #000 100%);
 }
 
-input, textarea, .select, select, .emailaddresses {
-    background-color: #222;
-    border-color: #aaa;
-    color: #fff;
-}
 .select, select {
     background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+);
 }
 
-hr {
-	border-color: #666;
-}
-
 #messageItem .b-text-part blockquote,
 .b-settings-general .editMainIdentity {
     border-color: #999;
-}
\ No newline at end of file
+}
diff --git a/snappymail/v/0.0.0/themes/BlurredDark/styles.css b/snappymail/v/0.0.0/themes/BlurredDark/styles.css
index e1de4c013..34ad09cdb 100644
--- a/snappymail/v/0.0.0/themes/BlurredDark/styles.css
+++ b/snappymail/v/0.0.0/themes/BlurredDark/styles.css
@@ -7,6 +7,11 @@
 	--main-bg-color: #48525C;
 	--main-bg-image: url("images/background.jpg");
 	--main-bg-size: cover;
+	--link-color: #6AE;
+	--border-color: #555;
+	--hr-color: #666;
+
+	--panel-bg-clr: #333;
 
 	/* LOADING */
 	--loading-color: #ddd;
@@ -45,8 +50,23 @@
 	--settings-menu-hover-color: #fff;
 	--settings-menu-hover-bg-color: rgba(0,0,0,0.5);
 
-	/* MESSAGE LIST */
-	--message-list-toolbar-bg-color: #eee;
+	/* MESSAGES */
+	--message-list-toolbar-bg-color: #111;
+	--message-header-bg-clr: #222;
+
+	/* DIALOGS */
+	--dialog-clr: #fff;
+	--dialog-bg-clr: #333;
+	--dialog-border-clr: #555;
+
+	/* FORMS */
+	--btn-clr: #fff;
+	--btn-bg-clr: #222;
+	--btn-border-clr: rgba(255,255,255,.20);
+
+	--input-clr: #fff;
+	--input-bg-clr: #222;
+	--input-border-clr: #aaa;
 }
 
 ::-webkit-scrollbar {
@@ -74,17 +94,9 @@
 	color: #ccc;
 }
 
-.thm-message-list-top-toolbar, .thm-message-list-bottom-toolbar {
-    background-color: #111 !important;
-	color: var(--main-color);
-}
-
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger) {
-	border-color: rgba(255,255,255,.15) rgba(255,255,255,.15) rgba(255,255,255,.25);
 	box-shadow: inset 0 1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(255,255,255,.05);
-	color: var(--main-color);
 	text-shadow: 0 -1px 0 rgba(255,255,255,.25);
-	background-color: #222;
 }
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger).active,
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger):active {
@@ -94,57 +106,9 @@
     border-color: #333;
     border-top-color: #ccc;
 }
-.btn .caret {
-	border-top-color: var(--main-color);
-}
-
-#rl-popups > dialog,
-#rl-settings-subscreen,
-.messageList,
-.messageView,
-.alert-info,
-#V-PopupsCompose .b-attachment-place {
-	background-color: #333;
-	border-color: #555;
-	color: var(--main-color);
-}
-
-.legend,
-dialog header, dialog footer,
-.table td, .table th {
-	border-color: #555 !important;
-}
-
-.legend,
-.messageView #messageItem {
-	color: var(--main-color);
-}
-
-.rl-mobile .squire-toolbar,
-#V-PopupsCompose .b-attachment-place.dragAndDropOver {
-	background-color: #222;
-}
-
-.g-ui-link,
-.messageView .messageItemHeader .informationShort a,
-.messageView #messageItem .bodyText .b-text-part a {
-	color: #6AE;
-}
-
-.messageView .messageItemHeader,
-.messageView #messageItem .pgpEncrypted,
-.messageView #messageItem .pgpSigned,
-.messageView #messageItem .readReceipt,
-.messageView #messageItem .showImages,
-.messageView #messageItem .attachmentsPlace,
-.messageView #messageItem .attachmentsControls {
-	background-color: #222;
-	border-bottom-color: #444;
-}
 
 .messageListItem {
 	border-left-color: #111;
-    color: #EEE;
 }
 
 .table-hover tbody tr:hover td,
@@ -161,27 +125,14 @@ dialog header, dialog footer,
 	filter: invert(1);
 }
 
-.b-folders li a.focused {
-	background-color: #111;
-}
-
 .tabs [id^="tab"]:checked + label {
 	background: linear-gradient(#555 0%, #000 100%);
 }
 
-input, textarea, .select, select, .emailaddresses {
-    background-color: #222;
-    border-color: #aaa;
-    color: #fff;
-}
 .select, select {
     background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+);
 }
 
-hr {
-	border-color: #666;
-}
-
 #messageItem .b-text-part blockquote,
 .b-settings-general .editMainIdentity {
     border-color: #999;
diff --git a/snappymail/v/0.0.0/themes/LoveDark/styles.css b/snappymail/v/0.0.0/themes/LoveDark/styles.css
index d32c2e427..fd221a07b 100644
--- a/snappymail/v/0.0.0/themes/LoveDark/styles.css
+++ b/snappymail/v/0.0.0/themes/LoveDark/styles.css
@@ -6,6 +6,11 @@
 	--main-bg-color: #48525C;
 	--main-bg-image: url("images/background.jpg");
 	--main-bg-size: cover;
+	--link-color: #6AE;
+	--border-color: #555;
+	--hr-color: #666;
+
+	--panel-bg-clr: #333;
 
 	/* LOADING */
 	--loading-color: #ddd;
@@ -44,8 +49,24 @@
 	--settings-menu-hover-color: #fff;
 	--settings-menu-hover-bg-color: rgba(0,0,0,0.5);
 
-	/* MESSAGE LIST */
-	--message-list-toolbar-bg-color: #eee;
+	/* MESSAGES */
+	--message-list-toolbar-bg-color: #111;
+	--message-header-bg-clr: #222;
+
+	/* DIALOGS */
+	--dialog-clr: #fff;
+	--dialog-bg-clr: #333;
+	--dialog-border-clr: #555;
+
+
+	/* FORMS */
+	--btn-clr: #fff;
+	--btn-bg-clr: #222;
+	--btn-border-clr: rgba(255,255,255,.20);
+
+	--input-clr: #fff;
+	--input-bg-clr: #222;
+	--input-border-clr: #aaa;
 }
 
 ::-webkit-scrollbar {
@@ -73,17 +94,9 @@
 	color: #ccc;
 }
 
-.thm-message-list-top-toolbar, .thm-message-list-bottom-toolbar {
-    background-color: #111 !important;
-	color: var(--main-color);
-}
-
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger) {
-	border-color: rgba(255,255,255,.15) rgba(255,255,255,.15) rgba(255,255,255,.25);
 	box-shadow: inset 0 1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(255,255,255,.05);
-	color: var(--main-color);
 	text-shadow: 0 -1px 0 rgba(255,255,255,.25);
-	background-color: #222;
 }
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger).active,
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger):active {
@@ -93,57 +106,9 @@
     border-color: #333;
     border-top-color: #ccc;
 }
-.btn .caret {
-	border-top-color: var(--main-color);
-}
-
-#rl-popups > dialog,
-#rl-settings-subscreen,
-.messageList,
-.messageView,
-.alert-info,
-#V-PopupsCompose .b-attachment-place {
-	background-color: #333;
-	border-color: #555;
-	color: var(--main-color);
-}
-
-.legend,
-dialog header, dialog footer,
-.table td, .table th {
-	border-color: #555 !important;
-}
-
-.legend,
-.messageView #messageItem {
-	color: var(--main-color);
-}
-
-.rl-mobile .squire-toolbar,
-#V-PopupsCompose .b-attachment-place.dragAndDropOver {
-	background-color: #222;
-}
-
-.g-ui-link,
-.messageView .messageItemHeader .informationShort a,
-.messageView #messageItem .bodyText .b-text-part a {
-	color: #6AE;
-}
-
-.messageView .messageItemHeader,
-.messageView #messageItem .pgpEncrypted,
-.messageView #messageItem .pgpSigned,
-.messageView #messageItem .readReceipt,
-.messageView #messageItem .showImages,
-.messageView #messageItem .attachmentsPlace,
-.messageView #messageItem .attachmentsControls {
-	background-color: #222;
-	border-bottom-color: #444;
-}
 
 .messageListItem {
 	border-left-color: #111;
-    color: #EEE;
 }
 
 .table-hover tbody tr:hover td,
@@ -160,28 +125,15 @@ dialog header, dialog footer,
 	filter: invert(1);
 }
 
-.b-folders li a.focused {
-	background-color: #111;
-}
-
 .tabs [id^="tab"]:checked + label {
 	background: linear-gradient(#555 0%, #000 100%);
 }
 
-input, textarea, .select, select, .emailaddresses {
-    background-color: #222;
-    border-color: #aaa;
-    color: #fff;
-}
 .select, select {
     background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+);
 }
 
-hr {
-	border-color: #666;
-}
-
 #messageItem .b-text-part blockquote,
 .b-settings-general .editMainIdentity {
     border-color: #999;
-}
\ No newline at end of file
+}
diff --git a/snappymail/v/0.0.0/themes/NightShine/styles.css b/snappymail/v/0.0.0/themes/NightShine/styles.css
index d32c2e427..fd221a07b 100644
--- a/snappymail/v/0.0.0/themes/NightShine/styles.css
+++ b/snappymail/v/0.0.0/themes/NightShine/styles.css
@@ -6,6 +6,11 @@
 	--main-bg-color: #48525C;
 	--main-bg-image: url("images/background.jpg");
 	--main-bg-size: cover;
+	--link-color: #6AE;
+	--border-color: #555;
+	--hr-color: #666;
+
+	--panel-bg-clr: #333;
 
 	/* LOADING */
 	--loading-color: #ddd;
@@ -44,8 +49,24 @@
 	--settings-menu-hover-color: #fff;
 	--settings-menu-hover-bg-color: rgba(0,0,0,0.5);
 
-	/* MESSAGE LIST */
-	--message-list-toolbar-bg-color: #eee;
+	/* MESSAGES */
+	--message-list-toolbar-bg-color: #111;
+	--message-header-bg-clr: #222;
+
+	/* DIALOGS */
+	--dialog-clr: #fff;
+	--dialog-bg-clr: #333;
+	--dialog-border-clr: #555;
+
+
+	/* FORMS */
+	--btn-clr: #fff;
+	--btn-bg-clr: #222;
+	--btn-border-clr: rgba(255,255,255,.20);
+
+	--input-clr: #fff;
+	--input-bg-clr: #222;
+	--input-border-clr: #aaa;
 }
 
 ::-webkit-scrollbar {
@@ -73,17 +94,9 @@
 	color: #ccc;
 }
 
-.thm-message-list-top-toolbar, .thm-message-list-bottom-toolbar {
-    background-color: #111 !important;
-	color: var(--main-color);
-}
-
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger) {
-	border-color: rgba(255,255,255,.15) rgba(255,255,255,.15) rgba(255,255,255,.25);
 	box-shadow: inset 0 1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(255,255,255,.05);
-	color: var(--main-color);
 	text-shadow: 0 -1px 0 rgba(255,255,255,.25);
-	background-color: #222;
 }
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger).active,
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger):active {
@@ -93,57 +106,9 @@
     border-color: #333;
     border-top-color: #ccc;
 }
-.btn .caret {
-	border-top-color: var(--main-color);
-}
-
-#rl-popups > dialog,
-#rl-settings-subscreen,
-.messageList,
-.messageView,
-.alert-info,
-#V-PopupsCompose .b-attachment-place {
-	background-color: #333;
-	border-color: #555;
-	color: var(--main-color);
-}
-
-.legend,
-dialog header, dialog footer,
-.table td, .table th {
-	border-color: #555 !important;
-}
-
-.legend,
-.messageView #messageItem {
-	color: var(--main-color);
-}
-
-.rl-mobile .squire-toolbar,
-#V-PopupsCompose .b-attachment-place.dragAndDropOver {
-	background-color: #222;
-}
-
-.g-ui-link,
-.messageView .messageItemHeader .informationShort a,
-.messageView #messageItem .bodyText .b-text-part a {
-	color: #6AE;
-}
-
-.messageView .messageItemHeader,
-.messageView #messageItem .pgpEncrypted,
-.messageView #messageItem .pgpSigned,
-.messageView #messageItem .readReceipt,
-.messageView #messageItem .showImages,
-.messageView #messageItem .attachmentsPlace,
-.messageView #messageItem .attachmentsControls {
-	background-color: #222;
-	border-bottom-color: #444;
-}
 
 .messageListItem {
 	border-left-color: #111;
-    color: #EEE;
 }
 
 .table-hover tbody tr:hover td,
@@ -160,28 +125,15 @@ dialog header, dialog footer,
 	filter: invert(1);
 }
 
-.b-folders li a.focused {
-	background-color: #111;
-}
-
 .tabs [id^="tab"]:checked + label {
 	background: linear-gradient(#555 0%, #000 100%);
 }
 
-input, textarea, .select, select, .emailaddresses {
-    background-color: #222;
-    border-color: #aaa;
-    color: #fff;
-}
 .select, select {
     background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+);
 }
 
-hr {
-	border-color: #666;
-}
-
 #messageItem .b-text-part blockquote,
 .b-settings-general .editMainIdentity {
     border-color: #999;
-}
\ No newline at end of file
+}
diff --git a/snappymail/v/0.0.0/themes/SnowDarkV1/styles.css b/snappymail/v/0.0.0/themes/SnowDarkV1/styles.css
index e1de4c013..34ad09cdb 100644
--- a/snappymail/v/0.0.0/themes/SnowDarkV1/styles.css
+++ b/snappymail/v/0.0.0/themes/SnowDarkV1/styles.css
@@ -7,6 +7,11 @@
 	--main-bg-color: #48525C;
 	--main-bg-image: url("images/background.jpg");
 	--main-bg-size: cover;
+	--link-color: #6AE;
+	--border-color: #555;
+	--hr-color: #666;
+
+	--panel-bg-clr: #333;
 
 	/* LOADING */
 	--loading-color: #ddd;
@@ -45,8 +50,23 @@
 	--settings-menu-hover-color: #fff;
 	--settings-menu-hover-bg-color: rgba(0,0,0,0.5);
 
-	/* MESSAGE LIST */
-	--message-list-toolbar-bg-color: #eee;
+	/* MESSAGES */
+	--message-list-toolbar-bg-color: #111;
+	--message-header-bg-clr: #222;
+
+	/* DIALOGS */
+	--dialog-clr: #fff;
+	--dialog-bg-clr: #333;
+	--dialog-border-clr: #555;
+
+	/* FORMS */
+	--btn-clr: #fff;
+	--btn-bg-clr: #222;
+	--btn-border-clr: rgba(255,255,255,.20);
+
+	--input-clr: #fff;
+	--input-bg-clr: #222;
+	--input-border-clr: #aaa;
 }
 
 ::-webkit-scrollbar {
@@ -74,17 +94,9 @@
 	color: #ccc;
 }
 
-.thm-message-list-top-toolbar, .thm-message-list-bottom-toolbar {
-    background-color: #111 !important;
-	color: var(--main-color);
-}
-
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger) {
-	border-color: rgba(255,255,255,.15) rgba(255,255,255,.15) rgba(255,255,255,.25);
 	box-shadow: inset 0 1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(255,255,255,.05);
-	color: var(--main-color);
 	text-shadow: 0 -1px 0 rgba(255,255,255,.25);
-	background-color: #222;
 }
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger).active,
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger):active {
@@ -94,57 +106,9 @@
     border-color: #333;
     border-top-color: #ccc;
 }
-.btn .caret {
-	border-top-color: var(--main-color);
-}
-
-#rl-popups > dialog,
-#rl-settings-subscreen,
-.messageList,
-.messageView,
-.alert-info,
-#V-PopupsCompose .b-attachment-place {
-	background-color: #333;
-	border-color: #555;
-	color: var(--main-color);
-}
-
-.legend,
-dialog header, dialog footer,
-.table td, .table th {
-	border-color: #555 !important;
-}
-
-.legend,
-.messageView #messageItem {
-	color: var(--main-color);
-}
-
-.rl-mobile .squire-toolbar,
-#V-PopupsCompose .b-attachment-place.dragAndDropOver {
-	background-color: #222;
-}
-
-.g-ui-link,
-.messageView .messageItemHeader .informationShort a,
-.messageView #messageItem .bodyText .b-text-part a {
-	color: #6AE;
-}
-
-.messageView .messageItemHeader,
-.messageView #messageItem .pgpEncrypted,
-.messageView #messageItem .pgpSigned,
-.messageView #messageItem .readReceipt,
-.messageView #messageItem .showImages,
-.messageView #messageItem .attachmentsPlace,
-.messageView #messageItem .attachmentsControls {
-	background-color: #222;
-	border-bottom-color: #444;
-}
 
 .messageListItem {
 	border-left-color: #111;
-    color: #EEE;
 }
 
 .table-hover tbody tr:hover td,
@@ -161,27 +125,14 @@ dialog header, dialog footer,
 	filter: invert(1);
 }
 
-.b-folders li a.focused {
-	background-color: #111;
-}
-
 .tabs [id^="tab"]:checked + label {
 	background: linear-gradient(#555 0%, #000 100%);
 }
 
-input, textarea, .select, select, .emailaddresses {
-    background-color: #222;
-    border-color: #aaa;
-    color: #fff;
-}
 .select, select {
     background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+);
 }
 
-hr {
-	border-color: #666;
-}
-
 #messageItem .b-text-part blockquote,
 .b-settings-general .editMainIdentity {
     border-color: #999;
diff --git a/snappymail/v/0.0.0/themes/SquaresDark/styles.css b/snappymail/v/0.0.0/themes/SquaresDark/styles.css
index 07f336d07..a570ee3d8 100644
--- a/snappymail/v/0.0.0/themes/SquaresDark/styles.css
+++ b/snappymail/v/0.0.0/themes/SquaresDark/styles.css
@@ -6,7 +6,11 @@
 	--main-color: #fff;
 	--main-bg-color: #3C454D;
 	--main-bg-image: url("images/background.jpg");
+	--link-color: #6AE;
 	--border-color: #555;
+	--hr-color: #666;
+
+	--panel-bg-clr: #000;
 
 	/* LOADING */
 	--loading-color: #ddd;
@@ -45,10 +49,20 @@
 	--settings-menu-hover-color: #fff;
 	--settings-menu-hover-bg-color: rgba(0,0,0,0.5);
 
-	/* MESSAGE LIST */
+	/* MESSAGES */
 	--message-list-toolbar-bg-color: #222;
+	--message-header-bg-clr: #222;
+
+	/* DIALOGS */
+	--dialog-clr: #fff;
+	--dialog-bg-clr: #000;
+	--dialog-border-clr: #555;
 
 	/* FORMS */
+	--btn-clr: #fff;
+	--btn-bg-clr: #000;
+	--btn-border-clr: rgba(255,255,255,.20);
+
 	--input-clr: #fff;
 	--input-bg-clr: #000;
 	--input-border-clr: #aaa;
@@ -68,16 +82,11 @@
 
 .thm-message-list-top-toolbar, .thm-message-list-bottom-toolbar {
 	background-image: linear-gradient(to bottom,#444,#111) !important;
-	background-repeat: repeat-x !important;
-	color: var(--main-color);
 }
 
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger) {
-	border-color: rgba(255,255,255,.15) rgba(255,255,255,.15) rgba(255,255,255,.25);
 	box-shadow: inset 0 1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(255,255,255,.05);
-	color: var(--main-color);
 	text-shadow: 0 -1px 0 rgba(255,255,255,.25);
-	background-color: #000;
 }
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger).active,
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger):active {
@@ -87,46 +96,9 @@
 	border-color: #333;
 	border-top-color: #ccc;
 }
-.btn .caret {
-	border-top-color: var(--main-color);
-}
-
-#rl-popups > dialog,
-#rl-settings-subscreen,
-.messageList,
-.messageView,
-.alert-info,
-#V-PopupsCompose .b-attachment-place {
-	background-color: #000;
-	border-color: #555;
-	color: var(--main-color);
-}
-
-.legend,
-.messageView #messageItem {
-	color: var(--main-color);
-}
-
-.rl-mobile .squire-toolbar,
-#V-PopupsCompose .b-attachment-place.dragAndDropOver {
-	background-color: #222;
-}
-
-.g-ui-link,
-.messageView .messageItemHeader .informationShort a,
-.messageView #messageItem .bodyText .b-text-part a {
-	color: #6AE;
-}
-
-.messageView .messageItemHeader,
-.messageView #messageItem .bodySubHeader > * {
-	background-color: #222;
-	border-bottom-color: #444;
-}
 
 .messageListItem {
 	border-left-color: #111;
-	color: #EEE;
 }
 
 .table-hover tbody tr:hover td,
@@ -143,10 +115,6 @@
 	filter: invert(1);
 }
 
-.b-folders li a.focused {
-	background-color: #111;
-}
-
 .tabs [id^="tab"]:checked + label {
 	background: linear-gradient(#555 0%, #000 100%);
 }
@@ -155,10 +123,6 @@
 	background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+);
 }
 
-hr {
-	border-color: #666;
-}
-
 #messageItem .b-text-part blockquote,
 .b-settings-general .editMainIdentity {
 	border-color: #999;
diff --git a/snappymail/v/0.0.0/themes/StripesDark/styles.css b/snappymail/v/0.0.0/themes/StripesDark/styles.css
index d32c2e427..e1ecf4126 100644
--- a/snappymail/v/0.0.0/themes/StripesDark/styles.css
+++ b/snappymail/v/0.0.0/themes/StripesDark/styles.css
@@ -6,6 +6,11 @@
 	--main-bg-color: #48525C;
 	--main-bg-image: url("images/background.jpg");
 	--main-bg-size: cover;
+	--link-color: #6AE;
+	--border-color: #555;
+	--hr-color: #666;
+
+	--panel-bg-clr: #333;
 
 	/* LOADING */
 	--loading-color: #ddd;
@@ -44,8 +49,23 @@
 	--settings-menu-hover-color: #fff;
 	--settings-menu-hover-bg-color: rgba(0,0,0,0.5);
 
-	/* MESSAGE LIST */
-	--message-list-toolbar-bg-color: #eee;
+	/* MESSAGES */
+	--message-list-toolbar-bg-color: #111;
+	--message-header-bg-clr: #222;
+
+	/* DIALOGS */
+	--dialog-clr: #fff;
+	--dialog-bg-clr: #333;
+	--dialog-border-clr: #555;
+
+	/* FORMS */
+	--btn-clr: #fff;
+	--btn-bg-clr: #222;
+	--btn-border-clr: rgba(255,255,255,.20);
+
+	--input-clr: #fff;
+	--input-bg-clr: #222;
+	--input-border-clr: #aaa;
 }
 
 ::-webkit-scrollbar {
@@ -73,17 +93,9 @@
 	color: #ccc;
 }
 
-.thm-message-list-top-toolbar, .thm-message-list-bottom-toolbar {
-    background-color: #111 !important;
-	color: var(--main-color);
-}
-
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger) {
-	border-color: rgba(255,255,255,.15) rgba(255,255,255,.15) rgba(255,255,255,.25);
 	box-shadow: inset 0 1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(255,255,255,.05);
-	color: var(--main-color);
 	text-shadow: 0 -1px 0 rgba(255,255,255,.25);
-	background-color: #222;
 }
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger).active,
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger):active {
@@ -93,57 +105,9 @@
     border-color: #333;
     border-top-color: #ccc;
 }
-.btn .caret {
-	border-top-color: var(--main-color);
-}
-
-#rl-popups > dialog,
-#rl-settings-subscreen,
-.messageList,
-.messageView,
-.alert-info,
-#V-PopupsCompose .b-attachment-place {
-	background-color: #333;
-	border-color: #555;
-	color: var(--main-color);
-}
-
-.legend,
-dialog header, dialog footer,
-.table td, .table th {
-	border-color: #555 !important;
-}
-
-.legend,
-.messageView #messageItem {
-	color: var(--main-color);
-}
-
-.rl-mobile .squire-toolbar,
-#V-PopupsCompose .b-attachment-place.dragAndDropOver {
-	background-color: #222;
-}
-
-.g-ui-link,
-.messageView .messageItemHeader .informationShort a,
-.messageView #messageItem .bodyText .b-text-part a {
-	color: #6AE;
-}
-
-.messageView .messageItemHeader,
-.messageView #messageItem .pgpEncrypted,
-.messageView #messageItem .pgpSigned,
-.messageView #messageItem .readReceipt,
-.messageView #messageItem .showImages,
-.messageView #messageItem .attachmentsPlace,
-.messageView #messageItem .attachmentsControls {
-	background-color: #222;
-	border-bottom-color: #444;
-}
 
 .messageListItem {
 	border-left-color: #111;
-    color: #EEE;
 }
 
 .table-hover tbody tr:hover td,
@@ -160,28 +124,15 @@ dialog header, dialog footer,
 	filter: invert(1);
 }
 
-.b-folders li a.focused {
-	background-color: #111;
-}
-
 .tabs [id^="tab"]:checked + label {
 	background: linear-gradient(#555 0%, #000 100%);
 }
 
-input, textarea, .select, select, .emailaddresses {
-    background-color: #222;
-    border-color: #aaa;
-    color: #fff;
-}
 .select, select {
     background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+);
 }
 
-hr {
-	border-color: #666;
-}
-
 #messageItem .b-text-part blockquote,
 .b-settings-general .editMainIdentity {
     border-color: #999;
-}
\ No newline at end of file
+}
diff --git a/snappymail/v/0.0.0/themes/example.css b/snappymail/v/0.0.0/themes/example.css
index f4983c334..1c1ebcaf3 100644
--- a/snappymail/v/0.0.0/themes/example.css
+++ b/snappymail/v/0.0.0/themes/example.css
@@ -14,6 +14,8 @@
 	--border-radius: 5px;
 	--hr-color: #eee;
 
+	--panel-bg-clr: #fff;
+
 	--warning-clr: #c09853;
 	--warning-bg-clr: #fcf8e3;
 	--warning-border-clr: #fbeed5;
@@ -62,18 +64,15 @@
 	--unread-count-bg-color: #333;
 
 	/* SETTINGS */
-	--settings-bg-clr: #fff;
 	--settings-menu-color: #333;
 	--settings-menu-selected-color: #eee;
 	--settings-menu-selected-bg-color: #333;
 	--settings-menu-hover-color: #eee;
 	--settings-menu-hover-bg-color: #333;
 
-	/* MESSAGE LIST */
+	/* MESSAGES */
 	--message-list-toolbar-bg-color: #eee;
-
-	/* MESSAGE */
-	--message-bg-color: #fff;
+	--message-header-bg-clr: #f8f8f8;
 
 	/* DIALOGS */
 	--dialog-clr: #333;
diff --git a/tasks/css.js b/tasks/css.js
index e3b89362a..498130ea7 100644
--- a/tasks/css.js
+++ b/tasks/css.js
@@ -8,6 +8,7 @@ const eol = require('gulp-eol');
 const filter = require('gulp-filter');
 const expect = require('gulp-expect-file');
 const gcmq = require('gulp-group-css-media-queries');
+const less = require('gulp-less');
 
 const { config } = require('./config');
 const { del } = require('./common');
@@ -29,7 +30,6 @@ const cssBootBuild = () => {
 
 const cssMainBuild = () => {
 	const
-		less = require('gulp-less'),
 		lessFilter = filter('**/*.less', { restore: true }),
 		src = config.paths.css.main.src.concat([config.paths.less.main.src]);
 
@@ -51,7 +51,6 @@ const cssMainBuild = () => {
 
 const cssAdminBuild = () => {
 	const
-		less = require('gulp-less'),
 		lessFilter = filter('**/*.less', { restore: true }),
 		src = config.paths.css.admin.src;
 
diff --git a/tasks/js.js b/tasks/js.js
index 5da1937e0..b8946f76b 100644
--- a/tasks/js.js
+++ b/tasks/js.js
@@ -10,8 +10,7 @@ const concat = require('gulp-concat'),
 	eslint = require('gulp-eslint'),
 	cache = require('gulp-cached'),
 	expect = require('gulp-expect-file'),
-	size = require('gulp-size'),
-	gutil = require('gulp-util');
+	size = require('gulp-size');
 
 const { config } = require('./config');
 const { del, getHead } = require('./common');
@@ -59,8 +58,7 @@ const jsSieve = async () =>
 //		.pipe(sourcemaps.write('.'))
 		.pipe(header(getHead() + '\n'))
 		.pipe(eol('\n', true))
-		.pipe(gulp.dest(config.paths.staticJS))
-		.on('error', gutil.log);
+		.pipe(gulp.dest(config.paths.staticJS));
 
 // app
 const jsApp = async () =>
@@ -68,16 +66,14 @@ const jsApp = async () =>
 //		.pipe(sourcemaps.write('.'))
 		.pipe(header(getHead() + '\n'))
 		.pipe(eol('\n', true))
-		.pipe(gulp.dest(config.paths.staticJS))
-		.on('error', gutil.log);
+		.pipe(gulp.dest(config.paths.staticJS));
 
 const jsAdmin = async () =>
 	(await rollupJS(config.paths.js.admin.name))
 //		.pipe(sourcemaps.write('.'))
 		.pipe(header(getHead() + '\n'))
 		.pipe(eol('\n', true))
-		.pipe(gulp.dest(config.paths.staticJS))
-		.on('error', gutil.log);
+		.pipe(gulp.dest(config.paths.staticJS));
 
 const jsMin = () =>
 	gulp
@@ -118,8 +114,7 @@ const jsMin = () =>
 				showTotal: false
 			})
 		)
-		.pipe(gulp.dest(config.paths.staticMinJS))
-		.on('error', gutil.log);
+		.pipe(gulp.dest(config.paths.staticMinJS));
 
 const jsLint = () =>
 	gulp
diff --git a/tasks/vendors.js b/tasks/vendors.js
index 357d4d29a..e66af42f8 100644
--- a/tasks/vendors.js
+++ b/tasks/vendors.js
@@ -1,7 +1,5 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */
 const gulp = require('gulp');
-const header = require('gulp-header');
-const stripbom = require('gulp-stripbom');
 
 const { config } = require('./config');
 const { del } = require('./common');
diff --git a/vendors/bootstrap/less/alerts.less b/vendors/bootstrap/less/alerts.less
index dfd741cc9..124326743 100644
--- a/vendors/bootstrap/less/alerts.less
+++ b/vendors/bootstrap/less/alerts.less
@@ -33,10 +33,22 @@
 .alert-error {
   background-color: var(--error-bg-clr, #f2dede);
   border-color: var(--error-border-clr, #eed3d7);
-  color: var(--error-clr, #b94a48);
 }
 .alert-info {
   background-color: var(--info-bg-clr, #d9edf7);
   border-color: var(--info-border-clr, #bce8f1);
+}
+
+.alert a:not(.close) {
+  text-decoration: underline;
+}
+
+.alert-info,
+.alert.alert-info a:not(.close) {
   color: var(--info-clr, #3a87ad);
 }
+
+.alert-error,
+.alert.alert-error a:not(.close) {
+  color: var(--error-clr, #b94a48);
+}
diff --git a/vendors/bootstrap/less/button-groups.less b/vendors/bootstrap/less/button-groups.less
index d3ef30963..d27fe144c 100644
--- a/vendors/bootstrap/less/button-groups.less
+++ b/vendors/bootstrap/less/button-groups.less
@@ -5,38 +5,36 @@
 
 // Make the div behave like a button
 .btn-group {
+  margin-right: 3px;
   position: relative;
   white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
 }
 
-.btn-group + .btn-group {
-  margin-left: 3px;
-}
-
 // Optional: Group multiple button groups together for a toolbar
 .btn-toolbar {
   .btn-group {
     display: inline-block;
   }
-  .btn + .btn,
-  .btn-group + .btn,
-  .btn + .btn-group {
-    margin-left: 3px;
+  * {
+    margin-right: 3px;
+  }
+  *:last-child {
+    margin-right: 0;
   }
 }
 
 // Float them, remove border radius, then re-add to first and last elements
-.btn-group > .btn {
-  position: relative;
+.btn-group > * {
   border-radius: 0;
+  position: relative;
+  margin-right: 0;
 }
-.btn-group > .btn + .btn {
+.btn-group > * + * {
   margin-left: -1px;
 }
 
 // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
 .btn-group > .btn:first-child {
-  margin-left: 0;
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px;
 }
diff --git a/vendors/bootstrap/less/buttons.less b/vendors/bootstrap/less/buttons.less
index 5f208a925..8bc88fd67 100644
--- a/vendors/bootstrap/less/buttons.less
+++ b/vendors/bootstrap/less/buttons.less
@@ -16,8 +16,7 @@
   text-align: center;
   vertical-align: middle;
   cursor: pointer;
-  border: 1px solid var(--btn-border-clr, #bbb);
-  border-color: rgba(0,0,0,.15) rgba(0,0,0,.15) rgba(0,0,0,.25);
+  border: 1px solid var(--btn-border-clr, rgba(0,0,0,.20));
   box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
   color: var(--btn-clr, #333);
   text-shadow: 0 -1px 0 rgba(0,0,0,.25);
diff --git a/vendors/knockout/build/output/knockout-latest.debug.js b/vendors/knockout/build/output/knockout-latest.debug.js
index f1818d029..883ef27b1 100644
--- a/vendors/knockout/build/output/knockout-latest.debug.js
+++ b/vendors/knockout/build/output/knockout-latest.debug.js
@@ -32,6 +32,9 @@ ko.utils = {
     objectForEach: (obj, action) => obj && Object.entries(obj).forEach(prop => action(prop[0], prop[1])),
 
     emptyDomNode: domNode => [...domNode.childNodes].forEach(child => ko.removeNode(child)),
+//    emptyDomNode: domNode => {while (domNode.lastChild) ko.removeNode(domNode.lastChild)},
+	// Safari 14+
+//    emptyDomNode: domNode => domNode.replaceChildren(),
 
     moveCleanedNodesToContainerElement: nodes => {
         // Ensure it's a real array, as we're about to reparent the nodes and
@@ -472,10 +475,7 @@ ko.exportProperty(ko_subscribable_fn, 'extend', ko_subscribable_fn.extend);
 // For browsers that support proto assignment, we overwrite the prototype of each
 // observable instance. Since observables are functions, we need Function.prototype
 // to still be in the prototype chain.
-Object.setPrototypeOf(ko_subscribable_fn, Function.prototype);
-
-ko.subscribable['fn'] = ko_subscribable_fn;
-
+ko.subscribable['fn'] = Object.setPrototypeOf(ko_subscribable_fn, Function.prototype);
 
 ko.isSubscribable = instance =>
     typeof instance?.subscribe == "function" && typeof instance.notifySubscribers == "function";
@@ -554,9 +554,7 @@ ko.observable = initialValue => {
     ko.subscribable['fn'].init(observable);
 
     // Inherit from 'observable'
-    Object.setPrototypeOf(observable, observableFn);
-
-    return observable;
+    return Object.setPrototypeOf(observable, observableFn);
 }
 
 // Define prototype for observables
@@ -605,12 +603,12 @@ ko.observableArray = initialValues => {
     if (typeof initialValues != 'object' || !('length' in initialValues))
         throw new Error("The argument passed when initializing an observable array must be an array, or null, or undefined.");
 
-    var result = ko.observable(initialValues);
-    Object.setPrototypeOf(result, ko.observableArray['fn']);
-    return result.extend({'trackArrayChanges':true});
+    return Object.setPrototypeOf(ko.observable(initialValues), ko.observableArray['fn']).extend({'trackArrayChanges':true});
 };
 
-ko.observableArray['fn'] = {
+// Note that for browsers that don't support proto assignment, the
+// inheritance chain is created manually in the ko.observableArray constructor
+ko.observableArray['fn'] = Object.setPrototypeOf({
     'remove': function (valueOrPredicate) {
         var underlyingArray = this.peek();
         var removed = false;
@@ -630,11 +628,7 @@ ko.observableArray['fn'] = {
         }
         removed && this.valueHasMutated();
     }
-};
-
-// Note that for browsers that don't support proto assignment, the
-// inheritance chain is created manually in the ko.observableArray constructor
-Object.setPrototypeOf(ko.observableArray['fn'], ko.observable['fn']);
+}, ko.observable['fn']);
 
 // Populate ko.observableArray.fn with native arrays functions
 Object.getOwnPropertyNames(Array.prototype).forEach(methodName => {
diff --git a/vendors/knockout/build/output/knockout-latest.js b/vendors/knockout/build/output/knockout-latest.js
index 7b6e9aff5..55ac99c20 100644
--- a/vendors/knockout/build/output/knockout-latest.js
+++ b/vendors/knockout/build/output/knockout-latest.js
@@ -4,7 +4,7 @@
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */
 
-(V=>{function P(a,b){return null===a||da[typeof a]?a===b:!1}function ea(a,b){var d;return()=>{d||(d=setTimeout(()=>{d=0;a()},b))}}function fa(a,b){var d;return()=>{clearTimeout(d);d=setTimeout(a,b)}}function ha(a,b){b?.A?.()}function ia(a,b){var d=this.$b,f=d[y];f.$||(this.Za&&this.za[b]?(d.vb(b,a,this.za[b]),this.za[b]=null,--this.Za):f.B[b]||d.vb(b,a,f.C?{X:a}:d.Sb(a)),a.ka&&a.Wb())}function W(a){a=c.g.j.get(a,K);var b=a?.I;b&&(a.I=null,b.Mb())}function X(a,b){for(var d,f=c.m.firstChild(b);d=f;)f=
+(V=>{function P(a,b){return null===a||da[typeof a]?a===b:!1}function ea(a,b){var d;return()=>{d||(d=setTimeout(()=>{d=0;a()},b))}}function fa(a,b){var d;return()=>{clearTimeout(d);d=setTimeout(a,b)}}function ha(a,b){b?.A?.()}function ia(a,b){var d=this.$b,f=d[y];f.$||(this.Za&&this.za[b]?(d.vb(b,a,this.za[b]),this.za[b]=null,--this.Za):f.B[b]||d.vb(b,a,f.C?{X:a}:d.Sb(a)),a.ja&&a.Wb())}function W(a){a=c.g.j.get(a,K);var b=a?.I;b&&(a.I=null,b.Mb())}function X(a,b){for(var d,f=c.m.firstChild(b);d=f;)f=
 c.m.nextSibling(d),Y(a,d);c.l.notify(b,c.l.H)}function Y(a,b){var d=a;if(1===b.nodeType||c.Ab.nc(b))d=Z(b,null,a).bindingContextForDescendants;d&&!b.matches?.("SCRIPT,TEXTAREA,TEMPLATE")&&X(d,b)}function ja(a){var b=[],d={},f=[];c.g.P(a,function e(l){if(!d[l]){var g=c.h[l];g&&(g.after&&(f.push(l),g.after.forEach(h=>{if(a[h]){if(f.includes(h))throw Error("Cannot combine the following bindings, because they have a cyclic dependency: "+f.join(", "));e(h)}}),f.length--),b.push({key:l,Ib:g}));d[l]=!0}});
 return b}function Z(a,b,d){var f=c.g.j.fb(a,K,{}),k=f.Xb;if(!b){if(k)throw Error("You cannot apply bindings multiple times to the same element.");f.Xb=!0}k||(f.context=d);f.hb||(f.hb={});if(b&&"function"!==typeof b)var l=b;else{var e=c.u(()=>{if(l=b?b(d,a):c.Ab.cc(a,d))d[L]?.(),d[aa]?.();return l},{s:a});l&&e.isActive()||(e=null)}var g=d,h;if(l){var n=e?m=>()=>e()[m]():m=>l[m],p={get:m=>l[m]&&n(m)(),has:m=>m in l};c.l.H in l&&c.l.subscribe(a,c.l.H,()=>{var m=l[c.l.H]();if(m){var r=c.m.childNodes(a);
 r.length&&m(r,c.Eb(r[0]))}});c.l.ga in l&&(g=c.l.mb(a,d),c.l.subscribe(a,c.l.ga,()=>{var m=l[c.l.ga]();m&&c.m.firstChild(a)&&m(a)}));ja(l).forEach(m=>{var r=m.Ib.init,q=m.Ib.update,t=m.key;if(8===a.nodeType&&!c.m.ca[t])throw Error("The binding '"+t+"' cannot be used with virtual elements");try{"function"==typeof r&&c.o.M(()=>{var u=r(a,n(t),p,g.$data,g);if(u&&u.controlsDescendantBindings){if(void 0!==h)throw Error("Multiple bindings ("+h+" and "+t+") are trying to control descendant bindings of the same element. You cannot use these bindings together on the same element.");
@@ -12,46 +12,46 @@ h=t}}),"function"==typeof q&&c.u(()=>q(a,n(t),p,g.$data,g),{s:a})}catch(u){throw
 c.g={extend:(a,b)=>b?Object.assign(a,b):a,P:(a,b)=>a&&Object.entries(a).forEach(d=>b(d[0],d[1])),cb:a=>[...a.childNodes].forEach(b=>c.removeNode(b)),Lb:a=>{a=[...a];var b=(a[0]?.ownerDocument||M).createElement("div");a.forEach(d=>b.append(c.fa(d)));return b},ya:(a,b)=>Array.prototype.map.call(a,b?d=>c.fa(d.cloneNode(!0)):d=>d.cloneNode(!0)),ua:(a,b)=>{c.g.cb(a);b&&a.append(...b)},Ba:(a,b)=>{if(a.length){for(b=8===b.nodeType&&b.parentNode||b;a.length&&a[0].parentNode!==b;)a.splice(0,1);for(;1<a.length&&
 a[a.length-1].parentNode!==b;)--a.length;if(1<a.length){b=a[0];var d=a[a.length-1];for(a.length=0;b!==d;)a.push(b),b=b.nextSibling;a.push(d)}}return a},Rb:a=>null==a?"":a.trim?a.trim():a.toString().replace(/^[\s\xa0]+|[\s\xa0]+$/g,""),bb:a=>a.ownerDocument.documentElement.contains(1!==a.nodeType?a.parentNode:a),Tb:(a,b)=>{if(!a?.nodeType)throw Error("element must be a DOM node when calling triggerEvent");a.dispatchEvent(new Event(b))},i:a=>c.T(a)?a():a,lb:(a,b)=>a.textContent=c.g.i(b)||""};c.v("utils",
 c.g);c.v("unwrap",c.g.i);(()=>{let a=0,b="__ko__"+Date.now(),d=new WeakMap;c.g.j={get:(f,k)=>(d.get(f)||{})[k],set:(f,k,l)=>{d.has(f)?d.get(f)[k]=l:d.set(f,{[k]:l});return l},fb:function(f,k,l){return this.get(f,k)||this.set(f,k,l)},clear:f=>d.delete(f),Z:()=>a++ +b}})();c.g.K=(()=>{var a=c.g.j.Z(),b={1:1,8:1,9:1},d={1:1,9:1};const f=(e,g)=>{var h=c.g.j.get(e,a);g&&!h&&(h=new Set,c.g.j.set(e,a,h));return h},k=e=>{var g=f(e);g&&(new Set(g)).forEach(h=>h(e));c.g.j.clear(e);d[e.nodeType]&&l(e.childNodes,
-!0)},l=(e,g)=>{for(var h=[],n,p=0;p<e.length;p++)if(!g||8===e[p].nodeType)if(k(h[h.length]=n=e[p]),e[p]!==n)for(;p--&&!h.includes(e[p]););};return{na:(e,g)=>{if("function"!=typeof g)throw Error("Callback must be a function");f(e,1).add(g)},kb:(e,g)=>{var h=f(e);h&&(h.delete(g),h.size||c.g.j.set(e,a,null))},fa:e=>{c.o.M(()=>{b[e.nodeType]&&(k(e),d[e.nodeType]&&l(e.getElementsByTagName("*")))});return e},removeNode:e=>{c.fa(e);e.parentNode&&e.parentNode.removeChild(e)}}})();c.fa=c.g.K.fa;c.removeNode=
-c.g.K.removeNode;c.v("utils.domNodeDisposal",c.g.K);c.v("utils.domNodeDisposal.addDisposeCallback",c.g.K.na);c.eb={debounce:(a,b)=>a.Ja(d=>fa(d,b)),rateLimit:(a,b)=>{if("number"==typeof b)var d=b;else{d=b.timeout;var f=b.method}var k="function"==typeof f?f:ea;a.Ja(l=>k(l,d,b))},notify:(a,b)=>{a.qa="always"==b?null:P}};var da={undefined:1,"boolean":1,number:1,string:1};c.v("extenders",c.eb);class ka{constructor(a,b,d){this.X=a;this.pb=b;this.Da=d;this.Ra=!1;this.L=this.ia=null;c.ha(this,"dispose",
-this.A)}A(){this.Ra||(this.L&&c.g.K.kb(this.ia,this.L),this.Ra=!0,this.Da(),this.X=this.pb=this.Da=this.ia=this.L=null)}s(a){this.ia=a;c.g.K.na(a,this.L=this.A.bind(this))}}c.V=function(){Object.setPrototypeOf(this,D);D.Fa(this)};var D={Fa:a=>{a.W=new Map;a.W.set("change",new Set);a.ub=1},subscribe:function(a,b,d){var f=this;d=d||"change";var k=new ka(f,b?a.bind(b):a,()=>{f.W.get(d).delete(k);f.Sa?.(d)});f.Ua?.(d);f.W.has(d)||f.W.set(d,new Set);f.W.get(d).add(k);return k},D:function(a,b){b=b||"change";
-"change"===b&&this.Na();if(this.sa(b)){b="change"===b&&this.Ub||new Set(this.W.get(b));try{c.o.zb(),b.forEach(d=>{d.Ra||d.pb(a)})}finally{c.o.end()}}},Ca:function(){return this.ub},fc:function(a){return this.Ca()!==a},Na:function(){++this.ub},Ja:function(a){var b=this,d=c.T(b),f,k,l,e,g;b.wa||(b.wa=b.D,b.D=(n,p)=>{p&&"change"!==p?"beforeChange"===p?b.rb(n):b.wa(n,p):b.sb(n)});var h=a(()=>{b.ka=!1;d&&e===b&&(e=b.qb?b.qb():b());var n=k||g&&b.Ha(l,e);g=k=f=!1;n&&b.wa(l=e)});b.sb=(n,p)=>{p&&b.ka||(g=
-!p);b.Ub=new Set(b.W.get("change"));b.ka=f=!0;e=n;h()};b.rb=n=>{f||(l=n,b.wa(n,"beforeChange"))};b.tb=()=>{g=!0};b.Wb=()=>{b.Ha(l,b.R(!0))&&(k=!0)}},sa:function(a){return(this.W.get(a)||[]).size},Ha:function(a,b){return!this.qa||!this.qa(a,b)},toString:()=>"[object Object]",extend:function(a){var b=this;a&&c.g.P(a,(d,f)=>{d=c.eb[d];"function"==typeof d&&(b=d(b,f)||b)});return b}};c.ha(D,"init",D.Fa);c.ha(D,"subscribe",D.subscribe);c.ha(D,"extend",D.extend);Object.setPrototypeOf(D,Function.prototype);
-c.V.fn=D;c.kc=a=>"function"==typeof a?.subscribe&&"function"==typeof a.D;(()=>{var a=[],b,d=0;c.o={zb:f=>{a.push(b);b=f},end:()=>b=a.pop(),Pb:f=>{if(b){if(!c.kc(f))throw Error("Only subscribable things can act as dependencies");b.Yb.call(b.Zb,f,f.Vb||(f.Vb=++d))}},M:(f,k,l)=>{try{return a.push(b),b=void 0,f.apply(k,l||[])}finally{b=a.pop()}},ra:()=>b?.u.ra(),Ia:()=>b?.Ia,u:()=>b?.u}})();const B=Symbol("_latestValue");c.ba=a=>{function b(){if(0<arguments.length)return b.Ha(b[B],arguments[0])&&(b.ob(),
-b[B]=arguments[0],b.Oa()),this;c.o.Pb(b);return b[B]}b[B]=a;Object.defineProperty(b,"length",{get:()=>null==b[B]?void 0:b[B].length});c.V.fn.Fa(b);Object.setPrototypeOf(b,F);return b};var F={toJSON:function(){let a=this[B];return a?.toJSON?.()||a},qa:P,R:function(){return this[B]},Oa:function(){this.D(this[B],"spectate");this.D(this[B])},ob:function(){this.D(this[B],"beforeChange")}};Object.setPrototypeOf(F,c.V.fn);var G=c.ba.qc="__ko_proto__";F[G]=c.ba;c.T=a=>{if((a="function"==typeof a&&a[G])&&
-a!==F[G]&&a!==c.u.fn[G])throw Error("Invalid object that looks like an observable; possibly from another Knockout instance");return!!a};c.lc=a=>"function"==typeof a&&(a[G]===F[G]||a[G]===c.u.fn[G]&&a.hc);c.v("observable",c.ba);c.v("isObservable",c.T);c.v("observable.fn",F);c.ha(F,"valueHasMutated",F.Oa);c.ja=a=>{a=a||[];if("object"!=typeof a||!("length"in a))throw Error("The argument passed when initializing an observable array must be an array, or null, or undefined.");a=c.ba(a);Object.setPrototypeOf(a,
-c.ja.fn);return a.extend({trackArrayChanges:!0})};c.ja.fn={remove:function(a){for(var b=this.R(),d=!1,f="function"!=typeof a||c.T(a)?e=>e===a:a,k=b.length;k--;){var l=b[k];if(f(l)){if(b[k]!==l)throw Error("Array modified during remove; cannot remove item");d||this.ob();d=!0;b.splice(k,1)}}d&&this.Oa()}};Object.setPrototypeOf(c.ja.fn,c.ba.fn);Object.getOwnPropertyNames(Array.prototype).forEach(a=>{"function"===typeof Array.prototype[a]&&"constructor"!=a&&("copyWithin fill pop push reverse shift sort splice unshift".split(" ").includes(a)?
-c.ja.fn[a]=function(...b){var d=this.R();this.ob();this.Bb(d,a,b);b=d[a](...b);this.Oa();return b===d?this:b}:c.ja.fn[a]=function(...b){return this()[a](...b)})});c.Jb=a=>c.T(a)&&"function"==typeof a.remove&&"function"==typeof a.push;c.v("observableArray",c.ja);c.v("isObservableArray",c.Jb);c.eb.trackArrayChanges=(a,b)=>{function d(){function m(){if(g){var r=[].concat(a.R()||[]);if(a.sa("arrayChange")){if(!k||1<g)k=c.g.Cb(h,r,a.Wa);var q=k}h=r;k=null;g=0;q?.length&&a.D(q,"arrayChange")}}f?m():(f=
-!0,e=a.subscribe(()=>++g,null,"spectate"),h=[].concat(a.R()||[]),k=null,l=a.subscribe(m))}a.Wa={};"object"==typeof b&&c.g.extend(a.Wa,b);a.Wa.sparse=!0;if(!a.Bb){var f=!1,k=null,l,e,g=0,h,n=a.Ua,p=a.Sa;a.Ua=m=>{n?.call(a,m);"arrayChange"===m&&d()};a.Sa=m=>{p?.call(a,m);"arrayChange"!==m||a.sa("arrayChange")||(l?.A(),e?.A(),e=l=null,f=!1,h=void 0)};a.Bb=(m,r,q)=>{function t(A,x,I){return u[u.length]={status:A,value:x,index:I}}if(f&&!g){var u=[],w=m.length,v=q.length,z=0;switch(r){case "push":z=w;case "unshift":for(m=
+!0)},l=(e,g)=>{for(var h=[],n,p=0;p<e.length;p++)if(!g||8===e[p].nodeType)if(k(h[h.length]=n=e[p]),e[p]!==n)for(;p--&&!h.includes(e[p]););};return{ma:(e,g)=>{if("function"!=typeof g)throw Error("Callback must be a function");f(e,1).add(g)},kb:(e,g)=>{var h=f(e);h&&(h.delete(g),h.size||c.g.j.set(e,a,null))},fa:e=>{c.o.M(()=>{b[e.nodeType]&&(k(e),d[e.nodeType]&&l(e.getElementsByTagName("*")))});return e},removeNode:e=>{c.fa(e);e.parentNode&&e.parentNode.removeChild(e)}}})();c.fa=c.g.K.fa;c.removeNode=
+c.g.K.removeNode;c.v("utils.domNodeDisposal",c.g.K);c.v("utils.domNodeDisposal.addDisposeCallback",c.g.K.ma);c.eb={debounce:(a,b)=>a.Ja(d=>fa(d,b)),rateLimit:(a,b)=>{if("number"==typeof b)var d=b;else{d=b.timeout;var f=b.method}var k="function"==typeof f?f:ea;a.Ja(l=>k(l,d,b))},notify:(a,b)=>{a.pa="always"==b?null:P}};var da={undefined:1,"boolean":1,number:1,string:1};c.v("extenders",c.eb);class ka{constructor(a,b,d){this.X=a;this.pb=b;this.Da=d;this.Ra=!1;this.L=this.ia=null;c.ha(this,"dispose",
+this.A)}A(){this.Ra||(this.L&&c.g.K.kb(this.ia,this.L),this.Ra=!0,this.Da(),this.X=this.pb=this.Da=this.ia=this.L=null)}s(a){this.ia=a;c.g.K.ma(a,this.L=this.A.bind(this))}}c.V=function(){Object.setPrototypeOf(this,D);D.Fa(this)};var D={Fa:a=>{a.W=new Map;a.W.set("change",new Set);a.ub=1},subscribe:function(a,b,d){var f=this;d=d||"change";var k=new ka(f,b?a.bind(b):a,()=>{f.W.get(d).delete(k);f.Sa?.(d)});f.Ua?.(d);f.W.has(d)||f.W.set(d,new Set);f.W.get(d).add(k);return k},D:function(a,b){b=b||"change";
+"change"===b&&this.Na();if(this.ra(b)){b="change"===b&&this.Ub||new Set(this.W.get(b));try{c.o.zb(),b.forEach(d=>{d.Ra||d.pb(a)})}finally{c.o.end()}}},Ca:function(){return this.ub},fc:function(a){return this.Ca()!==a},Na:function(){++this.ub},Ja:function(a){var b=this,d=c.T(b),f,k,l,e,g;b.wa||(b.wa=b.D,b.D=(n,p)=>{p&&"change"!==p?"beforeChange"===p?b.rb(n):b.wa(n,p):b.sb(n)});var h=a(()=>{b.ja=!1;d&&e===b&&(e=b.qb?b.qb():b());var n=k||g&&b.Ha(l,e);g=k=f=!1;n&&b.wa(l=e)});b.sb=(n,p)=>{p&&b.ja||(g=
+!p);b.Ub=new Set(b.W.get("change"));b.ja=f=!0;e=n;h()};b.rb=n=>{f||(l=n,b.wa(n,"beforeChange"))};b.tb=()=>{g=!0};b.Wb=()=>{b.Ha(l,b.R(!0))&&(k=!0)}},ra:function(a){return(this.W.get(a)||[]).size},Ha:function(a,b){return!this.pa||!this.pa(a,b)},toString:()=>"[object Object]",extend:function(a){var b=this;a&&c.g.P(a,(d,f)=>{d=c.eb[d];"function"==typeof d&&(b=d(b,f)||b)});return b}};c.ha(D,"init",D.Fa);c.ha(D,"subscribe",D.subscribe);c.ha(D,"extend",D.extend);c.V.fn=Object.setPrototypeOf(D,Function.prototype);
+c.kc=a=>"function"==typeof a?.subscribe&&"function"==typeof a.D;(()=>{var a=[],b,d=0;c.o={zb:f=>{a.push(b);b=f},end:()=>b=a.pop(),Pb:f=>{if(b){if(!c.kc(f))throw Error("Only subscribable things can act as dependencies");b.Yb.call(b.Zb,f,f.Vb||(f.Vb=++d))}},M:(f,k,l)=>{try{return a.push(b),b=void 0,f.apply(k,l||[])}finally{b=a.pop()}},qa:()=>b?.u.qa(),Ia:()=>b?.Ia,u:()=>b?.u}})();const B=Symbol("_latestValue");c.ba=a=>{function b(){if(0<arguments.length)return b.Ha(b[B],arguments[0])&&(b.ob(),b[B]=
+arguments[0],b.Oa()),this;c.o.Pb(b);return b[B]}b[B]=a;Object.defineProperty(b,"length",{get:()=>null==b[B]?void 0:b[B].length});c.V.fn.Fa(b);return Object.setPrototypeOf(b,F)};var F={toJSON:function(){let a=this[B];return a?.toJSON?.()||a},pa:P,R:function(){return this[B]},Oa:function(){this.D(this[B],"spectate");this.D(this[B])},ob:function(){this.D(this[B],"beforeChange")}};Object.setPrototypeOf(F,c.V.fn);var G=c.ba.qc="__ko_proto__";F[G]=c.ba;c.T=a=>{if((a="function"==typeof a&&a[G])&&a!==F[G]&&
+a!==c.u.fn[G])throw Error("Invalid object that looks like an observable; possibly from another Knockout instance");return!!a};c.lc=a=>"function"==typeof a&&(a[G]===F[G]||a[G]===c.u.fn[G]&&a.hc);c.v("observable",c.ba);c.v("isObservable",c.T);c.v("observable.fn",F);c.ha(F,"valueHasMutated",F.Oa);c.ta=a=>{a=a||[];if("object"!=typeof a||!("length"in a))throw Error("The argument passed when initializing an observable array must be an array, or null, or undefined.");return Object.setPrototypeOf(c.ba(a),
+c.ta.fn).extend({trackArrayChanges:!0})};c.ta.fn=Object.setPrototypeOf({remove:function(a){for(var b=this.R(),d=!1,f="function"!=typeof a||c.T(a)?e=>e===a:a,k=b.length;k--;){var l=b[k];if(f(l)){if(b[k]!==l)throw Error("Array modified during remove; cannot remove item");d||this.ob();d=!0;b.splice(k,1)}}d&&this.Oa()}},c.ba.fn);Object.getOwnPropertyNames(Array.prototype).forEach(a=>{"function"===typeof Array.prototype[a]&&"constructor"!=a&&("copyWithin fill pop push reverse shift sort splice unshift".split(" ").includes(a)?
+c.ta.fn[a]=function(...b){var d=this.R();this.ob();this.Bb(d,a,b);b=d[a](...b);this.Oa();return b===d?this:b}:c.ta.fn[a]=function(...b){return this()[a](...b)})});c.Jb=a=>c.T(a)&&"function"==typeof a.remove&&"function"==typeof a.push;c.v("observableArray",c.ta);c.v("isObservableArray",c.Jb);c.eb.trackArrayChanges=(a,b)=>{function d(){function m(){if(g){var r=[].concat(a.R()||[]);if(a.ra("arrayChange")){if(!k||1<g)k=c.g.Cb(h,r,a.Wa);var q=k}h=r;k=null;g=0;q?.length&&a.D(q,"arrayChange")}}f?m():(f=
+!0,e=a.subscribe(()=>++g,null,"spectate"),h=[].concat(a.R()||[]),k=null,l=a.subscribe(m))}a.Wa={};"object"==typeof b&&c.g.extend(a.Wa,b);a.Wa.sparse=!0;if(!a.Bb){var f=!1,k=null,l,e,g=0,h,n=a.Ua,p=a.Sa;a.Ua=m=>{n?.call(a,m);"arrayChange"===m&&d()};a.Sa=m=>{p?.call(a,m);"arrayChange"!==m||a.ra("arrayChange")||(l?.A(),e?.A(),e=l=null,f=!1,h=void 0)};a.Bb=(m,r,q)=>{function t(A,x,I){return u[u.length]={status:A,value:x,index:I}}if(f&&!g){var u=[],w=m.length,v=q.length,z=0;switch(r){case "push":z=w;case "unshift":for(m=
 0;m<v;m++)t("added",q[m],z+m);break;case "pop":z=w-1;case "shift":w&&t("deleted",m[z],z);break;case "splice":z=Math.min(Math.max(0,0>q[0]?w+q[0]:q[0]),w);w=1===v?w:Math.min(z+(q[1]||0),w);v=z+v-2;r=Math.max(w,v);for(var C=[],H=[],O=2;z<r;++z,++O)z<w&&H.push(t("deleted",m[z],z)),z<v&&C.push(t("added",q[O],z));c.g.Hb(H,C);break;default:return}k=u}}}};var y=Symbol("_state");c.u=(a,b)=>{function d(){if(0<arguments.length){if("function"!==typeof f)throw Error("Cannot write a value to a ko.computed unless you specify a 'write' option. If you wish to read the current value, don't pass any parameters.");
-f(...arguments);return this}k.$||c.o.Pb(d);(k.Y||k.C&&d.ta())&&d.U();return k.N}"object"===typeof a?b=a:(b=b||{},a&&(b.read=a));if("function"!=typeof b.read)throw Error("Pass a function that returns the value of the ko.computed");var f=b.write,k={N:void 0,aa:!0,Y:!0,Ga:!1,nb:!1,$:!1,jb:!1,C:!1,Ob:b.read,s:b.disposeWhenNodeIsRemoved||b.s||null,oa:b.disposeWhen||b.oa,ab:null,B:{},J:0,Gb:null};d[y]=k;d.hc="function"===typeof f;c.V.fn.Fa(d);Object.setPrototypeOf(d,J);b.pure&&(k.jb=!0,k.C=!0,c.g.extend(d,
-la));k.s&&(k.nb=!0,k.s.nodeType||(k.s=null));k.C||d.U();k.s&&d.isActive()&&c.g.K.na(k.s,k.ab=()=>{d.A()});return d};var J={qa:P,ra:function(){return this[y].J},dc:function(){var a=[];c.g.P(this[y].B,(b,d)=>a[d.la]=d.X);return a},gb:function(a){if(!this[y].J)return!1;var b=this.dc();return b.includes(a)||!!b.find(d=>d.gb&&d.gb(a))},vb:function(a,b,d){if(this[y].jb&&b===this)throw Error("A 'pure' computed must not be called recursively");this[y].B[a]=d;d.la=this[y].J++;d.ma=b.Ca()},ta:function(){var a,
-b=this[y].B;for(a in b)if(Object.prototype.hasOwnProperty.call(b,a)){var d=b[a];if(this.va&&d.X.ka||d.X.fc(d.ma))return!0}},vc:function(){this[y].Ga||this.va?.(!1)},isActive:function(){var a=this[y];return a.Y||0<a.J},wc:function(){this.ka?this[y].Y&&(this[y].aa=!0):this.Fb()},Sb:function(a){return a.subscribe(this.Fb,this)},Fb:function(){var a=this,b=a.throttleEvaluation;0<=b?(clearTimeout(this[y].Gb),this[y].Gb=setTimeout(()=>a.U(!0),b)):a.va?a.va(!0):a.U(!0)},U:function(a){var b=this[y],d=b.oa,
+f(...arguments);return this}k.$||c.o.Pb(d);(k.Y||k.C&&d.sa())&&d.U();return k.N}"object"===typeof a?b=a:(b=b||{},a&&(b.read=a));if("function"!=typeof b.read)throw Error("Pass a function that returns the value of the ko.computed");var f=b.write,k={N:void 0,aa:!0,Y:!0,Ga:!1,nb:!1,$:!1,jb:!1,C:!1,Ob:b.read,s:b.disposeWhenNodeIsRemoved||b.s||null,na:b.disposeWhen||b.na,ab:null,B:{},J:0,Gb:null};d[y]=k;d.hc="function"===typeof f;c.V.fn.Fa(d);Object.setPrototypeOf(d,J);b.pure&&(k.jb=!0,k.C=!0,c.g.extend(d,
+la));k.s&&(k.nb=!0,k.s.nodeType||(k.s=null));k.C||d.U();k.s&&d.isActive()&&c.g.K.ma(k.s,k.ab=()=>{d.A()});return d};var J={pa:P,qa:function(){return this[y].J},dc:function(){var a=[];c.g.P(this[y].B,(b,d)=>a[d.ka]=d.X);return a},gb:function(a){if(!this[y].J)return!1;var b=this.dc();return b.includes(a)||!!b.find(d=>d.gb&&d.gb(a))},vb:function(a,b,d){if(this[y].jb&&b===this)throw Error("A 'pure' computed must not be called recursively");this[y].B[a]=d;d.ka=this[y].J++;d.la=b.Ca()},sa:function(){var a,
+b=this[y].B;for(a in b)if(Object.prototype.hasOwnProperty.call(b,a)){var d=b[a];if(this.va&&d.X.ja||d.X.fc(d.la))return!0}},vc:function(){this[y].Ga||this.va?.(!1)},isActive:function(){var a=this[y];return a.Y||0<a.J},wc:function(){this.ja?this[y].Y&&(this[y].aa=!0):this.Fb()},Sb:function(a){return a.subscribe(this.Fb,this)},Fb:function(){var a=this,b=a.throttleEvaluation;0<=b?(clearTimeout(this[y].Gb),this[y].Gb=setTimeout(()=>a.U(!0),b)):a.va?a.va(!0):a.U(!0)},U:function(a){var b=this[y],d=b.na,
 f=!1;if(!b.Ga&&!b.$){if(b.s&&!c.g.bb(b.s)||d?.()){if(!b.nb){this.A();return}}else b.nb=!1;try{b.Ga=!0,f=this.bc(a)}finally{b.Ga=!1}return f}},bc:function(a){var b=this[y],d=b.jb?void 0:!b.J;var f={$b:this,za:b.B,Za:b.J};c.o.zb({Zb:f,Yb:ia,u:this,Ia:d});b.B={};b.J=0;a:{try{var k=b.Ob();break a}finally{c.o.end(),f.Za&&!b.C&&c.g.P(f.za,ha),b.aa=b.Y=!1}k=void 0}b.J?f=this.Ha(b.N,k):(this.A(),f=!0);f&&(b.C?this.Na():this.D(b.N,"beforeChange"),b.N=k,this.D(b.N,"spectate"),!b.C&&a&&this.D(b.N),this.tb&&
-this.tb());d&&this.D(b.N,"awake");return f},R:function(a){var b=this[y];(b.Y&&(a||!b.J)||b.C&&this.ta())&&this.U();return b.N},Ja:function(a){var b=this;c.V.fn.Ja.call(b,a);b.qb=()=>{b[y].C||(b[y].aa?b.U():b[y].Y=!1);return b[y].N};b.va=d=>{b.rb(b[y].N);b[y].Y=!0;d&&(b[y].aa=!0);b.sb(b,!d)}},A:function(){var a=this[y];!a.C&&a.B&&c.g.P(a.B,(b,d)=>d.A?.());a.s&&a.ab&&c.g.K.kb(a.s,a.ab);a.B=void 0;a.J=0;a.$=!0;a.aa=!1;a.Y=!1;a.C=!1;a.s=void 0;a.oa=void 0;a.Ob=void 0}},la={Ua:function(a){var b=this,d=
-b[y];if(!d.$&&d.C&&"change"==a){d.C=!1;if(d.aa||b.ta())d.B=null,d.J=0,b.U()&&b.Na();else{var f=[];c.g.P(d.B,(k,l)=>f[l.la]=k);f.forEach((k,l)=>{var e=d.B[k],g=b.Sb(e.X);g.la=l;g.ma=e.ma;d.B[k]=g});b.ta()&&b.U()&&b.Na()}d.$||b.D(d.N,"awake")}},Sa:function(a){var b=this[y];b.$||"change"!=a||this.sa("change")||(c.g.P(b.B,(d,f)=>{f.A&&(b.B[d]={X:f.X,la:f.la,ma:f.ma},f.A())}),b.C=!0,this.D(void 0,"asleep"))},Ca:function(){var a=this[y];a.C&&(a.aa||this.ta())&&this.U();return c.V.fn.Ca.call(this)}};Object.setPrototypeOf(J,
+this.tb());d&&this.D(b.N,"awake");return f},R:function(a){var b=this[y];(b.Y&&(a||!b.J)||b.C&&this.sa())&&this.U();return b.N},Ja:function(a){var b=this;c.V.fn.Ja.call(b,a);b.qb=()=>{b[y].C||(b[y].aa?b.U():b[y].Y=!1);return b[y].N};b.va=d=>{b.rb(b[y].N);b[y].Y=!0;d&&(b[y].aa=!0);b.sb(b,!d)}},A:function(){var a=this[y];!a.C&&a.B&&c.g.P(a.B,(b,d)=>d.A?.());a.s&&a.ab&&c.g.K.kb(a.s,a.ab);a.B=void 0;a.J=0;a.$=!0;a.aa=!1;a.Y=!1;a.C=!1;a.s=void 0;a.na=void 0;a.Ob=void 0}},la={Ua:function(a){var b=this,d=
+b[y];if(!d.$&&d.C&&"change"==a){d.C=!1;if(d.aa||b.sa())d.B=null,d.J=0,b.U()&&b.Na();else{var f=[];c.g.P(d.B,(k,l)=>f[l.ka]=k);f.forEach((k,l)=>{var e=d.B[k],g=b.Sb(e.X);g.ka=l;g.la=e.la;d.B[k]=g});b.sa()&&b.U()&&b.Na()}d.$||b.D(d.N,"awake")}},Sa:function(a){var b=this[y];b.$||"change"!=a||this.ra("change")||(c.g.P(b.B,(d,f)=>{f.A&&(b.B[d]={X:f.X,ka:f.ka,la:f.la},f.A())}),b.C=!0,this.D(void 0,"asleep"))},Ca:function(){var a=this[y];a.C&&(a.aa||this.sa())&&this.U();return c.V.fn.Ca.call(this)}};Object.setPrototypeOf(J,
 c.V.fn);var S=c.ba.qc;J[S]=c.u;c.v("computed",c.u);c.v("isComputed",a=>"function"==typeof a&&a[S]===J[S]);c.v("computed.fn",J);c.ha(J,"dispose",J.A);c.Nb=a=>{if("function"===typeof a)return c.u(a,{pure:!0});a={...a,pure:!0};return c.u(a)};c.F={S:a=>{switch(a.nodeName){case "OPTION":return!0===a.__ko__hasDomDataOptionValue__?c.g.j.get(a,c.h.options.ib):a.value;case "SELECT":return 0<=a.selectedIndex?c.F.S(a.options[a.selectedIndex]):void 0;default:return a.value}},Pa:(a,b,d)=>{switch(a.nodeName){case "OPTION":"string"===
 typeof b?(c.g.j.set(a,c.h.options.ib,void 0),delete a.__ko__hasDomDataOptionValue__,a.value=b):(c.g.j.set(a,c.h.options.ib,b),a.__ko__hasDomDataOptionValue__=!0,a.value="number"===typeof b?b:"");break;case "SELECT":for(var f=-1,k=""===b||null==b,l=a.options.length,e;l--;)if(e=c.F.S(a.options[l]),e==b||""===e&&k){f=l;break}if(d||0<=f||k&&1<a.size)a.selectedIndex=f;break;default:a.value=null==b?"":b}}};c.G=(()=>{var a=["true","false","null","undefined"],b=/^(?:[$_a-z][$\w]*|(.+)(\.\s*[$_a-z][$\w]*|\[.+\]))$/i,
 d=RegExp("\"(?:\\\\.|[^\"])*\"|'(?:\\\\.|[^'])*'|`(?:\\\\.|[^`])*`|/\\*(?:[^*]|\\*+[^*/])*\\*+/|//.*\n|/(?:\\\\.|[^/])+/w*|[^\\s:,/][^,\"'`{}()/:[\\]]*[^\\s,\"'`{}()/:[\\]]|[^\\s]","g"),f=/[\])"'A-Za-z0-9_$]+$/,k={"in":1,"return":1,"typeof":1},l=g=>{g=c.g.Rb(g);123===g.charCodeAt(0)&&(g=g.slice(1,-1));g+="\n,";var h=[],n=g.match(d),p=[],m=0;if(1<n.length){for(var r=0,q;q=n[r++];){var t=q.charCodeAt(0);if(44===t){if(0>=m){h.push(u&&p.length?{key:u,value:p.join("")}:{unknown:u||p.join("")});var u=m=
 0;p=[];continue}}else if(58===t){if(!m&&!u&&1===p.length){u=p.pop();continue}}else if(47===t&&1<q.length&&(47===q.charCodeAt(1)||42===q.charCodeAt(1)))continue;else 47===t&&r&&1<q.length?(t=n[r-1].match(f))&&!k[t[0]]&&(g=g.slice(g.indexOf(q)+1),n=g.match(d),r=-1,q="/"):40===t||123===t||91===t?++m:41===t||125===t||93===t?--m:u||p.length||34!==t&&39!==t||(q=q.slice(1,-1));p.push(q)}if(0<m)throw Error("Unbalanced parentheses, braces, or brackets");}return h},e=new Set;return{Va:[],Ma:e,oc:l,pc:(g,h)=>
 {var n=[],p=[],m=h?.valueAccessors,r=h?.bindingParams,q=(t,u)=>{if(!r){var w=c.h[t];if(w?.preprocess&&!(u=w.preprocess(u,t,q)))return;if(w=e.has(t)){var v=u;a.includes(v)?v=!1:(w=v.match(b),v=null===w?!1:w[1]?"Object("+w[1]+")"+w[2]:v);w=v}w&&p.push("'"+t+"':function(_z){"+v+"=_z}")}m&&(u="function(){return "+u+" }");n.push("'"+t+"':"+u)};("string"===typeof g?l(g):g).forEach(t=>q(t.key||t.unknown,t.value));p.length&&q("_ko_property_writers","{"+p.join(",")+" }");return n.join(",")},mc:(g,h)=>-1<g.findIndex(n=>
 n.key==h),Qa:(g,h,n,p,m)=>{if(g&&c.T(g))!c.lc(g)||m&&g.R()===p||g(p);else h.get("_ko_property_writers")?.[n]?.(p)}}})();(()=>{function a(e){return 8==e.nodeType&&f.test(e.nodeValue)}function b(e){return 8==e.nodeType&&k.test(e.nodeValue)}function d(e,g){for(var h=e,n=1,p=[];h=h.nextSibling;){if(b(h)&&(c.g.j.set(h,l,!0),!--n))return p;p.push(h);a(h)&&++n}if(!g)throw Error("Cannot find closing comment tag to match: "+e.nodeValue);return null}var f=/^\s*ko(?:\s+([\s\S]+))?\s*$/,k=/^\s*\/ko\s*$/,l="__ko_matchedEndComment__";
-c.m={ca:{},childNodes:e=>a(e)?d(e):e.childNodes,pa:e=>{a(e)?(e=d(e))&&[...e].forEach(g=>c.removeNode(g)):c.g.cb(e)},ua:(e,g)=>{a(e)?(c.m.pa(e),e.after(...g)):c.g.ua(e,g)},prepend:(e,g)=>{a(e)?e.nextSibling.before(g):e.prepend(g)},jc:(e,g,h)=>{h?h.after(g):c.m.prepend(e,g)},firstChild:e=>{if(a(e))return e=e.nextSibling,!e||b(e)?null:e;let g=e.firstChild;if(g&&b(g))throw Error("Found invalid end comment, as the first child of "+e);return g},nextSibling:e=>{if(a(e)){var g=d(e,void 0);e=g?(g.length?g[g.length-
+c.m={ca:{},childNodes:e=>a(e)?d(e):e.childNodes,oa:e=>{a(e)?(e=d(e))&&[...e].forEach(g=>c.removeNode(g)):c.g.cb(e)},ua:(e,g)=>{a(e)?(c.m.oa(e),e.after(...g)):c.g.ua(e,g)},prepend:(e,g)=>{a(e)?e.nextSibling.before(g):e.prepend(g)},jc:(e,g,h)=>{h?h.after(g):c.m.prepend(e,g)},firstChild:e=>{if(a(e))return e=e.nextSibling,!e||b(e)?null:e;let g=e.firstChild;if(g&&b(g))throw Error("Found invalid end comment, as the first child of "+e);return g},nextSibling:e=>{if(a(e)){var g=d(e,void 0);e=g?(g.length?g[g.length-
 1]:e).nextSibling:null}if((g=e.nextSibling)&&b(g)){if(b(g)&&!c.g.j.get(g,l))throw Error("Found end comment without a matching opening comment, as child of "+e);return null}return g},ec:a,uc:e=>(e=e.nodeValue.match(f))?e[1]:null}})();const ba=new Map;c.Ab=new class{nc(a){switch(a.nodeType){case 1:return null!=a.getAttribute("data-bind");case 8:return c.m.ec(a)}return!1}cc(a,b){a:{switch(a.nodeType){case 1:var d=a.getAttribute("data-bind");break a;case 8:d=c.m.uc(a);break a}d=null}if(d)try{let k={valueAccessors:!0},
 l=ba.get(d);if(!l){var f="with($context){with($data||{}){return{"+c.G.pc(d,k)+"}}}";l=new Function("$context","$element",f);ba.set(d,l)}return l(b,a)}catch(k){throw k.message="Unable to parse bindings.\nBindings value: "+d+"\nMessage: "+k.message,k;}return null}};const L=Symbol("_subscribable"),N=Symbol("_ancestorBindingInfo"),aa=Symbol("_dataDependency"),ca={},K=c.g.j.Z();c.h={};c.ea=class{constructor(a,b,d,f,k){var l=this,e=a===ca,g=e?void 0:a,h="function"==typeof g&&!c.T(g),n=k?.dataDependency;
-a=()=>{var m=h?g():g,r=c.g.i(m);b?(c.g.extend(l,b),N in b&&(l[N]=b[N])):(l.$parents=[],l.$root=r,l.ko=c);l[L]=p;e?r=l.$data:(l.$rawData=m,l.$data=r);d&&(l[d]=r);f?.(l,b,r);if(b?.[L]&&!c.o.u().gb(b[L]))b[L]();n&&(l[aa]=n);return l.$data};if(k?.exportDependencies)a();else{var p=c.Nb(a);p.R();p.isActive()?p.qa=null:l[L]=void 0}}createChildContext(a,b,d,f){!f&&b&&"object"==typeof b&&(f=b,b=f.as,d=f.extend);return new c.ea(a,this,b,(k,l)=>{k.$parentContext=l;k.$parent=l.$data;k.$parents=(l.$parents||[]).slice(0);
-k.$parents.unshift(k.$parent);d&&d(k)},f)}extend(a,b){return new c.ea(ca,this,null,d=>c.g.extend(d,"function"==typeof a?a(d):a),b)}};class ma{constructor(a,b,d){this.L=a;this.ia=b;this.xa=new Set;this.H=!1;b.I||c.g.K.na(a,W);d?.I&&(d.I.xa.add(a),this.Da=d)}Mb(){this.Da?.I?.ac(this.L)}ac(a){this.xa.delete(a);this.xa.size||this.Db?.()}Db(){this.H=!0;this.ia.I&&!this.xa.size&&(this.ia.I=null,c.g.K.kb(this.L,W),c.l.notify(this.L,c.l.ga),this.Mb())}}c.l={H:"childrenComplete",ga:"descendantsComplete",subscribe:(a,
-b,d,f,k)=>{var l=c.g.j.fb(a,K,{});l.Aa||(l.Aa=new c.V);k?.notifyImmediately&&l.hb[b]&&c.o.M(d,f,[a]);return l.Aa.subscribe(d,f,b)},notify:(a,b)=>{var d=c.g.j.get(a,K);if(d&&(d.hb[b]=!0,d.Aa?.D(a,b),b==c.l.H))if(d.I)d.I.Db();else if(void 0===d.I&&d.Aa?.sa(c.l.ga))throw Error("descendantsComplete event not supported for bindings on this node");},mb:(a,b)=>{var d=c.g.j.fb(a,K,{});d.I||(d.I=new ma(a,d,b[N]));return b[N]==d?b:b.extend(f=>{f[N]=d})}};c.tc=a=>(a=c.g.j.get(a,K))&&a.context;c.wb=(a,b,d)=>
+a=()=>{var m=h?g():g,r=c.g.i(m);b?(c.g.extend(l,b),N in b&&(l[N]=b[N])):(l.$parents=[],l.$root=r,l.ko=c);l[L]=p;e?r=l.$data:(l.$rawData=m,l.$data=r);d&&(l[d]=r);f?.(l,b,r);if(b?.[L]&&!c.o.u().gb(b[L]))b[L]();n&&(l[aa]=n);return l.$data};if(k?.exportDependencies)a();else{var p=c.Nb(a);p.R();p.isActive()?p.pa=null:l[L]=void 0}}createChildContext(a,b,d,f){!f&&b&&"object"==typeof b&&(f=b,b=f.as,d=f.extend);return new c.ea(a,this,b,(k,l)=>{k.$parentContext=l;k.$parent=l.$data;k.$parents=(l.$parents||[]).slice(0);
+k.$parents.unshift(k.$parent);d&&d(k)},f)}extend(a,b){return new c.ea(ca,this,null,d=>c.g.extend(d,"function"==typeof a?a(d):a),b)}};class ma{constructor(a,b,d){this.L=a;this.ia=b;this.xa=new Set;this.H=!1;b.I||c.g.K.ma(a,W);d?.I&&(d.I.xa.add(a),this.Da=d)}Mb(){this.Da?.I?.ac(this.L)}ac(a){this.xa.delete(a);this.xa.size||this.Db?.()}Db(){this.H=!0;this.ia.I&&!this.xa.size&&(this.ia.I=null,c.g.K.kb(this.L,W),c.l.notify(this.L,c.l.ga),this.Mb())}}c.l={H:"childrenComplete",ga:"descendantsComplete",subscribe:(a,
+b,d,f,k)=>{var l=c.g.j.fb(a,K,{});l.Aa||(l.Aa=new c.V);k?.notifyImmediately&&l.hb[b]&&c.o.M(d,f,[a]);return l.Aa.subscribe(d,f,b)},notify:(a,b)=>{var d=c.g.j.get(a,K);if(d&&(d.hb[b]=!0,d.Aa?.D(a,b),b==c.l.H))if(d.I)d.I.Db();else if(void 0===d.I&&d.Aa?.ra(c.l.ga))throw Error("descendantsComplete event not supported for bindings on this node");},mb:(a,b)=>{var d=c.g.j.fb(a,K,{});d.I||(d.I=new ma(a,d,b[N]));return b[N]==d?b:b.extend(f=>{f[N]=d})}};c.tc=a=>(a=c.g.j.get(a,K))&&a.context;c.wb=(a,b,d)=>
 Z(a,b,Q(d));c.yb=(a,b)=>{1!==b.nodeType&&8!==b.nodeType||X(Q(a),b)};c.xb=function(a,b,d){if(2>arguments.length){if(b=M.body,!b)throw Error("ko.applyBindings: could not find document.body; has the document been loaded?");}else if(!b||1!==b.nodeType&&8!==b.nodeType)throw Error("ko.applyBindings: first parameter should be your view model; second parameter should be a DOM node");Y(Q(a,d),b)};c.Eb=a=>(a=a&&[1,8].includes(a.nodeType)&&c.tc(a))?a.$data:void 0;c.v("bindingHandlers",c.h);c.v("applyBindings",
 c.xb);c.v("applyBindingAccessorsToNode",c.wb);c.v("dataFor",c.Eb);(()=>{var a=Object.create(null),b=new Map;c.Xa={get:(l,e)=>{if(b.has(l))e(b.get(l));else{var g=a[l];g?g.subscribe(e):(g=a[l]=new c.V,g.subscribe(e),k(l,h=>{b.set(l,h);delete a[l];g.D(h)}))}},register:(l,e)=>{if(!e)throw Error("Invalid configuration for "+l);if(d[l])throw Error("Component "+l+" is already registered");d[l]=e}};var d=Object.create(null),f=(l,e)=>{throw Error(`Component '${l}': ${e}`);},k=(l,e)=>{var g={},h=d[l]||{},n=
 h.template;h=h.viewModel;if(n){n.element||f(l,"Unknown template value: "+n);n=n.element;var p=M.getElementById(n);p||f(l,"Cannot find element with ID "+n);p.matches("TEMPLATE")||f(l,"Template Source Element not a <template>");g.template=c.g.ya(p.content.childNodes)}h&&("function"!==typeof h.createViewModel&&f(l,"Unknown viewModel value: "+h),g.createViewModel=h.createViewModel);e(g.template&&g.createViewModel?g:null)};c.v("components",c.Xa);c.v("components.register",c.Xa.register)})();(()=>{var a=
-0;c.h.component={init:(b,d,f,k,l)=>{var e,g,h,n=()=>{var m=e&&e.dispose;"function"===typeof m&&m.call(e);h&&h.A();g=e=h=null},p=[...c.m.childNodes(b)];c.m.pa(b);c.g.K.na(b,n);c.u(()=>{var m=c.g.i(d());if("string"!==typeof m){var r=c.g.i(m.params);m=c.g.i(m.name)}if(!m)throw Error("No component name specified");var q=c.l.mb(b,l),t=g=++a;c.Xa.get(m,u=>{if(g===t){n();if(!u)throw Error("Unknown component '"+m+"'");var w=u.template;if(!w)throw Error("Component '"+m+"' has no template");c.m.ua(b,c.g.ya(w));
+0;c.h.component={init:(b,d,f,k,l)=>{var e,g,h,n=()=>{var m=e&&e.dispose;"function"===typeof m&&m.call(e);h&&h.A();g=e=h=null},p=[...c.m.childNodes(b)];c.m.oa(b);c.g.K.ma(b,n);c.u(()=>{var m=c.g.i(d());if("string"!==typeof m){var r=c.g.i(m.params);m=c.g.i(m.name)}if(!m)throw Error("No component name specified");var q=c.l.mb(b,l),t=g=++a;c.Xa.get(m,u=>{if(g===t){n();if(!u)throw Error("Unknown component '"+m+"'");var w=u.template;if(!w)throw Error("Component '"+m+"' has no template");c.m.ua(b,c.g.ya(w));
 e=u.createViewModel(r,{element:b,templateNodes:p});c.yb(q.createChildContext(e,{extend:v=>{v.$component=e;v.$componentTemplateNodes=p}}),b)}})},{s:b});return{controlsDescendantBindings:!0}}};c.m.ca.component=!0})();c.h.attr={update:(a,b)=>{b=c.g.i(b())||{};c.g.P(b,function(d,f){f=c.g.i(f);var k=d.indexOf(":");k="lookupNamespaceURI"in a&&0<k&&a.lookupNamespaceURI(d.slice(0,k));var l=!1===f||null==f;l?k?a.removeAttributeNS(k,d):a.removeAttribute(d):(f=f.toString(),k?a.setAttributeNS(k,d,f):a.setAttribute(d,
-f));"name"===d&&(a.name=l?"":f)})}};(()=>{c.h.checked={after:["value","attr"],init:function(a,b,d){var f="checkbox"==a.type,k="radio"==a.type;if(f||k){const l=c.Nb(()=>{if(k)return d.has("value")?c.g.i(d.get("value")):a.value});a.addEventListener("click",()=>{if(!c.o.Ia()){var e=a.checked;if(e||!k&&!c.o.ra()){e=f?e:l();var g=c.o.M(b);c.G.Qa(g,d,"checked",e,!0)}}});c.u(()=>{var e=c.g.i(b());a.checked=f?!!e:l()===e},null,{s:a})}}};c.G.Ma.checked=!0})();var T=(a,b,d)=>b&&b.split(/\s+/).forEach(f=>a.classList.toggle(f,
+f));"name"===d&&(a.name=l?"":f)})}};(()=>{c.h.checked={after:["value","attr"],init:function(a,b,d){var f="checkbox"==a.type,k="radio"==a.type;if(f||k){const l=c.Nb(()=>{if(k)return d.has("value")?c.g.i(d.get("value")):a.value});a.addEventListener("click",()=>{if(!c.o.Ia()){var e=a.checked;if(e||!k&&!c.o.qa()){e=f?e:l();var g=c.o.M(b);c.G.Qa(g,d,"checked",e,!0)}}});c.u(()=>{var e=c.g.i(b());a.checked=f?!!e:l()===e},null,{s:a})}}};c.G.Ma.checked=!0})();var T=(a,b,d)=>b&&b.split(/\s+/).forEach(f=>a.classList.toggle(f,
 d));c.h.css={update:(a,b)=>{b=c.g.i(b());"object"==typeof b?c.g.P(b,(d,f)=>{f=c.g.i(f);T(a,d,!!f)}):(b=c.g.Rb(b),T(a,a.__ko__cssValue,!1),a.__ko__cssValue=b,T(a,b,!0))}};c.h.enable={update:(a,b)=>{(b=c.g.i(b()))&&a.disabled?a.removeAttribute("disabled"):b||a.disabled||(a.disabled=!0)}};c.h.disable={update:(a,b)=>c.h.enable.update(a,()=>!c.g.i(b()))};c.h.event={init:(a,b,d,f,k)=>{c.g.P(b()||{},l=>{"string"==typeof l&&a.addEventListener(l,(...e)=>{var g=b()[l];if(g)try{f=k.$data;var h=g.apply(f,[f,
 ...e])}finally{!0!==h&&e[0].preventDefault()}})})}};c.h.foreach={Kb:a=>()=>{var b=a(),d=c.T(b)?b.R():b;if(!d||"number"==typeof d.length)return{foreach:b};c.g.i(b);return{foreach:d.data,as:d.as,beforeRemove:d.beforeRemove}},init:(a,b)=>c.h.template.init(a,c.h.foreach.Kb(b)),update:(a,b,d,f,k)=>c.h.template.update(a,c.h.foreach.Kb(b),d,f,k)};c.G.Va.foreach=!1;c.m.ca.foreach=!0;c.h.hasfocus={init:(a,b,d)=>{var f=l=>{a.__ko_hasfocusUpdating=!0;l=a.ownerDocument.activeElement===a;c.G.Qa(b(),d,"hasfocus",
 l,!0);a.__ko_hasfocusLastValue=l;a.__ko_hasfocusUpdating=!1},k=f.bind(null,!0);f=f.bind(null,!1);a.addEventListener("focus",k);a.addEventListener("focusin",k);a.addEventListener("blur",f);a.addEventListener("focusout",f);a.__ko_hasfocusLastValue=!1},update:(a,b)=>{b=!!c.g.i(b());a.__ko_hasfocusUpdating||a.__ko_hasfocusLastValue===b||(b?a.focus():a.blur())}};c.G.Ma.add("hasfocus");c.h.html={init:()=>({controlsDescendantBindings:!0}),update:(a,b)=>{c.g.cb(a);b=c.g.i(b());if(null!=b){const d=M.createElement("template");
-d.innerHTML="string"!=typeof b?b.toString():b;a.appendChild(d.content)}}};(()=>{function a(b,d,f){c.h[b]={init:(k,l,e,g,h)=>{var n,p={};d&&(p={as:e.get("as"),exportDependencies:!0});var m=e.has(c.l.ga);c.u(()=>{var r=c.g.i(l()),q=!f!==!r,t=!n;m&&(h=c.l.mb(k,h));if(q){p.dataDependency=c.o.u();var u=d?h.createChildContext("function"==typeof r?r:l,p):c.o.ra()?h.extend(null,p):h}t&&c.o.ra()&&(n=c.g.ya(c.m.childNodes(k),!0));q?(t||c.m.ua(k,c.g.ya(n)),c.yb(u,k)):(c.m.pa(k),c.l.notify(k,c.l.H))},{s:k});
+d.innerHTML="string"!=typeof b?b.toString():b;a.appendChild(d.content)}}};(()=>{function a(b,d,f){c.h[b]={init:(k,l,e,g,h)=>{var n,p={};d&&(p={as:e.get("as"),exportDependencies:!0});var m=e.has(c.l.ga);c.u(()=>{var r=c.g.i(l()),q=!f!==!r,t=!n;m&&(h=c.l.mb(k,h));if(q){p.dataDependency=c.o.u();var u=d?h.createChildContext("function"==typeof r?r:l,p):c.o.qa()?h.extend(null,p):h}t&&c.o.qa()&&(n=c.g.ya(c.m.childNodes(k),!0));q?(t||c.m.ua(k,c.g.ya(n)),c.yb(u,k)):(c.m.oa(k),c.l.notify(k,c.l.H))},{s:k});
 return{controlsDescendantBindings:!0}}};c.G.Va[b]=!1;c.m.ca[b]=!0}a("if");a("ifnot",!1,!0);a("with",!0)})();var U={};c.h.options={init:a=>{if(!a.matches("SELECT"))throw Error("options binding applies only to SELECT elements");let b=a.length;for(;b--;)a.remove(b);return{controlsDescendantBindings:!0}},update:(a,b,d)=>{var f=a.multiple,k=0!=a.length&&f?a.scrollTop:null,l=c.g.i(b()),e=d.get("valueAllowUnset")&&d.has("value"),g={},h=[];b=()=>Array.from(a.options).filter(q=>q.selected);var n=(q,t,u)=>
 {var w=typeof t;return"function"==w?t(q):"string"==w?q[t]:u},p=(q,t)=>{r&&e?c.l.notify(a,c.l.H):h.length&&(q=h.includes(c.F.S(t[0])),t[0].selected=q,r&&!q&&c.o.M(c.g.Tb,null,[a,"change"]))};e||(f?h=b().map(c.F.S):0<=a.selectedIndex&&h.push(c.F.S(a.options[a.selectedIndex])));if(l){"undefined"==typeof l.length&&(l=[l]);var m=l.filter(q=>q||null==q);d.has("optionsCaption")&&(l=c.g.i(d.get("optionsCaption")),null!=l&&m.unshift(U))}var r=!1;g.beforeRemove=q=>a.removeChild(q);l=p;d.has("optionsAfterRender")&&
 "function"==typeof d.get("optionsAfterRender")&&(l=(q,t)=>{p(q,t);c.o.M(d.get("optionsAfterRender"),null,[t[0],q!==U?q:void 0])});c.g.Qb(a,m,(q,t,u)=>{u.length&&(h=!e&&u[0].selected?[c.F.S(u[0])]:[],r=!0);t=a.ownerDocument.createElement("option");q===U?(c.g.lb(t,d.get("optionsCaption")),c.F.Pa(t,void 0)):(u=n(q,d.get("optionsValue"),q),c.F.Pa(t,c.g.i(u)),q=n(q,d.get("optionsText"),u),c.g.lb(t,q));return[t]},g,l);e||(m=h.length,(f?m&&b().length<m:m&&0<=a.selectedIndex?c.F.S(a.options[a.selectedIndex])!==
@@ -62,13 +62,13 @@ l.forEach(m=>{var r=h;(m||"").startsWith("after")&&(r=()=>{g=c.F.S(a);setTimeout
 {s:a}))},null,{notifyImmediately:!0})}else a.addEventListener("change",h),c.u(n,{s:a})}else c.wb(a,{checkedValue:b})},update:()=>{}};c.G.Ma.add("value");c.h.visible={update:(a,b)=>{b=c.g.i(b());var d="none"!=a.style.display;b&&!d?a.style.display="":d&&!b&&(a.style.display="none")}};c.h.hidden={update:(a,b)=>a.hidden=!!c.g.i(b())};(function(a){c.h[a]={init:function(b,d,f,k,l){return c.h.event.init.call(this,b,()=>({[a]:d()}),f,k,l)}}})("click");(()=>{let a=c.g.j.Z();class b{constructor(f){this.$a=
 f}Ka(...f){let k=this.$a;if(!f.length)return c.g.j.get(k,a)||(11===this.L?k.content:1===this.L?k:void 0);c.g.j.set(k,a,f[0])}}class d extends b{constructor(f){super(f);f&&(this.L=f.matches("TEMPLATE")&&f.content?f.content.nodeType:1)}}c.La={$a:d,Ta:b}})();(()=>{var a=(e,g,h)=>{var n;for(g=c.m.nextSibling(g);e&&(n=e)!==g;)e=c.m.nextSibling(n),h(n,e)},b=(e,g)=>{if(e.length){var h=e[0],n=h.parentNode;a(h,e[e.length-1],p=>{1!==p.nodeType&&8!==p.nodeType||c.xb(g,p)});c.g.Ba(e,n)}},d=(e,g,h,n)=>{var p=
 (e&&(e.nodeType?e:0<e.length?e[0]:null)||h||{}).ownerDocument;if("string"==typeof h){p=p||M;p=p.getElementById(h);if(!p)throw Error("Cannot find template with ID "+h);h=new c.La.$a(p)}else if([1,8].includes(h.nodeType))h=new c.La.Ta(h);else throw Error("Unknown template type: "+h);h=(h=h.Ka?h.Ka():null)?[...h.cloneNode(!0).childNodes]:null;if("number"!=typeof h.length||0<h.length&&"number"!=typeof h[0].nodeType)throw Error("Template engine must return an array of DOM nodes");p=!1;switch(g){case "replaceChildren":c.m.ua(e,
-h);p=!0;break;case "ignoreTargetNode":break;default:throw Error("Unknown renderMode: "+g);}p&&(b(h,n),"replaceChildren"==g&&c.l.notify(e,c.l.H));return h},f=(e,g,h)=>c.T(e)?e():"function"===typeof e?e(g,h):e;c.rc=function(e,g,h,n){h=h||{};var p=p||"replaceChildren";if(n){var m=n.nodeType?n:0<n.length?n[0]:null;return c.u(()=>{var r=g instanceof c.ea?g:new c.ea(g,null,null,null,{exportDependencies:!0}),q=f(e,r.$data,r);d(n,p,q,r,h)},{oa:()=>!m||!c.g.bb(m),s:m})}console.log("no targetNodeOrNodeArray")};
+h);p=!0;break;case "ignoreTargetNode":break;default:throw Error("Unknown renderMode: "+g);}p&&(b(h,n),"replaceChildren"==g&&c.l.notify(e,c.l.H));return h},f=(e,g,h)=>c.T(e)?e():"function"===typeof e?e(g,h):e;c.rc=function(e,g,h,n){h=h||{};var p=p||"replaceChildren";if(n){var m=n.nodeType?n:0<n.length?n[0]:null;return c.u(()=>{var r=g instanceof c.ea?g:new c.ea(g,null,null,null,{exportDependencies:!0}),q=f(e,r.$data,r);d(n,p,q,r,h)},{na:()=>!m||!c.g.bb(m),s:m})}console.log("no targetNodeOrNodeArray")};
 c.sc=(e,g,h,n,p)=>{function m(v,z){c.o.M(c.g.Qb,null,[n,v,t,h,u,z]);c.l.notify(n,c.l.H)}var r,q=h.as,t=(v,z)=>{r=p.createChildContext(v,{as:q,extend:C=>{C.$index=z;q&&(C[q+"Index"]=z)}});v=f(e,v,r);return d(n,"ignoreTargetNode",v,r,h)},u=(v,z)=>{b(z,r);r=null};if(!h.beforeRemove&&c.Jb(g)){m(g.R());var w=g.subscribe(v=>{m(g(),v)},null,"arrayChange");w.s(n);return w}return c.u(()=>{var v=c.g.i(g)||[];"undefined"==typeof v.length&&(v=[v]);m(v)},{s:n})};var k=c.g.j.Z(),l=c.g.j.Z();c.h.template={init:(e,
-g)=>{g=c.g.i(g());if("string"==typeof g||"name"in g)c.m.pa(e);else if("nodes"in g){g=g.nodes||[];if(c.T(g))throw Error('The "nodes" option must be a plain, non-observable array.');let h=g[0]?.parentNode;h&&c.g.j.get(h,l)||(h=c.g.Lb(g),c.g.j.set(h,l,!0));(new c.La.Ta(e)).Ka(h)}else if(g=c.m.childNodes(e),g.length)g=c.g.Lb(g),(new c.La.Ta(e)).Ka(g);else throw Error("Anonymous template defined, but no template content was provided");return{controlsDescendantBindings:!0}},update:(e,g,h,n,p)=>{var m=g();
-g=c.g.i(m);h=!0;n=null;"string"==typeof g?g={}:(m="name"in g?g.name:e,"if"in g&&(h=c.g.i(g["if"])),h&&"ifnot"in g&&(h=!c.g.i(g.ifnot)),h&&!m&&(h=!1));"foreach"in g?n=c.sc(m,h&&g.foreach||[],g,e,p):h?(h=p,"data"in g&&(h=p.createChildContext(g.data,{as:g.as,exportDependencies:!0})),n=c.rc(m,h,g,e)):c.m.pa(e);p=n;c.g.j.get(e,k)?.A?.();c.g.j.set(e,k,!p||p.isActive&&!p.isActive()?void 0:p)}};c.G.Va.template=e=>{e=c.G.oc(e);return 1==e.length&&e[0].unknown||c.G.mc(e,"name")?null:"This template engine does not support anonymous templates nested within its templates"};
+g)=>{g=c.g.i(g());if("string"==typeof g||"name"in g)c.m.oa(e);else if("nodes"in g){g=g.nodes||[];if(c.T(g))throw Error('The "nodes" option must be a plain, non-observable array.');let h=g[0]?.parentNode;h&&c.g.j.get(h,l)||(h=c.g.Lb(g),c.g.j.set(h,l,!0));(new c.La.Ta(e)).Ka(h)}else if(g=c.m.childNodes(e),g.length)g=c.g.Lb(g),(new c.La.Ta(e)).Ka(g);else throw Error("Anonymous template defined, but no template content was provided");return{controlsDescendantBindings:!0}},update:(e,g,h,n,p)=>{var m=g();
+g=c.g.i(m);h=!0;n=null;"string"==typeof g?g={}:(m="name"in g?g.name:e,"if"in g&&(h=c.g.i(g["if"])),h&&"ifnot"in g&&(h=!c.g.i(g.ifnot)),h&&!m&&(h=!1));"foreach"in g?n=c.sc(m,h&&g.foreach||[],g,e,p):h?(h=p,"data"in g&&(h=p.createChildContext(g.data,{as:g.as,exportDependencies:!0})),n=c.rc(m,h,g,e)):c.m.oa(e);p=n;c.g.j.get(e,k)?.A?.();c.g.j.set(e,k,!p||p.isActive&&!p.isActive()?void 0:p)}};c.G.Va.template=e=>{e=c.G.oc(e);return 1==e.length&&e[0].unknown||c.G.mc(e,"name")?null:"This template engine does not support anonymous templates nested within its templates"};
 c.m.ca.template=!0})();c.g.Hb=(a,b,d)=>{var f=0,k,l=b.length;l&&a.every(e=>{k=b.findIndex(g=>e.value===g.value);0<=k&&(e.moved=b[k].index,b[k].moved=e.index,b.splice(k,1),f=k=0,--l);f+=l;return l&&(!d||f<d)})};c.g.Cb=(()=>{var a=(b,d,f,k,l)=>{for(var e=Math.min,g=Math.max,h=[],n=-1,p=b.length,m,r=d.length,q=r-p||1,t=p+r+1,u,w,v;++n<=p;)for(w=u,h.push(u=[]),v=e(r,n+q),m=g(0,n-1);m<=v;m++)u[m]=m?n?b[n-1]===d[m-1]?w[m-1]:e(w[m]||t,u[m-1]||t)+1:m+1:n+1;e=[];g=[];q=[];n=p;for(m=r;n||m;)r=h[n][m]-1,m&&
 r===h[n][m-1]?g.push(e[e.length]={status:f,value:d[--m],index:m}):n&&r===h[n-1][m]?q.push(e[e.length]={status:k,value:b[--n],index:n}):(--m,--n,l.sparse||e.push({status:"retained",value:d[m]}));c.g.Hb(q,g,!l.dontLimitMoves&&10*p);return e.reverse()};return(b,d,f)=>{f="boolean"===typeof f?{dontLimitMoves:f}:f||{};b=b||[];d=d||[];return b.length<d.length?a(b,d,"added","deleted",f):a(d,b,"deleted","added",f)}})();(()=>{function a(f,k,l,e,g){var h=[],n=c.u(()=>{var p=k(l,g,c.g.Ba(h,f))||[];if(0<h.length){var m=
-h.nodeType?[h]:h;if(0<m.length){var r=m[0],q=r.parentNode;p.forEach(t=>q.insertBefore(t,r));m.forEach(t=>c.removeNode(t))}e&&c.o.M(e,null,[l,p,g])}h.length=0;h.push(...p)},{s:f,oa:()=>!!h.find(c.g.bb)});return{O:h,Ya:n.isActive()?n:void 0}}var b=c.g.j.Z(),d=c.g.j.Z();c.g.Qb=(f,k,l,e,g,h)=>{k=k||[];"undefined"==typeof k.length&&(k=[k]);e=e||{};var n=c.g.j.get(f,b),p=[],m=0,r=0,q=[],t=[],u=[],w=0,v=x=>{A={da:x,Ea:c.ba(r++)};p.push(A)},z=x=>{A=n[x];A.Ea(r++);c.g.Ba(A.O,f);p.push(A)};if(n){if(!h||n&&
+h.nodeType?[h]:h;if(0<m.length){var r=m[0],q=r.parentNode;p.forEach(t=>q.insertBefore(t,r));m.forEach(t=>c.removeNode(t))}e&&c.o.M(e,null,[l,p,g])}h.length=0;h.push(...p)},{s:f,na:()=>!!h.find(c.g.bb)});return{O:h,Ya:n.isActive()?n:void 0}}var b=c.g.j.Z(),d=c.g.j.Z();c.g.Qb=(f,k,l,e,g,h)=>{k=k||[];"undefined"==typeof k.length&&(k=[k]);e=e||{};var n=c.g.j.get(f,b),p=[],m=0,r=0,q=[],t=[],u=[],w=0,v=x=>{A={da:x,Ea:c.ba(r++)};p.push(A)},z=x=>{A=n[x];A.Ea(r++);c.g.Ba(A.O,f);p.push(A)};if(n){if(!h||n&&
 n._countWaitingForRemove)h=c.g.Cb(Array.prototype.map.call(n,E=>E.da),k,{dontLimitMoves:e.dontLimitMoves,sparse:!0});let x,I;for(h.forEach(E=>{x=E.moved;I=E.index;switch(E.status){case "deleted":for(;m<I;)z(m++);void 0===x&&(A=n[m],A.Ya&&(A.Ya.A(),A.Ya=void 0),c.g.Ba(A.O,f).length&&(e.beforeRemove&&(p.push(A),w++,A.da===d?A=null:u[A.Ea.R()]=A),A&&q.push.apply(q,A.O)));m++;break;case "added":for(;r<I;)z(m++);void 0!==x?(t.push(p.length),z(x)):v(E.value)}});r<k.length;)z(m++);p._countWaitingForRemove=
 w}else k.forEach(v);c.g.j.set(f,b,p);q.forEach(e.beforeRemove?c.fa:c.removeNode);var C,H,O=x=>{c.m.jc(f,x,H);H=x};h=f.ownerDocument.activeElement;if(t.length)for(;void 0!=(C=t.shift());){var A=p[C];for(H=void 0;C;)if(k=p[--C].O,k?.length){H=k[k.length-1];break}A.O.forEach(O)}p.forEach(x=>{x.O||c.g.extend(x,a(f,l,x.da,g,x.Ea));x.O.forEach(O);!x.ic&&g&&(g(x.da,x.O,x.Ea),x.ic=!0,H=x.O[x.O.length-1])});f.ownerDocument.activeElement!=h&&h?.focus();((x,I)=>{x&&I.forEach(E=>E?.O.forEach(na=>x(na,C,E.da)))})(e.beforeRemove,
 u);u.forEach(x=>x&&(x.da=d))}})();V.ko=R})(this);
diff --git a/vendors/knockout/src/subscribables/observable.js b/vendors/knockout/src/subscribables/observable.js
index 904b41159..dc5472a81 100644
--- a/vendors/knockout/src/subscribables/observable.js
+++ b/vendors/knockout/src/subscribables/observable.js
@@ -29,9 +29,7 @@ ko.observable = initialValue => {
     ko.subscribable['fn'].init(observable);
 
     // Inherit from 'observable'
-    Object.setPrototypeOf(observable, observableFn);
-
-    return observable;
+    return Object.setPrototypeOf(observable, observableFn);
 }
 
 // Define prototype for observables
diff --git a/vendors/knockout/src/subscribables/observableArray.js b/vendors/knockout/src/subscribables/observableArray.js
index 76a0ea89f..9af99306c 100644
--- a/vendors/knockout/src/subscribables/observableArray.js
+++ b/vendors/knockout/src/subscribables/observableArray.js
@@ -4,12 +4,12 @@ ko.observableArray = initialValues => {
     if (typeof initialValues != 'object' || !('length' in initialValues))
         throw new Error("The argument passed when initializing an observable array must be an array, or null, or undefined.");
 
-    var result = ko.observable(initialValues);
-    Object.setPrototypeOf(result, ko.observableArray['fn']);
-    return result.extend({'trackArrayChanges':true});
+    return Object.setPrototypeOf(ko.observable(initialValues), ko.observableArray['fn']).extend({'trackArrayChanges':true});
 };
 
-ko.observableArray['fn'] = {
+// Note that for browsers that don't support proto assignment, the
+// inheritance chain is created manually in the ko.observableArray constructor
+ko.observableArray['fn'] = Object.setPrototypeOf({
     'remove': function (valueOrPredicate) {
         var underlyingArray = this.peek();
         var removed = false;
@@ -29,11 +29,7 @@ ko.observableArray['fn'] = {
         }
         removed && this.valueHasMutated();
     }
-};
-
-// Note that for browsers that don't support proto assignment, the
-// inheritance chain is created manually in the ko.observableArray constructor
-Object.setPrototypeOf(ko.observableArray['fn'], ko.observable['fn']);
+}, ko.observable['fn']);
 
 // Populate ko.observableArray.fn with native arrays functions
 Object.getOwnPropertyNames(Array.prototype).forEach(methodName => {
diff --git a/vendors/knockout/src/subscribables/subscribable.js b/vendors/knockout/src/subscribables/subscribable.js
index b4b19924b..ae0173bb4 100644
--- a/vendors/knockout/src/subscribables/subscribable.js
+++ b/vendors/knockout/src/subscribables/subscribable.js
@@ -187,10 +187,7 @@ ko.exportProperty(ko_subscribable_fn, 'extend', ko_subscribable_fn.extend);
 // For browsers that support proto assignment, we overwrite the prototype of each
 // observable instance. Since observables are functions, we need Function.prototype
 // to still be in the prototype chain.
-Object.setPrototypeOf(ko_subscribable_fn, Function.prototype);
-
-ko.subscribable['fn'] = ko_subscribable_fn;
-
+ko.subscribable['fn'] = Object.setPrototypeOf(ko_subscribable_fn, Function.prototype);
 
 ko.isSubscribable = instance =>
     typeof instance?.subscribe == "function" && typeof instance.notifySubscribers == "function";
diff --git a/vendors/knockout/src/utils.js b/vendors/knockout/src/utils.js
index c2cb847a7..a752eb577 100644
--- a/vendors/knockout/src/utils.js
+++ b/vendors/knockout/src/utils.js
@@ -4,6 +4,9 @@ ko.utils = {
     objectForEach: (obj, action) => obj && Object.entries(obj).forEach(prop => action(prop[0], prop[1])),
 
     emptyDomNode: domNode => [...domNode.childNodes].forEach(child => ko.removeNode(child)),
+//    emptyDomNode: domNode => {while (domNode.lastChild) ko.removeNode(domNode.lastChild)},
+    // Safari 14+
+//    emptyDomNode: domNode => domNode.replaceChildren(),
 
     moveCleanedNodesToContainerElement: nodes => {
         // Ensure it's a real array, as we're about to reparent the nodes and
diff --git a/vendors/squire/build/squire-raw.js b/vendors/squire/build/squire-raw.js
index 4ba322311..6a98c5806 100644
--- a/vendors/squire/build/squire-raw.js
+++ b/vendors/squire/build/squire-raw.js
@@ -8,9 +8,10 @@
 	not UL > LI > BLOCKQUOTE
 */
 
-( doc => {
+(doc => {
 
 const
+	blockTag = 'DIV',
 	DOCUMENT_POSITION_PRECEDING = 2, // Node.DOCUMENT_POSITION_PRECEDING
 	ELEMENT_NODE = 1,                // Node.ELEMENT_NODE,
 	TEXT_NODE = 3,                   // Node.TEXT_NODE,
@@ -31,10 +32,10 @@ const
 
 	ua = navigator.userAgent,
 
-	isMac = /Mac OS X/.test( ua ),
-	isIOS = /iP(?:ad|hone|od)/.test( ua ) || ( isMac && !!navigator.maxTouchPoints ),
+	isMac = /Mac OS X/.test(ua),
+	isIOS = /iP(?:ad|hone|od)/.test(ua) || (isMac && !!navigator.maxTouchPoints),
 
-	isWebKit = /WebKit\//.test( ua ),
+	isWebKit = /WebKit\//.test(ua),
 
 	ctrlKey = isMac ? 'meta-' : 'ctrl-',
 	osKey = isMac ? 'metaKey' : 'ctrlKey',
@@ -78,13 +79,13 @@ const
 	isLeaf = node => node.nodeType === ELEMENT_NODE && !!leafNodeNames[ node.nodeName ],
 
 	getNodeCategory = node => {
-		switch ( node.nodeType ) {
+		switch (node.nodeType) {
 		case TEXT_NODE:
 			return INLINE;
 		case ELEMENT_NODE:
 		case DOCUMENT_FRAGMENT_NODE:
-			if ( nodeCategoryCache.has( node ) ) {
-				return nodeCategoryCache.get( node );
+			if (nodeCategoryCache.has(node)) {
+				return nodeCategoryCache.get(node);
 			}
 			break;
 		default:
@@ -92,41 +93,41 @@ const
 		}
 
 		let nodeCategory =
-			Array.prototype.every.call( node.childNodes, isInline )
-			? ( inlineNodeNames.test( node.nodeName ) ? INLINE : BLOCK )
+			Array.prototype.every.call(node.childNodes, isInline)
+			? (inlineNodeNames.test(node.nodeName) ? INLINE : BLOCK)
 			// Malformed HTML can have block tags inside inline tags. Need to treat
 			// these as containers rather than inline. See #239.
 			: CONTAINER;
-		nodeCategoryCache.set( node, nodeCategory );
+		nodeCategoryCache.set(node, nodeCategory);
 		return nodeCategory;
 	},
-	isInline = node => getNodeCategory( node ) === INLINE,
-	isBlock = node => getNodeCategory( node ) === BLOCK,
-	isContainer = node => getNodeCategory( node ) === CONTAINER,
-	createTreeWalker = (root, whatToShow, filter) => doc.createTreeWalker( root, whatToShow, filter ? {
+	isInline = node => getNodeCategory(node) === INLINE,
+	isBlock = node => getNodeCategory(node) === BLOCK,
+	isContainer = node => getNodeCategory(node) === CONTAINER,
+	createTreeWalker = (root, whatToShow, filter) => doc.createTreeWalker(root, whatToShow, filter ? {
 			acceptNode: node => filter(node) ? filterAccept : NodeFilter.FILTER_SKIP
 		} : null
 	),
-	getBlockWalker = ( node, root ) => {
-		let walker = createTreeWalker( root, SHOW_ELEMENT, isBlock );
+	getBlockWalker = (node, root) => {
+		let walker = createTreeWalker(root, SHOW_ELEMENT, isBlock);
 		walker.currentNode = node;
 		return walker;
 	},
-	getPreviousBlock = ( node, root ) => {
-//		node = getClosest( node, root, blockElementNames );
-		node = getBlockWalker( node, root ).previousNode();
+	getPreviousBlock = (node, root) => {
+//		node = getClosest(node, root, blockElementNames);
+		node = getBlockWalker(node, root).previousNode();
 		return node !== root ? node : null;
 	},
-	getNextBlock = ( node, root ) => {
-//		node = getClosest( node, root, blockElementNames );
-		node = getBlockWalker( node, root ).nextNode();
+	getNextBlock = (node, root) => {
+//		node = getClosest(node, root, blockElementNames);
+		node = getBlockWalker(node, root).nextNode();
 		return node !== root ? node : null;
 	},
 
-	isEmptyBlock = block => !block.textContent && !block.querySelector( 'IMG' ),
+	isEmptyBlock = block => !block.textContent && !block.querySelector('IMG'),
 
-	areAlike = ( node, node2 ) => {
-		return !isLeaf( node ) && (
+	areAlike = (node, node2) => {
+		return !isLeaf(node) && (
 			node.nodeType === node2.nodeType &&
 			node.nodeName === node2.nodeName &&
 			node.nodeName !== 'A' &&
@@ -134,17 +135,17 @@ const
 			node.style?.cssText === node2.style?.cssText
 		);
 	},
-	hasTagAttributes = ( node, tag, attributes ) => {
+	hasTagAttributes = (node, tag, attributes) => {
 		return node.nodeName === tag && Object.entries(attributes || {}).every(([k,v]) => node.getAttribute(k) === v);
 	},
-	getClosest = ( node, root, selector ) => {
+	getClosest = (node, root, selector) => {
 		node = (node && !node.closest) ? node.parentElement : node;
 		node = node?.closest(selector);
 		return (node && root.contains(node)) ? node : null;
 	},
-	getNearest = ( node, root, tag, attributes ) => {
-		while ( node && node !== root ) {
-			if ( hasTagAttributes( node, tag, attributes ) ) {
+	getNearest = (node, root, tag, attributes) => {
+		while (node && node !== root) {
+			if (hasTagAttributes(node, tag, attributes)) {
 				return node;
 			}
 			node = node.parentNode;
@@ -152,22 +153,22 @@ const
 		return null;
 	},
 
-	getPath = ( node, root, config ) => {
+	getPath = (node, root) => {
 		let path = '', style;
-		if ( node && node !== root ) {
-			path = getPath( node.parentNode, root, config );
-			if ( node.nodeType === ELEMENT_NODE ) {
-				path += ( path ? '>' : '' ) + node.nodeName;
-				if ( node.id ) {
+		if (node && node !== root) {
+			path = getPath(node.parentNode, root);
+			if (node.nodeType === ELEMENT_NODE) {
+				path += (path ? '>' : '') + node.nodeName;
+				if (node.id) {
 					path += '#' + node.id;
 				}
-				if ( node.classList.length ) {
-					path += '.' + [...node.classList].sort().join( '.' );
+				if (node.classList.length) {
+					path += '.' + [...node.classList].sort().join('.');
 				}
-				if ( node.dir ) {
+				if (node.dir) {
 					path += '[dir=' + node.dir + ']';
 				}
-				if ( style = node.style.cssText ) {
+				if (style = node.style.cssText) {
 					path += '[style=' + style + ']';
 				}
 			}
@@ -183,43 +184,43 @@ const
 
 	detach = node => {
 //		node.remove();
-		node.parentNode?.removeChild( node );
+		node.parentNode?.removeChild(node);
 		return node;
 	},
 
 	empty = node => {
 		let frag = doc.createDocumentFragment(),
 			childNodes = node.childNodes;
-		childNodes && frag.append( ...childNodes );
+		childNodes && frag.append(...childNodes);
 		return frag;
 	},
 
-	setStyle = ( node, style ) => {
+	setStyle = (node, style) => {
 		if (typeof style === 'object') {
 			Object.entries(style).forEach(([k,v]) => node.style[k] = v);
-		} else if ( style !== undefined ) {
-			node.setAttribute( 'style', style );
+		} else if (style !== undefined) {
+			node.setAttribute('style', style);
 		}
 	},
 
-	createElement = ( tag, props, children ) => {
-		let el = doc.createElement( tag );
-		if ( props instanceof Array ) {
+	createElement = (tag, props, children) => {
+		let el = doc.createElement(tag);
+		if (props instanceof Array) {
 			children = props;
 			props = null;
 		}
 		props && Object.entries(props).forEach(([k,v]) => {
 			if ('style' === k) {
-				setStyle( el, v );
-			} else if ( v !== undefined ) {
-				el.setAttribute( k, v );
+				setStyle(el, v);
+			} else if (v !== undefined) {
+				el.setAttribute(k, v);
 			}
 		});
-		children && el.append( ...children );
+		children && el.append(...children);
 		return el;
 	},
 
-	fixCursor = ( node, root ) => {
+	fixCursor = (node, root) => {
 		// In Webkit and Gecko, block level elements are collapsed and
 		// unfocusable if they have no content (:empty). To remedy this, a <BR> must be
 		// inserted. In Opera and IE, we just need a textnode in order for the
@@ -228,45 +229,45 @@ const
 		let originalNode = node;
 		let fixer, child;
 
-		if ( node === root ) {
-			if ( !( child = node.firstChild ) || child.nodeName === 'BR' ) {
+		if (node === root) {
+			if (!(child = node.firstChild) || child.nodeName === 'BR') {
 				fixer = self.createDefaultBlock();
-				if ( child ) {
-					child.replaceWith( fixer );
+				if (child) {
+					child.replaceWith(fixer);
 				}
 				else {
-					node.append( fixer );
+					node.append(fixer);
 				}
 				node = fixer;
 				fixer = null;
 			}
 		}
 
-		if ( node.nodeType === TEXT_NODE ) {
+		if (node.nodeType === TEXT_NODE) {
 			return originalNode;
 		}
 
-		if ( isInline( node ) ) {
+		if (isInline(node)) {
 			child = node.firstChild;
-			while ( isWebKit && child?.nodeType === TEXT_NODE && !child.data ) {
-				child.remove(  );
+			while (isWebKit && child?.nodeType === TEXT_NODE && !child.data) {
+				child.remove();
 				child = node.firstChild;
 			}
-			if ( !child ) {
+			if (!child) {
 				fixer = self._addZWS();
 			}
-//		} else if ( !node.querySelector( 'BR' ) ) {
-//		} else if ( !node.innerText.trim().length ) {
-		} else if ( node.matches( ':empty' ) ) {
-			fixer = createElement( 'BR' );
-			while ( ( child = node.lastElementChild ) && !isInline( child ) ) {
+//		} else if (!node.querySelector('BR')) {
+//		} else if (!node.innerText.trim().length) {
+		} else if (node.matches(':empty')) {
+			fixer = createElement('BR');
+			while ((child = node.lastElementChild) && !isInline(child)) {
 				node = child;
 			}
 		}
-		if ( fixer ) {
+		if (fixer) {
 			try {
-				node.append( fixer );
-			} catch ( error ) {
+				node.append(fixer);
+			} catch (error) {
 				didError({
 					name: 'Squire: fixCursor – ' + error,
 					message: 'Parent: ' + node.nodeName + '/' + node.innerHTML +
@@ -279,255 +280,211 @@ const
 	},
 
 	// Recursively examine container nodes and wrap any inline children.
-	fixContainer = ( container, root ) => {
-		let children = container.childNodes;
-		let wrapper = null;
-		let i = 0, l = children.length, child, isBR;
-
-		for ( ; i < l; ++i ) {
-			child = children[i];
-			isBR = child.nodeName === 'BR';
-			if ( !isBR && isInline( child )
-//			 && (root.__squire__._config.blockTag !== 'DIV' || (child.matches && !child.matches(phrasingElements)))
-			) {
-				if ( !wrapper ) {
-					 wrapper = createElement( 'div' );
-				}
-				wrapper.append( child );
-				--i;
-				--l;
-			} else if ( isBR || wrapper ) {
-				if ( !wrapper ) {
-					wrapper = createElement( 'div' );
-				}
-				fixCursor( wrapper, root );
-				if ( isBR ) {
-					child.replaceWith( wrapper );
-				} else {
-					child.before( wrapper  );
-					++i;
-					++l;
-				}
-				wrapper = null;
-			}
-			isContainer( child ) && fixContainer( child, root );
-		}
-/*
-		// Not live
+	fixContainer = (container, root) => {
+		let wrapper, isBR;
 		[...container.children].forEach(child => {
 			isBR = child.nodeName === 'BR';
-			if ( !isBR && isInline( child )
-//			 && (root.__squire__._config.blockTag !== 'DIV' || (child.matches && !child.matches(phrasingElements)))
+			if (!isBR && isInline(child)
+//			 && (blockTag !== 'DIV' || (child.matches && !child.matches(phrasingElements)))
 			) {
-				if ( !wrapper ) {
-					 wrapper = createElement( 'div' );
-				}
-				wrapper.append( child );
-			} else if ( isBR || wrapper ) {
-				if ( !wrapper ) {
-					wrapper = createElement( 'div' );
-				}
-				fixCursor( wrapper, root );
-				if ( isBR ) {
-					child.replaceWith( wrapper );
-				} else {
-					child.before( wrapper  );
-				}
+				wrapper = wrapper || createElement('div');
+				wrapper.append(child);
+			} else if (isBR || wrapper) {
+				wrapper = wrapper || createElement('div');
+				fixCursor(wrapper, root);
+				child[isBR ? 'replaceWith' : 'before'](wrapper);
 				wrapper = null;
 			}
-			if ( isContainer( child ) ) {
-				fixContainer( child, root );
-			}
+			isContainer(child) && fixContainer(child, root);
 		});
-*/
-		wrapper && container.append( fixCursor( wrapper, root ) );
+		wrapper && container.append(fixCursor(wrapper, root));
 		return container;
 	},
 
-	split = ( node, offset, stopNode, root ) => {
+	split = (node, offset, stopNode, root) => {
 		let nodeType = node.nodeType,
 			parent, clone, next;
-		if ( nodeType === TEXT_NODE && node !== stopNode ) {
+		if (nodeType === TEXT_NODE && node !== stopNode) {
 			return split(
-				node.parentNode, node.splitText( offset ), stopNode, root );
+				node.parentNode, node.splitText(offset), stopNode, root);
 		}
-		if ( nodeType === ELEMENT_NODE ) {
-			if ( typeof( offset ) === 'number' ) {
+		if (nodeType === ELEMENT_NODE) {
+			if (typeof(offset) === 'number') {
 				offset = offset < node.childNodes.length ?
 					node.childNodes[ offset ] : null;
 			}
-			if ( node === stopNode ) {
+			if (node === stopNode) {
 				return offset;
 			}
 
 			// Clone node without children
 			parent = node.parentNode;
-			clone = node.cloneNode( false );
+			clone = node.cloneNode(false);
 
 			// Add right-hand siblings to the clone
-			while ( offset ) {
+			while (offset) {
 				next = offset.nextSibling;
-				clone.append( offset );
+				clone.append(offset);
 				offset = next;
 			}
 
 			// Maintain li numbering if inside a quote.
-			if ( node.nodeName === 'OL' &&
-					getClosest( node, root, 'BLOCKQUOTE' ) ) {
-				clone.start = ( +node.start || 1 ) + node.childNodes.length - 1;
+			if (node.nodeName === 'OL' &&
+					getClosest(node, root, 'BLOCKQUOTE')) {
+				clone.start = (+node.start || 1) + node.childNodes.length - 1;
 			}
 
 			// DO NOT NORMALISE. This may undo the fixCursor() call
 			// of a node lower down the tree!
 
 			// We need something in the element in order for the cursor to appear.
-			fixCursor( node, root );
-			fixCursor( clone, root );
+			fixCursor(node, root);
+			fixCursor(clone, root);
 
 			// Inject clone after original node
-			node.after( clone );
+			node.after(clone);
 
 			// Keep on splitting up the tree
-			return split( parent, clone, stopNode, root );
+			return split(parent, clone, stopNode, root);
 		}
 		return offset;
 	},
 
-	_mergeInlines = ( node, fakeRange ) => {
+	_mergeInlines = (node, fakeRange) => {
 		let children = node.childNodes,
 			l = children.length,
 			frags = [],
 			child, prev;
-		while ( l-- ) {
+		while (l--) {
 			child = children[l];
 			prev = l && children[ l - 1 ];
-			if ( l && isInline( child ) && areAlike( child, prev ) &&
-					!leafNodeNames[ child.nodeName ] ) {
-				if ( fakeRange.startContainer === child ) {
+			if (l && isInline(child) && areAlike(child, prev) &&
+					!leafNodeNames[ child.nodeName ]) {
+				if (fakeRange.startContainer === child) {
 					fakeRange.startContainer = prev;
-					fakeRange.startOffset += getLength( prev );
+					fakeRange.startOffset += getLength(prev);
 				}
-				if ( fakeRange.endContainer === child ) {
+				if (fakeRange.endContainer === child) {
 					fakeRange.endContainer = prev;
-					fakeRange.endOffset += getLength( prev );
+					fakeRange.endOffset += getLength(prev);
 				}
-				if ( fakeRange.startContainer === node ) {
-					if ( fakeRange.startOffset > l ) {
+				if (fakeRange.startContainer === node) {
+					if (fakeRange.startOffset > l) {
 						--fakeRange.startOffset;
 					}
-					else if ( fakeRange.startOffset === l ) {
+					else if (fakeRange.startOffset === l) {
 						fakeRange.startContainer = prev;
-						fakeRange.startOffset = getLength( prev );
+						fakeRange.startOffset = getLength(prev);
 					}
 				}
-				if ( fakeRange.endContainer === node ) {
-					if ( fakeRange.endOffset > l ) {
+				if (fakeRange.endContainer === node) {
+					if (fakeRange.endOffset > l) {
 						--fakeRange.endOffset;
 					}
-					else if ( fakeRange.endOffset === l ) {
+					else if (fakeRange.endOffset === l) {
 						fakeRange.endContainer = prev;
-						fakeRange.endOffset = getLength( prev );
+						fakeRange.endOffset = getLength(prev);
 					}
 				}
-				detach( child );
-				if ( child.nodeType === TEXT_NODE ) {
-					prev.appendData( child.data );
+				detach(child);
+				if (child.nodeType === TEXT_NODE) {
+					prev.appendData(child.data);
 				}
 				else {
-					frags.push( empty( child ) );
+					frags.push(empty(child));
 				}
 			}
-			else if ( child.nodeType === ELEMENT_NODE ) {
+			else if (child.nodeType === ELEMENT_NODE) {
 				child.append(...frags.reverse());
 				frags = [];
-				_mergeInlines( child, fakeRange );
+				_mergeInlines(child, fakeRange);
 			}
 		}
 	},
 
-	mergeInlines = ( node, range ) => {
-		if ( node.nodeType === TEXT_NODE ) {
+	mergeInlines = (node, range) => {
+		if (node.nodeType === TEXT_NODE) {
 			node = node.parentNode;
 		}
-		if ( node.nodeType === ELEMENT_NODE ) {
+		if (node.nodeType === ELEMENT_NODE) {
 			let fakeRange = {
 				startContainer: range.startContainer,
 				startOffset: range.startOffset,
 				endContainer: range.endContainer,
 				endOffset: range.endOffset
 			};
-			_mergeInlines( node, fakeRange );
-			range.setStart( fakeRange.startContainer, fakeRange.startOffset );
-			range.setEnd( fakeRange.endContainer, fakeRange.endOffset );
+			_mergeInlines(node, fakeRange);
+			range.setStart(fakeRange.startContainer, fakeRange.startOffset);
+			range.setEnd(fakeRange.endContainer, fakeRange.endOffset);
 		}
 	},
 
-	mergeWithBlock = ( block, next, range, root ) => {
+	mergeWithBlock = (block, next, range, root) => {
 		let container = next;
 		let parent, last, offset;
-		while ( ( parent = container.parentNode ) &&
+		while ((parent = container.parentNode) &&
 				parent !== root &&
 				parent.nodeType === ELEMENT_NODE &&
-				parent.childNodes.length === 1 ) {
+				parent.childNodes.length === 1) {
 			container = parent;
 		}
-		detach( container );
+		detach(container);
 
 		offset = block.childNodes.length;
 
 		// Remove extra <BR> fixer if present.
 		last = block.lastChild;
-		if ( last?.nodeName === 'BR' ) {
-			last.remove(  );
+		if (last?.nodeName === 'BR') {
+			last.remove();
 			--offset;
 		}
 
-		block.append( empty( next ) );
+		block.append(empty(next));
 
-		range.setStart( block, offset );
-		range.collapse( true );
-		mergeInlines( block, range );
+		range.setStart(block, offset);
+		range.collapse(true);
+		mergeInlines(block, range);
 	},
 
-	mergeContainers = ( node, root ) => {
+	mergeContainers = (node, root) => {
 		let prev = node.previousSibling,
 			first = node.firstChild,
-			isListItem = ( node.nodeName === 'LI' ),
+			isListItem = (node.nodeName === 'LI'),
 			needsFix, block;
 
 		// Do not merge LIs, unless it only contains a UL
-		if ( isListItem && ( !first || !/^[OU]L$/.test( first.nodeName ) ) ) {
+		if (isListItem && (!first || !/^[OU]L$/.test(first.nodeName))) {
 			return;
 		}
 
-		if ( prev && areAlike( prev, node ) ) {
-			if ( !isContainer( prev ) ) {
-				if ( !isListItem ) {
+		if (prev && areAlike(prev, node)) {
+			if (!isContainer(prev)) {
+				if (!isListItem) {
 					return;
 				}
-				block = createElement( 'DIV' );
-				block.append( empty( prev ) );
-				prev.append( block );
+				block = createElement('DIV');
+				block.append(empty(prev));
+				prev.append(block);
 			}
-			detach( node );
-			needsFix = !isContainer( node );
-			prev.append( empty( node ) );
-			if ( needsFix ) {
-				fixContainer( prev, root );
+			detach(node);
+			needsFix = !isContainer(node);
+			prev.append(empty(node));
+			if (needsFix) {
+				fixContainer(prev, root);
 			}
-			if ( first ) {
-				mergeContainers( first, root );
+			if (first) {
+				mergeContainers(first, root);
 			}
-		} else if ( isListItem ) {
-			prev = createElement( 'DIV' );
-			node.insertBefore( prev, first );
-			fixCursor( prev, root );
+		} else if (isListItem) {
+			prev = createElement('DIV');
+			node.insertBefore(prev, first);
+			fixCursor(prev, root);
 		}
 	},
 
-	getNodeBefore = ( node, offset ) => {
+	getNodeBefore = (node, offset) => {
 		let children = node.childNodes;
-		while ( offset && node.nodeType === ELEMENT_NODE ) {
+		while (offset && node.nodeType === ELEMENT_NODE) {
 			node = children[ offset - 1 ];
 			children = node.childNodes;
 			offset = children.length;
@@ -535,22 +492,22 @@ const
 		return node;
 	},
 
-	getNodeAfter = ( node, offset ) => {
-		if ( node.nodeType === ELEMENT_NODE ) {
+	getNodeAfter = (node, offset) => {
+		if (node.nodeType === ELEMENT_NODE) {
 			let children = node.childNodes;
-			if ( offset < children.length ) {
+			if (offset < children.length) {
 				node = children[ offset ];
 			} else {
-				while ( node && !node.nextSibling ) {
+				while (node && !node.nextSibling) {
 					node = node.parentNode;
 				}
-				if ( node ) { node = node.nextSibling; }
+				if (node) { node = node.nextSibling; }
 			}
 		}
 		return node;
 	},
 
-	insertNodeInRange = ( range, node ) => {
+	insertNodeInRange = (range, node) => {
 		// Insert at start.
 		let startContainer = range.startContainer,
 			startOffset = range.startOffset,
@@ -559,28 +516,28 @@ const
 			parent, children, childCount, afterSplit;
 
 		// If part way through a text node, split it.
-		if ( startContainer.nodeType === TEXT_NODE ) {
+		if (startContainer.nodeType === TEXT_NODE) {
 			parent = startContainer.parentNode;
 			children = parent.childNodes;
-			if ( startOffset === startContainer.length ) {
-				startOffset = indexOf( children, startContainer ) + 1;
-				if ( range.collapsed ) {
+			if (startOffset === startContainer.length) {
+				startOffset = indexOf(children, startContainer) + 1;
+				if (range.collapsed) {
 					endContainer = parent;
 					endOffset = startOffset;
 				}
 			} else {
-				if ( startOffset ) {
-					afterSplit = startContainer.splitText( startOffset );
-					if ( endContainer === startContainer ) {
+				if (startOffset) {
+					afterSplit = startContainer.splitText(startOffset);
+					if (endContainer === startContainer) {
 						endOffset -= startOffset;
 						endContainer = afterSplit;
 					}
-					else if ( endContainer === parent ) {
+					else if (endContainer === parent) {
 						++endOffset;
 					}
 					startContainer = afterSplit;
 				}
-				startOffset = indexOf( children, startContainer );
+				startOffset = indexOf(children, startContainer);
 			}
 			startContainer = parent;
 		} else {
@@ -589,56 +546,56 @@ const
 
 		childCount = children.length;
 
-		if ( startOffset === childCount ) {
-			startContainer.append( node );
+		if (startOffset === childCount) {
+			startContainer.append(node);
 		} else {
-			startContainer.insertBefore( node, children[ startOffset ] );
+			startContainer.insertBefore(node, children[ startOffset ]);
 		}
 
-		if ( startContainer === endContainer ) {
+		if (startContainer === endContainer) {
 			endOffset += children.length - childCount;
 		}
 
-		range.setStart( startContainer, startOffset );
-		range.setEnd( endContainer, endOffset );
+		range.setStart(startContainer, startOffset);
+		range.setEnd(endContainer, endOffset);
 	},
 
-	extractContentsOfRange = ( range, common, root ) => {
+	extractContentsOfRange = (range, common, root) => {
 		let startContainer = range.startContainer,
 			startOffset = range.startOffset,
 			endContainer = range.endContainer,
 			endOffset = range.endOffset;
 
-		if ( !common ) {
+		if (!common) {
 			common = range.commonAncestorContainer;
 		}
 
-		if ( common.nodeType === TEXT_NODE ) {
+		if (common.nodeType === TEXT_NODE) {
 			common = common.parentNode;
 		}
 
-		let endNode = split( endContainer, endOffset, common, root ),
-			startNode = split( startContainer, startOffset, common, root ),
+		let endNode = split(endContainer, endOffset, common, root),
+			startNode = split(startContainer, startOffset, common, root),
 			frag = doc.createDocumentFragment(),
 			next, before, after, beforeText, afterText;
 
 		// End node will be null if at end of child nodes list.
-		while ( startNode !== endNode ) {
+		while (startNode !== endNode) {
 			next = startNode.nextSibling;
-			frag.append( startNode );
+			frag.append(startNode);
 			startNode = next;
 		}
 
 		startContainer = common;
 		startOffset = endNode ?
-			indexOf( common.childNodes, endNode ) :
+			indexOf(common.childNodes, endNode) :
 			common.childNodes.length;
 
 		// Merge text nodes if adjacent. IE10 in particular will not focus
 		// between two text nodes
 		after = common.childNodes[ startOffset ];
 		before = after?.previousSibling;
-		if ( before?.nodeType === TEXT_NODE && after.nodeType === TEXT_NODE ) {
+		if (before?.nodeType === TEXT_NODE && after.nodeType === TEXT_NODE) {
 			startContainer = before;
 			startOffset = before.length;
 			beforeText = before.data;
@@ -647,90 +604,90 @@ const
 			// If we now have two adjacent spaces, the second one needs to become
 			// a nbsp, otherwise the browser will swallow it due to HTML whitespace
 			// collapsing.
-			if ( beforeText.charAt( beforeText.length - 1 ) === ' ' &&
-					afterText.charAt( 0 ) === ' ' ) {
-				afterText = NBSP + afterText.slice( 1 ); // nbsp
+			if (beforeText.charAt(beforeText.length - 1) === ' ' &&
+					afterText.charAt(0) === ' ') {
+				afterText = NBSP + afterText.slice(1); // nbsp
 			}
-			before.appendData( afterText );
-			detach( after );
+			before.appendData(afterText);
+			detach(after);
 		}
 
-		range.setStart( startContainer, startOffset );
-		range.collapse( true );
+		range.setStart(startContainer, startOffset);
+		range.collapse(true);
 
-		fixCursor( common, root );
+		fixCursor(common, root);
 
 		return frag;
 	},
 
-	deleteContentsOfRange = ( range, root ) => {
-		let startBlock = getStartBlockOfRange( range, root );
-		let endBlock = getEndBlockOfRange( range, root );
-		let needsMerge = ( startBlock !== endBlock );
+	deleteContentsOfRange = (range, root) => {
+		let startBlock = getStartBlockOfRange(range, root);
+		let endBlock = getEndBlockOfRange(range, root);
+		let needsMerge = (startBlock !== endBlock);
 		let frag, child;
 
 		// Move boundaries up as much as possible without exiting block,
 		// to reduce need to split.
-		moveRangeBoundariesDownTree( range );
-		moveRangeBoundariesUpTree( range, startBlock, endBlock, root );
+		moveRangeBoundariesDownTree(range);
+		moveRangeBoundariesUpTree(range, startBlock, endBlock, root);
 
 		// Remove selected range
-		frag = extractContentsOfRange( range, null, root );
+		frag = extractContentsOfRange(range, null, root);
 
 		// Move boundaries back down tree as far as possible.
-		moveRangeBoundariesDownTree( range );
+		moveRangeBoundariesDownTree(range);
 
 		// If we split into two different blocks, merge the blocks.
-		if ( needsMerge ) {
+		if (needsMerge) {
 			// endBlock will have been split, so need to refetch
-			endBlock = getEndBlockOfRange( range, root );
-			if ( startBlock && endBlock && startBlock !== endBlock ) {
-				mergeWithBlock( startBlock, endBlock, range, root );
+			endBlock = getEndBlockOfRange(range, root);
+			if (startBlock && endBlock && startBlock !== endBlock) {
+				mergeWithBlock(startBlock, endBlock, range, root);
 			}
 		}
 
 		// Ensure block has necessary children
-		if ( startBlock ) {
-			fixCursor( startBlock, root );
+		if (startBlock) {
+			fixCursor(startBlock, root);
 		}
 
 		// Ensure root has a block-level element in it.
 		child = root.firstChild;
-		if ( child && child.nodeName !== 'BR' ) {
-			range.collapse( true );
+		if (child && child.nodeName !== 'BR') {
+			range.collapse(true);
 		} else {
-			fixCursor( root, root );
-			range.selectNodeContents( root.firstChild );
+			fixCursor(root, root);
+			range.selectNodeContents(root.firstChild);
 		}
 		return frag;
 	},
 
 	// Contents of range will be deleted.
 	// After method, range will be around inserted content
-	insertTreeFragmentIntoRange = ( range, frag, root ) => {
-		let firstInFragIsInline = frag.firstChild && isInline( frag.firstChild );
+	insertTreeFragmentIntoRange = (range, frag, root) => {
+		let firstInFragIsInline = frag.firstChild && isInline(frag.firstChild);
 		let node, block, blockContentsAfterSplit, stopPoint, container, offset;
 		let replaceBlock, firstBlockInFrag, nodeAfterSplit, nodeBeforeSplit;
 		let tempRange;
 
 		// Fixup content: ensure no top-level inline, and add cursor fix elements.
-		fixContainer( frag, root );
+		fixContainer(frag, root);
 		node = frag;
-		while ( ( node = getNextBlock( node, root ) ) ) {
-			fixCursor( node, root );
+		while ((node = getNextBlock(node, root))) {
+			fixCursor(node, root);
 		}
 
 		// Delete any selected content.
-		if ( !range.collapsed ) {
-			deleteContentsOfRange( range, root );
+		if (!range.collapsed) {
+			deleteContentsOfRange(range, root);
 		}
 
 		// Move range down into text nodes.
-		moveRangeBoundariesDownTree( range );
-		range.collapse( false ); // collapse to end
+		moveRangeBoundariesDownTree(range);
+		range.collapse(false); // collapse to end
 
 		// Where will we split up to? First blockquote parent, otherwise root.
-		stopPoint = getClosest( range.endContainer, root, 'BLOCKQUOTE' ) || root;
+		stopPoint = getClosest(range.endContainer, root, 'BLOCKQUOTE') || root;
 
 		// Merge the contents of the first block in the frag with the focused block.
 		// If there are contents in the block after the focus point, collect this
@@ -742,101 +699,101 @@ const
 		// e.g. <blockquote><p>Foo</p></blockquote>
 		// This seems a reasonable approximation of user intent.
 
-		block = getStartBlockOfRange( range, root );
-		firstBlockInFrag = getNextBlock( frag, frag );
-		replaceBlock = !firstInFragIsInline && !!block && isEmptyBlock( block );
-		if ( block && firstBlockInFrag && !replaceBlock &&
+		block = getStartBlockOfRange(range, root);
+		firstBlockInFrag = getNextBlock(frag, frag);
+		replaceBlock = !firstInFragIsInline && !!block && isEmptyBlock(block);
+		if (block && firstBlockInFrag && !replaceBlock &&
 				// Don't merge table cells or PRE elements into block
-				!getClosest( firstBlockInFrag, frag, 'PRE,TABLE' ) ) {
-			moveRangeBoundariesUpTree( range, block, block, root );
-			range.collapse( true ); // collapse to start
+				!getClosest(firstBlockInFrag, frag, 'PRE,TABLE')) {
+			moveRangeBoundariesUpTree(range, block, block, root);
+			range.collapse(true); // collapse to start
 			container = range.endContainer;
 			offset = range.endOffset;
 			// Remove trailing <br> – we don't want this considered content to be
 			// inserted again later
-			cleanupBRs( block, root, false );
-			if ( isInline( container ) ) {
+			cleanupBRs(block, root, false);
+			if (isInline(container)) {
 				// Split up to block parent.
 				nodeAfterSplit = split(
-					container, offset, getPreviousBlock( container, root ), root );
+					container, offset, getPreviousBlock(container, root), root);
 				container = nodeAfterSplit.parentNode;
-				offset = indexOf( container.childNodes, nodeAfterSplit );
+				offset = indexOf(container.childNodes, nodeAfterSplit);
 			}
-			if ( /*isBlock( container ) && */offset !== getLength( container ) ) {
+			if (/*isBlock(container) && */offset !== getLength(container)) {
 				// Collect any inline contents of the block after the range point
 				blockContentsAfterSplit = doc.createDocumentFragment();
-				while ( ( node = container.childNodes[ offset ] ) ) {
-					blockContentsAfterSplit.append( node );
+				while ((node = container.childNodes[ offset ])) {
+					blockContentsAfterSplit.append(node);
 				}
 			}
 			// And merge the first block in.
-			mergeWithBlock( container, firstBlockInFrag, range, root );
+			mergeWithBlock(container, firstBlockInFrag, range, root);
 
 			// And where we will insert
-			offset = indexOf( container.parentNode.childNodes, container ) + 1;
+			offset = indexOf(container.parentNode.childNodes, container) + 1;
 			container = container.parentNode;
-			range.setEnd( container, offset );
+			range.setEnd(container, offset);
 		}
 
 		// Is there still any content in the fragment?
-		if ( getLength( frag ) ) {
-			if ( replaceBlock ) {
-				range.setEndBefore( block );
-				range.collapse( false );
-				detach( block );
+		if (getLength(frag)) {
+			if (replaceBlock) {
+				range.setEndBefore(block);
+				range.collapse(false);
+				detach(block);
 			}
-			moveRangeBoundariesUpTree( range, stopPoint, stopPoint, root );
+			moveRangeBoundariesUpTree(range, stopPoint, stopPoint, root);
 			// Now split after block up to blockquote (if a parent) or root
 			nodeAfterSplit = split(
-				range.endContainer, range.endOffset, stopPoint, root );
+				range.endContainer, range.endOffset, stopPoint, root);
 			nodeBeforeSplit = nodeAfterSplit ?
 				nodeAfterSplit.previousSibling :
 				stopPoint.lastChild;
-			stopPoint.insertBefore( frag, nodeAfterSplit );
-			if ( nodeAfterSplit ) {
-				range.setEndBefore( nodeAfterSplit );
+			stopPoint.insertBefore(frag, nodeAfterSplit);
+			if (nodeAfterSplit) {
+				range.setEndBefore(nodeAfterSplit);
 			} else {
-				range.setEnd( stopPoint, getLength( stopPoint ) );
+				range.setEnd(stopPoint, getLength(stopPoint));
 			}
-			block = getEndBlockOfRange( range, root );
+			block = getEndBlockOfRange(range, root);
 
 			// Get a reference that won't be invalidated if we merge containers.
-			moveRangeBoundariesDownTree( range );
+			moveRangeBoundariesDownTree(range);
 			container = range.endContainer;
 			offset = range.endOffset;
 
 			// Merge inserted containers with edges of split
-			if ( nodeAfterSplit && isContainer( nodeAfterSplit ) ) {
-				mergeContainers( nodeAfterSplit, root );
+			if (nodeAfterSplit && isContainer(nodeAfterSplit)) {
+				mergeContainers(nodeAfterSplit, root);
 			}
 			nodeAfterSplit = nodeBeforeSplit?.nextSibling;
-			if ( nodeAfterSplit && isContainer( nodeAfterSplit ) ) {
-				mergeContainers( nodeAfterSplit, root );
+			if (nodeAfterSplit && isContainer(nodeAfterSplit)) {
+				mergeContainers(nodeAfterSplit, root);
 			}
-			range.setEnd( container, offset );
+			range.setEnd(container, offset);
 		}
 
 		// Insert inline content saved from before.
-		if ( blockContentsAfterSplit ) {
+		if (blockContentsAfterSplit) {
 			tempRange = range.cloneRange();
-			mergeWithBlock( block, blockContentsAfterSplit, tempRange, root );
-			range.setEnd( tempRange.endContainer, tempRange.endOffset );
+			mergeWithBlock(block, blockContentsAfterSplit, tempRange, root);
+			range.setEnd(tempRange.endContainer, tempRange.endOffset);
 		}
-		moveRangeBoundariesDownTree( range );
+		moveRangeBoundariesDownTree(range);
 	},
 
-	isNodeContainedInRange = ( range, node, partial = true ) => {
+	isNodeContainedInRange = (range, node, partial = true) => {
 		let nodeRange = doc.createRange();
 
-		nodeRange.selectNode( node );
+		nodeRange.selectNode(node);
 
 		return partial
 			// Node must not finish before range starts or start after range finishes.
-			? range.compareBoundaryPoints( END_TO_START, nodeRange ) < 0
-				&& range.compareBoundaryPoints( START_TO_END, nodeRange ) > 0
+			? range.compareBoundaryPoints(END_TO_START, nodeRange) < 0
+				&& range.compareBoundaryPoints(START_TO_END, nodeRange) > 0
 			// Node must start after range starts and finish before range finishes
-			: range.compareBoundaryPoints( START_TO_START, nodeRange ) < 1
-				&& range.compareBoundaryPoints( END_TO_END, nodeRange ) > -1;
+			: range.compareBoundaryPoints(START_TO_START, nodeRange) < 1
+				&& range.compareBoundaryPoints(END_TO_END, nodeRange) > -1;
 	},
 
 	moveRangeBoundariesDownTree = range => {
@@ -847,19 +804,19 @@ const
 			maySkipBR = true,
 			child;
 
-		while ( startContainer.nodeType !== TEXT_NODE ) {
+		while (startContainer.nodeType !== TEXT_NODE) {
 			child = startContainer.childNodes[ startOffset ];
-			if ( !child || isLeaf( child ) ) {
+			if (!child || isLeaf(child)) {
 				break;
 			}
 			startContainer = child;
 			startOffset = 0;
 		}
-		if ( endOffset ) {
-			while ( endContainer.nodeType !== TEXT_NODE ) {
+		if (endOffset) {
+			while (endContainer.nodeType !== TEXT_NODE) {
 				child = endContainer.childNodes[ endOffset - 1 ];
-				if ( !child || isLeaf( child ) ) {
-					if ( maySkipBR && child?.nodeName === 'BR' ) {
+				if (!child || isLeaf(child)) {
+					if (maySkipBR && child?.nodeName === 'BR') {
 						--endOffset;
 						maySkipBR = false;
 						continue;
@@ -867,12 +824,12 @@ const
 					break;
 				}
 				endContainer = child;
-				endOffset = getLength( endContainer );
+				endOffset = getLength(endContainer);
 			}
 		} else {
-			while ( endContainer.nodeType !== TEXT_NODE ) {
+			while (endContainer.nodeType !== TEXT_NODE) {
 				child = endContainer.firstChild;
-				if ( !child || isLeaf( child ) ) {
+				if (!child || isLeaf(child)) {
 					break;
 				}
 				endContainer = child;
@@ -882,16 +839,16 @@ const
 		// If collapsed, this algorithm finds the nearest text node positions
 		// *outside* the range rather than inside, but also it flips which is
 		// assigned to which.
-		if ( range.collapsed ) {
-			range.setStart( endContainer, endOffset );
-			range.setEnd( startContainer, startOffset );
+		if (range.collapsed) {
+			range.setStart(endContainer, endOffset);
+			range.setEnd(startContainer, startOffset);
 		} else {
-			range.setStart( startContainer, startOffset );
-			range.setEnd( endContainer, endOffset );
+			range.setStart(startContainer, startOffset);
+			range.setEnd(endContainer, endOffset);
 		}
 	},
 
-	moveRangeBoundariesUpTree = ( range, startMax, endMax, root ) => {
+	moveRangeBoundariesUpTree = (range, startMax, endMax, root) => {
 		let startContainer = range.startContainer;
 		let startOffset = range.startOffset;
 		let endContainer = range.endContainer;
@@ -899,50 +856,50 @@ const
 		let maySkipBR = true;
 		let parent;
 
-		if ( !startMax ) {
+		if (!startMax) {
 			startMax = range.commonAncestorContainer;
 		}
-		if ( !endMax ) {
+		if (!endMax) {
 			endMax = startMax;
 		}
 
-		while ( !startOffset &&
+		while (!startOffset &&
 				startContainer !== startMax &&
-				startContainer !== root ) {
+				startContainer !== root) {
 			parent = startContainer.parentNode;
-			startOffset = indexOf( parent.childNodes, startContainer );
+			startOffset = indexOf(parent.childNodes, startContainer);
 			startContainer = parent;
 		}
 
-		while ( endContainer !== endMax && endContainer !== root ) {
-			if ( maySkipBR &&
+		while (endContainer !== endMax && endContainer !== root) {
+			if (maySkipBR &&
 					endContainer.nodeType !== TEXT_NODE &&
 					endContainer.childNodes[ endOffset ] &&
-					endContainer.childNodes[ endOffset ].nodeName === 'BR' ) {
+					endContainer.childNodes[ endOffset ].nodeName === 'BR') {
 				++endOffset;
 				maySkipBR = false;
 			}
-			if ( endOffset !== getLength( endContainer ) ) {
+			if (endOffset !== getLength(endContainer)) {
 				break;
 			}
 			parent = endContainer.parentNode;
-			endOffset = indexOf( parent.childNodes, endContainer ) + 1;
+			endOffset = indexOf(parent.childNodes, endContainer) + 1;
 			endContainer = parent;
 		}
 
-		range.setStart( startContainer, startOffset );
-		range.setEnd( endContainer, endOffset );
+		range.setStart(startContainer, startOffset);
+		range.setEnd(endContainer, endOffset);
 	},
 
-	moveRangeBoundaryOutOf = ( range, nodeName, root ) => {
-		let parent = getClosest( range.endContainer, root, 'A' );
-		if ( parent ) {
+	moveRangeBoundaryOutOf = (range, nodeName, root) => {
+		let parent = getClosest(range.endContainer, root, 'A');
+		if (parent) {
 			let clone = range.cloneRange();
 			parent = parent.parentNode;
-			moveRangeBoundariesUpTree( clone, parent, parent, root );
-			if ( clone.endContainer === parent ) {
-				range.setStart( clone.endContainer, clone.endOffset );
-				range.setEnd( clone.endContainer, clone.endOffset );
+			moveRangeBoundariesUpTree(clone, parent, parent, root);
+			if (clone.endContainer === parent) {
+				range.setStart(clone.endContainer, clone.endOffset);
+				range.setEnd(clone.endContainer, clone.endOffset);
 			}
 		}
 		return range;
@@ -950,56 +907,56 @@ const
 
 	// Returns the first block at least partially contained by the range,
 	// or null if no block is contained by the range.
-	getStartBlockOfRange = ( range, root ) => {
+	getStartBlockOfRange = (range, root) => {
 		let container = range.startContainer,
 			block;
 
 		// If inline, get the containing block.
-		if ( isInline( container ) ) {
-			block = getPreviousBlock( container, root );
-		} else if ( container !== root && isBlock( container ) ) {
+		if (isInline(container)) {
+			block = getPreviousBlock(container, root);
+		} else if (container !== root && isBlock(container)) {
 			block = container;
 		} else {
-			block = getNextBlock( getNodeBefore( container, range.startOffset ), root );
+			block = getNextBlock(getNodeBefore(container, range.startOffset), root);
 		}
 		// Check the block actually intersects the range
-		return block && isNodeContainedInRange( range, block ) ? block : null;
+		return block && isNodeContainedInRange(range, block) ? block : null;
 	},
 
 	// Returns the last block at least partially contained by the range,
 	// or null if no block is contained by the range.
-	getEndBlockOfRange = ( range, root ) => {
+	getEndBlockOfRange = (range, root) => {
 		let container = range.endContainer,
 			block, child;
 
 		// If inline, get the containing block.
-		if ( isInline( container ) ) {
-			block = getPreviousBlock( container, root );
-		} else if ( container !== root && isBlock( container ) ) {
+		if (isInline(container)) {
+			block = getPreviousBlock(container, root);
+		} else if (container !== root && isBlock(container)) {
 			block = container;
 		} else {
-			block = getNodeAfter( container, range.endOffset );
-			if ( !block || !root.contains( block ) ) {
+			block = getNodeAfter(container, range.endOffset);
+			if (!block || !root.contains(block)) {
 				block = root;
-				while ( child = block.lastChild ) {
+				while (child = block.lastChild) {
 					block = child;
 				}
 			}
-			block = getPreviousBlock( block, root );
+			block = getPreviousBlock(block, root);
 		}
 		// Check the block actually intersects the range
-		return block && isNodeContainedInRange( range, block ) ? block : null;
+		return block && isNodeContainedInRange(range, block) ? block : null;
 	},
 
-	newContentWalker = root => createTreeWalker( root,
+	newContentWalker = root => createTreeWalker(root,
 		SHOW_ELEMENT_OR_TEXT,
-		node => node.nodeType === TEXT_NODE ? notWS.test( node.data ) : node.nodeName === 'IMG'
+		node => node.nodeType === TEXT_NODE ? notWS.test(node.data) : node.nodeName === 'IMG'
 	),
 
-	rangeDoesStartAtBlockBoundary = ( range, root ) => {
+	rangeDoesStartAtBlockBoundary = (range, root) => {
 		let startContainer = range.startContainer;
 		let startOffset = range.startOffset;
-		let startBlock = getStartBlockOfRange( range, root );
+		let startBlock = getStartBlockOfRange(range, root);
 		let nodeAfterCursor;
 
 		if (!startBlock) {
@@ -1007,93 +964,93 @@ const
 		}
 
 		// If in the middle or end of a text node, we're not at the boundary.
-		if ( startContainer.nodeType === TEXT_NODE ) {
-			if ( startOffset ) {
+		if (startContainer.nodeType === TEXT_NODE) {
+			if (startOffset) {
 				return false;
 			}
 			nodeAfterCursor = startContainer;
 		} else {
-			nodeAfterCursor = getNodeAfter( startContainer, startOffset );
-			if ( nodeAfterCursor && !root.contains( nodeAfterCursor ) ) {
+			nodeAfterCursor = getNodeAfter(startContainer, startOffset);
+			if (nodeAfterCursor && !root.contains(nodeAfterCursor)) {
 				nodeAfterCursor = null;
 			}
 			// The cursor was right at the end of the document
-			if ( !nodeAfterCursor ) {
-				nodeAfterCursor = getNodeBefore( startContainer, startOffset );
-				if ( nodeAfterCursor.nodeType === TEXT_NODE &&
-						nodeAfterCursor.length ) {
+			if (!nodeAfterCursor) {
+				nodeAfterCursor = getNodeBefore(startContainer, startOffset);
+				if (nodeAfterCursor.nodeType === TEXT_NODE &&
+						nodeAfterCursor.length) {
 					return false;
 				}
 			}
 		}
 
 		// Otherwise, look for any previous content in the same block.
-		contentWalker = newContentWalker(getStartBlockOfRange( range, root ));
+		contentWalker = newContentWalker(getStartBlockOfRange(range, root));
 		contentWalker.currentNode = nodeAfterCursor;
 
 		return !contentWalker.previousNode();
 	},
 
-	rangeDoesEndAtBlockBoundary = ( range, root ) => {
+	rangeDoesEndAtBlockBoundary = (range, root) => {
 		let endContainer = range.endContainer,
 			endOffset = range.endOffset,
 			length;
 
 		// Otherwise, look for any further content in the same block.
-		contentWalker = newContentWalker(getStartBlockOfRange( range, root ));
+		contentWalker = newContentWalker(getStartBlockOfRange(range, root));
 
 		// If in a text node with content, and not at the end, we're not
 		// at the boundary
-		if ( endContainer.nodeType === TEXT_NODE ) {
+		if (endContainer.nodeType === TEXT_NODE) {
 			length = endContainer.data.length;
-			if ( length && endOffset < length ) {
+			if (length && endOffset < length) {
 				return false;
 			}
 			contentWalker.currentNode = endContainer;
 		} else {
-			contentWalker.currentNode = getNodeBefore( endContainer, endOffset );
+			contentWalker.currentNode = getNodeBefore(endContainer, endOffset);
 		}
 
 		return !contentWalker.nextNode();
 	},
 
-	expandRangeToBlockBoundaries = ( range, root ) => {
-		let start = getStartBlockOfRange( range, root ),
-			end = getEndBlockOfRange( range, root );
+	expandRangeToBlockBoundaries = (range, root) => {
+		let start = getStartBlockOfRange(range, root),
+			end = getEndBlockOfRange(range, root);
 
-		if ( start && end ) {
-			range.setStart( start, 0 );
-			range.setEnd( end, end.childNodes.length );
+		if (start && end) {
+			range.setStart(start, 0);
+			range.setEnd(end, end.childNodes.length);
 //			parent = start.parentNode;
-//			range.setStart( parent, indexOf( parent.childNodes, start ) );
+//			range.setStart(parent, indexOf(parent.childNodes, start));
 //			parent = end.parentNode;
-//			range.setEnd( parent, indexOf( parent.childNodes, end ) + 1 );
+//			range.setEnd(parent, indexOf(parent.childNodes, end) + 1);
 		}
 	},
 
-	didError = error => console.error( error ),
+	didError = error => console.error(error),
 
-	createRange = ( range, startOffset, endContainer, endOffset ) => {
-		if ( range instanceof Range ) {
+	createRange = (range, startOffset, endContainer, endOffset) => {
+		if (range instanceof Range) {
 			return range.cloneRange();
 		}
 		let domRange = doc.createRange();
-		domRange.setStart( range, startOffset );
-		if ( endContainer ) {
-			domRange.setEnd( endContainer, endOffset );
+		domRange.setStart(range, startOffset);
+		if (endContainer) {
+			domRange.setEnd(endContainer, endOffset);
 		} else {
-			domRange.setEnd( range, startOffset );
+			domRange.setEnd(range, startOffset);
 		}
 		return domRange;
 	},
 
-	mapKeyTo = method => ( self, event ) => {
+	mapKeyTo = method => (self, event) => {
 		event.preventDefault();
 		self[ method ]();
 	},
 
-	mapKeyToFormat = ( tag, remove ) => {
-		return ( self, event ) => {
+	mapKeyToFormat = (tag, remove) => {
+		return (self, event) => {
 			event.preventDefault();
 			self.toggleTag(tag, remove);
 		};
@@ -1103,215 +1060,209 @@ const
 	// replace it with a <font> tag (!). If you delete all the text inside a
 	// link in Opera, it won't delete the link. Let's make things consistent. If
 	// you delete all text inside an inline tag, remove the inline tag.
-	afterDelete = ( self, range ) => {
+	afterDelete = (self, range) => {
 		try {
-			if ( !range ) { range = self.getSelection(); }
+			if (!range) { range = self.getSelection(); }
 			let node = range.startContainer,
 				parent;
 			// Climb the tree from the focus point while we are inside an empty
 			// inline element
-			if ( node.nodeType === TEXT_NODE ) {
+			if (node.nodeType === TEXT_NODE) {
 				node = node.parentNode;
 			}
 			parent = node;
-			while ( isInline( parent ) &&
-					( !parent.textContent || parent.textContent === ZWS ) ) {
+			while (isInline(parent) && (!parent.textContent || parent.textContent === ZWS)) {
 				node = parent;
 				parent = node.parentNode;
 			}
 			// If focused in empty inline element
-			if ( node !== parent ) {
+			if (node !== parent) {
 				// Move focus to just before empty inline(s)
-				range.setStart( parent,
-					indexOf( parent.childNodes, node ) );
-				range.collapse( true );
+				range.setStart(parent,
+					indexOf(parent.childNodes, node));
+				range.collapse(true);
 				// Remove empty inline(s)
-				node.remove(  );
+				node.remove();
 				// Fix cursor in block
-				if ( !isBlock( parent ) ) {
-					parent = getPreviousBlock( parent, self._root );
+				if (!isBlock(parent)) {
+					parent = getPreviousBlock(parent, self._root);
 				}
-				fixCursor( parent, self._root );
+				fixCursor(parent, self._root);
 				// Move cursor into text node
-				moveRangeBoundariesDownTree( range );
+				moveRangeBoundariesDownTree(range);
 			}
 			// If you delete the last character in the sole <div> in Chrome,
 			// it removes the div and replaces it with just a <br> inside the
 			// root. Detach the <br>; the _ensureBottomLine call will insert a new
 			// block.
-			if ( node === self._root &&
-					( node = node.firstChild ) && node.nodeName === 'BR' ) {
-				detach( node );
+			if (node === self._root && (node = node.firstChild) && node.nodeName === 'BR') {
+				detach(node);
 			}
 			self._ensureBottomLine();
-			self.setSelection( range );
-			self._updatePath( range, true );
-		} catch ( error ) {
-			didError( error );
+			self.setSelection(range);
+			self._updatePath(range, true);
+		} catch (error) {
+			didError(error);
 		}
 	},
 
-	detachUneditableNode = ( node, root ) => {
+	detachUneditableNode = (node, root) => {
 		let parent;
-		while (( parent = node.parentNode )) {
-			if ( parent === root || parent.isContentEditable ) {
+		while ((parent = node.parentNode)) {
+			if (parent === root || parent.isContentEditable) {
 				break;
 			}
 			node = parent;
 		}
-		detach( node );
+		detach(node);
 	},
 
-	handleEnter = ( self, shiftKey, range ) => {
+	handleEnter = (self, shiftKey, range) => {
 		let root = self._root;
 		let block, parent, node, offset, nodeAfterSplit;
 
 		// Save undo checkpoint and add any links in the preceding section.
 		// Remove any zws so we don't think there's content in an empty
 		// block.
-		self._recordUndoState( range, false );
-		if ( self._config.addLinks ) {
-			addLinks( range.startContainer, root, self );
-		}
+		self._recordUndoState(range, false);
+		self._config.addLinks && addLinks(range.startContainer, root, self);
 		self._removeZWS();
-		self._getRangeAndRemoveBookmark( range );
+		self._getRangeAndRemoveBookmark(range);
 
 		// Selected text is overwritten, therefore delete the contents
 		// to collapse selection.
-		if ( !range.collapsed ) {
-			deleteContentsOfRange( range, root );
+		if (!range.collapsed) {
+			deleteContentsOfRange(range, root);
 		}
 
-		block = getStartBlockOfRange( range, root );
+		block = getStartBlockOfRange(range, root);
 
 		// Inside a PRE, insert literal newline, unless on blank line.
-		if ( block && ( parent = getClosest( block, root, 'PRE' ) ) ) {
-			moveRangeBoundariesDownTree( range );
+		if (block && (parent = getClosest(block, root, 'PRE'))) {
+			moveRangeBoundariesDownTree(range);
 			node = range.startContainer;
 			offset = range.startOffset;
-			if ( node.nodeType !== TEXT_NODE ) {
-				node = doc.createTextNode( '' );
-				parent.insertBefore( node, parent.firstChild );
+			if (node.nodeType !== TEXT_NODE) {
+				node = doc.createTextNode('');
+				parent.insertBefore(node, parent.firstChild);
 			}
 			// If blank line: split and insert default block
-			if ( !shiftKey &&
-					( node.data.charAt( offset - 1 ) === '\n' ||
-						rangeDoesStartAtBlockBoundary( range, root ) ) &&
-					( node.data.charAt( offset ) === '\n' ||
-						rangeDoesEndAtBlockBoundary( range, root ) ) ) {
-				node.deleteData( offset && offset - 1, offset ? 2 : 1 );
+			if (!shiftKey &&
+					(node.data.charAt(offset - 1) === '\n' ||
+						rangeDoesStartAtBlockBoundary(range, root)) &&
+					(node.data.charAt(offset) === '\n' ||
+						rangeDoesEndAtBlockBoundary(range, root))) {
+				node.deleteData(offset && offset - 1, offset ? 2 : 1);
 				nodeAfterSplit =
-					split( node, offset && offset - 1, root, root );
+					split(node, offset && offset - 1, root, root);
 				node = nodeAfterSplit.previousSibling;
-				if ( !node.textContent ) {
-					detach( node );
+				if (!node.textContent) {
+					detach(node);
 				}
 				node = self.createDefaultBlock();
-				nodeAfterSplit.before( node );
-				if ( !nodeAfterSplit.textContent ) {
-					detach( nodeAfterSplit );
+				nodeAfterSplit.before(node);
+				if (!nodeAfterSplit.textContent) {
+					detach(nodeAfterSplit);
 				}
-				range.setStart( node, 0 );
+				range.setStart(node, 0);
 			} else {
-				node.insertData( offset, '\n' );
-				fixCursor( parent, root );
+				node.insertData(offset, '\n');
+				fixCursor(parent, root);
 				// Firefox bug: if you set the selection in the text node after
 				// the new line, it draws the cursor before the line break still
 				// but if you set the selection to the equivalent position
 				// in the parent, it works.
-				if ( node.length === offset + 1 ) {
-					range.setStartAfter( node );
+				if (node.length === offset + 1) {
+					range.setStartAfter(node);
 				} else {
-					range.setStart( node, offset + 1 );
+					range.setStart(node, offset + 1);
 				}
 			}
-			range.collapse( true );
-			self.setSelection( range );
-			self._updatePath( range, true );
+			range.collapse(true);
+			self.setSelection(range);
+			self._updatePath(range, true);
 			self._docWasChanged();
 			return;
 		}
 
 		// If this is a malformed bit of document or in a table;
 		// just play it safe and insert a <br>.
-		if ( !block || shiftKey || /^T[HD]$/.test( block.nodeName ) ) {
+		if (!block || shiftKey || /^T[HD]$/.test(block.nodeName)) {
 			// If inside an <a>, move focus out
-			moveRangeBoundaryOutOf( range, 'A', root );
-			insertNodeInRange( range, createElement( 'BR' ) );
-			range.collapse( false );
-			self.setSelection( range );
-			self._updatePath( range, true );
+			moveRangeBoundaryOutOf(range, 'A', root);
+			insertNodeInRange(range, createElement('BR'));
+			range.collapse(false);
+			self.setSelection(range);
+			self._updatePath(range, true);
 			return;
 		}
 
 		// If in a list, we'll split the LI instead.
-		block = getClosest( block, root, 'LI' ) || block;
+		block = getClosest(block, root, 'LI') || block;
 
-		if ( isEmptyBlock( block ) && ( parent = getClosest( block, root, 'UL,OL,BLOCKQUOTE' ) ) ) {
+		if (isEmptyBlock(block) && (parent = getClosest(block, root, 'UL,OL,BLOCKQUOTE'))) {
 			return 'BLOCKQUOTE' === parent.nodeName
 				// Break blockquote
-				? self.modifyBlocks( (/* frag */) => self.createDefaultBlock( createBookmarkNodes( self ) ), range )
+				? self.modifyBlocks((/* frag */) => self.createDefaultBlock(createBookmarkNodes(self)), range)
 				// Break list
-				: self.decreaseListLevel( range );
+				: self.decreaseListLevel(range);
 		}
 
 		// Otherwise, split at cursor point.
-		nodeAfterSplit = splitBlock( self, block,
-			range.startContainer, range.startOffset );
+		nodeAfterSplit = splitBlock(self, block,
+			range.startContainer, range.startOffset);
 
 		// Clean up any empty inlines if we hit enter at the beginning of the block
-		removeZWS( block );
-		removeEmptyInlines( block );
-		fixCursor( block, root );
+		removeZWS(block);
+		removeEmptyInlines(block);
+		fixCursor(block, root);
 
 		// Focus cursor
 		// If there's a <b>/<i> etc. at the beginning of the split
 		// make sure we focus inside it.
-		while ( nodeAfterSplit.nodeType === ELEMENT_NODE ) {
+		while (nodeAfterSplit.nodeType === ELEMENT_NODE) {
 			let child = nodeAfterSplit.firstChild,
 				next;
 
 			// Don't continue links over a block break; unlikely to be the
 			// desired outcome.
-			if ( nodeAfterSplit.nodeName === 'A' &&
-					( !nodeAfterSplit.textContent ||
-						nodeAfterSplit.textContent === ZWS ) ) {
-				child = doc.createTextNode( '' );
-				nodeAfterSplit.replaceWith( child );
+			if (nodeAfterSplit.nodeName === 'A' && (!nodeAfterSplit.textContent || nodeAfterSplit.textContent === ZWS)) {
+				child = doc.createTextNode('');
+				nodeAfterSplit.replaceWith(child);
 				nodeAfterSplit = child;
 				break;
 			}
 
-			while ( child?.nodeType === TEXT_NODE && !child.data ) {
+			while (child?.nodeType === TEXT_NODE && !child.data) {
 				next = child.nextSibling;
-				if ( !next || next.nodeName === 'BR' ) {
+				if (!next || next.nodeName === 'BR') {
 					break;
 				}
-				detach( child );
+				detach(child);
 				child = next;
 			}
 
 			// 'BR's essentially don't count; they're a browser hack.
 			// If you try to select the contents of a 'BR', FF will not let
 			// you type anything!
-			if ( !child || child.nodeName === 'BR' ||
-					child.nodeType === TEXT_NODE ) {
+			if (!child || child.nodeName === 'BR' ||
+					child.nodeType === TEXT_NODE) {
 				break;
 			}
 			nodeAfterSplit = child;
 		}
-		range = createRange( nodeAfterSplit, 0 );
-		self.setSelection( range );
-		self._updatePath( range, true );
+		range = createRange(nodeAfterSplit, 0);
+		self.setSelection(range);
+		self._updatePath(range, true);
 	},
 
 
-	changeIndentationLevel = direction => ( self, event ) => {
+	changeIndentationLevel = direction => (self, event) => {
 		event.preventDefault();
 		self.changeIndentationLevel(direction);
 	},
 
-	toggleList = ( type, methodIfNotInList ) => ( self, event ) => {
+	toggleList = (type, methodIfNotInList) => (self, event) => {
 		event.preventDefault();
 		let parent = self.getSelectionClosest('UL,OL');
 		if (type == parent?.nodeName) {
@@ -1336,41 +1287,41 @@ const
 	styleToSemantic = {
 		fontWeight: {
 			regexp: /^bold|^700/i,
-			replace: () => createElement( 'B' )
+			replace: () => createElement('B')
 		},
 		fontStyle: {
 			regexp: /^italic/i,
-			replace: () => createElement( 'I' )
+			replace: () => createElement('I')
 		},
 		fontFamily: {
 			regexp: notWS,
-			replace: ( doc, family ) => createElement( 'SPAN', {
+			replace: (doc, family) => createElement('SPAN', {
 				style: 'font-family:' + family
 			})
 		},
 		fontSize: {
 			regexp: notWS,
-			replace: ( doc, size ) => createElement( 'SPAN', {
+			replace: (doc, size) => createElement('SPAN', {
 				style: 'font-size:' + size
 			})
 		},
 		textDecoration: {
 			regexp: /^underline/i,
-			replace: () => createElement( 'U' )
+			replace: () => createElement('U')
 		}
 	/*
 		textDecoration: {
 			regexp: /^line-through/i,
-			replace: doc => createElement( 'S' )
+			replace: doc => createElement('S')
 		}
 	*/
 	},
 
 	replaceWithTag = tag => node => {
-		let el = createElement( tag );
-		Array.prototype.forEach.call( node.attributes, attr => el.setAttribute( attr.name, attr.value ) );
-		node.replaceWith( el );
-		el.append( empty( node ) );
+		let el = createElement(tag);
+		Array.prototype.forEach.call(node.attributes, attr => el.setAttribute(attr.name, attr.value));
+		node.replaceWith(el);
+		el.append(empty(node));
 		return el;
 	},
 
@@ -1380,26 +1331,26 @@ const
 
 		Object.entries(styleToSemantic).forEach(([attr,converter])=>{
 			css = style[ attr ];
-			if ( css && converter.regexp.test( css ) ) {
-				el = converter.replace( doc, css );
-				if ( el.nodeName === node.nodeName &&
-						el.className === node.className ) {
+			if (css && converter.regexp.test(css)) {
+				el = converter.replace(doc, css);
+				if (el.nodeName === node.nodeName &&
+						el.className === node.className) {
 					return;
 				}
-				if ( !newTreeTop ) {
+				if (!newTreeTop) {
 					newTreeTop = el;
 				}
-				if ( newTreeBottom ) {
-					newTreeBottom.append( el );
+				if (newTreeBottom) {
+					newTreeBottom.append(el);
 				}
 				newTreeBottom = el;
 				node.style[ attr ] = '';
 			}
 		});
 
-		if ( newTreeTop ) {
-			newTreeBottom.append( empty( node ) );
-			node.append( newTreeTop );
+		if (newTreeTop) {
+			newTreeBottom.append(empty(node));
+			node.append(newTreeTop);
 		}
 
 		return newTreeBottom || node;
@@ -1407,30 +1358,30 @@ const
 
 	stylesRewriters = {
 		SPAN: replaceStyles,
-		STRONG: replaceWithTag( 'B' ),
-		EM: replaceWithTag( 'I' ),
-		INS: replaceWithTag( 'U' ),
-		STRIKE: replaceWithTag( 'S' ),
+		STRONG: replaceWithTag('B'),
+		EM: replaceWithTag('I'),
+		INS: replaceWithTag('U'),
+		STRIKE: replaceWithTag('S'),
 		FONT: node => {
 			let face = node.face,
 				size = node.size,
 				color = node.color,
-				newTag = createElement( 'SPAN' ),
+				newTag = createElement('SPAN'),
 				css = newTag.style;
-			if ( face ) {
+			if (face) {
 				css.fontFamily = face;
 			}
-			if ( size ) {
+			if (size) {
 				css.fontSize = fontSizes[ size ];
 			}
-			if ( color && /^#?([\dA-F]{3}){1,2}$/i.test( color ) ) {
-				if ( color.charAt( 0 ) !== '#' ) {
+			if (color && /^#?([\dA-F]{3}){1,2}$/i.test(color)) {
+				if (color.charAt(0) !== '#') {
 					color = '#' + color;
 				}
 				css.color = color;
 			}
-			node.replaceWith( newTag );
-			newTag.append( empty( node ) );
+			node.replaceWith(newTag);
+			newTag.append(empty(node));
 			return newTag;
 		},
 	//	KBD:
@@ -1438,11 +1389,11 @@ const
 	//	CODE:
 	//	SAMP:
 		TT: node => {
-			let el = createElement( 'SPAN', {
+			let el = createElement('SPAN', {
 				style: 'font-family:menlo,consolas,"courier new",monospace'
 			});
-			node.replaceWith( el );
-			el.append( empty( node ) );
+			node.replaceWith(el);
+			el.append(empty(node));
 			return el;
 		}
 	},
@@ -1458,13 +1409,13 @@ const
 			nodeType = walker.nodeType, // whatToShow?
 			filter = walker.filter,
 			node;
-		while ( current ) {
+		while (current) {
 			node = current.lastChild;
-			while ( !node && current && current !== root) {
+			while (!node && current && current !== root) {
 				node = current.previousSibling;
-				if ( !node ) { current = current.parentNode; }
+				if (!node) { current = current.parentNode; }
 			}
-			if ( node && ( typeToBitArray[ node.nodeType ] & nodeType ) && filter( node ) ) {
+			if (node && (typeToBitArray[ node.nodeType ] & nodeType) && filter(node)) {
 				walker.currentNode = node;
 				return node;
 			}
@@ -1480,88 +1431,83 @@ const
 		   and whitespace nodes.
 		2. Convert inline tags into our preferred format.
 	*/
-	cleanTree = ( node, config, preserveWS ) => {
+	cleanTree = (node, preserveWS) => {
 		let children = node.childNodes,
 			nonInlineParent, i, l, child, nodeName, nodeType, childLength;
 //			startsWithWS, endsWithWS, data, sibling;
 
 		nonInlineParent = node;
-		while ( isInline( nonInlineParent ) ) {
+		while (isInline(nonInlineParent)) {
 			nonInlineParent = nonInlineParent.parentNode;
 		}
-//		let walker = createTreeWalker( nonInlineParent, SHOW_ELEMENT_OR_TEXT );
+//		let walker = createTreeWalker(nonInlineParent, SHOW_ELEMENT_OR_TEXT);
 
-		for ( i = 0, l = children.length; i < l; ++i ) {
+		for (i = 0, l = children.length; i < l; ++i) {
 			child = children[i];
 			nodeName = child.nodeName;
 			nodeType = child.nodeType;
-			if ( nodeType === ELEMENT_NODE ) {
+			if (nodeType === ELEMENT_NODE) {
 				childLength = child.childNodes.length;
-				if ( stylesRewriters[ nodeName ] ) {
-					child = stylesRewriters[ nodeName ]( child );
-				} else if ( blacklist.test( nodeName ) ) {
-					child.remove(  );
+				if (stylesRewriters[ nodeName ]) {
+					child = stylesRewriters[ nodeName ](child);
+				} else if (blacklist.test(nodeName)) {
+					child.remove();
 					--i;
 					--l;
 					continue;
-				} else if ( !allowedBlock.test( nodeName ) && !isInline( child ) ) {
+				} else if (!allowedBlock.test(nodeName) && !isInline(child)) {
 					--i;
 					l += childLength - 1;
-					child.replaceWith( empty( child ) );
+					child.replaceWith(empty(child));
 					continue;
 				}
-				if ( childLength ) {
-					cleanTree( child, config,
-						preserveWS || ( nodeName === 'PRE' ) );
+				if (childLength) {
+					cleanTree(child, preserveWS || (nodeName === 'PRE'));
 				}
 /*
 			} else {
-				if ( nodeType === TEXT_NODE ) {
+				if (nodeType === TEXT_NODE) {
 					data = child.data;
-					startsWithWS = !notWS.test( data.charAt( 0 ) );
-					endsWithWS = !notWS.test( data.charAt( data.length - 1 ) );
-					if ( preserveWS || ( !startsWithWS && !endsWithWS ) ) {
+					startsWithWS = !notWS.test(data.charAt(0));
+					endsWithWS = !notWS.test(data.charAt(data.length - 1));
+					if (preserveWS || (!startsWithWS && !endsWithWS)) {
 						continue;
 					}
 					// Iterate through the nodes; if we hit some other content
 					// before the start of a new block we don't trim
-					if ( startsWithWS ) {
+					if (startsWithWS) {
 						walker.currentNode = child;
-						while ( sibling = previousPONode(walker) ) {
+						while (sibling = previousPONode(walker)) {
 							nodeName = sibling.nodeName;
-							if ( nodeName === 'IMG' ||
-									( nodeName === '#text' &&
-										notWS.test( sibling.data ) ) ) {
+							if (nodeName === 'IMG' || (nodeName === '#text' && notWS.test(sibling.data))) {
 								break;
 							}
-							if ( !isInline( sibling ) ) {
+							if (!isInline(sibling)) {
 								sibling = null;
 								break;
 							}
 						}
-						data = data.replace( /^[ \r\n]+/g, sibling ? ' ' : '' );
+						data = data.replace(/^[ \r\n]+/g, sibling ? ' ' : '');
 					}
-					if ( endsWithWS ) {
+					if (endsWithWS) {
 						walker.currentNode = child;
-						while ( sibling = walker.nextNode() ) {
-							if ( nodeName === 'IMG' ||
-									( nodeName === '#text' &&
-										notWS.test( sibling.data ) ) ) {
+						while (sibling = walker.nextNode()) {
+							if (nodeName === 'IMG' || (nodeName === '#text' && notWS.test(sibling.data))) {
 								break;
 							}
-							if ( !isInline( sibling ) ) {
+							if (!isInline(sibling)) {
 								sibling = null;
 								break;
 							}
 						}
-						data = data.replace( /[ \r\n]+$/g, sibling ? ' ' : '' );
+						data = data.replace(/[ \r\n]+$/g, sibling ? ' ' : '');
 					}
-					if ( data ) {
+					if (data) {
 						child.data = data;
 						continue;
 					}
 				}
-				child.remove(  );
+				child.remove();
 				--i;
 				--l;
 */
@@ -1576,31 +1522,30 @@ const
 		let children = node.childNodes,
 			l = children.length,
 			child;
-		while ( l-- ) {
+		while (l--) {
 			child = children[l];
-			if ( child.nodeType === ELEMENT_NODE && !isLeaf( child ) ) {
-				removeEmptyInlines( child );
-				if ( !child.firstChild && isInline( child ) ) {
-					child.remove(  );
+			if (child.nodeType === ELEMENT_NODE && !isLeaf(child)) {
+				removeEmptyInlines(child);
+				if (!child.firstChild && isInline(child)) {
+					child.remove();
 				}
-			} else if ( child.nodeType === TEXT_NODE && !child.data ) {
-				child.remove(  );
+			} else if (child.nodeType === TEXT_NODE && !child.data) {
+				child.remove();
 			}
 		}
 	},
 
 	// ---
 
-	notWSTextNode = node => node.nodeType === ELEMENT_NODE ? node.nodeName === 'BR' : notWS.test( node.data ),
-	isLineBreak = ( br, isLBIfEmptyBlock ) => {
+	notWSTextNode = node => node.nodeType === ELEMENT_NODE ? node.nodeName === 'BR' : notWS.test(node.data),
+	isLineBreak = (br, isLBIfEmptyBlock) => {
 		let walker, block = br.parentNode;
-		while ( isInline( block ) ) {
+		while (isInline(block)) {
 			block = block.parentNode;
 		}
-		walker = createTreeWalker( block, SHOW_ELEMENT_OR_TEXT, notWSTextNode );
+		walker = createTreeWalker(block, SHOW_ELEMENT_OR_TEXT, notWSTextNode);
 		walker.currentNode = br;
-		return !!walker.nextNode() ||
-			( isLBIfEmptyBlock && !walker.previousNode() );
+		return !!walker.nextNode() || (isLBIfEmptyBlock && !walker.previousNode());
 	},
 
 	// <br> elements are treated specially, and differently depending on the
@@ -1609,23 +1554,23 @@ const
 	// line breaks by wrapping the inline text in a <div>. Browsers that want <br>
 	// elements at the end of each block will then have them added back in a later
 	// fixCursor method call.
-	cleanupBRs = ( node, root, keepForBlankLine ) => {
-		let brs = node.querySelectorAll( 'BR' );
+	cleanupBRs = (node, root, keepForBlankLine) => {
+		let brs = node.querySelectorAll('BR');
 		let l = brs.length;
 		let br, parent;
-		while ( l-- ) {
+		while (l--) {
 			br = brs[l];
 			// Cleanup may have removed it
 			parent = br.parentNode;
-			if ( !parent ) { continue; }
+			if (!parent) { continue; }
 			// If it doesn't break a line, just remove it; it's not doing
 			// anything useful. We'll add it back later if required by the
 			// browser. If it breaks a line, wrap the content in div tags
 			// and replace the brs.
-			if ( !isLineBreak( br, keepForBlankLine ) ) {
-				detach( br );
-			} else if ( !isInline( parent ) ) {
-				fixContainer( parent, root );
+			if (!isLineBreak(br, keepForBlankLine)) {
+				detach(br);
+			} else if (!isInline(parent)) {
+				fixContainer(parent, root);
 			}
 		}
 	},
@@ -1633,40 +1578,39 @@ const
 	// The (non-standard but supported enough) innerText property is based on the
 	// render tree in Firefox and possibly other browsers, so we must insert the
 	// DOM node into the document to ensure the text part is correct.
-	setClipboardData =
-			( event, contents, root ) => {
+	setClipboardData = (event, contents, root) => {
 		let clipboardData = event.clipboardData;
 		let body = doc.body;
-		let node = createElement( 'div' );
+		let node = createElement('div');
 		let html, text;
 
-		node.append( contents );
+		node.append(contents);
 
 		html = node.innerHTML;
 
 		// Firefox will add an extra new line for BRs at the end of block when
 		// calculating innerText, even though they don't actually affect
 		// display, so we need to remove them first.
-		cleanupBRs( node, root, true );
-		node.setAttribute( 'style',
-			'position:fixed;overflow:hidden;bottom:100%;right:100%;' );
-		body.append( node );
-		text = (node.innerText || node.textContent).replace( NBSP, ' ' ); // Replace nbsp with regular space
-		node.remove(  );
+		cleanupBRs(node, root, true);
+		node.setAttribute('style',
+			'position:fixed;overflow:hidden;bottom:100%;right:100%;');
+		body.append(node);
+		text = (node.innerText || node.textContent).replace(NBSP, ' '); // Replace nbsp with regular space
+		node.remove();
 
-		if ( text !== html ) {
-			clipboardData.setData( 'text/html', html );
+		if (text !== html) {
+			clipboardData.setData('text/html', html);
 		}
-		clipboardData.setData( 'text/plain', text );
+		clipboardData.setData('text/plain', text);
 		event.preventDefault();
 	},
 
-	mergeObjects = ( base, extras, mayOverride ) => {
+	mergeObjects = (base, extras, mayOverride) => {
 		base = base || {};
 		extras && Object.entries(extras).forEach(([prop,value])=>{
-			if ( mayOverride || !( prop in base ) ) {
-				base[ prop ] = ( value?.constructor === Object ) ?
-					mergeObjects( base[ prop ], value, mayOverride ) :
+			if (mayOverride || !(prop in base)) {
+				base[ prop ] = (value?.constructor === Object) ?
+					mergeObjects(base[ prop ], value, mayOverride) :
 					value;
 			}
 		});
@@ -1690,22 +1634,21 @@ const
 	// contained ZWS space then remove it too. We may want to keep one ZWS node at
 	// the bottom of the tree so the block can be selected. Define that node as the
 	// keepNode.
-	removeZWS = ( root, keepNode ) => {
-		let walker = createTreeWalker( root, SHOW_TEXT );
+	removeZWS = (root, keepNode) => {
+		let walker = createTreeWalker(root, SHOW_TEXT);
 		let parent, node, index;
-		while ( node = walker.nextNode() ) {
-			while ( ( index = node.data.indexOf( ZWS ) ) > -1  &&
-					( !keepNode || node.parentNode !== keepNode ) ) {
-				if ( node.length === 1 ) {
+		while (node = walker.nextNode()) {
+			while ((index = node.data.indexOf(ZWS)) > -1  && (!keepNode || node.parentNode !== keepNode)) {
+				if (node.length === 1) {
 					do {
 						parent = node.parentNode;
-						node.remove(  );
+						node.remove();
 						node = parent;
 						walker.currentNode = parent;
-					} while ( isInline( node ) && !getLength( node ) );
+					} while (isInline(node) && !getLength(node));
 					break;
 				} else {
-					node.deleteData( index, 1 );
+					node.deleteData(index, 1);
 				}
 			}
 		}
@@ -1717,11 +1660,11 @@ const
 	endSelectionId = 'squire-selection-end',
 
 	createBookmarkNodes = () => [
-		createElement( 'INPUT', {
+		createElement('INPUT', {
 			id: startSelectionId,
 			type: 'hidden'
 		}),
-		createElement( 'INPUT', {
+		createElement('INPUT', {
 			id: endSelectionId,
 			type: 'hidden'
 		})
@@ -1736,85 +1679,85 @@ const
 		PRE: 'PRE'
 	},
 
-	splitBlock = ( self, block, node, offset ) => {
-		let splitTag = tagAfterSplit[ block.nodeName ] || self._config.blockTag,
-			nodeAfterSplit = split( node, offset, block.parentNode, self._root );
+	splitBlock = (self, block, node, offset) => {
+		let splitTag = tagAfterSplit[ block.nodeName ] || blockTag,
+			nodeAfterSplit = split(node, offset, block.parentNode, self._root);
 
 		// Make sure the new node is the correct type.
-		if ( !hasTagAttributes( nodeAfterSplit, splitTag ) ) {
-			block = createElement( splitTag );
-			if ( nodeAfterSplit.dir ) {
+		if (!hasTagAttributes(nodeAfterSplit, splitTag)) {
+			block = createElement(splitTag);
+			if (nodeAfterSplit.dir) {
 				block.dir = nodeAfterSplit.dir;
 			}
-			nodeAfterSplit.replaceWith( block );
-			block.append( empty( nodeAfterSplit ) );
+			nodeAfterSplit.replaceWith(block);
+			block.append(empty(nodeAfterSplit));
 			nodeAfterSplit = block;
 		}
 		return nodeAfterSplit;
 	},
 
-	getListSelection = ( range, root ) => {
+	getListSelection = (range, root) => {
 		// Get start+end li in single common ancestor
 		let list = range.commonAncestorContainer;
 		let startLi = range.startContainer;
 		let endLi = range.endContainer;
-		while ( list && list !== root && !/^[OU]L$/.test( list.nodeName ) ) {
+		while (list && list !== root && !/^[OU]L$/.test(list.nodeName)) {
 			list = list.parentNode;
 		}
-		if ( !list || list === root ) {
+		if (!list || list === root) {
 			return null;
 		}
-		if ( startLi === list ) {
+		if (startLi === list) {
 			startLi = startLi.childNodes[ range.startOffset ];
 		}
-		if ( endLi === list ) {
+		if (endLi === list) {
 			endLi = endLi.childNodes[ range.endOffset ];
 		}
-		while ( startLi && startLi.parentNode !== list ) {
+		while (startLi && startLi.parentNode !== list) {
 			startLi = startLi.parentNode;
 		}
-		while ( endLi && endLi.parentNode !== list ) {
+		while (endLi && endLi.parentNode !== list) {
 			endLi = endLi.parentNode;
 		}
 		return [ list, startLi, endLi ];
 	},
 
-	makeList = ( self, frag, type ) => {
-		let walker = getBlockWalker( frag, self._root ),
+	makeList = (self, frag, type) => {
+		let walker = getBlockWalker(frag, self._root),
 			node, tag, prev, newLi;
 
-		while ( node = walker.nextNode() ) {
-			if ( node.parentNode.nodeName === 'LI' ) {
+		while (node = walker.nextNode()) {
+			if (node.parentNode.nodeName === 'LI') {
 				node = node.parentNode;
 				walker.currentNode = node.lastChild;
 			}
-			if ( node.nodeName !== 'LI' ) {
-				newLi = createElement( 'LI' );
-				if ( node.dir ) {
+			if (node.nodeName !== 'LI') {
+				newLi = createElement('LI');
+				if (node.dir) {
 					newLi.dir = node.dir;
 				}
 
 				// Have we replaced the previous block with a new <ul>/<ol>?
-				if ( ( prev = node.previousSibling ) && prev.nodeName === type ) {
-					prev.append( newLi );
-					detach( node );
+				if ((prev = node.previousSibling) && prev.nodeName === type) {
+					prev.append(newLi);
+					detach(node);
 				}
 				// Otherwise, replace this block with the <ul>/<ol>
 				else {
 					node.replaceWith(
-						createElement( type, null, [
+						createElement(type, null, [
 							newLi
 						])
 					);
 				}
-				newLi.append( empty( node ) );
+				newLi.append(empty(node));
 				walker.currentNode = newLi;
 			} else {
 				node = node.parentNode;
 				tag = node.nodeName;
-				if ( tag !== type && ( /^[OU]L$/.test( tag ) ) ) {
+				if (tag !== type && (/^[OU]L$/.test(tag))) {
 					node.replaceWith(
-						createElement( type, null, [ empty( node ) ] )
+						createElement(type, null, [ empty(node) ])
 					);
 				}
 			}
@@ -1823,45 +1766,42 @@ const
 		return frag;
 	},
 
-	linkRegExp = /\b(?:((?:(?:ht|f)tps?:\/\/|www\d{0,3}[.]|[a-z0-9][a-z0-9.-]*[.][a-z]{2,}\/)(?:[^\s()<>]+|\([^\s()<>]+\))+(?:[^\s?&`!()[\]{};:'".,<>«»“”‘’]|\([^\s()<>]+\)))|([\w\-.%+]+@(?:[\w-]+\.)+[a-z]{2,}\b(?:[?][^&?\s]+=[^\s?&`!()[\]{};:'".,<>«»“”‘’]+(?:&[^&?\s]+=[^\s?&`!()[\]{};:'".,<>«»“”‘’]+)*)?))/i,
+	linkRegExp = /\b(?:((https?:\/\/)?(?:www\d{0,3}\.|[a-z0-9][a-z0-9.-]*\.[a-z]{2,}\/)(?:[^\s()<>]+|\([^\s()<>]+\))+(?:[^\s?&`!()[\]{};:'".,<>«»“”‘’]|\([^\s()<>]+\)))|([\w\-.%+]+@(?:[\w-]+\.)+[a-z]{2,}\b(?:\?[^&?\s]+=[^\s?&`!()[\]{};:'".,<>«»“”‘’]+(?:&[^&?\s]+=[^\s?&`!()[\]{};:'".,<>«»“”‘’]+)*)?))/i,
 
-	addLinks = ( frag, root ) => {
-		let walker = createTreeWalker( frag, SHOW_TEXT, node => !getClosest( node, root, 'A' ) );
+	addLinks = (frag, root) => {
+		let walker = createTreeWalker(frag, SHOW_TEXT, node => !getClosest(node, root, 'A'));
 		let node, data, parent, match, index, endIndex, child;
-		while (( node = walker.nextNode() )) {
+		while ((node = walker.nextNode())) {
 			data = node.data;
 			parent = node.parentNode;
-			while (( match = linkRegExp.exec( data ) )) {
+			while ((match = linkRegExp.exec(data))) {
 				index = match.index;
 				endIndex = index + match[0].length;
-				if ( index ) {
-					child = doc.createTextNode( data.slice( 0, index ) );
-					parent.insertBefore( child, node );
+				if (index) {
+					child = doc.createTextNode(data.slice(0, index));
+					parent.insertBefore(child, node);
 				}
-				child = createElement( 'A', mergeObjects({
-					href: match[1] ?
-						/^(?:ht|f)tps?:/i.test( match[1] ) ?
-							match[1] :
-							'http://' + match[1] :
-						'mailto:' + match[0]
-				}, null, false ));
-				child.textContent = data.slice( index, endIndex );
-				parent.insertBefore( child, node );
-				node.data = data = data.slice( endIndex );
+				child = createElement('A', {
+					href: match[1]
+						? (match[2] ? match[1] : 'https://' + match[1])
+						: 'mailto:' + match[0]
+				}, [data.slice(index, endIndex)]);
+				parent.insertBefore(child, node);
+				node.data = data = data.slice(endIndex);
 			}
 		}
 	},
 
-	escapeHTML = text => text.replace( '&', '&amp;' )
-	   .replace( '<', '&lt;' )
-	   .replace( '>', '&gt;' )
-	   .replace( '"', '&quot;' );
+	escapeHTML = text => text.replace('&', '&amp;')
+	   .replace('<', '&lt;')
+	   .replace('>', '&gt;')
+	   .replace('"', '&quot;');
 
 let contentWalker,
 	nodeCategoryCache = new WeakMap();
 
-function onKey ( event ) {
-	if ( event.defaultPrevented ) {
+function onKey(event) {
+	if (event.defaultPrevented) {
 		return;
 	}
 
@@ -1871,115 +1811,113 @@ function onKey ( event ) {
 
 	// We need to apply the backspace/delete handlers regardless of
 	// control key modifiers.
-	if ( key !== 'backspace' && key !== 'delete' ) {
-		if ( event.altKey  ) { modifiers += 'alt-'; }
-		if ( event[osKey] ) { modifiers += ctrlKey; }
-		if ( event.shiftKey ) { modifiers += 'shift-'; }
+	if (key !== 'backspace' && key !== 'delete') {
+		if (event.altKey) { modifiers += 'alt-'; }
+		if (event[osKey]) { modifiers += ctrlKey; }
+		if (event.shiftKey) { modifiers += 'shift-'; }
 	}
 
 	key = modifiers + key;
 
-	if ( this._keyHandlers[ key ] ) {
-		this._keyHandlers[ key ]( this, event, range );
+	if (this._keyHandlers[ key ]) {
+		this._keyHandlers[ key ](this, event, range);
 	// !event.isComposing stops us from blatting Kana-Kanji conversion in Safari
-	} else if ( !range.collapsed && !event.isComposing &&
-			!event[osKey] &&
-			key.length === 1 ) {
+	} else if (!range.collapsed && !event.isComposing && !event[osKey] && key.length === 1) {
 		// Record undo checkpoint.
-		this.saveUndoState( range );
+		this.saveUndoState(range);
 		// Delete the selection
-		deleteContentsOfRange( range, this._root );
+		deleteContentsOfRange(range, this._root);
 		this._ensureBottomLine();
-		this.setSelection( range );
-		this._updatePath( range, true );
+		this.setSelection(range);
+		this._updatePath(range, true);
 	}
 }
 
-function onCut ( event ) {
+function onCut(event) {
 	let range = this.getSelection();
 	let root = this._root;
 	let self = this;
 	let startBlock, endBlock, copyRoot, contents, parent, newContents;
 
 	// Nothing to do
-	if ( range.collapsed ) {
+	if (range.collapsed) {
 		event.preventDefault();
 		return;
 	}
 
 	// Save undo checkpoint
-	this.saveUndoState( range );
+	this.saveUndoState(range);
 
 	// Edge only seems to support setting plain text as of 2016-03-11.
-	if ( event.clipboardData ) {
+	if (event.clipboardData) {
 		// Clipboard content should include all parents within block, or all
 		// parents up to root if selection across blocks
-		startBlock = getStartBlockOfRange( range, root );
-		endBlock = getEndBlockOfRange( range, root );
-		copyRoot = ( ( startBlock === endBlock ) && startBlock ) || root;
+		startBlock = getStartBlockOfRange(range, root);
+		endBlock = getEndBlockOfRange(range, root);
+		copyRoot = ((startBlock === endBlock) && startBlock) || root;
 		// Extract the contents
-		contents = deleteContentsOfRange( range, root );
+		contents = deleteContentsOfRange(range, root);
 		// Add any other parents not in extracted content, up to copy root
 		parent = range.commonAncestorContainer;
-		if ( parent.nodeType === TEXT_NODE ) {
+		if (parent.nodeType === TEXT_NODE) {
 			parent = parent.parentNode;
 		}
-		while ( parent && parent !== copyRoot ) {
-			newContents = parent.cloneNode( false );
-			newContents.append( contents );
+		while (parent && parent !== copyRoot) {
+			newContents = parent.cloneNode(false);
+			newContents.append(contents);
 			contents = newContents;
 			parent = parent.parentNode;
 		}
 		// Set clipboard data
-		setClipboardData( event, contents, root );
+		setClipboardData(event, contents, root);
 	} else {
-		setTimeout( () => {
+		setTimeout(() => {
 			try {
 				// If all content removed, ensure div at start of root.
 				self._ensureBottomLine();
-			} catch ( error ) {
-				didError( error );
+			} catch (error) {
+				didError(error);
 			}
-		}, 0 );
+		}, 0);
 	}
 
-	this.setSelection( range );
+	this.setSelection(range);
 }
 
-function onCopy ( event ) {
+function onCopy(event) {
 	// Edge only seems to support setting plain text as of 2016-03-11.
-	if ( event.clipboardData ) {
+	if (event.clipboardData) {
 		let range = this.getSelection(), root = this._root,
 			// Clipboard content should include all parents within block, or all
 			// parents up to root if selection across blocks
-			startBlock = getStartBlockOfRange( range, root ),
-			endBlock = getEndBlockOfRange( range, root ),
-			copyRoot = ( ( startBlock === endBlock ) && startBlock ) || root,
+			startBlock = getStartBlockOfRange(range, root),
+			endBlock = getEndBlockOfRange(range, root),
+			copyRoot = ((startBlock === endBlock) && startBlock) || root,
 			contents, parent, newContents;
 		// Clone range to mutate, then move up as high as possible without
 		// passing the copy root node.
 		range = range.cloneRange();
-		moveRangeBoundariesDownTree( range );
-		moveRangeBoundariesUpTree( range, copyRoot, copyRoot, root );
+		moveRangeBoundariesDownTree(range);
+		moveRangeBoundariesUpTree(range, copyRoot, copyRoot, root);
 		// Extract the contents
 		contents = range.cloneContents();
 		// Add any other parents not in extracted content, up to copy root
 		parent = range.commonAncestorContainer;
-		if ( parent.nodeType === TEXT_NODE ) {
+		if (parent.nodeType === TEXT_NODE) {
 			parent = parent.parentNode;
 		}
-		while ( parent && parent !== copyRoot ) {
-			newContents = parent.cloneNode( false );
-			newContents.append( contents );
+		while (parent && parent !== copyRoot) {
+			newContents = parent.cloneNode(false);
+			newContents.append(contents);
 			contents = newContents;
 			parent = parent.parentNode;
 		}
 		// Set clipboard data
-		setClipboardData( event, contents, root );
+		setClipboardData(event, contents, root);
 	}
 }
 
-function onPaste ( event ) {
+function onPaste(event) {
 	let clipboardData = event.clipboardData;
 	let items = clipboardData?.items;
 	let imageItem = null;
@@ -1991,23 +1929,23 @@ function onPaste ( event ) {
 	// Current HTML5 Clipboard interface
 	// ---------------------------------
 	// https://html.spec.whatwg.org/multipage/interaction.html
-	if ( items ) {
+	if (items) {
 		[...items].forEach(item => {
 			type = item.type;
-			if ( type === 'text/html' ) {
+			if (type === 'text/html') {
 				htmlItem = item;
 			// iOS copy URL gives you type text/uri-list which is just a list
 			// of 1 or more URLs separated by new lines. Can just treat as
 			// plain text.
-			} else if ( type === 'text/plain' || type === 'text/uri-list' ) {
+			} else if (type === 'text/plain' || type === 'text/uri-list') {
 				plainItem = item;
-			} else if ( item.kind === 'file' && /^image\/(png|jpeg|webp)/.test( type ) ) {
+			} else if (item.kind === 'file' && /^image\/(png|jpeg|webp)/.test(type)) {
 				imageItem = item;
 			}
 		});
 		if (htmlItem || plainItem || imageItem) {
 			event.preventDefault();
-			if ( imageItem ) {
+			if (imageItem) {
 				let reader = new FileReader();
 				reader.onload = event => {
 					let img = createElement('img', {src: event.target.result}),
@@ -2030,14 +1968,14 @@ function onPaste ( event ) {
 						canvas.width = width;
 						canvas.height = height;
 						ctx.drawImage(img, 0, 0, width, height);
-						self.insertHTML( '<img alt="" style="width:100%;max-width:'+width+'px" src="'+canvas.toDataURL()+'">', true );
+						self.insertHTML('<img alt="" style="width:100%;max-width:'+width+'px" src="'+canvas.toDataURL()+'">', true);
 					};
 				}
 				reader.readAsDataURL(imageItem.getAsFile());
-			} else if ( htmlItem && ( !self.isShiftDown || !plainItem ) ) {
-				htmlItem.getAsString( html => self.insertHTML( html, true ) );
-			} else if ( plainItem ) {
-				plainItem.getAsString( text => self.insertPlainText( text, true ) );
+			} else if (htmlItem && (!self.isShiftDown || !plainItem)) {
+				htmlItem.getAsString(html => self.insertHTML(html, true));
+			} else if (plainItem) {
+				plainItem.getAsString(text => self.insertPlainText(text, true));
 			}
 		}
 	}
@@ -2046,9 +1984,9 @@ function onPaste ( event ) {
 // On Windows you can drag an drop text. We can't handle this ourselves, because
 // as far as I can see, there's no way to get the drop insertion point. So just
 // save an undo state and hope for the best.
-function onDrop ( event ) {
+function onDrop(event) {
 	let types = event.dataTransfer.types;
-	if ( types.includes('text/plain') || types.includes('text/html') ) {
+	if (types.includes('text/plain') || types.includes('text/html')) {
 		this.saveUndoState();
 	}
 }
@@ -2064,129 +2002,129 @@ let keyHandlers = {
 	// let iOS handle the enter key, then after it's done that reset the HTML
 	// to what it was before and handle it properly in Squire; the IME state of
 	// course doesn't reset so you end up in the correct state!
-	enter: isIOS ? ( self, event, range ) => {
-		self._saveRangeToBookmark( range );
+	enter: isIOS ? (self, event, range) => {
+		self._saveRangeToBookmark(range);
 		let html = self._getHTML();
 		let restoreAndDoEnter = () => {
-			self.removeEventListener( 'keyup', restoreAndDoEnter );
-			self._setHTML( html );
+			self.removeEventListener('keyup', restoreAndDoEnter);
+			self._setHTML(html);
 			range = self._getRangeAndRemoveBookmark();
 			// Ignore the shift key on iOS, as this is for auto-capitalisation.
-			handleEnter( self, false, range );
+			handleEnter(self, false, range);
 		};
-		self.addEventListener( 'keyup', restoreAndDoEnter );
-	} : ( self, event, range ) => {
+		self.addEventListener('keyup', restoreAndDoEnter);
+	} : (self, event, range) => {
 		event.preventDefault();
-		handleEnter( self, event.shiftKey, range );
+		handleEnter(self, event.shiftKey, range);
 	},
 
-	'shift-enter': ( self, event, range ) => self._keyHandlers.enter( self, event, range ),
+	'shift-enter': (self, event, range) => self._keyHandlers.enter(self, event, range),
 
-	backspace: ( self, event, range ) => {
+	backspace: (self, event, range) => {
 		let root = self._root;
 		self._removeZWS();
 		// Record undo checkpoint.
-		self.saveUndoState( range );
+		self.saveUndoState(range);
 		// If not collapsed, delete contents
-		if ( !range.collapsed ) {
+		if (!range.collapsed) {
 			event.preventDefault();
-			deleteContentsOfRange( range, root );
-			afterDelete( self, range );
+			deleteContentsOfRange(range, root);
+			afterDelete(self, range);
 		}
 		// If at beginning of block, merge with previous
-		else if ( rangeDoesStartAtBlockBoundary( range, root ) ) {
+		else if (rangeDoesStartAtBlockBoundary(range, root)) {
 			event.preventDefault();
-			let current = getStartBlockOfRange( range, root );
+			let current = getStartBlockOfRange(range, root);
 			let previous;
-			if ( !current ) {
+			if (!current) {
 				return;
 			}
 			// In case inline data has somehow got between blocks.
-			fixContainer( current.parentNode, root );
+			fixContainer(current.parentNode, root);
 			// Now get previous block
-			previous = getPreviousBlock( current, root );
+			previous = getPreviousBlock(current, root);
 			// Must not be at the very beginning of the text area.
-			if ( previous ) {
+			if (previous) {
 				// If not editable, just delete whole block.
-				if ( !previous.isContentEditable ) {
-					detachUneditableNode( previous, root );
+				if (!previous.isContentEditable) {
+					detachUneditableNode(previous, root);
 					return;
 				}
 				// Otherwise merge.
-				mergeWithBlock( previous, current, range, root );
+				mergeWithBlock(previous, current, range, root);
 				// If deleted line between containers, merge newly adjacent
 				// containers.
 				current = previous.parentNode;
-				while ( current !== root && !current.nextSibling ) {
+				while (current !== root && !current.nextSibling) {
 					current = current.parentNode;
 				}
-				if ( current !== root && ( current = current.nextSibling ) ) {
-					mergeContainers( current, root );
+				if (current !== root && (current = current.nextSibling)) {
+					mergeContainers(current, root);
 				}
-				self.setSelection( range );
+				self.setSelection(range);
 			}
 			// If at very beginning of text area, allow backspace
 			// to break lists/blockquote.
-			else if ( current ) {
-				let parent = getClosest( current, root, 'UL,OL,BLOCKQUOTE' );
+			else if (current) {
+				let parent = getClosest(current, root, 'UL,OL,BLOCKQUOTE');
 				if (parent) {
-					return ( 'BLOCKQUOTE' === parent.nodeName )
+					return ('BLOCKQUOTE' === parent.nodeName)
 						// Break blockquote
-						? self.decreaseQuoteLevel( range )
+						? self.decreaseQuoteLevel(range)
 						// Break list
-						: self.decreaseListLevel( range );
+						: self.decreaseListLevel(range);
 				}
-				self.setSelection( range );
-				self._updatePath( range, true );
+				self.setSelection(range);
+				self._updatePath(range, true);
 			}
 		}
 		// Otherwise, leave to browser but check afterwards whether it has
 		// left behind an empty inline tag.
 		else {
-			self.setSelection( range );
-			setTimeout( () => afterDelete( self ), 0 );
+			self.setSelection(range);
+			setTimeout(() => afterDelete(self), 0);
 		}
 	},
-	'delete': ( self, event, range ) => {
+	'delete': (self, event, range) => {
 		let root = self._root;
 		let current, next, originalRange,
 			cursorContainer, cursorOffset, nodeAfterCursor;
 		self._removeZWS();
 		// Record undo checkpoint.
-		self.saveUndoState( range );
+		self.saveUndoState(range);
 		// If not collapsed, delete contents
-		if ( !range.collapsed ) {
+		if (!range.collapsed) {
 			event.preventDefault();
-			deleteContentsOfRange( range, root );
-			afterDelete( self, range );
+			deleteContentsOfRange(range, root);
+			afterDelete(self, range);
 		}
 		// If at end of block, merge next into this block
-		else if ( rangeDoesEndAtBlockBoundary( range, root ) ) {
+		else if (rangeDoesEndAtBlockBoundary(range, root)) {
 			event.preventDefault();
-			if ( current = getStartBlockOfRange( range, root ) ) {
+			if (current = getStartBlockOfRange(range, root)) {
 				// In case inline data has somehow got between blocks.
-				fixContainer( current.parentNode, root );
+				fixContainer(current.parentNode, root);
 				// Now get next block
 				// Must not be at the very end of the text area.
-				if ( next = getNextBlock( current, root ) ) {
+				if (next = getNextBlock(current, root)) {
 					// If not editable, just delete whole block.
-					if ( !next.isContentEditable ) {
-						detachUneditableNode( next, root );
+					if (!next.isContentEditable) {
+						detachUneditableNode(next, root);
 						return;
 					}
 					// Otherwise merge.
-					mergeWithBlock( current, next, range, root );
+					mergeWithBlock(current, next, range, root);
 					// If deleted line between containers, merge newly adjacent
 					// containers.
 					next = current.parentNode;
-					while ( next !== root && !next.nextSibling ) {
+					while (next !== root && !next.nextSibling) {
 						next = next.parentNode;
 					}
-					if ( next !== root && ( next = next.nextSibling ) ) {
-						mergeContainers( next, root );
+					if (next !== root && (next = next.nextSibling)) {
+						mergeContainers(next, root);
 					}
-					self.setSelection( range );
-					self._updatePath( range, true );
+					self.setSelection(range);
+					self._updatePath(range, true);
 				}
 			}
 		}
@@ -2197,89 +2135,86 @@ let keyHandlers = {
 			// delete it ourselves, because the browser won't if it is not
 			// inline.
 			originalRange = range.cloneRange();
-			moveRangeBoundariesUpTree( range, root, root, root );
+			moveRangeBoundariesUpTree(range, root, root, root);
 			cursorContainer = range.endContainer;
 			cursorOffset = range.endOffset;
-			if ( cursorContainer.nodeType === ELEMENT_NODE ) {
+			if (cursorContainer.nodeType === ELEMENT_NODE) {
 				nodeAfterCursor = cursorContainer.childNodes[ cursorOffset ];
-				if ( nodeAfterCursor?.nodeName === 'IMG' ) {
+				if (nodeAfterCursor?.nodeName === 'IMG') {
 					event.preventDefault();
-					detach( nodeAfterCursor );
-					moveRangeBoundariesDownTree( range );
-					afterDelete( self, range );
+					detach(nodeAfterCursor);
+					moveRangeBoundariesDownTree(range);
+					afterDelete(self, range);
 					return;
 				}
 			}
-			self.setSelection( originalRange );
-			setTimeout( () => afterDelete( self ), 0 );
+			self.setSelection(originalRange);
+			setTimeout(() => afterDelete(self), 0);
 		}
 	},
-	tab: ( self, event, range ) => {
+	tab: (self, event, range) => {
 		let root = self._root;
 		let node, parent;
 		self._removeZWS();
 		// If no selection and at start of block
-		if ( range.collapsed && rangeDoesStartAtBlockBoundary( range, root ) ) {
-			node = getStartBlockOfRange( range, root );
+		if (range.collapsed && rangeDoesStartAtBlockBoundary(range, root)) {
+			node = getStartBlockOfRange(range, root);
 			// Iterate through the block's parents
-			while ( ( parent = node.parentNode ) ) {
+			while ((parent = node.parentNode)) {
 				// If we find a UL or OL (so are in a list, node must be an LI)
-				if ( parent.nodeName === 'UL' || parent.nodeName === 'OL' ) {
+				if (parent.nodeName === 'UL' || parent.nodeName === 'OL') {
 					// Then increase the list level
 					event.preventDefault();
-					self.increaseListLevel( range );
+					self.increaseListLevel(range);
 					break;
 				}
 				node = parent;
 			}
 		}
 	},
-	'shift-tab': ( self, event, range ) => {
+	'shift-tab': (self, event, range) => {
 		let root = self._root;
 		let node;
 		self._removeZWS();
 		// If no selection and at start of block
-		if ( range.collapsed && rangeDoesStartAtBlockBoundary( range, root ) ) {
+		if (range.collapsed && rangeDoesStartAtBlockBoundary(range, root)) {
 			// Break list
 			node = range.startContainer;
-			if ( getClosest( node, root, 'UL,OL' ) ) {
+			if (getClosest(node, root, 'UL,OL')) {
 				event.preventDefault();
-				self.decreaseListLevel( range );
+				self.decreaseListLevel(range);
 			}
 		}
 	},
-	space: ( self, _, range ) => {
+	space: (self, _, range) => {
 		let root = self._root;
-		self._recordUndoState( range, false );
-		if ( self._config.addLinks ) {
-			addLinks( range.startContainer, root, self );
-		}
-		self._getRangeAndRemoveBookmark( range );
+		self._recordUndoState(range, false);
+		self._config.addLinks && addLinks(range.startContainer, root, self);
+		self._getRangeAndRemoveBookmark(range);
 /*
 		// If the cursor is at the end of a link (<a>foo|</a>) then move it
 		// outside of the link (<a>foo</a>|) so that the space is not part of
 		// the link text.
 		// SnappyMail: disabled as it fails in Firefox
 		let node = range.endContainer;
-		if ( range.collapsed && range.endOffset === getLength( node ) ) {
+		if (range.collapsed && range.endOffset === getLength(node)) {
 			do {
-				if ( node.nodeName === 'A' ) {
-					range.setStartAfter( node );
+				if (node.nodeName === 'A') {
+					range.setStartAfter(node);
 					break;
 				}
-			} while ( !node.nextSibling &&
-				( node = node.parentNode ) && node !== root );
+			} while (!node.nextSibling && (node = node.parentNode) && node !== root);
 		}
 */
 		// Delete the selection if not collapsed
-		if ( !range.collapsed ) {
-			deleteContentsOfRange( range, root );
+		if (!range.collapsed) {
+			deleteContentsOfRange(range, root);
 			self._ensureBottomLine();
-			self.setSelection( range );
-			self._updatePath( range, true );
+			self.setSelection(range);
+			self._updatePath(range, true);
 		}
 
-		self.setSelection( range );
+		self.setSelection(range);
 	},
 	arrowleft: self => self._removeZWS(),
 	arrowright: self => self._removeZWS()
@@ -2288,34 +2223,34 @@ let keyHandlers = {
 // System standard for page up/down on Mac is to just scroll, not move the
 // cursor. On Linux/Windows, it should move the cursor, but some browsers don't
 // implement this natively. Override to support it.
-function _moveCursorTo( self, toStart ) {
+function _moveCursorTo(self, toStart) {
 	let root = self._root,
-		range = createRange( root, toStart ? 0 : root.childNodes.length );
-	moveRangeBoundariesDownTree( range );
-	self.setSelection( range );
+		range = createRange(root, toStart ? 0 : root.childNodes.length);
+	moveRangeBoundariesDownTree(range);
+	self.setSelection(range);
 	return self;
 }
-if ( !isMac ) {
-	keyHandlers.pageup = self => _moveCursorTo( self, true );
-	keyHandlers.pagedown = self => _moveCursorTo( self, false );
+if (!isMac) {
+	keyHandlers.pageup = self => _moveCursorTo(self, true);
+	keyHandlers.pagedown = self => _moveCursorTo(self, false);
 }
 
-keyHandlers[ ctrlKey + 'b' ] = mapKeyToFormat( 'B' );
-keyHandlers[ ctrlKey + 'i' ] = mapKeyToFormat( 'I' );
-keyHandlers[ ctrlKey + 'u' ] = mapKeyToFormat( 'U' );
-keyHandlers[ ctrlKey + 'shift-7' ] = mapKeyToFormat( 'S' );
-keyHandlers[ ctrlKey + 'shift-5' ] = mapKeyToFormat( 'SUB', 'SUP' );
-keyHandlers[ ctrlKey + 'shift-6' ] = mapKeyToFormat( 'SUP', 'SUB' );
-keyHandlers[ ctrlKey + 'shift-8' ] = toggleList( 'UL', 'makeUnorderedList' );
-keyHandlers[ ctrlKey + 'shift-9' ] = toggleList( 'OL', 'makeOrderedList' );
-keyHandlers[ ctrlKey + '[' ] = changeIndentationLevel( 'decrease' );
-keyHandlers[ ctrlKey + ']' ] = changeIndentationLevel( 'increase' );
-keyHandlers[ ctrlKey + 'd' ] = mapKeyTo( 'toggleCode' );
-keyHandlers[ ctrlKey + 'y' ] = mapKeyTo( 'redo' );
-keyHandlers[ 'redo' ] = mapKeyTo( 'redo' );
-keyHandlers[ ctrlKey + 'z' ] = mapKeyTo( 'undo' );
-keyHandlers[ 'undo' ] = mapKeyTo( 'undo' );
-keyHandlers[ ctrlKey + 'shift-z' ] = mapKeyTo( 'redo' );
+keyHandlers[ ctrlKey + 'b' ] = mapKeyToFormat('B');
+keyHandlers[ ctrlKey + 'i' ] = mapKeyToFormat('I');
+keyHandlers[ ctrlKey + 'u' ] = mapKeyToFormat('U');
+keyHandlers[ ctrlKey + 'shift-7' ] = mapKeyToFormat('S');
+keyHandlers[ ctrlKey + 'shift-5' ] = mapKeyToFormat('SUB', 'SUP');
+keyHandlers[ ctrlKey + 'shift-6' ] = mapKeyToFormat('SUP', 'SUB');
+keyHandlers[ ctrlKey + 'shift-8' ] = toggleList('UL', 'makeUnorderedList');
+keyHandlers[ ctrlKey + 'shift-9' ] = toggleList('OL', 'makeOrderedList');
+keyHandlers[ ctrlKey + '[' ] = changeIndentationLevel('decrease');
+keyHandlers[ ctrlKey + ']' ] = changeIndentationLevel('increase');
+keyHandlers[ ctrlKey + 'd' ] = mapKeyTo('toggleCode');
+keyHandlers[ ctrlKey + 'y' ] = mapKeyTo('redo');
+keyHandlers[ 'redo' ] = mapKeyTo('redo');
+keyHandlers[ ctrlKey + 'z' ] = mapKeyTo('undo');
+keyHandlers[ 'undo' ] = mapKeyTo('undo');
+keyHandlers[ ctrlKey + 'shift-z' ] = mapKeyTo('redo');
 
 class EditStack extends Array
 {
@@ -2334,27 +2269,27 @@ class EditStack extends Array
 		this.length = 0;
 	}
 
-	stateChanged ( /*canUndo, canRedo*/ ) {
-		this.squire.fireEvent( 'undoStateChange', {
+	stateChanged(/*canUndo, canRedo*/) {
+		this.squire.fireEvent('undoStateChange', {
 			canUndo: this.index > 0,
 			canRedo: this.index + 1 < this.length
 		});
-		this.squire.fireEvent( 'input' );
+		this.squire.fireEvent('input');
 	}
 
-	docWasChanged () {
-		if ( this.inUndoState ) {
+	docWasChanged() {
+		if (this.inUndoState) {
 			this.inUndoState = false;
-			this.stateChanged ( /*true, false*/ );
+			this.stateChanged (/*true, false*/);
 		} else
-			this.squire.fireEvent( 'input' );
+			this.squire.fireEvent('input');
 	}
 
 	// Leaves bookmark
-	recordUndoState ( range, replace ) {
+	recordUndoState(range, replace) {
 		replace = replace !== false && this.inUndoState;
 		// Don't record if we're already in an undo state
-		if ( !this.inUndoState || replace ) {
+		if (!this.inUndoState || replace) {
 			// Advance pointer to new position
 			let undoIndex = this.index;
 			let undoThreshold = this.threshold;
@@ -2362,7 +2297,7 @@ class EditStack extends Array
 			let squire = this.squire;
 			let html;
 
-			if ( !replace ) {
+			if (!replace) {
 				++undoIndex;
 			}
 			undoIndex = Math.max(0, undoIndex);
@@ -2371,17 +2306,17 @@ class EditStack extends Array
 			this.length = Math.min(undoIndex + 1, this.length);
 
 			// Get data
-			if ( range ) {
-				squire._saveRangeToBookmark( range );
+			if (range) {
+				squire._saveRangeToBookmark(range);
 			}
 			html = squire._getHTML();
 
 			// If this document is above the configured size threshold,
 			// limit the number of saved undo states.
 			// Threshold is in bytes, JS uses 2 bytes per character
-			if ( undoThreshold > -1 && html.length * 2 > undoThreshold
-			 && undoLimit > -1 && undoIndex > undoLimit ) {
-				this.splice( 0, undoIndex - undoLimit );
+			if (undoThreshold > -1 && html.length * 2 > undoThreshold
+			 && undoLimit > -1 && undoIndex > undoLimit) {
+				this.splice(0, undoIndex - undoLimit);
 			}
 
 			// Save data
@@ -2391,52 +2326,52 @@ class EditStack extends Array
 		}
 	}
 
-	saveUndoState ( range ) {
+	saveUndoState(range) {
 		let squire = this.squire;
-		if ( range === undefined ) {
+		if (range === undefined) {
 			range = squire.getSelection();
 		}
-		this.recordUndoState( range );
-		squire._getRangeAndRemoveBookmark( range );
+		this.recordUndoState(range);
+		squire._getRangeAndRemoveBookmark(range);
 	}
 
-	undo () {
+	undo() {
 		let squire = this.squire,
 			undoIndex = this.index - 1;
 		// Sanity check: must not be at beginning of the history stack
-		if ( undoIndex >= 0 || !this.inUndoState ) {
+		if (undoIndex >= 0 || !this.inUndoState) {
 			// Make sure any changes since last checkpoint are saved.
-			this.recordUndoState( squire.getSelection(), false );
+			this.recordUndoState(squire.getSelection(), false);
 			this.index = undoIndex;
-			squire._setHTML( this[ undoIndex ] );
+			squire._setHTML(this[ undoIndex ]);
 			let range = squire._getRangeAndRemoveBookmark();
-			if ( range ) {
-				squire.setSelection( range );
+			if (range) {
+				squire.setSelection(range);
 			}
 			this.inUndoState = true;
-			this.stateChanged ( /*undoIndex > 0, true*/ );
+			this.stateChanged (/*undoIndex > 0, true*/);
 		}
 	}
 
-	redo () {
+	redo() {
 		// Sanity check: must not be at end of stack and must be in an undo state.
 		let squire = this.squire,
 			undoIndex = this.index + 1;
-		if ( undoIndex < this.length && this.inUndoState ) {
+		if (undoIndex < this.length && this.inUndoState) {
 			this.index = undoIndex;
-			squire._setHTML( this[ undoIndex ] );
+			squire._setHTML(this[ undoIndex ]);
 			let range = squire._getRangeAndRemoveBookmark();
-			if ( range ) {
-				squire.setSelection( range );
+			if (range) {
+				squire.setSelection(range);
 			}
-			this.stateChanged ( /*true, undoIndex + 1 < this.length*/ );
+			this.stateChanged (/*true, undoIndex + 1 < this.length*/);
 		}
 	}
 }
 
 class Squire
 {
-	constructor (root, config) {
+	constructor(root, config) {
 		this._root = root;
 
 		this._events = {};
@@ -2453,11 +2388,11 @@ class Squire
 		let _willUpdatePath;
 		const selectionchange = () => {
 			if (root.contains(doc.activeElement)) {
-				if ( this._isFocused && !_willUpdatePath ) {
-					_willUpdatePath = setTimeout( () => {
+				if (this._isFocused && !_willUpdatePath) {
+					_willUpdatePath = setTimeout(() => {
 						_willUpdatePath = 0;
-						this._updatePath( this.getSelection() );
-					}, 0 );
+						this._updatePath(this.getSelection());
+					}, 0);
 				}
 			} else {
 				this.removeEventListener('selectionchange', selectionchange);
@@ -2469,8 +2404,8 @@ class Squire
 		this._ignoreChange = false;
 		this._ignoreAllChanges = false;
 
-		this._mutation = new MutationObserver( ()=>this._docWasChanged() );
-		this._mutation.observe( root, {
+		this._mutation = new MutationObserver(()=>this._docWasChanged());
+		this._mutation.observe(root, {
 			childList: true,
 			attributes: true,
 			characterData: true,
@@ -2482,128 +2417,110 @@ class Squire
 		// before click, so use mousedown/touchstart
 		this._restoreSelection = false;
 		// https://caniuse.com/mdn-api_document_pointerup_event
-		this.addEventListener( 'blur', () => this._restoreSelection = true )
-			.addEventListener( 'pointerdown mousedown touchstart', () => this._restoreSelection = false )
-			.addEventListener( 'focus', () => this._restoreSelection && this.setSelection( this._lastRange ) )
-			.addEventListener( 'cut', onCut )
-			.addEventListener( 'copy', onCopy )
+		this.addEventListener('blur', () => this._restoreSelection = true)
+			.addEventListener('pointerdown mousedown touchstart', () => this._restoreSelection = false)
+			.addEventListener('focus', () => this._restoreSelection && this.setSelection(this._lastRange))
+			.addEventListener('cut', onCut)
+			.addEventListener('copy', onCopy)
 			// Need to monitor for shift key like this, as event.shiftKey is not available in paste event.
-			.addEventListener( 'keydown keyup', event => this.isShiftDown = event.shiftKey )
-			.addEventListener( 'paste', onPaste )
-			.addEventListener( 'drop', onDrop )
-			.addEventListener( 'keydown', onKey )
-			.addEventListener( 'pointerup keyup mouseup touchend', ()=>this.getSelection() );
+			.addEventListener('keydown keyup', event => this.isShiftDown = event.shiftKey)
+			.addEventListener('paste', onPaste)
+			.addEventListener('drop', onDrop)
+			.addEventListener('keydown', onKey)
+			.addEventListener('pointerup keyup mouseup touchend', ()=>this.getSelection());
 
 		// Add key handlers
-		this._keyHandlers = Object.create( keyHandlers );
+		this._keyHandlers = Object.create(keyHandlers);
 
 		// Override default properties
-		this.setConfig( config );
+		this.setConfig(config);
 
-		root.setAttribute( 'contenteditable', 'true' );
+		root.setAttribute('contenteditable', 'true');
 		// Grammarly breaks the editor, *sigh*
-		root.setAttribute( 'data-gramm', 'false' );
+		root.setAttribute('data-gramm', 'false');
 
 		// Remove Firefox's built-in controls
 		try {
-			doc.execCommand( 'enableObjectResizing', false, 'false' );
-			doc.execCommand( 'enableInlineTableEditing', false, 'false' );
-		} catch ( error ) {}
+			doc.execCommand('enableObjectResizing', false, 'false');
+			doc.execCommand('enableInlineTableEditing', false, 'false');
+		} catch (error) {}
 
 		root.__squire__ = this;
 
 		// Need to register instance before calling setHTML, so that the fixCursor
 		// function can lookup any default block tag options set.
-		this.setHTML( '' );
+		this.setHTML('');
 	}
 
-	setConfig ( config ) {
-		config = mergeObjects({
-			blockTag: 'DIV',
+	setConfig(config) {
+		this._config = mergeObjects({
 			addLinks: true
-		}, config, true );
-
-		if ( typeof config.sanitizeToDOMFragment !== 'function' ) {
-			config.sanitizeToDOMFragment = null;
-		}
-
-		// Users may specify block tag in lower case
-		config.blockTag = config.blockTag.toUpperCase();
-
-		this._config = config;
-
+		}, config, true);
 		return this;
 	}
 
-	createDefaultBlock ( children ) {
-		let config = this._config;
+	createDefaultBlock(children) {
 		return fixCursor(
-			createElement( config.blockTag, null, children ),
+			createElement(blockTag, null, children),
 			this._root
 		);
 	}
 
-	getRoot () {
+	getRoot() {
 		return this._root;
 	}
 
 	// --- Events ---
 
-	fireEvent ( type, event ) {
+	fireEvent(type, event) {
 		let handlers = this._events[ type ];
 		let isFocused, l, obj;
 		// UI code, especially modal views, may be monitoring for focus events and
 		// immediately removing focus. In certain conditions, this can cause the
 		// focus event to fire after the blur event, which can cause an infinite
 		// loop. So we detect whether we're actually focused/blurred before firing.
-		if ( /^(?:focus|blur)/.test( type ) ) {
+		if (/^(?:focus|blur)/.test(type)) {
 			isFocused = this._root === doc.activeElement;
-			if ( type === 'focus' ) {
-				if ( !isFocused || this._isFocused ) {
+			if (type === 'focus') {
+				if (!isFocused || this._isFocused) {
 					return this;
 				}
 				this._isFocused = true;
 			} else {
-				if ( isFocused || !this._isFocused ) {
+				if (isFocused || !this._isFocused) {
 					return this;
 				}
 				this._isFocused = false;
 			}
 		}
-		if ( handlers ) {
-			if ( !event ) {
-				event = {};
-			}
-			if ( event.type !== type ) {
+		if (handlers) {
+			event = event || {};
+			if (event.type !== type) {
 				event.type = type;
 			}
 			// Clone handlers array, so any handlers added/removed do not affect it.
 			handlers = handlers.slice();
 			l = handlers.length;
-			while ( l-- ) {
+			while (l--) {
 				obj = handlers[l];
 				try {
-					if ( obj.handleEvent ) {
-						obj.handleEvent( event );
-					} else {
-						obj.call( this, event );
-					}
-				} catch ( error ) {
+					obj.handleEvent ? obj.handleEvent(event) : obj.call(this, event);
+				} catch (error) {
 					error.details = 'Squire: fireEvent error. Event type: ' + type;
-					didError( error );
+					didError(error);
 				}
 			}
 		}
 		return this;
 	}
 
-	handleEvent ( event ) {
-		this.fireEvent( event.type, event );
+	handleEvent(event) {
+		this.fireEvent(event.type, event);
 	}
 
-	addEventListener ( type, fn ) {
+	addEventListener(type, fn) {
 		type.split(/\s+/).forEach(type=>{
-			if ( !fn ) {
+			if (!fn) {
 				didError({
 					name: 'Squire: addEventListener with null or undefined fn',
 					message: 'Event type: ' + type
@@ -2611,36 +2528,36 @@ class Squire
 				return this;
 			}
 			let handlers = this._events[ type ];
-			if ( !handlers ) {
+			if (!handlers) {
 				handlers = this._events[ type ] = [];
 				customEvents[ type ]
-				|| ( type === 'selectionchange' ? doc : this._root )
-					.addEventListener( type, this, {capture:true,passive:'touchstart'===type} );
+				|| (type === 'selectionchange' ? doc : this._root)
+					.addEventListener(type, this, {capture:true,passive:'touchstart'===type});
 			}
-			handlers.push( fn );
+			handlers.push(fn);
 		});
 		return this;
 	}
 
-	removeEventListener ( type, fn ) {
+	removeEventListener(type, fn) {
 		let handlers = this._events[ type ];
 		let l;
-		if ( handlers ) {
-			if ( fn ) {
+		if (handlers) {
+			if (fn) {
 				l = handlers.length;
-				while ( l-- ) {
-					if ( handlers[l] === fn ) {
-						handlers.splice( l, 1 );
+				while (l--) {
+					if (handlers[l] === fn) {
+						handlers.splice(l, 1);
 					}
 				}
 			} else {
 				handlers.length = 0;
 			}
-			if ( !handlers.length ) {
+			if (!handlers.length) {
 				delete this._events[ type ];
 				customEvents[ type ]
-				|| ( type === 'selectionchange' ? doc : this._root)
-					.removeEventListener( type, this, true );
+				|| (type === 'selectionchange' ? doc : this._root)
+					.removeEventListener(type, this, true);
 			}
 		}
 		return this;
@@ -2648,31 +2565,31 @@ class Squire
 
 	// --- Selection and Path ---
 
-	setSelection ( range ) {
-		if ( range ) {
+	setSelection(range) {
+		if (range) {
 			this._lastRange = range;
 			// If we're setting selection, that automatically, and synchronously, // triggers a focus event. So just store the selection and mark it as
 			// needing restore on focus.
-			if ( this._isFocused ) {
+			if (this._isFocused) {
 				// iOS bug: if you don't focus the iframe before setting the
 				// selection, you can end up in a state where you type but the input
 				// doesn't get directed into the contenteditable area but is instead
 				// lost in a black hole. Very strange.
-				if ( isIOS ) {
+				if (isIOS) {
 					win.focus();
 				}
 				let sel = win.getSelection();
-				if ( sel?.setBaseAndExtent ) {
+				if (sel?.setBaseAndExtent) {
 					sel.setBaseAndExtent(
 						range.startContainer,
 						range.startOffset,
 						range.endContainer,
 						range.endOffset,
 					);
-				} else if ( sel ) {
+				} else if (sel) {
 					// This is just for IE11
 					sel.removeAllRanges();
-					sel.addRange( range );
+					sel.addRange(range);
 				}
 			} else {
 				this._restoreSelection = true;
@@ -2681,43 +2598,43 @@ class Squire
 		return this;
 	}
 
-	getSelection () {
+	getSelection() {
 		let sel = win.getSelection();
 		let root = this._root;
 		let range, startContainer, endContainer;
 		// If not focused, always rely on cached range; another function may
 		// have set it but the DOM is not modified until focus again
-		if ( this._isFocused && sel?.rangeCount ) {
-			range = sel.getRangeAt( 0 ).cloneRange();
+		if (this._isFocused && sel?.rangeCount) {
+			range = sel.getRangeAt(0).cloneRange();
 			startContainer = range.startContainer;
 			endContainer = range.endContainer;
 			// FF can return the range as being inside an <img>. WTF?
-			if ( startContainer && isLeaf( startContainer ) ) {
-				range.setStartBefore( startContainer );
+			if (startContainer && isLeaf(startContainer)) {
+				range.setStartBefore(startContainer);
 			}
-			if ( endContainer && isLeaf( endContainer ) ) {
-				range.setEndBefore( endContainer );
+			if (endContainer && isLeaf(endContainer)) {
+				range.setEndBefore(endContainer);
 			}
 		}
-		if ( range && root.contains( range.commonAncestorContainer ) ) {
+		if (range && root.contains(range.commonAncestorContainer)) {
 			this._lastRange = range;
 		} else {
 			range = this._lastRange;
 			// Check the editor is in the live document; if not, the range has
 			// probably been rewritten by the browser and is bogus
-			if ( !doc.contains( range.commonAncestorContainer ) ) {
+			if (!doc.contains(range.commonAncestorContainer)) {
 				range = null;
 			}
 		}
-		return range || createRange( root.firstChild, 0 );
+		return range || createRange(root.firstChild, 0);
 	}
 
-	getSelectionClosest (selector) {
+	getSelectionClosest(selector) {
 		let range = this.getSelection();
 		return range && getClosest(range.commonAncestorContainer, this._root, selector);
 	}
 
-	getPath () {
+	getPath() {
 		return this._path;
 	}
 
@@ -2727,34 +2644,33 @@ class Squire
 
 	_addZWS () {
 		this._hasZWS = isWebKit;
-		return doc.createTextNode( isWebKit ? ZWS : '' );
+		return doc.createTextNode(isWebKit ? ZWS : '');
 	}
 	_removeZWS () {
-		if ( this._hasZWS ) {
-			removeZWS( this._root );
+		if (this._hasZWS) {
+			removeZWS(this._root);
 			this._hasZWS = false;
 		}
 	}
 
 	// --- Path change events ---
 
-	_updatePath ( range, force ) {
-		if ( range ) {
+	_updatePath (range, force) {
+		if (range) {
 			let anchor = range.startContainer,
 				focus = range.endContainer,
 				newPath;
-			if ( force || anchor !== this._lastAnchorNode ||
-					focus !== this._lastFocusNode ) {
+			if (force || anchor !== this._lastAnchorNode || focus !== this._lastFocusNode) {
 				this._lastAnchorNode = anchor;
 				this._lastFocusNode = focus;
-				newPath = ( anchor && focus ) ? ( anchor === focus ?
-					getPath( focus, this._root, this._config ) : '(selection)' ) : '';
-				if ( this._path !== newPath ) {
+				newPath = (anchor && focus) ? (anchor === focus ?
+					getPath(focus, this._root) : '(selection)') : '';
+				if (this._path !== newPath) {
 					this._path = newPath;
-					this.fireEvent( 'pathChange', { path: newPath } );
+					this.fireEvent('pathChange', { path: newPath });
 				}
 			}
-			this.fireEvent( range.collapsed ? 'cursor' : 'select', {
+			this.fireEvent(range.collapsed ? 'cursor' : 'select', {
 				range: range
 			});
 		}
@@ -2762,29 +2678,28 @@ class Squire
 
 	// --- Focus ---
 
-	focus () {
+	focus() {
 		this._root.focus({ preventScroll: true });
 		return this;
 	}
 
-	blur () {
+	blur() {
 		this._root.blur();
 		return this;
 	}
 
 	// --- Bookmarking ---
 
-	_saveRangeToBookmark ( range ) {
+	_saveRangeToBookmark (range) {
 		let [startNode, endNode] = createBookmarkNodes(this),
 			temp;
 
-		insertNodeInRange( range, startNode );
-		range.collapse( false );
-		insertNodeInRange( range, endNode );
+		insertNodeInRange(range, startNode);
+		range.collapse(false);
+		insertNodeInRange(range, endNode);
 
 		// In a collapsed range, the start is sometimes inserted after the end!
-		if ( startNode.compareDocumentPosition( endNode ) &
-				DOCUMENT_POSITION_PRECEDING ) {
+		if (startNode.compareDocumentPosition(endNode) & DOCUMENT_POSITION_PRECEDING) {
 			startNode.id = endSelectionId;
 			endNode.id = startSelectionId;
 			temp = startNode;
@@ -2792,53 +2707,53 @@ class Squire
 			endNode = temp;
 		}
 
-		range.setStartAfter( startNode );
-		range.setEndBefore( endNode );
+		range.setStartAfter(startNode);
+		range.setEndBefore(endNode);
 	}
 
-	_getRangeAndRemoveBookmark ( range ) {
+	_getRangeAndRemoveBookmark (range) {
 		let root = this._root,
-			start = root.querySelector( '#' + startSelectionId ),
-			end = root.querySelector( '#' + endSelectionId );
+			start = root.querySelector('#' + startSelectionId),
+			end = root.querySelector('#' + endSelectionId);
 
-		if ( start && end ) {
+		if (start && end) {
 			let startContainer = start.parentNode,
 				endContainer = end.parentNode,
-				startOffset = indexOf( startContainer.childNodes, start ),
-				endOffset = indexOf( endContainer.childNodes, end );
+				startOffset = indexOf(startContainer.childNodes, start),
+				endOffset = indexOf(endContainer.childNodes, end);
 
-			if ( startContainer === endContainer ) {
+			if (startContainer === endContainer) {
 				--endOffset;
 			}
 
-			detach( start );
-			detach( end );
+			detach(start);
+			detach(end);
 
-			if ( !range ) {
+			if (!range) {
 				range = doc.createRange();
 			}
-			range.setStart( startContainer, startOffset );
-			range.setEnd( endContainer, endOffset );
+			range.setStart(startContainer, startOffset);
+			range.setEnd(endContainer, endOffset);
 
 			// Merge any text nodes we split
-			mergeInlines( startContainer, range );
-			if ( startContainer !== endContainer ) {
-				mergeInlines( endContainer, range );
+			mergeInlines(startContainer, range);
+			if (startContainer !== endContainer) {
+				mergeInlines(endContainer, range);
 			}
 
 			// If we didn't split a text node, we should move into any adjacent
 			// text node to current selection point
-			if ( range.collapsed ) {
+			if (range.collapsed) {
 				startContainer = range.startContainer;
-				if ( startContainer.nodeType === TEXT_NODE ) {
+				if (startContainer.nodeType === TEXT_NODE) {
 					endContainer = startContainer.childNodes[ range.startOffset ];
-					if ( !endContainer || endContainer.nodeType !== TEXT_NODE ) {
+					if (!endContainer || endContainer.nodeType !== TEXT_NODE) {
 						endContainer =
 							startContainer.childNodes[ range.startOffset - 1 ];
 					}
-					if ( endContainer?.nodeType === TEXT_NODE ) {
-						range.setStart( endContainer, 0 );
-						range.collapse( true );
+					if (endContainer?.nodeType === TEXT_NODE) {
+						range.setStart(endContainer, 0);
+						range.collapse(true);
 					}
 				}
 			}
@@ -2850,8 +2765,8 @@ class Squire
 
 	_docWasChanged () {
 		nodeCategoryCache = new WeakMap();
-		if ( !this._ignoreAllChanges ) {
-			if ( this._ignoreChange ) {
+		if (!this._ignoreAllChanges) {
+			if (this._ignoreChange) {
 				this._ignoreChange = false;
 			} else {
 				this.editStack.docWasChanged();
@@ -2859,19 +2774,19 @@ class Squire
 		}
 	}
 
-	_recordUndoState ( range, replace ) {
-		this.editStack.recordUndoState( range, replace );
+	_recordUndoState (range, replace) {
+		this.editStack.recordUndoState(range, replace);
 	}
 
-	saveUndoState ( range ) {
-		this.editStack.saveUndoState( range );
+	saveUndoState(range) {
+		this.editStack.saveUndoState(range);
 	}
 
-	undo () {
+	undo() {
 		this.editStack.undo();
 	}
 
-	redo () {
+	redo() {
 		this.editStack.redo();
 	}
 
@@ -2879,25 +2794,25 @@ class Squire
 
 	// Looks for matching tag and attributes, so won't work
 	// if <strong> instead of <b> etc.
-	hasFormat ( tag, attributes, range ) {
+	hasFormat(tag, attributes, range) {
 		// 1. Normalise the arguments and get selection
 		tag = tag.toUpperCase();
-		if ( !range && !( range = this.getSelection() ) ) {
+		if (!range && !(range = this.getSelection())) {
 			return false;
 		}
 
 		// Sanitize range to prevent weird IE artifacts
-		if ( !range.collapsed &&
+		if (!range.collapsed &&
 				range.startContainer.nodeType === TEXT_NODE &&
 				range.startOffset === range.startContainer.length &&
-				range.startContainer.nextSibling ) {
-			range.setStartBefore( range.startContainer.nextSibling );
+				range.startContainer.nextSibling) {
+			range.setStartBefore(range.startContainer.nextSibling);
 		}
-		if ( !range.collapsed &&
+		if (!range.collapsed &&
 				range.endContainer.nodeType === TEXT_NODE &&
 				range.endOffset === 0 &&
-				range.endContainer.previousSibling ) {
-			range.setEndAfter( range.endContainer.previousSibling );
+				range.endContainer.previousSibling) {
+			range.setEndAfter(range.endContainer.previousSibling);
 		}
 
 		// If the common ancestor is inside the tag we require, we definitely
@@ -2905,23 +2820,23 @@ class Squire
 		let root = this._root;
 		let common = range.commonAncestorContainer;
 		let walker, node;
-		if ( getNearest( common, root, tag, attributes ) ) {
+		if (getNearest(common, root, tag, attributes)) {
 			return true;
 		}
 
 		// If common ancestor is a text node and doesn't have the format, we
 		// definitely don't have it.
-		if ( common.nodeType === TEXT_NODE ) {
+		if (common.nodeType === TEXT_NODE) {
 			return false;
 		}
 
 		// Otherwise, check each text node at least partially contained within
 		// the selection and make sure all of them have the format we want.
-		walker = createTreeWalker( common, SHOW_TEXT, node => isNodeContainedInRange( range, node ) );
+		walker = createTreeWalker(common, SHOW_TEXT, node => isNodeContainedInRange(range, node));
 
 		let seenNode = false;
-		while ( node = walker.nextNode() ) {
-			if ( !getNearest( node, root, tag, attributes ) ) {
+		while (node = walker.nextNode()) {
+			if (!getNearest(node, root, tag, attributes)) {
 				return false;
 			}
 			seenNode = true;
@@ -2932,7 +2847,7 @@ class Squire
 
 	// Extracts the font-family and font-size (if any) of the element
 	// holding the cursor. If there's a selection, returns an empty object.
-	getFontInfo ( range ) {
+	getFontInfo(range) {
 		let fontInfo = {
 			color: undefined,
 			backgroundColor: undefined,
@@ -2942,31 +2857,30 @@ class Squire
 		let seenAttributes = 0;
 		let element, style, attr;
 
-		if ( !range && !( range = this.getSelection() ) ) {
+		if (!range && !(range = this.getSelection())) {
 			return fontInfo;
 		}
 
 		element = range.commonAncestorContainer;
-		if ( range.collapsed || element.nodeType === TEXT_NODE ) {
-			if ( element.nodeType === TEXT_NODE ) {
+		if (range.collapsed || element.nodeType === TEXT_NODE) {
+			if (element.nodeType === TEXT_NODE) {
 				element = element.parentNode;
 			}
-			while ( seenAttributes < 4 && element ) {
-				if ( style = element.style ) {
-					if ( !fontInfo.color && ( attr = style.color ) ) {
+			while (seenAttributes < 4 && element) {
+				if (style = element.style) {
+					if (!fontInfo.color && (attr = style.color)) {
 						fontInfo.color = attr;
 						++seenAttributes;
 					}
-					if ( !fontInfo.backgroundColor &&
-							( attr = style.backgroundColor ) ) {
+					if (!fontInfo.backgroundColor && (attr = style.backgroundColor)) {
 						fontInfo.backgroundColor = attr;
 						++seenAttributes;
 					}
-					if ( !fontInfo.family && ( attr = style.fontFamily ) ) {
+					if (!fontInfo.family && (attr = style.fontFamily)) {
 						fontInfo.family = attr;
 						++seenAttributes;
 					}
-					if ( !fontInfo.size && ( attr = style.fontSize ) ) {
+					if (!fontInfo.size && (attr = style.fontSize)) {
 						fontInfo.size = attr;
 						++seenAttributes;
 					}
@@ -2977,26 +2891,26 @@ class Squire
 		return fontInfo;
 	}
 
-	_addFormat ( tag, attributes, range ) {
+	_addFormat (tag, attributes, range) {
 		// If the range is collapsed we simply insert the node by wrapping
 		// it round the range and focus it.
 		let root = this._root;
 		let el, walker, startContainer, endContainer, startOffset, endOffset,
 			node, block;
 
-		if ( range.collapsed ) {
-			el = fixCursor( createElement( tag, attributes ), root );
-			insertNodeInRange( range, el );
-			range.setStart( el.firstChild, el.firstChild.length );
-			range.collapse( true );
+		if (range.collapsed) {
+			el = fixCursor(createElement(tag, attributes), root);
+			insertNodeInRange(range, el);
+			range.setStart(el.firstChild, el.firstChild.length);
+			range.collapse(true);
 
 			// Clean up any previous formats that may have been set on this block
 			// that are unused.
 			block = el;
-			while ( isInline( block ) ) {
+			while (isInline(block)) {
 				block = block.parentNode;
 			}
-			removeZWS( block, el );
+			removeZWS(block, el);
 		}
 		// Otherwise we find all the textnodes in the range (splitting
 		// partially selected nodes) and if they're not already formatted
@@ -3016,10 +2930,10 @@ class Squire
 			walker = createTreeWalker(
 				range.commonAncestorContainer,
 				SHOW_ELEMENT_OR_TEXT,
-				node => ( node.nodeType === TEXT_NODE ||
+				node => (node.nodeType === TEXT_NODE ||
 							node.nodeName === 'BR' ||
 							node.nodeName === 'IMG'
-						) && isNodeContainedInRange( range, node )
+						) && isNodeContainedInRange(range, node)
 			);
 
 			// Start at the beginning node of the range and iterate through
@@ -3031,39 +2945,39 @@ class Squire
 
 			// Make sure we start with a valid node.
 			walker.currentNode = startContainer;
-			if ( filterAccept != walker.filter.acceptNode( startContainer ) ) {
+			if (filterAccept != walker.filter.acceptNode(startContainer)) {
 				startContainer = walker.nextNode();
 				startOffset = 0;
 			}
 
 			// If there are interesting nodes in the selection
-			if ( startContainer ) {
+			if (startContainer) {
 				do {
 					node = walker.currentNode;
-					if ( !getNearest( node, root, tag, attributes ) ) {
+					if (!getNearest(node, root, tag, attributes)) {
 						// <br> can never be a container node, so must have a text node
 						// if node == (end|start)Container
-						if ( node === endContainer && node.length > endOffset ) {
-							node.splitText( endOffset );
+						if (node === endContainer && node.length > endOffset) {
+							node.splitText(endOffset);
 						}
-						if ( node === startContainer && startOffset ) {
-							node = node.splitText( startOffset );
-							if ( endContainer === startContainer ) {
+						if (node === startContainer && startOffset) {
+							node = node.splitText(startOffset);
+							if (endContainer === startContainer) {
 								endContainer = node;
 								endOffset -= startOffset;
 							}
 							startContainer = node;
 							startOffset = 0;
 						}
-						el = createElement( tag, attributes );
-						node.replaceWith( el );
-						el.append( node );
+						el = createElement(tag, attributes);
+						node.replaceWith(el);
+						el.append(node);
 					}
-				} while ( walker.nextNode() );
+				} while (walker.nextNode());
 
 				// If we don't finish inside a text node, offset may have changed.
-				if ( endContainer.nodeType !== TEXT_NODE ) {
-					if ( node.nodeType === TEXT_NODE ) {
+				if (endContainer.nodeType !== TEXT_NODE) {
+					if (node.nodeType === TEXT_NODE) {
 						endContainer = node;
 						endOffset = node.length;
 					} else {
@@ -3076,27 +2990,27 @@ class Squire
 
 				// Now set the selection to as it was before
 				range = createRange(
-					startContainer, startOffset, endContainer, endOffset );
+					startContainer, startOffset, endContainer, endOffset);
 			}
 		}
 		return range;
 	}
 
-	_removeFormat ( tag, attributes, range, partial ) {
+	_removeFormat (tag, attributes, range, partial) {
 		// Add bookmark
-		this._saveRangeToBookmark( range );
+		this._saveRangeToBookmark(range);
 
 		// We need a node in the selection to break the surrounding
 		// formatted text.
 		let fixer;
-		if ( range.collapsed ) {
+		if (range.collapsed) {
 			fixer = this._addZWS();
-			insertNodeInRange( range, fixer );
+			insertNodeInRange(range, fixer);
 		}
 
 		// Find block-level ancestor of selection
 		let root = range.commonAncestorContainer;
-		while ( isInline( root ) ) {
+		while (isInline(root)) {
 			root = root.parentNode;
 		}
 
@@ -3107,34 +3021,33 @@ class Squire
 			endContainer = range.endContainer,
 			endOffset = range.endOffset,
 			toWrap = [],
-			examineNode = ( node, exemplar ) => {
+			examineNode = (node, exemplar) => {
 				// If the node is completely contained by the range then
 				// we're going to remove all formatting so ignore it.
-				if ( isNodeContainedInRange( range, node, false ) ) {
+				if (isNodeContainedInRange(range, node, false)) {
 					return;
 				}
 
-				let isText = ( node.nodeType === TEXT_NODE ),
+				let isText = (node.nodeType === TEXT_NODE),
 					child, next;
 
 				// If not at least partially contained, wrap entire contents
 				// in a clone of the tag we're removing and we're done.
-				if ( !isNodeContainedInRange( range, node ) ) {
+				if (!isNodeContainedInRange(range, node)) {
 					// Ignore bookmarks and empty text nodes
-					if ( node.nodeName !== 'INPUT' &&
-							( !isText || node.data ) ) {
+					if (node.nodeName !== 'INPUT' && (!isText || node.data)) {
 						toWrap.push([ exemplar, node ]);
 					}
 					return;
 				}
 
 				// Split any partially selected text nodes.
-				if ( isText ) {
-					if ( node === endContainer && endOffset !== node.length ) {
-						toWrap.push([ exemplar, node.splitText( endOffset ) ]);
+				if (isText) {
+					if (node === endContainer && endOffset !== node.length) {
+						toWrap.push([ exemplar, node.splitText(endOffset) ]);
 					}
-					if ( node === startContainer && startOffset ) {
-						node.splitText( startOffset );
+					if (node === startContainer && startOffset) {
+						node.splitText(startOffset);
 						toWrap.push([ exemplar, node ]);
 					}
 				}
@@ -3142,211 +3055,211 @@ class Squire
 				// Beware, the tree may be rewritten with each call
 				// to examineNode, hence find the next sibling first.
 				else {
-					for ( child = node.firstChild; child; child = next ) {
+					for (child = node.firstChild; child; child = next) {
 						next = child.nextSibling;
-						examineNode( child, exemplar );
+						examineNode(child, exemplar);
 					}
 				}
 			},
 			formatTags = Array.prototype.filter.call(
-				root.getElementsByTagName( tag ),
-				el => isNodeContainedInRange( range, el ) && hasTagAttributes( el, tag, attributes )
+				root.getElementsByTagName(tag),
+				el => isNodeContainedInRange(range, el) && hasTagAttributes(el, tag, attributes)
 			);
 
-		partial || formatTags.forEach( node => examineNode( node, node ) );
+		partial || formatTags.forEach(node => examineNode(node, node));
 
 		// Now wrap unselected nodes in the tag
-		toWrap.forEach( ([exemplar, node]) => {
-			let el = exemplar.cloneNode( false );
-			node.replaceWith( el );
-			el.append( node );
+		toWrap.forEach(([exemplar, node]) => {
+			let el = exemplar.cloneNode(false);
+			node.replaceWith(el);
+			el.append(node);
 		});
 		// and remove old formatting tags.
-		formatTags.forEach( el => el.replaceWith( empty( el ) ) );
+		formatTags.forEach(el => el.replaceWith(empty(el)));
 
 		// Merge adjacent inlines:
-		this._getRangeAndRemoveBookmark( range );
-		fixer && range.collapse( false );
-		mergeInlines( root, range );
+		this._getRangeAndRemoveBookmark(range);
+		fixer && range.collapse(false);
+		mergeInlines(root, range);
 
 		return range;
 	}
 
-	toggleTag ( name, remove ) {
+	toggleTag(name, remove) {
 		let range = this.getSelection();
-		if ( this.hasFormat( name, null, range ) ) {
-			this.changeFormat ( null, { tag: name }, range );
+		if (this.hasFormat(name, null, range)) {
+			this.changeFormat (null, { tag: name }, range);
 		} else {
-			this.changeFormat ( { tag: name }, remove ? { tag: remove } : null, range );
+			this.changeFormat ({ tag: name }, remove ? { tag: remove } : null, range);
 		}
 	}
 
-	changeFormat ( add, remove, range, partial ) {
+	changeFormat(add, remove, range, partial) {
 		// Normalise the arguments and get selection
-		if ( range || ( range = this.getSelection() ) ) {
+		if (range || (range = this.getSelection())) {
 			// Save undo checkpoint
-			this.saveUndoState( range );
+			this.saveUndoState(range);
 
-			if ( remove ) {
-				range = this._removeFormat( remove.tag.toUpperCase(),
-					remove.attributes || {}, range, partial );
+			if (remove) {
+				range = this._removeFormat(remove.tag.toUpperCase(),
+					remove.attributes || {}, range, partial);
 			}
 
-			if ( add ) {
-				range = this._addFormat( add.tag.toUpperCase(),
-					add.attributes || {}, range );
+			if (add) {
+				range = this._addFormat(add.tag.toUpperCase(),
+					add.attributes || {}, range);
 			}
 
-			this.setSelection( range );
-			this._updatePath( range, true );
+			this.setSelection(range);
+			this._updatePath(range, true);
 		}
 		return this;
 	}
 
 	// --- Block formatting ---
 
-	forEachBlock ( fn, range ) {
-		if ( range || ( range = this.getSelection() ) ) {
+	forEachBlock(fn, range) {
+		if (range || (range = this.getSelection())) {
 			// Save undo checkpoint
-			this.saveUndoState( range );
+			this.saveUndoState(range);
 
 			let root = this._root;
-			let start = getStartBlockOfRange( range, root );
-			let end = getEndBlockOfRange( range, root );
-			if ( start && end ) {
+			let start = getStartBlockOfRange(range, root);
+			let end = getEndBlockOfRange(range, root);
+			if (start && end) {
 				do {
-					if ( fn( start ) || start === end ) { break; }
-				} while ( start = getNextBlock( start, root ) );
+					if (fn(start) || start === end) { break; }
+				} while (start = getNextBlock(start, root));
 			}
 
-			this.setSelection( range );
+			this.setSelection(range);
 
 			// Path may have changed
-			this._updatePath( range, true );
+			this._updatePath(range, true);
 		}
 		return this;
 	}
 
-	modifyBlocks ( modify, range ) {
-		if ( range || ( range = this.getSelection() ) ) {
+	modifyBlocks(modify, range) {
+		if (range || (range = this.getSelection())) {
 			// 1. Save undo checkpoint and bookmark selection
-			this._recordUndoState( range );
+			this._recordUndoState(range);
 
 			let root = this._root;
 			let frag;
 
 			// 2. Expand range to block boundaries
-			expandRangeToBlockBoundaries( range, root );
+			expandRangeToBlockBoundaries(range, root);
 
 			// 3. Remove range.
-			moveRangeBoundariesUpTree( range, root, root, root );
-			frag = extractContentsOfRange( range, root, root );
+			moveRangeBoundariesUpTree(range, root, root, root);
+			frag = extractContentsOfRange(range, root, root);
 
 			// 4. Modify tree of fragment and reinsert.
-			insertNodeInRange( range, modify.call( this, frag ) );
+			insertNodeInRange(range, modify.call(this, frag));
 
 			// 5. Merge containers at edges
-			if ( range.endOffset < range.endContainer.childNodes.length ) {
-				mergeContainers( range.endContainer.childNodes[ range.endOffset ], root );
+			if (range.endOffset < range.endContainer.childNodes.length) {
+				mergeContainers(range.endContainer.childNodes[ range.endOffset ], root);
 			}
-			mergeContainers( range.startContainer.childNodes[ range.startOffset ], root );
+			mergeContainers(range.startContainer.childNodes[ range.startOffset ], root);
 
 			// 6. Restore selection
-			this._getRangeAndRemoveBookmark( range );
-			this.setSelection( range );
-			this._updatePath( range, true );
+			this._getRangeAndRemoveBookmark(range);
+			this.setSelection(range);
+			this._updatePath(range, true);
 		}
 		return this;
 	}
 
-	increaseListLevel ( range ) {
-		if ( range || ( range = this.getSelection() ) ) {
+	increaseListLevel(range) {
+		if (range || (range = this.getSelection())) {
 			let root = this._root;
-			let listSelection = getListSelection( range, root );
-			if ( listSelection ) {
+			let listSelection = getListSelection(range, root);
+			if (listSelection) {
 				let list = listSelection[0];
 				let startLi = listSelection[1];
 				let endLi = listSelection[2];
-				if ( startLi && startLi !== list.firstChild ) {
+				if (startLi && startLi !== list.firstChild) {
 					// Save undo checkpoint and bookmark selection
-					this._recordUndoState( range );
+					this._recordUndoState(range);
 
 					// Increase list depth
 					let type = list.nodeName;
 					let newParent = startLi.previousSibling;
 					let next;
-					if ( newParent.nodeName !== type ) {
-						newParent = createElement( type );
-						startLi.before( newParent );
+					if (newParent.nodeName !== type) {
+						newParent = createElement(type);
+						startLi.before(newParent);
 					}
 					do {
 						next = startLi === endLi ? null : startLi.nextSibling;
-						newParent.append( startLi );
-					} while ( ( startLi = next ) );
+						newParent.append(startLi);
+					} while ((startLi = next));
 					next = newParent.nextSibling;
-					next && mergeContainers( next, root );
+					next && mergeContainers(next, root);
 
 					// Restore selection
-					this._getRangeAndRemoveBookmark( range );
-					this.setSelection( range );
-					this._updatePath( range, true );
+					this._getRangeAndRemoveBookmark(range);
+					this.setSelection(range);
+					this._updatePath(range, true);
 				}
 			}
 		}
 		return this.focus();
 	}
 
-	decreaseListLevel ( range ) {
-		if ( range || ( range = this.getSelection() ) ) {
+	decreaseListLevel(range) {
+		if (range || (range = this.getSelection())) {
 			let root = this._root;
-			let listSelection = getListSelection( range, root );
-			if ( listSelection ) {
+			let listSelection = getListSelection(range, root);
+			if (listSelection) {
 				let list = listSelection[0];
 				let startLi = listSelection[1] || list.firstChild;
 				let endLi = listSelection[2] || list.lastChild;
 				let newParent, next, insertBefore, makeNotList;
 
 				// Save undo checkpoint and bookmark selection
-				this._recordUndoState( range );
+				this._recordUndoState(range);
 
-				if ( startLi ) {
+				if (startLi) {
 					// Find the new parent list node
 					newParent = list.parentNode;
 
 					// Split list if necesary
 					insertBefore = !endLi.nextSibling ?
 						list.nextSibling :
-						split( list, endLi.nextSibling, newParent, root );
+						split(list, endLi.nextSibling, newParent, root);
 
-					if ( newParent !== root && newParent.nodeName === 'LI' ) {
+					if (newParent !== root && newParent.nodeName === 'LI') {
 						newParent = newParent.parentNode;
-						while ( insertBefore ) {
+						while (insertBefore) {
 							next = insertBefore.nextSibling;
-							endLi.append( insertBefore );
+							endLi.append(insertBefore);
 							insertBefore = next;
 						}
 						insertBefore = list.parentNode.nextSibling;
 					}
 
-					makeNotList = !/^[OU]L$/.test( newParent.nodeName );
+					makeNotList = !/^[OU]L$/.test(newParent.nodeName);
 					do {
 						next = startLi === endLi ? null : startLi.nextSibling;
-						startLi.remove(  );
-						if ( makeNotList && startLi.nodeName === 'LI' ) {
-							startLi = this.createDefaultBlock([ empty( startLi ) ]);
+						startLi.remove();
+						if (makeNotList && startLi.nodeName === 'LI') {
+							startLi = this.createDefaultBlock([ empty(startLi) ]);
 						}
-						newParent.insertBefore( startLi, insertBefore );
-					} while (( startLi = next ));
+						newParent.insertBefore(startLi, insertBefore);
+					} while ((startLi = next));
 				}
 
-				list.firstChild || detach( list );
+				list.firstChild || detach(list);
 
-				insertBefore && mergeContainers( insertBefore, root );
+				insertBefore && mergeContainers(insertBefore, root);
 
 				// Restore selection
-				this._getRangeAndRemoveBookmark( range );
-				this.setSelection( range );
-				this._updatePath( range, true );
+				this._getRangeAndRemoveBookmark(range);
+				this.setSelection(range);
+				this._updatePath(range, true);
 			}
 		}
 		return this.focus();
@@ -3355,9 +3268,8 @@ class Squire
 	_ensureBottomLine () {
 		let root = this._root;
 		let last = root.lastElementChild;
-		if ( !last ||
-				last.nodeName !== this._config.blockTag || !isBlock( last ) ) {
-			root.append( this.createDefaultBlock() );
+		if (!last || last.nodeName !== blockTag || !isBlock(last)) {
+			root.append(this.createDefaultBlock());
 		}
 	}
 
@@ -3367,292 +3279,224 @@ class Squire
 		return this._root.innerHTML;
 	}
 
-	_setHTML ( html ) {
+	_setHTML (html) {
 		let root = this._root;
 		let node = root;
-		let sanitizeToDOMFragment = this._config.sanitizeToDOMFragment;
-		if ( sanitizeToDOMFragment ) {
-			empty( node );
-			node.appendChild( sanitizeToDOMFragment( html, false, this ) );
-		} else {
-			node.innerHTML = html;
-		}
+		empty(root);
+		root.appendChild(this._config.sanitizeToDOMFragment(html, false));
 		do {
-			fixCursor( node, root );
-		} while ( node = getNextBlock( node, root ) );
+			fixCursor(node, root);
+		} while (node = getNextBlock(node, root));
 		this._ignoreChange = true;
 	}
 
-	getHTML ( withBookMark ) {
+	getHTML(withBookMark) {
 		let html, range;
-		if ( withBookMark && ( range = this.getSelection() ) ) {
-			this._saveRangeToBookmark( range );
+		if (withBookMark && (range = this.getSelection())) {
+			this._saveRangeToBookmark(range);
 		}
-		html = this._getHTML().replace( /\u200B/g, '' );
-		range && this._getRangeAndRemoveBookmark( range );
+		html = this._getHTML().replace(/\u200B/g, '');
+		range && this._getRangeAndRemoveBookmark(range);
 		return html;
 	}
 
-	setHTML ( html ) {
-		let config = this._config;
-		let sanitizeToDOMFragment = config.sanitizeToDOMFragment;
-		let root = this._root;
-		let div, frag, child;
+	setHTML(html) {
+		let root = this._root,
+			// Parse HTML into DOM tree
+			frag = this._config.sanitizeToDOMFragment(html, false),
+			child;
 
-		// Parse HTML into DOM tree
-		if ( sanitizeToDOMFragment ) {
-			frag = sanitizeToDOMFragment( html, false, this );
-		} else {
-			div = createElement( 'DIV' );
-			div.innerHTML = html;
-			frag = doc.createDocumentFragment();
-			frag.append( empty( div ) );
-		}
+		cleanTree(frag);
+		cleanupBRs(frag, root, false);
 
-		cleanTree( frag, config );
-		cleanupBRs( frag, root, false );
-
-		fixContainer( frag, root );
+		fixContainer(frag, root);
 
 		// Fix cursor
-		let node, walker = getBlockWalker( frag, root );
-		while ( (node = walker.nextNode()) && node !== root ) {
-			fixCursor( node, root );
+		let node, walker = getBlockWalker(frag, root);
+		while ((node = walker.nextNode()) && node !== root) {
+			fixCursor(node, root);
 		}
 
 		// Don't fire an input event
 		this._ignoreChange = true;
 
 		// Remove existing root children
-		while ( child = root.lastChild ) {
-			child.remove(  );
+		while (child = root.lastChild) {
+			child.remove();
 		}
 
 		// And insert new content
-		root.append( frag );
-		fixCursor( root, root );
+		root.append(frag);
+		fixCursor(root, root);
 
 		// Reset the undo stack
 		this.editStack.clear();
 
 		// Record undo state
 		let range = this._getRangeAndRemoveBookmark() ||
-			createRange( root.firstChild, 0 );
-		this.saveUndoState( range );
+			createRange(root.firstChild, 0);
+		this.saveUndoState(range);
 		// IE will also set focus when selecting text so don't use
 		// setSelection. Instead, just store it in lastSelection, so if
 		// anything calls getSelection before first focus, we have a range
 		// to return.
 		this._lastRange = range;
 		this._restoreSelection = true;
-		this._updatePath( range, true );
+		this._updatePath(range, true);
 
 		return this;
 	}
 
-	insertElement ( el, range ) {
-		if ( !range ) {
+	insertElement(el, range) {
+		if (!range) {
 			range = this.getSelection();
 		}
-		range.collapse( true );
-		if ( isInline( el ) ) {
-			insertNodeInRange( range, el );
-			range.setStartAfter( el );
+		range.collapse(true);
+		if (isInline(el)) {
+			insertNodeInRange(range, el);
+			range.setStartAfter(el);
 		} else {
 			// Get containing block node.
 			let root = this._root;
-			let splitNode = getStartBlockOfRange( range, root ) || root;
+			let splitNode = getStartBlockOfRange(range, root) || root;
 			let parent, nodeAfterSplit;
 			// While at end of container node, move up DOM tree.
-			while ( splitNode !== root && !splitNode.nextSibling ) {
+			while (splitNode !== root && !splitNode.nextSibling) {
 				splitNode = splitNode.parentNode;
 			}
 			// If in the middle of a container node, split up to root.
-			if ( splitNode !== root ) {
+			if (splitNode !== root) {
 				parent = splitNode.parentNode;
-				nodeAfterSplit = split( parent, splitNode.nextSibling, root, root );
+				nodeAfterSplit = split(parent, splitNode.nextSibling, root, root);
 			}
-			if ( nodeAfterSplit ) {
-				nodeAfterSplit.before( el );
+			if (nodeAfterSplit) {
+				nodeAfterSplit.before(el);
 			} else {
-				root.append( el );
+				root.append(el);
 				// Insert blank line below block.
 				nodeAfterSplit = this.createDefaultBlock();
-				root.append( nodeAfterSplit );
+				root.append(nodeAfterSplit);
 			}
-			range.setStart( nodeAfterSplit, 0 );
-			range.setEnd( nodeAfterSplit, 0 );
-			moveRangeBoundariesDownTree( range );
+			range.setStart(nodeAfterSplit, 0);
+			range.setEnd(nodeAfterSplit, 0);
+			moveRangeBoundariesDownTree(range);
 		}
 		this.focus();
-		this.setSelection( range );
-		this._updatePath( range );
+		this.setSelection(range);
+		this._updatePath(range);
 
 		return this;
 	}
 
-	insertImage ( src, attributes ) {
-		let img = createElement( 'IMG', mergeObjects({
+	insertImage(src, attributes) {
+		let img = createElement('IMG', mergeObjects({
 			src: src
-		}, attributes, true ));
-		this.insertElement( img );
+		}, attributes, true));
+		this.insertElement(img);
 		return img;
 	}
 
 	// Insert HTML at the cursor location. If the selection is not collapsed
 	// insertTreeFragmentIntoRange will delete the selection so that it is replaced
 	// by the html being inserted.
-	insertHTML ( html, isPaste ) {
-		let config = this._config;
-		let sanitizeToDOMFragment = config.sanitizeToDOMFragment;
+	insertHTML(html, isPaste) {
 		let range = this.getSelection();
-		let startFragmentIndex, endFragmentIndex;
-		let div, frag, root, node, event;
 
 		// Edge doesn't just copy the fragment, but includes the surrounding guff
 		// including the full <head> of the page. Need to strip this out.
-		if ( isPaste ) {
-			startFragmentIndex = html.indexOf( '<!--StartFragment-->' );
-			endFragmentIndex = html.lastIndexOf( '<!--EndFragment-->' );
-			if ( startFragmentIndex > -1 && endFragmentIndex > -1 ) {
-				html = html.slice( startFragmentIndex + 20, endFragmentIndex );
+		if (isPaste) {
+			let startFragmentIndex = html.indexOf('<!--StartFragment-->'),
+				endFragmentIndex = html.lastIndexOf('<!--EndFragment-->');
+			if (startFragmentIndex > -1 && endFragmentIndex > -1) {
+				html = html.slice(startFragmentIndex + 20, endFragmentIndex);
 			}
 		}
-		if ( sanitizeToDOMFragment ) {
-			frag = sanitizeToDOMFragment( html, isPaste, this );
-		} else {
-			// Wrap with <tr> if html contains dangling <td> tags
-			if ( /<\/td>((?!<\/tr>)[\s\S])*$/i.test( html ) ) {
-				html = '<TR>' + html + '</TR>';
-			}
-			// Wrap with <table> if html contains dangling <tr> tags
-			if ( /<\/tr>((?!<\/table>)[\s\S])*$/i.test( html ) ) {
-				html = '<TABLE>' + html + '</TABLE>';
-			}
-			// Parse HTML into DOM tree
-			div = createElement( 'DIV' );
-			div.innerHTML = html;
-			frag = doc.createDocumentFragment();
-			frag.append( empty( div ) );
-		}
+
+		let frag = this._config.sanitizeToDOMFragment(html, isPaste);
 
 		// Record undo checkpoint
-		this.saveUndoState( range );
+		this.saveUndoState(range);
 
 		try {
-			root = this._root;
-			node = frag;
-			event = {
-				fragment: frag,
-				preventDefault: function () {
-					this.defaultPrevented = true;
-				},
-				defaultPrevented: false
-			};
+			let root = this._root, node = frag;
 
-			addLinks( frag, frag, this );
-			cleanTree( frag, config );
-			cleanupBRs( frag, root, false );
-			removeEmptyInlines( frag );
+			addLinks(frag, frag, this);
+			cleanTree(frag);
+			cleanupBRs(frag, root, false);
+			removeEmptyInlines(frag);
 			frag.normalize();
 
-			while ( node = getNextBlock( node, frag ) ) {
-				fixCursor( node, root );
+			while (node = getNextBlock(node, frag)) {
+				fixCursor(node, root);
 			}
 
-			isPaste && this.fireEvent( 'willPaste', event );
+			insertTreeFragmentIntoRange(range, frag, root);
+			range.collapse(false);
 
-			if ( !event.defaultPrevented ) {
-				insertTreeFragmentIntoRange( range, event.fragment, root );
-				range.collapse( false );
+			// After inserting the fragment, check whether the cursor is inside
+			// an <a> element and if so if there is an equivalent cursor
+			// position after the <a> element. If there is, move it there.
+			moveRangeBoundaryOutOf(range, 'A', root);
 
-				// After inserting the fragment, check whether the cursor is inside
-				// an <a> element and if so if there is an equivalent cursor
-				// position after the <a> element. If there is, move it there.
-				moveRangeBoundaryOutOf( range, 'A', root );
+			this._ensureBottomLine();
 
-				this._ensureBottomLine();
-			}
-
-			this.setSelection( range );
-			this._updatePath( range, true );
+			this.setSelection(range);
+			this._updatePath(range, true);
 			// Safari sometimes loses focus after paste. Weird.
 			isPaste && this.focus();
-		} catch ( error ) {
-			didError( error );
+		} catch (error) {
+			didError(error);
 		}
 		return this;
 	}
 
-	insertPlainText ( plainText, isPaste ) {
+	insertPlainText(plainText, isPaste) {
 		let range = this.getSelection();
-		if ( range.collapsed &&
-				getClosest( range.startContainer, this._root, 'PRE' ) ) {
+		if (range.collapsed && getClosest(range.startContainer, this._root, 'PRE')) {
 			let node = range.startContainer;
 			let offset = range.startOffset;
-			let text, event;
-			if ( node?.nodeType !== TEXT_NODE ) {
-				text = doc.createTextNode( '' );
-				node?.childNodes[ offset ].before( text );
+			let text;
+			if (node?.nodeType !== TEXT_NODE) {
+				text = doc.createTextNode('');
+				node?.childNodes[ offset ].before(text);
 				node = text;
 				offset = 0;
 			}
-			event = {
-				text: plainText,
-				preventDefault: function () {
-					this.defaultPrevented = true;
-				},
-				defaultPrevented: false
-			};
-			isPaste && this.fireEvent( 'willPaste', event );
 
-			if ( !event.defaultPrevented ) {
-				plainText = event.text;
-				node.insertData( offset, plainText );
-				range.setStart( node, offset + plainText.length );
-				range.collapse( true );
-			}
-			this.setSelection( range );
+			node.insertData(offset, plainText);
+			range.setStart(node, offset + plainText.length);
+			range.collapse(true);
+			this.setSelection(range);
 			return this;
 		}
-		let lines = plainText.split( '\n' );
-		let config = this._config;
-		let tag = config.blockTag;
-		let closeBlock  = '</' + tag + '>';
-		let openBlock = '<' + tag + '>';
-		let i = lines.length, line;
+		let lines = plainText.split(/\r?\n/),
+			closeBlock = '</' + blockTag + '>',
+			openBlock = '<' + blockTag + '>';
 
-		while (i--) {
-			line = escapeHTML( lines[i] ).replace( / (?= )/g, '&nbsp;' );
+		lines.forEach((line, i) => {
+			line = escapeHTML(line).replace(/ (?=(?: |$))/g, NBSP);
 			// We don't wrap the first line in the block, so if it gets inserted
 			// into a blank line it keeps that line's formatting.
 			// Wrap each line in <div></div>
-			if ( i ) {
-				line = openBlock + ( line || '<BR>' ) + closeBlock;
-			}
-			lines[i] = line;
-		}
-		return this.insertHTML( lines.join( '' ), isPaste );
+			lines[i] = i ? openBlock + (line || '<BR>') + closeBlock : line;
+		});
+		return this.insertHTML(lines.join(''), isPaste);
 	}
 
 	// --- Formatting ---
 
-	makeLink ( url, attributes ) {
+	makeLink(url, attributes) {
 		let range = this.getSelection();
-		if ( range.collapsed ) {
-			let protocolEnd = url.indexOf( ':' ) + 1;
-			if ( protocolEnd ) {
-				while ( url[ protocolEnd ] === '/' ) { ++protocolEnd; }
-			}
+		if (range.collapsed) {
 			insertNodeInRange(
 				range,
-				doc.createTextNode( url.slice( protocolEnd ) )
+				doc.createTextNode(url.replace(/^[^:]*:\/*/, ''))
 			);
 		}
 		attributes = mergeObjects(
 			mergeObjects({
 				href: url
-			}, attributes, true ),
+			}, attributes, true),
 			null,
 			false
 		);
@@ -3662,27 +3506,27 @@ class Squire
 			attributes: attributes
 		}, {
 			tag: 'A'
-		}, range );
+		}, range);
 		return this.focus();
 	}
 
-	removeLink () {
-		this.changeFormat( null, {
+	removeLink() {
+		this.changeFormat(null, {
 			tag: 'A'
-		}, this.getSelection(), true );
+		}, this.getSelection(), true);
 		return this.focus();
 	}
 
-	setStyle ( style ) {
+	setStyle(style) {
 		let range = this.getSelection();
 		let start = range?.startContainer || {};
 		let end = range ? range.endContainer : 0;
 		// When the selection is all the text inside an element, set style on the element itself
-		if ( TEXT_NODE === start?.nodeType && 0 === range.startOffset && start === end && end.length === range.endOffset ) {
-			this.saveUndoState( range );
-			setStyle( start.parentNode, style );
-			this.setSelection( range );
-			this._updatePath( range, true );
+		if (TEXT_NODE === start?.nodeType && 0 === range.startOffset && start === end && end.length === range.endOffset) {
+			this.saveUndoState(range);
+			setStyle(start.parentNode, style);
+			this.setSelection(range);
+			this._updatePath(range, true);
 		}
 		// Else create a span element
 		else {
@@ -3698,121 +3542,118 @@ class Squire
 
 	// ---
 
-	code () {
+	code() {
 		let range = this.getSelection();
-		if ( range.collapsed || isContainer( range.commonAncestorContainer ) ) {
-			this.modifyBlocks( frag => {
+		if (range.collapsed || isContainer(range.commonAncestorContainer)) {
+			this.modifyBlocks(frag => {
 				let root = this._root;
 				let output = doc.createDocumentFragment();
-				let walker = getBlockWalker( frag, root );
+				let walker = getBlockWalker(frag, root);
 				let node;
 				// 1. Extract inline content; drop all blocks and contains.
-				while (( node = walker.nextNode() )) {
+				while ((node = walker.nextNode())) {
 					// 2. Replace <br> with \n in content
-					node.querySelectorAll( 'BR' ).forEach( br => {
-						if ( !isLineBreak( br, false ) ) {
-							detach( br );
+					node.querySelectorAll('BR').forEach(br => {
+						if (!isLineBreak(br, false)) {
+							detach(br);
 						} else {
-							br.replaceWith( doc.createTextNode( '\n' ) );
+							br.replaceWith(doc.createTextNode('\n'));
 						}
 					});
 					// 3. Remove <code>; its format clashes with <pre>
-					node.querySelectorAll( 'CODE' ).forEach( el => detach( el ) );
-					if ( output.childNodes.length ) {
-						output.append( doc.createTextNode( '\n' ) );
+					node.querySelectorAll('CODE').forEach(el => detach(el));
+					if (output.childNodes.length) {
+						output.append(doc.createTextNode('\n'));
 					}
-					output.append( empty( node ) );
+					output.append(empty(node));
 				}
 				// 4. Replace nbsp with regular sp
-				walker = createTreeWalker( output, SHOW_TEXT );
-				while (( node = walker.nextNode() )) {
-					node.data = node.data.replace( NBSP, ' ' ); // nbsp -> sp
+				walker = createTreeWalker(output, SHOW_TEXT);
+				while ((node = walker.nextNode())) {
+					node.data = node.data.replace(NBSP, ' '); // nbsp -> sp
 				}
 				output.normalize();
-				return fixCursor( createElement( 'PRE',
+				return fixCursor(createElement('PRE',
 					null, [
 						output
-					]), root );
-			}, range );
+					]), root);
+			}, range);
 		} else {
 			this.changeFormat({
 				tag: 'CODE'
-			}, null, range );
+			}, null, range);
 		}
 		return this.focus();
 	}
 
-	removeCode () {
+	removeCode() {
 		let range = this.getSelection();
 		let ancestor = range.commonAncestorContainer;
-		let inPre = getClosest( ancestor, this._root, 'PRE' );
-		if ( inPre ) {
-			this.modifyBlocks( frag => {
+		let inPre = getClosest(ancestor, this._root, 'PRE');
+		if (inPre) {
+			this.modifyBlocks(frag => {
 				let root = this._root;
-				let pres = frag.querySelectorAll( 'PRE' );
+				let pres = frag.querySelectorAll('PRE');
 				let l = pres.length;
 				let pre, walker, node, value, contents, index;
-				while ( l-- ) {
+				while (l--) {
 					pre = pres[l];
-					walker = createTreeWalker( pre, SHOW_TEXT );
-					while (( node = walker.nextNode() )) {
+					walker = createTreeWalker(pre, SHOW_TEXT);
+					while ((node = walker.nextNode())) {
 						value = node.data;
-						value = value.replace( / (?= )/g, NBSP ); // sp -> nbsp
+						value = value.replace(/ (?=)/g, NBSP); // sp -> nbsp
 						contents = doc.createDocumentFragment();
-						while (( index = value.indexOf( '\n' ) ) > -1 ) {
+						while ((index = value.indexOf('\n')) > -1) {
 							contents.append(
-								doc.createTextNode( value.slice( 0, index ) )
+								doc.createTextNode(value.slice(0, index))
 							);
-							contents.append( createElement( 'BR' ) );
-							value = value.slice( index + 1 );
+							contents.append(createElement('BR'));
+							value = value.slice(index + 1);
 						}
-						node.before( contents );
+						node.before(contents);
 						node.data = value;
 					}
-					fixContainer( pre, root );
-					pre.replaceWith( empty( pre ) );
+					fixContainer(pre, root);
+					pre.replaceWith(empty(pre));
 				}
 				return frag;
-			}, range );
+			}, range);
 		} else {
-			this.changeFormat( null, { tag: 'CODE' }, range );
+			this.changeFormat(null, { tag: 'CODE' }, range);
 		}
 		return this.focus();
 	}
 
-	toggleCode () {
-		if ( this.hasFormat( 'PRE' ) || this.hasFormat( 'CODE' ) ) {
-			this.removeCode();
-		} else {
-			this.code();
-		}
-		return this;
+	toggleCode() {
+		return (this.hasFormat('PRE') || this.hasFormat('CODE'))
+			? this.removeCode()
+			: this.code();
 	}
 
 	// ---
 
-	changeIndentationLevel (direction) {
+	changeIndentationLevel(direction) {
 		let parent = this.getSelectionClosest('UL,OL,BLOCKQUOTE');
 		if (parent || 'increase' === direction) {
-			let method = ( !parent || 'BLOCKQUOTE' === parent.nodeName ) ? 'Quote' : 'List';
+			let method = (!parent || 'BLOCKQUOTE' === parent.nodeName) ? 'Quote' : 'List';
 			this[ direction + method + 'Level' ]();
 		}
 	}
 
-	increaseQuoteLevel ( range ) {
+	increaseQuoteLevel(range) {
 		this.modifyBlocks(
-			frag => createElement( 'BLOCKQUOTE', null, [ frag ]),
+			frag => createElement('BLOCKQUOTE', null, [ frag ]),
 			range
 		);
 		return this.focus();
 	}
 
-	decreaseQuoteLevel ( range ) {
+	decreaseQuoteLevel(range) {
 		this.modifyBlocks(
 			frag => {
-				Array.prototype.filter.call( frag.querySelectorAll( 'blockquote' ), el =>
-					!getClosest( el.parentNode, frag, 'BLOCKQUOTE' )
-				).forEach( el => el.replaceWith( empty( el ) ) );
+				Array.prototype.filter.call(frag.querySelectorAll('blockquote'), el =>
+					!getClosest(el.parentNode, frag, 'BLOCKQUOTE')
+				).forEach(el => el.replaceWith(empty(el)));
 				return frag;
 			},
 			range
@@ -3820,34 +3661,34 @@ class Squire
 		return this.focus();
 	}
 
-	makeUnorderedList () {
-		this.modifyBlocks( frag => makeList( this, frag, 'UL' ) );
+	makeUnorderedList() {
+		this.modifyBlocks(frag => makeList(this, frag, 'UL'));
 		return this.focus();
 	}
 
-	makeOrderedList () {
-		this.modifyBlocks( frag => makeList( this, frag, 'OL' ) );
+	makeOrderedList() {
+		this.modifyBlocks(frag => makeList(this, frag, 'OL'));
 		return this.focus();
 	}
 
-	removeList () {
-		this.modifyBlocks( frag => {
+	removeList() {
+		this.modifyBlocks(frag => {
 			let root = this._root,
 				listFrag;
-			frag.querySelectorAll( 'UL, OL' ).forEach( list => {
-				listFrag = empty( list );
-				fixContainer( listFrag, root );
-				list.replaceWith( listFrag );
+			frag.querySelectorAll('UL, OL').forEach(list => {
+				listFrag = empty(list);
+				fixContainer(listFrag, root);
+				list.replaceWith(listFrag);
 			});
 
-			frag.querySelectorAll( 'LI' ).forEach( item => {
-				if ( isBlock( item ) ) {
+			frag.querySelectorAll('LI').forEach(item => {
+				if (isBlock(item)) {
 					item.replaceWith(
-						this.createDefaultBlock([ empty( item ) ])
+						this.createDefaultBlock([ empty(item) ])
 					);
 				} else {
-					fixContainer( item, root );
-					item.replaceWith( empty( item ) );
+					fixContainer(item, root);
+					item.replaceWith(empty(item));
 				}
 			});
 
@@ -3856,14 +3697,14 @@ class Squire
 		return this.focus();
 	}
 
-	bold () { this.toggleTag( 'B' ); }
-	italic () { this.toggleTag( 'I' ); }
-	underline () { this.toggleTag( 'U' ); }
-	strikethrough () { this.toggleTag( 'S' ); }
-	subscript () { this.toggleTag( 'SUB', 'SUP' ); }
-	superscript () { this.toggleTag( 'SUP', 'SUB' ); }
+	bold() { this.toggleTag('B'); }
+	italic() { this.toggleTag('I'); }
+	underline() { this.toggleTag('U'); }
+	strikethrough() { this.toggleTag('S'); }
+	subscript() { this.toggleTag('SUB', 'SUP'); }
+	superscript() { this.toggleTag('SUP', 'SUB'); }
 }
 
 win.Squire = Squire;
 
-})( document );
+})(document);
diff --git a/yarn.lock b/yarn.lock
deleted file mode 100644
index a479114a6..000000000
--- a/yarn.lock
+++ /dev/null
@@ -1,4645 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@babel/code-frame@7.12.11":
-  version "7.12.11"
-  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz"
-  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
-  dependencies:
-    "@babel/highlight" "^7.10.4"
-
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz"
-  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
-  dependencies:
-    "@babel/highlight" "^7.16.7"
-
-"@babel/generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz"
-  integrity sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==
-  dependencies:
-    "@babel/types" "^7.16.8"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/helper-environment-visitor@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz"
-  integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-function-name@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz"
-  integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-get-function-arity@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz"
-  integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-hoist-variables@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz"
-  integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-split-export-declaration@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz"
-  integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-validator-identifier@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"
-  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
-
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.16.7":
-  version "7.16.10"
-  resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz"
-  integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
-"@babel/parser@^7.16.10", "@babel/parser@^7.16.7", "@babel/parser@^7.7.0":
-  version "7.16.12"
-  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.16.12.tgz"
-  integrity sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==
-
-"@babel/template@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz"
-  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/parser" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/traverse@^7.7.0":
-  version "7.16.10"
-  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.10.tgz"
-  integrity sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.16.8"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.16.10"
-    "@babel/types" "^7.16.8"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.7.0":
-  version "7.16.8"
-  resolved "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz"
-  integrity sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    to-fast-properties "^2.0.0"
-
-"@eslint/eslintrc@^0.4.3":
-  version "0.4.3"
-  resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz"
-  integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
-  dependencies:
-    ajv "^6.12.4"
-    debug "^4.1.1"
-    espree "^7.3.0"
-    globals "^13.9.0"
-    ignore "^4.0.6"
-    import-fresh "^3.2.1"
-    js-yaml "^3.13.1"
-    minimatch "^3.0.4"
-    strip-json-comments "^3.1.1"
-
-"@humanwhocodes/config-array@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz"
-  integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
-  dependencies:
-    "@humanwhocodes/object-schema" "^1.2.0"
-    debug "^4.1.1"
-    minimatch "^3.0.4"
-
-"@humanwhocodes/object-schema@^1.2.0":
-  version "1.2.1"
-  resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"
-  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
-
-"@nodelib/fs.scandir@2.1.5":
-  version "2.1.5"
-  resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"
-  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
-  dependencies:
-    "@nodelib/fs.stat" "2.0.5"
-    run-parallel "^1.1.9"
-
-"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.5"
-  resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"
-  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
-
-"@nodelib/fs.walk@^1.2.3":
-  version "1.2.8"
-  resolved "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"
-  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
-  dependencies:
-    "@nodelib/fs.scandir" "2.1.5"
-    fastq "^1.6.0"
-
-"@rollup/plugin-node-resolve@^13.1.3":
-  version "13.1.3"
-  resolved "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.1.3.tgz"
-  integrity sha512-BdxNk+LtmElRo5d06MGY4zoepyrXX1tkzX2hrnPEZ53k78GuOMWLqmJDGIIOPwVRIFZrLQOo+Yr6KtCuLIA0AQ==
-  dependencies:
-    "@rollup/pluginutils" "^3.1.0"
-    "@types/resolve" "1.17.1"
-    builtin-modules "^3.1.0"
-    deepmerge "^4.2.2"
-    is-module "^1.0.0"
-    resolve "^1.19.0"
-
-"@rollup/plugin-replace@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-3.0.1.tgz"
-  integrity sha512-989J5oRzf3mm0pO/0djTijdfEh9U3n63BIXN5X7T4U9BP+fN4oxQ6DvDuBvFaHA6scaHQRclqmKQEkBhB7k7Hg==
-  dependencies:
-    "@rollup/pluginutils" "^3.1.0"
-    magic-string "^0.25.7"
-
-"@rollup/pluginutils@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz"
-  integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==
-  dependencies:
-    "@types/estree" "0.0.39"
-    estree-walker "^1.0.1"
-    picomatch "^2.2.2"
-
-"@rollup/pluginutils@^4.0.0":
-  version "4.1.2"
-  resolved "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.1.2.tgz"
-  integrity sha512-ROn4qvkxP9SyPeHaf7uQC/GPFY6L/OWy9+bd9AwcjOAWQwxRscoEyAUD8qCY5o5iL4jqQwoLk2kaTKJPb/HwzQ==
-  dependencies:
-    estree-walker "^2.0.1"
-    picomatch "^2.2.2"
-
-"@types/estree@*":
-  version "0.0.50"
-  resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz"
-  integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==
-
-"@types/estree@0.0.39":
-  version "0.0.39"
-  resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz"
-  integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
-
-"@types/expect@^1.20.4":
-  version "1.20.4"
-  resolved "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz"
-  integrity sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==
-
-"@types/minimatch@^3.0.3":
-  version "3.0.5"
-  resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz"
-  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
-
-"@types/node@*", "@types/node@^14.14.41":
-  version "14.18.9"
-  resolved "https://registry.npmjs.org/@types/node/-/node-14.18.9.tgz"
-  integrity sha512-j11XSuRuAlft6vLDEX4RvhqC0KxNxx6QIyMXNb0vHHSNPXTPeiy3algESWmOOIzEtiEL0qiowPU3ewW9hHVa7Q==
-
-"@types/resolve@1.17.1":
-  version "1.17.1"
-  resolved "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz"
-  integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==
-  dependencies:
-    "@types/node" "*"
-
-"@types/vinyl@^2.0.4":
-  version "2.0.6"
-  resolved "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.6.tgz"
-  integrity sha512-ayJ0iOCDNHnKpKTgBG6Q6JOnHTj9zFta+3j2b8Ejza0e4cvRyMn0ZoLEmbPrTHe5YYRlDYPvPWVdV4cTaRyH7g==
-  dependencies:
-    "@types/expect" "^1.20.4"
-    "@types/node" "*"
-
-acorn-jsx@^5.2.0, acorn-jsx@^5.3.1:
-  version "5.3.2"
-  resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
-  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
-
-acorn@^7.1.1, acorn@^7.4.0:
-  version "7.4.1"
-  resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"
-  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-
-aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"
-  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
-  dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^4.0.0"
-
-ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4:
-  version "6.12.6"
-  resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ajv@^8.0.1:
-  version "8.9.0"
-  resolved "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz"
-  integrity sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
-    uri-js "^4.2.2"
-
-ansi-colors@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz"
-  integrity sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==
-  dependencies:
-    ansi-wrap "^0.1.0"
-
-ansi-colors@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
-ansi-escapes@^4.2.1:
-  version "4.3.2"
-  resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz"
-  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
-  dependencies:
-    type-fest "^0.21.3"
-
-ansi-gray@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz"
-  integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
-  dependencies:
-    ansi-wrap "0.1.0"
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
-ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
-
-ansi-regex@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
-  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
-
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-ansi-styles@^4.0.0, ansi-styles@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
-  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
-  dependencies:
-    color-convert "^2.0.1"
-
-ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz"
-  integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
-
-anymatch@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz"
-  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
-  dependencies:
-    micromatch "^3.1.4"
-    normalize-path "^2.1.1"
-
-append-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz"
-  integrity sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=
-  dependencies:
-    buffer-equal "^1.0.0"
-
-archy@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"
-  integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=
-
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
-arr-diff@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"
-  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
-
-arr-filter@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz"
-  integrity sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=
-  dependencies:
-    make-iterator "^1.0.0"
-
-arr-flatten@^1.0.1, arr-flatten@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
-
-arr-map@^2.0.0, arr-map@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz"
-  integrity sha1-Onc0X/wc814qkYJWAfnljy4kysQ=
-  dependencies:
-    make-iterator "^1.0.0"
-
-arr-union@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"
-  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
-
-array-differ@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
-  integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=
-
-array-differ@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz"
-  integrity sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==
-
-array-each@^1.0.0, array-each@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz"
-  integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8=
-
-array-initial@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz"
-  integrity sha1-L6dLJnOTccOUe9enrcc74zSz15U=
-  dependencies:
-    array-slice "^1.0.0"
-    is-number "^4.0.0"
-
-array-last@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz"
-  integrity sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==
-  dependencies:
-    is-number "^4.0.0"
-
-array-slice@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz"
-  integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==
-
-array-sort@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz"
-  integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==
-  dependencies:
-    default-compare "^1.0.0"
-    get-value "^2.0.6"
-    kind-of "^5.0.2"
-
-array-union@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"
-  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
-
-array-uniq@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
-
-array-unique@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz"
-  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
-
-arrify@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz"
-  integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
-
-assign-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"
-  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
-
-astral-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz"
-  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
-
-astral-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz"
-  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
-
-async-done@^1.2.0, async-done@^1.2.2:
-  version "1.3.2"
-  resolved "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz"
-  integrity sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.2"
-    process-nextick-args "^2.0.0"
-    stream-exhaust "^1.0.1"
-
-async-each@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz"
-  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
-
-async-settle@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz"
-  integrity sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=
-  dependencies:
-    async-done "^1.2.2"
-
-async@^3.2.0:
-  version "3.2.3"
-  resolved "https://registry.npmjs.org/async/-/async-3.2.3.tgz"
-  integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==
-
-atob@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz"
-  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
-
-babel-eslint@10.1.0:
-  version "10.1.0"
-  resolved "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz"
-  integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.7.0"
-    "@babel/traverse" "^7.7.0"
-    "@babel/types" "^7.7.0"
-    eslint-visitor-keys "^1.0.0"
-    resolve "^1.12.0"
-
-bach@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz"
-  integrity sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=
-  dependencies:
-    arr-filter "^1.1.1"
-    arr-flatten "^1.0.1"
-    arr-map "^2.0.0"
-    array-each "^1.0.0"
-    array-initial "^1.0.0"
-    array-last "^1.1.1"
-    async-done "^1.2.2"
-    async-settle "^1.0.0"
-    now-and-later "^2.0.0"
-
-balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-base@^0.11.1:
-  version "0.11.2"
-  resolved "https://registry.npmjs.org/base/-/base-0.11.2.tgz"
-  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
-  dependencies:
-    cache-base "^1.0.1"
-    class-utils "^0.3.5"
-    component-emitter "^1.2.1"
-    define-property "^1.0.0"
-    isobject "^3.0.1"
-    mixin-deep "^1.2.0"
-    pascalcase "^0.1.1"
-
-beeper@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz"
-  integrity sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=
-
-binary-extensions@^1.0.0:
-  version "1.13.1"
-  resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz"
-  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
-
-binaryextensions@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/binaryextensions/-/binaryextensions-2.3.0.tgz"
-  integrity sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==
-
-bindings@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
-  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
-  dependencies:
-    file-uri-to-path "1.0.0"
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@^2.3.1, braces@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz"
-  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
-  dependencies:
-    arr-flatten "^1.1.0"
-    array-unique "^0.3.2"
-    extend-shallow "^2.0.1"
-    fill-range "^4.0.0"
-    isobject "^3.0.1"
-    repeat-element "^1.1.2"
-    snapdragon "^0.8.1"
-    snapdragon-node "^2.0.1"
-    split-string "^3.0.2"
-    to-regex "^3.0.1"
-
-braces@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-brotli-size@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/brotli-size/-/brotli-size-4.0.0.tgz"
-  integrity sha512-uA9fOtlTRC0iqKfzff1W34DXUA3GyVqbUaeo3Rw3d4gd1eavKVCETXrn3NzO74W+UVkG3UHu8WxUi+XvKI/huA==
-  dependencies:
-    duplexer "0.1.1"
-
-buffer-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz"
-  integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74=
-
-buffer-from@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"
-  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
-
-builtin-modules@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz"
-  integrity sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==
-
-cache-base@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"
-  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
-  dependencies:
-    collection-visit "^1.0.0"
-    component-emitter "^1.2.1"
-    get-value "^2.0.6"
-    has-value "^1.0.0"
-    isobject "^3.0.1"
-    set-value "^2.0.0"
-    to-object-path "^0.3.0"
-    union-value "^1.0.0"
-    unset-value "^1.0.0"
-
-call-bind@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
-  dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
-
-callsites@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"
-  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
-
-camel-case@3.0.x:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz"
-  integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
-  dependencies:
-    no-case "^2.2.0"
-    upper-case "^1.1.1"
-
-camelcase@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"
-  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
-
-chalk@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-chalk@^2.0.0, chalk@^2.1.0:
-  version "2.4.2"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
-  version "4.1.2"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-chardet@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"
-  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-
-chokidar@^2.0.0:
-  version "2.1.8"
-  resolved "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz"
-  integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
-  dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.1"
-    braces "^2.3.2"
-    glob-parent "^3.1.0"
-    inherits "^2.0.3"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    normalize-path "^3.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.2.1"
-    upath "^1.1.1"
-  optionalDependencies:
-    fsevents "^1.2.7"
-
-class-utils@^0.3.5:
-  version "0.3.6"
-  resolved "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"
-  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
-  dependencies:
-    arr-union "^3.1.0"
-    define-property "^0.2.5"
-    isobject "^3.0.0"
-    static-extend "^0.1.1"
-
-clean-css@4.2.3, clean-css@4.2.x:
-  version "4.2.3"
-  resolved "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz"
-  integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
-  dependencies:
-    source-map "~0.6.0"
-
-clean-stack@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"
-  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-
-cli-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"
-  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
-  dependencies:
-    restore-cursor "^3.1.0"
-
-cli-width@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz"
-  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
-
-cliui@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"
-  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wrap-ansi "^2.0.0"
-
-clone-buffer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz"
-  integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=
-
-clone-stats@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
-  integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=
-
-clone-stats@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz"
-  integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=
-
-clone@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"
-  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
-
-clone@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"
-  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
-
-cloneable-readable@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz"
-  integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==
-  dependencies:
-    inherits "^2.0.1"
-    process-nextick-args "^2.0.0"
-    readable-stream "^2.3.5"
-
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
-collection-map@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz"
-  integrity sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=
-  dependencies:
-    arr-map "^2.0.2"
-    for-own "^1.0.0"
-    make-iterator "^1.0.0"
-
-collection-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz"
-  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
-  dependencies:
-    map-visit "^1.0.0"
-    object-visit "^1.0.0"
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-  dependencies:
-    color-name "~1.1.4"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
-color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-color-support@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"
-  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
-
-commander@2.17.x:
-  version "2.17.1"
-  resolved "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz"
-  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
-
-commander@^2.20.0:
-  version "2.20.3"
-  resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
-commander@~2.19.0:
-  version "2.19.0"
-  resolved "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz"
-  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
-
-component-emitter@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz"
-  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-
-concat-stream@^1.6.0:
-  version "1.6.2"
-  resolved "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"
-  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
-concat-with-sourcemaps@^1.0.0, concat-with-sourcemaps@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz"
-  integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==
-  dependencies:
-    source-map "^0.6.1"
-
-convert-source-map@^1.5.0:
-  version "1.8.0"
-  resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz"
-  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
-  dependencies:
-    safe-buffer "~5.1.1"
-
-copy-anything@^2.0.1:
-  version "2.0.6"
-  resolved "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz"
-  integrity sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==
-  dependencies:
-    is-what "^3.14.1"
-
-copy-descriptor@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"
-  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-
-copy-props@^2.0.1:
-  version "2.0.5"
-  resolved "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz"
-  integrity sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==
-  dependencies:
-    each-props "^1.3.2"
-    is-plain-object "^5.0.0"
-
-core-js@3.16.3:
-  version "3.16.3"
-  resolved "https://registry.npmjs.org/core-js/-/core-js-3.16.3.tgz"
-  integrity sha512-lM3GftxzHNtPNUJg0v4pC2RC6puwMd6VZA7vXUczi+SKmCWSf4JwO89VJGMqbzmB7jlK7B5hr3S64PqwFL49cA==
-
-core-util-is@~1.0.0:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"
-  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
-
-cross-spawn@^6.0.5:
-  version "6.0.5"
-  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-cross-spawn@^7.0.2:
-  version "7.0.3"
-  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
-css-parse@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz"
-  integrity sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=
-  dependencies:
-    css "^2.0.0"
-
-css-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/css-stringify/-/css-stringify-2.0.0.tgz"
-  integrity sha1-LvM9z0mMPT7oK9c9CgGsKGKM0Po=
-  dependencies:
-    css "^2.0.0"
-
-css@^2.0.0:
-  version "2.2.4"
-  resolved "https://registry.npmjs.org/css/-/css-2.2.4.tgz"
-  integrity sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==
-  dependencies:
-    inherits "^2.0.3"
-    source-map "^0.6.1"
-    source-map-resolve "^0.5.2"
-    urix "^0.1.0"
-
-d@1, d@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/d/-/d-1.0.1.tgz"
-  integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
-  dependencies:
-    es5-ext "^0.10.50"
-    type "^1.0.1"
-
-dateformat@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz"
-  integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=
-
-debug@^2.2.0, debug@^2.3.3:
-  version "2.6.9"
-  resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@^3.2.6:
-  version "3.2.7"
-  resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"
-  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
-  dependencies:
-    ms "^2.1.1"
-
-debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
-  version "4.3.3"
-  resolved "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz"
-  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
-  dependencies:
-    ms "2.1.2"
-
-decamelize@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
-decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
-
-deep-is@^0.1.3, deep-is@~0.1.3:
-  version "0.1.4"
-  resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"
-  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
-
-deepmerge@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz"
-  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
-
-default-compare@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz"
-  integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==
-  dependencies:
-    kind-of "^5.0.2"
-
-default-resolution@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz"
-  integrity sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=
-
-define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
-  dependencies:
-    object-keys "^1.0.12"
-
-define-property@^0.2.5:
-  version "0.2.5"
-  resolved "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"
-  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
-  dependencies:
-    is-descriptor "^0.1.0"
-
-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"
-  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
-  dependencies:
-    is-descriptor "^1.0.0"
-
-define-property@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"
-  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
-  dependencies:
-    is-descriptor "^1.0.2"
-    isobject "^3.0.1"
-
-del@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/del/-/del-6.0.0.tgz"
-  integrity sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==
-  dependencies:
-    globby "^11.0.1"
-    graceful-fs "^4.2.4"
-    is-glob "^4.0.1"
-    is-path-cwd "^2.2.0"
-    is-path-inside "^3.0.2"
-    p-map "^4.0.0"
-    rimraf "^3.0.2"
-    slash "^3.0.0"
-
-detect-file@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz"
-  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
-
-dir-glob@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"
-  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
-  dependencies:
-    path-type "^4.0.0"
-
-doctrine@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"
-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
-  dependencies:
-    esutils "^2.0.2"
-
-duplexer2@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"
-  integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=
-  dependencies:
-    readable-stream "~1.1.9"
-
-duplexer@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
-  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
-
-duplexer@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"
-  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
-
-duplexify@^3.6.0:
-  version "3.7.1"
-  resolved "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz"
-  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
-  dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
-
-each-props@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz"
-  integrity sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==
-  dependencies:
-    is-plain-object "^2.0.1"
-    object.defaults "^1.1.0"
-
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-  version "1.4.4"
-  resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
-  dependencies:
-    once "^1.4.0"
-
-enquirer@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz"
-  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
-  dependencies:
-    ansi-colors "^4.1.1"
-
-errno@^0.1.1:
-  version "0.1.8"
-  resolved "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz"
-  integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
-  dependencies:
-    prr "~1.0.1"
-
-error-ex@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
-  dependencies:
-    is-arrayish "^0.2.1"
-
-es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50:
-  version "0.10.53"
-  resolved "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz"
-  integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==
-  dependencies:
-    es6-iterator "~2.0.3"
-    es6-symbol "~3.1.3"
-    next-tick "~1.0.0"
-
-es6-iterator@^2.0.1, es6-iterator@^2.0.3, es6-iterator@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"
-  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
-  dependencies:
-    d "1"
-    es5-ext "^0.10.35"
-    es6-symbol "^3.1.1"
-
-es6-symbol@^3.1.1, es6-symbol@~3.1.3:
-  version "3.1.3"
-  resolved "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz"
-  integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
-  dependencies:
-    d "^1.0.1"
-    ext "^1.1.2"
-
-es6-weak-map@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz"
-  integrity sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==
-  dependencies:
-    d "1"
-    es5-ext "^0.10.46"
-    es6-iterator "^2.0.3"
-    es6-symbol "^3.1.1"
-
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.3, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-escape-string-regexp@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"
-  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
-eslint-scope@^5.0.0, eslint-scope@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"
-  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^4.1.1"
-
-eslint-utils@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz"
-  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
-  dependencies:
-    eslint-visitor-keys "^1.1.0"
-
-eslint-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz"
-  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
-  dependencies:
-    eslint-visitor-keys "^1.1.0"
-
-eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"
-  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
-
-eslint-visitor-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"
-  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
-
-eslint@7.32.0:
-  version "7.32.0"
-  resolved "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz"
-  integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
-  dependencies:
-    "@babel/code-frame" "7.12.11"
-    "@eslint/eslintrc" "^0.4.3"
-    "@humanwhocodes/config-array" "^0.5.0"
-    ajv "^6.10.0"
-    chalk "^4.0.0"
-    cross-spawn "^7.0.2"
-    debug "^4.0.1"
-    doctrine "^3.0.0"
-    enquirer "^2.3.5"
-    escape-string-regexp "^4.0.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^2.1.0"
-    eslint-visitor-keys "^2.0.0"
-    espree "^7.3.1"
-    esquery "^1.4.0"
-    esutils "^2.0.2"
-    fast-deep-equal "^3.1.3"
-    file-entry-cache "^6.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^5.1.2"
-    globals "^13.6.0"
-    ignore "^4.0.6"
-    import-fresh "^3.0.0"
-    imurmurhash "^0.1.4"
-    is-glob "^4.0.0"
-    js-yaml "^3.13.1"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.4.1"
-    lodash.merge "^4.6.2"
-    minimatch "^3.0.4"
-    natural-compare "^1.4.0"
-    optionator "^0.9.1"
-    progress "^2.0.0"
-    regexpp "^3.1.0"
-    semver "^7.2.1"
-    strip-ansi "^6.0.0"
-    strip-json-comments "^3.1.0"
-    table "^6.0.9"
-    text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
-
-eslint@^6.0.0:
-  version "6.8.0"
-  resolved "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz"
-  integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    ajv "^6.10.0"
-    chalk "^2.1.0"
-    cross-spawn "^6.0.5"
-    debug "^4.0.1"
-    doctrine "^3.0.0"
-    eslint-scope "^5.0.0"
-    eslint-utils "^1.4.3"
-    eslint-visitor-keys "^1.1.0"
-    espree "^6.1.2"
-    esquery "^1.0.1"
-    esutils "^2.0.2"
-    file-entry-cache "^5.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^5.0.0"
-    globals "^12.1.0"
-    ignore "^4.0.6"
-    import-fresh "^3.0.0"
-    imurmurhash "^0.1.4"
-    inquirer "^7.0.0"
-    is-glob "^4.0.0"
-    js-yaml "^3.13.1"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.14"
-    minimatch "^3.0.4"
-    mkdirp "^0.5.1"
-    natural-compare "^1.4.0"
-    optionator "^0.8.3"
-    progress "^2.0.0"
-    regexpp "^2.0.1"
-    semver "^6.1.2"
-    strip-ansi "^5.2.0"
-    strip-json-comments "^3.0.1"
-    table "^5.2.3"
-    text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
-
-espree@^6.1.2:
-  version "6.2.1"
-  resolved "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz"
-  integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==
-  dependencies:
-    acorn "^7.1.1"
-    acorn-jsx "^5.2.0"
-    eslint-visitor-keys "^1.1.0"
-
-espree@^7.3.0, espree@^7.3.1:
-  version "7.3.1"
-  resolved "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz"
-  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
-  dependencies:
-    acorn "^7.4.0"
-    acorn-jsx "^5.3.1"
-    eslint-visitor-keys "^1.3.0"
-
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-esquery@^1.0.1, esquery@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz"
-  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
-  dependencies:
-    estraverse "^5.1.0"
-
-esrecurse@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"
-  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
-  dependencies:
-    estraverse "^5.2.0"
-
-estraverse@^4.1.1:
-  version "4.3.0"
-  resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"
-  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
-
-estraverse@^5.1.0, estraverse@^5.2.0:
-  version "5.3.0"
-  resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
-  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
-
-estree-walker@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-0.2.1.tgz"
-  integrity sha1-va/oCVOD2EFNXcLs9MkXO225QS4=
-
-estree-walker@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz"
-  integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
-
-estree-walker@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz"
-  integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
-
-esutils@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
-  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
-
-expand-brackets@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"
-  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
-  dependencies:
-    debug "^2.3.3"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    posix-character-classes "^0.1.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-expand-tilde@^2.0.0, expand-tilde@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"
-  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
-  dependencies:
-    homedir-polyfill "^1.0.1"
-
-ext@^1.1.2:
-  version "1.6.0"
-  resolved "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz"
-  integrity sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==
-  dependencies:
-    type "^2.5.0"
-
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
-  dependencies:
-    is-extendable "^0.1.0"
-
-extend-shallow@^3.0.0, extend-shallow@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"
-  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
-  dependencies:
-    assign-symbols "^1.0.0"
-    is-extendable "^1.0.1"
-
-extend@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-external-editor@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"
-  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
-  dependencies:
-    chardet "^0.7.0"
-    iconv-lite "^0.4.24"
-    tmp "^0.0.33"
-
-extglob@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"
-  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
-  dependencies:
-    array-unique "^0.3.2"
-    define-property "^1.0.0"
-    expand-brackets "^2.1.4"
-    extend-shallow "^2.0.1"
-    fragment-cache "^0.2.1"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-fancy-log@^1.1.0, fancy-log@^1.3.2, fancy-log@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz"
-  integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==
-  dependencies:
-    ansi-gray "^0.1.1"
-    color-support "^1.1.3"
-    parse-node-version "^1.0.0"
-    time-stamp "^1.0.0"
-
-fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-
-fast-glob@^3.2.9:
-  version "3.2.11"
-  resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz"
-  integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.2"
-    merge2 "^1.3.0"
-    micromatch "^4.0.4"
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
-fast-levenshtein@^1.0.0:
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz"
-  integrity sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk=
-
-fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
-  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
-
-fastq@^1.6.0:
-  version "1.13.0"
-  resolved "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz"
-  integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
-  dependencies:
-    reusify "^1.0.4"
-
-figures@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz"
-  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
-file-entry-cache@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz"
-  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
-  dependencies:
-    flat-cache "^2.0.1"
-
-file-entry-cache@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"
-  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
-  dependencies:
-    flat-cache "^3.0.4"
-
-file-uri-to-path@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
-  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
-
-fill-range@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"
-  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-    to-regex-range "^2.1.0"
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-find-up@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"
-  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
-  dependencies:
-    path-exists "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-findup-sync@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz"
-  integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=
-  dependencies:
-    detect-file "^1.0.0"
-    is-glob "^3.1.0"
-    micromatch "^3.0.4"
-    resolve-dir "^1.0.1"
-
-findup-sync@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz"
-  integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==
-  dependencies:
-    detect-file "^1.0.0"
-    is-glob "^4.0.0"
-    micromatch "^3.0.4"
-    resolve-dir "^1.0.1"
-
-fined@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz"
-  integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==
-  dependencies:
-    expand-tilde "^2.0.2"
-    is-plain-object "^2.0.3"
-    object.defaults "^1.1.0"
-    object.pick "^1.2.0"
-    parse-filepath "^1.0.1"
-
-first-chunk-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
-  integrity sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=
-
-flagged-respawn@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz"
-  integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==
-
-flat-cache@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz"
-  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
-  dependencies:
-    flatted "^2.0.0"
-    rimraf "2.6.3"
-    write "1.0.3"
-
-flat-cache@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"
-  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
-  dependencies:
-    flatted "^3.1.0"
-    rimraf "^3.0.2"
-
-flatted@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz"
-  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
-
-flatted@^3.1.0:
-  version "3.2.5"
-  resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz"
-  integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
-
-flush-write-stream@^1.0.2:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz"
-  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
-  dependencies:
-    inherits "^2.0.3"
-    readable-stream "^2.3.6"
-
-for-in@^1.0.1, for-in@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
-
-for-own@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz"
-  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
-  dependencies:
-    for-in "^1.0.1"
-
-fragment-cache@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"
-  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
-  dependencies:
-    map-cache "^0.2.2"
-
-fs-mkdirp-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz"
-  integrity sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=
-  dependencies:
-    graceful-fs "^4.1.11"
-    through2 "^2.0.3"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-fs@^0.0.1-security:
-  version "0.0.1-security"
-  resolved "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz"
-  integrity sha1-invTcYa23d84E/I4WLV+yq9eQdQ=
-
-fsevents@^1.2.7:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
-  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
-  dependencies:
-    bindings "^1.5.0"
-    nan "^2.12.1"
-
-fsevents@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
-  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
-
-get-caller-file@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz"
-  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
-
-get-intrinsic@^1.0.2:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"
-  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
-  dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-
-get-value@^2.0.3, get-value@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"
-  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
-
-glob-parent@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
-glob-parent@^5.0.0, glob-parent@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob-stream@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz"
-  integrity sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=
-  dependencies:
-    extend "^3.0.0"
-    glob "^7.1.1"
-    glob-parent "^3.1.0"
-    is-negated-glob "^1.0.0"
-    ordered-read-streams "^1.0.0"
-    pumpify "^1.3.5"
-    readable-stream "^2.1.5"
-    remove-trailing-separator "^1.0.1"
-    to-absolute-glob "^2.0.0"
-    unique-stream "^2.0.2"
-
-glob-watcher@^5.0.3:
-  version "5.0.5"
-  resolved "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz"
-  integrity sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==
-  dependencies:
-    anymatch "^2.0.0"
-    async-done "^1.2.0"
-    chokidar "^2.0.0"
-    is-negated-glob "^1.0.0"
-    just-debounce "^1.0.0"
-    normalize-path "^3.0.0"
-    object.defaults "^1.1.0"
-
-glob@^7.1.1, glob@^7.1.3:
-  version "7.2.0"
-  resolved "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"
-  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-global-modules@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"
-  integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
-  dependencies:
-    global-prefix "^1.0.1"
-    is-windows "^1.0.1"
-    resolve-dir "^1.0.0"
-
-global-prefix@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"
-  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
-  dependencies:
-    expand-tilde "^2.0.2"
-    homedir-polyfill "^1.0.1"
-    ini "^1.3.4"
-    is-windows "^1.0.1"
-    which "^1.2.14"
-
-globals@^11.1.0:
-  version "11.12.0"
-  resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
-  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
-
-globals@^12.1.0:
-  version "12.4.0"
-  resolved "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz"
-  integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
-  dependencies:
-    type-fest "^0.8.1"
-
-globals@^13.6.0, globals@^13.9.0:
-  version "13.12.0"
-  resolved "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz"
-  integrity sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==
-  dependencies:
-    type-fest "^0.20.2"
-
-globby@^11.0.1:
-  version "11.1.0"
-  resolved "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"
-  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
-  dependencies:
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.2.9"
-    ignore "^5.2.0"
-    merge2 "^1.4.1"
-    slash "^3.0.0"
-
-glogg@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz"
-  integrity sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==
-  dependencies:
-    sparkles "^1.0.0"
-
-graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.4:
-  version "4.2.9"
-  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz"
-  integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
-
-group-css-media-queries@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.npmjs.org/group-css-media-queries/-/group-css-media-queries-1.4.1.tgz"
-  integrity sha1-jlTLMcxFqcXgjrg4lAuKKAONcXU=
-  dependencies:
-    css-parse "^2.0.0"
-    css-stringify "^2.0.0"
-
-gulp-cached@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/gulp-cached/-/gulp-cached-1.1.1.tgz"
-  integrity sha1-/nzU+H83YB5gc8/t7lwr2vi2rM4=
-  dependencies:
-    lodash.defaults "^4.2.0"
-    through2 "^2.0.1"
-
-gulp-clean-css@4.3.0:
-  version "4.3.0"
-  resolved "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-4.3.0.tgz"
-  integrity sha512-mGyeT3qqFXTy61j0zOIciS4MkYziF2U594t2Vs9rUnpkEHqfu6aDITMp8xOvZcvdX61Uz3y1mVERRYmjzQF5fg==
-  dependencies:
-    clean-css "4.2.3"
-    plugin-error "1.0.1"
-    through2 "3.0.1"
-    vinyl-sourcemaps-apply "0.2.1"
-
-gulp-cli@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz"
-  integrity sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==
-  dependencies:
-    ansi-colors "^1.0.1"
-    archy "^1.0.0"
-    array-sort "^1.0.0"
-    color-support "^1.1.3"
-    concat-stream "^1.6.0"
-    copy-props "^2.0.1"
-    fancy-log "^1.3.2"
-    gulplog "^1.0.0"
-    interpret "^1.4.0"
-    isobject "^3.0.1"
-    liftoff "^3.1.0"
-    matchdep "^2.0.0"
-    mute-stdout "^1.0.0"
-    pretty-hrtime "^1.0.0"
-    replace-homedir "^1.0.0"
-    semver-greatest-satisfied-range "^1.1.0"
-    v8flags "^3.2.0"
-    yargs "^7.1.0"
-
-gulp-concat@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz"
-  integrity sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=
-  dependencies:
-    concat-with-sourcemaps "^1.0.0"
-    through2 "^2.0.0"
-    vinyl "^2.0.0"
-
-gulp-eol@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.npmjs.org/gulp-eol/-/gulp-eol-0.2.0.tgz"
-  integrity sha512-YaUQld+7A3h1iOHs7XTdEboYUg8GjA+3DmWtgvZ9sb1r0tDpB27cTtgaoD83oTm9Mp2Hmwge6AQMqPxwUjQ/xA==
-  dependencies:
-    plugin-error "~1.0"
-    through2 "~0.4"
-
-gulp-eslint@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-6.0.0.tgz"
-  integrity sha512-dCVPSh1sA+UVhn7JSQt7KEb4An2sQNbOdB3PA8UCfxsoPlAKjJHxYHGXdXC7eb+V1FAnilSFFqslPrq037l1ig==
-  dependencies:
-    eslint "^6.0.0"
-    fancy-log "^1.3.2"
-    plugin-error "^1.0.1"
-
-gulp-expect-file@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/gulp-expect-file/-/gulp-expect-file-2.0.0.tgz"
-  integrity sha512-VLBvmSoF85dQ71tQngx1GfAcJ0s9g50dcjrlX4eyZbF9sAEoGU8F04JtXXU6rBcGDAHXUs4+n1HUs0lgHKyW1Q==
-  dependencies:
-    ansi-colors "^4.1.1"
-    async "^3.2.0"
-    fancy-log "^1.3.3"
-    minimatch "^3.0.4"
-    plugin-error "^1.0.1"
-    through2 "^4.0.2"
-    vinyl "^2.2.1"
-
-gulp-filter@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/gulp-filter/-/gulp-filter-7.0.0.tgz"
-  integrity sha512-ZGWtJo0j1mHfP77tVuhyqem4MRA5NfNRjoVe6VAkLGeQQ/QGo2VsFwp7zfPTGDsd1rwzBmoDHhxpE6f5B3Zuaw==
-  dependencies:
-    multimatch "^5.0.0"
-    plugin-error "^1.0.1"
-    streamfilter "^3.0.0"
-    to-absolute-glob "^2.0.2"
-
-gulp-group-css-media-queries@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.npmjs.org/gulp-group-css-media-queries/-/gulp-group-css-media-queries-1.2.2.tgz"
-  integrity sha512-uOs8aJ5TV12aRstfc6pn107edDT2XSY7KNAU721Dz+gKHu/AUIlAaOdFdo9n/eHWqfb9QWMArrM8fiPOCqZPGg==
-  dependencies:
-    group-css-media-queries "^1.4.1"
-    plugin-error "^1.0.1"
-    through2 "^2.0.3"
-
-gulp-header@2.0.9:
-  version "2.0.9"
-  resolved "https://registry.npmjs.org/gulp-header/-/gulp-header-2.0.9.tgz"
-  integrity sha512-LMGiBx+qH8giwrOuuZXSGvswcIUh0OiioNkUpLhNyvaC6/Ga8X6cfAeme2L5PqsbXMhL8o8b/OmVqIQdxprhcQ==
-  dependencies:
-    concat-with-sourcemaps "^1.1.0"
-    lodash.template "^4.5.0"
-    map-stream "0.0.7"
-    through2 "^2.0.0"
-
-gulp-less@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/gulp-less/-/gulp-less-5.0.0.tgz"
-  integrity sha512-W2I3TewO/By6UZsM/wJG3pyK5M6J0NYmJAAhwYXQHR+38S0iDtZasmUgFCH3CQj+pQYw/PAIzxvFvwtEXz1HhQ==
-  dependencies:
-    less "^3.7.1 || ^4.0.0"
-    object-assign "^4.0.1"
-    plugin-error "^1.0.0"
-    replace-ext "^2.0.0"
-    through2 "^4.0.0"
-    vinyl-sourcemaps-apply "^0.2.0"
-
-gulp-rename@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz"
-  integrity sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==
-
-gulp-replace@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.1.3.tgz"
-  integrity sha512-HcPHpWY4XdF8zxYkDODHnG2+7a3nD/Y8Mfu3aBgMiCFDW3X2GiOKXllsAmILcxe3KZT2BXoN18WrpEFm48KfLQ==
-  dependencies:
-    "@types/node" "^14.14.41"
-    "@types/vinyl" "^2.0.4"
-    istextorbinary "^3.0.0"
-    replacestream "^4.0.3"
-    yargs-parser ">=5.0.0-security.0"
-
-gulp-rollup-2@^1.2.1:
-  version "1.3.1"
-  resolved "https://registry.npmjs.org/gulp-rollup-2/-/gulp-rollup-2-1.3.1.tgz"
-  integrity sha512-sKkHsbhmcFBorQ3AHUME8Kifj3Ud7d6BwUMntCigolJQxzbXH8Ja688WRc3dolSlcp31cIWTtJf9r+090gC+Ew==
-  dependencies:
-    njfs "^1.2.5"
-    object-hash "^2.1.1"
-    rollup "^2.41.4"
-    through2 "^4.0.2"
-    vinyl "^2.2.1"
-    vinyl-sourcemaps-apply "^0.2.1"
-
-gulp-size@4.0.1:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/gulp-size/-/gulp-size-4.0.1.tgz"
-  integrity sha512-yNf5uGUKe2YAMZwHDFgnkp2o9fLp3WLUMZ+Gd23IIbav0TAVsr5Ek6So8gwjlSimPwR2p05Gg7zsjASYXZtt3g==
-  dependencies:
-    brotli-size "^4.0.0"
-    chalk "^4.1.1"
-    fancy-log "^1.3.3"
-    gzip-size "^6.0.0"
-    plugin-error "^1.0.1"
-    pretty-bytes "^5.6.0"
-    stream-counter "^1.0.0"
-    through2 "^4.0.2"
-
-gulp-stripbom@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.npmjs.org/gulp-stripbom/-/gulp-stripbom-1.0.5.tgz"
-  integrity sha512-0mThhGKerVFgXVPM6BSlleXym+K0Txkzx+CMaOmpMjScm1UZ4FIvuQiAQme0oYm3lhMwrbDQkiDtYbuve64l0Q==
-  dependencies:
-    ansi-colors "^4.1.1"
-    fancy-log "^1.3.3"
-    log-symbols "^1.0.0"
-    plugin-error "^1.0.1"
-    strip-bom "^1.0.0"
-    through2 "^0.5.1"
-
-gulp-terser@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/gulp-terser/-/gulp-terser-2.0.1.tgz"
-  integrity sha512-XCrnCXP8ovNpgLK9McJIXlgm0j3W2TsiWu7K9y3m+Sn5XZgUzi6U8MPHtS3NdLMic9poCj695N0ARJ2B6atypw==
-  dependencies:
-    plugin-error "^1.0.1"
-    terser "5.4.0"
-    through2 "^4.0.2"
-    vinyl-sourcemaps-apply "^0.2.1"
-
-gulp-util@3.0.8:
-  version "3.0.8"
-  resolved "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz"
-  integrity sha1-AFTh50RQLifATBh8PsxQXdVLu08=
-  dependencies:
-    array-differ "^1.0.0"
-    array-uniq "^1.0.2"
-    beeper "^1.0.0"
-    chalk "^1.0.0"
-    dateformat "^2.0.0"
-    fancy-log "^1.1.0"
-    gulplog "^1.0.0"
-    has-gulplog "^0.1.0"
-    lodash._reescape "^3.0.0"
-    lodash._reevaluate "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.template "^3.0.0"
-    minimist "^1.1.0"
-    multipipe "^0.1.2"
-    object-assign "^3.0.0"
-    replace-ext "0.0.1"
-    through2 "^2.0.0"
-    vinyl "^0.5.0"
-
-gulp@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz"
-  integrity sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==
-  dependencies:
-    glob-watcher "^5.0.3"
-    gulp-cli "^2.2.0"
-    undertaker "^1.2.1"
-    vinyl-fs "^3.0.0"
-
-gulplog@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz"
-  integrity sha1-4oxNRdBey77YGDY86PnFkmIp/+U=
-  dependencies:
-    glogg "^1.0.0"
-
-gzip-size@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz"
-  integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==
-  dependencies:
-    duplexer "^0.1.2"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
-has-flag@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
-  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-
-has-gulplog@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz"
-  integrity sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=
-  dependencies:
-    sparkles "^1.0.0"
-
-has-symbols@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"
-  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
-
-has-value@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"
-  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
-  dependencies:
-    get-value "^2.0.3"
-    has-values "^0.1.4"
-    isobject "^2.0.0"
-
-has-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"
-  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
-  dependencies:
-    get-value "^2.0.6"
-    has-values "^1.0.0"
-    isobject "^3.0.0"
-
-has-values@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"
-  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
-
-has-values@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"
-  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
-  dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
-
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-he@1.2.x:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/he/-/he-1.2.0.tgz"
-  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
-
-homedir-polyfill@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"
-  integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
-  dependencies:
-    parse-passwd "^1.0.0"
-
-hosted-git-info@^2.1.4:
-  version "2.8.9"
-  resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"
-  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
-
-html-minifier@^3.0.2:
-  version "3.5.21"
-  resolved "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz"
-  integrity sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==
-  dependencies:
-    camel-case "3.0.x"
-    clean-css "4.2.x"
-    commander "2.17.x"
-    he "1.2.x"
-    param-case "2.1.x"
-    relateurl "0.2.x"
-    uglify-js "3.4.x"
-
-iconv-lite@^0.4.24, iconv-lite@^0.4.4:
-  version "0.4.24"
-  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
-ignore@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-
-ignore@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"
-  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
-
-image-size@~0.5.0:
-  version "0.5.5"
-  resolved "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz"
-  integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
-
-import-fresh@^3.0.0, import-fresh@^3.2.1:
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"
-  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
-  dependencies:
-    parent-module "^1.0.0"
-    resolve-from "^4.0.0"
-
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
-
-indent-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"
-  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-ini@^1.3.4:
-  version "1.3.8"
-  resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"
-  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-
-inquirer@^7.0.0:
-  version "7.3.3"
-  resolved "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz"
-  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^4.1.0"
-    cli-cursor "^3.1.0"
-    cli-width "^3.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.19"
-    mute-stream "0.0.8"
-    run-async "^2.4.0"
-    rxjs "^6.6.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-    through "^2.3.6"
-
-interpret@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz"
-  integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
-
-invert-kv@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"
-  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
-
-is-absolute@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz"
-  integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
-  dependencies:
-    is-relative "^1.0.0"
-    is-windows "^1.0.1"
-
-is-accessor-descriptor@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"
-  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-accessor-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"
-  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
-  dependencies:
-    kind-of "^6.0.0"
-
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
-
-is-binary-path@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz"
-  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
-  dependencies:
-    binary-extensions "^1.0.0"
-
-is-buffer@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-core-module@^2.8.1:
-  version "2.8.1"
-  resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz"
-  integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
-  dependencies:
-    has "^1.0.3"
-
-is-data-descriptor@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"
-  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-data-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"
-  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
-  dependencies:
-    kind-of "^6.0.0"
-
-is-descriptor@^0.1.0:
-  version "0.1.6"
-  resolved "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"
-  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
-  dependencies:
-    is-accessor-descriptor "^0.1.6"
-    is-data-descriptor "^0.1.4"
-    kind-of "^5.0.0"
-
-is-descriptor@^1.0.0, is-descriptor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"
-  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
-  dependencies:
-    is-accessor-descriptor "^1.0.0"
-    is-data-descriptor "^1.0.0"
-    kind-of "^6.0.2"
-
-is-extendable@^0.1.0, is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
-
-is-extendable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"
-  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
-  dependencies:
-    is-plain-object "^2.0.4"
-
-is-extglob@^2.1.0, is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
-  dependencies:
-    is-extglob "^2.1.0"
-
-is-glob@^4.0.0, is-glob@^4.0.1:
-  version "4.0.3"
-  resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"
-  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz"
-  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
-
-is-negated-glob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz"
-  integrity sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=
-
-is-number@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"
-  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-number@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz"
-  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-path-cwd@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz"
-  integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
-
-is-path-inside@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz"
-  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
-
-is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
-  dependencies:
-    isobject "^3.0.1"
-
-is-plain-object@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz"
-  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
-
-is-reference@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz"
-  integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==
-  dependencies:
-    "@types/estree" "*"
-
-is-relative@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz"
-  integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
-  dependencies:
-    is-unc-path "^1.0.0"
-
-is-unc-path@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz"
-  integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
-  dependencies:
-    unc-path-regex "^0.1.2"
-
-is-utf8@^0.2.0, is-utf8@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
-
-is-valid-glob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz"
-  integrity sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=
-
-is-what@^3.14.1:
-  version "3.14.1"
-  resolved "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz"
-  integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==
-
-is-windows@^1.0.1, is-windows@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-
-isarray@1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
-  dependencies:
-    isarray "1.0.0"
-
-isobject@^3.0.0, isobject@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
-
-istextorbinary@^3.0.0:
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/istextorbinary/-/istextorbinary-3.3.0.tgz"
-  integrity sha512-Tvq1W6NAcZeJ8op+Hq7tdZ434rqnMx4CCZ7H0ff83uEloDvVbqAwaMTZcafKGJT0VHkYzuXUiCY4hlXQg6WfoQ==
-  dependencies:
-    binaryextensions "^2.2.0"
-    textextensions "^3.2.0"
-
-jest-worker@^26.2.1:
-  version "26.6.2"
-  resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz"
-  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
-  dependencies:
-    "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^7.0.0"
-
-js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
-js-yaml@^3.13.1:
-  version "3.14.1"
-  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-jsesc@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
-  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-schema-traverse@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"
-  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
-
-json-stable-stringify-without-jsonify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
-
-just-debounce@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz"
-  integrity sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==
-
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^5.0.0, kind-of@^5.0.2:
-  version "5.1.0"
-  resolved "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"
-  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
-
-kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.3"
-  resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"
-  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
-
-last-run@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz"
-  integrity sha1-RblpQsF7HHnHchmCWbqUO+v4yls=
-  dependencies:
-    default-resolution "^2.0.0"
-    es6-weak-map "^2.0.1"
-
-lazystream@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz"
-  integrity sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==
-  dependencies:
-    readable-stream "^2.0.5"
-
-lcid@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"
-  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
-  dependencies:
-    invert-kv "^1.0.0"
-
-lead@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz"
-  integrity sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=
-  dependencies:
-    flush-write-stream "^1.0.2"
-
-"less@^3.7.1 || ^4.0.0":
-  version "4.1.2"
-  resolved "https://registry.npmjs.org/less/-/less-4.1.2.tgz"
-  integrity sha512-EoQp/Et7OSOVu0aJknJOtlXZsnr8XE8KwuzTHOLeVSEx8pVWUICc8Q0VYRHgzyjX78nMEyC/oztWFbgyhtNfDA==
-  dependencies:
-    copy-anything "^2.0.1"
-    parse-node-version "^1.0.1"
-    tslib "^2.3.0"
-  optionalDependencies:
-    errno "^0.1.1"
-    graceful-fs "^4.1.2"
-    image-size "~0.5.0"
-    make-dir "^2.1.0"
-    mime "^1.4.1"
-    needle "^2.5.2"
-    source-map "~0.6.0"
-
-levn@^0.3.0, levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
-levn@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"
-  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
-  dependencies:
-    prelude-ls "^1.2.1"
-    type-check "~0.4.0"
-
-liftoff@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz"
-  integrity sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==
-  dependencies:
-    extend "^3.0.0"
-    findup-sync "^3.0.0"
-    fined "^1.0.1"
-    flagged-respawn "^1.0.0"
-    is-plain-object "^2.0.4"
-    object.map "^1.0.0"
-    rechoir "^0.6.2"
-    resolve "^1.1.7"
-
-load-json-file@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"
-  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    strip-bom "^2.0.0"
-
-lodash._basecopy@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
-  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
-
-lodash._basetostring@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-  integrity sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=
-
-lodash._basevalues@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
-  integrity sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=
-
-lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"
-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
-
-lodash._isiterateecall@^3.0.0:
-  version "3.0.9"
-  resolved "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
-  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
-
-lodash._reescape@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
-  integrity sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=
-
-lodash._reevaluate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
-  integrity sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=
-
-lodash._reinterpolate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
-  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
-
-lodash._root@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz"
-  integrity sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=
-
-lodash.defaults@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz"
-  integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
-
-lodash.escape@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz"
-  integrity sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=
-  dependencies:
-    lodash._root "^3.0.0"
-
-lodash.isarguments@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz"
-  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
-
-lodash.isarray@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
-  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
-
-lodash.keys@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz"
-  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
-  dependencies:
-    lodash._getnative "^3.0.0"
-    lodash.isarguments "^3.0.0"
-    lodash.isarray "^3.0.0"
-
-lodash.merge@^4.6.2:
-  version "4.6.2"
-  resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"
-  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
-
-lodash.restparam@^3.0.0:
-  version "3.6.1"
-  resolved "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
-  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
-
-lodash.template@^3.0.0:
-  version "3.6.2"
-  resolved "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz"
-  integrity sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash._basetostring "^3.0.0"
-    lodash._basevalues "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-    lodash.keys "^3.0.0"
-    lodash.restparam "^3.0.0"
-    lodash.templatesettings "^3.0.0"
-
-lodash.template@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz"
-  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-    lodash.templatesettings "^4.0.0"
-
-lodash.templatesettings@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz"
-  integrity sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-
-lodash.templatesettings@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz"
-  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-
-lodash.truncate@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz"
-  integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
-
-lodash@^4.17.14, lodash@^4.17.19:
-  version "4.17.21"
-  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
-log-symbols@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz"
-  integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=
-  dependencies:
-    chalk "^1.0.0"
-
-lower-case@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz"
-  integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-magic-string@^0.25.7:
-  version "0.25.7"
-  resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz"
-  integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
-  dependencies:
-    sourcemap-codec "^1.4.4"
-
-make-dir@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz"
-  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
-  dependencies:
-    pify "^4.0.1"
-    semver "^5.6.0"
-
-make-iterator@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz"
-  integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==
-  dependencies:
-    kind-of "^6.0.2"
-
-map-cache@^0.2.0, map-cache@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"
-  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
-
-map-stream@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz"
-  integrity sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=
-
-map-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"
-  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
-  dependencies:
-    object-visit "^1.0.0"
-
-matchdep@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz"
-  integrity sha1-xvNINKDY28OzfCfui7yyfHd1WC4=
-  dependencies:
-    findup-sync "^2.0.0"
-    micromatch "^3.0.4"
-    resolve "^1.4.0"
-    stack-trace "0.0.10"
-
-merge-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"
-  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
-
-merge2@^1.3.0, merge2@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"
-  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
-
-micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
-  version "3.1.10"
-  resolved "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"
-  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    braces "^2.3.1"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    extglob "^2.0.4"
-    fragment-cache "^0.2.1"
-    kind-of "^6.0.2"
-    nanomatch "^1.2.9"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.2"
-
-micromatch@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz"
-  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
-  dependencies:
-    braces "^3.0.1"
-    picomatch "^2.2.3"
-
-mime@^1.4.1:
-  version "1.6.0"
-  resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"
-  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
-
-mimic-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-
-minimatch@^3.0.2, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@^1.1.0, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-
-mixin-deep@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz"
-  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
-  dependencies:
-    for-in "^1.0.2"
-    is-extendable "^1.0.1"
-
-mkdirp@^0.5.1:
-  version "0.5.5"
-  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"
-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
-  dependencies:
-    minimist "^1.2.5"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-ms@2.1.2, ms@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-multimatch@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz"
-  integrity sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==
-  dependencies:
-    "@types/minimatch" "^3.0.3"
-    array-differ "^3.0.0"
-    array-union "^2.1.0"
-    arrify "^2.0.1"
-    minimatch "^3.0.4"
-
-multipipe@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz"
-  integrity sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=
-  dependencies:
-    duplexer2 "0.0.2"
-
-mute-stdout@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz"
-  integrity sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==
-
-mute-stream@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"
-  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
-
-nan@^2.12.1:
-  version "2.15.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
-  integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
-
-nanomatch@^1.2.9:
-  version "1.2.13"
-  resolved "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz"
-  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    fragment-cache "^0.2.1"
-    is-windows "^1.0.2"
-    kind-of "^6.0.2"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-natural-compare@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
-  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
-
-needle@^2.5.2:
-  version "2.9.1"
-  resolved "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz"
-  integrity sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==
-  dependencies:
-    debug "^3.2.6"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
-
-next-tick@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz"
-  integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
-
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-
-njfs@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.npmjs.org/njfs/-/njfs-1.2.5.tgz"
-  integrity sha512-Vnl1VDjSo7fO3RHAO5N9QrsyWaIpSTxHSwVoQOcepYAx3Lt+2JD/tUwgEJHfh1QqBjyy/H9WS5L79+hL+l99ug==
-
-no-case@^2.2.0:
-  version "2.3.2"
-  resolved "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz"
-  integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
-  dependencies:
-    lower-case "^1.1.1"
-
-normalize-package-data@^2.3.2:
-  version "2.5.0"
-  resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"
-  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
-  dependencies:
-    hosted-git-info "^2.1.4"
-    resolve "^1.10.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-normalize-path@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
-normalize-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
-now-and-later@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz"
-  integrity sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==
-  dependencies:
-    once "^1.3.2"
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
-object-assign@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"
-  integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=
-
-object-assign@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
-object-copy@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"
-  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
-  dependencies:
-    copy-descriptor "^0.1.0"
-    define-property "^0.2.5"
-    kind-of "^3.0.3"
-
-object-hash@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz"
-  integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==
-
-object-keys@^1.0.12, object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object-keys@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz"
-  integrity sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=
-
-object-visit@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"
-  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
-  dependencies:
-    isobject "^3.0.0"
-
-object.assign@^4.0.4, object.assign@^4.1.0:
-  version "4.1.2"
-  resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz"
-  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    has-symbols "^1.0.1"
-    object-keys "^1.1.1"
-
-object.defaults@^1.0.0, object.defaults@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz"
-  integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=
-  dependencies:
-    array-each "^1.0.1"
-    array-slice "^1.0.0"
-    for-own "^1.0.0"
-    isobject "^3.0.0"
-
-object.map@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz"
-  integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=
-  dependencies:
-    for-own "^1.0.0"
-    make-iterator "^1.0.0"
-
-object.pick@^1.2.0, object.pick@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"
-  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
-  dependencies:
-    isobject "^3.0.1"
-
-object.reduce@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz"
-  integrity sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=
-  dependencies:
-    for-own "^1.0.0"
-    make-iterator "^1.0.0"
-
-once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-onetime@^5.1.0:
-  version "5.1.2"
-  resolved "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"
-  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
-  dependencies:
-    mimic-fn "^2.1.0"
-
-optionator@^0.8.3:
-  version "0.8.3"
-  resolved "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz"
-  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.6"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    word-wrap "~1.2.3"
-
-optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
-  dependencies:
-    deep-is "^0.1.3"
-    fast-levenshtein "^2.0.6"
-    levn "^0.4.1"
-    prelude-ls "^1.2.1"
-    type-check "^0.4.0"
-    word-wrap "^1.2.3"
-
-ordered-read-streams@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz"
-  integrity sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=
-  dependencies:
-    readable-stream "^2.0.1"
-
-os-locale@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"
-  integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
-  dependencies:
-    lcid "^1.0.0"
-
-os-tmpdir@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
-
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz"
-  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
-param-case@2.1.x:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz"
-  integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc=
-  dependencies:
-    no-case "^2.2.0"
-
-parent-module@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"
-  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
-  dependencies:
-    callsites "^3.0.0"
-
-parse-filepath@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz"
-  integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=
-  dependencies:
-    is-absolute "^1.0.0"
-    map-cache "^0.2.0"
-    path-root "^0.1.1"
-
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"
-  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
-  dependencies:
-    error-ex "^1.2.0"
-
-parse-node-version@^1.0.0, parse-node-version@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz"
-  integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
-
-parse-passwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"
-  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
-
-pascalcase@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"
-  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
-
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
-
-path-exists@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"
-  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
-  dependencies:
-    pinkie-promise "^2.0.0"
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
-
-path-key@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"
-  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
-path-parse@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"
-  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
-
-path-root-regex@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz"
-  integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=
-
-path-root@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz"
-  integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=
-  dependencies:
-    path-root-regex "^0.1.0"
-
-path-type@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"
-  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
-  dependencies:
-    graceful-fs "^4.1.2"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-path-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"
-  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-
-picomatch@^2.2.2, picomatch@^2.2.3:
-  version "2.3.1"
-  resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-
-pify@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
-
-pify@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz"
-  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
-plugin-error@1.0.1, plugin-error@^1.0.0, plugin-error@^1.0.1, plugin-error@~1.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz"
-  integrity sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==
-  dependencies:
-    ansi-colors "^1.0.1"
-    arr-diff "^4.0.0"
-    arr-union "^3.1.0"
-    extend-shallow "^3.0.2"
-
-posix-character-classes@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"
-  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
-
-prelude-ls@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
-  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
-
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"
-  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
-
-pretty-bytes@^5.6.0:
-  version "5.6.0"
-  resolved "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz"
-  integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
-
-pretty-hrtime@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz"
-  integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
-
-process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
-progress@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"
-  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
-
-prr@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz"
-  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
-
-pump@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz"
-  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-pumpify@^1.3.5:
-  version "1.5.1"
-  resolved "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz"
-  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
-  dependencies:
-    duplexify "^3.6.0"
-    inherits "^2.0.3"
-    pump "^2.0.0"
-
-punycode@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-queue-microtask@^1.2.2:
-  version "1.2.3"
-  resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"
-  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
-
-randombytes@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"
-  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
-  dependencies:
-    safe-buffer "^5.1.0"
-
-read-pkg-up@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"
-  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
-  dependencies:
-    find-up "^1.0.0"
-    read-pkg "^1.0.0"
-
-read-pkg@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"
-  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
-  dependencies:
-    load-json-file "^1.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^1.0.0"
-
-"readable-stream@2 || 3", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
-  version "2.3.7"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-readable-stream@3, readable-stream@^3.0.6:
-  version "3.6.0"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readable-stream@~1.0.17:
-  version "1.0.34"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"
-  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-readable-stream@~1.1.9:
-  version "1.1.14"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"
-  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-readdirp@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz"
-  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
-  dependencies:
-    graceful-fs "^4.1.11"
-    micromatch "^3.1.10"
-    readable-stream "^2.0.2"
-
-rechoir@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"
-  integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
-  dependencies:
-    resolve "^1.1.6"
-
-regex-not@^1.0.0, regex-not@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"
-  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
-  dependencies:
-    extend-shallow "^3.0.2"
-    safe-regex "^1.1.0"
-
-regexpp@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz"
-  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
-
-regexpp@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz"
-  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
-
-relateurl@0.2.x:
-  version "0.2.7"
-  resolved "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz"
-  integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
-
-remove-bom-buffer@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz"
-  integrity sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==
-  dependencies:
-    is-buffer "^1.1.5"
-    is-utf8 "^0.2.1"
-
-remove-bom-stream@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz"
-  integrity sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=
-  dependencies:
-    remove-bom-buffer "^3.0.0"
-    safe-buffer "^5.1.0"
-    through2 "^2.0.3"
-
-remove-trailing-separator@^1.0.1, remove-trailing-separator@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
-
-repeat-element@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz"
-  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
-
-repeat-string@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
-
-replace-ext@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
-  integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=
-
-replace-ext@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz"
-  integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
-
-replace-ext@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz"
-  integrity sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==
-
-replace-homedir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz"
-  integrity sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=
-  dependencies:
-    homedir-polyfill "^1.0.1"
-    is-absolute "^1.0.0"
-    remove-trailing-separator "^1.1.0"
-
-replacestream@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz"
-  integrity sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==
-  dependencies:
-    escape-string-regexp "^1.0.3"
-    object-assign "^4.0.1"
-    readable-stream "^2.0.2"
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
-
-require-from-string@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"
-  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
-
-require-main-filename@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"
-  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
-
-resolve-dir@^1.0.0, resolve-dir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"
-  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
-  dependencies:
-    expand-tilde "^2.0.0"
-    global-modules "^1.0.0"
-
-resolve-from@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"
-  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
-
-resolve-options@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz"
-  integrity sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=
-  dependencies:
-    value-or-function "^3.0.0"
-
-resolve-url@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"
-  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
-
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.19.0, resolve@^1.4.0:
-  version "1.22.0"
-  resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz"
-  integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
-  dependencies:
-    is-core-module "^2.8.1"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-restore-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"
-  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
-  dependencies:
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-
-ret@~0.1.10:
-  version "0.1.15"
-  resolved "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"
-  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
-
-reusify@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
-  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
-
-rimraf@2.6.3:
-  version "2.6.3"
-  resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
-  dependencies:
-    glob "^7.1.3"
-
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
-rollup-plugin-external-globals@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.npmjs.org/rollup-plugin-external-globals/-/rollup-plugin-external-globals-0.6.1.tgz"
-  integrity sha512-mlp3KNa5sE4Sp9UUR2rjBrxjG79OyZAh/QC18RHIjM+iYkbBwNXSo8DHRMZWtzJTrH8GxQ+SJvCTN3i14uMXIA==
-  dependencies:
-    "@rollup/pluginutils" "^4.0.0"
-    estree-walker "^2.0.1"
-    is-reference "^1.2.1"
-    magic-string "^0.25.7"
-
-rollup-plugin-html@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.npmjs.org/rollup-plugin-html/-/rollup-plugin-html-0.2.1.tgz"
-  integrity sha1-oYYuyoeuVLZ3aJ0NQTORHoImRj0=
-  dependencies:
-    html-minifier "^3.0.2"
-    rollup-pluginutils "^1.5.0"
-
-rollup-plugin-includepaths@^0.2.4:
-  version "0.2.4"
-  resolved "https://registry.npmjs.org/rollup-plugin-includepaths/-/rollup-plugin-includepaths-0.2.4.tgz"
-  integrity sha512-iZen+XKVExeCzk7jeSZPJKL7B67slZNr8GXSC5ROBXtDGXDBH8wdjMfdNW5hf9kPt+tHyIvWh3wlE9bPrZL24g==
-
-rollup-plugin-terser@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz"
-  integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==
-  dependencies:
-    "@babel/code-frame" "^7.10.4"
-    jest-worker "^26.2.1"
-    serialize-javascript "^4.0.0"
-    terser "^5.0.0"
-
-rollup-pluginutils@^1.5.0:
-  version "1.5.2"
-  resolved "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz"
-  integrity sha1-HhVud4+UtyVb+hs9AXi+j1xVJAg=
-  dependencies:
-    estree-walker "^0.2.1"
-    minimatch "^3.0.2"
-
-rollup@2.56.3, rollup@^2.41.4:
-  version "2.56.3"
-  resolved "https://registry.npmjs.org/rollup/-/rollup-2.56.3.tgz"
-  integrity sha512-Au92NuznFklgQCUcV96iXlxUbHuB1vQMaH76DHl5M11TotjOHwqk9CwcrT78+Tnv4FN9uTBxq6p4EJoYkpyekg==
-  optionalDependencies:
-    fsevents "~2.3.2"
-
-run-async@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz"
-  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
-
-run-parallel@^1.1.9:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"
-  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
-  dependencies:
-    queue-microtask "^1.2.2"
-
-rxjs@^6.6.0:
-  version "6.6.7"
-  resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz"
-  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
-  dependencies:
-    tslib "^1.9.0"
-
-safe-buffer@^5.1.0, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-safe-regex@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"
-  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
-  dependencies:
-    ret "~0.1.10"
-
-"safer-buffer@>= 2.1.2 < 3":
-  version "2.1.2"
-  resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-sax@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-
-semver-greatest-satisfied-range@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz"
-  integrity sha1-E+jCZYq5aRywzXEJMkAoDTb3els=
-  dependencies:
-    sver-compat "^1.5.0"
-
-"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-semver@^6.1.2:
-  version "6.3.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
-semver@^7.2.1:
-  version "7.3.5"
-  resolved "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"
-  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
-  dependencies:
-    lru-cache "^6.0.0"
-
-serialize-javascript@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz"
-  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
-  dependencies:
-    randombytes "^2.1.0"
-
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
-set-value@^2.0.0, set-value@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz"
-  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.3"
-    split-string "^3.0.1"
-
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
-  dependencies:
-    shebang-regex "^1.0.0"
-
-shebang-command@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"
-  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
-  dependencies:
-    shebang-regex "^3.0.0"
-
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
-
-shebang-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"
-  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-
-signal-exit@^3.0.2:
-  version "3.0.6"
-  resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz"
-  integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==
-
-slash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"
-  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-
-slice-ansi@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz"
-  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
-  dependencies:
-    ansi-styles "^3.2.0"
-    astral-regex "^1.0.0"
-    is-fullwidth-code-point "^2.0.0"
-
-slice-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz"
-  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
-  dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
-
-snapdragon-node@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"
-  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
-  dependencies:
-    define-property "^1.0.0"
-    isobject "^3.0.0"
-    snapdragon-util "^3.0.1"
-
-snapdragon-util@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"
-  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
-  dependencies:
-    kind-of "^3.2.0"
-
-snapdragon@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"
-  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
-  dependencies:
-    base "^0.11.1"
-    debug "^2.2.0"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    map-cache "^0.2.2"
-    source-map "^0.5.6"
-    source-map-resolve "^0.5.0"
-    use "^3.1.0"
-
-source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
-  version "0.5.3"
-  resolved "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz"
-  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
-  dependencies:
-    atob "^2.1.2"
-    decode-uri-component "^0.2.0"
-    resolve-url "^0.2.1"
-    source-map-url "^0.4.0"
-    urix "^0.1.0"
-
-source-map-support@~0.5.19:
-  version "0.5.21"
-  resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"
-  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-url@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz"
-  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
-
-source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.6:
-  version "0.5.7"
-  resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-source-map@~0.7.2:
-  version "0.7.3"
-  resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
-
-sourcemap-codec@^1.4.4:
-  version "1.4.8"
-  resolved "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"
-  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
-
-sparkles@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz"
-  integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==
-
-spdx-correct@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz"
-  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
-  dependencies:
-    spdx-expression-parse "^3.0.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-exceptions@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"
-  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
-
-spdx-expression-parse@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"
-  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
-  dependencies:
-    spdx-exceptions "^2.1.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-license-ids@^3.0.0:
-  version "3.0.11"
-  resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz"
-  integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==
-
-split-string@^3.0.1, split-string@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"
-  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
-  dependencies:
-    extend-shallow "^3.0.0"
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
-stack-trace@0.0.10:
-  version "0.0.10"
-  resolved "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"
-  integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
-
-static-extend@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"
-  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
-  dependencies:
-    define-property "^0.2.5"
-    object-copy "^0.1.0"
-
-stream-counter@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/stream-counter/-/stream-counter-1.0.0.tgz"
-  integrity sha1-kc8lac5NxQYf6816yyY5SloRR1E=
-
-stream-exhaust@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz"
-  integrity sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==
-
-stream-shift@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz"
-  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
-
-streamfilter@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/streamfilter/-/streamfilter-3.0.0.tgz"
-  integrity sha512-kvKNfXCmUyC8lAXSSHCIXBUlo/lhsLcCU/OmzACZYpRUdtKIH68xYhm/+HI15jFJYtNJGYtCgn2wmIiExY1VwA==
-  dependencies:
-    readable-stream "^3.0.6"
-
-string-width@^1.0.1, string-width@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-string-width@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
-string-width@^4.1.0, string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string_decoder@^1.1.1, string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^5.1.0, strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
-  dependencies:
-    ansi-regex "^4.1.0"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-bom@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz"
-  integrity sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=
-  dependencies:
-    first-chunk-stream "^1.0.0"
-    is-utf8 "^0.2.0"
-
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
-  dependencies:
-    is-utf8 "^0.2.0"
-
-strip-json-comments@^3.0.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
-  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
-supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^7.0.0, supports-color@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
-  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
-  dependencies:
-    has-flag "^4.0.0"
-
-supports-preserve-symlinks-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"
-  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
-
-sver-compat@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz"
-  integrity sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=
-  dependencies:
-    es6-iterator "^2.0.1"
-    es6-symbol "^3.1.1"
-
-table@^5.2.3:
-  version "5.4.6"
-  resolved "https://registry.npmjs.org/table/-/table-5.4.6.tgz"
-  integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
-  dependencies:
-    ajv "^6.10.2"
-    lodash "^4.17.14"
-    slice-ansi "^2.1.0"
-    string-width "^3.0.0"
-
-table@^6.0.9:
-  version "6.8.0"
-  resolved "https://registry.npmjs.org/table/-/table-6.8.0.tgz"
-  integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==
-  dependencies:
-    ajv "^8.0.1"
-    lodash.truncate "^4.4.2"
-    slice-ansi "^4.0.0"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-
-terser@5.4.0, terser@^5.0.0:
-  version "5.4.0"
-  resolved "https://registry.npmjs.org/terser/-/terser-5.4.0.tgz"
-  integrity sha512-3dZunFLbCJis9TAF2VnX+VrQLctRUmt1p3W2kCsJuZE4ZgWqh//+1MZ62EanewrqKoUf4zIaDGZAvml4UDc0OQ==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.7.2"
-    source-map-support "~0.5.19"
-
-text-table@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
-  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
-
-textextensions@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/textextensions/-/textextensions-3.3.0.tgz"
-  integrity sha512-mk82dS8eRABNbeVJrEiN5/UMSCliINAuz8mkUwH4SwslkNP//gbEzlWNS5au0z5Dpx40SQxzqZevZkn+WYJ9Dw==
-
-through2-filter@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz"
-  integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==
-  dependencies:
-    through2 "~2.0.0"
-    xtend "~4.0.0"
-
-through2@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz"
-  integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
-  dependencies:
-    readable-stream "2 || 3"
-
-through2@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz"
-  integrity sha1-390BLrnHAOIyP9M084rGIqs3Lac=
-  dependencies:
-    readable-stream "~1.0.17"
-    xtend "~3.0.0"
-
-through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0:
-  version "2.0.5"
-  resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"
-  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
-  dependencies:
-    readable-stream "~2.3.6"
-    xtend "~4.0.1"
-
-through2@^4.0.0, through2@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz"
-  integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==
-  dependencies:
-    readable-stream "3"
-
-through2@~0.4:
-  version "0.4.2"
-  resolved "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz"
-  integrity sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=
-  dependencies:
-    readable-stream "~1.0.17"
-    xtend "~2.1.1"
-
-through@^2.3.6:
-  version "2.3.8"
-  resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
-
-time-stamp@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz"
-  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
-
-tmp@^0.0.33:
-  version "0.0.33"
-  resolved "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
-  dependencies:
-    os-tmpdir "~1.0.2"
-
-to-absolute-glob@^2.0.0, to-absolute-glob@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz"
-  integrity sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=
-  dependencies:
-    is-absolute "^1.0.0"
-    is-negated-glob "^1.0.0"
-
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
-
-to-object-path@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"
-  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
-  dependencies:
-    kind-of "^3.0.2"
-
-to-regex-range@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"
-  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
-  dependencies:
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-to-regex@^3.0.1, to-regex@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"
-  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
-  dependencies:
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    regex-not "^1.0.2"
-    safe-regex "^1.1.0"
-
-to-through@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz"
-  integrity sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=
-  dependencies:
-    through2 "^2.0.3"
-
-tslib@^1.9.0:
-  version "1.14.1"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
-  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-
-tslib@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"
-  integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
-
-type-check@^0.4.0, type-check@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"
-  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
-  dependencies:
-    prelude-ls "^1.2.1"
-
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
-  dependencies:
-    prelude-ls "~1.1.2"
-
-type-fest@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"
-  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
-
-type-fest@^0.21.3:
-  version "0.21.3"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz"
-  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
-
-type-fest@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"
-  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
-
-type@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/type/-/type-1.2.0.tgz"
-  integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
-
-type@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.npmjs.org/type/-/type-2.5.0.tgz"
-  integrity sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==
-
-typedarray@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-
-uglify-js@3.4.x:
-  version "3.4.10"
-  resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz"
-  integrity sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==
-  dependencies:
-    commander "~2.19.0"
-    source-map "~0.6.1"
-
-unc-path-regex@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz"
-  integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
-
-undertaker-registry@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz"
-  integrity sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=
-
-undertaker@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz"
-  integrity sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==
-  dependencies:
-    arr-flatten "^1.0.1"
-    arr-map "^2.0.0"
-    bach "^1.0.0"
-    collection-map "^1.0.0"
-    es6-weak-map "^2.0.1"
-    fast-levenshtein "^1.0.0"
-    last-run "^1.1.0"
-    object.defaults "^1.0.0"
-    object.reduce "^1.0.0"
-    undertaker-registry "^1.0.0"
-
-union-value@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz"
-  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
-  dependencies:
-    arr-union "^3.1.0"
-    get-value "^2.0.6"
-    is-extendable "^0.1.1"
-    set-value "^2.0.1"
-
-unique-stream@^2.0.2:
-  version "2.3.1"
-  resolved "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz"
-  integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==
-  dependencies:
-    json-stable-stringify-without-jsonify "^1.0.1"
-    through2-filter "^3.0.0"
-
-unset-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"
-  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
-  dependencies:
-    has-value "^0.3.1"
-    isobject "^3.0.0"
-
-upath@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz"
-  integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
-
-upper-case@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz"
-  integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
-
-uri-js@^4.2.2:
-  version "4.4.1"
-  resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"
-  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
-  dependencies:
-    punycode "^2.1.0"
-
-urix@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"
-  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
-
-use@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/use/-/use-3.1.1.tgz"
-  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
-
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
-v8-compile-cache@^2.0.3:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"
-  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
-
-v8flags@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz"
-  integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==
-  dependencies:
-    homedir-polyfill "^1.0.1"
-
-validate-npm-package-license@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"
-  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
-  dependencies:
-    spdx-correct "^3.0.0"
-    spdx-expression-parse "^3.0.0"
-
-value-or-function@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz"
-  integrity sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=
-
-vinyl-fs@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz"
-  integrity sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==
-  dependencies:
-    fs-mkdirp-stream "^1.0.0"
-    glob-stream "^6.1.0"
-    graceful-fs "^4.0.0"
-    is-valid-glob "^1.0.0"
-    lazystream "^1.0.0"
-    lead "^1.0.0"
-    object.assign "^4.0.4"
-    pumpify "^1.3.5"
-    readable-stream "^2.3.3"
-    remove-bom-buffer "^3.0.0"
-    remove-bom-stream "^1.2.0"
-    resolve-options "^1.1.0"
-    through2 "^2.0.0"
-    to-through "^2.0.0"
-    value-or-function "^3.0.0"
-    vinyl "^2.0.0"
-    vinyl-sourcemap "^1.1.0"
-
-vinyl-sourcemap@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz"
-  integrity sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=
-  dependencies:
-    append-buffer "^1.0.2"
-    convert-source-map "^1.5.0"
-    graceful-fs "^4.1.6"
-    normalize-path "^2.1.1"
-    now-and-later "^2.0.0"
-    remove-bom-buffer "^3.0.0"
-    vinyl "^2.0.0"
-
-vinyl-sourcemaps-apply@0.2.1, vinyl-sourcemaps-apply@^0.2.0, vinyl-sourcemaps-apply@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz"
-  integrity sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=
-  dependencies:
-    source-map "^0.5.1"
-
-vinyl@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz"
-  integrity sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
-vinyl@^2.0.0, vinyl@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz"
-  integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==
-  dependencies:
-    clone "^2.1.1"
-    clone-buffer "^1.0.0"
-    clone-stats "^1.0.0"
-    cloneable-readable "^1.0.0"
-    remove-trailing-separator "^1.0.1"
-    replace-ext "^1.0.0"
-
-which-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"
-  integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
-
-which@^1.2.14, which@^1.2.9:
-  version "1.3.1"
-  resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
-which@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
-word-wrap@^1.2.3, word-wrap@~1.2.3:
-  version "1.2.3"
-  resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
-
-wrap-ansi@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"
-  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-write@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/write/-/write-1.0.3.tgz"
-  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
-  dependencies:
-    mkdirp "^0.5.1"
-
-xtend@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz"
-  integrity sha1-bv7MKk2tjmlixJAbM3znuoe10os=
-  dependencies:
-    object-keys "~0.4.0"
-
-xtend@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
-  integrity sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=
-
-xtend@~4.0.0, xtend@~4.0.1:
-  version "4.0.2"
-  resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"
-  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
-
-y18n@^3.2.1:
-  version "3.2.2"
-  resolved "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz"
-  integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-
-yargs-parser@>=5.0.0-security.0:
-  version "21.0.0"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.0.tgz"
-  integrity sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==
-
-yargs-parser@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz"
-  integrity sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==
-  dependencies:
-    camelcase "^3.0.0"
-    object.assign "^4.1.0"
-
-yargs@^7.1.0:
-  version "7.1.2"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz"
-  integrity sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==
-  dependencies:
-    camelcase "^3.0.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^1.0.2"
-    which-module "^1.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^5.0.1"