diff --git a/.docker/release/Dockerfile b/.docker/release/Dockerfile
index 0e6473191..d6675462e 100644
--- a/.docker/release/Dockerfile
+++ b/.docker/release/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
-FROM alpine:3.24.3 AS builder
-RUN apk add --no-cache php85 php85-json php-phar php-zip
+FROM alpine:3.18.5 AS builder
+RUN apk add --no-cache php82 php82-json php-phar php-zip
 RUN apk add --no-cache npm
 RUN npm install -g gulp yarn
 WORKDIR /source
@@ -23,7 +23,7 @@ RUN set -eux; \
     rm -v /snappymail/README.md /snappymail/_include.php
 
 # Inspired by the original Rainloop dockerfile from youtous on GitLab
-FROM php:8.5-fpm-alpine AS final
+FROM php:8.2-fpm-alpine AS final
 
 LABEL org.label-schema.description="SnappyMail webmail client image using nginx, php-fpm on Alpine"
 
@@ -99,6 +99,9 @@ RUN set -eux; \
 # mysql
 RUN docker-php-ext-install pdo_mysql
 
+# opcache
+RUN docker-php-ext-install opcache
+
 # postgres
 RUN set -eux; \
     apk add --no-cache postgresql-libs; \
@@ -119,13 +122,6 @@ RUN set -eux; \
     apk del .build-dependencies; \
     apk del .deps
 
-# sqlite
-RUN set -eux; \
-    apk add --no-cache sqlite-libs; \
-    apk add --no-cache --virtual .deps sqlite-dev; \
-    docker-php-ext-install pdo_sqlite; \
-    apk del .deps
-
 # tidy
 RUN set -eux; \
     apk add --no-cache tidyhtml; \
diff --git a/.docker/release/files/entrypoint.sh b/.docker/release/files/entrypoint.sh
index c0ed7df0c..75e82d729 100755
--- a/.docker/release/files/entrypoint.sh
+++ b/.docker/release/files/entrypoint.sh
@@ -9,12 +9,6 @@ UPLOAD_MAX_SIZE=${UPLOAD_MAX_SIZE:-25M}
 MEMORY_LIMIT=${MEMORY_LIMIT:-128M}
 SECURE_COOKIES=${SECURE_COOKIES:-true}
 
-# Disable listening on ipv6 for ipv4-only environments, or nginx will fail to start
-if ! ip a | grep 'inet6 ' > /dev/null; then
-    echo "[INFO] ipv6 is disabled. Configuring nginx to not listen on ipv6"
-    sed -i '/listen \[::\]:/d' /etc/nginx/nginx.conf
-fi
-
 # Set attachment size limit
 sed -i "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /usr/local/etc/php-fpm.d/php-fpm.conf /etc/nginx/nginx.conf
 sed -i "s/<MEMORY_LIMIT>/$MEMORY_LIMIT/g" /usr/local/etc/php-fpm.d/php-fpm.conf
diff --git a/SECURITY.md b/SECURITY.md
index 11d1ddada..faaba8d68 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -36,5 +36,5 @@ YMXQVq4SJt7UpWABAORudfJxsBqCRKtPlZMgGTJLjcOkyFJ9C2Fx7DeN0J4I
 ## Publishing and Credits
 
 I will analyze and fix the reported issue as fast as possible.
-Together with the reporter, I plan the disclosure of the found and fixed vulnerability.
+Together with the reporter I plan the disclosure of the found and fixed vulnerability.
 Credits to the reporter are granted and can be included in all public communication if desired.
diff --git a/cli/compile.php b/cli/compile.php
deleted file mode 100755
index 936643cc3..000000000
--- a/cli/compile.php
+++ /dev/null
@@ -1,247 +0,0 @@
-#!/usr/bin/php
-<?php
-define('ROOT_DIR', dirname(__DIR__));
-chdir(ROOT_DIR);
-
-$options = getopt('', ['readme','source','knockout','openpgp','squire']);
-$return_var = '';
-
-function execCmd($cmd)
-{
-	passthru($cmd, $return_var);
-	if ($return_var) {
-		exit("`{$cmd}` failed with error code {$return_var}\n");
-	}
-}
-
-if (isset($options['knockout'])) {
-	chdir(ROOT_DIR . '/vendors/knockout');
-	if ($grunt = trim(`which grunt`)) {
-		execCmd($grunt, $return_var);
-	} else {
-		exit('grunt not installed');
-	}
-
-	$file = ROOT_DIR . '/vendors/knockout/build/output/knockout-latest.js';
-	$data = file_get_contents($file);
-/*
-	Strip start: (()=>{'use strict';var aa="function"==typeof Object.defineProperties?Object.defineProperty:function(C,F,E){if(C==Array.prototype||C==Object.prototype)return C;C[F]=E.value;return C};function ba(C){C=["object"==typeof globalThis&&globalThis,C,"object"==typeof window&&window,"object"==typeof self&&self,"object"==typeof global&&global];for(var F=0;F<C.length;++F){var E=C[F];if(E&&E.Math==Math)return E}throw Error("Cannot find global object");}var ca=ba(this);
-function Z(C,F){if(F)a:{var E=ca;C=C.split(".");for(var J=0;J<C.length-1;J++){var S=C[J];if(!(S in E))break a;E=E[S]}C=C[C.length-1];J=E[C];F=F(J);F!=J&&null!=F&&aa(E,C,{configurable:!0,writable:!0,value:F})}}Z("Object.entries",function(C){return C?C:function(F){var E=[],J;for(J in F)Object.prototype.hasOwnProperty.call(F,J)&&E.push([J,F[J]]);return E}});
-Z("Array.prototype.includes",function(C){return C?C:function(F,E){var J=this;J instanceof String&&(J=String(J));var S=J.length;E=E||0;for(0>E&&(E=Math.max(E+S,0));E<S;E++){var V=J[E];if(V===F||Object.is(V,F))return!0}return!1}});
-	Strip end: })();
-*/
-
-	$p1 = strpos($data, '(()=>');
-	// ECMASCRIPT_202
-	$data = substr($data, 0, $p1) . substr($data, $p1 + 6, -6) . "\n";
-	// ECMASCRIPT_2018
-//	$data = substr($data, 0, $p1) . substr($data, $p1 + 19, -6) . "\n";
-	// ECMASCRIPT6
-//	$data = substr($data, 0, $p1) . substr($data, strpos($data, 'return!0}return!1}});') + 22, -6) . "\n";
-
-	file_put_contents($file, $data);
-	exit;
-}
-
-if (isset($options['openpgp'])) {
-	chdir(ROOT_DIR . '/vendors/openpgp-5');
-	execCmd('git pull', $return_var);
-	execCmd('./build.sh', $return_var);
-	exit;
-}
-
-if (isset($options['squire'])) {
-	chdir(ROOT_DIR . '/vendors/squire2');
-//	execCmd('git pull', $return_var);
-//	execCmd('git checkout snappymail', $return_var);
-	execCmd('./build.sh', $return_var);
-	exit;
-}
-
-if (isset($options['source'])) {
-	#cd ROOT_DIR . '/vendors/openpgp-2.6.2/';
-	#rollup -c
-	#npm cache clean --force
-
-	if ($gulp = trim(`which gulp`)) {
-		execCmd($gulp, $return_var);
-	} else {
-		exit('gulp not installed, run as root: npm install --global gulp-cli');
-	}
-
-	#rollup -c
-
-	$cmddir = escapeshellcmd(ROOT_DIR) . '/snappymail/v/0.0.0/static';
-
-	if ($gzip = trim(`which gzip`)) {
-		echo "\x1b[33;1m === Gzip *.js and *.css === \x1b[0m\n";
-//		execCmd("{$gzip} -k --best {$cmddir}/js/*.js");
-		execCmd("{$gzip} -k --best {$cmddir}/js/min/*.js");
-		execCmd("{$gzip} -k --best {$cmddir}/css/admin*.css");
-		execCmd("{$gzip} -k --best {$cmddir}/css/app*.css");
-//		unlink($cmddir . '/js/boot.js.gz');
-//		unlink($cmddir . '/js/min/boot.min.js.gz');
-	}
-
-	if ($brotli = trim(`which brotli`)) {
-		echo "\x1b[33;1m === Brotli *.js and *.css === \x1b[0m\n";
-//		execCmd("{$brotli} -k --best {$cmddir}/js/*.js");
-		execCmd("{$brotli} -k --best {$cmddir}/js/min/*.js");
-		execCmd("{$brotli} -k --best {$cmddir}/css/admin*.css");
-		execCmd("{$brotli} -k --best {$cmddir}/css/app*.css");
-//		unlink($cmddir . '/js/boot.js.br');
-//		unlink($cmddir . '/js/min/boot.min.js.br');
-	}
-}
-
-if (isset($options['readme'])) {
-
-	$basedir = escapeshellcmd(ROOT_DIR) . '/snappymail/v/0.0.0';
-
-	$readme = file_get_contents(ROOT_DIR . '/README.md');
-
-	$total = filesize("{$basedir}/static/js/serviceworker.js");
-	foreach (['admin','app','boot','libs','sieve'] as $name) {
-		$size = filesize("{$basedir}/static/js/{$name}.js");
-		$total += $size;
-		$readme = preg_replace("/(\\|{$name}\\.js\\s+\\|[\\s0-9.]+\\|)[\\s0-9.]+\\|/Ds",
-			'$1' . str_pad(number_format($size, 0, '', '.'), 9, ' ', STR_PAD_LEFT) . '	|',
-			$readme
-		);
-	}
-	$readme = preg_replace("/(\\|TOTAL\\s+\\|8[\\s0-9.]+\\|)[\\s0-9.]+\\|/Ds",
-		'$1' . str_pad(number_format($total, 0, '', '.'), 9, ' ', STR_PAD_LEFT) . '	|',
-		$readme
-	);
-
-	$total = [];
-	$total_br = [];
-	$total_gz = [];
-	foreach (['admin','app','boot','libs','sieve'] as $name) {
-		$size = filesize("{$basedir}/static/js/min/{$name}.min.js");
-		$size_br = filesize("{$basedir}/static/js/min/{$name}.min.js.br");
-		$size_gz = filesize("{$basedir}/static/js/min/{$name}.min.js.gz");
-		$total[$name] = $size;
-		$total_br[$name] = $size_br;
-		$total_gz[$name] = $size_gz;
-		$readme = preg_replace(
-			"/(\\|{$name}\\.min\\.js\\s+\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+\\|/Ds",
-			'$1|'
-			. str_pad(number_format($size, 0, '', '.'), 9, ' ', STR_PAD_LEFT) . '	'
-			. '$2|'
-			. str_pad(number_format($size_gz, 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
-			. '$3|'
-			. str_pad(number_format($size_br, 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
-			. '|'
-			,
-			$readme
-		);
-	}
-	$readme = preg_replace(
-		"/(TOTAL user\+sieve\\s+\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+\\|/Ds",
-		'$1|'
-		. str_pad(number_format(array_sum($total) - $total['admin'], 0, '', '.'), 9, ' ', STR_PAD_LEFT) . '	'
-		. '$2|'
-		. str_pad(number_format(array_sum($total_gz) - $total_gz['admin'], 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
-		. '$3|'
-		. str_pad(number_format(array_sum($total_br) - $total_br['admin'], 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
-		. '|'
-		,
-		$readme
-	);
-
-	//$smaller = 1217635 / (array_sum($total) - $total['admin']);
-	$smaller = 358761 / (array_sum($total_gz) - $total_gz['admin']);
-	//$smaller = 299485 / (array_sum($total_br) - $total_br['admin']);
-	$readme = preg_replace(
-		'/(For a user it is around) [0-9]+/',
-		'$1 ' . round(100 - 100 / $smaller),
-		$readme
-	);
-
-	unset($total['sieve']);
-	unset($total_br['sieve']);
-	unset($total_gz['sieve']);
-	$readme = preg_replace(
-		"/(TOTAL user\\s+\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+\\|/Ds",
-		'$1|'
-		. str_pad(number_format(array_sum($total) - $total['admin'], 0, '', '.'), 9, ' ', STR_PAD_LEFT) . '	'
-		. '$2|'
-		. str_pad(number_format(array_sum($total_gz) - $total_gz['admin'], 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
-		. '$3|'
-		. str_pad(number_format(array_sum($total_br) - $total_br['admin'], 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
-		. '|'
-		,
-		$readme
-	);
-	$readme = preg_replace(
-		"/(TOTAL admin\\s+\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+\\|/Ds",
-		'$1|'
-		. str_pad(number_format(array_sum($total) - $total['app'], 0, '', '.'), 9, ' ', STR_PAD_LEFT) . '	'
-		. '$2|'
-		. str_pad(number_format(array_sum($total_gz) - $total_gz['app'], 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
-		. '$3|'
-		. str_pad(number_format(array_sum($total_br) - $total_br['app'], 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
-		. '|'
-		,
-		$readme
-	);
-
-	foreach (['admin','app'] as $name) {
-		$readme = preg_replace(
-			"/(\\|{$name}\\.css\\s+\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+\\|[\\s0-9.]+\\|/Ds",
-			'$1|'
-			. str_pad(number_format(filesize("{$basedir}/static/css/{$name}.css"), 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
-			. '$2|'
-			. str_pad(number_format(filesize("{$basedir}/static/css/{$name}.css.gz"), 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	|'
-			. str_pad(number_format(filesize("{$basedir}/static/css/{$name}.css.br"), 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
-			. '|'
-			,
-			$readme
-		);
-		$readme = preg_replace(
-			"/(\\|{$name}\\.min\\.css\\s+\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+\\|[\\s0-9.]+\\|/Ds",
-			'$1|'
-			. str_pad(number_format(filesize("{$basedir}/static/css/{$name}.min.css"), 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
-			. '$2|'
-			. str_pad(number_format(filesize("{$basedir}/static/css/{$name}.min.css.gz"), 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	|'
-			. str_pad(number_format(filesize("{$basedir}/static/css/{$name}.min.css.br"), 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
-			. '|'
-			,
-			$readme
-		);
-	}
-
-
-	$sizes = [
-		filesize("{$basedir}/static/js/min/openpgp.min.js"),
-		filesize("{$basedir}/static/js/min/openpgp.min.js.gz"),
-		filesize("{$basedir}/static/js/min/openpgp.min.js.br")
-	];
-	//|openpgp.min.js 	|  330.742	|  540.542	|102.388	| 167.397	| 84.241  	| 137.502	|
-	$readme = preg_replace(
-		"/(openpgp\.min\.js\\s+\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+\\|/Ds",
-		'$1|'
-		. str_pad(number_format($sizes[0], 0, '', '.'), 9, ' ', STR_PAD_LEFT) . '	'
-		. '$2| '
-		. str_pad(number_format($sizes[1], 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
-		. '$3|  '
-		. str_pad(number_format($sizes[2], 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
-		. '|'
-		,
-		$readme
-	);
-
-	//file://
-
-	file_put_contents(ROOT_DIR . '/README.md', $readme);
-
-	$data = file_put_contents(
-		"{$basedir}/app/templates/Views/Admin/AdminSettingsAbout.html",
-		preg_replace(
-			'/20[0-9][0-9] ©/',
-			date('Y').' ©',
-			file_get_contents("{$basedir}/app/templates/Views/Admin/AdminSettingsAbout.html")
-		)
-	);
-}
diff --git a/cli/release.php b/cli/release.php
index fe406f7f3..aac915b02 100755
--- a/cli/release.php
+++ b/cli/release.php
@@ -9,7 +9,7 @@ if (isset($options['plugins'])) {
 	require(ROOT_DIR . '/build/plugins.php');
 }
 
-$gulp = trim(shell_exec('which gulp'));
+$gulp = trim(`which gulp`);
 if (!$gulp) {
 	exit('gulp not installed, run as root: npm install --global gulp-cli');
 }
@@ -34,7 +34,7 @@ $options['aur'] = isset($options['aur']);
 
 // Docker build
 $options['docker'] = isset($options['docker']);
-if ($options['docker'] && !($docker = trim(shell_exec('which docker')))) {
+if ($options['docker'] && !($docker = trim(`which docker`))) {
 	exit('docker not found');
 }
 if ($options['docker'] && $options['aur']) {
@@ -60,7 +60,7 @@ if (!isset($options['skip-gulp'])) {
 
 	$cmddir = escapeshellcmd(ROOT_DIR) . '/snappymail/v/0.0.0/static';
 
-	if ($gzip = trim(shell_exec('which gzip'))) {
+	if ($gzip = trim(`which gzip`)) {
 		echo "\x1b[33;1m === Gzip *.js and *.css === \x1b[0m\n";
 		passthru("{$gzip} -k --best {$cmddir}/js/*.js");
 		passthru("{$gzip} -k --best {$cmddir}/js/min/*.js");
@@ -70,7 +70,7 @@ if (!isset($options['skip-gulp'])) {
 		unlink(ROOT_DIR . '/snappymail/v/0.0.0/static/js/min/boot.min.js.gz');
 	}
 
-	if ($brotli = trim(shell_exec('which brotli'))) {
+	if ($brotli = trim(`which brotli`)) {
 		echo "\x1b[33;1m === Brotli *.js and *.css === \x1b[0m\n";
 		passthru("{$brotli} -k --best {$cmddir}/js/*.js");
 		passthru("{$brotli} -k --best {$cmddir}/js/min/*.js");
@@ -188,7 +188,7 @@ file_put_contents("{$destPath}core.json", '{
 // Arch User Repository
 if ($options['aur']) {
 	// extension_loaded('blake2')
-	if (!function_exists('b2sum') && $b2sum = trim(shell_exec('which b2sum'))) {
+	if (!function_exists('b2sum') && $b2sum = trim(`which b2sum`)) {
 		function b2sum($file) {
 			$file = escapeshellarg($file);
 			exec("b2sum --binary {$file} 2>&1", $output, $exitcode);
diff --git a/dev/App/User.js b/dev/App/User.js
index 5e28164ac..aafec7da3 100644
--- a/dev/App/User.js
+++ b/dev/App/User.js
@@ -1,7 +1,6 @@
 import 'External/User/ko';
 
 import { SMAudio } from 'Common/Audio';
-import { arrayLength } from 'Common/Utils';
 import { mailToHelper, setLayoutResizer, dropdownsDetectVisibility, loadAccountsAndIdentities } from 'Common/UtilsUser';
 
 import {
@@ -241,15 +240,7 @@ export class AppUser extends AbstractApp {
 
 	showMessageComposer(params = [])
 	{
-		let msg = params[1];
-		if (1 == arrayLength(msg)) {
-			msg = msg[0];
-		}
-		if (msg) {
-			msg.decrypt().then((/*success*/)=>showScreenPopup(ComposePopupView, params));
-		} else {
-			showScreenPopup(ComposePopupView, params);
-		}
+		showScreenPopup(ComposePopupView, params);
 	}
 }
 
@@ -260,8 +251,7 @@ AskPopupView.password = function(sAskDesc, btnText, ask) {
 			view => resolve({
 				password:view.passphrase(),
 				username:/*ask & 2 ? */view.username(),
-				remember:/*ask & 4 ? */view.remember(),
-				rememberPermanent: view.rememberPermanent(),
+				remember:/*ask & 4 ? */view.remember()
 			}),
 			() => resolve(null),
 			true,
diff --git a/dev/Common/Html.js b/dev/Common/Html.js
index d495a8c31..0be300ec9 100644
--- a/dev/Common/Html.js
+++ b/dev/Common/Html.js
@@ -232,7 +232,6 @@ export const
 			detectHiddenImages = true, // !!SettingsGet('try_to_detect_hidden_images'),
 
 			bqLevel = parseInt(SettingsUserStore.maxBlockquotesLevel()),
-			minFontSize = parseInt(SettingsUserStore.minFontSize()),
 
 			result = {
 				hasExternals: false,
@@ -258,15 +257,6 @@ export const
 				rightmargin: (value, node) => node.style.marginRight = pInt(value) + 'px'
 			},
 			allowedAttributes = [
-				// SnappyMail
-//				'data-x-href-broken',
-//				'data-x-href-tracking',
-				'data-x-src',
-//				'data-x-src-hidden',
-//				'data-x-src-tracking',
-//				'data-x-src-broken',
-//				'data-x-style-url',
-//				'data-x-style-broken-urls',
 				// defaults
 				'name',
 				'dir', 'lang', 'style', 'title',
@@ -309,11 +299,8 @@ export const
 			// Not supported by <template> element
 //			.replace(/<!doctype[^>]*>/gi, '')
 //			.replace(/<\?xml[^>]*\?>/gi, '')
-			// https://github.com/the-djmaze/snappymail/issues/1860
-			.replace(/<(\/?)x-html(\s[^>]*)?>/gi, '')
 			.replace(/<(\/?)head(\s[^>]*)?>/gi, '')
-			.replace(/<body(\s[^>]*)?>/i, '<div class="mail-body"$1>')
-			.replace(/<(\/?)body(\s[^>]*)?>/gi, '<$1div$2>')
+			.replace(/<(\/?)body(\s[^>]*)?>/gi, '<$1div class="mail-body"$2>')
 //			.replace(/<\/?(html|head)[^>]*>/gi, '')
 			// Fix Reddit https://github.com/the-djmaze/snappymail/issues/540
 			.replace(/<span class="preview-text"[\s\S]+?<\/span>/, '')
@@ -506,12 +493,12 @@ export const
 						let attachment;
 						if (value.startsWith('cid:'))
 						{
-							setAttribute('data-x-src', value);
 							value = value.slice(4);
+							setAttribute('data-x-src-cid', value);
 							attachment = findAttachmentByCid(value);
 							if (attachment?.download) {
 								oElement.src = attachment.linkPreview();
-//								oElement.title || (oElement.title = '+attachment.fileName);
+								oElement.title += ' ('+attachment.fileName+')';
 								attachment.isInline(true);
 								attachment.isLinked(true);
 							}
@@ -627,14 +614,12 @@ export const
 				if (urls_broken.length) {
 					setAttribute('data-x-style-broken-urls', JSON.stringify(urls_broken));
 				}
-
+/*
 				// https://github.com/the-djmaze/snappymail/issues/1082
-				// Use getComputedStyle?
-				if (oStyle.fontSize && minFontSize > pInt(oStyle.fontSize)) {
-					oStyle.fontSize = minFontSize + "px";
-//					oStyle.setProperty('font-size', minFontSize + "px");
+				if (11 > pInt(oStyle.fontSize)) {
+					oStyle.removeProperty('font-size');
 				}
-
+*/
 				// Removes background and color
 				// Many e-mails incorrectly only define one, not both
 				// And in dark theme mode this kills the readability
diff --git a/dev/External/User/ko.js b/dev/External/User/ko.js
index 2e951e576..78dc965eb 100644
--- a/dev/External/User/ko.js
+++ b/dev/External/User/ko.js
@@ -97,7 +97,7 @@ Object.assign(ko.bindingHandlers, {
 
 				fValue.subscribe(fUpdateEditorValue);
 
-				// ko.addDisposeCallback(element, () => {
+				// ko.utils.domNodeDisposal.addDisposeCallback(element, () => {
 				// });
 			}
 		}
diff --git a/dev/External/ko.js b/dev/External/ko.js
index d783ae1df..0d693148d 100644
--- a/dev/External/ko.js
+++ b/dev/External/ko.js
@@ -15,7 +15,6 @@ export const
 	 * based solely on the values of other observables in the application
 	 */
 	koComputable = fn => ko.computed(fn, {'pure':true}),
-//	koObservable = value => ko.observable(value),
 
 	addObservablesTo = (target, observables) =>
 		forEachObjectEntry(observables, (key, value) =>
@@ -31,7 +30,7 @@ export const
 
 	onEvent = (element, event, fn) => {
 		element.addEventListener(event, fn);
-		ko.addDisposeCallback(element, () => element.removeEventListener(event, fn));
+		ko.utils.domNodeDisposal.addDisposeCallback(element, () => element.removeEventListener(event, fn));
 	},
 
 	onKey = (key, element, fValueAccessor, fAllBindings, model) => {
@@ -176,6 +175,6 @@ ko.extenders.falseTimeout = (target, option) => {
 
 // functions
 
-ko.observable.fn.askDeleteHelper = function(prop='askDelete') {
-	return this.extend({ falseTimeout: 3000, toggleSubscribeProperty: [this, prop] });
+ko.observable.fn.askDeleteHelper = function() {
+	return this.extend({ falseTimeout: 3000, toggleSubscribeProperty: [this, 'askDelete'] });
 };
diff --git a/dev/Model/Email.js b/dev/Model/Email.js
index b4a77efcf..077aab37b 100644
--- a/dev/Model/Email.js
+++ b/dev/Model/Email.js
@@ -73,9 +73,4 @@ export class EmailModel extends AbstractModel {
 		}
 		return result || name;
 	}
-
-	get domain() {
-		return this.email.replace(/^.+@([^@]+)$/, '$1');
-//		return this.email.slice(this.email.lastIndexOf('@'))
-	}
 }
diff --git a/dev/Model/Identity.js b/dev/Model/Identity.js
index 4a93b2d81..ac38bc376 100644
--- a/dev/Model/Identity.js
+++ b/dev/Model/Identity.js
@@ -1,16 +1,19 @@
-//import { AbstractModel } from 'Knoin/AbstractModel';
-import { EmailModel } from 'Model/Email';
+import { AbstractModel } from 'Knoin/AbstractModel';
 import { addObservablesTo, addComputablesTo } from 'External/ko';
 
-export class IdentityModel extends EmailModel /*AbstractModel*/ {
+export class IdentityModel extends AbstractModel {
+	/**
+	 * @param {string} id
+	 * @param {string} email
+	 */
 	constructor() {
 		super();
 
 		addObservablesTo(this, {
 			id: '',
 			label: '',
-//			email: '',
-//			name: '',
+			email: '',
+			name: '',
 
 			replyTo: '',
 			bcc: '',
@@ -24,7 +27,6 @@ export class IdentityModel extends EmailModel /*AbstractModel*/ {
 
 			smimeKey: '',
 			smimeCertificate: '',
-			smimeCertificateChain: '',
 
 			askDelete: false,
 
@@ -34,18 +36,16 @@ export class IdentityModel extends EmailModel /*AbstractModel*/ {
 		addComputablesTo(this, {
 			smimeKeyEncrypted: () => this.smimeKey().includes('-----BEGIN ENCRYPTED PRIVATE KEY-----'),
 			smimeKeyValid: () => /^-----BEGIN (ENCRYPTED |RSA )?PRIVATE KEY-----/.test(this.smimeKey()),
-			smimeCertificateValid: () => /^-----BEGIN CERTIFICATE-----/.test(this.smimeCertificate()),
-			smimeCertificateChainValid: () => !this.smimeCertificateChain()
-				|| /^-----BEGIN CERTIFICATE-----/.test(this.smimeCertificateChain())
+			smimeCertificateValid: () => /^-----BEGIN CERTIFICATE-----/.test(this.smimeCertificate())
 		});
 	}
 
 	/**
 	 * @returns {string}
 	 */
-	toString() {
-		const name = this.name,
-			email = this.email,
+	formattedName() {
+		const name = this.name(),
+			email = this.email(),
 			label = this.label();
 		return (name ? `${name} ` : '') + `<${email}>` + (label ? ` (${label})` : '');
 	}
diff --git a/dev/Model/Message.js b/dev/Model/Message.js
index 9b320c14e..ebb936965 100644
--- a/dev/Model/Message.js
+++ b/dev/Model/Message.js
@@ -24,10 +24,6 @@ import Remote from 'Remote/User/Fetch';
 
 import { MimeToMessage } from 'Mime/Utils';
 
-import { PgpUserStore } from 'Stores/User/Pgp';
-import { IdentityUserStore } from 'Stores/User/Identity';
-import { Passphrases } from 'Storage/Passphrases';
-
 const
 	PreviewHTML = `<html>
 <head>
@@ -602,140 +598,4 @@ export class MessageModel extends AbstractModel {
 		return result.html || plainToHtml(this.plain());
 	}
 
-	async decrypt() {
-		const msg = this;
-		if (msg.pgpEncrypted() && !msg.pgpDecrypted()) {
-			return await msg.pgpDecrypt().then(()=>msg.pgpDecrypted());
-		}
-		if (msg.smimeEncrypted() && !msg.smimeDecrypted()) {
-			return await msg.smimeDecrypt().then(()=>msg.smimeDecrypted());
-		}
-		return true;
-	}
-/*
-	async decrypted() {
-		return msg.pgpDecrypted() || msg.smimeDecrypted());
-	}
-*/
-	async pgpDecrypt() {
-		const oMessage = this,
-			data = oMessage.pgpEncrypted();
-		delete data.error;
-		await PgpUserStore.decrypt(oMessage).then(result => {
-			if (!result) {
-				// TODO: translate
-				throw Error('Decryption failed, canceled or not possible');
-			}
-			oMessage.pgpDecrypted(true);
-			if (result.data) {
-				MimeToMessage(result.data, oMessage);
-				oMessage.html() ? oMessage.viewHtml() : oMessage.viewPlain();
-				if (result.signatures?.length) {
-					oMessage.pgpSigned({
-						signatures: result.signatures,
-						success: !!result.signatures.length
-					});
-				}
-			}
-		})
-		.catch(e => {
-			data.error = e.message;
-		})
-		.finally(() => {
-			oMessage.pgpEncrypted(data);
-		});
-	}
-
-	pgpVerify(/*self, event*/) {
-		const oMessage = this;
-		PgpUserStore.verify(oMessage).then(result => {
-			if (result) {
-				oMessage.pgpSigned(result);
-			} else {
-				alert('Verification failed or no valid public key found');
-			}
-/*
-			if (result?.success) {
-				i18n('CRYPTO/GOOD_SIGNATURE', {
-					USER: validKey.user + ' (' + validKey.id + ')'
-				});
-				message.getText()
-			} else {
-				const keyIds = arrayLength(signingKeyIds) ? signingKeyIds : null,
-					additional = keyIds
-						? keyIds.map(item => item?.toHex?.()).filter(v => v).join(', ')
-						: '';
-
-				i18n('CRYPTO/ERROR', {
-					TYPE: 'OpenPGP',
-					ERROR: 'message'
-				}) + (additional ? ' (' + additional + ')' : '');
-			}
-*/
-		});
-	}
-
-	async smimeDecrypt() {
-		const message = this;
-		const addresses = message.from.concat(message.to, message.cc, message.bcc).map(item => item.email),
-			identity = IdentityUserStore.find(item => addresses.includes(item.email)),
-			data = message.smimeEncrypted(); // { partId: "1" }
-		if (data && identity) {
-			delete data.error;
-			let pass, params = { ...data }; // clone
-			params.folder = message.folder;
-			params.uid = message.uid;
-//			params.bodyPart = params.bodyPart?.raw;
-			params.certificate = identity.smimeCertificate();
-			params.privateKey = identity.smimeKey();
-			if (identity.smimeKeyEncrypted()) {
-				pass = await Passphrases.ask(identity,
-					i18n('SMIME/PRIVATE_KEY_OF', {EMAIL: identity.email}),
-					'CRYPTO/DECRYPT'
-				);
-				if (!pass) {
-					return;
-				}
-				params.passphrase = pass?.password;
-			}
-			await Remote.post('SMimeDecryptMessage', null, params).then(response => {
-				if (response?.Result?.data) {
-					message.smimeDecrypted(true);
-					MimeToMessage(response.Result.data, message);
-					message.html() ? message.viewHtml() : message.viewPlain();
-					pass && pass.remember && Passphrases.handle(identity, pass.password);
-					if ('signed' in response.Result) {
-						message.smimeSigned(response.Result.signed);
-					}
-				}
-			}).catch(e => {
-				data.error = e.message
-			})
-			.finally(() => {
-				message.smimeEncrypted(data);
-			});
-		}
-	}
-
-	smimeVerify(/*self, event*/) {
-		const message = this,
-			data = message.smimeSigned(); // { partId: "1", micAlg: "pgp-sha256" }
-		if (data) {
-			const params = { ...data }; // clone
-			params.folder = message.folder;
-			params.uid = message.uid;
-			params.bodyPart = data.bodyPart?.raw;
-			params.sigPart = data.sigPart?.bodyRaw;
-			Remote.post('SMimeVerifyMessage', null, params).then(response => {
-				if (response?.Result) {
-					if (response.Result.body) {
-						MimeToMessage(response.Result.body, message);
-						message.html() ? message.viewHtml() : message.viewPlain();
-					}
-					data.success = response.Result.success;
-					message.smimeSigned(data);
-				}
-			});
-		}
-	}
 }
diff --git a/dev/Settings/Admin/Domains.js b/dev/Settings/Admin/Domains.js
index 1a769bb14..80fc9bff4 100644
--- a/dev/Settings/Admin/Domains.js
+++ b/dev/Settings/Admin/Domains.js
@@ -18,8 +18,8 @@ export class AdminSettingsDomains /*extends AbstractViewSettings*/ {
 	testUsername() {
 		Remote.request('AdminDomainMatch',
 			(iError, oData) => {
-				if (oData?.Result?.name) {
-					alert(`${oData.Result.email} matched domain: ${oData.Result.name}`);
+				if (oData?.Result?.domain) {
+					alert(`${oData.Result.email} matched domain: ${oData.Result.domain.name}`);
 				} else {
 					alert('No domain match');
 				}
diff --git a/dev/Settings/User/Contacts.js b/dev/Settings/User/Contacts.js
index 8d21cdb83..b3815ed56 100644
--- a/dev/Settings/User/Contacts.js
+++ b/dev/Settings/User/Contacts.js
@@ -2,7 +2,7 @@ import ko from 'ko';
 import { koComputable } from 'External/ko';
 
 import { SettingsGet } from 'Common/Globals';
-import { i18n, translateTrigger, getErrorMessage } from 'Common/Translator';
+import { i18n, translateTrigger } from 'Common/Translator';
 import { ContactUserStore } from 'Stores/User/Contact';
 import Remote from 'Remote/User/Fetch';
 
@@ -15,7 +15,6 @@ export class UserSettingsContacts /*extends AbstractViewSettings*/ {
 		this.syncUrl = ContactUserStore.syncUrl;
 		this.syncUser = ContactUserStore.syncUser;
 		this.syncPass = ContactUserStore.syncPass;
-		this.syncError = ko.observable('');
 
 		this.syncModeOptions = koComputable(() => {
 			translateTrigger();
@@ -49,15 +48,4 @@ export class UserSettingsContacts /*extends AbstractViewSettings*/ {
 			})
 		);
 	}
-
-	test() {
-		this.syncError('');
-		Remote.request('TestContactsSyncData', (iError, data) => {
-			iError && this.syncError(data.messageAdditional || data.message || getErrorMessage(iError, data));
-		}, {
-			Url: ContactUserStore.syncUrl(),
-			User: ContactUserStore.syncUser(),
-			Password: ContactUserStore.syncPass()
-		})
-	}
 }
diff --git a/dev/Settings/User/General.js b/dev/Settings/User/General.js
index d0f57062c..a05a3227d 100644
--- a/dev/Settings/User/General.js
+++ b/dev/Settings/User/General.js
@@ -44,51 +44,6 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 		this.desktopNotifications = NotificationUserStore.enabled;
 		this.isDesktopNotificationAllowed = NotificationUserStore.allowed;
 
-		const i18nSort = s => i18n('MESSAGE_LIST/SORT_'+s);
-		this.sortSupported = FolderUserStore.hasCapability('SORT');
-		this.sortOptions = [
-			{
-				value: '',
-				text: i18nSort('DATE_DESC')
-			},
-			{
-				value: 'DATE',
-				text: i18nSort('DATE_ASC')
-			},
-			{
-				value: 'FROM',
-				text: i18nSort('FROM_ASC')
-			},
-			{
-				value: 'REVERSE FROM',
-				text: i18nSort('FROM_DESC')
-			},
-			{
-				value: 'REVERSE SIZE',
-				text: i18nSort('SIZE_DESC')
-			},
-			{
-				value: 'SIZE',
-				text: i18nSort('SIZE_ASC')
-			},
-			{
-				value: 'SUBJECT',
-				text: i18nSort('SUBJECT_ASC')
-			},
-			{
-				value: 'REVERSE SUBJECT',
-				text: i18nSort('SUBJECT_DESC')
-			},
-			{
-				value: 'REVERSE ARRIVAL',
-				text: i18nSort('ARRIVAL_DESC')
-			},
-			{
-				value: 'ARRIVAL',
-				text: i18nSort('ARRIVAL_ASC')
-			}
-		];
-
 		this.threadsAllowed = AppUserStore.threadsAllowed;
 		// 'THREAD=REFS', 'THREAD=REFERENCES', 'THREAD=ORDEREDSUBJECT'
 		this.threadAlgorithms = ko.observableArray();
@@ -96,11 +51,12 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 			capa.startsWith('THREAD=') && this.threadAlgorithms.push(capa.slice(7))
 		);
 		this.threadAlgorithms.sort((a, b) => a.length - b.length);
+		this.threadAlgorithm = SettingsUserStore.threadAlgorithm;
 
-		['defaultSort', 'useThreads', 'threadAlgorithm',
+		['useThreads', 'threadAlgorithm',
 		 // These use addSetting()
 		 'layout', 'messageReadDelay', 'messagesPerPage', 'checkMailInterval',
-		 'editorDefaultType', 'editorWysiwyg', 'msgDefaultAction', 'maxBlockquotesLevel', 'minFontSize',
+		 'editorDefaultType', 'editorWysiwyg', 'msgDefaultAction', 'maxBlockquotesLevel',
 		 // These are in addSettings()
 		 'requestReadReceipt', 'requestDsn', 'requireTLS', 'pgpSign', 'pgpEncrypt',
 		 'viewHTML', 'viewImages', 'viewImagesWhitelist', 'removeColors', 'allowStyles', 'allowDraftAutosave',
@@ -122,7 +78,7 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 
 			identityMainDesc: () => {
 				const identity = IdentityUserStore.main();
-				return identity ? identity.toString() : '---';
+				return identity ? identity.formattedName() : '---';
 			},
 
 			editorDefaultTypes: () => {
@@ -161,8 +117,6 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 		this.addSetting('CheckMailInterval');
 		this.addSetting('Layout');
 		this.addSetting('MaxBlockquotesLevel');
-		this.addSetting('minFontSize');
-		this.addSetting('defaultSort');
 
 		this.addSettings([
 			'requestReadReceipt', 'requestDsn', 'requireTLS', 'pgpSign', 'pgpEncrypt',
diff --git a/dev/Storage/Passphrases.js b/dev/Storage/Passphrases.js
index 0242ddd45..db43925a0 100644
--- a/dev/Storage/Passphrases.js
+++ b/dev/Storage/Passphrases.js
@@ -1,155 +1,21 @@
 import { AskPopupView } from 'View/Popup/Ask';
 import { SettingsUserStore } from 'Stores/User/Settings';
-import { SettingsGet } from '../Common/Globals';
-import { isArray } from '../Common/Utils';
 
 export const Passphrases = new WeakMap();
 
-Passphrases.ask = async (key, sAskDesc, btnText) => {
-	if (Passphrases.has(key)) {
-		return { password: Passphrases.handle(key)/*, remember:false*/ };
-	} else if (Passphrases.hasInLocalStorage(key)) {
-		return { password: await getFromLocalStorage(key) };
-	} else {
-		const pass = await AskPopupView.password(sAskDesc, btnText,
-			window.crypto.subtle && canUseLocalStorage(key) ? 0b1101 : 0b0101);
-		pass.rememberPermanent && await saveToLocalStorage(key, pass.password);
-		return pass;
-	}
-};
-
-Passphrases._deleteFromSession = Passphrases.delete;
+Passphrases.ask = async (key, sAskDesc, btnText) =>
+	Passphrases.has(key)
+		? {password:Passphrases.handle(key)/*, remember:false*/}
+		: await AskPopupView.password(sAskDesc, btnText, 5);
 
 const timeouts = {};
 // get/set accessor to control deletion after N minutes of inactivity
 Passphrases.handle = (key, pass) => {
 	const timeout = SettingsUserStore.keyPassForget();
 	if (timeout && !timeouts[key]) {
-		timeouts[key] = (() => Passphrases._deleteFromSession(key)).debounce(timeout * 60 * 1000);
+		timeouts[key] = (()=>Passphrases.delete(key)).debounce(timeout * 1000);
 	}
 	pass && Passphrases.set(key, pass);
 	timeout && timeouts[key]();
 	return Passphrases.get(key);
 };
-
-const deleteFromLocalStorage = (key) => {
-	const keyId = getKeyId(key);
-	if (keyId) {
-		localStorage.removeItem(keyId);
-	}
-};
-Passphrases.delete = (key) => {
-	deleteFromLocalStorage(key);
-	return Passphrases._deleteFromSession(key);
-};
-
-Passphrases.hasInLocalStorage = (key) => {
-	const keyId = getKeyId(key);
-	return keyId && localStorage.getItem(keyId) !== null;
-};
-
-const saveToLocalStorage = async (key, pass) => {
-	const keyId = getKeyId(key);
-	if (!keyId) {
-		return;
-	}
-
-	if (!pass) {
-		localStorage.removeItem(keyId);
-		return;
-	}
-
-	try {
-		const salt = window.crypto.getRandomValues(new Uint8Array(16));
-		const derivedKey = await deriveKeyFromHash(SettingsGet('accountHash'), salt);
-
-		const iv = window.crypto.getRandomValues(new Uint8Array(12));
-		const encrypted = await window.crypto.subtle.encrypt(
-			{ name: 'AES-GCM', iv: iv },
-			derivedKey,
-			new TextEncoder().encode(pass)
-		);
-		localStorage.setItem(keyId, JSON.stringify([
-			btoa(String.fromCharCode.apply(null, salt)),
-			btoa(String.fromCharCode.apply(null, iv)),
-			btoa(String.fromCharCode.apply(null, new Uint8Array(encrypted)))
-		]));
-	} catch (e) {
-		console.error('Passphrases.saveToLocalStorage failed', e);
-	}
-};
-
-const getFromLocalStorage = async (key) => {
-	const keyId = getKeyId(key);
-	if (!keyId) {
-		return undefined;
-	}
-
-	const jsonData = localStorage.getItem(keyId);
-	if (!jsonData) {
-		console.error('Passphrases.getFromLocalStorage failed: no data found');
-		return undefined;
-	}
-
-	try {
-		const saltIvData = JSON.parse(jsonData);
-		if (!saltIvData || !isArray(saltIvData) || saltIvData.length !== 3) {
-			// noinspection ExceptionCaughtLocallyJS
-			throw new Error('invalid passphrase data');
-		}
-		const toUint8 = (str) => new Uint8Array(atob(str).split('').map(c => c.charCodeAt(0)));
-
-		const derivedKey = await deriveKeyFromHash(SettingsGet('accountHash'), toUint8(saltIvData[0]));
-		const decrypted = await window.crypto.subtle.decrypt(
-			{
-				name: 'AES-GCM',
-				iv: toUint8(saltIvData[1])
-			},
-			derivedKey,
-			toUint8(saltIvData[2])
-		);
-		return String.fromCharCode.apply(null, new Uint8Array(decrypted));
-	} catch (e) {
-		localStorage.removeItem(keyId);
-		console.error('Passphrases.getFromLocalStorage failed', e);
-		return undefined;
-	}
-};
-
-const canUseLocalStorage = (key) => getKeyId(key) !== undefined;
-
-const getKeyId = (key) => {
-	if (key && typeof key.id === 'string' && key.id.length > 4 && typeof key.forgetPass === 'function') {
-		// only deal with keys that we can forget (OpenPGB, GnuPG)
-		return key.id + '_local_key';
-	} else {
-		console.info('Passphrases.getKeyId: unsupported key type');
-		return undefined;
-	}
-};
-
-const deriveKeyFromHash = async (hash, salt) => {
-	if (!hash) {
-		throw new Error('empty accountHash');
-	}
-	return window.crypto.subtle.importKey(
-		'raw',
-		new TextEncoder().encode(hash),
-		{ 'name': 'PBKDF2' },
-		false,
-		['deriveKey']
-	).then(keyMaterial => {
-		return window.crypto.subtle.deriveKey(
-			{
-				'name': 'PBKDF2',
-				'salt': salt,
-				'iterations': 512,
-				'hash': 'SHA-256'
-			},
-			keyMaterial,
-			{ 'name': 'AES-GCM', 'length': 256 },
-			false,
-			['encrypt', 'decrypt']
-		);
-	});
-};
diff --git a/dev/Stores/User/GnuPG.js b/dev/Stores/User/GnuPG.js
index f70b9a3c3..3b9c85785 100644
--- a/dev/Stores/User/GnuPG.js
+++ b/dev/Stores/User/GnuPG.js
@@ -51,13 +51,6 @@ export const GnuPGUserStore = new class {
 						key.for = email => aEmails.includes(IDN.toASCII(email));
 						key.askDelete = ko.observable(false);
 						key.openForDeletion = ko.observable(null).askDeleteHelper();
-						key.askForgetPass = ko.observable(false);
-						key.openForPassForget = ko.observable(null).askDeleteHelper('askForgetPass');
-						key.forgetPass = () => {
-							Passphrases.delete(key);
-							key.hasStoredPass(false);
-						};
-						key.hasStoredPass = ko.observable(Passphrases.hasInLocalStorage(key));
 						key.remove = () => {
 							if (key.askDelete()) {
 								Remote.request('GnupgDeleteKey',
@@ -76,7 +69,6 @@ export const GnuPGUserStore = new class {
 										isPrivate: isPrivate
 									}
 								);
-								isPrivate && key.forgetPass();
 							}
 						};
 						if (isPrivate) {
diff --git a/dev/Stores/User/OpenPGP.js b/dev/Stores/User/OpenPGP.js
index 5c521d214..55acd484d 100644
--- a/dev/Stores/User/OpenPGP.js
+++ b/dev/Stores/User/OpenPGP.js
@@ -13,7 +13,7 @@ import { OpenPgpKeyPopupView } from 'View/Popup/OpenPgpKey';
 
 import { Passphrases } from 'Storage/Passphrases';
 
-import { baseCollator, getNotification } from 'Common/Translator';
+import { baseCollator } from 'Common/Translator';
 
 const
 	loaded = () => !!window.openpgp,
@@ -58,9 +58,10 @@ const
 	 */
 	publicKeysItem = 'openpgp-public-keys',
 	privateKeysItem = 'openpgp-private-keys',
+	storage = window.localStorage,
 	loadOpenPgpKeys = async itemname => {
 		let keys = [], key,
-			armoredKeys = JSON.parse(localStorage.getItem(itemname)),
+			armoredKeys = JSON.parse(storage.getItem(itemname)),
 			i = arrayLength(armoredKeys);
 		while (i--) try {
 			key = await openpgp.readKey({armoredKey:armoredKeys[i]});
@@ -73,9 +74,9 @@ const
 	storeOpenPgpKeys = (keys, section) => {
 		let armoredKeys = keys.map(item => item.armor);
 		if (armoredKeys.length) {
-			localStorage.setItem(section, JSON.stringify(armoredKeys));
+			storage.setItem(section, JSON.stringify(armoredKeys));
 		} else {
-			localStorage.removeItem(section);
+			storage.removeItem(section);
 		}
 	};
 
@@ -90,9 +91,6 @@ class OpenPgpKeyModel {
 		this.armor = armor;
 		this.askDelete = ko.observable(false);
 		this.openForDeletion = ko.observable(null).askDeleteHelper();
-		this.hasStoredPass = ko.observable(Passphrases.hasInLocalStorage(this));
-		this.askForgetPass = ko.observable(false);
-		this.openForPassForget = ko.observable(null).askDeleteHelper('askForgetPass');
 //		key.getUserIDs()
 //		key.getPrimaryUser()
 	}
@@ -118,29 +116,12 @@ class OpenPgpKeyModel {
 			if (this.key.isPrivate()) {
 				OpenPGPUserStore.privateKeys.remove(this);
 				storeOpenPgpKeys(OpenPGPUserStore.privateKeys, privateKeysItem);
-				this.forgetPass()
 			} else {
 				OpenPGPUserStore.publicKeys.remove(this);
 				storeOpenPgpKeys(OpenPGPUserStore.publicKeys, publicKeysItem);
 			}
-			Remote.request('DeletePGPKey',
-				(iError, oData) => {
-					if (oData) {
-						if (iError || oData.Result === false) {
-							alert(oData.message || getNotification(iError));
-						}
-					}
-				}, {
-					key: this.armor
-				}
-			);
 		}
 	}
-
-	forgetPass() {
-		Passphrases.delete(this);
-		this.hasStoredPass(false);
-	}
 /*
 	toJSON() {
 		return this.armor;
diff --git a/dev/Stores/User/Settings.js b/dev/Stores/User/Settings.js
index 841e89302..382c74289 100644
--- a/dev/Stores/User/Settings.js
+++ b/dev/Stores/User/Settings.js
@@ -5,7 +5,6 @@ import { LayoutSideView, LayoutBottomView } from 'Common/EnumsUser';
 import { pInt } from 'Common/Utils';
 import { $htmlCL, SettingsGet, fireEvent } from 'Common/Globals';
 import { ThemeStore } from 'Stores/Theme';
-import { FolderUserStore } from 'Stores/User/Folder';
 
 export const SettingsUserStore = new class {
 	constructor() {
@@ -23,7 +22,6 @@ export const SettingsUserStore = new class {
 			allowStyles: 0,
 			collapseBlockquotes: 1,
 			maxBlockquotesLevel: 0,
-			minFontSize: 0,
 			listInlineAttachments: 0,
 			simpleAttachmentsList: 0,
 			useCheckboxesInList: 1,
@@ -31,7 +29,6 @@ export const SettingsUserStore = new class {
 			showNextMessage: 0,
 			allowDraftAutosave: 1,
 			useThreads: 0,
-			defaultSort: '',
 			threadAlgorithm: '',
 			replySameFolder: 0,
 			hideUnsubscribed: 0,
@@ -99,7 +96,6 @@ export const SettingsUserStore = new class {
 			'AllowStyles',
 			'CollapseBlockquotes',
 			'MaxBlockquotesLevel',
-			'minFontSize',
 			'ListInlineAttachments',
 			'simpleAttachmentsList',
 			'UseCheckboxesInList',
@@ -107,7 +103,6 @@ export const SettingsUserStore = new class {
 			'showNextMessage',
 			'AllowDraftAutosave',
 			'useThreads',
-			'defaultSort',
 			'threadAlgorithm',
 			'ReplySameFolder',
 			'HideUnsubscribed',
@@ -166,7 +161,5 @@ export const SettingsUserStore = new class {
 		self.messageReadDelay(pInt(SettingsGet('MessageReadDelay')));
 		self.autoLogout(pInt(SettingsGet('AutoLogout')));
 		self.keyPassForget(pInt(SettingsGet('keyPassForget')));
-
-		FolderUserStore.sortMode(self.defaultSort());
 	}
 };
diff --git a/dev/Styles/Languages.less b/dev/Styles/Languages.less
index e0046710d..ae5b95eb7 100644
--- a/dev/Styles/Languages.less
+++ b/dev/Styles/Languages.less
@@ -1,6 +1,6 @@
 #V-PopupsLanguages {
 
-	max-width: 720px;
+	max-width: 710px;
 
 	label {
 		display: inline-block;
diff --git a/dev/Styles/User/Contacts.less b/dev/Styles/User/Contacts.less
index d9744e907..11d0bb87b 100644
--- a/dev/Styles/User/Contacts.less
+++ b/dev/Styles/User/Contacts.less
@@ -125,9 +125,8 @@
 	/* Right */
 
 	.right {
-		border-left: 1px solid var(--border-color, #ddd);
-		max-width: 600px;
 		width: 100%;
+		border-left: 1px solid var(--border-color, #ddd);
 	}
 
 	.b-view-content-toolbar {
diff --git a/dev/Styles/User/FolderList.less b/dev/Styles/User/FolderList.less
index d920dfd90..6157ec2e1 100644
--- a/dev/Styles/User/FolderList.less
+++ b/dev/Styles/User/FolderList.less
@@ -82,7 +82,7 @@
 			border-left: 3px solid transparent;
 			color: var(--folders-color, #333);
 			display: block;
-			line-height: 2.2em;
+			line-height: 34px;
 			padding: 0 2em 0 @folderItemPadding;
 			position: relative;
 			text-decoration: none;
@@ -151,7 +151,7 @@
 		color: var(--unread-count-color, #fff);
 		font-size: 80%;
 		line-height: 1.5em;
-		margin-top: 0.5em;
+		margin-top: 7px;
 		min-width: 1.7em;
 		padding: 1px 4px;
 		text-align: center;
diff --git a/dev/Styles/User/SettingsAccounts.less b/dev/Styles/User/SettingsAccounts.less
index 5b7f5c91a..54e58c288 100644
--- a/dev/Styles/User/SettingsAccounts.less
+++ b/dev/Styles/User/SettingsAccounts.less
@@ -45,8 +45,4 @@
 		content: ')';
 	}
 
-	.identities-list tr + tr .identity-default {
-		display: none;
-	}
-
 }
diff --git a/dev/View/Popup/Ask.js b/dev/View/Popup/Ask.js
index 8392dfcbd..8d7c7bca0 100644
--- a/dev/View/Popup/Ask.js
+++ b/dev/View/Popup/Ask.js
@@ -15,14 +15,10 @@ export class AskPopupView extends AbstractViewPopup {
 			askUsername: false,
 			passphrase: '',
 			askPass: false,
-			remember: true, // remember for session
-			askRemeber: false,
-			rememberPermanent: false,
-			askRememberPermanent: false,
+			remember: true,
+			askRemeber: false
 		});
 
-		this.rememberPermanent.subscribe(value => value && this.remember(true));
-
 		this.fYesAction = null;
 		this.fNoAction = null;
 
@@ -52,12 +48,10 @@ export class AskPopupView extends AbstractViewPopup {
 		this.askDesc(sAskDesc || '');
 		this.askUsername(ask & 2);
 		this.askPass(ask & 1);
-		this.askRemeber(ask & 4); // 0b0100
-		this.askRememberPermanent(ask & 0b1000)
+		this.askRemeber(ask & 4);
 		this.username('');
 		this.passphrase('');
 		this.remember(true);
-		this.rememberPermanent(false);
 		this.yesButton(i18n(btnText || 'GLOBAL/YES'));
 		this.noButton(i18n(ask ? 'GLOBAL/CANCEL' : 'GLOBAL/NO'));
 		this.fYesAction = fYesFunc;
diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index ffa49a2a4..302017dfb 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -44,7 +44,6 @@ import Remote from 'Remote/User/Fetch';
 
 import { ComposeAttachmentModel } from 'Model/ComposeAttachment';
 import { EmailModel } from 'Model/Email';
-import { IdentityModel } from 'Model/Identity';
 import { MimeHeaderAutocryptModel } from 'Model/MimeHeaderAutocrypt';
 import { addressparser } from 'Mime/Address';
 
@@ -93,7 +92,7 @@ const
 
 	findIdentity = addresses => {
 		addresses = addresses.map(item => item.email);
-		return IdentityUserStore.find(item => addresses.includes(item.email));
+		return IdentityUserStore.find(item => addresses.includes(item.email()));
 	},
 
 	/**
@@ -344,7 +343,7 @@ export class ComposePopupView extends AbstractViewPopup {
 				IdentityUserStore.map(item => ({
 					item: item,
 					optValue: item.id(),
-					optText: item
+					optText: item.formattedName()
 				})),
 
 			canBeSentOrSaved: () => !this.sending() && !this.saving()
@@ -359,7 +358,7 @@ export class ComposePopupView extends AbstractViewPopup {
 
 			currentIdentity: value => {
 				if (value) {
-					this.from(value.toString());
+					this.from(value.formattedName());
 					this.doEncrypt(value.pgpEncrypt() || SettingsUserStore.pgpEncrypt());
 					this.doSign(value.pgpSign() || SettingsUserStore.pgpSign());
 				}
@@ -455,7 +454,7 @@ export class ComposePopupView extends AbstractViewPopup {
 			contactsCommand: self => self.allowContacts
 		});
 
-		this.from(IdentityUserStore()[0].toString());
+		this.from(IdentityUserStore()[0].formattedName());
 	}
 
 	sentFolder()
@@ -863,7 +862,6 @@ export class ComposePopupView extends AbstractViewPopup {
 				case ComposeType.Forward:
 				case ComposeType.ForwardAsAttachment:
 					identity = findIdentity(oLastMessage.to.concat(oLastMessage.cc, oLastMessage.bcc))
-						|| findIdentity(oLastMessage.from)
 						/* || findIdentity(oLastMessage.deliveredTo)*/;
 					break;
 				case ComposeType.Draft:
@@ -873,20 +871,10 @@ export class ComposePopupView extends AbstractViewPopup {
 //				case ComposeType.Empty:
 			}
 		}
-		// Set from custom email
-		if (!identity
-			&& oLastMessage && (ComposeType.Reply === options.mode || ComposeType.ReplyAll === options.mode)
-			&& 1 === oLastMessage.to.length
-//			&& mEmail.includes(oLastMessage.to[0].domain)
-		) {
-			identity = new IdentityModel;
-			identity.name = oLastMessage.to[0].name;
-			identity.email = oLastMessage.to[0].email;
-		}
 		identity = identity || IdentityUserStore()[0];
 		if (identity) {
-//			excludeEmail.add(identity.email);
-			excludeEmail[identity.email] = true;
+//			excludeEmail.add(identity.email());
+			excludeEmail[identity.email()] = true;
 		}
 
 		if (arrayLength(options.to)) {
@@ -971,7 +959,7 @@ export class ComposePopupView extends AbstractViewPopup {
 			// https://github.com/the-djmaze/snappymail/issues/491
 			tpl.innerHTML = oLastMessage.bodyAsHTML();
 			tpl.content.querySelectorAll('img').forEach(img => {
-				img.src || img.dataset.xSrc || img.replaceWith(img.alt || img.title)
+				img.src || img.dataset.xSrcCid || img.dataset.xSrc || img.replaceWith(img.alt || img.title)
 			});
 			sText = tpl.innerHTML.trim();
 
@@ -1393,7 +1381,7 @@ export class ComposePopupView extends AbstractViewPopup {
 	allRecipients() {
 		return [
 				// From/sender is also recipient (Sent mailbox)
-//				this.currentIdentity().email,
+//				this.currentIdentity().email(),
 				this.from(),
 				this.to(),
 				this.cc(),
@@ -1413,8 +1401,7 @@ export class ComposePopupView extends AbstractViewPopup {
 		key && options.push(['OpenPGP', key]);
 		key = GnuPGUserStore.getPrivateKeyFor(email, 1);
 		key && options.push(['GnuPG', key]);
-		identity.smimeKeyValid() && identity.smimeCertificateValid()
-			&& identity.smimeCertificateChainValid() && identity.email === email
+		identity.smimeKeyValid() && identity.smimeCertificateValid() && identity.email() === email
 			&& options.push(['S/MIME']);
 		console.dir({signOptions: options});
 		this.signOptions(options);
@@ -1433,7 +1420,7 @@ export class ComposePopupView extends AbstractViewPopup {
 
 			const count = recipients.length,
 				identity = this.currentIdentity(),
-				from = (identity.smimeKey() && identity.smimeCertificate()) ? identity.email : null;
+				from = (identity.smimeKey() && identity.smimeCertificate()) ? identity.email() : null;
 			count
 				&& count === recipients.filter(email =>
 					email == from
@@ -1510,21 +1497,12 @@ export class ComposePopupView extends AbstractViewPopup {
 				 **/
 				linkedData: []
 			},
-			recipients = draft ? [identity.email] : this.allRecipients(),
+			recipients = draft ? [identity.email()] : this.allRecipients(),
 			signOptions = !draft && this.doSign() && this.signOptions(),
 			encryptOptions = this.doEncrypt() && this.encryptOptions(),
 			isHtml = this.oEditor.isHtml();
 
 		if (isHtml) {
-			tpl.innerHTML = Text;
-			tpl.content.querySelectorAll('img').forEach(img => {
-				if (img.dataset.xSrc) {
-					img.src = img.dataset.xSrc;
-					img.removeAttribute('data-x-src')
-				}
-			});
-			Text = tpl.innerHTML.trim();
-
 			do {
 				l = Text.length;
 				Text = Text
@@ -1594,7 +1572,6 @@ export class ComposePopupView extends AbstractViewPopup {
 */
 						break;
 					} catch (e) {
-						Passphrases.delete(signOptions[i][1])
 						console.error(e);
 					}
 				} else if ('GnuPG' == signOptions[i][0]) {
@@ -1612,12 +1589,11 @@ export class ComposePopupView extends AbstractViewPopup {
 					// TODO: sign in PHP fails
 					params.sign = 'S/MIME';
 //					params.signCertificate = identity.smimeCertificate();
-//					params.signCertificateChain = identity.smimeCertificateChain();
 //					params.signPrivateKey = identity.smimeKey();
 //					params.attachCertificate = false;
 					if (identity.smimeKeyEncrypted()) {
 						const pass = await Passphrases.ask(identity,
-							i18n('SMIME/PRIVATE_KEY_OF', {EMAIL: identity.email}),
+							i18n('SMIME/PRIVATE_KEY_OF', {EMAIL: identity.email()}),
 							'CRYPTO/SIGN'
 						);
 						if (null != pass) {
@@ -1637,9 +1613,7 @@ export class ComposePopupView extends AbstractViewPopup {
 					Object.entries(PgpUserStore.getPublicKeyOfEmails(recipients) || {}).forEach(([k,v]) =>
 						params.autocrypt.push({
 							addr: k,
-							keydata: v
-								.replace(/-----(BEGIN|END) PGP PUBLIC KEY BLOCK-----/g, '')
-								.replace(/\s+/g, '') // Single base64 string, let the server do compliance formatting
+							keydata: v.replace(/-----(BEGIN|END) PGP PUBLIC KEY BLOCK-----/g, '').trim()
 						})
 					);
 				for (let i = 0; i < encryptOptions.length; ++i) {
@@ -1659,7 +1633,7 @@ export class ComposePopupView extends AbstractViewPopup {
 					if ('S/MIME' == encryptOptions[i]) {
 						params.encryptCertificates = [identity.smimeCertificate()];
 						SMimeUserStore.forEach(certificate => {
-							certificate.emailAddress != identity.email
+							certificate.emailAddress != identity.email()
 							&& recipients.includes(certificate.emailAddress)
 							&& params.encryptCertificates.push(certificate.id)
 						});
diff --git a/dev/View/Popup/Identity.js b/dev/View/Popup/Identity.js
index b47b9d07d..f061da0ed 100644
--- a/dev/View/Popup/Identity.js
+++ b/dev/View/Popup/Identity.js
@@ -57,8 +57,8 @@ export class IdentityPopupView extends AbstractViewPopup {
 						this.submitError(oData.message);
 					}
 				}, {
-					name: identity.name,
-					email: identity.email,
+					name: identity.name(),
+					email: identity.email(),
 					privateKey: identity.smimeKey(),
 					passphrase: result.password
 				});
diff --git a/dev/View/Popup/OpenPgpGenerate.js b/dev/View/Popup/OpenPgpGenerate.js
index e785af81e..a2ec51515 100644
--- a/dev/View/Popup/OpenPgpGenerate.js
+++ b/dev/View/Popup/OpenPgpGenerate.js
@@ -105,9 +105,9 @@ export class OpenPgpGeneratePopupView extends AbstractViewPopup {
 	}
 
 	onShow() {
-		this.name(''/*IdentityUserStore()[0].name*/);
+		this.name(''/*IdentityUserStore()[0].name()*/);
 		this.password('');
-		this.email(''/*IdentityUserStore()[0].email*/);
+		this.email(''/*IdentityUserStore()[0].email()*/);
 		this.emailError(false);
 		this.submitError('');
 	}
diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index e273e3069..a55062be5 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -213,19 +213,15 @@ export class MailMessageList extends AbstractViewRight {
 
 			sortText: () => {
 				let mode = FolderUserStore.sortMode(),
-					has = w => mode.includes(w),
-					desc = '' === mode || has('REVERSE');
+					desc = '' === mode || mode.includes('REVERSE');
 				mode = mode.split(/\s+/);
-				if (has('FROM')) {
+				if (mode.includes('FROM')) {
 					 return '@' + (desc ? '⬆' : '⬇');
 				}
-				if (has('SUBJECT')) {
+				if (mode.includes('SUBJECT')) {
 					 return '𝐒' + (desc ? '⬆' : '⬇');
 				}
-				if (has('SIZE')) {
-					 return '✉' + (desc ? '⬇' : '⬆');
-				}
-				return (has('ARRIVAL') ? '📨' : '📅') + (desc ? '⬇' : '⬆');
+				return (mode.includes('SIZE') ? '✉' : '📅') + (desc ? '⬇' : '⬆');
 			},
 
 			downloadAsZipAllowed: () => this.attachmentsActions.includes('zip')
@@ -303,14 +299,14 @@ export class MailMessageList extends AbstractViewRight {
 				item => sFolder === item?.folder && iUid == item?.uid
 			);
 
-			if ('INBOX' === sFolder && 'INBOX' !== FolderUserStore.currentFolderFullName()) {
+			if ('INBOX' === sFolder) {
 				hasher.setHash(mailBox(sFolder));
 			}
 
 			if (message) {
 				this.selector.selectMessageItem(message);
 			} else {
-				if ('INBOX' !== sFolder && sFolder !== FolderUserStore.currentFolderFullName()) {
+				if ('INBOX' !== sFolder) {
 					hasher.setHash(mailBox(sFolder));
 				}
 				if (sFolder && iUid) {
diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js
index 7139d9d03..5a879466e 100644
--- a/dev/View/User/MailBox/MessageView.js
+++ b/dev/View/User/MailBox/MessageView.js
@@ -56,6 +56,9 @@ import { showScreenPopup } from 'Knoin/Knoin';
 import { OpenPgpImportPopupView } from 'View/Popup/OpenPgpImport';
 import { GnuPGUserStore } from 'Stores/User/GnuPG';
 import { OpenPGPUserStore } from 'Stores/User/OpenPGP';
+import { IdentityUserStore } from 'Stores/User/Identity';
+
+import { Passphrases } from 'Storage/Passphrases';
 
 const
 	oMessageScrollerDom = () => elementById('messageItem') || {},
@@ -130,8 +133,6 @@ export class MailMessageView extends AbstractViewRight {
 			// viewer
 			viewFromShort: '',
 			dkimData: ['none', '', ''],
-			spfData: ['none', '', ''],
-			dmarcData: ['none', '', ''],
 			nowTracking: false
 		});
 
@@ -196,7 +197,7 @@ export class MailMessageView extends AbstractViewRight {
 			dkimIcon: () => {
 				switch (this.dkimData()[0]) {
 					case 'none':
-						return '🚫︎';
+						return '';
 					case 'pass':
 						return '✔';
 					default:
@@ -204,43 +205,12 @@ export class MailMessageView extends AbstractViewRight {
 				}
 			},
 			dkimIconClass: () => 'pass' === this.dkimData()[0] ? 'iconcolor-green' : 'iconcolor-red',
+
 			dkimTitle:() => {
 				const dkim = this.dkimData();
 				return dkim[0] ? dkim[2] || 'DKIM: ' + dkim[0] : '';
 			},
 
-			spfIcon: () => {
-				switch (this.spfData()[0]) {
-					case 'none':
-						return '🚫︎';
-					case 'pass':
-						return '✔';
-					default:
-						return '✖';
-				}
-			},
-			spfIconClass: () => 'pass' === this.spfData()[0] ? 'iconcolor-green' : 'iconcolor-red',
-			spfTitle:() => {
-				const spf = this.spfData();
-				return spf[0] ? spf[2] || 'SPF: ' + spf[0] : '';
-			},
-
-			dmarcIcon: () => {
-				switch (this.dmarcData()[0]) {
-					case 'none':
-						return '🚫︎';
-					case 'pass':
-						return '✔';
-					default:
-						return '✖';
-				}
-			},
-			dmarcIconClass: () => 'pass' === this.dmarcData()[0] ? 'iconcolor-green' : 'iconcolor-red',
-			dmarcTitle:() => {
-				const dmarc = this.dmarcData();
-				return dmarc[0] ? dmarc[2] || 'DMARC: ' + dmarc[0] : '';
-			},
-
 			showWhitelistOptions: () => 'match' === SettingsUserStore.viewImages(),
 
 			firstUnsubsribeLink: () => currentMessage()?.unsubsribeLinks()[0] || '',
@@ -263,8 +233,6 @@ export class MailMessageView extends AbstractViewRight {
 					// TODO: make first param a user setting #683
 					this.viewFromShort(message.from.toString(false, true));
 					this.dkimData(message.dkim[0] || ['none', '', '']);
-					this.spfData(message.spf[0] || ['none', '', '']);
-					this.dmarcData(message.dmarc[0] || ['none', '', '']);
 					this.nowTracking(false);
 				} else {
 					MessagelistUserStore.selectedMessage(null);
@@ -642,19 +610,125 @@ export class MailMessageView extends AbstractViewRight {
 	}
 
 	pgpDecrypt() {
-		currentMessage().decrypt();
+		const oMessage = currentMessage(),
+			data = oMessage.pgpEncrypted();
+		delete data.error;
+		PgpUserStore.decrypt(oMessage).then(result => {
+			if (!result) {
+				// TODO: translate
+				throw Error('Decryption failed, canceled or not possible');
+			}
+			oMessage.pgpDecrypted(true);
+			if (result.data) {
+				MimeToMessage(result.data, oMessage);
+				oMessage.html() ? oMessage.viewHtml() : oMessage.viewPlain();
+				if (result.signatures?.length) {
+					oMessage.pgpSigned({
+						signatures: result.signatures,
+						success: !!result.signatures.length
+					});
+				}
+			}
+		})
+		.catch(e => {
+			data.error = e.message;
+		})
+		.finally(() => {
+			oMessage.pgpEncrypted(data);
+		});
 	}
 
 	pgpVerify(/*self, event*/) {
-		currentMessage().pgpVerify();
+		const oMessage = currentMessage()/*, ctrl = event.target.closest('.openpgp-control')*/;
+		PgpUserStore.verify(oMessage).then(result => {
+			if (result) {
+				oMessage.pgpSigned(result);
+			} else {
+				alert('Verification failed or no valid public key found');
+			}
+/*
+			if (result?.success) {
+				i18n('CRYPTO/GOOD_SIGNATURE', {
+					USER: validKey.user + ' (' + validKey.id + ')'
+				});
+				message.getText()
+			} else {
+				const keyIds = arrayLength(signingKeyIds) ? signingKeyIds : null,
+					additional = keyIds
+						? keyIds.map(item => item?.toHex?.()).filter(v => v).join(', ')
+						: '';
+
+				i18n('CRYPTO/ERROR', {
+					TYPE: 'OpenPGP',
+					ERROR: 'message'
+				}) + (additional ? ' (' + additional + ')' : '');
+			}
+*/
+		});
 	}
 
 	async smimeDecrypt() {
-		currentMessage().decrypt();
+		const message = currentMessage();
+		const addresses = message.from.concat(message.to, message.cc, message.bcc).map(item => item.email),
+			identity = IdentityUserStore.find(item => addresses.includes(item.email())),
+			data = message.smimeEncrypted(); // { partId: "1" }
+		if (data && identity) {
+			delete data.error;
+			let pass, params = { ...data }; // clone
+			params.folder = message.folder;
+			params.uid = message.uid;
+//			params.bodyPart = params.bodyPart?.raw;
+			params.certificate = identity.smimeCertificate();
+			params.privateKey = identity.smimeKey();
+			if (identity.smimeKeyEncrypted()) {
+				pass = await Passphrases.ask(identity,
+					i18n('SMIME/PRIVATE_KEY_OF', {EMAIL: identity.email()}),
+					'CRYPTO/DECRYPT'
+				);
+				if (!pass) {
+					return;
+				}
+				params.passphrase = pass?.password;
+			}
+			Remote.post('SMimeDecryptMessage', null, params).then(response => {
+				if (response?.Result?.data) {
+					message.smimeDecrypted(true);
+					MimeToMessage(response.Result.data, message);
+					message.html() ? message.viewHtml() : message.viewPlain();
+					pass && pass.remember && Passphrases.handle(identity, pass.password);
+					if ('signed' in response.Result) {
+						message.smimeSigned(response.Result.signed);
+					}
+				}
+			}).catch(e => {
+				data.error = e.message
+			})
+			.finally(() => {
+				message.smimeEncrypted(data);
+			});
+		}
 	}
 
 	smimeVerify(/*self, event*/) {
-		currentMessage().smimeVerify();
+		const message = currentMessage(),
+			data = message.smimeSigned(); // { partId: "1", micAlg: "pgp-sha256" }
+		if (data) {
+			const params = { ...data }; // clone
+			params.folder = message.folder;
+			params.uid = message.uid;
+			params.bodyPart = data.bodyPart?.raw;
+			params.sigPart = data.sigPart?.bodyRaw;
+			Remote.post('SMimeVerifyMessage', null, params).then(response => {
+				if (response?.Result) {
+					if (response.Result.body) {
+						MimeToMessage(response.Result.body, message);
+						message.html() ? message.viewHtml() : message.viewPlain();
+					}
+					data.success = response.Result.success;
+					message.smimeSigned(data);
+				}
+			});
+		}
 	}
 
 }
diff --git a/examples/docker/Docker.md b/examples/docker/Docker.md
index 9d5ec834f..28a17a9c3 100644
--- a/examples/docker/Docker.md
+++ b/examples/docker/Docker.md
@@ -77,7 +77,7 @@ Now, login to [http://localhost:8888/?admin](http://localhost:8888/?admin) with
 To use PostgreSQL as the DB, in Admin Panel, click `Contacts`, check `Enable contacts` and , and under `Storage (PDO)` choose the following:
 
 - Type: `PostgresSQL`
-- Data Source Name (DSN): `host=db;port=5432;dbname=snappymail`
+- Data Source Name (DSN): `host=postgres;port=5432;dbname=snappymail`
 - User `snappymail`
 - Password `snappymail`
 
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index c3a50a8fa..0b8e89e1d 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.38.2</upstream>.
+This app packages SnappyMail <upstream>2.38.2.1</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index a3d442e96..8bc072596 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.38.2
+VERSION=2.38.2.1
 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/app/include.php b/integrations/nextcloud/snappymail/app/include.php
index 0c80bf719..1326ed6b7 100644
--- a/integrations/nextcloud/snappymail/app/include.php
+++ b/integrations/nextcloud/snappymail/app/include.php
@@ -28,12 +28,7 @@
  * Custom 'data' folder path
  */
 if (class_exists('OC')) {
-	define('APP_DATA_FOLDER_PATH', \rtrim(\trim(
-		\method_exists(\OC::$server, 'getSystemConfig')
-			? \OC::$server->getSystemConfig()->getValue('datadirectory', '')
-			// Nextcloud 34+
-			: \OC::$server->get(\OCP\IConfig::class)->getSystemValue('datadirectory', '')
-	), '\\/') . '/appdata_snappymail/');
+	define('APP_DATA_FOLDER_PATH', \rtrim(\trim(\OC::$server->getSystemConfig()->getValue('datadirectory', '')), '\\/').'/appdata_snappymail/');
 } else {
 	http_response_code(400);
 	header($_SERVER['SERVER_PROTOCOL'].' 400 Bad Request', true, 400);
diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml
index d85ad52ed..1ebad7ac1 100644
--- a/integrations/nextcloud/snappymail/appinfo/info.xml
+++ b/integrations/nextcloud/snappymail/appinfo/info.xml
@@ -63,9 +63,8 @@ There, click on the link to go to the SnappyMail admin panel.
 		<lib>uuid</lib>
 		<lib>xxtea</lib>
 		<lib>zip</lib>
-		<nextcloud min-version="20" max-version="34" />
 -->
-		<nextcloud min-version="20" />
+		<nextcloud min-version="20" max-version="30" />
 	</dependencies>
 	<settings>
 		<admin>OCA\SnappyMail\Settings\AdminSettings</admin>
diff --git a/integrations/nextcloud/snappymail/lib/ContentSecurityPolicy.php b/integrations/nextcloud/snappymail/lib/ContentSecurityPolicy.php
index 3f90c3c1a..27a9c44d1 100644
--- a/integrations/nextcloud/snappymail/lib/ContentSecurityPolicy.php
+++ b/integrations/nextcloud/snappymail/lib/ContentSecurityPolicy.php
@@ -37,11 +37,7 @@ class ContentSecurityPolicy extends \OCP\AppFramework\Http\ContentSecurityPolicy
 	public function getSnappyMailNonce() {
 		static $sNonce;
 		if (!$sNonce) {
-			$cspManager = (\method_exists(\OC::$server, 'getContentSecurityPolicyNonceManager')
-				? \OC::$server->getContentSecurityPolicyNonceManager()
-				// Nextcloud 34+
-				: \OC::$server->get(\OC\Security\CSP\ContentSecurityPolicyNonceManager::class)
-			);
+			$cspManager = \OC::$server->getContentSecurityPolicyNonceManager();
 			$sNonce = $cspManager->getNonce() ?: \SnappyMail\UUID::generate();
 			if (\method_exists($cspManager, 'browserSupportsCspV3') && !$cspManager->browserSupportsCspV3()) {
 				$this->addAllowedScriptDomain("'nonce-{$sNonce}'");
diff --git a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
index deb7fb465..80a93d061 100644
--- a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
+++ b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
@@ -176,8 +176,7 @@ class SnappyMailHelper
 			// If OpenID Connect (OIDC) is enabled and used for login, use this.
 			if (static::isOIDCLogin()) {
 				$sEmail = $config->getUserValue($sUID, 'settings', 'email');
-				$pwd = new \SnappyMail\SensitiveString("oidc_login|{$sUID}");
-				return [$sUID, $sEmail, $pwd];
+				return [$sUID, $sEmail, "oidc_login|{$sUID}"];
 			}
 
 			// Only use the user's password in the current session if they have
diff --git a/integrations/virtualmin/snappymail.pl b/integrations/virtualmin/snappymail.pl
index c3fcc7ab5..b4de28225 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.38.2" );
+return ( "2.38.2.1" );
 }
 
 sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index 3e7ef29eb..caee2bb16 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.38.2",
+  "version": "2.38.2.1",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",
@@ -43,11 +43,10 @@
   "dependencies": {
     "@rollup/plugin-node-resolve": "^13.1.3",
     "@rollup/plugin-replace": "^3.0.1",
-    "@rollup/plugin-terser": "^1.0.2",
     "babel-eslint": "^10.1.0",
     "del": "^6.0.0",
     "eslint": "^7.32.0",
-    "gulp": "^5.0.1",
+    "gulp": "^5.0.0",
     "gulp-append-prepend": "^1.0.9",
     "gulp-cached": "^1.1.1",
     "gulp-clean-css": "^4.3.0",
@@ -65,6 +64,7 @@
     "gulp-terser": "^2.1.0",
     "rollup": "^2.56.3",
     "rollup-plugin-external-globals": "^0.6.1",
-    "rollup-plugin-includepaths": "^0.2.4"
+    "rollup-plugin-includepaths": "^0.2.4",
+    "rollup-plugin-terser": "^7.0.2"
   }
 }
diff --git a/plugins/avatars/avatars.js b/plugins/avatars/avatars.js
index 0c09bcbd6..464c4f1cc 100644
--- a/plugins/avatars/avatars.js
+++ b/plugins/avatars/avatars.js
@@ -38,10 +38,7 @@
 		queue = [],
 		avatars = new Map,
 		ncAvatars = new Map,
-		identicons = new Map,
 		templateId = 'MailMessageView',
-		b64 = data => btoa(unescape(encodeURIComponent(data))),
-		b64url = data => b64(data).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, ''),
 		getBimiSelector = msg => {
 			// Get 's' value out of 'v=BIMI1; s=foo;'
 			let bimiSelector = msg.headers().valueByName('BIMI-Selector');
@@ -49,21 +46,9 @@
 			return bimiSelector || '';
 		},
 		getBimiId = msg => ('pass' == msg.from[0].dkimStatus ? 1 : 0) + '-' + getBimiSelector(msg),
-		email = msg => msg.from[0].email.toLowerCase(),
-		getAvatarUid = msg => `${getBimiId(msg)}/${email(msg)}`,
-		getAvatar = msg => ncAvatars.get(email(msg)) || avatars.get(getAvatarUid(msg)),
-		getAvatarUri = msg => {
-			if ('remote' === msg.avatar) {
-				msg.avatar = `?Avatar/${getBimiId(msg)}/${b64url(email(msg))}`;
-			}
-/*
-			else if (!msg.avatar.startsWith('data:')) {
-				msg.avatar = null;
-			}
-*/
-			return msg.avatar;
-		},
-
+		getAvatarUrl = msg => `?Avatar/${getBimiId(msg)}/${msg.avatar}`,
+		getAvatarUid = msg => `${getBimiId(msg)}/${msg.from[0].email.toLowerCase()}`,
+		getAvatar = msg => ncAvatars.get(msg.from[0].email.toLowerCase()) || avatars.get(getAvatarUid(msg)),
 		hash = async txt => {
 			if (/^[0-9a-f]{15,}$/i.test(txt)) {
 				return txt;
@@ -79,56 +64,58 @@
 			(from.name?.split(/[^\p{L}]+/gu) || []).reduce((a, s) => a + (s[0] || ''), '')
 			.slice(0,2)
 			.toUpperCase(),
-		setIdenticon = (msg, fn, cb) => {
-			const from = email(msg);
-			if (identicons.get(from)) {
-				fn(identicons.get(from));
-			} else {
-				hash(from).then(hash => {
-					const uri = 'data:image/svg+xml;base64,' + b64(window.identiconSvg(
-						hash,
-						fromChars(msg.from[0]),
-						window.getComputedStyle(getEl('rl-app'), null).getPropertyValue('font-family')
-					));
-					fn(uri);
-					identicons.set(email(msg), uri);
-					cb?.(uri);
-				});
-			}
-		},
-
+		setIdenticon = (from, fn) => hash(from.email).then(hash =>
+			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) => {
-			if (msg.from?.[0]) {
-				if (getAvatarUri(msg)) {
-					if (rl.pluginSettingsGet('avatars', 'delay')) {
-						setIdenticon(msg, fn, ()=>{
-							queue.push([msg, fn]);
-							runQueue();
-						});
-					} else {
-						fn(msg.avatar);
-					}
-				} else {
-					setIdenticon(msg, fn);
-				}
+			msg.from?.[0] && setIdenticon(msg.from[0], fn);
+			if (rl.pluginSettingsGet('avatars', 'delay')) {
+				queue.push([msg, fn]);
+				runQueue();
+			} else if (msg.avatar) {
+				fn(getAvatarUrl(msg));
 			}
 		},
 		runQueue = (() => {
 			let item = queue.shift();
 			while (item) {
-				let url = getAvatar(item[0]);
-				if (url) {
-					item[1](url);
-					item = queue.shift();
-					continue;
-				} else if (item[0].avatar) {
-					item[1](item[0].avatar);
+				if (item[0].from) {
+					let url = getAvatar(item[0]),
+						uid = getAvatarUid(item[0]);
+					if (url) {
+						item[1](url);
+						item = queue.shift();
+						continue;
+					} else if (item[0].avatar) {
+						item[1](getAvatarUrl(item[0]));
+					} else if (!avatars.has(uid)) {
+						let from = item[0].from[0];
+						rl.pluginRemoteRequest((iError, data) => {
+							if (!iError && data?.Result.type) {
+								url = `data:${data.Result.type};base64,${data.Result.data}`;
+								avatars.set(uid, url);
+								item[1](url);
+							} else {
+								avatars.set(uid, '');
+							}
+							runQueue();
+						}, 'Avatar', {
+							bimi: 'pass' == from.dkimStatus ? 1 : 0,
+							bimiSelector: getBimiSelector(item[0]),
+							email: from.email
+						});
+					}
 				}
 				runQueue();
 				break;
 			}
 		}).debounce(1000);
 
+//	addEventListener('DOMContentLoaded', () => {
 		/**
 		 * Modify templates
 		 */
@@ -201,19 +188,13 @@
 						fn = url=>{element.src = url};
 					element.onerror = ()=>{
 						element.onerror = null;
-						setIdenticon(msg, fn, uri=>avatars.set(getAvatarUid(msg), uri));
+						setIdenticon(msg.from[0], fn);
 					};
 					if (url) {
 						fn(url);
 					} else if (msg.avatar?.startsWith('data:')) {
 						fn(msg.avatar);
 					} else {
-						element.onload = ()=>{
-							if (!element.src.startsWith('data:')) {
-								element.onload = null;
-								avatars.set(getAvatarUid(msg), element.src);
-							}
-						};
 						addQueue(msg, fn);
 					}
 				}
@@ -240,8 +221,11 @@
 					if (url) {
 						fn(url);
 					} else if (msg.avatar) {
-						fn(getAvatarUri(msg));
+						fn(msg.avatar.startsWith('data:') ? msg.avatar : getAvatarUrl(msg));
 					} else {
+//						let from = msg.from[0];
+//						view.viewUserPic(`?Avatar/${'pass' == from.dkimStatus ? 1 : 0}/${encodeURIComponent(from.email)}`);
+//						view.viewUserPicVisible(true);
 						addQueue(msg, fn);
 					}
 				}
diff --git a/plugins/avatars/index.php b/plugins/avatars/index.php
index 459172ebe..21b2be697 100644
--- a/plugins/avatars/index.php
+++ b/plugins/avatars/index.php
@@ -10,12 +10,12 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
 		NAME     = 'Avatars',
 		AUTHOR   = 'SnappyMail',
 		URL      = 'https://snappymail.eu/',
-		VERSION  = '1.22',
-		RELEASE  = '2025-03-10',
+		VERSION  = '1.20',
+		RELEASE  = '2024-08-26',
 		REQUIRED = '2.33.0',
 		CATEGORY = 'Contacts',
 		LICENSE  = 'MIT',
-		DESCRIPTION = 'Show graphic of sender in message and messages list (supports Contacts, BIMI, Gravatar, favicon and identicon)';
+		DESCRIPTION = 'Show graphic of sender in message and messages list (supports BIMI, Gravatar, favicon and identicon, Contacts is still TODO)';
 
 	public function Init() : void
 	{
@@ -79,8 +79,11 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
 				|| ($this->Config()->Get('plugin', 'bimi', false) && 'pass' == $mFrom['dkimStatus'])
 				|| ($this->Config()->Get('plugin', 'favicon', false) && 'pass' == $mFrom['dkimStatus'])
 			 )
-			) {
-				return 'remote';
+			) try {
+				// Base64Url
+				return \SnappyMail\Crypt::EncryptUrlSafe($mFrom['email']);
+			} catch (\Throwable $e) {
+				\SnappyMail\Log::error('Crypt', $e->getMessage());
 			}
 			if ('pass' == $mFrom['dkimStatus'] && $this->Config()->Get('plugin', 'service', true)) {
 				// 'data:image/png;base64,[a-zA-Z0-9+/=]'
@@ -109,17 +112,17 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
 	}
 
 	/**
-	 * GET /?Avatar/${bimi}/Encoded(${from.email})
-	 * Nextcloud Mail uses insecure unencoded 'index.php/apps/mail/api/avatars/url/local%40example.com'
+	 * GET /?Avatar/${bimi}/Encrypted(${from.email})
+	 * Nextcloud Mail uses insecure unencrypted 'index.php/apps/mail/api/avatars/url/local%40example.com'
 	 */
 //	public function ServiceAvatar(...$aParts)
-	public function ServiceAvatar(string $sServiceName, string $sBimi, string $sEncodedEmail)
+	public function ServiceAvatar(string $sServiceName, string $sBimi, string $sEncryptedEmail)
 	{
 		$maxAge = 86400;
-		$sEmail = \MailSo\Base\Utils::UrlSafeBase64Decode($sEncodedEmail);
+		$sEmail = \SnappyMail\Crypt::DecryptUrlSafe($sEncryptedEmail);
 		$aBimi = \explode('-', $sBimi, 2);
 		$sBimiSelector = isset($aBimi[1]) ? $aBimi[1] : 'default';
-//		$sEmail && \MailSo\Base\Http::setETag("{$sBimiSelector}-{$sEncodedEmail}");
+//		$sEmail && \MailSo\Base\Http::setETag("{$sBimiSelector}-{$sEncryptedEmail}");
 		if ($sEmail && ($aResult = $this->getAvatar($sEmail, !empty($aBimi[0]), $sBimiSelector))) {
 			\header("Cache-Control: max-age={$maxAge}, private");
 			\header('Expires: '.\gmdate('D, j M Y H:i:s', $maxAge + \time()).' UTC');
@@ -139,10 +142,6 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
 				->SetAllowedInJs(true)
 				->SetDefaultValue(true),
-			\RainLoop\Plugins\Property::NewInstance('contacts')->SetLabel('Contacts')
-				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
-				->SetDescription('Use the PHOTO stored on a matching address book contact')
-				->SetDefaultValue(true),
 			\RainLoop\Plugins\Property::NewInstance('bimi')->SetLabel('BIMI')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
 				->SetDefaultValue(false)
@@ -189,8 +188,11 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
 		return $aResult;
 	}
 
-	private static function getServicePng(string $sDomain) : ?string
+	// Only allow service icon when DKIM is valid. $bBimi is true when DKIM is valid.
+	private static function getServiceIcon(string $sEmail) : ?string
 	{
+		$sDomain = \explode('@', $sEmail);
+		$sDomain = \array_pop($sDomain);
 		$aServices = [
 			"services/{$sDomain}",
 			'services/' . static::serviceDomain($sDomain)
@@ -198,20 +200,9 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
 		foreach ($aServices as $service) {
 			$file = __DIR__ . "/images/{$service}.png";
 			if (\file_exists($file)) {
-				return $file;
+				return 'data:image/png;base64,' . \base64_encode(\file_get_contents($file));
 			}
 		}
-		return null;
-	}
-
-	// Only allow service icon when DKIM is valid. $bBimi is true when DKIM is valid.
-	private static function getServiceIcon(string $sEmail) : ?string
-	{
-		$aParts = \explode('@', $sEmail);
-		$file = static::getServicePng(\array_pop($aParts));
-		if ($file) {
-			return 'data:image/png;base64,' . \base64_encode(\file_get_contents($file));
-		}
 
 		$aResult = static::getCachedImage($sEmail);
 		if ($aResult) {
@@ -234,23 +225,30 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
 		\header('Cache-Control: private');
 //		\header('Expires: '.\gmdate('D, j M Y H:i:s', \time() + 86400).' UTC');
 
-		// A photo stored on the contact is authoritative, so it is consulted
-		// before the cache and before any network lookup: it beats a guessed
-		// avatar and replaces up to five remote round-trips. Deliberately not
-		// written to the avatars cache, which has no expiry - a cached copy
-		// would shadow later edits to the contact.
-		if ($this->Config()->Get('plugin', 'contacts', true)) {
-			$aResult = static::getContactPhoto($sAsciiEmail);
-			if ($aResult) {
-				return $aResult;
-			}
-		}
-
 		$aResult = static::getCachedImage($sEmail);
 		if ($aResult) {
 			return $aResult;
 		}
 
+		// TODO: lookup contacts vCard and return PHOTO value
+		/*
+		if (!$aResult) {
+			$oActions = \RainLoop\Api::Actions();
+			$oAccount = $oActions->getAccountFromToken();
+			if ($oAccount) {
+				$oAddressBookProvider = $oActions->AddressBookProvider($oAccount);
+				if ($oAddressBookProvider) {
+					$oContact = $oAddressBookProvider->GetContactByEmail($sEmail);
+					if ($oContact && $oContact->vCard && $oContact->vCard['PHOTO']) {
+						$aResult = [
+							'text/vcard',
+							$oContact->vCard
+						];
+					}
+				}
+			}
+		}
+		*/
 
 		if (!$aResult) {
 			$sDomain = \explode('@', $sEmail);
@@ -270,7 +268,7 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
 			}
 
 			if ($this->Config()->Get('plugin', 'gravatar', false)) {
-				$aUrls[] = 'https://gravatar.com/avatar/'.\hash('sha256', \strtolower($sAsciiEmail)).'?s=80&d=404';
+				$aUrls[] = 'https://gravatar.com/avatar/'.\md5(\strtolower($sAsciiEmail)).'?s=80&d=404';
 			}
 
 			foreach ($aUrls as $sUrl) {
@@ -286,13 +284,20 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
 
 		// Only allow service icon when DKIM is valid. $bBimi is true when DKIM is valid.
 		if ($bBimi && !$aResult) {
-			$file = static::getServicePng($sDomain);
-			if ($file) {
-				\MailSo\Base\Http::setLastModified(\filemtime($file));
-				$aResult = [
-					'image/png',
-					\file_get_contents($file)
-				];
+			$aServices = [
+				"services/{$sDomain}",
+				'services/' . static::serviceDomain($sDomain)
+			];
+			foreach ($aServices as $service) {
+				$file = __DIR__ . "/images/{$service}.png";
+				if (\file_exists($file)) {
+					\MailSo\Base\Http::setLastModified(\filemtime($file));
+					$aResult = [
+						'image/png',
+						\file_get_contents($file)
+					];
+					break;
+				}
 			}
 
 			if (!$aResult && $this->Config()->Get('plugin', 'favicon', false)) {
@@ -313,77 +318,6 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
 		return $sDomain;
 	}
 
-	/**
-	 * Return the PHOTO of the address book contact owning this address.
-	 *
-	 * vCard 4.0 stores it as a data: URI, vCard 3.0 as ENCODING=b with a TYPE
-	 * parameter, and either version may point at an external URL instead.
-	 */
-	private static function getContactPhoto(string $sEmail) : ?array
-	{
-		try {
-			$oActions = \RainLoop\Api::Actions();
-			$oAccount = $oActions->getAccountFromToken(false);
-			if (!$oAccount) {
-				return null;
-			}
-			$oProvider = $oActions->AddressBookProvider($oAccount);
-			if (!$oProvider || !$oProvider->IsActive()) {
-				return null;
-			}
-			// Several contacts can share an address - a synced card, a manual
-			// entry, an auto-collected one - and only one of them may carry the
-			// photo. GetContactByEmail() returns whichever matches first, so
-			// fall back to scanning the matches for one that actually has it.
-			$oPhoto = null;
-			$oContact = $oProvider->GetContactByEmail($sEmail);
-			if ($oContact && $oContact->vCard && isset($oContact->vCard->PHOTO)) {
-				$oPhoto = $oContact->vCard->PHOTO;
-			} else {
-				$iCount = 0;
-				foreach ($oProvider->GetContacts(0, 20, $sEmail, $iCount) as $oCandidate) {
-					if ($oCandidate->vCard && isset($oCandidate->vCard->PHOTO)) {
-						$oPhoto = $oCandidate->vCard->PHOTO;
-						break;
-					}
-				}
-			}
-			if (!$oPhoto) {
-				return null;
-			}
-
-			$sValue = \trim((string) $oPhoto);
-			if (!\strlen($sValue)) {
-				return null;
-			}
-
-			// vCard 4.0: data:image/jpeg;base64,...
-			if (\preg_match('#^data:(image/[a-z0-9.+-]+);base64,(.+)$#si', $sValue, $aMatch)) {
-				$sBinary = \base64_decode(\preg_replace('#\s+#', '', $aMatch[2]), true);
-				return $sBinary ? [\strtolower($aMatch[1]), $sBinary] : null;
-			}
-
-			// vCard 3.0: PHOTO;ENCODING=b;TYPE=JPEG:<base64>
-			$sEncoding = \strtolower((string) ($oPhoto['ENCODING'] ?? ''));
-			if ('b' === $sEncoding || 'base64' === $sEncoding) {
-				$sBinary = \base64_decode(\preg_replace('#\s+#', '', $sValue), true);
-				if ($sBinary) {
-					$sType = \strtolower((string) ($oPhoto['TYPE'] ?? '')) ?: 'jpeg';
-					return [\str_starts_with($sType, 'image/') ? $sType : "image/{$sType}", $sBinary];
-				}
-				return null;
-			}
-
-			// Either version may reference the image instead of embedding it.
-			if (\preg_match('#^https?://#i', $sValue)) {
-				return static::getUrl($sValue);
-			}
-		} catch (\Throwable $oException) {
-			\SnappyMail\Log::notice('Avatar', 'contact photo lookup failed: ' . $oException->getMessage());
-		}
-		return null;
-	}
-
 	private static function cacheImage(string $sEmail, array $aResult) : void
 	{
 		if (!\is_dir(\APP_PRIVATE_DATA . 'avatars')) {
diff --git a/plugins/change-password/langs/uk.ini b/plugins/change-password/langs/uk.ini
deleted file mode 100644
index 83afa3df4..000000000
--- a/plugins/change-password/langs/uk.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[SETTINGS_CHANGE_PASSWORD]
-LEGEND_CHANGE_PASSWORD = "Змінити пароль"
-LABEL_CURRENT_PASSWORD = "Поточний пароль"
-LABEL_NEW_PASSWORD = "Новий пароль"
-LABEL_REPEAT_PASSWORD = "Підтвердьте новий пароль"
-BUTTON_UPDATE_PASSWORD = "Змінити"
-ERROR_PASSWORD_MISMATCH = "Паролі не збігаються, спробуйте ще раз"
-[NOTIFICATIONS]
-COULD_NOT_SAVE_NEW_PASSWORD = "Не вдалося зберегти новий пароль"
-CURRENT_PASSWORD_INCORRECT = "Поточний пароль не вірний"
-NEW_PASSWORD_SHORT = "Пароль закороткий"
-NEW_PASSWORD_WEAK = "Пароль надто легкий"
-NEW_PASSWORD_HIBP = "Пароль знайдено в сервісі Have I Been Pwned"
diff --git a/plugins/compact-composer/index.php b/plugins/compact-composer/index.php
index c9a1be1f5..d98b5cc95 100644
--- a/plugins/compact-composer/index.php
+++ b/plugins/compact-composer/index.php
@@ -6,7 +6,7 @@ class CompactComposerPlugin extends \RainLoop\Plugins\AbstractPlugin
 		NAME = 'Compact Composer',
 		AUTHOR = 'Sergey Mosin',
 		URL = 'https://github.com/the-djmaze/snappymail/pull/1466',
-		VERSION = '1.0.6',
+		VERSION = '1.0.5',
 		RELEASE = '2024-08-08',
 		REQUIRED = '2.34.0',
 		LICENSE = 'AGPL v3',
diff --git a/plugins/compact-composer/js/CompactComposer.js b/plugins/compact-composer/js/CompactComposer.js
index 15ff25d03..01d020bb3 100644
--- a/plugins/compact-composer/js/CompactComposer.js
+++ b/plugins/compact-composer/js/CompactComposer.js
@@ -100,6 +100,10 @@
 			}
 		},
 
+		pasteSanitizer = (event) => {
+			return rl.Utils.cleanHtml(event.detail.html).html;
+		},
+
 		pasteImageHandler = (e, squire) => {
 
 			const items = [...e.detail.clipboardData.items];
@@ -138,12 +142,7 @@
 			toolbar.className = 'squire-toolbar btn-toolbar';
 			const actions = this.makeActions(squire, toolbar);
 
-			this.squire.addEventListener('willPaste', (event) => {
-				// https://github.com/fastmail/Squire?tab=readme-ov-file#addeventlistener
-				// The content that will be inserted is available as either the fragment property, or the text property for plain text, on the detail property of the event. You can modify this text/fragment in your event handler to change what will be pasted
-				tpl.innerHTML = rl.Utils.cleanHtml(event.detail.html).html;
-				event.detail.fragment = tpl.content;
-			});
+			this.squire.addEventListener('willPaste', pasteSanitizer);
 			this.squire.addEventListener('pasteImage', (e) => {
 				pasteImageHandler(e, squire);
 			});
diff --git a/plugins/compact-composer/js/squire-raw.js b/plugins/compact-composer/js/squire-raw.js
index 512387eaa..949efa7d7 100644
--- a/plugins/compact-composer/js/squire-raw.js
+++ b/plugins/compact-composer/js/squire-raw.js
@@ -1,5 +1,5 @@
-"use strict";
-// v2.3.2
+'use strict';
+// v2.2.8
 (() => {
   // source/node/TreeIterator.ts
   var SHOW_ELEMENT = 1;
@@ -13,11 +13,13 @@
       this.nodeType = nodeType;
       this.filter = filter || always;
     }
+
     isAcceptableNode(node) {
       const nodeType = node.nodeType;
       const nodeFilterType = nodeType === Node.ELEMENT_NODE ? SHOW_ELEMENT : nodeType === Node.TEXT_NODE ? SHOW_TEXT : 0;
       return !!(nodeFilterType & this.nodeType) && this.filter(node);
     }
+
     nextNode() {
       const root = this.root;
       let current = this.currentNode;
@@ -43,6 +45,7 @@
         current = node;
       }
     }
+
     previousNode() {
       const root = this.root;
       let current = this.currentNode;
@@ -69,6 +72,7 @@
         current = node;
       }
     }
+
     // Previous node in post-order.
     previousPONode() {
       const root = this.root;
@@ -101,7 +105,7 @@
   var ELEMENT_NODE = 1;
   var TEXT_NODE = 3;
   var DOCUMENT_FRAGMENT_NODE = 11;
-  var ZWS = "\u200B";
+  var ZWS = '\u200B';
   var ua = navigator.userAgent;
   var isMac = /Mac OS X/.test(ua);
   var isWin = /Windows NT/.test(ua);
@@ -110,14 +114,14 @@
   var isGecko = /Gecko\//.test(ua);
   var isLegacyEdge = /Edge\//.test(ua);
   var isWebKit = !isLegacyEdge && /WebKit\//.test(ua);
-  var ctrlKey = isMac || isIOS ? "Meta-" : "Ctrl-";
+  var ctrlKey = isMac || isIOS ? 'Meta-' : 'Ctrl-';
   var cantFocusEmptyTextNodes = isWebKit;
-  var supportsInputEvents = "onbeforeinput" in document && "inputType" in new InputEvent("input");
+  var supportsInputEvents = 'onbeforeinput' in document && 'inputType' in new InputEvent('input');
   var notWS = /[^ \t\r\n]/;
 
   // source/node/Category.ts
   var inlineNodeNames = /^(?:#text|A(?:BBR|CRONYM)?|B(?:R|D[IO])?|C(?:ITE|ODE)|D(?:ATA|EL|FN)|EM|FONT|HR|I(?:FRAME|MG|NPUT|NS)?|KBD|Q|R(?:P|T|UBY)|S(?:AMP|MALL|PAN|TR(?:IKE|ONG)|U[BP])?|TIME|U|VAR|WBR)$/;
-  var leafNodeNames = /* @__PURE__ */ new Set(["BR", "HR", "IFRAME", "IMG", "INPUT"]);
+  var leafNodeNames = /* @__PURE__ */ new Set(['BR', 'HR', 'IFRAME', 'IMG', 'INPUT']);
   var UNKNOWN = 0;
   var INLINE = 1;
   var BLOCK = 2;
@@ -191,7 +195,7 @@
       return false;
     }
     if (node instanceof HTMLElement && node2 instanceof HTMLElement) {
-      return node.nodeName !== "A" && node.className === node2.className && node.style.cssText === node2.style.cssText;
+      return node.nodeName !== 'A' && node.className === node2.className && node.style.cssText === node2.style.cssText;
     }
     return true;
   };
@@ -200,7 +204,7 @@
       return false;
     }
     for (const attr in attributes) {
-      if (!("getAttribute" in node) || node.getAttribute(attr) !== attributes[attr]) {
+      if (!('getAttribute' in node) || node.getAttribute(attr) !== attributes[attr]) {
         return false;
       }
     }
@@ -269,7 +273,7 @@
 
   // source/node/Whitespace.ts
   var notWSTextNode = (node) => {
-    return node instanceof Element ? node.nodeName === "BR" : (
+    return node instanceof Element ? node.nodeName === 'BR' : (
       // okay if data is 'undefined' here.
       notWS.test(node.data)
     );
@@ -359,7 +363,7 @@
       while (!(endContainer instanceof Text)) {
         const child = endContainer.childNodes[endOffset - 1];
         if (!child || isLeaf(child)) {
-          if (child && child.nodeName === "BR" && !isLineBreak(child, false)) {
+          if (child && child.nodeName === 'BR' && !isLineBreak(child, false)) {
             endOffset -= 1;
             continue;
           }
@@ -403,7 +407,7 @@
       if (endContainer === endMax || endContainer === root) {
         break;
       }
-      if (endContainer.nodeType !== TEXT_NODE && endContainer.childNodes[endOffset] && endContainer.childNodes[endOffset].nodeName === "BR" && !isLineBreak(endContainer.childNodes[endOffset], false)) {
+      if (endContainer.nodeType !== TEXT_NODE && endContainer.childNodes[endOffset] && endContainer.childNodes[endOffset].nodeName === 'BR' && !isLineBreak(endContainer.childNodes[endOffset], false)) {
         endOffset += 1;
       }
       if (endOffset !== getLength(endContainer)) {
@@ -447,11 +451,11 @@
         if (cantFocusEmptyTextNodes) {
           fixer = document.createTextNode(ZWS);
         } else {
-          fixer = document.createTextNode("");
+          fixer = document.createTextNode('');
         }
       }
-    } else if ((node instanceof Element || node instanceof DocumentFragment) && !node.querySelector("BR")) {
-      fixer = createElement("BR");
+    } else if ((node instanceof Element || node instanceof DocumentFragment) && !node.querySelector('BR')) {
+      fixer = createElement('BR');
       let parent = node;
       let child;
       while ((child = parent.lastElementChild) && !isInline(child)) {
@@ -470,15 +474,15 @@
   var fixContainer = (container, root) => {
     let wrapper = null;
     Array.from(container.childNodes).forEach((child) => {
-      const isBR = child.nodeName === "BR";
+      const isBR = child.nodeName === 'BR';
       if (!isBR && isInline(child)) {
         if (!wrapper) {
-          wrapper = createElement("DIV");
+          wrapper = createElement('DIV');
         }
         wrapper.appendChild(child);
       } else if (isBR || wrapper) {
         if (!wrapper) {
-          wrapper = createElement("DIV");
+          wrapper = createElement('DIV');
         }
         fixCursor(wrapper);
         if (isBR) {
@@ -499,15 +503,15 @@
   };
   var split = (node, offset, stopNode, root) => {
     if (node instanceof Text && node !== stopNode) {
-      if (typeof offset !== "number") {
-        throw new Error("Offset must be a number to split text node!");
+      if (typeof offset !== 'number') {
+        throw new Error('Offset must be a number to split text node!');
       }
       if (!node.parentNode) {
-        throw new Error("Cannot split text node with no parent!");
+        throw new Error('Cannot split text node with no parent!');
       }
       return split(node.parentNode, node.splitText(offset), stopNode, root);
     }
-    let nodeAfterSplit = typeof offset === "number" ? offset < node.childNodes.length ? node.childNodes[offset] : null : offset;
+    let nodeAfterSplit = typeof offset === 'number' ? offset < node.childNodes.length ? node.childNodes[offset] : null : offset;
     const parent = node.parentNode;
     if (!parent || node === stopNode || !(node instanceof Element)) {
       return nodeAfterSplit;
@@ -518,7 +522,7 @@
       clone.appendChild(nodeAfterSplit);
       nodeAfterSplit = next;
     }
-    if (node instanceof HTMLOListElement && getNearest(node, root, "BLOCKQUOTE")) {
+    if (node instanceof HTMLOListElement && getNearest(node, root, 'BLOCKQUOTE')) {
       clone.start = (+node.start || 1) + node.childNodes.length - 1;
     }
     fixCursor(node);
@@ -597,7 +601,7 @@
     detach(container);
     offset = block.childNodes.length;
     const last = block.lastChild;
-    if (last && last.nodeName === "BR") {
+    if (last && last.nodeName === 'BR') {
       block.removeChild(last);
       offset -= 1;
     }
@@ -609,14 +613,14 @@
   var mergeContainers = (node, root) => {
     const prev = node.previousSibling;
     const first = node.firstChild;
-    const isListItem = node.nodeName === "LI";
+    const isListItem = node.nodeName === 'LI';
     if (isListItem && (!first || !/^[OU]L$/.test(first.nodeName))) {
       return;
     }
     if (prev && areAlike(prev, node)) {
       if (!isContainer(prev)) {
         if (isListItem) {
-          const block = createElement("DIV");
+          const block = createElement('DIV');
           block.appendChild(empty(prev));
           prev.appendChild(block);
         } else {
@@ -633,7 +637,7 @@
         mergeContainers(first, root);
       }
     } else if (isListItem) {
-      const block = createElement("DIV");
+      const block = createElement('DIV');
       node.insertBefore(block, first);
       fixCursor(block);
     }
@@ -641,40 +645,40 @@
 
   // source/Clean.ts
   var styleToSemantic = {
-    "font-weight": {
+    'font-weight': {
       regexp: /^bold|^700/i,
       replace() {
-        return createElement("B");
+        return createElement('B');
       }
     },
-    "font-style": {
+    'font-style': {
       regexp: /^italic/i,
       replace() {
-        return createElement("I");
+        return createElement('I');
       }
     },
-    "font-family": {
+    'font-family': {
       regexp: notWS,
       replace(classNames, family) {
-        return createElement("SPAN", {
+        return createElement('SPAN', {
           class: classNames.fontFamily,
-          style: "font-family:" + family
+          style: 'font-family:' + family
         });
       }
     },
-    "font-size": {
+    'font-size': {
       regexp: notWS,
       replace(classNames, size) {
-        return createElement("SPAN", {
+        return createElement('SPAN', {
           class: classNames.fontSize,
-          style: "font-size:" + size
+          style: 'font-size:' + size
         });
       }
     },
-    "text-decoration": {
+    'text-decoration': {
       regexp: /^underline/i,
       replace() {
-        return createElement("U");
+        return createElement('U');
       }
     }
   };
@@ -724,19 +728,19 @@
     };
   };
   var fontSizes = {
-    "1": "10",
-    "2": "13",
-    "3": "16",
-    "4": "18",
-    "5": "24",
-    "6": "32",
-    "7": "48"
+    '1': '10',
+    '2': '13',
+    '3': '16',
+    '4': '18',
+    '5': '24',
+    '6': '32',
+    '7': '48'
   };
   var stylesRewriters = {
-    STRONG: replaceWithTag("B"),
-    EM: replaceWithTag("I"),
-    INS: replaceWithTag("U"),
-    STRIKE: replaceWithTag("S"),
+    STRONG: replaceWithTag('B'),
+    EM: replaceWithTag('I'),
+    INS: replaceWithTag('U'),
+    STRIKE: replaceWithTag('S'),
     SPAN: replaceStyles,
     FONT: (node, parent, config) => {
       const font = node;
@@ -750,17 +754,17 @@
       let newTreeBottom;
       let newTreeTop;
       if (face) {
-        fontSpan = createElement("SPAN", {
+        fontSpan = createElement('SPAN', {
           class: classNames.fontFamily,
-          style: "font-family:" + face
+          style: 'font-family:' + face
         });
         newTreeTop = fontSpan;
         newTreeBottom = fontSpan;
       }
       if (size) {
-        sizeSpan = createElement("SPAN", {
+        sizeSpan = createElement('SPAN', {
           class: classNames.fontSize,
-          style: "font-size:" + fontSizes[size] + "px"
+          style: 'font-size:' + fontSizes[size] + 'px'
         });
         if (!newTreeTop) {
           newTreeTop = sizeSpan;
@@ -771,12 +775,12 @@
         newTreeBottom = sizeSpan;
       }
       if (color && /^#?([\dA-F]{3}){1,2}$/i.test(color)) {
-        if (color.charAt(0) !== "#") {
-          color = "#" + color;
+        if (color.charAt(0) !== '#') {
+          color = '#' + color;
         }
-        colorSpan = createElement("SPAN", {
+        colorSpan = createElement('SPAN', {
           class: classNames.color,
-          style: "color:" + color
+          style: 'color:' + color
         });
         if (!newTreeTop) {
           newTreeTop = colorSpan;
@@ -787,14 +791,14 @@
         newTreeBottom = colorSpan;
       }
       if (!newTreeTop || !newTreeBottom) {
-        newTreeTop = newTreeBottom = createElement("SPAN");
+        newTreeTop = newTreeBottom = createElement('SPAN');
       }
       parent.replaceChild(newTreeTop, font);
       newTreeBottom.appendChild(empty(font));
       return newTreeBottom;
     },
     TT: (node, parent, config) => {
-      const el = createElement("SPAN", {
+      const el = createElement('SPAN', {
         class: config.classNames.fontFamily,
         style: 'font-family:menlo,consolas,"courier new",monospace'
       });
@@ -835,7 +839,7 @@
           continue;
         }
         if (childLength) {
-          cleanTree(child, config, preserveWS || nodeName === "PRE");
+          cleanTree(child, config, preserveWS || nodeName === 'PRE');
         }
       } else {
         if (child instanceof Text) {
@@ -849,7 +853,7 @@
             walker.currentNode = child;
             let sibling;
             while (sibling = walker.previousPONode()) {
-              if (sibling.nodeName === "IMG" || sibling instanceof Text && notWS.test(sibling.data)) {
+              if (sibling.nodeName === 'IMG' || sibling instanceof Text && notWS.test(sibling.data)) {
                 break;
               }
               if (!isInline(sibling)) {
@@ -857,13 +861,13 @@
                 break;
               }
             }
-            data = data.replace(/^[ \t\r\n]+/g, sibling ? " " : "");
+            data = data.replace(/^[ \t\r\n]+/g, sibling ? ' ' : '');
           }
           if (endsWithWS) {
             walker.currentNode = child;
             let sibling;
             while (sibling = walker.nextNode()) {
-              if (sibling.nodeName === "IMG" || sibling instanceof Text && notWS.test(sibling.data)) {
+              if (sibling.nodeName === 'IMG' || sibling instanceof Text && notWS.test(sibling.data)) {
                 break;
               }
               if (!isInline(sibling)) {
@@ -871,7 +875,7 @@
                 break;
               }
             }
-            data = data.replace(/[ \t\r\n]+$/g, sibling ? " " : "");
+            data = data.replace(/[ \t\r\n]+$/g, sibling ? ' ' : '');
           }
           if (data) {
             child.data = data;
@@ -901,7 +905,7 @@
     }
   };
   var cleanupBRs = (node, root, keepForBlankLine) => {
-    const brs = node.querySelectorAll("BR");
+    const brs = node.querySelectorAll('BR');
     const brBreaksLine = [];
     let l = brs.length;
     for (let i = 0; i < l; i += 1) {
@@ -921,7 +925,7 @@
     }
   };
   var escapeHTML = (text) => {
-    return text.split("&").join("&amp;").split("<").join("&lt;").split(">").join("&gt;").split('"').join("&quot;");
+    return text.split('&').join('&amp;').split('<').join('&lt;').split('>').join('&gt;').split('"').join('&quot;');
   };
 
   // source/node/Block.ts
@@ -939,7 +943,7 @@
     return block !== root ? block : null;
   };
   var isEmptyBlock = (block) => {
-    return !block.textContent && !block.querySelector("IMG");
+    return !block.textContent && !block.querySelector('IMG');
   };
 
   // source/range/Block.ts
@@ -977,7 +981,7 @@
     return block && isNodeContainedInRange(range, block, true) ? block : null;
   };
   var isContent = (node) => {
-    return node instanceof Text ? notWS.test(node.data) : node.nodeName === "IMG";
+    return node instanceof Text ? notWS.test(node.data) : node.nodeName === 'IMG';
   };
   var rangeDoesStartAtBlockBoundary = (range, root) => {
     const startContainer = range.startContainer;
@@ -1059,13 +1063,14 @@
   function createRange(startContainer, startOffset, endContainer, endOffset) {
     const range = document.createRange();
     range.setStart(startContainer, startOffset);
-    if (endContainer && typeof endOffset === "number") {
+    if (endContainer && typeof endOffset === 'number') {
       range.setEnd(endContainer, endOffset);
     } else {
       range.setEnd(startContainer, startOffset);
     }
     return range;
   }
+
   var insertNodeInRange = (range, node) => {
     let { startContainer, startOffset, endContainer, endOffset } = range;
     let children;
@@ -1130,12 +1135,11 @@
       frag.appendChild(node);
       node = next;
     }
-    node = endContainer && endContainer.previousSibling;
-    if (node && node instanceof Text && endContainer instanceof Text) {
-      endOffset = node.length;
-      node.appendData(endContainer.data);
+    if (startContainer instanceof Text && endContainer instanceof Text) {
+      startContainer.appendData(endContainer.data);
       detach(endContainer);
-      endContainer = node;
+      endContainer = startContainer;
+      endOffset = startOffset;
     }
     range.setStart(startContainer, startOffset);
     if (endContainer) {
@@ -1179,7 +1183,7 @@
       fixCursor(startBlock);
     }
     const child = root.firstChild;
-    if (!child || child.nodeName === "BR") {
+    if (!child || child.nodeName === 'BR') {
       fixCursor(root);
       if (root.firstChild) {
         range.selectNodeContents(root.firstChild);
@@ -1192,7 +1196,7 @@
     let afterNode = startContainer;
     let afterOffset = startOffset;
     if (!(afterNode instanceof Text) || afterOffset === afterNode.data.length) {
-      afterNode = getAdjacentInlineNode(iterator, "nextNode", afterNode);
+      afterNode = getAdjacentInlineNode(iterator, 'nextNode', afterNode);
       afterOffset = 0;
     }
     let beforeNode = startContainer;
@@ -1200,7 +1204,7 @@
     if (!(beforeNode instanceof Text) || beforeOffset === -1) {
       beforeNode = getAdjacentInlineNode(
         iterator,
-        "previousPONode",
+        'previousPONode',
         afterNode || (startContainer instanceof Text ? startContainer : startContainer.childNodes[startOffset] || startContainer)
       );
       if (beforeNode instanceof Text) {
@@ -1209,17 +1213,17 @@
     }
     let node = null;
     let offset = 0;
-    if (afterNode instanceof Text && afterNode.data.charAt(afterOffset) === " " && rangeDoesStartAtBlockBoundary(range, root)) {
+    if (afterNode instanceof Text && afterNode.data.charAt(afterOffset) === ' ' && rangeDoesStartAtBlockBoundary(range, root)) {
       node = afterNode;
       offset = afterOffset;
-    } else if (beforeNode instanceof Text && beforeNode.data.charAt(beforeOffset) === " ") {
-      if (afterNode instanceof Text && afterNode.data.charAt(afterOffset) === " " || rangeDoesEndAtBlockBoundary(range, root)) {
+    } else if (beforeNode instanceof Text && beforeNode.data.charAt(beforeOffset) === ' ') {
+      if (afterNode instanceof Text && afterNode.data.charAt(afterOffset) === ' ' || rangeDoesEndAtBlockBoundary(range, root)) {
         node = beforeNode;
         offset = beforeOffset;
       }
     }
     if (node) {
-      node.replaceData(offset, 1, "\xA0");
+      node.replaceData(offset, 1, '\xA0');
     }
     range.setStart(startContainer, startOffset);
     range.collapse(true);
@@ -1238,13 +1242,13 @@
     }
     moveRangeBoundariesDownTree(range);
     range.collapse(false);
-    const stopPoint = getNearest(range.endContainer, root, "BLOCKQUOTE") || root;
+    const stopPoint = getNearest(range.endContainer, root, 'BLOCKQUOTE') || root;
     let block = getStartBlockOfRange(range, root);
     let blockContentsAfterSplit = null;
     const firstBlockInFrag = getNextBlock(frag, frag);
     const replaceBlock = !firstInFragIsInline && !!block && isEmptyBlock(block);
     if (block && firstBlockInFrag && !replaceBlock && // Don't merge table cells or PRE elements into block
-      !getNearest(firstBlockInFrag, frag, "PRE") && !getNearest(firstBlockInFrag, frag, "TABLE")) {
+      !getNearest(firstBlockInFrag, frag, 'PRE') && !getNearest(firstBlockInFrag, frag, 'TABLE')) {
       moveRangeBoundariesUpTree(range, block, block, root);
       range.collapse(true);
       let container = range.endContainer;
@@ -1323,7 +1327,7 @@
   // source/range/Contents.ts
   var getTextContentsOfRange = (range) => {
     if (range.collapsed) {
-      return "";
+      return '';
     }
     const startContainer = range.startContainer;
     const endContainer = range.endContainer;
@@ -1336,7 +1340,7 @@
     );
     walker.currentNode = startContainer;
     let node = startContainer;
-    let textContent = "";
+    let textContent = '';
     let addedTextInBlock = false;
     let value;
     if (!(node instanceof Element) && !(node instanceof Text) || !walker.filter(node)) {
@@ -1355,13 +1359,13 @@
           textContent += value;
           addedTextInBlock = true;
         }
-      } else if (node.nodeName === "BR" || addedTextInBlock && !isInline(node)) {
-        textContent += "\n";
+      } else if (node.nodeName === 'BR' || addedTextInBlock && !isInline(node)) {
+        textContent += '\n';
         addedTextInBlock = false;
       }
       node = walker.nextNode();
     }
-    textContent = textContent.replace(/ /g, " ");
+    textContent = textContent.replace(/ /g, ' ');
     return textContent;
   };
 
@@ -1372,7 +1376,7 @@
     if (isLegacyEdge || !clipboardData) {
       return false;
     }
-    let text = toPlainText ? "" : getTextContentsOfRange(range);
+    let text = toPlainText ? '' : getTextContentsOfRange(range);
     const startBlock = getStartBlockOfRange(range, root);
     const endBlock = getEndBlockOfRange(range, root);
     let copyRoot = root;
@@ -1400,10 +1404,10 @@
     }
     let html;
     if (contents.childNodes.length === 1 && contents.childNodes[0] instanceof Text) {
-      text = contents.childNodes[0].data.replace(/ /g, " ");
+      text = contents.childNodes[0].data.replace(/ /g, ' ');
       plainTextOnly = true;
     } else {
-      const node = createElement("DIV");
+      const node = createElement('DIV');
       node.appendChild(contents);
       html = node.innerHTML;
       if (toCleanHTML) {
@@ -1414,13 +1418,12 @@
       text = toPlainText(html);
     }
     if (isWin) {
-      text = text.replace(/\r?\n/g, "\r\n");
+      text = text.replace(/\r?\n/g, '\r\n');
     }
     if (!plainTextOnly && html && text !== html) {
-      html = "<!-- squire -->" + html;
-      clipboardData.setData("text/html", html);
+      clipboardData.setData('text/html', html);
     }
-    clipboardData.setData("text/plain", text);
+    clipboardData.setData('text/plain', text);
     event.preventDefault();
     return true;
   };
@@ -1479,11 +1482,11 @@
       while (l--) {
         const item = items[l];
         const type = item.type;
-        if (type === "text/html") {
+        if (type === 'text/html') {
           htmlItem = item;
-        } else if (type === "text/plain" || type === "text/uri-list") {
+        } else if (type === 'text/plain' || type === 'text/uri-list') {
           plainItem = item;
-        } else if (type === "text/rtf") {
+        } else if (type === 'text/rtf') {
           hasRTF = true;
         } else if (/^image\/.*/.test(type)) {
           hasImage = true;
@@ -1491,7 +1494,7 @@
       }
       if (hasImage && !(hasRTF && htmlItem)) {
         event.preventDefault();
-        this.fireEvent("pasteImage", {
+        this.fireEvent('pasteImage', {
           clipboardData
         });
         return;
@@ -1521,12 +1524,12 @@
       }
     }
     const types = clipboardData == null ? void 0 : clipboardData.types;
-    if (!isLegacyEdge && types && (indexOf.call(types, "text/html") > -1 || !isGecko && indexOf.call(types, "text/plain") > -1 && indexOf.call(types, "text/rtf") < 0)) {
+    if (!isLegacyEdge && types && (indexOf.call(types, 'text/html') > -1 || !isGecko && indexOf.call(types, 'text/plain') > -1 && indexOf.call(types, 'text/rtf') < 0)) {
       event.preventDefault();
       let data;
-      if (!choosePlain && (data = clipboardData.getData("text/html"))) {
+      if (!choosePlain && (data = clipboardData.getData('text/html'))) {
         this.insertHTML(data, true);
-      } else if ((data = clipboardData.getData("text/plain")) || (data = clipboardData.getData("text/uri-list"))) {
+      } else if ((data = clipboardData.getData('text/plain')) || (data = clipboardData.getData('text/uri-list'))) {
         this.insertPlainText(data, true);
       }
       return;
@@ -1537,16 +1540,16 @@
     const startOffset = range.startOffset;
     const endContainer = range.endContainer;
     const endOffset = range.endOffset;
-    let pasteArea = createElement("DIV", {
-      contenteditable: "true",
-      style: "position:fixed; overflow:hidden; top:0; right:100%; width:1px; height:1px;"
+    let pasteArea = createElement('DIV', {
+      contenteditable: 'true',
+      style: 'position:fixed; overflow:hidden; top:0; right:100%; width:1px; height:1px;'
     });
     body.appendChild(pasteArea);
     range.selectNodeContents(pasteArea);
     this.setSelection(range);
     setTimeout(() => {
       try {
-        let html = "";
+        let html = '';
         let next = pasteArea;
         let first;
         while (pasteArea = next) {
@@ -1584,10 +1587,10 @@
     let hasHTML = false;
     while (l--) {
       switch (types[l]) {
-        case "text/plain":
+        case 'text/plain':
           hasPlain = true;
           break;
-        case "text/html":
+        case 'text/html':
           hasHTML = true;
           break;
         default:
@@ -1633,7 +1636,7 @@
         fixCursor(parent);
         moveRangeBoundariesDownTree(range);
       }
-      if (node === self._root && (node = node.firstChild) && node.nodeName === "BR") {
+      if (node === self._root && (node = node.firstChild) && node.nodeName === 'BR') {
         detach(node);
       }
       self._ensureBottomLine();
@@ -1654,13 +1657,13 @@
     detach(node);
   };
   var linkifyText = (self, textNode, offset) => {
-    if (getNearest(textNode, self._root, "A")) {
+    if (getNearest(textNode, self._root, 'A')) {
       return;
     }
-    const data = textNode.data || "";
+    const data = textNode.data || '';
     const searchFrom = Math.max(
-      data.lastIndexOf(" ", offset - 1),
-      data.lastIndexOf("\xA0", offset - 1)
+      data.lastIndexOf(' ', offset - 1),
+      data.lastIndexOf('\xA0', offset - 1)
     ) + 1;
     const searchText = data.slice(searchFrom, offset);
     const match = self.linkRegExp.exec(searchText);
@@ -1678,10 +1681,10 @@
       }
       const defaultAttributes = self._config.tagAttributes.a;
       const link = createElement(
-        "A",
+        'A',
         Object.assign(
           {
-            href: match[1] ? /^(?:ht|f)tps?:/i.test(match[1]) ? match[1] : "http://" + match[1] : "mailto:" + match[0]
+            href: match[1] ? /^(?:ht|f)tps?:/i.test(match[1]) ? match[1] : 'http://' + match[1] : 'mailto:' + match[0]
           },
           defaultAttributes
         )
@@ -1730,10 +1733,10 @@
         }
         self.setSelection(range);
       } else if (current) {
-        if (getNearest(current, root, "UL") || getNearest(current, root, "OL")) {
+        if (getNearest(current, root, 'UL') || getNearest(current, root, 'OL')) {
           self.decreaseListLevel(range);
           return;
-        } else if (getNearest(current, root, "BLOCKQUOTE")) {
+        } else if (getNearest(current, root, 'BLOCKQUOTE')) {
           self.removeQuote(range);
           return;
         }
@@ -1805,7 +1808,7 @@
       cursorOffset = range.endOffset;
       if (cursorContainer instanceof Element) {
         nodeAfterCursor = cursorContainer.childNodes[cursorOffset];
-        if (nodeAfterCursor && nodeAfterCursor.nodeName === "IMG") {
+        if (nodeAfterCursor && nodeAfterCursor.nodeName === 'IMG') {
           event.preventDefault();
           detach(nodeAfterCursor);
           moveRangeBoundariesDownTree(range);
@@ -1828,7 +1831,7 @@
       let node = getStartBlockOfRange(range, root);
       let parent;
       while (parent = node.parentNode) {
-        if (parent.nodeName === "UL" || parent.nodeName === "OL") {
+        if (parent.nodeName === 'UL' || parent.nodeName === 'OL') {
           event.preventDefault();
           self.increaseListLevel(range);
           break;
@@ -1842,7 +1845,7 @@
     self._removeZWS();
     if (range.collapsed && rangeDoesStartAtBlockBoundary(range, root)) {
       const node = range.startContainer;
-      if (getNearest(node, root, "UL") || getNearest(node, root, "OL")) {
+      if (getNearest(node, root, 'UL') || getNearest(node, root, 'OL')) {
         event.preventDefault();
         self.decreaseListLevel(range);
       }
@@ -1863,11 +1866,11 @@
       self._updatePath(range, true);
     } else if (rangeDoesEndAtBlockBoundary(range, root)) {
       const block = getStartBlockOfRange(range, root);
-      if (block && block.nodeName !== "PRE") {
-        const text = (_a = block.textContent) == null ? void 0 : _a.trimEnd().replace(ZWS, "");
-        if (text === "*" || text === "1.") {
+      if (block && block.nodeName !== 'PRE') {
+        const text = (_a = block.textContent) == null ? void 0 : _a.trimEnd().replace(ZWS, '');
+        if (text === '*' || text === '1.') {
           event.preventDefault();
-          self.insertPlainText(" ", false);
+          self.insertPlainText(' ', false);
           self._docWasChanged();
           self.saveUndoState(range);
           const walker = new TreeIterator(block, SHOW_TEXT);
@@ -1875,7 +1878,7 @@
           while (textNode = walker.nextNode()) {
             detach(textNode);
           }
-          if (text === "*") {
+          if (text === '*') {
             self.makeUnorderedList();
           } else {
             self.makeOrderedList();
@@ -1887,7 +1890,7 @@
     node = range.endContainer;
     if (range.endOffset === getLength(node)) {
       do {
-        if (node.nodeName === "A") {
+        if (node.nodeName === 'A') {
           range.setStartAfter(node);
           break;
         }
@@ -1911,27 +1914,27 @@
       return;
     }
     let key = event.key;
-    let modifiers = "";
+    let modifiers = '';
     const code = event.code;
     if (/^Digit\d$/.test(code)) {
       key = code.slice(-1);
     }
-    if (key !== "Backspace" && key !== "Delete") {
+    if (key !== 'Backspace' && key !== 'Delete') {
       if (event.altKey) {
-        modifiers += "Alt-";
+        modifiers += 'Alt-';
       }
       if (event.ctrlKey) {
-        modifiers += "Ctrl-";
+        modifiers += 'Ctrl-';
       }
       if (event.metaKey) {
-        modifiers += "Meta-";
+        modifiers += 'Meta-';
       }
       if (event.shiftKey) {
-        modifiers += "Shift-";
+        modifiers += 'Shift-';
       }
     }
-    if (isWin && event.shiftKey && key === "Delete") {
-      modifiers += "Shift-";
+    if (isWin && event.shiftKey && key === 'Delete') {
+      modifiers += 'Shift-';
     }
     key = modifiers + key;
     const range = this.getSelection();
@@ -1946,25 +1949,25 @@
     }
   };
   var keyHandlers = {
-    "Backspace": Backspace,
-    "Delete": Delete,
-    "Tab": Tab,
-    "Shift-Tab": ShiftTab,
-    " ": Space,
-    "ArrowLeft"(self) {
+    'Backspace': Backspace,
+    'Delete': Delete,
+    'Tab': Tab,
+    'Shift-Tab': ShiftTab,
+    ' ': Space,
+    'ArrowLeft'(self) {
       self._removeZWS();
     },
-    "ArrowRight"(self, event, range) {
+    'ArrowRight'(self, event, range) {
       self._removeZWS();
       const root = self.getRoot();
       if (rangeDoesEndAtBlockBoundary(range, root)) {
         moveRangeBoundariesDownTree(range);
         let node = range.endContainer;
         do {
-          if (node.nodeName === "CODE") {
+          if (node.nodeName === 'CODE') {
             let next = node.nextSibling;
             if (!(next instanceof Text)) {
-              const textNode = document.createTextNode("\xA0");
+              const textNode = document.createTextNode('\xA0');
               node.parentNode.insertBefore(textNode, next);
               next = textNode;
             }
@@ -1979,7 +1982,7 @@
   };
   if (!supportsInputEvents) {
     keyHandlers.Enter = Enter;
-    keyHandlers["Shift-Enter"] = Enter;
+    keyHandlers['Shift-Enter'] = Enter;
   }
   if (!isMac && !isIOS) {
     keyHandlers.PageUp = (self) => {
@@ -2001,13 +2004,13 @@
       }
     };
   };
-  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", { tag: "SUP" });
-  keyHandlers[ctrlKey + "Shift-6"] = mapKeyToFormat("SUP", { tag: "SUB" });
-  keyHandlers[ctrlKey + "Shift-8"] = (self, event) => {
+  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', { tag: 'SUP' });
+  keyHandlers[ctrlKey + 'Shift-6'] = mapKeyToFormat('SUP', { tag: 'SUB' });
+  keyHandlers[ctrlKey + 'Shift-8'] = (self, event) => {
     event.preventDefault();
     const path = self.getPath();
     if (!/(?:^|>)UL/.test(path)) {
@@ -2016,7 +2019,7 @@
       self.removeList();
     }
   };
-  keyHandlers[ctrlKey + "Shift-9"] = (self, event) => {
+  keyHandlers[ctrlKey + 'Shift-9'] = (self, event) => {
     event.preventDefault();
     const path = self.getPath();
     if (!/(?:^|>)OL/.test(path)) {
@@ -2025,7 +2028,7 @@
       self.removeList();
     }
   };
-  keyHandlers[ctrlKey + "["] = (self, event) => {
+  keyHandlers[ctrlKey + '['] = (self, event) => {
     event.preventDefault();
     const path = self.getPath();
     if (/(?:^|>)BLOCKQUOTE/.test(path) || !/(?:^|>)[OU]L/.test(path)) {
@@ -2034,7 +2037,7 @@
       self.decreaseListLevel();
     }
   };
-  keyHandlers[ctrlKey + "]"] = (self, event) => {
+  keyHandlers[ctrlKey + ']'] = (self, event) => {
     event.preventDefault();
     const path = self.getPath();
     if (/(?:^|>)BLOCKQUOTE/.test(path) || !/(?:^|>)[OU]L/.test(path)) {
@@ -2043,18 +2046,18 @@
       self.increaseListLevel();
     }
   };
-  keyHandlers[ctrlKey + "d"] = (self, event) => {
+  keyHandlers[ctrlKey + 'd'] = (self, event) => {
     event.preventDefault();
     self.toggleCode();
   };
-  keyHandlers[ctrlKey + "z"] = (self, event) => {
+  keyHandlers[ctrlKey + 'z'] = (self, event) => {
     event.preventDefault();
     self.undo();
   };
-  keyHandlers[ctrlKey + "y"] = // Depending on platform, the Shift may cause the key to come through as
+  keyHandlers[ctrlKey + 'y'] = // Depending on platform, the Shift may cause the key to come through as
     // upper case, but sometimes not. Just add both as shortcuts — the browser
     // will only ever fire one or the other.
-    keyHandlers[ctrlKey + "Shift-z"] = keyHandlers[ctrlKey + "Shift-Z"] = (self, event) => {
+    keyHandlers[ctrlKey + 'Shift-z'] = keyHandlers[ctrlKey + 'Shift-Z'] = (self, event) => {
       event.preventDefault();
       self.redo();
     };
@@ -2068,15 +2071,15 @@
        * editor code.
        */
       this.customEvents = /* @__PURE__ */ new Set([
-        "pathChange",
-        "select",
-        "input",
-        "pasteImage",
-        "undoStateChange"
+        'pathChange',
+        'select',
+        'input',
+        'pasteImage',
+        'undoStateChange'
       ]);
       // ---
-      this.startSelectionId = "squire-selection-start";
-      this.endSelectionId = "squire-selection-end";
+      this.startSelectionId = 'squire-selection-start';
+      this.endSelectionId = 'squire-selection-end';
       /*
       linkRegExp = new RegExp(
           // Only look on boundaries
@@ -2130,10 +2133,10 @@
       */
       this.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;
       this.tagAfterSplit = {
-        DT: "DD",
-        DD: "DT",
-        LI: "LI",
-        PRE: "PRE"
+        DT: 'DD',
+        DD: 'DT',
+        LI: 'LI',
+        PRE: 'PRE'
       };
       this._root = root;
       this._config = this._makeConfig(config);
@@ -2143,7 +2146,7 @@
       this._mayHaveZWS = false;
       this._lastAnchorNode = null;
       this._lastFocusNode = null;
-      this._path = "";
+      this._path = '';
       this._events = /* @__PURE__ */ new Map();
       this._undoIndex = -1;
       this._undoStack = [];
@@ -2151,23 +2154,22 @@
       this._isInUndoState = false;
       this._ignoreChange = false;
       this._ignoreAllChanges = false;
-      this.addEventListener("selectionchange", this._updatePathOnEvent);
-      this.addEventListener("blur", this._enableRestoreSelection);
-      this.addEventListener("mousedown", this._disableRestoreSelection);
-      this.addEventListener("touchstart", this._disableRestoreSelection);
-      this.addEventListener("focus", this._restoreSelection);
-      this.addEventListener("blur", this._removeZWS);
+      this.addEventListener('selectionchange', this._updatePathOnEvent);
+      this.addEventListener('blur', this._enableRestoreSelection);
+      this.addEventListener('mousedown', this._disableRestoreSelection);
+      this.addEventListener('touchstart', this._disableRestoreSelection);
+      this.addEventListener('focus', this._restoreSelection);
       this._isShiftDown = false;
-      this.addEventListener("cut", _onCut);
-      this.addEventListener("copy", _onCopy);
-      this.addEventListener("paste", _onPaste);
-      this.addEventListener("drop", _onDrop);
+      this.addEventListener('cut', _onCut);
+      this.addEventListener('copy', _onCopy);
+      this.addEventListener('paste', _onPaste);
+      this.addEventListener('drop', _onDrop);
       this.addEventListener(
-        "keydown",
+        'keydown',
         _monitorShiftKey
       );
-      this.addEventListener("keyup", _monitorShiftKey);
-      this.addEventListener("keydown", _onKey);
+      this.addEventListener('keyup', _monitorShiftKey);
+      this.addEventListener('keydown', _onKey);
       this._keyHandlers = Object.create(keyHandlers);
       const mutation = new MutationObserver(() => this._docWasChanged());
       mutation.observe(root, {
@@ -2177,13 +2179,14 @@
         subtree: true
       });
       this._mutation = mutation;
-      root.setAttribute("contenteditable", "true");
+      root.setAttribute('contenteditable', 'true');
       this.addEventListener(
-        "beforeinput",
+        'beforeinput',
         this._beforeInput
       );
-      this.setHTML("");
+      this.setHTML('');
     }
+
     destroy() {
       this._events.forEach((_, type) => {
         this.removeEventListener(type);
@@ -2193,16 +2196,17 @@
       this._undoStack = [];
       this._undoStackLength = 0;
     }
+
     _makeConfig(userConfig) {
       const config = {
-        blockTag: "DIV",
+        blockTag: 'DIV',
         blockAttributes: null,
         tagAttributes: {},
         classNames: {
-          color: "color",
-          fontFamily: "font",
-          fontSize: "size",
-          highlight: "highlight"
+          color: 'color',
+          fontFamily: 'font',
+          fontSize: 'size',
+          highlight: 'highlight'
         },
         undo: {
           documentSizeThreshold: -1,
@@ -2231,108 +2235,112 @@
       }
       return config;
     }
+
     setKeyHandler(key, fn) {
       this._keyHandlers[key] = fn;
       return this;
     }
+
     _beforeInput(event) {
       switch (event.inputType) {
-        case "insertLineBreak":
+        case 'insertLineBreak':
           event.preventDefault();
           this.splitBlock(true);
           break;
-        case "insertParagraph":
+        case 'insertParagraph':
           event.preventDefault();
           this.splitBlock(false);
           break;
-        case "insertOrderedList":
+        case 'insertOrderedList':
           event.preventDefault();
           this.makeOrderedList();
           break;
-        case "insertUnoderedList":
+        case 'insertUnoderedList':
           event.preventDefault();
           this.makeUnorderedList();
           break;
-        case "historyUndo":
+        case 'historyUndo':
           event.preventDefault();
           this.undo();
           break;
-        case "historyRedo":
+        case 'historyRedo':
           event.preventDefault();
           this.redo();
           break;
-        case "formatBold":
+        case 'formatBold':
           event.preventDefault();
           this.bold();
           break;
-        case "formaItalic":
+        case 'formaItalic':
           event.preventDefault();
           this.italic();
           break;
-        case "formatUnderline":
+        case 'formatUnderline':
           event.preventDefault();
           this.underline();
           break;
-        case "formatStrikeThrough":
+        case 'formatStrikeThrough':
           event.preventDefault();
           this.strikethrough();
           break;
-        case "formatSuperscript":
+        case 'formatSuperscript':
           event.preventDefault();
           this.superscript();
           break;
-        case "formatSubscript":
+        case 'formatSubscript':
           event.preventDefault();
           this.subscript();
           break;
-        case "formatJustifyFull":
-        case "formatJustifyCenter":
-        case "formatJustifyRight":
-        case "formatJustifyLeft": {
+        case 'formatJustifyFull':
+        case 'formatJustifyCenter':
+        case 'formatJustifyRight':
+        case 'formatJustifyLeft': {
           event.preventDefault();
           let alignment = event.inputType.slice(13).toLowerCase();
-          if (alignment === "full") {
-            alignment = "justify";
+          if (alignment === 'full') {
+            alignment = 'justify';
           }
           this.setTextAlignment(alignment);
           break;
         }
-        case "formatRemove":
+        case 'formatRemove':
           event.preventDefault();
           this.removeAllFormatting();
           break;
-        case "formatSetBlockTextDirection": {
+        case 'formatSetBlockTextDirection': {
           event.preventDefault();
           let dir = event.data;
-          if (dir === "null") {
+          if (dir === 'null') {
             dir = null;
           }
           this.setTextDirection(dir);
           break;
         }
-        case "formatBackColor":
+        case 'formatBackColor':
           event.preventDefault();
           this.setHighlightColor(event.data);
           break;
-        case "formatFontColor":
+        case 'formatFontColor':
           event.preventDefault();
           this.setTextColor(event.data);
           break;
-        case "formatFontName":
+        case 'formatFontName':
           event.preventDefault();
           this.setFontFace(event.data);
           break;
       }
     }
+
     // --- Events
     handleEvent(event) {
       this.fireEvent(event.type, event);
     }
+
     fireEvent(type, detail) {
       let handlers = this._events.get(type);
       if (/^(?:focus|blur)/.test(type)) {
         const isFocused = this._root === document.activeElement;
-        if (type === "focus") {
+        if (type === 'focus') {
           if (!isFocused || this._isFocused) {
             return this;
           }
@@ -2351,7 +2359,7 @@
         handlers = handlers.slice();
         for (const handler of handlers) {
           try {
-            if ("handleEvent" in handler) {
+            if ('handleEvent' in handler) {
               handler.handleEvent(event);
             } else {
               handler.call(this, event);
@@ -2363,6 +2371,7 @@
       }
       return this;
     }
+
     addEventListener(type, fn) {
       let handlers = this._events.get(type);
       let target = this._root;
@@ -2370,7 +2379,7 @@
         handlers = [];
         this._events.set(type, handlers);
         if (!this.customEvents.has(type)) {
-          if (type === "selectionchange") {
+          if (type === 'selectionchange') {
             target = document;
           }
           target.addEventListener(type, this, true);
@@ -2379,6 +2388,7 @@
       handlers.push(fn);
       return this;
     }
+
     removeEventListener(type, fn) {
       const handlers = this._events.get(type);
       let target = this._root;
@@ -2396,7 +2406,7 @@
         if (!handlers.length) {
           this._events.delete(type);
           if (!this.customEvents.has(type)) {
-            if (type === "selectionchange") {
+            if (type === 'selectionchange') {
               target = document;
             }
             target.removeEventListener(type, this, true);
@@ -2405,27 +2415,33 @@
       }
       return this;
     }
+
     // --- Focus
     focus() {
       this._root.focus({ preventScroll: true });
       return this;
     }
+
     blur() {
       this._root.blur();
       return this;
     }
+
     // --- Selection and bookmarking
     _enableRestoreSelection() {
       this._willRestoreSelection = true;
     }
+
     _disableRestoreSelection() {
       this._willRestoreSelection = false;
     }
+
     _restoreSelection() {
       if (this._willRestoreSelection) {
         this.setSelection(this._lastSelection);
       }
     }
+
     // ---
     _removeZWS() {
       if (!this._mayHaveZWS) {
@@ -2434,14 +2450,15 @@
       removeZWS(this._root);
       this._mayHaveZWS = false;
     }
+
     _saveRangeToBookmark(range) {
-      let startNode = createElement("INPUT", {
+      let startNode = createElement('INPUT', {
         id: this.startSelectionId,
-        type: "hidden"
+        type: 'hidden'
       });
-      let endNode = createElement("INPUT", {
+      let endNode = createElement('INPUT', {
         id: this.endSelectionId,
-        type: "hidden"
+        type: 'hidden'
       });
       let temp;
       insertNodeInRange(range, startNode);
@@ -2457,10 +2474,11 @@
       range.setStartAfter(startNode);
       range.setEndBefore(endNode);
     }
+
     _getRangeAndRemoveBookmark(range) {
       const root = this._root;
-      const start = root.querySelector("#" + this.startSelectionId);
-      const end = root.querySelector("#" + this.endSelectionId);
+      const start = root.querySelector('#' + this.startSelectionId);
+      const end = root.querySelector('#' + this.endSelectionId);
       if (start && end) {
         let startContainer = start.parentNode;
         let endContainer = end.parentNode;
@@ -2498,6 +2516,7 @@
       }
       return range || null;
     }
+
     getSelection() {
       const selection = window.getSelection();
       const root = this._root;
@@ -2526,6 +2545,7 @@
       }
       return range;
     }
+
     setSelection(range) {
       this._lastSelection = range;
       if (!this._isFocused) {
@@ -2533,7 +2553,7 @@
       } else {
         const selection = window.getSelection();
         if (selection) {
-          if ("setBaseAndExtent" in Selection.prototype) {
+          if ('setBaseAndExtent' in Selection.prototype) {
             selection.setBaseAndExtent(
               range.startContainer,
               range.startOffset,
@@ -2548,6 +2568,7 @@
       }
       return this;
     }
+
     // ---
     _moveCursorTo(toStart) {
       const root = this._root;
@@ -2556,19 +2577,22 @@
       this.setSelection(range);
       return this;
     }
+
     moveCursorToStart() {
       return this._moveCursorTo(true);
     }
+
     moveCursorToEnd() {
       return this._moveCursorTo(false);
     }
+
     // ---
     getCursorPosition() {
       const range = this.getSelection();
       let rect = range.getBoundingClientRect();
       if (rect && !rect.top) {
         this._ignoreChange = true;
-        const node = createElement("SPAN");
+        const node = createElement('SPAN');
         node.textContent = ZWS;
         insertNodeInRange(range, node);
         rect = node.getBoundingClientRect();
@@ -2578,15 +2602,18 @@
       }
       return rect;
     }
+
     // --- Path
     getPath() {
       return this._path;
     }
+
     _updatePathOnEvent() {
       if (this._isFocused) {
         this._updatePath(this.getSelection());
       }
     }
+
     _updatePath(range, force) {
       const anchor = range.startContainer;
       const focus = range.endContainer;
@@ -2594,58 +2621,60 @@
       if (force || anchor !== this._lastAnchorNode || focus !== this._lastFocusNode) {
         this._lastAnchorNode = anchor;
         this._lastFocusNode = focus;
-        newPath = anchor && focus ? anchor === focus ? this._getPath(focus) : "(selection)" : "";
-        if (this._path !== newPath || anchor !== focus) {
+        newPath = anchor && focus ? anchor === focus ? this._getPath(focus) : '(selection)' : '';
+        if (this._path !== newPath) {
           this._path = newPath;
-          this.fireEvent("pathChange", {
+          this.fireEvent('pathChange', {
             path: newPath
           });
         }
       }
-      this.fireEvent(range.collapsed ? "cursor" : "select", {
+      this.fireEvent(range.collapsed ? 'cursor' : 'select', {
         range
       });
     }
+
     _getPath(node) {
       const root = this._root;
       const config = this._config;
-      let path = "";
+      let path = '';
       if (node && node !== root) {
         const parent = node.parentNode;
-        path = parent ? this._getPath(parent) : "";
+        path = parent ? this._getPath(parent) : '';
         if (node instanceof HTMLElement) {
           const id = node.id;
           const classList = node.classList;
           const classNames = Array.from(classList).sort();
           const dir = node.dir;
           const styleNames = config.classNames;
-          path += (path ? ">" : "") + node.nodeName;
+          path += (path ? '>' : '') + node.nodeName;
           if (id) {
-            path += "#" + id;
+            path += '#' + id;
           }
           if (classNames.length) {
-            path += ".";
-            path += classNames.join(".");
+            path += '.';
+            path += classNames.join('.');
           }
           if (dir) {
-            path += "[dir=" + dir + "]";
+            path += '[dir=' + dir + ']';
           }
           if (classList.contains(styleNames.highlight)) {
-            path += "[backgroundColor=" + node.style.backgroundColor.replace(/ /g, "") + "]";
+            path += '[backgroundColor=' + node.style.backgroundColor.replace(/ /g, '') + ']';
           }
           if (classList.contains(styleNames.color)) {
-            path += "[color=" + node.style.color.replace(/ /g, "") + "]";
+            path += '[color=' + node.style.color.replace(/ /g, '') + ']';
           }
           if (classList.contains(styleNames.fontFamily)) {
-            path += "[fontFamily=" + node.style.fontFamily.replace(/ /g, "") + "]";
+            path += '[fontFamily=' + node.style.fontFamily.replace(/ /g, '') + ']';
           }
           if (classList.contains(styleNames.fontSize)) {
-            path += "[fontSize=" + node.style.fontSize + "]";
+            path += '[fontSize=' + node.style.fontSize + ']';
           }
         }
       }
       return path;
     }
+
     // --- History
     modifyDocument(modificationFn) {
       const mutation = this._mutation;
@@ -2669,6 +2698,7 @@
       }
       return this;
     }
+
     _docWasChanged() {
       resetNodeCategoryCache();
       this._mayHaveZWS = true;
@@ -2681,13 +2711,14 @@
       }
       if (this._isInUndoState) {
         this._isInUndoState = false;
-        this.fireEvent("undoStateChange", {
+        this.fireEvent('undoStateChange', {
           canUndo: true,
           canRedo: false
         });
       }
-      this.fireEvent("input");
+      this.fireEvent('input');
     }
+
     /**
      * Leaves bookmark.
      */
@@ -2726,6 +2757,7 @@
       }
       return this;
     }
+
     saveUndoState(range) {
       if (!range) {
         range = this.getSelection();
@@ -2734,6 +2766,7 @@
       this._getRangeAndRemoveBookmark(range);
       return this;
     }
+
     undo() {
       if (this._undoIndex !== 0 || !this._isInUndoState) {
         this._recordUndoState(this.getSelection(), false);
@@ -2744,14 +2777,15 @@
           this.setSelection(range);
         }
         this._isInUndoState = true;
-        this.fireEvent("undoStateChange", {
+        this.fireEvent('undoStateChange', {
           canUndo: this._undoIndex !== 0,
           canRedo: true
         });
-        this.fireEvent("input");
+        this.fireEvent('input');
       }
       return this.focus();
     }
+
     redo() {
       const undoIndex = this._undoIndex;
       const undoStackLength = this._undoStackLength;
@@ -2762,27 +2796,30 @@
         if (range) {
           this.setSelection(range);
         }
-        this.fireEvent("undoStateChange", {
+        this.fireEvent('undoStateChange', {
           canUndo: true,
           canRedo: undoIndex + 2 < undoStackLength
         });
-        this.fireEvent("input");
+        this.fireEvent('input');
       }
       return this.focus();
     }
+
     // --- Get and set data
     getRoot() {
       return this._root;
     }
+
     _getRawHTML() {
       return this._root.innerHTML;
     }
+
     _setRawHTML(html) {
       const root = this._root;
       root.innerHTML = html;
       let node = root;
       const child = node.firstChild;
-      if (!child || child.nodeName === "BR") {
+      if (!child || child.nodeName === 'BR') {
         const block = this.createDefaultBlock();
         if (child) {
           node.replaceChild(block, child);
@@ -2797,18 +2834,20 @@
       this._ignoreChange = true;
       return this;
     }
+
     getHTML(withBookmark) {
       let range;
       if (withBookmark) {
         range = this.getSelection();
         this._saveRangeToBookmark(range);
       }
-      const html = this._getRawHTML().replace(/\u200B/g, "");
+      const html = this._getRawHTML().replace(/\u200B/g, '');
       if (withBookmark) {
         this._getRangeAndRemoveBookmark(range);
       }
       return html;
     }
+
     setHTML(html) {
       const frag = this._config.sanitizeToDOMFragment(html, this);
       const root = this._root;
@@ -2817,7 +2856,7 @@
       fixContainer(frag, root);
       let node = frag;
       let child = node.firstChild;
-      if (!child || child.nodeName === "BR") {
+      if (!child || child.nodeName === 'BR') {
         const block = this.createDefaultBlock();
         if (child) {
           node.replaceChild(block, child);
@@ -2844,6 +2883,7 @@
       this._updatePath(range, true);
       return this;
     }
+
     /**
      * Insert HTML at the cursor location. If the selection is not collapsed
      * insertTreeFragmentIntoRange will delete the selection so that it is
@@ -2869,21 +2909,20 @@
         }
         let doInsert = true;
         if (isPaste) {
-          const event = new CustomEvent("willPaste", {
+          const event = new CustomEvent('willPaste', {
             cancelable: true,
             detail: {
-              html,
               fragment: frag
             }
           });
-          this.fireEvent("willPaste", event);
+          this.fireEvent('willPaste', event);
           frag = event.detail.fragment;
           doInsert = !event.defaultPrevented;
         }
         if (doInsert) {
           insertTreeFragmentIntoRange(range, frag, root);
           range.collapse(false);
-          moveRangeBoundaryOutOf(range, "A", root);
+          moveRangeBoundaryOutOf(range, 'A', root);
           this._ensureBottomLine();
         }
         this.setSelection(range);
@@ -2896,6 +2935,7 @@
       }
       return this;
     }
+
     insertElement(el, range) {
       if (!range) {
         range = this.getSelection();
@@ -2939,9 +2979,10 @@
       this._updatePath(range);
       return this;
     }
+
     insertImage(src, attributes) {
       const img = createElement(
-        "IMG",
+        'IMG',
         Object.assign(
           {
             src
@@ -2952,14 +2993,15 @@
       this.insertElement(img);
       return img;
     }
+
     insertPlainText(plainText, isPaste) {
       const range = this.getSelection();
-      if (range.collapsed && getNearest(range.startContainer, this._root, "PRE")) {
+      if (range.collapsed && getNearest(range.startContainer, this._root, 'PRE')) {
         const startContainer = range.startContainer;
         let offset = range.startOffset;
         let textNode;
         if (!startContainer || !(startContainer instanceof Text)) {
-          const text = document.createTextNode("");
+          const text = document.createTextNode('');
           startContainer.insertBefore(
             text,
             startContainer.childNodes[offset]
@@ -2971,13 +3013,13 @@
         }
         let doInsert = true;
         if (isPaste) {
-          const event = new CustomEvent("willPaste", {
+          const event = new CustomEvent('willPaste', {
             cancelable: true,
             detail: {
               text: plainText
             }
           });
-          this.fireEvent("willPaste", event);
+          this.fireEvent('willPaste', event);
           plainText = event.detail.text;
           doInsert = !event.defaultPrevented;
         }
@@ -2989,29 +3031,31 @@
         this.setSelection(range);
         return this;
       }
-      const lines = plainText.split("\n");
+      const lines = plainText.split('\n');
       const config = this._config;
       const tag = config.blockTag;
       const attributes = config.blockAttributes;
-      const closeBlock = "</" + tag + ">";
-      let openBlock = "<" + tag;
+      const closeBlock = '</' + tag + '>';
+      let openBlock = '<' + tag;
       for (const attr in attributes) {
-        openBlock += " " + attr + '="' + escapeHTML(attributes[attr]) + '"';
+        openBlock += ' ' + attr + '="' + escapeHTML(attributes[attr]) + '"';
       }
-      openBlock += ">";
+      openBlock += '>';
       for (let i = 0, l = lines.length; i < l; i += 1) {
         let line = lines[i];
-        line = escapeHTML(line).replace(/ (?=(?: |$))/g, "&nbsp;");
+        line = escapeHTML(line).replace(/ (?=(?: |$))/g, '&nbsp;');
         if (i) {
-          line = openBlock + (line || "<BR>") + closeBlock;
+          line = openBlock + (line || '<BR>') + closeBlock;
         }
         lines[i] = line;
       }
-      return this.insertHTML(lines.join(""), isPaste);
+      return this.insertHTML(lines.join(''), isPaste);
     }
+
     getSelectedText(range) {
       return getTextContentsOfRange(range || this.getSelection());
     }
+
     // --- Inline formatting
     /**
      * Extracts the font-family and font-size (if any) of the element
@@ -3027,7 +3071,6 @@
       if (!range) {
         range = this.getSelection();
       }
-      moveRangeBoundariesDownTree(range);
       let seenAttributes = 0;
       let element = range.commonAncestorContainer;
       if (range.collapsed || element instanceof Text) {
@@ -3063,6 +3106,7 @@
       }
       return fontInfo;
     }
+
     /**
      * Looks for matching tag and attributes, so won't work if <strong>
      * instead of <b> etc.
@@ -3102,6 +3146,7 @@
       }
       return seenNode;
     }
+
     changeFormat(add, remove, range, partial) {
       if (!range) {
         range = this.getSelection();
@@ -3126,6 +3171,7 @@
       this._updatePath(range, true);
       return this.focus();
     }
+
     _addFormat(tag, attributes, range) {
       const root = this._root;
       if (range.collapsed) {
@@ -3145,7 +3191,7 @@
           range.commonAncestorContainer,
           SHOW_ELEMENT_OR_TEXT,
           (node) => {
-            return (node instanceof Text || node.nodeName === "BR" || node.nodeName === "IMG") && isNodeContainedInRange(range, node, true);
+            return (node instanceof Text || node.nodeName === 'BR' || node.nodeName === 'IMG') && isNodeContainedInRange(range, node, true);
           }
         );
         let { startContainer, startOffset, endContainer, endOffset } = range;
@@ -3190,6 +3236,7 @@
       }
       return range;
     }
+
     _removeFormat(tag, attributes, range, partial) {
       this._saveRangeToBookmark(range);
       let fixer;
@@ -3197,7 +3244,7 @@
         if (cantFocusEmptyTextNodes) {
           fixer = document.createTextNode(ZWS);
         } else {
-          fixer = document.createTextNode("");
+          fixer = document.createTextNode('');
         }
         insertNodeInRange(range, fixer);
       }
@@ -3272,50 +3319,63 @@
       mergeInlines(root, range);
       return range;
     }
+
     // ---
     bold() {
-      return this.changeFormat({ tag: "B" });
+      return this.changeFormat({ tag: 'B' });
     }
+
     removeBold() {
-      return this.changeFormat(null, { tag: "B" });
+      return this.changeFormat(null, { tag: 'B' });
     }
+
     italic() {
-      return this.changeFormat({ tag: "I" });
+      return this.changeFormat({ tag: 'I' });
     }
+
     removeItalic() {
-      return this.changeFormat(null, { tag: "I" });
+      return this.changeFormat(null, { tag: 'I' });
     }
+
     underline() {
-      return this.changeFormat({ tag: "U" });
+      return this.changeFormat({ tag: 'U' });
     }
+
     removeUnderline() {
-      return this.changeFormat(null, { tag: "U" });
+      return this.changeFormat(null, { tag: 'U' });
     }
+
     strikethrough() {
-      return this.changeFormat({ tag: "S" });
+      return this.changeFormat({ tag: 'S' });
     }
+
     removeStrikethrough() {
-      return this.changeFormat(null, { tag: "S" });
+      return this.changeFormat(null, { tag: 'S' });
     }
+
     subscript() {
-      return this.changeFormat({ tag: "SUB" }, { tag: "SUP" });
+      return this.changeFormat({ tag: 'SUB' }, { tag: 'SUP' });
     }
+
     removeSubscript() {
-      return this.changeFormat(null, { tag: "SUB" });
+      return this.changeFormat(null, { tag: 'SUB' });
     }
+
     superscript() {
-      return this.changeFormat({ tag: "SUP" }, { tag: "SUB" });
+      return this.changeFormat({ tag: 'SUP' }, { tag: 'SUB' });
     }
+
     removeSuperscript() {
-      return this.changeFormat(null, { tag: "SUP" });
+      return this.changeFormat(null, { tag: 'SUP' });
     }
+
     // ---
     makeLink(url, attributes) {
       const range = this.getSelection();
       if (range.collapsed) {
-        let protocolEnd = url.indexOf(":") + 1;
+        let protocolEnd = url.indexOf(':') + 1;
         if (protocolEnd) {
-          while (url[protocolEnd] === "/") {
+          while (url[protocolEnd] === '/') {
             protocolEnd += 1;
           }
         }
@@ -3333,30 +3393,32 @@
       );
       return this.changeFormat(
         {
-          tag: "A",
+          tag: 'A',
           attributes
         },
         {
-          tag: "A"
+          tag: 'A'
         },
         range
       );
     }
+
     removeLink() {
       return this.changeFormat(
         null,
         {
-          tag: "A"
+          tag: 'A'
         },
         this.getSelection(),
         true
       );
     }
+
     addDetectedLinks(searchInNode, root) {
       const walker = new TreeIterator(
         searchInNode,
         SHOW_TEXT,
-        (node2) => !getNearest(node2, root || this._root, "A")
+        (node2) => !getNearest(node2, root || this._root, 'A')
       );
       const linkRegExp = this.linkRegExp;
       const defaultAttributes = this._config.tagAttributes.a;
@@ -3375,10 +3437,10 @@
             );
           }
           const child = createElement(
-            "A",
+            'A',
             Object.assign(
               {
-                href: match[1] ? /^(?:ht|f)tps?:/i.test(match[1]) ? match[1] : "http://" + match[1] : "mailto:" + match[0]
+                href: match[1] ? /^(?:ht|f)tps?:/i.test(match[1]) ? match[1] : 'http://' + match[1] : 'mailto:' + match[0]
               },
               defaultAttributes
             )
@@ -3390,71 +3452,76 @@
       }
       return this;
     }
+
     // ---
     setFontFace(name) {
       const className = this._config.classNames.fontFamily;
       return this.changeFormat(
         name ? {
-          tag: "SPAN",
+          tag: 'SPAN',
           attributes: {
             class: className,
-            style: "font-family: " + name + ", sans-serif;"
+            style: 'font-family: ' + name + ', sans-serif;'
           }
         } : null,
         {
-          tag: "SPAN",
+          tag: 'SPAN',
           attributes: { class: className }
         }
       );
     }
+
     setFontSize(size) {
       const className = this._config.classNames.fontSize;
       return this.changeFormat(
         size ? {
-          tag: "SPAN",
+          tag: 'SPAN',
           attributes: {
             class: className,
-            style: "font-size: " + (typeof size === "number" ? size + "px" : size)
+            style: 'font-size: ' + (typeof size === 'number' ? size + 'px' : size)
           }
         } : null,
         {
-          tag: "SPAN",
+          tag: 'SPAN',
           attributes: { class: className }
         }
       );
     }
+
     setTextColor(color) {
       const className = this._config.classNames.color;
       return this.changeFormat(
         color ? {
-          tag: "SPAN",
+          tag: 'SPAN',
           attributes: {
             class: className,
-            style: "color:" + color
+            style: 'color:' + color
           }
         } : null,
         {
-          tag: "SPAN",
+          tag: 'SPAN',
           attributes: { class: className }
         }
       );
     }
+
     setHighlightColor(color) {
       const className = this._config.classNames.highlight;
       return this.changeFormat(
         color ? {
-          tag: "SPAN",
+          tag: 'SPAN',
           attributes: {
             class: className,
-            style: "background-color:" + color
+            style: 'background-color:' + color
           }
         } : null,
         {
-          tag: "SPAN",
+          tag: 'SPAN',
           attributes: { class: className }
         }
       );
     }
+
     // --- Block formatting
     _ensureBottomLine() {
       const root = this._root;
@@ -3463,12 +3530,14 @@
         root.appendChild(this.createDefaultBlock());
       }
     }
+
     createDefaultBlock(children) {
       const config = this._config;
       return fixCursor(
         createElement(config.blockTag, config.blockAttributes, children)
       );
     }
+
     splitBlock(lineBreakOnly, range) {
       if (!range) {
         range = this.getSelection();
@@ -3493,15 +3562,15 @@
         }, 0);
       }
       block = getStartBlockOfRange(range, root);
-      if (block && (parent = getNearest(block, root, "PRE"))) {
+      if (block && (parent = getNearest(block, root, 'PRE'))) {
         moveRangeBoundariesDownTree(range);
         node = range.startContainer;
         const offset2 = range.startOffset;
         if (!(node instanceof Text)) {
-          node = document.createTextNode("");
+          node = document.createTextNode('');
           parent.insertBefore(node, parent.firstChild);
         }
-        if (!lineBreakOnly && node instanceof Text && (node.data.charAt(offset2 - 1) === "\n" || rangeDoesStartAtBlockBoundary(range, root)) && (node.data.charAt(offset2) === "\n" || rangeDoesEndAtBlockBoundary(range, root))) {
+        if (!lineBreakOnly && node instanceof Text && (node.data.charAt(offset2 - 1) === '\n' || rangeDoesStartAtBlockBoundary(range, root)) && (node.data.charAt(offset2) === '\n' || rangeDoesEndAtBlockBoundary(range, root))) {
           node.deleteData(offset2 && offset2 - 1, offset2 ? 2 : 1);
           nodeAfterSplit = split(
             node,
@@ -3520,7 +3589,7 @@
           }
           range.setStart(node, 0);
         } else {
-          node.insertData(offset2, "\n");
+          node.insertData(offset2, '\n');
           fixCursor(parent);
           if (node.length === offset2 + 1) {
             range.setStartAfter(node);
@@ -3535,22 +3604,22 @@
         return this;
       }
       if (!block || lineBreakOnly || /^T[HD]$/.test(block.nodeName)) {
-        moveRangeBoundaryOutOf(range, "A", root);
-        insertNodeInRange(range, createElement("BR"));
+        moveRangeBoundaryOutOf(range, 'A', root);
+        insertNodeInRange(range, createElement('BR'));
         range.collapse(false);
         this.setSelection(range);
         this._updatePath(range, true);
         return this;
       }
-      if (parent = getNearest(block, root, "LI")) {
+      if (parent = getNearest(block, root, 'LI')) {
         block = parent;
       }
       if (isEmptyBlock(block)) {
-        if (getNearest(block, root, "UL") || getNearest(block, root, "OL")) {
+        if (getNearest(block, root, 'UL') || getNearest(block, root, 'OL')) {
           this.decreaseListLevel(range);
           return this;
-        } else if (getNearest(block, root, "BLOCKQUOTE")) {
-          this.replaceWithBlankLine(range);
+        } else if (getNearest(block, root, 'BLOCKQUOTE')) {
+          this.removeQuote(range);
           return this;
         }
       }
@@ -3584,21 +3653,21 @@
       while (nodeAfterSplit instanceof Element) {
         let child = nodeAfterSplit.firstChild;
         let next;
-        if (nodeAfterSplit.nodeName === "A" && (!nodeAfterSplit.textContent || nodeAfterSplit.textContent === ZWS)) {
-          child = document.createTextNode("");
+        if (nodeAfterSplit.nodeName === 'A' && (!nodeAfterSplit.textContent || nodeAfterSplit.textContent === ZWS)) {
+          child = document.createTextNode('');
           replaceWith(nodeAfterSplit, child);
           nodeAfterSplit = child;
           break;
         }
         while (child && child instanceof Text && !child.data) {
           next = child.nextSibling;
-          if (!next || next.nodeName === "BR") {
+          if (!next || next.nodeName === 'BR') {
             break;
           }
           detach(child);
           child = next;
         }
-        if (!child || child.nodeName === "BR" || child instanceof Text) {
+        if (!child || child.nodeName === 'BR' || child instanceof Text) {
           break;
         }
         nodeAfterSplit = child;
@@ -3608,6 +3677,7 @@
       this._updatePath(range, true);
       return this;
     }
+
     forEachBlock(fn, mutates, range) {
       if (!range) {
         range = this.getSelection();
@@ -3631,6 +3701,7 @@
       }
       return this;
     }
+
     modifyBlocks(modify, range) {
       if (!range) {
         range = this.getSelection();
@@ -3668,32 +3739,35 @@
       this._updatePath(range, true);
       return this;
     }
+
     // ---
     setTextAlignment(alignment) {
       this.forEachBlock((block) => {
         const className = block.className.split(/\s+/).filter((klass) => {
           return !!klass && !/^align/.test(klass);
-        }).join(" ");
+        }).join(' ');
         if (alignment) {
-          block.className = className + " align-" + alignment;
+          block.className = className + ' align-' + alignment;
           block.style.textAlign = alignment;
         } else {
           block.className = className;
-          block.style.textAlign = "";
+          block.style.textAlign = '';
         }
       }, true);
       return this.focus();
     }
+
     setTextDirection(direction) {
       this.forEachBlock((block) => {
         if (direction) {
           block.dir = direction;
         } else {
-          block.removeAttribute("dir");
+          block.removeAttribute('dir');
         }
       }, true);
       return this.focus();
     }
+
     // ---
     _getListSelection(range, root) {
       let list = range.commonAncestorContainer;
@@ -3719,6 +3793,7 @@
       }
       return [list, startLi, endLi];
     }
+
     increaseListLevel(range) {
       if (!range) {
         range = this.getSelection();
@@ -3755,6 +3830,7 @@
       this._updatePath(range, true);
       return this.focus();
     }
+
     decreaseListLevel(range) {
       if (!range) {
         range = this.getSelection();
@@ -3777,7 +3853,7 @@
       if (startLi) {
         let newParent = list.parentNode;
         insertBefore = !endLi.nextSibling ? list.nextSibling : split(list, endLi.nextSibling, newParent, root);
-        if (newParent !== root && newParent.nodeName === "LI") {
+        if (newParent !== root && newParent.nodeName === 'LI') {
           newParent = newParent.parentNode;
           while (insertBefore) {
             next = insertBefore.nextSibling;
@@ -3790,7 +3866,7 @@
         do {
           next = startLi === endLi ? null : startLi.nextSibling;
           list.removeChild(startLi);
-          if (makeNotList && startLi.nodeName === "LI") {
+          if (makeNotList && startLi.nodeName === 'LI') {
             startLi = this.createDefaultBlock([empty(startLi)]);
           }
           newParent.insertBefore(startLi, insertBefore);
@@ -3807,6 +3883,7 @@
       this._updatePath(range, true);
       return this.focus();
     }
+
     _makeList(frag, type) {
       const walker = getBlockWalker(frag, this._root);
       const tagAttributes = this._config.tagAttributes;
@@ -3819,7 +3896,7 @@
           walker.currentNode = node.lastChild;
         }
         if (!(node instanceof HTMLLIElement)) {
-          const newLi = createElement("LI", listItemAttrs);
+          const newLi = createElement('LI', listItemAttrs);
           if (node.dir) {
             newLi.dir = node.dir;
           }
@@ -3845,18 +3922,21 @@
       }
       return frag;
     }
+
     makeUnorderedList() {
-      this.modifyBlocks((frag) => this._makeList(frag, "UL"));
+      this.modifyBlocks((frag) => this._makeList(frag, 'UL'));
       return this.focus();
     }
+
     makeOrderedList() {
-      this.modifyBlocks((frag) => this._makeList(frag, "OL"));
+      this.modifyBlocks((frag) => this._makeList(frag, 'OL'));
       return this.focus();
     }
+
     removeList() {
       this.modifyBlocks((frag) => {
-        const lists = frag.querySelectorAll("UL, OL");
-        const items = frag.querySelectorAll("LI");
+        const lists = frag.querySelectorAll('UL, OL');
+        const items = frag.querySelectorAll('LI');
         const root = this._root;
         for (let i = 0, l = lists.length; i < l; i += 1) {
           const list = lists[i];
@@ -3877,11 +3957,12 @@
       });
       return this.focus();
     }
+
     // ---
     increaseQuoteLevel(range) {
       this.modifyBlocks(
         (frag) => createElement(
-          "BLOCKQUOTE",
+          'BLOCKQUOTE',
           this._config.tagAttributes.blockquote,
           [frag]
         ),
@@ -3889,10 +3970,11 @@
       );
       return this.focus();
     }
+
     decreaseQuoteLevel(range) {
       this.modifyBlocks((frag) => {
-        Array.from(frag.querySelectorAll("blockquote")).filter((el) => {
-          return !getNearest(el.parentNode, frag, "BLOCKQUOTE");
+        Array.from(frag.querySelectorAll('blockquote')).filter((el) => {
+          return !getNearest(el.parentNode, frag, 'BLOCKQUOTE');
         }).forEach((el) => {
           replaceWith(el, empty(el));
         });
@@ -3900,33 +3982,24 @@
       }, range);
       return this.focus();
     }
+
     removeQuote(range) {
-      this.modifyBlocks((frag) => {
-        Array.from(frag.querySelectorAll("blockquote")).forEach(
-          (el) => {
-            replaceWith(el, empty(el));
-          }
-        );
-        return frag;
-      }, range);
-      return this.focus();
-    }
-    replaceWithBlankLine(range) {
       this.modifyBlocks(
         () => this.createDefaultBlock([
-          createElement("INPUT", {
+          createElement('INPUT', {
             id: this.startSelectionId,
-            type: "hidden"
+            type: 'hidden'
           }),
-          createElement("INPUT", {
+          createElement('INPUT', {
             id: this.endSelectionId,
-            type: "hidden"
+            type: 'hidden'
           })
         ]),
         range
       );
       return this.focus();
     }
+
     // ---
     code() {
       const range = this.getSelection();
@@ -3937,7 +4010,7 @@
           const blockWalker = getBlockWalker(frag, root);
           let node;
           while (node = blockWalker.nextNode()) {
-            let nodes = node.querySelectorAll("BR");
+            let nodes = node.querySelectorAll('BR');
             const brBreaksLine = [];
             let l = nodes.length;
             for (let i = 0; i < l; i += 1) {
@@ -3948,26 +4021,26 @@
               if (!brBreaksLine[l]) {
                 detach(br);
               } else {
-                replaceWith(br, document.createTextNode("\n"));
+                replaceWith(br, document.createTextNode('\n'));
               }
             }
-            nodes = node.querySelectorAll("CODE");
+            nodes = node.querySelectorAll('CODE');
             l = nodes.length;
             while (l--) {
               replaceWith(nodes[l], empty(nodes[l]));
             }
             if (output.childNodes.length) {
-              output.appendChild(document.createTextNode("\n"));
+              output.appendChild(document.createTextNode('\n'));
             }
             output.appendChild(empty(node));
           }
           const textWalker = new TreeIterator(output, SHOW_TEXT);
           while (node = textWalker.nextNode()) {
-            node.data = node.data.replace(/ /g, " ");
+            node.data = node.data.replace(/ /g, ' ');
           }
           output.normalize();
           return fixCursor(
-            createElement("PRE", this._config.tagAttributes.pre, [
+            createElement('PRE', this._config.tagAttributes.pre, [
               output
             ])
           );
@@ -3976,7 +4049,7 @@
       } else {
         this.changeFormat(
           {
-            tag: "CODE",
+            tag: 'CODE',
             attributes: this._config.tagAttributes.code
           },
           null,
@@ -3985,14 +4058,15 @@
       }
       return this;
     }
+
     removeCode() {
       const range = this.getSelection();
       const ancestor = range.commonAncestorContainer;
-      const inPre = getNearest(ancestor, this._root, "PRE");
+      const inPre = getNearest(ancestor, this._root, 'PRE');
       if (inPre) {
         this.modifyBlocks((frag) => {
           const root = this._root;
-          const pres = frag.querySelectorAll("PRE");
+          const pres = frag.querySelectorAll('PRE');
           let l = pres.length;
           while (l--) {
             const pre = pres[l];
@@ -4000,14 +4074,14 @@
             let node;
             while (node = walker.nextNode()) {
               let value = node.data;
-              value = value.replace(/ (?= )/g, "\xA0");
+              value = value.replace(/ (?= )/g, '\xA0');
               const contents = document.createDocumentFragment();
               let index;
-              while ((index = value.indexOf("\n")) > -1) {
+              while ((index = value.indexOf('\n')) > -1) {
                 contents.appendChild(
                   document.createTextNode(value.slice(0, index))
                 );
-                contents.appendChild(createElement("BR"));
+                contents.appendChild(createElement('BR'));
                 value = value.slice(index + 1);
               }
               node.parentNode.insertBefore(contents, node);
@@ -4020,24 +4094,26 @@
         }, range);
         this.focus();
       } else {
-        this.changeFormat(null, { tag: "CODE" }, range);
+        this.changeFormat(null, { tag: 'CODE' }, range);
       }
       return this;
     }
+
     toggleCode() {
-      if (this.hasFormat("PRE") || this.hasFormat("CODE")) {
+      if (this.hasFormat('PRE') || this.hasFormat('CODE')) {
         this.removeCode();
       } else {
         this.code();
       }
       return this;
     }
+
     // ---
     _removeFormatting(root, clean) {
       for (let node = root.firstChild, next; node; node = next) {
         next = node.nextSibling;
         if (isInline(node)) {
-          if (node instanceof Text || node.nodeName === "BR" || node.nodeName === "IMG") {
+          if (node instanceof Text || node.nodeName === 'BR' || node.nodeName === 'IMG') {
             clean.appendChild(node);
             continue;
           }
@@ -4056,6 +4132,7 @@
       }
       return clean;
     }
+
     removeAllFormatting(range) {
       if (!range) {
         range = this.getSelection();
diff --git a/plugins/ics-viewer/index.php b/plugins/ics-viewer/index.php
index 4100593b2..591288392 100644
--- a/plugins/ics-viewer/index.php
+++ b/plugins/ics-viewer/index.php
@@ -5,8 +5,8 @@ class ICSViewerPlugin extends \RainLoop\Plugins\AbstractPlugin
 	const
 		NAME = 'ICS Viewer',
 		AUTHOR = 'PhieF',
-		VERSION = '1.1',
-		RELEASE  = '2026-10-22',
+		VERSION = '1.0',
+		RELEASE  = '2024-09-17',
 		CATEGORY = 'Messages',
 		DESCRIPTION = 'Display ICS attachment using ical lib, or JSON-LD details, based on viewICS',
 		REQUIRED = '2.34.0';
diff --git a/plugins/ics-viewer/message.js b/plugins/ics-viewer/message.js
index b0adc469d..380b732bb 100644
--- a/plugins/ics-viewer/message.js
+++ b/plugins/ics-viewer/message.js
@@ -86,17 +86,10 @@
 							});
 						}
 					});
-					// ICS attachment.
-					// attachments is a ko.observableArray, so it must be
-					// unwrapped before array methods are used on it.
-					// A scheduling mail does not always carry a text/calendar
-					// attachment either: the part is often inline inside
-					// multipart/alternative and repeated as application/ics.
-					let ics = (msg.attachments() || []).find(attachment =>
-						'text/calendar' == attachment.mimeType
-						|| 'application/ics' == attachment.mimeType
-						|| 'text/x-vcalendar' == attachment.mimeType
-						|| /\.ics$/i.test(attachment.fileName || ''));
+					// ICS attachment
+//					let ics = msg.attachments.find(attachment => 'application/ics' == attachment.mimeType);
+
+					let ics = msg.attachments.find(attachment => 'text/calendar' == attachment.mimeType);
 					if (ics && ics.download) {
 
 						// fetch it and parse the VEVENT
diff --git a/plugins/ldap-contacts-suggestions/LdapContactsSuggestions.php b/plugins/ldap-contacts-suggestions/LdapContactsSuggestions.php
index aa5907753..d7eb3eb9a 100644
--- a/plugins/ldap-contacts-suggestions/LdapContactsSuggestions.php
+++ b/plugins/ldap-contacts-suggestions/LdapContactsSuggestions.php
@@ -139,41 +139,29 @@ class LdapContactsSuggestions implements \RainLoop\Providers\Suggestions\ISugges
 			$sFilter .= (1 < count($aItems) ? '(|' : '').$sSubFilter.(1 < count($aItems) ? ')' : '');
 			$sFilter .= ')';
 
-			// A directory rarely keeps everything worth suggesting in one branch:
-			// meeting rooms and other bookable resources commonly live outside
-			// the people branch. Searching a single subtree either misses them,
-			// or - if the base is widened to the domain root - drags every
-			// service account into the suggestion list. Base DNs are therefore
-			// separated by '|', which cannot appear unescaped in a DN, so an
-			// existing single-branch configuration keeps working unchanged.
-			$aBaseDns = \array_filter(\array_map('trim', \explode('|', $sBaseDn)), 'strlen');
+			$this->logWrite('ldap_search: start: '.$sBaseDn.' / '.$sFilter, \LOG_INFO, 'LDAP');
+			$oS = @\ldap_search($oCon, $sBaseDn, $sFilter, $aItems, 0, 30, 30);
+			if ($oS) {
+				$aEntries = @\ldap_get_entries($oCon, $oS);
+				if (is_array($aEntries)) {
+					if (isset($aEntries['count'])) {
+						unset($aEntries['count']);
+					}
 
-			foreach ($aBaseDns as $sOneBaseDn) {
-				$this->logWrite('ldap_search: start: '.$sOneBaseDn.' / '.$sFilter, \LOG_INFO, 'LDAP');
-				$oS = @\ldap_search($oCon, $sOneBaseDn, $sFilter, $aItems, 0, 30, 30);
-				if ($oS) {
-					$aEntries = @\ldap_get_entries($oCon, $oS);
-					if (is_array($aEntries)) {
-						if (isset($aEntries['count'])) {
-							unset($aEntries['count']);
-						}
-
-						foreach ($aEntries as $aItem) {
-							if ($aItem) {
-								$sName = $sEmail = '';
-								list ($sEmail, $sName) = $this->findNameAndEmail($aItem, $aEmails, $aNames, $aUIDs);
-								if (!empty($sEmail)) {
-									$aResult[] = array($sEmail, $sName);
-								}
+					foreach ($aEntries as $aItem) {
+						if ($aItem) {
+							$sName = $sEmail = '';
+							list ($sEmail, $sName) = $this->findNameAndEmail($aItem, $aEmails, $aNames, $aUIDs);
+							if (!empty($sEmail)) {
+								$aResult[] = array($sEmail, $sName);
 							}
 						}
-					} else {
-						$this->logLdapError($oCon, 'ldap_get_entries');
 					}
 				} else {
-					// One unreachable branch must not silence the others.
-					$this->logLdapError($oCon, 'ldap_search ('.$sOneBaseDn.')');
+					$this->logLdapError($oCon, 'ldap_get_entries');
 				}
+			} else {
+				$this->logLdapError($oCon, 'ldap_search');
 			}
 		}
 
diff --git a/plugins/ldap-contacts-suggestions/index.php b/plugins/ldap-contacts-suggestions/index.php
index 5ef78593c..dbbf2d515 100644
--- a/plugins/ldap-contacts-suggestions/index.php
+++ b/plugins/ldap-contacts-suggestions/index.php
@@ -4,8 +4,8 @@ class LdapContactsSuggestionsPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME     = 'Contacts suggestions (LDAP)',
-		VERSION  = '2.15',
-		RELEASE  = '2026-08-19',
+		VERSION  = '2.14',
+		RELEASE  = '2024-03-12',
 		REQUIRED = '2.35.3',
 		CATEGORY = 'Contacts',
 		DESCRIPTION = 'Get contacts suggestions from LDAP.';
@@ -79,7 +79,7 @@ class LdapContactsSuggestionsPlugin extends \RainLoop\Plugins\AbstractPlugin
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::PASSWORD)
 				->SetDefaultValue(''),
 			\RainLoop\Plugins\Property::NewInstance('base_dn')->SetLabel('Search base DN')
-				->SetDescription('DN to use as the search base. Supported tokens: {domain}, {domain:dc}, {email}, {email:user}, {email:domain}, {login}, {imap:login}, {imap:host}, {imap:port} Several branches may be given, separated by | - useful when meeting rooms or other resources live outside the people branch.')
+				->SetDescription('DN to use as the search base. Supported tokens: {domain}, {domain:dc}, {email}, {email:user}, {email:domain}, {login}, {imap:login}, {imap:host}, {imap:port}')
 				->SetDefaultValue('ou=People,dc=example,dc=com'),
 			\RainLoop\Plugins\Property::NewInstance('object_classes')->SetLabel('objectClasses')
 				->SetDescription('LDAP objectClasses to search for, comma separated list')
diff --git a/plugins/ldap-login-mapping/README b/plugins/ldap-login-mapping/README
index 59e065d6b..b12d3a77e 100644
--- a/plugins/ldap-login-mapping/README
+++ b/plugins/ldap-login-mapping/README
@@ -1 +1 @@
-This plugins allows to authenticate using LDAP mail field, yet login field would still be used for IMAP and SMTP authentication.
+Plugin which allows you to set up LDAP username by email address (when IMAP/SMTP requires it)
diff --git a/plugins/ldap-login-mapping/index.php b/plugins/ldap-login-mapping/index.php
index ea00ee759..73d8fae9c 100644
--- a/plugins/ldap-login-mapping/index.php
+++ b/plugins/ldap-login-mapping/index.php
@@ -8,12 +8,12 @@ class LDAPLoginMappingPlugin extends AbstractPlugin
 {
 	const
 		NAME     = 'LDAP login mapping',
-		VERSION  = '2.4',
+		VERSION  = '2.3',
 		AUTHOR   = 'RainLoop Team, Ludovic Pouzenc<ludovic@pouzenc.fr>, ZephOne<zephone@protonmail.com>',
-		RELEASE  = '2025-01-09',
+		RELEASE  = '2024-09-20',
 		REQUIRED = '2.36.1',
 		CATEGORY = 'Login',
-		DESCRIPTION = 'This plugins allows to authenticate using LDAP mail field, yet login field would still be used for IMAP and SMTP authentication';
+		DESCRIPTION = 'Enable custom mapping using ldap field';
 	/**
 	 * @var array
 	 */
@@ -104,10 +104,9 @@ class LDAPLoginMappingPlugin extends AbstractPlugin
 			$sResult = $this->ldapSearch($sEmail);
 			if ( is_array($sResult) ) {
 				$sImapUser = $sResult['login'];
-				$sSmtpUser = $sResult['login'];
 				$sEmail = $sResult['email'];
 			}
-			syslog(LOG_WARNING, "plugins/ldap-login-mapping/index.php:FilterLoginCredentials() auth try: $sIP/$sEmail, resolved as $sImapUser/$sEmail");
+			syslog(LOG_WARNING, "plugins/ldap-login-mapping/index.php:FilterLoginСredentials() auth try: $sIP/$sEmail, resolved as $sImapUser/$sEmail");
 		}
 	}
 
diff --git a/plugins/login-http/LICENSE b/plugins/login-http/LICENSE
deleted file mode 100644
index f709b02e2..000000000
--- a/plugins/login-http/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 RainLoop Team
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/login-http/index.php b/plugins/login-http/index.php
deleted file mode 100644
index 9b53c0cb5..000000000
--- a/plugins/login-http/index.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-class LoginHttpPlugin extends \RainLoop\Plugins\AbstractPlugin
-{
-	const
-		NAME     = 'Login HTTP',
-		AUTHOR   = 'Alterative Editions',
-		URL      = 'https://alterative.fr/',
-		VERSION  = '1.0',
-		RELEASE  = '2026-02-09',
-		REQUIRED = '2.21.0',
-		CATEGORY = 'Login',
-		LICENSE  = 'MIT',
-		DESCRIPTION = 'Automatic HTTP Login : uses PHP_AUTH_USER & PHP_AUTH_PW for IMAP connection';
-
-	public function Init() : void
-	{
-		$this->addPartHook('ExternalHTTP', 'ServiceExternalHTTP');
-	}
-
-	public function ServiceExternalHTTP() : string
-	{
-		$oActions = \RainLoop\Api::Actions();
-		$oActions->Http()->ServerNoCache();
-		$sUser=$_SERVER['PHP_AUTH_USER'] ?? '';
-		$sPassword=$_SERVER['PHP_AUTH_PW'] ?? '';
-		try {
-                	$oAccount = $oActions->LoginProcess($sUser, new \SnappyMail\SensitiveString($sPassword));
-                if ($oAccount) {
-                    \MailSo\Base\Http::Location('./');
-                    return true;
-                }
-            } catch (\Throwable $e) {
-                // Log l'erreur si besoin
-            }
-                \MailSo\Base\Http::Location('./?ExternalHTTP');
-		return true;
-	}
-}
diff --git a/plugins/login-o365/LoginOAuth2.js b/plugins/login-o365/LoginOAuth2.js
index 392c0e7b1..dd8c843ed 100644
--- a/plugins/login-o365/LoginOAuth2.js
+++ b/plugins/login-o365/LoginOAuth2.js
@@ -1,91 +1,54 @@
-((rl) => {
-  const client_id = rl.pluginSettingsGet("login-o365", "client_id"),
-    allowAnyDomain = !!rl.pluginSettingsGet("login-o365", "allow_any_domain"),
-    isSupportedEmail = (email) => {
-      email = (email || "").toLowerCase();
-      if (!email.includes("@")) return false;
-      if (allowAnyDomain) return true;
-      return /@(outlook\.com|hotmail\.com|live\.com)$/.test(email);
-    },
-    startOAuth = (op, opts = {}) => {
-      const email = (opts.email || "").toLowerCase();
-      const name = opts.name || "";
-      const returnHash = opts.return || "";
+(rl => {
+	const client_id = rl.pluginSettingsGet('login-o365', 'client_id'),
+		// https://learn.microsoft.com/en-us/entra/identity-platform/reply-url#query-parameter-support-in-redirect-uris
+		query = rl.pluginSettingsGet('login-o365', 'personal') ? '' : '?',
+		tenant = rl.pluginSettingsGet('login-o365', 'tenant'),
+		login = () => {
+			document.location = 'https://login.microsoftonline.com/'+tenant+'/oauth2/v2.0/authorize?' + (new URLSearchParams({
+				response_type: 'code',
+				client_id: client_id,
+				redirect_uri: document.location.href.replace(/\/$/, '') + '/' + query + 'LoginO365',
+				scope: [
+					// Associate personal info
+					'openid',
+					'offline_access',
+					'email',
+					'profile',
+					// Access IMAP and SMTP through OAUTH
+					'https://graph.microsoft.com/IMAP.AccessAsUser.All',
+//					'https://graph.microsoft.com/Mail.ReadWrite'
+					'https://graph.microsoft.com/Mail.Send'
+/*					// Legacy:
+					'https://outlook.office.com/SMTP.Send',
+					'https://outlook.office.com/IMAP.AccessAsUser.All'
+*/
+				].join(' '),
+				state: 'o365', // + rl.settings.app('token') + localStorage.getItem('smctoken')
+				// Force authorize screen, so we always get a refresh_token
+				access_type: 'offline',
+				prompt: 'consent'
+			}));
+		};
 
-      // Server mints a signed state + correct redirect_uri and returns full authUrl.
-      rl.pluginRemoteRequest((iError, data) => {
-        const url = data?.Result?.authUrl;
-        if (!iError && url) {
-          document.location = url;
-        }
-      }, "LoginO365AuthUrl", {
-        op: op,
-        email: email,
-        name: name,
-        return: returnHash,
-      });
-    };
+	if (client_id) {
+		addEventListener('sm-user-login', e => {
+			if (event.detail.get('Email').includes('@hotmail.com')) {
+				e.preventDefault();
+				login();
+			}
+		});
 
-  if (client_id) {
-    addEventListener("sm-user-login", (e) => {
-      const email = (e.detail.get("Email") || "").toLowerCase();
-      if (isSupportedEmail(email)) {
-        e.preventDefault();
-        startOAuth("login", { email });
-      }
-    });
+		addEventListener('rl-view-model', e => {
+			if ('Login' === e.detail.viewModelTemplateID) {
+				const
+					container = e.detail.viewModelDom.querySelector('#plugin-Login-BottomControlGroup'),
+					btn = Element.fromHTML('<button type="button">Outlook</button>'),
+					div = Element.fromHTML('<div class="controls"></div>');
+				btn.onclick = login;
+				div.append(btn);
+				container && container.append(div);
+			}
+		});
+	}
 
-    addEventListener("rl-view-model", (e) => {
-      if ("Login" === e.detail.viewModelTemplateID) {
-        const
-		  container = e.detail.viewModelDom.querySelector("#plugin-Login-BottomControlGroup"),
-          btn = Element.fromHTML('<button type="button">Outlook</button>'),
-          div = Element.fromHTML('<div class="controls"></div>');
-        btn.onclick = () => {
-          // Best-effort: try to read the email field if present.
-          const input = e.detail.viewModelDom.querySelector('input[type="email"], input[name="Email"], input[name="email"], input');
-          const email = (input?.value || "").toLowerCase();
-          if (!email || isSupportedEmail(email)) {
-            startOAuth("login", { email });
-          }
-        };
-        div.append(btn);
-        container && container.append(div);
-      }
-
-      // "Add account" popup (Settings → Accounts → Add account)
-      if ("PopupsAccount" === e.detail.viewModelTemplateID) {
-        // Only for the "Add account" mode, not "Edit account".
-        if (typeof e.detail.isNew === "function" && !e.detail.isNew()) {
-          return;
-        }
-        const root = e.detail.viewModelDom;
-        if (!root) return;
-
-        const footer = root.querySelector("footer");
-        const form = root.querySelector("#accountform");
-        const addButton = root.querySelector("button.buttonAddAccount");
-        if (!footer || !form || !addButton) return;
-
-        // Avoid inserting duplicates when view model is re-rendered.
-        if (root.querySelector(".plugin-o365-add-account")) return;
-
-        const btn = Element.fromHTML(
-          '<button type="button" class="btn plugin-o365-add-account" style="margin-left: 6px;">Outlook</button>'
-        );
-
-        btn.onclick = () => {
-          const email = (form.querySelector('input[name="email"]')?.value || "").trim().toLowerCase();
-          const name = (form.querySelector('input[name="name"]')?.value || "").trim();
-          if (!email || !isSupportedEmail(email)) {
-            return;
-          }
-          startOAuth("add", { email, name, return: document.location.hash || "#/settings/accounts" });
-        };
-
-        // Put the button next to the default Add Account submit button.
-        footer.insertBefore(btn, addButton.nextSibling);
-      }
-    });
-  }
 })(window.rl);
diff --git a/plugins/login-o365/index.php b/plugins/login-o365/index.php
index bb8ae7b69..62050f429 100644
--- a/plugins/login-o365/index.php
+++ b/plugins/login-o365/index.php
@@ -1,20 +1,15 @@
 <?php
 /**
- * SnappyMail login-o365 plugin
- * You need to register an app in Azure portal and add
- * a secret, redirect URIs and the following API permissions:
- *     https://outlook.office.com/IMAP.AccessAsUser.All
- *     https://outlook.office.com/SMTP.Send
- *     openid offline_access email profile
+ * Microsoft requires an Azure account that has an active subscription
+ * I'm not going to pay, so feel free to fix this code yourself.
+ * https://learn.microsoft.com/en-us/exchange/client-developer/legacy-protocols/how-to-authenticate-an-imap-pop-smtp-application-by-using-oauth
+ * https://answers.microsoft.com/en-us/msoffice/forum/all/configuration-for-imap-pop-and-smtp-with-oauth-in/3db47d43-25ac-4e0b-b957-22585e6caf15
+ *
+ * https://portal.azure.com/#view/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/~/RegisteredApps
+ *
  * https://learn.microsoft.com/en-us/entra/identity-platform/reply-url#query-parameter-support-in-redirect-uris
- * Query: redirect_uri=https://{DOMAIN}/?LoginO365
- * Path:  redirect_uri=https://{DOMAIN}/LoginO365
- * 
- * If running behind nginx reverse proxy you might
- * need to add the following to your nginx config:
- * location = /LoginO365 {
- *     return 302 /?LoginO365&$args;
- * }
+ * Azure:    redirect_uri=https://{DOMAIN}/?LoginO365
+ * Personal: redirect_uri=https://{DOMAIN}/LoginO365
  */
 
 use RainLoop\Model\MainAccount;
@@ -22,674 +17,232 @@ use RainLoop\Providers\Storage\Enumerations\StorageType;
 
 class LoginO365Plugin extends \RainLoop\Plugins\AbstractPlugin
 {
-    const
-        NAME     = 'Office365/Outlook OAuth2',
-        VERSION  = '0.4',
-        RELEASE  = '2025-12-22',
-        REQUIRED = '2.36.1',
-        CATEGORY = 'Login',
-        DESCRIPTION = 'Office365/Outlook IMAP, Sieve & SMTP login using RFC 7628 OAuth2';
+	const
+		NAME     = 'Office365/Outlook OAuth2',
+		VERSION  = '0.3',
+		RELEASE  = '2024-09-29',
+		REQUIRED = '2.36.1',
+		CATEGORY = 'Login',
+		DESCRIPTION = 'Office365/Outlook IMAP, Sieve & SMTP login using RFC 7628 OAuth2';
 
-    // v2 endpoints
-    const
-        AUTH_URI  = 'https://login.microsoftonline.com/{{tenant}}/oauth2/v2.0/authorize',
-        TOKEN_URI = 'https://login.microsoftonline.com/{{tenant}}/oauth2/v2.0/token';
+	// https://login.microsoftonline.com/{{tenant}}/v2.0/.well-known/openid-configuration
+	const
+		LOGIN_URI = 'https://login.microsoftonline.com/{{tenant}}/oauth2/v2.0/auth',
+		TOKEN_URI = 'https://login.microsoftonline.com/{{tenant}}/oauth2/v2.0/token';
 
-    /**
-     * In-request cache of decrypted token bundles, keyed by lowercase email.
-     * This avoids re-decrypting the same blob multiple times during a single request.
-     *
-     * Shape:
-     *   [
-     *     'user@outlook.com' => ['access_token'=>..., 'refresh_token'=>..., 'expires'=>..., 'expires_in'=>...],
-     *     ...
-     *   ]
-     */
-    private static array $auth = [];
+	private static ?array $auth = null;
 
-    public function Init() : void
-    {
-        $this->UseLangs(true);
-        $this->addJs('LoginOAuth2.js');
-        $this->addHook('imap.before-login', 'clientLogin');
-        $this->addHook('smtp.before-login', 'clientLogin');
-        $this->addHook('sieve.before-login', 'clientLogin');
+	public function Init() : void
+	{
+		$this->UseLangs(true);
+		$this->addJs('LoginOAuth2.js');
+		$this->addHook('imap.before-login', 'clientLogin');
+		$this->addHook('smtp.before-login', 'clientLogin');
+		$this->addHook('sieve.before-login', 'clientLogin');
 
-        $this->addPartHook('LoginO365', 'ServiceLoginO365');
-        // Used by JS to obtain an auth URL with signed state (for both login + add-account flows).
-        $this->addJsonHook('LoginO365AuthUrl', 'DoLoginO365AuthUrl');
+		$this->addPartHook('LoginO365', 'ServiceLoginO365');
 
-        // Prevent Disallowed Sec-Fetch Dest: document Mode: navigate Site: cross-site User: true
-        $this->addHook('filter.http-paths', 'httpPaths');
+		// Prevent Disallowed Sec-Fetch Dest: document Mode: navigate Site: cross-site User: true
+		$this->addHook('filter.http-paths', 'httpPaths');
+	}
 
-        // Cleanup: when an additional account is removed, also remove its encrypted refresh token bundle.
-        $this->addHook('json.after-AccountDelete', 'afterAccountDelete');
-    }
+	public function httpPaths(array &$aPaths) : void
+	{
+		// Personal accounts workaround
+		if (!empty($_SERVER['PATH_INFO']) && \str_ends_with($_SERVER['PATH_INFO'], 'LoginO365')) {
+			$aPaths = ['LoginO365'];
+		}
 
-    public function httpPaths(array &$aPaths) : void
-    {
-        if (!empty($_SERVER['PATH_INFO']) && \str_ends_with($_SERVER['PATH_INFO'], 'LoginO365')) {
-            $aPaths = ['LoginO365'];
-        }
+		if (!empty($aPaths[0]) && 'LoginO365' === $aPaths[0]) {
+			$oConfig = \RainLoop\Api::Config();
+			$oConfig->Set('security', 'secfetch_allow',
+				\trim($oConfig->Get('security', 'secfetch_allow', '') . ';site=cross-site', ';')
+			);
+		}
+	}
 
-        if (!empty($aPaths[0]) && 'LoginO365' === $aPaths[0]) {
-            $oConfig = \RainLoop\Api::Config();
-            $oConfig->Set('security', 'secfetch_allow',
-                \trim($oConfig->Get('security', 'secfetch_allow', '') . ';site=cross-site', ';')
-            );
-        }
-    }
+	public function ServiceLoginO365() : string
+	{
+		$oActions = \RainLoop\Api::Actions();
+		$oHttp = $oActions->Http();
+		$oHttp->ServerNoCache();
 
-    public function ServiceLoginO365() : string
-    {
-        $oActions = \RainLoop\Api::Actions();
-        $oHttp = $oActions->Http();
-        $oHttp->ServerNoCache();
-
-        try
+		try
 		{
-            if (isset($_GET['error'])) {
-                $desc = $_GET['error_description'] ?? '';
-                throw new \RuntimeException("{$_GET['error']}: {$desc}");
-            }
-
-            // Must have code + state
-            if (!isset($_GET['code']) || empty($_GET['state'])) {
-                $oActions->Location(\RainLoop\Utils::WebPath());
-                exit;
-            }
-
-            $oO365 = $this->o365Connector();
-            if (!$oO365) {
-                $oActions->Location(\RainLoop\Utils::WebPath());
-                exit;
-            }
-
-            $iNow = \time();
-
-            $redirectUri = $this->redirectUri();
-
-            $tenant = $this->Config()->Get('plugin', 'tenant', 'common');
-
-            $state = (string) $_GET['state'];
-            $statePayload = $this->verifyAndConsumeState($state);
-            if (!$statePayload) {
-                $oActions->Location(\RainLoop\Utils::WebPath());
-                exit;
-            }
-
-            $aTokenWrap = $oO365->getAccessToken(
-                \str_replace('{{tenant}}', $tenant, static::TOKEN_URI),
-                'authorization_code',
-                [
-                    'code' => $_GET['code'],
-                    'redirect_uri' => $redirectUri
-                ]
-            );
-
-            if (!\is_array($aTokenWrap) || !isset($aTokenWrap['code'])) {
-                throw new \RuntimeException('Token request failed: ' . \json_encode($aTokenWrap));
-            }
-            if (200 !== (int)$aTokenWrap['code']) {
-                $err = $aTokenWrap['result']['error'] ?? '';
-                $desc = $aTokenWrap['result']['error_description'] ?? '';
-                throw new \RuntimeException("Token HTTP {$aTokenWrap['code']}: {$err} / {$desc}");
-            }
-
-            $aToken = $aTokenWrap['result'] ?? [];
-            $accessToken = $aToken['access_token'] ?? '';
-            $refreshToken = $aToken['refresh_token'] ?? '';
-            $expiresIn = (int)($aToken['expires_in'] ?? 0);
-            $idToken = $aToken['id_token'] ?? '';
-
-            if ($accessToken === '') {
-                throw new \RuntimeException('access_token missing');
-            }
-
-            if ($refreshToken === '') {
-                throw new \RuntimeException('refresh_token missing');
-            }
-            if ($idToken === '') {
-                // We rely on id_token to get email/sub without Graph.
-                throw new \RuntimeException('id_token missing (add openid email profile scopes)');
-            }
-
-            // Parse id_token (JWT) to get identity (sub + email)
-            $claims = $this->decodeJwtPayload($idToken);
-            if (!\is_array($claims)) {
-                throw new \RuntimeException('Cannot decode id_token payload');
-            }
-
-            $email = $claims['email'] ?? ($claims['preferred_username'] ?? ($claims['upn'] ?? ''));
-            $sub = $claims['sub'] ?? '';
-
-            if ($sub === '') {
-                throw new \RuntimeException('unknown id from id_token');
-            }
-            if ($email === '') {
-                throw new \RuntimeException('unknown email address from id_token');
-            }
-
-            if (!$this->isSupportedEmail(\strtolower($email))) {
-                throw new \RuntimeException('Unsupported email domain for this plugin');
-            }
-
-            $tokenBundle = [
-                'access_token' => $accessToken,
-                'refresh_token' => $refreshToken,
-                'expires_in' => $expiresIn,
-                'expires' => $iNow + $expiresIn
-            ];
-
-            $op = $statePayload['op'] ?? 'login';
-            if ('add' === $op) {
-                $oMainAccount = $oActions->getMainAccountFromToken(false);
-                if (!$oMainAccount) {
-                    throw new \RuntimeException('Add-account flow requires logged in main account');
-                }
-                if (!empty($statePayload['main']) && $statePayload['main'] !== $oMainAccount->Email()) {
-                    throw new \RuntimeException('Add-account state does not match current main account');
-                }
-
-                // Store token bundle encrypted with MAIN account crypt key (never store refresh_token unencrypted).
-                // This is later used by imap/smtp/sieve.before-login for *additional* accounts.
-                $this->storeAccountTokens($oMainAccount, $email, $tokenBundle);
-
-                // Create/validate an AdditionalAccount entry exactly like SnappyMail expects in "additionalaccounts".
-                // We set the "password" to the OAuth subject (sub) as an opaque secret; the plugin will inject XOAUTH2.
-                $oPassword = new \SnappyMail\SensitiveString($sub);
-                $oAdditional = $oActions->LoginProcess($email, $oPassword, false);
-                if (!$oAdditional instanceof \RainLoop\Model\AdditionalAccount) {
-                    throw new \RuntimeException('Failed to create additional account');
-                }
-
-                $asciiEmail = \SnappyMail\IDN::emailToAscii($oAdditional->Email());
-                if ($asciiEmail === $oMainAccount->Email()) {
-                    throw new \RuntimeException('Cannot add main account as additional');
-                }
-
-                $aAccounts = $oActions->GetAccounts($oMainAccount);
-                $aEntry = $oAdditional->asTokenArray($oMainAccount);
-                if (!empty($statePayload['name']) && \is_string($statePayload['name'])) {
-                    $aEntry['name'] = \trim($statePayload['name']);
-                } else if (isset($aAccounts[$asciiEmail]['name'])) {
-                    // Preserve previous custom label if re-adding/updating.
-                    $aEntry['name'] = (string) $aAccounts[$asciiEmail]['name'];
-                }
-                $aAccounts[$asciiEmail] = $aEntry;
-                $oActions->SetAccounts($oMainAccount, $aAccounts);
-
-                // Cache for this request (used during LoginProcess() above and any subsequent logins).
-                static::$auth[\strtolower($asciiEmail)] = $tokenBundle;
-
-                $returnHash = '';
-                if (!empty($statePayload['return']) && \is_string($statePayload['return']) && \str_starts_with($statePayload['return'], '#')) {
-                    $returnHash = $statePayload['return'];
-                }
-                $oActions->Location(\RainLoop\Utils::WebPath() . $returnHash);
-                exit;
-            }
-
-            // Default: "login" flow (preserve existing behavior)
-            static::$auth[\strtolower($email)] = $tokenBundle;
-
-            // SnappyMail uses password as opaque string; plugin injects XOAUTH2 later.
-            $oPassword = new \SnappyMail\SensitiveString($sub);
-            $oAccount = $oActions->LoginProcess($email, $oPassword);
-
-            if ($oAccount) {
-                $oActions->StorageProvider()->Put(
-                    $oAccount,
-                    StorageType::SESSION,
-                    \RainLoop\Utils::GetSessionToken(),
-                    \SnappyMail\Crypt::EncryptToJSON($tokenBundle, $oAccount->CryptKey())
-                );
-            }
-        }
-        catch (\Throwable $e) {
-            $oActions->Logger()->WriteException($e, \LOG_ERR);
-        }
-
-        $oActions->Location(\RainLoop\Utils::WebPath());
-        exit;
-    }
-
-    public function configMapping() : array
-    {
-        return [
-            \RainLoop\Plugins\Property::NewInstance('client_id')
-                ->SetLabel('Client ID')
-                ->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING)
-                ->SetAllowedInJs(),
-            \RainLoop\Plugins\Property::NewInstance('client_secret')
-                ->SetLabel('Client Secret')
-                ->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING)
-                ->SetEncrypted(),
-            \RainLoop\Plugins\Property::NewInstance('tenant')
-                ->SetLabel('Tenant')
-                ->SetType(\RainLoop\Enumerations\PluginPropertyType::SELECTION)
-                ->SetDefaultValue(['common','consumers','organizations'])
-                ->SetAllowedInJs(),
-            \RainLoop\Plugins\Property::NewInstance('personal')
-                // When true: redirect URI uses query parameter form "/?LoginO365" (Azure supports it).
-                // When false: redirect URI uses path form "/LoginO365" (useful behind reverse proxies).
-                ->SetLabel('Use "/?LoginO365" redirect URI')
-                ->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
-                ->SetDefaultValue(false)
-                ->SetAllowedInJs(),
-            \RainLoop\Plugins\Property::NewInstance('allow_any_domain')
-                ->SetLabel('Allow any domain (not only outlook.com/hotmail.com/live.com)')
-                ->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
-                ->SetDefaultValue(false)
-                ->SetAllowedInJs()
-        ];
-    }
-
-    public function clientLogin(\RainLoop\Model\Account $oAccount, \MailSo\Net\NetClient $oClient, \MailSo\Net\ConnectSettings $oSettings) : void
-    {
-        $email = \strtolower($oAccount->Email());
-
-        if (!$this->isSupportedEmail($email)) {
-            return;
-        }
-
-        $oActions = \RainLoop\Api::Actions();
-
-        $aData = static::$auth[$email] ?? null;
-        if (!$aData) {
-            try {
-                if ($oAccount instanceof MainAccount) {
-                    $blob = $oActions->StorageProvider()->Get(
-                        $oAccount,
-                        StorageType::SESSION,
-                        \RainLoop\Utils::GetSessionToken()
-                    );
-                    $aData = \SnappyMail\Crypt::DecryptFromJSON($blob, $oAccount->CryptKey());
-                } else if ($oAccount instanceof \RainLoop\Model\AdditionalAccount) {
-                    $oMain = $oActions->getMainAccountFromToken(false);
-                    if (!$oMain) {
-                        return;
-                    }
-                    $blob = $oActions->StorageProvider()->Get(
-                        $oMain,
-                        StorageType::CONFIG,
-                        $this->tokenStorageKey($email)
-                    );
-                    $aData = \SnappyMail\Crypt::DecryptFromJSON($blob, $oMain->CryptKey());
-                }
-            } catch (\Throwable $e) {
-                return;
-            }
-        }
-
-        if (empty($aData['access_token']) || empty($aData['refresh_token']) || empty($aData['expires'])) {
-            return;
-        }
-
-        // Refresh if expired (or close to expiry)
-        if (\time() >= ((int)$aData['expires'] - 30)) {
-            $oO365 = $this->o365Connector();
-            if ($oO365) {
-                $tenant = $this->Config()->Get('plugin', 'tenant', 'common');
-                $aRefreshWrap = $oO365->getAccessToken(
-                    \str_replace('{{tenant}}', $tenant, static::TOKEN_URI),
-                    'refresh_token',
-                    ['refresh_token' => $aData['refresh_token']]
-                );
-
-                if (\is_array($aRefreshWrap) && isset($aRefreshWrap['code']) && 200 === (int)$aRefreshWrap['code']) {
-                    $r = $aRefreshWrap['result'] ?? [];
-                    if (!empty($r['access_token'])) {
-                        $aData['access_token'] = $r['access_token'];
-                    }
-                    if (!empty($r['refresh_token'])) {
-                        $aData['refresh_token'] = $r['refresh_token'];
-                    }
-                    $expiresIn = (int)($r['expires_in'] ?? 0);
-                    if ($expiresIn > 0) {
-                        $aData['expires'] = \time() + $expiresIn;
-                        $aData['expires_in'] = $expiresIn;
-                    }
-
-                    // Persist updated bundle (encrypted).
-                    if ($oAccount instanceof MainAccount) {
-                        $oActions->StorageProvider()->Put(
-                            $oAccount,
-                            StorageType::SESSION,
-                            \RainLoop\Utils::GetSessionToken(),
-                            \SnappyMail\Crypt::EncryptToJSON($aData, $oAccount->CryptKey())
-                        );
-                    } else if ($oAccount instanceof \RainLoop\Model\AdditionalAccount) {
-                        $oMain = $oActions->getMainAccountFromToken(false);
-                        if ($oMain) {
-                            $oActions->StorageProvider()->Put(
-                                $oMain,
-                                StorageType::CONFIG,
-                                $this->tokenStorageKey($email),
-                                \SnappyMail\Crypt::EncryptToJSON($aData, $oMain->CryptKey())
-                            );
-                        }
-                    }
-                }
-            }
-        }
-
-        static::$auth[$email] = $aData;
-
-        // Inject XOAUTH2/OAUTHBEARER
-        $oSettings->passphrase = $aData['access_token'];
-        \array_unshift($oSettings->SASLMechanisms, 'OAUTHBEARER', 'XOAUTH2');
-    }
-
-    /**
-     * Server-side cleanup hook: after a successful AccountDelete, remove stored token bundle for that email.
-     * This prevents leaving encrypted refresh tokens behind when an additional account is removed.
-     */
-    public function afterAccountDelete(array &$aResponse) : void
-    {
-        if (empty($aResponse['Result'])) {
-            return;
-        }
-        $oActions = \RainLoop\Api::Actions();
-        $oMain = $oActions->getMainAccountFromToken(false);
-        if (!$oMain) {
-            return;
-        }
-        $email = \strtolower(\SnappyMail\IDN::emailToAscii(\trim((string) $oActions->GetActionParam('emailToDelete', ''))));
-        if ($email && $this->isSupportedEmail($email)) {
-            $oActions->StorageProvider()->Clear($oMain, StorageType::CONFIG, $this->tokenStorageKey($email));
-        }
-    }
-
-    protected function o365Connector() : ?\OAuth2\Client
-    {
-        $client_id = \trim($this->Config()->Get('plugin', 'client_id', ''));
-        $client_secret = \trim($this->Config()->getDecrypted('plugin', 'client_secret', ''));
-
-        if ($client_id && $client_secret) {
-            try {
-                $oO365 = new \OAuth2\Client($client_id, $client_secret);
-
-                $oActions = \RainLoop\Api::Actions();
-                $sProxy = $oActions->Config()->Get('labs', 'curl_proxy', '');
-                if (\strlen($sProxy)) {
-                    $oO365->setCurlOption(CURLOPT_PROXY, $sProxy);
-                    $sProxyAuth = $oActions->Config()->Get('labs', 'curl_proxy_auth', '');
-                    if (\strlen($sProxyAuth)) {
-                        $oO365->setCurlOption(CURLOPT_PROXYUSERPWD, $sProxyAuth);
-                    }
-                }
-
-                return $oO365;
-            } catch (\Throwable $e) {
-                \RainLoop\Api::Actions()->Logger()->WriteException($e, \LOG_ERR);
-            }
-        }
-
-        return null;
-    }
-
-    private function decodeJwtPayload(string $jwt) : ?array
-    {
-        $parts = \explode('.', $jwt);
-        if (\count($parts) < 2) {
-            return null;
-        }
-        $payload = $parts[1];
-        $payload .= \str_repeat('=', (4 - (\strlen($payload) % 4)) % 4);
-        $json = \base64_decode(\strtr($payload, '-_', '+/'));
-        if ($json === false) {
-            return null;
-        }
-        $data = \json_decode($json, true);
-        return \is_array($data) ? $data : null;
-    }
-
-    /**
-     * JSON action called by JS to obtain an MS authorize URL with signed state.
-     * This avoids exposing any signing secret to JS and keeps redirect_uri consistent with server logic.
-     */
-    public function DoLoginO365AuthUrl() : array
-    {
-        $oActions = \RainLoop\Api::Actions();
-
-        $op = (string) $this->jsonParam('op', 'login');
-        if (!\in_array($op, ['login', 'add'], true)) {
-            return $this->jsonResponse(__FUNCTION__, false);
-        }
-
-        $email = \strtolower(\trim((string) $this->jsonParam('email', '')));
-        $name = \trim((string) $this->jsonParam('name', ''));
-        $returnHash = (string) $this->jsonParam('return', '');
-
-        if ($returnHash && !\str_starts_with($returnHash, '#')) {
-            $returnHash = '';
-        }
-
-        // For add-account flow, require a logged-in main account (we must write to its additionalaccounts storage).
-        $oMainAccount = null;
-        if ('add' === $op) {
-            $oMainAccount = $oActions->getMainAccountFromToken(false);
-            if (!$oMainAccount) {
-                return $this->jsonResponse(__FUNCTION__, false);
-            }
-        }
-
-        // Optional server-side guard: only permit supported consumer domains unless configured otherwise.
-        if ($email && !$this->isSupportedEmail($email)) {
-            return $this->jsonResponse(__FUNCTION__, false);
-        }
-
-        $oConfig = $this->Config();
-        $client_id = \trim($oConfig->Get('plugin', 'client_id', ''));
-        if (!$client_id) {
-            return $this->jsonResponse(__FUNCTION__, false);
-        }
-
-        $nonce = $this->b64url(\random_bytes(16));
-        // Store nonce server-side to prevent replay; consumed on callback.
-        $oActions->StorageProvider()->Put(
-            null,
-            StorageType::NOBODY,
-            $this->stateNonceKey($nonce),
-            (string) \time()
-        );
-
-        $payload = [
-            'v' => 1,
-            'op' => $op,
-            'csrf' => \RainLoop\Utils::GetCsrfToken(),
-            'nonce' => $nonce,
-            'ts' => \time()
-        ];
-        if ('add' === $op && $oMainAccount) {
-            $payload['main'] = $oMainAccount->Email();
-            if ($name) {
-                $payload['name'] = \substr($name, 0, 100);
-            }
-            if ($returnHash) {
-                $payload['return'] = \substr($returnHash, 0, 200);
-            }
-        }
-
-        $state = $this->signState($payload);
-        $tenant = $oConfig->Get('plugin', 'tenant', 'common');
-        $redirectUri = $this->redirectUri();
-
-        $params = [
-                'response_type' => 'code',
-                'client_id' => $client_id,
-                'redirect_uri' => $redirectUri,
-                'scope' => \implode(' ', [
-                    'openid',
-                    'offline_access',
-                    'email',
-                    'profile',
-                    'https://outlook.office.com/IMAP.AccessAsUser.All',
-                    'https://outlook.office.com/SMTP.Send',
-                ]),
-                'state' => $state,
-                // Helps MS UI prefill, but does not change server-side validation.
-        ];
-        if ($email) {
-            $params['login_hint'] = $email;
-        }
-        $authUrl = \str_replace('{{tenant}}', $tenant, static::AUTH_URI)
-            . '?'
-            . \http_build_query($params, '', '&', PHP_QUERY_RFC3986);
-
-        return $this->jsonResponse(__FUNCTION__, [
-            'authUrl' => $authUrl
-        ]);
-    }
-
-    private function isSupportedEmail(string $email) : bool
-    {
-        if ((bool)$this->Config()->Get('plugin', 'allow_any_domain', false)) {
-            return \str_contains($email, '@');
-        }
-        return \str_ends_with($email, '@hotmail.com')
-            || \str_ends_with($email, '@outlook.com')
-            || \str_ends_with($email, '@live.com');
-    }
-
-    /**
-     * Build absolute base URL (works behind nginx reverse proxy).
-     */
-    private function baseUrl() : string
-    {
-        $scheme = (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']))
-            ? $_SERVER['HTTP_X_FORWARDED_PROTO']
-            : ((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http');
-
-        $host = $_SERVER['HTTP_HOST'] ?? $_SERVER['SERVER_NAME'] ?? '';
-        if (!$host) {
-            throw new \RuntimeException('Cannot determine HTTP_HOST');
-        }
-        return $scheme . '://' . $host;
-    }
-
-    /**
-     * Redirect URI used for the Azure app registration.
-     * When plugin.personal=true -> "/?LoginO365"
-     * When plugin.personal=false -> "/LoginO365"
-     */
-    private function redirectUri() : string
-    {
-        $base = \rtrim($this->baseUrl(), '/');
-        $useQuery = (bool)$this->Config()->Get('plugin', 'personal', false);
-        return $useQuery ? ($base . '/?LoginO365') : ($base . '/LoginO365');
-    }
-
-    private function tokenStorageKey(string $emailLower) : string
-    {
-        // Stored under MAIN account StorageType::CONFIG (encrypted with main CryptKey).
-        // Email is hashed to avoid path/encoding issues across storage backends.
-        return 'login-o365.tokens.' . \sha1($emailLower);
-    }
-
-    private function storeAccountTokens(MainAccount $oMainAccount, string $email, array $tokenBundle) : void
-    {
-        $emailLower = \strtolower(\SnappyMail\IDN::emailToAscii($email));
-        \RainLoop\Api::Actions()->StorageProvider()->Put(
-            $oMainAccount,
-            StorageType::CONFIG,
-            $this->tokenStorageKey($emailLower),
-            \SnappyMail\Crypt::EncryptToJSON($tokenBundle, $oMainAccount->CryptKey())
-        );
-    }
-
-    private function stateNonceKey(string $nonce) : string
-    {
-        return 'login-o365.state.' . $nonce;
-    }
-
-    private function b64url(string $bin) : string
-    {
-        return \rtrim(\strtr(\base64_encode($bin), '+/', '-_'), '=');
-    }
-
-    private function b64urlDecode(string $b64url) /*: string|false*/
-    {
-        $pad = (4 - (\strlen($b64url) % 4)) % 4;
-        return \base64_decode(\strtr($b64url . \str_repeat('=', $pad), '-_', '+/'), true);
-    }
-
-    private function stateHmacKey() : string
-    {
-        // Uses the plugin client_secret (server-side only) as HMAC key.
-        // This prevents any user-controlled tampering of the state payload.
-        $key = \trim($this->Config()->getDecrypted('plugin', 'client_secret', ''));
-        if (!$key) {
-            // Fallback for misconfiguration; keeps behavior deterministic.
-            $key = 'login-o365';
-        }
-        return $key;
-    }
-
-    private function signState(array $payload) : string
-    {
-        $json = \json_encode($payload);
-        if (!$json) {
-            $json = '{}';
-        }
-        $payloadB64 = $this->b64url($json);
-        $sig = \hash_hmac('sha256', $payloadB64, $this->stateHmacKey(), true);
-        return $payloadB64 . '.' . $this->b64url($sig);
-    }
-
-    /**
-     * Verify signature + CSRF + nonce, then consumes nonce to prevent replay.
-     * Returns decoded payload on success, null on failure.
-     */
-    private function verifyAndConsumeState(string $state) : ?array
-    {
-        $parts = \explode('.', $state, 2);
-        if (2 !== \count($parts)) {
-            return null;
-        }
-        [$payloadB64, $sigB64] = $parts;
-        $sig = $this->b64urlDecode($sigB64);
-        if ($sig === false) {
-            return null;
-        }
-
-        $expected = \hash_hmac('sha256', $payloadB64, $this->stateHmacKey(), true);
-        if (!\hash_equals($expected, $sig)) {
-            return null;
-        }
-
-        $payloadJson = $this->b64urlDecode($payloadB64);
-        if ($payloadJson === false) {
-            return null;
-        }
-        $payload = \json_decode($payloadJson, true);
-        if (!\is_array($payload) || empty($payload['csrf']) || empty($payload['nonce']) || empty($payload['op'])) {
-            return null;
-        }
-
-        // Must match the current browser session.
-        if ($payload['csrf'] !== \RainLoop\Utils::GetCsrfToken()) {
-            return null;
-        }
-
-        // Replay protection: nonce must exist server-side and is consumed once.
-        $oActions = \RainLoop\Api::Actions();
-        $key = $this->stateNonceKey((string) $payload['nonce']);
-        $seen = $oActions->StorageProvider()->Get(null, StorageType::NOBODY, $key);
-        if (!$seen) {
-            return null;
-        }
-
-        $ts = (int) ($payload['ts'] ?? 0);
-        if ($ts && \abs(\time() - $ts) > 900) { // 15 minutes
-            // Expired: clear nonce to avoid accumulating stale entries.
-            $oActions->StorageProvider()->Clear(null, StorageType::NOBODY, $key);
-            return null;
-        }
-
-        $oActions->StorageProvider()->Clear(null, StorageType::NOBODY, $key);
-
-        return $payload;
-    }
-}
\ No newline at end of file
+			if (isset($_GET['error'])) {
+				throw new \RuntimeException("{$_GET['error']}: {$_GET['error_description']}");
+			}
+			if (!isset($_GET['code']) || empty($_GET['state']) || 'o365' !== $_GET['state']) {
+				$oActions->Location(\RainLoop\Utils::WebPath());
+				exit;
+			}
+			$oO365 = $this->o365Connector();
+			if (!$oO365) {
+				$oActions->Location(\RainLoop\Utils::WebPath());
+				exit;
+			}
+
+			$iExpires = \time();
+			$aResponse = $oO365->getAccessToken(
+				\str_replace('{{tenant}}', $this->Config()->Get('plugin', 'tenant', 'common'), static::TOKEN_URI),
+				'authorization_code',
+				array(
+					'code' => $_GET['code'],
+					'redirect_uri' => $oHttp->GetFullUrl().'?LoginO365'
+				)
+			);
+			if (200 != $aResponse['code']) {
+				if (isset($aResponse['result']['error'])) {
+					throw new \RuntimeException(
+						$aResponse['code']
+						. ': '
+						. $aResponse['result']['error']
+						. ' / '
+						. $aResponse['result']['error_description']
+					);
+				}
+				throw new \RuntimeException("HTTP: {$aResponse['code']}");
+			}
+			$aResponse = $aResponse['result'];
+			if (empty($aResponse['access_token'])) {
+				throw new \RuntimeException('access_token missing');
+			}
+			if (empty($aResponse['refresh_token'])) {
+				throw new \RuntimeException('refresh_token missing');
+			}
+
+			$sAccessToken = $aResponse['access_token'];
+			$iExpires += $aResponse['expires_in'];
+
+			$oO365->setAccessToken($sAccessToken);
+			$aUserInfo = $oO365->fetch('https://graph.microsoft.com/oidc/userinfo');
+			if (200 != $aUserInfo['code']) {
+				throw new \RuntimeException("HTTP: {$aResponse['code']}");
+			}
+			$aUserInfo = $aUserInfo['result'];
+			if (empty($aUserInfo['id'])) {
+				throw new \RuntimeException('unknown id');
+			}
+			if (empty($aUserInfo['email'])) {
+				throw new \RuntimeException('unknown email address');
+			}
+
+			static::$auth = [
+				'access_token' => $sAccessToken,
+				'refresh_token' => $aResponse['refresh_token'],
+				'expires_in' => $aResponse['expires_in'],
+				'expires' => $iExpires
+			];
+
+			$oPassword = new \SnappyMail\SensitiveString($aUserInfo['id']);
+			$oAccount = $oActions->LoginProcess($aUserInfo['email'], $oPassword);
+//			$oAccount = MainAccount::NewInstanceFromCredentials($oActions, $aUserInfo['email'], $aUserInfo['email'], $oPassword, true);
+			if ($oAccount) {
+//				$oActions->SetMainAuthAccount($oAccount);
+//				$oActions->SetAuthToken($oAccount);
+				$oActions->StorageProvider()->Put($oAccount, StorageType::SESSION, \RainLoop\Utils::GetSessionToken(),
+					\SnappyMail\Crypt::EncryptToJSON(static::$auth, $oAccount->CryptKey())
+				);
+			}
+		}
+		catch (\Exception $oException)
+		{
+			$oActions->Logger()->WriteException($oException, \LOG_ERR);
+		}
+		$oActions->Location(\RainLoop\Utils::WebPath());
+		exit;
+	}
+
+	public function configMapping() : array
+	{
+		return [
+			\RainLoop\Plugins\Property::NewInstance('personal')
+				->SetLabel('Use with personal accounts')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+				->SetDefaultValue(true)
+				->SetAllowedInJs()
+				->SetDescription('Sign in users with personal Microsoft accounts such as Outlook.com (Hotmail)'),
+			\RainLoop\Plugins\Property::NewInstance('client_id')
+				->SetLabel('Client ID')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING)
+				->SetAllowedInJs()
+				->SetDescription('https://github.com/the-djmaze/snappymail/wiki/FAQ#o365'),
+			\RainLoop\Plugins\Property::NewInstance('client_secret')
+				->SetLabel('Client Secret')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING)
+				->SetEncrypted(),
+			\RainLoop\Plugins\Property::NewInstance('tenant_id')
+				->SetLabel('Tenant ID')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING),
+			\RainLoop\Plugins\Property::NewInstance('tenant')->SetLabel('Tenant')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::SELECTION)
+				->SetDefaultValue(['common','consumers','organizations'])
+				->SetAllowedInJs()
+		];
+	}
+
+	public function clientLogin(\RainLoop\Model\Account $oAccount, \MailSo\Net\NetClient $oClient, \MailSo\Net\ConnectSettings $oSettings) : void
+	{
+		if ($oAccount instanceof MainAccount && \str_ends_with($oAccount->Email(), '@hotmail.com')) {
+			$oActions = \RainLoop\Api::Actions();
+			try {
+				$aData = static::$auth ?: \SnappyMail\Crypt::DecryptFromJSON(
+					$oActions->StorageProvider()->Get($oAccount, StorageType::SESSION, \RainLoop\Utils::GetSessionToken()),
+					$oAccount->CryptKey()
+				);
+			} catch (\Throwable $oException) {
+//				$oActions->Logger()->WriteException($oException, \LOG_ERR);
+				return;
+			}
+			if (!empty($aData['expires']) && !empty($aData['access_token']) && !empty($aData['refresh_token'])) {
+				if (\time() >= $aData['expires']) {
+					$iExpires = \time();
+					$oO365 = $this->o365Connector();
+					if ($oO365) {
+						$aRefreshTokenResponse = $oO365->getAccessToken(
+							\str_replace('{{tenant}}', $this->Config()->Get('plugin', 'tenant', 'common'), static::TOKEN_URI),
+							'refresh_token',
+							array('refresh_token' => $aData['refresh_token'])
+						);
+						if (!empty($aRefreshTokenResponse['result']['access_token'])) {
+							$aData['access_token'] = $aRefreshTokenResponse['result']['access_token'];
+							$aResponse['expires'] = $iExpires + $aResponse['expires_in'];
+							$oActions->StorageProvider()->Put($oAccount, StorageType::SESSION, \RainLoop\Utils::GetSessionToken(),
+								\SnappyMail\Crypt::EncryptToJSON($aData, $oAccount->CryptKey())
+							);
+						}
+					}
+				}
+				$oSettings->passphrase = $aData['access_token'];
+				\array_unshift($oSettings->SASLMechanisms, 'OAUTHBEARER', 'XOAUTH2');
+			}
+		}
+	}
+
+	protected function o365Connector() : ?\OAuth2\Client
+	{
+		$client_id = \trim($this->Config()->Get('plugin', 'client_id', ''));
+		$client_secret = \trim($this->Config()->getDecrypted('plugin', 'client_secret', ''));
+		if ($client_id && $client_secret) {
+			try
+			{
+				$oO365 = new \OAuth2\Client($client_id, $client_secret);
+				$oActions = \RainLoop\Api::Actions();
+				$sProxy = $oActions->Config()->Get('labs', 'curl_proxy', '');
+				if (\strlen($sProxy)) {
+					$oO365->setCurlOption(CURLOPT_PROXY, $sProxy);
+					$sProxyAuth = $oActions->Config()->Get('labs', 'curl_proxy_auth', '');
+					if (\strlen($sProxyAuth)) {
+						$oO365->setCurlOption(CURLOPT_PROXYUSERPWD, $sProxyAuth);
+					}
+				}
+				return $oO365;
+			}
+			catch (\Exception $oException)
+			{
+				$oActions->Logger()->WriteException($oException, \LOG_ERR);
+			}
+		}
+		return null;
+	}
+}
diff --git a/plugins/login-remote/index.php b/plugins/login-remote/index.php
index fe5bb7282..ab1550571 100644
--- a/plugins/login-remote/index.php
+++ b/plugins/login-remote/index.php
@@ -6,8 +6,8 @@ class LoginRemotePlugin extends \RainLoop\Plugins\AbstractPlugin
 		NAME     = 'Login Remote',
 		AUTHOR   = 'SnappyMail',
 		URL      = 'https://snappymail.eu/',
-		VERSION  = '1.6',
-		RELEASE  = '2026-10-22',
+		VERSION  = '1.5',
+		RELEASE  = '2024-09-20',
 		REQUIRED = '2.36.1',
 		CATEGORY = 'Login',
 		LICENSE  = 'MIT',
@@ -43,7 +43,6 @@ class LoginRemotePlugin extends \RainLoop\Plugins\AbstractPlugin
 			try
 			{
 				static::$login = true;
-				$sPassword = new \SnappyMail\SensitiveString($sPassword);
 				$oAccount = $oActions->LoginProcess($sEmail, $sPassword);
 			}
 			catch (\Throwable $oException)
diff --git a/plugins/proxy-auth/README.md b/plugins/proxy-auth/README.md
index c9db401e6..7a3004d70 100644
--- a/plugins/proxy-auth/README.md
+++ b/plugins/proxy-auth/README.md
@@ -19,34 +19,33 @@ The following steps are require in SnappyMail:
    - Master User is dependent on Dovecot config (see below)
    - Master User Password is dependent on Dovecot config (see below)
    - Header Name is dependent on authentication solution. This is the header containing the name of currently logged in user. In case of Authelia, this is "Remote-User".
+   - Check Proxy: Since this plugin partially bypasses authentication, it is important to only allow this access from well-defined hosts. It is highly recommended to activate this option!
+   - When checking for reverse proxy, it is required to set the IP filter to either an IP address or a subnet.
    - Automatic Login: Automatically logs in the user of user header is present (see below)
 
-> **Security note**
->
-> This plugin trusts the configured request header as proof of identity. Anyone who can reach the SnappyMail container directly and set that header can log in as any user. You **must** ensure that SnappyMail is only reachable through your reverse proxy / SSO chain (e.g. via the docker network, a firewall, or by binding SnappyMail to a non-public interface) and that the upstream proxy strips any client-supplied value of the header before forwarding. The plugin itself does no source-IP validation — earlier versions had a `check_proxy` option, but it inspected the forwarded client IP (the end user's IP) and therefore did not actually verify that the request came from the proxy. It has been removed; gate access at the network layer instead.
-
 This concludes the setup of SnappyMail.
 
 ### Dovecot
 
 In Dovecot, you need to enable Master User.
 Enable ```!include auth-master.conf.ext``` in /etc/dovecot/conf.d/10-auth.conf.
-In Dovecot 2.3, the file /etc/dovecot/conf.d/auth-master.conf.ext should contain:
+The file /etc/dovecot/conf.d/auth-master.conf.ext should contain:
 ```
+# Authentication for master users. Included from auth.conf.
+
+# By adding master=yes setting inside a passdb you make the passdb a list
+# of "master users", who can log in as anyone else.
+# <doc/wiki/Authentication.MasterUsers.txt>
+
+# Example master user passdb using passwd-file. You can use any passdb though.
 passdb {
   driver = passwd-file
   master = yes
   args = /etc/dovecot/master-users
-  pass = yes
-}
-```
 
-In Dovecot 2.4, the file /etc/dovecot/conf.d/auth-master.conf.ext should contain:
-```
-passdb passwd-file {
-  master = yes
-  passwd_file_path = /etc/dovecot/master-users
-  result_success = continue
+  # Unless you're using PAM, you probably still want the destination user to
+  # be looked up from passdb that it really exists. pass=yes does that.
+  pass = yes
 }
 ```
 
@@ -81,11 +80,3 @@ The user is always considered logged in, as authentication is handled through re
 Auto login can be disabled in the plugin settings.
 You can also change the logout link in admin panel -> Config -> custom_logout_link to the one of your authentication system, e.g., ```https://auth.yourdomain.com/logout```.
 In this case, you can log out from your overall system via SnappyMail.
-
-## Troubleshooting
-
-### IMAP `AUTHENTICATIONFAILED` after a container rebuild / upgrade
-
-The master user/password fields are encrypted at rest using SnappyMail's `APP_SALT`. If that salt is regenerated (e.g., the data volume was reset, the container was rebuilt without persisting `_data_`, or the salt file was rotated), the values in `plugin-proxy-auth.json` can no longer be decrypted. `getDecrypted()` then silently returns `null`, an empty password is passed to IMAP, and Dovecot rejects the login with `AUTHENTICATIONFAILED`.
-
-Fix: open admin panel -> Extensions -> Proxy Auth, re-enter the Master User and Master Password (and any other previously-set encrypted fields), and save. The values will be re-encrypted under the current salt.
diff --git a/plugins/proxy-auth/index.php b/plugins/proxy-auth/index.php
index 36db5d9c2..ad2fea0f4 100644
--- a/plugins/proxy-auth/index.php
+++ b/plugins/proxy-auth/index.php
@@ -6,8 +6,8 @@ class ProxyAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 		NAME     = 'Proxy Auth',
 		AUTHOR   = 'Philipp',
 		URL      = 'https://www.mundhenk.org/',
-		VERSION  = '0.7',
-		RELEASE  = '2026-05-17',
+		VERSION  = '0.5',
+		RELEASE  = '2024-09-20',
 		REQUIRED = '2.36.1',
 		CATEGORY = 'Login',
 		LICENSE  = 'MIT',
@@ -21,6 +21,26 @@ class ProxyAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 		$this->addHook('login.credentials', 'MapEmailAddress');
 	}
 
+	/* by https://gist.github.com/tott/7684443 */
+	/**
+ 	 * Check if a given ip is in a network
+ 	 * @param  string $ip    IP to check in IPV4 format eg. 127.0.0.1
+ 	 * @param  string $range IP/CIDR netmask eg. 127.0.0.0/24, also 127.0.0.1 is accepted and /32 assumed
+ 	 * @return boolean true if the ip is in this range / false if not.
+ 	 */
+	private function ip_in_range( $ip, $range ) {
+		if ( strpos( $range, '/' ) == false ) {
+			$range .= '/32';
+		}
+		// $range is in IP/CIDR format eg 127.0.0.1/24
+		list( $range, $netmask ) = explode( '/', $range, 2 );
+		$range_decimal = ip2long( $range );
+		$ip_decimal = ip2long( $ip );
+		$wildcard_decimal = pow( 2, ( 32 - $netmask ) ) - 1;
+		$netmask_decimal = ~ $wildcard_decimal;
+		return ( ( $ip_decimal & $netmask_decimal ) == ( $range_decimal & $netmask_decimal ) );
+	}
+
 	public function MapEmailAddress(string &$sEmail, string &$sImapUser, string &$sPassword, string &$sSmtpUser)
 	{
 		$oActions = \RainLoop\Api::Actions();
@@ -60,19 +80,59 @@ class ProxyAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 		$sMsg = "Remote User: " . $sRemoteUser;
 		$oLogger->Write($sMsg, $sLevel, $sPrefix);
 
-		/* create master user login from remote user header and settings */
-		$sEmail = $sRemoteUser . $sMasterSeparator . $sMasterUser;
-		$sPassword = new \SnappyMail\SensitiveString(\trim($this->Config()->getDecrypted('plugin', 'master_password', '')));
+		$sProxyIP = $this->Config()->getDecrypted('plugin', 'proxy_ip', '');
+		$sMsg = "ProxyIP: " . $sProxyIP;
+		$oLogger->Write($sMsg, $sLevel, $sPrefix);
 
-		try
-		{
-			static::$login = true;
-			$oAccount = $oActions->LoginProcess($sEmail, $sPassword);
+		$sProxyCheck = $this->Config()->getDecrypted('plugin', 'proxy_check', '');
+		$sClientIPs = $this->Manager()->Actions()->Http()->GetClientIP(true);
+
+		/* make sure that remote user is only set by authorized proxy to avoid security risks */
+		if ($sProxyCheck) {
+			$sProxyRequest = false;
+			$sMsg = "checking client IPs: " . $sClientIPs;
+			$oLogger->Write($sMsg, $sLevel, $sPrefix);
+
+			$sClientIPs = explode(", ", $sClientIPs);
+			if (is_array($sClientIPs)) {
+				foreach ($sClientIPs as &$sIP) {
+					$sMsg = "checking client IP: " . $sIP;
+					$oLogger->Write($sMsg, $sLevel, $sPrefix);
+
+					if ($this->ip_in_range($sIP, $sProxyIP)) {
+						$sProxyRequest = true;
+					}
+				}
+			} else {
+				$sMsg = "checking client IP: " . $sClientIPs;
+				$oLogger->Write($sMsg, $sLevel, $sPrefix);
+
+				if ($this->ip_in_range($sClientIPs, $sProxyIP)) {
+					$sProxyRequest = true;
+				}
+			}
+		} else {
+			$sProxyRequest = true;
 		}
-		catch (\Throwable $oException)
-		{
-			$oLogger = $oActions->Logger();
-			$oLogger && $oLogger->WriteException($oException);
+
+		if ($sProxyRequest) {
+			/* create master user login from remote user header and settings */
+			$sEmail = $sRemoteUser . $sMasterSeparator . $sMasterUser;
+			$sPassword =  new \SnappyMail\SensitiveString(\trim($this->Config()->getDecrypted('plugin', 'master_password', '')));
+
+			try
+			{
+				static::$login = true;
+				$oAccount = $oActions->LoginProcess($sEmail, $sPassword);
+			}
+			catch (\Throwable $oException)
+			{
+				$oLogger = $oActions->Logger();
+				$oLogger && $oLogger->WriteException($oException);
+			}
+
+			\MailSo\Base\Http::Location('./');
+			return true;
 		}
 
 		\MailSo\Base\Http::Location('./');
@@ -128,6 +188,18 @@ class ProxyAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 				->SetDescription('Name of header containing username')
 				->SetDefaultValue('Remote-User')
 				->SetEncrypted(),
+			\RainLoop\Plugins\Property::NewInstance('check_proxy')
+				->SetLabel('Check Proxy')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+				->SetDescription('Activates check if proxy is connecting')
+				->SetDefaultValue(true)
+				->SetEncrypted(),
+			\RainLoop\Plugins\Property::NewInstance('proxy_ip')
+				->SetLabel('Proxy IPNet')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
+				->SetDescription('IP or Subnet of proxy, auth header will only be accepted from this address')
+				->SetDefaultValue('10.1.0.0/24')
+				->SetEncrypted(),
 			\RainLoop\Plugins\Property::NewInstance('auto_login')
 				->SetAllowedInJs(true)
 				->SetLabel('Activate automatic login')
diff --git a/plugins/search-filters/index.php b/plugins/search-filters/index.php
index f48cae1ae..090f31141 100644
--- a/plugins/search-filters/index.php
+++ b/plugins/search-filters/index.php
@@ -6,8 +6,8 @@ class SearchFiltersPlugin extends \RainLoop\Plugins\AbstractPlugin
 		NAME = 'Search Filters',
 		AUTHOR = 'AbdoBnHesham',
 		URL    = 'https://github.com/the-djmaze/snappymail/pull/1673',
-		VERSION = '0.3',
-		RELEASE = '2026-10-22',
+		VERSION = '0.2',
+		RELEASE = '2024-06-28',
 		REQUIRED = '2.36.3',
 		CATEGORY = 'General',
 		LICENSE = 'MIT',
@@ -51,33 +51,45 @@ class SearchFiltersPlugin extends \RainLoop\Plugins\AbstractPlugin
 		$Filters = $aSettings['SFilters'];
 
 		foreach ($Filters as $filter) {
-			$this->Manager()->logWrite(json_encode(['filter' => $filter]), LOG_WARNING);
+			$this->Manager()->logWrite(json_encode([
+				'filter' => $filter,
+			]), LOG_WARNING);
 
+			$folder = 'INBOX';
 			$searchQ = $filter['searchQ'];
+			$uids = $this->searchMessages($oImapClient, $searchQ, "INBOX");
 
-			// obsługa keyword (multi-folder)
-			if (stripos($searchQ, 'keyword=') !== false) {
-				$oMailClient = $this->Manager()->Actions()->MailClient();
-
-				// Pobieramy wszystkie foldery top-level
-				$folders = $oMailClient->Folders('', false, '');
-				foreach ($folders as $f) {
-					$folder = $f->FullName ?? null;
-					if (!$folder) continue;
-
-					$uids = $this->searchMessages($oImapClient, $searchQ, $folder);
-					if (!empty($uids)) {
-						$this->applyActions($oImapClient, $filter, $uids, $folder);
-					}
+			//Mark as read/seen
+			if ($filter['fSeen']) {
+				foreach ($uids as $uid) {
+					$oRange = new MailSo\Imap\SequenceSet([$uid]);
+					$this->Manager()->Actions()->MailClient()->MessageSetFlag(
+						$folder,
+						$oRange,
+						MailSo\Imap\Enumerations\MessageFlag::SEEN
+					);
 				}
-
-				continue; // przechodzimy do następnego filtra
 			}
 
-			// normalny search w INBOX
-			$uids = $this->searchMessages($oImapClient, $searchQ, 'INBOX');
-			if (!empty($uids)) {
-				$this->applyActions($oImapClient, $filter, $uids, 'INBOX');
+			//Flag/Star message
+			if ($filter['fFlag']) {
+				foreach ($uids as $uid) {
+					$oRange = new MailSo\Imap\SequenceSet([$uid]);
+					$this->Manager()->Actions()->MailClient()->MessageSetFlag(
+						$folder,
+						$oRange,
+						MailSo\Imap\Enumerations\MessageFlag::FLAGGED
+					);
+				}
+			}
+
+			// Move to folder
+			if ($filter['fFolder']) {
+				$folder = $filter['fFolder'];
+				foreach ($uids as $uid) {
+					$oRange = new MailSo\Imap\SequenceSet([$uid]);
+					$oImapClient->MessageMove("INBOX", $folder, $oRange);
+				}
 			}
 		}
 	}
@@ -87,66 +99,21 @@ class SearchFiltersPlugin extends \RainLoop\Plugins\AbstractPlugin
 		string $search,
 		string $folder = "INBOX"
 	): array {
-		try {
-			$bUseCache = false;
-			$oSearchCriterias = \MailSo\Imap\SearchCriterias::fromString(
-				$imapClient,
-				$folder,
-				$search,
-				true,
-				$bUseCache
-			);
+		$oParams = new \MailSo\Mail\MessageListParams();
+		$oParams->sSearch = $search;
+		$oParams->sFolderName = $folder;
 
-			$imapClient->FolderSelect($folder);
-			return $imapClient->MessageSearch($oSearchCriterias, true);
+		$bUseCache = false;
+		$oSearchCriterias = \MailSo\Imap\SearchCriterias::fromString(
+			$imapClient,
+			$folder,
+			$search,
+			true,
+			$bUseCache
+		);
 
-		} catch (\Throwable $e) {
-			$this->Manager()->logWrite(
-				'SearchFilters IMAP error in folder "' . $folder .
-				'" for search "' . $search . '": ' . $e->getMessage(),
-				LOG_ERR
-			);
-			return [];
-		}
-	}
-
-	private function applyActions(
-		\MailSo\Imap\ImapClient $imapClient,
-		array $filter,
-		array $uids,
-		string $folder
-	) {
-		// Mark as read/seen
-		if (!empty($filter['fSeen'])) {
-			foreach ($uids as $uid) {
-				$oRange = new \MailSo\Imap\SequenceSet([$uid]);
-				$this->Manager()->Actions()->MailClient()->MessageSetFlag(
-					$folder,
-					$oRange,
-					\MailSo\Imap\Enumerations\MessageFlag::SEEN
-				);
-			}
-		}
-
-		// Flag/Star message
-		if (!empty($filter['fFlag'])) {
-			foreach ($uids as $uid) {
-				$oRange = new \MailSo\Imap\SequenceSet([$uid]);
-				$this->Manager()->Actions()->MailClient()->MessageSetFlag(
-					$folder,
-					$oRange,
-					\MailSo\Imap\Enumerations\MessageFlag::FLAGGED
-				);
-			}
-		}
-
-		// Move to folder
-		if (!empty($filter['fFolder']) && $filter['fFolder'] !== -1) {
-			foreach ($uids as $uid) {
-				$oRange = new \MailSo\Imap\SequenceSet([$uid]);
-				$imapClient->MessageMove('INBOX', $filter['fFolder'], $oRange);
-			}
-		}
+		$imapClient->FolderSelect($folder);
+		return $imapClient->MessageSearch($oSearchCriterias, true);
 	}
 
 	public function GetFilters()
@@ -206,6 +173,7 @@ class SearchFiltersPlugin extends \RainLoop\Plugins\AbstractPlugin
 		} else {
 			$aSettings['SFilters'][$foundIndex] = $newFilter;
 		}
+
 		return $this->jsonResponse(__FUNCTION__, $this->saveUserSettings($aSettings));
 	}
 
diff --git a/plugins/two-factor-auth/index.php b/plugins/two-factor-auth/index.php
index 21b449daa..a080ae08b 100644
--- a/plugins/two-factor-auth/index.php
+++ b/plugins/two-factor-auth/index.php
@@ -131,7 +131,7 @@ class TwoFactorAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 	private static function getQRCode(MainAccount $oAccount, string $secret) : string
 	{
 		$email = \rawurlencode($oAccount->Email());
-//		$issuer = \rawurlencode(\RainLoop\Api::Config()->Get('webmail', 'title', 'SnappyMail'));
+//		$issuer = \rawurlencode(\RainLoop\API::Config()->Get('webmail', 'title', 'SnappyMail'));
 		$QR = \SnappyMail\QRCode::getMinimumQRCode(
 //			"otpauth://totp/{$issuer}:{$email}?secret={$secret}&issuer={$issuer}",
 			"otpauth://totp/{$email}?secret={$secret}",
diff --git a/plugins/two-factor-auth/langs/cs.ini b/plugins/two-factor-auth/langs/cs.ini
index 2324476fc..bcffceb9c 100644
--- a/plugins/two-factor-auth/langs/cs.ini
+++ b/plugins/two-factor-auth/langs/cs.ini
@@ -12,8 +12,8 @@ BUTTON_SHOW_SECRET = "Show Secret"
 BUTTON_HIDE_SECRET = "Hide Secret"
 TWO_FACTOR_SECRET_CONFIGURED_DESC = "Configured"
 TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Not configured"
-TWO_FACTOR_SECRET_DESC = "Import this info into your Google Authenticator client (or other TOTP client) using the provided QR code below or by entering the code manually."
-TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authenticator (or other TOTP client), you can use backup codes to sign in. After you’ve used a backup code to sign in, it will become inactive."
+TWO_FACTOR_SECRET_DESC = "Import this info into your Google Authenticator client (or other TOTP client) using the provided QR code below or by entering the code manually.\n"
+TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authenticator (or other TOTP client), you can use backup codes to sign in. After you’ve used a backup code to sign in, it will become inactive.\n"
 TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test."
 TITLE_TEST_CODE = "2-Step verification test"
 LABEL_CODE = "Code"
diff --git a/plugins/two-factor-auth/langs/en.ini b/plugins/two-factor-auth/langs/en.ini
index 003a50a31..fb94a5e56 100644
--- a/plugins/two-factor-auth/langs/en.ini
+++ b/plugins/two-factor-auth/langs/en.ini
@@ -12,8 +12,8 @@ BUTTON_SHOW_SECRET = "Show Secret"
 BUTTON_HIDE_SECRET = "Hide Secret"
 TWO_FACTOR_SECRET_CONFIGURED_DESC = "Configured"
 TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Not configured"
-TWO_FACTOR_SECRET_DESC = "Import this info into your Google Authenticator client (or other TOTP client) using the provided QR code below or by entering the code manually."
-TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authenticator (or other TOTP client), you can use backup codes to sign in. After you’ve used a backup code to sign in, it will become inactive."
+TWO_FACTOR_SECRET_DESC = "Import this info into your Google Authenticator client (or other TOTP client) using the provided QR code below or by entering the code manually.\n"
+TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authenticator (or other TOTP client), you can use backup codes to sign in. After you’ve used a backup code to sign in, it will become inactive.\n"
 TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test."
 TITLE_TEST_CODE = "2-Step verification test"
 LABEL_CODE = "Code"
diff --git a/plugins/two-factor-auth/langs/hu.ini b/plugins/two-factor-auth/langs/hu.ini
index a847b1be4..c97b8b192 100644
--- a/plugins/two-factor-auth/langs/hu.ini
+++ b/plugins/two-factor-auth/langs/hu.ini
@@ -12,8 +12,8 @@ BUTTON_SHOW_SECRET = "Titok megjelenítése"
 BUTTON_HIDE_SECRET = "Titok elrejtése"
 TWO_FACTOR_SECRET_CONFIGURED_DESC = "Beállítva"
 TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Nincs beállítva"
-TWO_FACTOR_SECRET_DESC = "Importáld ezt az infót a Google Authenticator kliensedbe (vagy más TOTP kliensbe) az alábbi QR kód használatával vagy a kód manuális megadatásával."
-TWO_FACTOR_BACKUP_CODES_DESC = "Ha nem kapod meg a kódokat a Google Authenticator kliensből (vagy más TOTP kliensből), akkor a bejelentkezéshez használhatod a biztonsági kódot. A biztonsági kód használata után inaktívvá válik."
+TWO_FACTOR_SECRET_DESC = "Importáld ezt az infót a Google Authenticator kliensedbe (vagy más TOTP kliensbe) az alábbi QR kód használatával vagy a kód manuális megadatásával.\n"
+TWO_FACTOR_BACKUP_CODES_DESC = "Ha nem kapod meg a kódokat a Google Authenticator kliensből (vagy más TOTP kliensből), akkor a bejelentkezéshez használhatod a biztonsági kódot. A biztonsági kód használata után inaktívvá válik.\n"
 TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "Tesztelés nélkül nem lehet megváltoztatni ezt a beállítást."
 TITLE_TEST_CODE = "2-lépéses hitelesítés teszt"
 LABEL_CODE = "Kód"
diff --git a/plugins/two-factor-auth/langs/it.ini b/plugins/two-factor-auth/langs/it.ini
index fbd44f45d..1b1faccac 100644
--- a/plugins/two-factor-auth/langs/it.ini
+++ b/plugins/two-factor-auth/langs/it.ini
@@ -12,8 +12,8 @@ BUTTON_SHOW_SECRET = "Mostra la chiave segreta"
 BUTTON_HIDE_SECRET = "Nascondi la chiave segreta"
 TWO_FACTOR_SECRET_CONFIGURED_DESC = "Configurato"
 TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Non configurato"
-TWO_FACTOR_SECRET_DESC = "Importa queste informazioni nella tua app Google Authenticator (o un altro programma per l'autenticazione a due fattori) utilizzando il codice QR fornito qui sotto o inserendo il codice manualmente."
-TWO_FACTOR_BACKUP_CODES_DESC = "Se non riesci a ricevere i codici tramite Google Authenticator (o un altro programma per l'autenticazione a due fattori), puoi utilizzare i codici di backup per accedere. Dopo che hai utilizzato un codice di backup per accedere, diventerà inattivo."
+TWO_FACTOR_SECRET_DESC = "Importa queste informazioni nella tua app Google Authenticator (o un altro programma per l'autenticazione a due fattori) utilizzando il codice QR fornito qui sotto o inserendo il codice manualmente.\n"
+TWO_FACTOR_BACKUP_CODES_DESC = "Se non riesci a ricevere i codici tramite Google Authenticator (o un altro programma per l'autenticazione a due fattori), puoi utilizzare i codici di backup per accedere. Dopo che hai utilizzato un codice di backup per accedere, diventerà inattivo.\n"
 TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "Non puoi modificare questa impostazione prima del test."
 TITLE_TEST_CODE = "Test di verifica a 2 fattori"
 LABEL_CODE = "Codice"
diff --git a/plugins/two-factor-auth/langs/uk.ini b/plugins/two-factor-auth/langs/uk.ini
deleted file mode 100644
index 5f09cfb09..000000000
--- a/plugins/two-factor-auth/langs/uk.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-[PLUGIN_2FA]
-LEGEND_TWO_FACTOR_AUTH = "2-етапна перевірка (TOTP)"
-LABEL_ENABLE_TWO_FACTOR = "Увімкнути 2-етапну перевірку"
-LABEL_TWO_FACTOR_USER = "Ім'я користувача"
-LABEL_TWO_FACTOR_STATUS = "Статус"
-LABEL_TWO_FACTOR_SECRET = "Ключ"
-LABEL_TWO_FACTOR_BACKUP_CODES = "Резервні коди"
-BUTTON_CREATE = "Create a secret"
-BUTTON_ACTIVATE = "Activate"
-LINK_TEST = "Тестувати"
-BUTTON_SHOW_SECRET = "Показати ключ"
-BUTTON_HIDE_SECRET = "Приховати ключ"
-TWO_FACTOR_SECRET_CONFIGURED_DESC = "Налаштовано"
-TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Не налаштовано"
-TWO_FACTOR_SECRET_DESC = "Імпортуйте цю інформацію у свій клієнт Google Authenticator (або інший клієнт TOTP), використовуючи наданий нижче QR-код або ввівши код вручну"
-TWO_FACTOR_BACKUP_CODES_DESC = "Якщо ви не можете отримати код через Google Authenticator (або інший клієнт TOTP), ви можете скористатися резервними кодами для входу. Після того, як ви використаєте резервний код для входу, він стане неактивним. Закреслюйте його"
-TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "Ви не можете змінити це налаштування перед тестуванням."
-TITLE_TEST_CODE = "Тест 2-етапної перевірки"
-LABEL_CODE = "Код"
-LABEL_TWO_FACTOR_CODE = "Код підтвердження"
diff --git a/plugins/two-factor-auth/langs/zh.ini b/plugins/two-factor-auth/langs/zh.ini
index 87c530e92..56091d914 100644
--- a/plugins/two-factor-auth/langs/zh.ini
+++ b/plugins/two-factor-auth/langs/zh.ini
@@ -12,8 +12,8 @@ BUTTON_SHOW_SECRET = "显示密钥"
 BUTTON_HIDE_SECRET = "隐藏密钥"
 TWO_FACTOR_SECRET_CONFIGURED_DESC = "已设置"
 TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "未设置"
-TWO_FACTOR_SECRET_DESC = "将下面的信息导入 Google Authenticator (或其他 TOTP 客户端)。 扫描下面的二维码或手动输入密钥。"
-TWO_FACTOR_BACKUP_CODES_DESC = "如果你无法从验证器获取验证码，你可以使用备用代码登录。 当你使用过某一个备用代码后，它将会失效。"
+TWO_FACTOR_SECRET_DESC = "将下面的信息导入 Google Authenticator (或其他 TOTP 客户端)。 扫描下面的二维码或手动输入密钥。\n"
+TWO_FACTOR_BACKUP_CODES_DESC = "如果你无法从验证器获取验证码，你可以使用备用代码登录。 当你使用过某一个备用代码后，它将会失效。\n"
 TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "完成测试前你无法更改此设置。"
 TITLE_TEST_CODE = "两步验证测试"
 LABEL_CODE = "代码"
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 ebc35ba16..e8aaec0ad 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
@@ -25,7 +25,10 @@ abstract class Collection extends \ArrayObject implements \JsonSerializable
 		}
 	}
 
-	public function append(mixed $mItem, bool $bToTop = false): void
+	/**
+	 * @param mixed $mItem
+	 */
+	public function append($mItem, bool $bToTop = false) : void
 	{
 		if ($bToTop) {
 			$array = $this->getArrayCopy();
@@ -36,18 +39,18 @@ abstract class Collection extends \ArrayObject implements \JsonSerializable
 		}
 	}
 
-	public function keys(): array
+	public function keys() : array
 	{
 		return \array_keys($this->getArrayCopy());
 	}
 
-	public function Add($mItem, bool $bToTop = false): self
+	public function Add($mItem, bool $bToTop = false) : self
 	{
 		$this->append($mItem, $bToTop);
 		return $this;
 	}
 
-	public function Clear(): void
+	public function Clear() : void
 	{
 		$this->exchangeArray([]);
 	}
@@ -61,14 +64,14 @@ abstract class Collection extends \ArrayObject implements \JsonSerializable
 		return $callable($this->getArrayCopy(), ...$arguments);
 	}
 */
-	public function Slice(int $offset, ?int $length = null, bool $preserve_keys = false)/*: static*/
+	public function Slice(int $offset, ?int $length = null, bool $preserve_keys = false)
 	{
 		return new static(
 			\array_slice($this->getArrayCopy(), $offset, $length, $preserve_keys)
 		);
 	}
 
-	public function Crop(?int $length = null, int $offset = 0, bool $preserve_keys = false): self
+	public function Crop(?int $length = null, int $offset = 0, bool $preserve_keys = false)
 	{
 		$this->exchangeArray(
 			\array_slice($this->getArrayCopy(), $offset, $length, $preserve_keys)
@@ -76,8 +79,8 @@ abstract class Collection extends \ArrayObject implements \JsonSerializable
 		return $this;
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		$aNames = \explode('\\', \get_class($this));
 		return array(
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php
index 74bb1cc25..c4cb6c4bc 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php
@@ -54,22 +54,11 @@ abstract class DateTimeHelper
 			\DateTime::createFromFormat('d M Y H:i:s O', $sDateTime, static::GetUtcTimeZoneObject())
 			// Using T (obsolete timezone abbreviation)
 			?: \DateTime::createFromFormat('d M Y H:i:s T', $sDateTime, static::GetUtcTimeZoneObject());
-
-		try {
-			$timestamp = $oDateTime->getTimestamp();
-
-			// 398045302 is 1982-08-13 00:08:22, the date RFC 822 was created
-			if (398045302 > $timestamp) {
-				\SnappyMail\Log::notice('', "Failed to parse RFC 2822 date '{$sDateTime}'");
-				return 0;
-			}
-
-			return $timestamp;
-		} catch (\Throwable $error) {
-			// Catch integer overflow or other fatal errors
-			\SnappyMail\Log::notice('', "Failed to parse RFC 2822 date '{$sDateTime}'. {$error->getMessage()}");
-			return 0;
+		// 398045302 is 1982-08-13 00:08:22 the date RFC 822 was created
+		if (!$oDateTime || 398045302 > $oDateTime->getTimestamp()) {
+			\SnappyMail\Log::notice('', "Failed to parse RFC 2822 date '{$sDateTime}'");
 		}
+		return $oDateTime ? $oDateTime->getTimestamp() : 0;
 	}
 
 	/**
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 0300d6c48..e073363b3 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
@@ -160,20 +160,13 @@ abstract class HtmlUtils
 
 		// Remove all remaining data-* attributes
 		foreach ($xpath->query('//*[@*[starts-with(name(), "data-")]]') as $oElement) {
+			$sTagNameLower = \strtolower($oElement->nodeName);
 			if ($oElement->hasAttributes()) {
-				// DOMNamedNodeMap is live: removing the attribute the foreach is
-				// currently on ends the iteration, so exactly one data-* was
-				// removed per element however many it carried. Collect the
-				// names first, then remove.
-				$aNames = [];
 				foreach ($oElement->attributes as $oAttr) {
 					if ('data-' === \substr(\strtolower($oAttr->nodeName), 0, 5)) {
-						$aNames[] = $oAttr->nodeName;
+						$oElement->removeAttribute($oAttr->nodeName);
 					}
 				}
-				foreach ($aNames as $sName) {
-					$oElement->removeAttribute($sName);
-				}
 			}
 		}
 
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 b4d79017f..67bb61489 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
@@ -30,7 +30,12 @@ class Http
 		return $oInstance;
 	}
 
-	public static function GetServer(string $sKey, mixed $mDefault = null): mixed
+	/**
+	 * @param mixed $mDefault = null
+	 *
+	 * @return mixed
+	 */
+	public static function GetServer(string $sKey, $mDefault = null)
 	{
 		return isset($_SERVER[$sKey]) ? $_SERVER[$sKey] : $mDefault;
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php
index f16598be8..5cf2f68ca 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php
@@ -59,7 +59,7 @@ abstract class Utils
 				return 'iso-8859-8';
 		}
 
-		return \preg_replace('/^(cp|windows)-?(12[\d]*)/i', 'windows-$2', $sEncoding);
+		return \preg_replace('/^(cp-?|windows?)(12[\d])/', 'windows-$1', $sEncoding);
 	}
 
 	public static function NormalizeCharsetByValue(string $sCharset, string $sValue) : string
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
index 27ead9bb5..bf3dc8981 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
@@ -40,27 +40,27 @@ class BodyStructure implements \JsonSerializable
 	 */
 	private array $aSubParts;
 
-	public function Charset(): string
+	public function Charset() : string
 	{
 		return $this->sCharset;
 	}
 
-	public function ContentTransferEncoding(): string
+	public function ContentTransferEncoding() : string
 	{
 		return $this->sContentTransferEncoding;
 	}
 
-	public function ContentType(): string
+	public function ContentType() : string
 	{
 		return $this->sContentType;
 	}
 
-	public function PartID(): string
+	public function PartID() : string
 	{
 		return $this->sPartID;
 	}
 
-	public function FileName(bool $bCalculateOnEmpty = false): string
+	public function FileName(bool $bCalculateOnEmpty = false) : string
 	{
 		$sFileName = \trim($this->sFileName);
 		if (\strlen($sFileName) || !$bCalculateOnEmpty) {
@@ -90,7 +90,7 @@ class BodyStructure implements \JsonSerializable
 		return ($this->isInline() ? 'inline' : 'part' ) . $sIdx;
 	}
 
-	public function EstimatedSize(): int
+	public function EstimatedSize() : int
 	{
 		$fCoefficient = 1;
 		switch ($this->sContentTransferEncoding)
@@ -106,17 +106,17 @@ class BodyStructure implements \JsonSerializable
 		return (int) ($this->iSize * $fCoefficient);
 	}
 
-	public function SubParts(): array
+	public function SubParts() : array
 	{
 		return $this->aSubParts;
 	}
 
-	public function isInline(): bool
+	public function isInline() : bool
 	{
 		return 'inline' === $this->sDisposition || \strlen($this->sContentID);
 	}
 
-	public function isText(): bool
+	public function isText() : bool
 	{
 		return 'text/html' === $this->sContentType
 			|| 'text/plain' === $this->sContentType
@@ -125,7 +125,7 @@ class BodyStructure implements \JsonSerializable
 	}
 
 	// https://datatracker.ietf.org/doc/html/rfc3156#section-4
-	public function isPgpEncrypted(): bool
+	public function isPgpEncrypted() : bool
 	{
 		return 'multipart/encrypted' === $this->sContentType
 		 && !empty($this->aContentTypeParams['protocol'])
@@ -138,7 +138,7 @@ class BodyStructure implements \JsonSerializable
 	}
 
 	// https://datatracker.ietf.org/doc/html/rfc3156#section-5
-	public function isPgpSigned(): bool
+	public function isPgpSigned() : bool
 	{
 		return 'multipart/signed' === $this->sContentType
 		 && !empty($this->aContentTypeParams['protocol'])
@@ -149,7 +149,7 @@ class BodyStructure implements \JsonSerializable
 	}
 
 	// https://datatracker.ietf.org/doc/html/rfc2633#section-3.3
-	public function isSMimeEncrypted(): bool
+	public function isSMimeEncrypted() : bool
 	{
 		$type = \strtolower(\trim($this->aContentTypeParams['smime-type'] ?? ''));
 		return ContentType::isPkcs7Mime($this->sContentType)
@@ -158,7 +158,7 @@ class BodyStructure implements \JsonSerializable
 	}
 
 	// https://www.rfc-editor.org/rfc/rfc8551.html#section-3.5
-	public function isSMimeSigned(): bool
+	public function isSMimeSigned() : bool
 	{
 		return ('multipart/signed' === $this->sContentType
 			&& !empty($this->aContentTypeParams['protocol'])
@@ -172,7 +172,7 @@ class BodyStructure implements \JsonSerializable
 		);
 	}
 
-	protected function IsAttachment(/*BodyStructure*/ $oParent): bool
+	protected function IsAttachment(/*BodyStructure*/ $oParent) : bool
 	{
 //		return 'application/pgp-encrypted' !== $this->sContentType
 		return (!$oParent || !$oParent->isPgpEncrypted())
@@ -184,14 +184,14 @@ class BodyStructure implements \JsonSerializable
 		);
 	}
 
-	public function IsFlowedFormat(): bool
+	public function IsFlowedFormat() : bool
 	{
 		return !empty($this->aContentTypeParams['format'])
 			&& 'flowed' === \strtolower(\trim($this->aContentTypeParams['format']))
 			&& !\in_array($this->sContentTransferEncoding, array('base64', 'quoted-printable'));
 	}
 
-	public function GetHtmlAndPlainParts(): array
+	public function GetHtmlAndPlainParts() : array
 	{
 		$aParts = [];
 
@@ -231,7 +231,7 @@ class BodyStructure implements \JsonSerializable
 		return $aParts;
 	}
 
-	public function SearchCharset(): string
+	public function SearchCharset() : string
 	{
 		$gParts = $this->SearchByCallback(function ($oPart, $oParent) {
 			return $oPart->Charset() && $oPart->isText() && !$oPart->IsAttachment($oParent);
@@ -246,7 +246,7 @@ class BodyStructure implements \JsonSerializable
 		return $gParts->valid() ? $gParts->current()->Charset() : '';
 	}
 
-	public function SearchByCallback(callable $fCallback, /*?BodyStructure*/ $parent = null): iterable
+	public function SearchByCallback(callable $fCallback, /*BodyStructure*/ $parent = null) : iterable
 	{
 		if ($fCallback($this, $parent)) {
 			yield $this;
@@ -256,7 +256,7 @@ class BodyStructure implements \JsonSerializable
 		}
 	}
 
-	public function SearchAttachmentsParts(): iterable
+	public function SearchAttachmentsParts() : iterable
 	{
 		return $this->SearchByCallback(function ($oItem, $oParent) {
 //			return $oItem->IsAttachment();
@@ -264,7 +264,7 @@ class BodyStructure implements \JsonSerializable
 		});
 	}
 
-	public function SearchByContentType(string $sContentType): iterable
+	public function SearchByContentType(string $sContentType) : iterable
 	{
 		$sContentType = \strtolower($sContentType);
 		return $this->SearchByCallback(function ($oItem) use ($sContentType) {
@@ -272,14 +272,14 @@ class BodyStructure implements \JsonSerializable
 		});
 	}
 
-	public function SearchByContentTypes(array $aContentTypes): iterable
+	public function SearchByContentTypes(array $aContentTypes) : iterable
 	{
 		return $this->SearchByCallback(function ($oItem) use ($aContentTypes) {
 			return \in_array($oItem->sContentType, $aContentTypes);
 		});
 	}
 
-	public function GetPartByMimeIndex(string $sMimeIndex): self
+	public function GetPartByMimeIndex(string $sMimeIndex) : self
 	{
 		$oPart = null;
 		if (\strlen($sMimeIndex)) {
@@ -300,7 +300,7 @@ class BodyStructure implements \JsonSerializable
 		return $oPart;
 	}
 
-	private static function decodeAttrParameter(array $aParams, string $sParamName, string $sCharset): string
+	private static function decodeAttrParameter(array $aParams, string $sParamName, string $sCharset) : string
 	{
 		$sResult = '';
 		if (isset($aParams[$sParamName])) {
@@ -349,7 +349,7 @@ class BodyStructure implements \JsonSerializable
 		return $sResult;
 	}
 
-	public static function NewInstance(array $aBodyStructure, string $sPartID = ''): ?self
+	public static function NewInstance(array $aBodyStructure, string $sPartID = '') : ?self
 	{
 		if (2 > \count($aBodyStructure)) {
 			return null;
@@ -542,7 +542,7 @@ class BodyStructure implements \JsonSerializable
 	 * Returns dict with key="charset" and value="US-ASCII" for array ("CHARSET" "US-ASCII").
 	 * Keys are lowercased (StringDictionary itself does this), values are not altered.
 	 */
-	private static function getKeyValueListFromArrayList(array $aList): array
+	private static function getKeyValueListFromArrayList(array $aList) : array
 	{
 		$aDict = array();
 		$iLen = \count($aList);
@@ -557,8 +557,8 @@ class BodyStructure implements \JsonSerializable
 		return $aDict;
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		return array(
 			'mimeIndex' => $this->sPartID,
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FetchResponse.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FetchResponse.php
index 5141aa2f6..c882df8f6 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FetchResponse.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FetchResponse.php
@@ -26,7 +26,7 @@ class FetchResponse
 		$this->oImapResponse = $oImapResponse;
 	}
 
-	public function GetEnvelope(bool $bForce = false): ?array
+	public function GetEnvelope(bool $bForce = false) : ?array
 	{
 		if (null === $this->aEnvelopeCache || $bForce) {
 			$this->aEnvelopeCache = $this->GetFetchValue(Enumerations\FetchType::ENVELOPE);
@@ -34,12 +34,15 @@ class FetchResponse
 		return $this->aEnvelopeCache;
 	}
 
-	public function GetFetchEnvelopeValue(int $iIndex, ?string $mNullResult = null): mixed
+	/**
+	 * @return mixed
+	 */
+	public function GetFetchEnvelopeValue(int $iIndex, ?string $mNullResult = null)
 	{
 		return self::findEnvelopeIndex($this->GetEnvelope(), $iIndex, $mNullResult);
 	}
 
-	public function GetFetchEnvelopeEmailCollection(int $iIndex, string $sParentCharset = \MailSo\Base\Enumerations\Charset::ISO_8859_1): ?\MailSo\Mime\EmailCollection
+	public function GetFetchEnvelopeEmailCollection(int $iIndex, string $sParentCharset = \MailSo\Base\Enumerations\Charset::ISO_8859_1) : ?\MailSo\Mime\EmailCollection
 	{
 		$oResult = null;
 		$aEmails = $this->GetFetchEnvelopeValue($iIndex);
@@ -68,7 +71,7 @@ class FetchResponse
 		return $oResult;
 	}
 
-	public function GetFetchBodyStructure(): ?BodyStructure
+	public function GetFetchBodyStructure() : ?BodyStructure
 	{
 		$aBodyStructureArray = $this->GetFetchValue(Enumerations\FetchType::BODYSTRUCTURE);
 
@@ -79,8 +82,9 @@ class FetchResponse
 
 	/**
 	 * Like: UID, RFC822.SIZE, MODSEQ, INTERNALDATE, FLAGS, BODYSTRUCTURE
+	 * @return mixed
 	 */
-	public function GetFetchValue(string $sFetchItemName): mixed
+	public function GetFetchValue(string $sFetchItemName)
 	{
 		if (isset($this->oImapResponse->ResponseList[3]) && \is_array($this->oImapResponse->ResponseList[3])) {
 			$bNextIsValue = false;
@@ -100,8 +104,9 @@ class FetchResponse
 
 	/**
 	 * Like: BODY[HEADER.FIELDS (RETURN-PATH RECEIVED MIME-VERSION MESSAGE-ID CONTENT-TYPE FROM TO CC BCC SENDER REPLY-TO DELIVERED-TO IN-REPLY-TO REFERENCES DATE SUBJECT SENSITIVITY X-MSMAIL-PRIORITY IMPORTANCE X-PRIORITY X-DRAFT-INFO RETURN-RECEIPT-TO DISPOSITION-NOTIFICATION-TO X-CONFIRM-READING-TO AUTHENTICATION-RESULTS X-DKIM-AUTHENTICATION-RESULTS LIST-UNSUBSCRIBE X-SPAM-STATUS X-SPAMD-RESULT X-BOGOSITY X-VIRUS X-VIRUS-SCANNED X-VIRUS-STATUS)]
+	 * @return mixed
 	 */
-	public function GetHeaderFieldsValue(): string
+	public function GetHeaderFieldsValue() : string
 	{
 		$bNextIsValue = false;
 
@@ -124,7 +129,7 @@ class FetchResponse
 		return '';
 	}
 
-	public static function isValidImapResponse(Response $oImapResponse): bool
+	public static function isValidImapResponse(Response $oImapResponse) : bool
 	{
 		return
 			!$oImapResponse->IsStatusResponse
@@ -133,13 +138,16 @@ class FetchResponse
 			&& \is_array($oImapResponse->ResponseList[3]);
 	}
 
-	public static function hasUidAndSize(Response $oImapResponse): bool
+	public static function hasUidAndSize(Response $oImapResponse) : bool
 	{
 		return \in_array(Enumerations\FetchType::UID, $oImapResponse->ResponseList[3])
 			&& \in_array(Enumerations\FetchType::RFC822_SIZE, $oImapResponse->ResponseList[3]);
 	}
 
-	private static function findEnvelopeIndex(array $aEnvelope, int $iIndex, ?string $mNullResult): mixed
+	/**
+	 * @return mixed
+	 */
+	private static function findEnvelopeIndex(array $aEnvelope, int $iIndex, ?string $mNullResult)
 	{
 		return (isset($aEnvelope[$iIndex]) && '' !== $aEnvelope[$iIndex])
 			? $aEnvelope[$iIndex] : $mNullResult;
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 b36c183a7..276eeb13f 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
@@ -53,22 +53,22 @@ class Folder implements \JsonSerializable
 */
 	}
 
-	public function setAttributes(array $aAttributes): void
+	public function setAttributes(array $aAttributes) : void
 	{
 		$this->aAttributes = \array_map('mb_strtolower', $aAttributes);
 	}
 
-	public function setSubscribed(): void
+	public function setSubscribed() : void
 	{
 		$this->aAttributes = \array_unique(\array_merge($this->aAttributes, ['\\subscribed']));
 	}
 
-	public function setDelimiter(?string $sDelimiter): void
+	public function setDelimiter(?string $sDelimiter) : void
 	{
 		$this->sDelimiter = $sDelimiter;
 	}
 
-	public function Name(): string
+	public function Name() : string
 	{
 		$sNameRaw = $this->FullName;
 		if ($this->sDelimiter) {
@@ -78,49 +78,49 @@ class Folder implements \JsonSerializable
 		return $sNameRaw;
 	}
 
-	public function Delimiter(): ?string
+	public function Delimiter() : ?string
 	{
 		return $this->sDelimiter;
 	}
 
-	public function Selectable(): bool
+	public function Selectable() : bool
 	{
 		return !\in_array('\\noselect', $this->aAttributes)
 			&& !\in_array('\\nonexistent', $this->aAttributes);
 	}
 
-	public function IsSubscribed(): bool
+	public function IsSubscribed() : bool
 	{
 		return \in_array('\\subscribed', $this->aAttributes);
 	}
 
-	public function IsInbox(): bool
+	public function IsInbox() : bool
 	{
 		return 'INBOX' === \strtoupper($this->FullName) || \in_array('\\inbox', $this->aAttributes);
 	}
 
-	public function SetMetadata(string $sName, string $sData): void
+	public function SetMetadata(string $sName, string $sData) : void
 	{
 		$this->aMetadata[$sName] = $sData;
 	}
 
-	public function SetAllMetadata(array $aMetadata): void
+	public function SetAllMetadata(array $aMetadata) : void
 	{
 		$this->aMetadata = $aMetadata;
 	}
 
-	public function GetMetadata(string $sName): ?string
+	public function GetMetadata(string $sName) : ?string
 	{
 		return isset($this->aMetadata[$sName]) ? $this->aMetadata[$sName] : null;
 	}
 
-	public function Metadata(): array
+	public function Metadata() : array
 	{
 		return $this->aMetadata;
 	}
 
 	// JMAP RFC 8621
-	public function Role(): ?string
+	public function Role() : ?string
 	{
 		$role = \strtolower($this->GetMetadata(MetadataKeys::SPECIALUSE) ?: '');
 		if (!$role) {
@@ -145,8 +145,8 @@ class Folder implements \JsonSerializable
 		return $role ? \ltrim($role, '\\') : null;
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		$selectable = $this->Selectable();
 		$result = array(
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FolderCollection.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FolderCollection.php
index 6fe2698e3..8e2d9d8c2 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FolderCollection.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FolderCollection.php
@@ -19,14 +19,14 @@ class FolderCollection extends \MailSo\Base\Collection
 {
 //	public bool $Optimized = false;
 
-	public function append($oFolder, bool $bToTop = false): void
+	public function append($oFolder, bool $bToTop = false) : void
 	{
 		assert($oFolder instanceof Folder);
 		parent::append($oFolder, $bToTop);
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		return array(
 			'@Object' => 'Collection/FolderCollection',
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 1609359ac..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
@@ -40,15 +40,15 @@ class FolderInformation implements \JsonSerializable
 		$this->IsWritable = $bIsWritable;
 	}
 
-	public function IsFlagSupported(string $sFlag): bool
+	public function IsFlagSupported(string $sFlag) : bool
 	{
 		return \in_array('\\*', $this->PermanentFlags)
 			|| \in_array($sFlag, $this->PermanentFlags);
 //			|| \in_array($sFlag, $this->Flags);
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		$result = array(
 			'id' => $this->MAILBOXID,
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 2ec335901..ace504b1c 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,7 +49,7 @@ class ImapClient extends \MailSo\Net\NetClient
 	 */
 	private bool $UTF8 = false;
 
-	public function Hash(): string
+	public function Hash() : string
 	{
 		return \md5('ImapClientHash/'.
 			$this->Settings->username . '@' .
@@ -64,8 +64,8 @@ class ImapClient extends \MailSo\Net\NetClient
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-//	public function Connect(Settings $oSettings): void
-	public function Connect(\MailSo\Net\ConnectSettings $oSettings): void
+//	public function Connect(Settings $oSettings) : void
+	public function Connect(\MailSo\Net\ConnectSettings $oSettings) : void
 	{
 		$this->aTagTimeouts['*'] = \microtime(true);
 
@@ -79,7 +79,7 @@ class ImapClient extends \MailSo\Net\NetClient
 		}
 	}
 
-	private function StartTLS(): void
+	private function StartTLS() : void
 	{
 		if ($this->hasCapability('STARTTLS')) {
 			$this->SendRequestGetResponse('STARTTLS');
@@ -93,7 +93,7 @@ class ImapClient extends \MailSo\Net\NetClient
 		}
 	}
 
-	public function supportsAuthType(string $sasl_type): bool
+	public function supportsAuthType(string $sasl_type) : bool
 	{
 		return $this->hasCapability("AUTH={$sasl_type}");
 	}
@@ -104,7 +104,7 @@ class ImapClient extends \MailSo\Net\NetClient
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function Login(Settings $oSettings): self
+	public function Login(Settings $oSettings) : self
 	{
 		if ($this->bIsLoggined) {
 			return $this;
@@ -242,7 +242,7 @@ class ImapClient extends \MailSo\Net\NetClient
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function Logout(): void
+	public function Logout() : void
 	{
 		if ($this->bIsLoggined) {
 			$this->bIsLoggined = false;
@@ -250,12 +250,12 @@ class ImapClient extends \MailSo\Net\NetClient
 		}
 	}
 
-	public function IsLoggined(): bool
+	public function IsLoggined() : bool
 	{
 		return $this->IsConnected() && $this->bIsLoggined;
 	}
 
-	public function IsSelected(): bool
+	public function IsSelected() : bool
 	{
 		return $this->IsLoggined() && $this->oCurrentFolderInfo;
 	}
@@ -265,7 +265,7 @@ class ImapClient extends \MailSo\Net\NetClient
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function Capability(): ?array
+	public function Capability() : ?array
 	{
 		if (!$this->aCapaRaw) {
 			$this->setCapabilities($this->SendRequestGetResponse('CAPABILITY'));
@@ -276,7 +276,7 @@ class ImapClient extends \MailSo\Net\NetClient
 		return $this->aCapa;
 	}
 
-	public function Capabilities(): ?array
+	public function Capabilities() : ?array
 	{
 		if (!$this->aCapaRaw) {
 			$this->Capability();
@@ -284,7 +284,7 @@ class ImapClient extends \MailSo\Net\NetClient
 		return $this->aCapaRaw;
 	}
 
-	public function CapabilityValue(string $sExtentionName): ?string
+	public function CapabilityValue(string $sExtentionName) : ?string
 	{
 		$sExtentionName = \trim($sExtentionName) . '=';
 		$aCapabilities = $this->Capability() ?: [];
@@ -296,7 +296,7 @@ class ImapClient extends \MailSo\Net\NetClient
 		return null;
 	}
 
-	private function setCapabilities(ResponseCollection $oResponseCollection): void
+	private function setCapabilities(ResponseCollection $oResponseCollection) : void
 	{
 		$aList = $oResponseCollection->getCapabilityResult();
 		$this->aCapaRaw = $aList;
@@ -330,7 +330,7 @@ class ImapClient extends \MailSo\Net\NetClient
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function hasCapability(string $sExtentionName): bool
+	public function hasCapability(string $sExtentionName) : bool
 	{
 		$sExtentionName = \trim($sExtentionName);
 		return $sExtentionName && \in_array(\strtoupper($sExtentionName), $this->Capability() ?: []);
@@ -339,7 +339,7 @@ class ImapClient extends \MailSo\Net\NetClient
 	/**
 	 * RFC 5161
 	 */
-	public function Enable(string|array $mCapabilityNames): void
+	public function Enable(/*string|array*/ $mCapabilityNames) : void
 	{
 		if (\is_string($mCapabilityNames)) {
 			$mCapabilityNames = [$mCapabilityNames];
@@ -354,7 +354,7 @@ class ImapClient extends \MailSo\Net\NetClient
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function GetNamespaces(): ?NamespaceResult
+	public function GetNamespaces() : ?NamespaceResult
 	{
 		if (!$this->hasCapability('NAMESPACE')) {
 			return null;
@@ -382,7 +382,7 @@ class ImapClient extends \MailSo\Net\NetClient
 	 * and that the client will need to discover upload limits for each mailbox,
 	 * as they might differ from mailbox to mailbox.
 	 */
-	public function AppendLimit(): ?int
+	public function AppendLimit() : ?int
 	{
 		$string = $this->CapabilityValue('APPENDLIMIT');
 		return \is_null($string) ? null : (int) $string;
@@ -393,7 +393,7 @@ class ImapClient extends \MailSo\Net\NetClient
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function Noop(): self
+	public function Noop() : self
 	{
 		$this->SendRequestGetResponse('NOOP');
 		return $this;
@@ -405,7 +405,7 @@ class ImapClient extends \MailSo\Net\NetClient
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function SendRequest(string $sCommand, array $aParams = array(), bool $bBreakOnLiteral = false): string
+	public function SendRequest(string $sCommand, array $aParams = array(), bool $bBreakOnLiteral = false) : string
 	{
 		$sCommand = \trim($sCommand);
 		if (!\strlen($sCommand)) {
@@ -438,13 +438,13 @@ class ImapClient extends \MailSo\Net\NetClient
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function SendRequestGetResponse(string $sCommand, array $aParams = array()): ResponseCollection
+	public function SendRequestGetResponse(string $sCommand, array $aParams = array()) : ResponseCollection
 	{
 		$this->SendRequest($sCommand, $aParams);
 		return $this->getResponse();
 	}
 
-	protected function getResponseValue(ResponseCollection $oResponseCollection, int $type = 0): string
+	protected function getResponseValue(ResponseCollection $oResponseCollection, int $type = 0) : string
 	{
 		$oResponse = $oResponseCollection->getLast();
 		if ($oResponse && (!$type || $type === $oResponse->ResponseType)) {
@@ -466,7 +466,7 @@ class ImapClient extends \MailSo\Net\NetClient
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	protected function streamResponse(?string $sEndTag = null): void
+	protected function streamResponse(?string $sEndTag = null) : void
 	{
 		try {
 			if (\is_resource($this->ConnectionResource())) {
@@ -488,7 +488,7 @@ class ImapClient extends \MailSo\Net\NetClient
 		}
 	}
 
-	protected function getResponse(?string $sEndTag = null): ResponseCollection
+	protected function getResponse(?string $sEndTag = null) : ResponseCollection
 	{
 		try {
 			$oResult = new ResponseCollection;
@@ -535,8 +535,8 @@ class ImapClient extends \MailSo\Net\NetClient
 		return $oResult;
 	}
 
-//	public function yieldUntaggedResponses(): \Generator
-	public function yieldUntaggedResponses(): iterable
+//	public function yieldUntaggedResponses() : \Generator
+	public function yieldUntaggedResponses() : iterable
 	{
 		try {
 			$oResult = new ResponseCollection;
@@ -577,7 +577,7 @@ class ImapClient extends \MailSo\Net\NetClient
 		}
 	}
 
-	protected function prepareParamLine(array $aParams = array()): string
+	protected function prepareParamLine(array $aParams = array()) : string
 	{
 		$sReturn = '';
 		foreach ($aParams as $mParamItem) {
@@ -590,18 +590,18 @@ class ImapClient extends \MailSo\Net\NetClient
 		return $sReturn;
 	}
 
-	protected function getNewTag(): string
+	protected function getNewTag() : string
 	{
 		++$this->iTagCount;
 		return $this->getCurrentTag();
 	}
 
-	protected function getCurrentTag(): string
+	protected function getCurrentTag() : string
 	{
 		return $this->TAG_PREFIX.$this->iTagCount;
 	}
 
-	public function EscapeString(?string $sStringForEscape): string
+	public function EscapeString(?string $sStringForEscape) : string
 	{
 		if (null === $sStringForEscape) {
 			return 'NIL';
@@ -617,7 +617,7 @@ class ImapClient extends \MailSo\Net\NetClient
 		return '"' . \addcslashes($sStringForEscape, '\\"') . '"';
 	}
 
-	public function getLogName(): string
+	public function getLogName() : string
 	{
 		return 'IMAP';
 	}
@@ -626,7 +626,7 @@ class ImapClient extends \MailSo\Net\NetClient
 	 * RFC 2971
 	 * Don't have to be logged in to call this command
 	 */
-	public function ServerID(): string
+	public function ServerID() : string
 	{
 		if ($this->hasCapability('ID')) {
 			foreach ($this->SendRequestGetResponse('ID', [null]) as $oResponse) {
@@ -647,7 +647,7 @@ class ImapClient extends \MailSo\Net\NetClient
 	 * RFC 4978
 	 * It is RECOMMENDED that the client uses TLS compression.
 	 *//*
-	public function Compress(): bool
+	public function Compress() : bool
 	{
 		try {
 			if ($this->hasCapability('COMPRESS=DEFLATE')) {
@@ -663,12 +663,12 @@ class ImapClient extends \MailSo\Net\NetClient
 		return false;
 	}*/
 
-	public function EscapeFolderName(string $sFolderName): string
+	public function EscapeFolderName(string $sFolderName) : string
 	{
 		return $this->EscapeString($this->UTF8 ? $sFolderName : \MailSo\Base\Utils::Utf8ToUtf7Modified($sFolderName));
 	}
 
-	public function toUTF8(string $sText): string
+	public function toUTF8(string $sText) : string
 	{
 		return $this->UTF8 ? $sText : \MailSo\Base\Utils::Utf7ModifiedToUtf8($sText);
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/NamespaceResult.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/NamespaceResult.php
index 2d7a50b8a..a0d2eb971 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/NamespaceResult.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/NamespaceResult.php
@@ -59,7 +59,7 @@ class NamespaceResult implements \JsonSerializable
 		}
 	}
 
-	public function GetPersonalPrefix(): string
+	public function GetPersonalPrefix() : string
 	{
 		$sPrefix = '';
 		if (isset($this->aPersonal[0])) {
@@ -72,8 +72,8 @@ class NamespaceResult implements \JsonSerializable
 		return $sPrefix;
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		return array(
 			'@Object' => 'Object/Namespaces',
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Requests/THREAD.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Requests/THREAD.php
index 511963a20..33665ed2e 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Requests/THREAD.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Requests/THREAD.php
@@ -42,7 +42,7 @@ class THREAD extends Request
 		parent::__construct($oImapClient);
 	}
 
-	public function setAlgorithm(string $sAlgorithm): void
+	public function setAlgorithm(string $sAlgorithm) : void
 	{
 		$sAlgorithm = \strtoupper($sAlgorithm);
 		if (!$this->oImapClient->hasCapability("THREAD={$sAlgorithm}")) {
@@ -51,7 +51,7 @@ class THREAD extends Request
 		$this->sAlgorithm = $sAlgorithm;
 	}
 
-	public function SendRequestIterateResponse(): iterable
+	public function SendRequestIterateResponse() : iterable
 	{
 		$this->oImapClient->SendRequest(
 			($this->bUid ? 'UID THREAD' : 'THREAD'),
@@ -79,7 +79,12 @@ class THREAD extends Request
 		}
 	}
 
-	private function validateThreadItem(mixed $mValue): int|array|false
+	/**
+	 * @param mixed $mValue
+	 *
+	 * @return int | array | false
+	 */
+	private function validateThreadItem($mValue)
 	{
 		if (\is_numeric($mValue)) {
 			$mValue = (int) $mValue;
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Responses/ACL.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Responses/ACL.php
index 11ce68c0d..bc5b6e8e5 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Responses/ACL.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Responses/ACL.php
@@ -28,19 +28,19 @@ class ACL implements \JsonSerializable
 		$this->rights = $rights;
 	}
 
-	public function identifier(): string
+	public function identifier() : string
 	{
 		return $this->identifier;
 	}
 
 	/** PHP 8.1
-	public function hasRight(string|\MailSo\Imap\Enumerations\FolderACL $right): bool
+	public function hasRight(string|\MailSo\Imap\Enumerations\FolderACL $right)
 	{
 		if ($right instanceof \BackedEnum) {
 			return \str_contains($this->rights, $right->value);
 		}
 	*/
-	public function hasRight(string $right): bool
+	public function hasRight(string $right) : bool
 	{
 		$const = '\\MailSo\\Imap\\Enumerations\\FolderACL::' . \strtoupper($right);
 		if (\defined($const)) {
@@ -49,8 +49,8 @@ class ACL implements \JsonSerializable
 		return \str_contains($this->rights, $right);
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		return [
 			'@Object' => 'Object/FolderACLRights',
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SequenceSet.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SequenceSet.php
index 86f79f957..e8f742980 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SequenceSet.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SequenceSet.php
@@ -53,7 +53,7 @@ class SequenceSet /*extends \SplFixedArray*/ implements \Countable
 		return \in_array($value, $this->data);
 	}
 
-	public function indexOf($value): int|false
+	public function indexOf($value)/*: int|false*/
 	{
 		return \array_search($value, $this->data);
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Settings.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Settings.php
index f8035c32c..8993a051b 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Settings.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Settings.php
@@ -40,7 +40,7 @@ class Settings extends \MailSo\Net\ConnectSettings
 	public array
 		$disabled_capabilities = [];
 
-	public static function fromArray(array $aSettings): self
+	public static function fromArray(array $aSettings) : self
 	{
 		$object = parent::fromArray($aSettings);
 
@@ -119,8 +119,8 @@ class Settings extends \MailSo\Net\ConnectSettings
 		return $object;
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		if (\in_array('SORT', $this->disabled_capabilities)) {
 			$this->disabled_capabilities[] = 'ESORT';
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Driver.php b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Driver.php
index f7e2cf4dc..33fb026e2 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Driver.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Driver.php
@@ -48,7 +48,7 @@ abstract class Driver
 		$this->oTimeZone = new \DateTimeZone('UTC');
 	}
 
-	public function SetTimeZone(\DateTimeZone|string $mTimeZone): self
+	public function SetTimeZone(/*\DateTimeZone | string*/ $mTimeZone) : self
 	{
 		$this->oTimeZone = $mTimeZone instanceof \DateTimeZone
 			? $mTimeZone
@@ -56,43 +56,43 @@ abstract class Driver
 		return $this;
 	}
 
-	public function DisableGuidPrefix(): self
+	public function DisableGuidPrefix() : self
 	{
 		$this->bGuidPrefix = false;
 		return $this;
 	}
 
-	public function DisableTimePrefix(): self
+	public function DisableTimePrefix() : self
 	{
 		$this->bTimePrefix = false;
 		return $this;
 	}
 
-	public function DisableTypedPrefix(): self
+	public function DisableTypedPrefix() : self
 	{
 		$this->bTypedPrefix = false;
 		return $this;
 	}
 
-	abstract protected function writeImplementation($mDesc): bool;
+	abstract protected function writeImplementation($mDesc) : bool;
 
-	protected function clearImplementation(): bool
+	protected function clearImplementation() : bool
 	{
 		return true;
 	}
 
-	protected function getTimeWithMicroSec(): string
+	protected function getTimeWithMicroSec() : string
 	{
 		return \substr((new \DateTime('now', $this->oTimeZone))->format('Y-m-d H:i:s.u'), 0, -3);
 	}
 
-	protected function getTypedPrefix(int $iType, string $sName = ''): string
+	protected function getTypedPrefix(int $iType, string $sName = '') : string
 	{
 		$sName = \strlen($sName) ? $sName : $this->sName;
 		return isset(self::PREFIXES[$iType]) ? $sName . self::PREFIXES[$iType].': ' : '';
 	}
 
-	final public function Write(string $sDesc, int $iType = \LOG_INFO, string $sName = '', bool $bDiplayCrLf = false): bool
+	final public function Write(string $sDesc, int $iType = \LOG_INFO, string $sName = '', bool $bDiplayCrLf = false)
 	{
 		$sDesc = \ltrim(
 			($this->bTimePrefix ? '['.$this->getTimeWithMicroSec().']' : '').
@@ -105,7 +105,7 @@ abstract class Driver
 		return $this->writeImplementation($sDesc);
 	}
 
-	final public function Clear(): bool
+	final public function Clear() : bool
 	{
 		return $this->clearImplementation();
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Logger.php b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Logger.php
index fbc060645..e1cec4c16 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Logger.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Logger.php
@@ -84,7 +84,7 @@ class Logger extends \SplFixedArray
 	/**
 	 * @staticvar string $sCache;
 	 */
-	public static function Guid(): string
+	public static function Guid() : string
 	{
 		static $sCache = null;
 		if (null === $sCache) {
@@ -94,7 +94,7 @@ class Logger extends \SplFixedArray
 		return $sCache;
 	}
 
-	public function append($oDriver): void
+	public function append($oDriver) : void
 	{
 		if ($oDriver) {
 			$this->setSize(1);
@@ -102,7 +102,7 @@ class Logger extends \SplFixedArray
 		}
 	}
 
-	public function IsEnabled(): bool
+	public function IsEnabled() : bool
 	{
 		return 0 < $this->count();
 	}
@@ -110,7 +110,7 @@ class Logger extends \SplFixedArray
 	public function AddSecret(
 		#[\SensitiveParameter]
 		string $sWord
-	): void
+	) : void
 	{
 //		$this->bShowSecrets && $this->Write("AddSecret '{$sWord}'", \LOG_INFO);
 		$sWord = \trim($sWord);
@@ -121,18 +121,18 @@ class Logger extends \SplFixedArray
 		}
 	}
 
-	public function SetShowSecrets(bool $bShow): self
+	public function SetShowSecrets(bool $bShow) : self
 	{
 		$this->bShowSecrets = $bShow;
 		return $this;
 	}
 
-	public function ShowSecrets(): bool
+	public function ShowSecrets() : bool
 	{
 		return $this->bShowSecrets;
 	}
 
-	public function SetLevel(int $iLevel): self
+	public function SetLevel(int $iLevel) : self
 	{
 		$this->iLevel = $iLevel;
 		return $this;
@@ -150,7 +150,7 @@ class Logger extends \SplFixedArray
 		\E_USER_ERROR => \LOG_ERR,
 		\E_USER_WARNING => \LOG_WARNING,
 		\E_USER_NOTICE => \LOG_NOTICE,
-//		\E_STRICT => \LOG_CRIT,
+		\E_STRICT => \LOG_CRIT,
 		\E_RECOVERABLE_ERROR => \LOG_ERR,
 		\E_DEPRECATED => \LOG_INFO,
 		\E_USER_DEPRECATED => \LOG_INFO
@@ -168,13 +168,13 @@ class Logger extends \SplFixedArray
 		\E_USER_ERROR => '-USER',
 		\E_USER_WARNING => '-USER',
 		\E_USER_NOTICE => '-USER',
-//		\E_STRICT => '-STRICT',
+		\E_STRICT => '-STRICT',
 		\E_RECOVERABLE_ERROR => '-RECOVERABLE',
 		\E_DEPRECATED => '-DEPRECATED',
 		\E_USER_DEPRECATED => '-USER_DEPRECATED'
 	);
 
-	public function __phpErrorHandler(int $iErrNo, string $sErrStr, string $sErrFile, int $iErrLine): bool
+	public function __phpErrorHandler(int $iErrNo, string $sErrStr, string $sErrFile, int $iErrLine) : bool
 	{
 		if (\error_reporting() & $iErrNo) {
 			$this->Write(
@@ -196,7 +196,7 @@ class Logger extends \SplFixedArray
 		\error_log('Uncaught exception: ' . $oException);
 	}
 
-	public function __loggerShutDown(): void
+	public function __loggerShutDown() : void
 	{
 		if ($this->bUsed) {
 			$error = \error_get_last();
@@ -206,7 +206,7 @@ class Logger extends \SplFixedArray
 		}
 	}
 
-	public function signalHandler(int $signo, mixed $siginfo = null): void
+	public function signalHandler($signo, /*?array*/$siginfo = null)
 	{
 		if (\SIGTERM == $signo) {
 			exit;
@@ -219,7 +219,7 @@ class Logger extends \SplFixedArray
 		}
 	}
 
-	public function Write(string $sDesc, int $iType = \LOG_INFO, string $sName = '', bool $bDiplayCrLf = false): bool
+	public function Write(string $sDesc, int $iType = \LOG_INFO, string $sName = '', bool $bDiplayCrLf = false) : bool
 	{
 		if ($this->iLevel < $iType) {
 			return true;
@@ -241,14 +241,17 @@ class Logger extends \SplFixedArray
 		return (bool) $iResult;
 	}
 
-	public function WriteDump(mixed $mValue, int $iType = \LOG_INFO, string $sName = ''): bool
+	/**
+	 * @param mixed $mValue
+	 */
+	public function WriteDump($mValue, int $iType = \LOG_INFO, string $sName = '') : bool
 	{
 		return $this->Write(\print_r($mValue, true), $iType, $sName);
 	}
 
 	private $aExceptions = [];
 
-	public function WriteException(\Throwable $oException, int $iType = \LOG_NOTICE, string $sName = ''): void
+	public function WriteException(\Throwable $oException, int $iType = \LOG_NOTICE, string $sName = '') : void
 	{
 		if (!\in_array($oException, $this->aExceptions)) {
 			$this->Write((string) $oException, $iType, $sName);
@@ -256,7 +259,7 @@ class Logger extends \SplFixedArray
 		}
 	}
 
-	public function WriteExceptionShort(\Throwable $oException, int $iType = \LOG_NOTICE, string $sName = ''): void
+	public function WriteExceptionShort(\Throwable $oException, int $iType = \LOG_NOTICE, string $sName = '') : void
 	{
 		if (!\in_array($oException, $this->aExceptions)) {
 			$this->Write($oException->getMessage(), $iType, $sName);
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Attachment.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Attachment.php
index e56841d90..aa11a1c81 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Attachment.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Attachment.php
@@ -32,7 +32,7 @@ class Attachment implements \JsonSerializable
 		$this->oBodyStructure = $oBodyStructure;
 	}
 
-	public function Clear(): self
+	public function Clear() : self
 	{
 		$this->sFolder = '';
 		$this->iUid = 0;
@@ -41,23 +41,23 @@ class Attachment implements \JsonSerializable
 		return $this;
 	}
 
-	public function Folder(): string
+	public function Folder() : string
 	{
 		return $this->sFolder;
 	}
 
-	public function Uid(): int
+	public function Uid() : int
 	{
 		return $this->iUid;
 	}
 
-	public function __call(string $name, array $arguments): mixed
+	public function __call(string $name, array $arguments) //: mixed
 	{
 		return $this->oBodyStructure->{$name}(...$arguments);
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		return \array_merge([
 			'@Object' => 'Object/Attachment',
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 ecca5da53..f5b55fe27 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
@@ -37,12 +37,12 @@ class MailClient
 		$this->oImapClient = new \MailSo\Imap\ImapClient;
 	}
 
-	public function ImapClient(): \MailSo\Imap\ImapClient
+	public function ImapClient() : \MailSo\Imap\ImapClient
 	{
 		return $this->oImapClient;
 	}
 
-	private function getEnvelopeOrHeadersRequestString(): string
+	private function getEnvelopeOrHeadersRequestString() : string
 	{
 		if ($this->oImapClient->Settings->message_all_headers) {
 			return FetchType::BODY_HEADER_PEEK;
@@ -115,7 +115,7 @@ class MailClient
 	 * @throws \MailSo\Imap\Exceptions\*
 	 * @throws \MailSo\Mail\Exceptions\*
 	 */
-	public function MessageSetFlag(string $sFolderName, SequenceSet $oRange, string $sMessageFlag, bool $bSetAction = true, bool $bSkipUnsupportedFlag = false): void
+	public function MessageSetFlag(string $sFolderName, SequenceSet $oRange, string $sMessageFlag, bool $bSetAction = true, bool $bSkipUnsupportedFlag = false) : void
 	{
 		if (\count($oRange)) {
 			if ($this->oImapClient->FolderSelect($sFolderName)->IsFlagSupported($sMessageFlag)) {
@@ -133,7 +133,7 @@ class MailClient
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function Message(string $sFolderName, int $iIndex, bool $bIndexIsUid = true, ?\MailSo\Cache\CacheClient $oCacher = null): ?Message
+	public function Message(string $sFolderName, int $iIndex, bool $bIndexIsUid = true, ?\MailSo\Cache\CacheClient $oCacher = null) : ?Message
 	{
 		if (1 > $iIndex) {
 			throw new \ValueError;
@@ -181,12 +181,14 @@ class MailClient
 	/**
 	 * Streams mime part to $mCallback
 	 *
+	 * @param mixed $mCallback
+	 *
 	 * @throws \InvalidArgumentException
 	 * @throws \MailSo\RuntimeException
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function MessageMimeStream(callable $mCallback, string $sFolderName, int $iIndex, string $sMimeIndex): bool
+	public function MessageMimeStream($mCallback, string $sFolderName, int $iIndex, string $sMimeIndex) : bool
 	{
 		if (!\is_callable($mCallback)) {
 			throw new \ValueError;
@@ -277,7 +279,7 @@ class MailClient
 		return ($aFetchResponse && 1 === \count($aFetchResponse));
 	}
 
-	public function MessageAppendFile(string $sMessageFileName, string $sFolderToSave, ?array $aAppendFlags = null): int
+	public function MessageAppendFile(string $sMessageFileName, string $sFolderToSave, ?array $aAppendFlags = null) : int
 	{
 		if (!\is_file($sMessageFileName) || !\is_readable($sMessageFileName)) {
 			throw new \ValueError;
@@ -297,7 +299,7 @@ class MailClient
 	 * Returns list of new messages since $iPrevUidNext
 	 * Currently only for INBOX
 	 */
-	private function getFolderNextMessageInformation(string $sFolderName, int $iPrevUidNext, int $iCurrentUidNext): array
+	private function getFolderNextMessageInformation(string $sFolderName, int $iPrevUidNext, int $iCurrentUidNext) : array
 	{
 		$aNewMessages = array();
 
@@ -347,7 +349,7 @@ class MailClient
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function FolderInformation(string $sFolderName, int $iPrevUidNext = 0, ?SequenceSet $oRange = null): array
+	public function FolderInformation(string $sFolderName, int $iPrevUidNext = 0, ?SequenceSet $oRange = null) : array
 	{
 		if ($oRange) {
 //			$aInfo = $this->oImapClient->FolderExamine($sFolderName)->jsonSerialize();
@@ -389,7 +391,7 @@ class MailClient
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function FolderHash(string $sFolderName): string
+	public function FolderHash(string $sFolderName) : string
 	{
 		try
 		{
@@ -403,7 +405,7 @@ class MailClient
 		return '';
 	}
 
-	public function MessageThread(string $sFolderName, string $sMessageID): MessageCollection
+	public function MessageThread(string $sFolderName, string $sMessageID) : MessageCollection
 	{
 		$this->oImapClient->FolderExamine($sFolderName);
 
@@ -432,7 +434,7 @@ class MailClient
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	protected function ThreadsMap(string $sAlgorithm, MessageCollection $oMessageCollection, ?\MailSo\Cache\CacheClient $oCacher, bool $bBackground = false): array
+	protected function ThreadsMap(string $sAlgorithm, MessageCollection $oMessageCollection, ?\MailSo\Cache\CacheClient $oCacher, bool $bBackground = false) : array
 	{
 		$oFolderInfo = $oMessageCollection->FolderInfo;
 		$sFolderName = $oFolderInfo->FullName;
@@ -510,7 +512,7 @@ class MailClient
 	}
 
 	// All threads UID's except the most recent UID of each thread
-	protected function ThreadsOldUids(array $aAllThreads, MessageCollection $oMessageCollection, ?\MailSo\Cache\CacheClient $oCacher, bool $bBackground = false): array
+	protected function ThreadsOldUids(array $aAllThreads, MessageCollection $oMessageCollection, ?\MailSo\Cache\CacheClient $oCacher, bool $bBackground = false) : array
 	{
 		$oFolderInfo = $oMessageCollection->FolderInfo;
 
@@ -583,7 +585,7 @@ class MailClient
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
 	protected function MessageListByRequestIndexOrUids(MessageCollection $oMessageCollection, SequenceSet $oRange,
-		array &$aAllThreads = [], array &$aUnseenUIDs = []): void
+		array &$aAllThreads = [], array &$aUnseenUIDs = []) : void
 	{
 		if (\count($oRange)) {
 			$aFetchItems = array(
@@ -631,7 +633,7 @@ class MailClient
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	private function GetUids(MessageListParams $oParams, FolderInformation $oInfo, bool $onlyCache = false): ?array
+	private function GetUids(MessageListParams $oParams, FolderInformation $oInfo, bool $onlyCache = false) : ?array
 	{
 		$oCacher = $oParams->oCacher;
 		$sFolderName = $oParams->sFolderName;
@@ -723,7 +725,7 @@ class MailClient
 		return $aResultUids;
 	}
 
-	public function MessageListUnseen(MessageListParams $oParams, FolderInformation $oInfo): array
+	public function MessageListUnseen(MessageListParams $oParams, FolderInformation $oInfo) : array
 	{
 		$oUnseenParams = new MessageListParams;
 		$oUnseenParams->sFolderName = $oParams->sFolderName;
@@ -747,7 +749,7 @@ class MailClient
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function MessageList(MessageListParams $oParams): MessageCollection
+	public function MessageList(MessageListParams $oParams) : MessageCollection
 	{
 		if (0 > $oParams->iOffset || 0 > $oParams->iLimit) {
 			throw new \ValueError;
@@ -909,7 +911,7 @@ class MailClient
 		return $oMessageCollection;
 	}
 
-	public function FindMessageUidByMessageId(string $sFolderName, string $sMessageId): ?int
+	public function FindMessageUidByMessageId(string $sFolderName, string $sMessageId) : ?int
 	{
 		if (!\strlen($sMessageId)) {
 			throw new \ValueError;
@@ -922,7 +924,7 @@ class MailClient
 		return 1 === \count($aUids) && \is_numeric($aUids[0]) ? (int) $aUids[0] : null;
 	}
 
-	public function Folders(string $sParent, string $sListPattern, bool $bUseListSubscribeStatus): ?FolderCollection
+	public function Folders(string $sParent, string $sListPattern, bool $bUseListSubscribeStatus) : ?FolderCollection
 	{
 		$oFolderCollection = $this->oImapClient->FolderStatusList($sParent, $sListPattern);
 		if (!$oFolderCollection->count()) {
@@ -955,7 +957,7 @@ class MailClient
 	/**
 	 * @throws \ValueError
 	 */
-	public function FolderCreate(string $sFolderNameInUtf8, string $sFolderParentFullName = '', bool $bSubscribeOnCreation = true, string $sDelimiter = ''): ?\MailSo\Imap\Folder
+	public function FolderCreate(string $sFolderNameInUtf8, string $sFolderParentFullName = '', bool $bSubscribeOnCreation = true, string $sDelimiter = '') : ?\MailSo\Imap\Folder
 	{
 		$sFolderNameInUtf8 = \trim($sFolderNameInUtf8);
 		$sFolderParentFullName = \trim($sFolderParentFullName);
@@ -1002,7 +1004,7 @@ class MailClient
 	/**
 	 * @throws \InvalidArgumentException
 	 */
-	public function FolderRename(string $sPrevFolderFullName, string $sNewFolderFullName): self
+	public function FolderRename(string $sPrevFolderFullName, string $sNewFolderFullName) : self
 	{
 		if (!\strlen($sPrevFolderFullName) || !\strlen($sNewFolderFullName)) {
 			throw new \ValueError;
@@ -1045,7 +1047,7 @@ class MailClient
 	/**
 	 * @throws \InvalidArgumentException
 	 */
-	public function SetLogger(?\MailSo\Log\Logger $oLogger): void
+	public function SetLogger(?\MailSo\Log\Logger $oLogger) : void
 	{
 		$this->oLogger = $oLogger;
 		$this->oImapClient->SetLogger($oLogger);
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 36ac413c6..fa8c9cf2e 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
@@ -92,52 +92,52 @@ class Message implements \JsonSerializable
 		return \property_exists($this, $k) ? $this->$k : null;
 	}
 
-	public function Subject(): string
+	public function Subject() : string
 	{
 		return $this->sSubject;
 	}
 
-	public function From(): ?\MailSo\Mime\EmailCollection
+	public function From() : ?\MailSo\Mime\EmailCollection
 	{
 		return $this->oFrom;
 	}
 
-	public function Uid(): int
+	public function Uid() : int
 	{
 		return $this->Uid;
 	}
 
-	public function Attachments(): ?AttachmentCollection
+	public function Attachments() : ?AttachmentCollection
 	{
 		return $this->Attachments;
 	}
 
-	public function setPlain(string $value): void
+	public function setPlain(string $value) : void
 	{
 		$this->sPlain = $value;
 	}
 
-	public function setHtml(string $value): void
+	public function setHtml(string $value) : void
 	{
 		$this->sHtml = $value;
 	}
 
-	private function setSpamScore($value): void
+	private function setSpamScore($value) : void
 	{
 		$this->SpamScore = \intval(\max(0, \min(100, $value)));
 	}
 
-	public function SetThreads(array $aThreadUIDs): void
+	public function SetThreads(array $aThreadUIDs)
 	{
 		$this->aThreadUIDs = $aThreadUIDs;
 	}
 
-	public function SetThreadUnseen(array $aUnseenUIDs): void
+	public function SetThreadUnseen(array $aUnseenUIDs)
 	{
 		$this->aThreadUnseenUIDs = $aUnseenUIDs;
 	}
 
-	public static function fromFetchResponse(string $sFolder, \MailSo\Imap\FetchResponse $oFetchResponse, ?\MailSo\Imap\BodyStructure $oBodyStructure = null): self
+	public static function fromFetchResponse(string $sFolder, \MailSo\Imap\FetchResponse $oFetchResponse, ?\MailSo\Imap\BodyStructure $oBodyStructure = null) : self
 	{
 		$oMessage = new self;
 
@@ -463,7 +463,7 @@ class Message implements \JsonSerializable
 		return $oMessage;
 	}
 
-	public function ETag(string $sClientHash): string
+	public function ETag(string $sClientHash) : string
 	{
 		return \md5('MessageHash/' . \implode('/', [
 			$this->sFolder,
@@ -477,7 +477,7 @@ class Message implements \JsonSerializable
 	// 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
+	protected function getFlags() : array
 	{
 		return \array_unique(\str_replace(
 			['$readreceipt', '$replied',  /* 'junk',  'nonjunk',  '$queued',        '$sent',      'sent'*/],
@@ -486,8 +486,8 @@ class Message implements \JsonSerializable
 		));
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 /*
 		// JMAP-only RFC8621 keywords (RFC5788)
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 aea3681eb..c4feac4ca 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
@@ -36,7 +36,8 @@ class MessageCollection extends \MailSo\Base\Collection
 
 	public int $ThreadUid = 0;
 
-	public ?\MailSo\Imap\FolderInformation $FolderInfo = null;
+	// MailSo\Imap\FolderInformation
+	public $FolderInfo = null;
 
 	public array $NewMessages = array();
 
@@ -44,19 +45,19 @@ class MessageCollection extends \MailSo\Base\Collection
 
 	public bool $Limited = false;
 
-	public function append($oMessage, bool $bToTop = false): void
+	public function append($oMessage, bool $bToTop = false) : void
 	{
 		assert($oMessage instanceof Message);
 		parent::append($oMessage, $bToTop);
 	}
 
-	public function Clear(): void
+	public function Clear() : void
 	{
 		throw new \BadMethodCallException('disallowed');
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		return \array_merge(parent::jsonSerialize(), array(
 			'totalEmails' => $this->totalEmails,
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Email.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Email.php
index 246bc40c5..7448de43b 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Email.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Email.php
@@ -200,8 +200,8 @@ class Email implements \JsonSerializable
 		return $this->ToString();
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		return array(
 			'@Object' => 'Object/Email',
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 8513a506d..0d56809af 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
@@ -27,13 +27,13 @@ class EmailCollection extends \MailSo\Base\Collection
 		}
 	}
 
-	public function append($oEmail, bool $bToTop = false): void
+	public function append($oEmail, bool $bToTop = false) : void
 	{
 		assert($oEmail instanceof Email);
 		parent::append($oEmail, $bToTop);
 	}
 
-	public function Unique(): self
+	public function Unique() : self
 	{
 		$aReturn = array();
 
@@ -47,7 +47,7 @@ class EmailCollection extends \MailSo\Base\Collection
 		return new static($aReturn);
 	}
 
-	public function ToString(bool $bConvertSpecialsName = false, bool $bIdn = false): string
+	public function ToString(bool $bConvertSpecialsName = false, bool $bIdn = false) : string
 	{
 		$aReturn = array();
 		foreach ($this as $oEmail) {
@@ -57,12 +57,12 @@ class EmailCollection extends \MailSo\Base\Collection
 		return \implode(', ', $aReturn);
 	}
 
-	public function __toString(): string
+	public function __toString() : string
 	{
 		return $this->ToString();
 	}
 
-	private function parseEmailAddresses(string $sRawEmails): void
+	private function parseEmailAddresses(string $sRawEmails) : void
 	{
 //		$sRawEmails = \MailSo\Base\Utils::Trim($sRawEmails);
 		$sRawEmails = \trim($sRawEmails);
@@ -156,8 +156,8 @@ class EmailCollection extends \MailSo\Base\Collection
 		}
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		return \array_slice($this->getArrayCopy(), 0, 100);
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Header.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Header.php
index 523134093..f48cdf0f4 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Header.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Header.php
@@ -35,7 +35,7 @@ class Header implements \JsonSerializable
 		$this->initInputData($sName, $sValue, $sEncodedValueForReparse);
 	}
 
-	private function initInputData(string $sName, string $sValue, string $sEncodedValueForReparse): void
+	private function initInputData(string $sName, string $sValue, string $sEncodedValueForReparse) : void
 	{
 		$this->sName = \trim($sName);
 		$this->sFullValue = \trim($sValue);
@@ -62,7 +62,7 @@ class Header implements \JsonSerializable
 		}
 	}
 
-	public static function NewInstanceFromEncodedString(string $sEncodedLines, string $sIncomingCharset = \MailSo\Base\Enumerations\Charset::ISO_8859_1): Header
+	public static function NewInstanceFromEncodedString(string $sEncodedLines, string $sIncomingCharset = \MailSo\Base\Enumerations\Charset::ISO_8859_1) : Header
 	{
 		if (empty($sIncomingCharset)) {
 			$sIncomingCharset = \MailSo\Base\Enumerations\Charset::ISO_8859_1;
@@ -81,27 +81,27 @@ class Header implements \JsonSerializable
 		return false;
 	}
 
-	public function Name(): string
+	public function Name() : string
 	{
 		return $this->sName;
 	}
 
-	public function Value(): string
+	public function Value() : string
 	{
 		return $this->sValue;
 	}
 
-	public function FullValue(): string
+	public function FullValue() : string
 	{
 		return $this->sFullValue;
 	}
 
-	public function EncodedValue(): string
+	public function EncodedValue() : string
 	{
 		return $this->sEncodedValue ?: $this->sFullValue;
 	}
 
-	public function SetParentCharset(string $sParentCharset): Header
+	public function SetParentCharset(string $sParentCharset) : Header
 	{
 		if ($this->sParentCharset !== $sParentCharset && \strlen($this->sEncodedValue)) {
 			$this->initInputData(
@@ -116,17 +116,17 @@ class Header implements \JsonSerializable
 		return $this;
 	}
 
-	public function Parameters(): ?ParameterCollection
+	public function Parameters() : ?ParameterCollection
 	{
 		return $this->oParameters;
 	}
 
-	public function setParameter(string $sName, string $sValue): void
+	public function setParameter(string $sName, string $sValue) : void
 	{
 		$this->oParameters->setParameter($sName, $sValue);
 	}
 
-	public function __toString(): string
+	public function __toString() : string
 	{
 		$sResult = $this->sFullValue;
 
@@ -159,12 +159,12 @@ class Header implements \JsonSerializable
 		return $sName . \wordwrap($sResult, 78 - \strlen($sName) - 1, "\r\n ");
 	}
 
-	private function IsSubject(): bool
+	private function IsSubject() : bool
 	{
 		return \strtolower(Enumerations\Header::SUBJECT) === \strtolower($this->Name());
 	}
 
-	private function IsParameterized(): bool
+	private function IsParameterized() : bool
 	{
 		return \in_array(\strtolower($this->sName), array(
 			\strtolower(Enumerations\Header::CONTENT_TYPE),
@@ -173,7 +173,7 @@ class Header implements \JsonSerializable
 		));
 	}
 
-	private function IsEmail(): bool
+	private function IsEmail() : bool
 	{
 		return \in_array(\strtolower($this->sName), array(
 			\strtolower(Enumerations\Header::FROM_),
@@ -186,7 +186,7 @@ class Header implements \JsonSerializable
 		));
 	}
 
-	public function ValueWithCharsetAutoDetect(): string
+	public function ValueWithCharsetAutoDetect() : string
 	{
 		if (!\MailSo\Base\Utils::IsAscii($this->Value())
 		 && \strlen($this->sEncodedValue)
@@ -198,8 +198,8 @@ class Header implements \JsonSerializable
 		return $this->Value();
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		$aResult = array(
 			'@Object' => 'Object/MimeHeader',
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php
index 1bb807bab..5b3674dbe 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php
@@ -27,30 +27,30 @@ class HeaderCollection extends \MailSo\Base\Collection
 		}
 	}
 
-	public function append($oHeader, bool $bToTop = false): void
+	public function append($oHeader, bool $bToTop = false) : void
 	{
 		assert($oHeader instanceof Header);
 		parent::append($oHeader, $bToTop);
 	}
 
-	public function AddByName(string $sName, string $sValue, bool $bToTop = false): self
+	public function AddByName(string $sName, string $sValue, bool $bToTop = false) : self
 	{
 		$this->append(new Header($sName, $sValue), $bToTop);
 		return $this;
 	}
 
-	public function SetByName(string $sName, string $sValue, bool $bToTop = false): self
+	public function SetByName(string $sName, string $sValue, bool $bToTop = false) : self
 	{
 		return $this->RemoveByName($sName)->Add(new Header($sName, $sValue), $bToTop);
 	}
 
-	public function ValueByName(string $sHeaderName, bool $bCharsetAutoDetect = false): string
+	public function ValueByName(string $sHeaderName, bool $bCharsetAutoDetect = false) : string
 	{
 		$oHeader = $this->GetByName($sHeaderName);
 		return $oHeader ? ($bCharsetAutoDetect ? $oHeader->ValueWithCharsetAutoDetect() : $oHeader->Value()) : '';
 	}
 
-	public function ValuesByName(string $sHeaderName): array
+	public function ValuesByName(string $sHeaderName) : array
 	{
 		$aResult = array();
 		$sHeaderNameLower = \strtolower($sHeaderName);
@@ -62,7 +62,7 @@ class HeaderCollection extends \MailSo\Base\Collection
 		return $aResult;
 	}
 
-	public function RemoveByName(string $sHeaderName): self
+	public function RemoveByName(string $sHeaderName) : self
 	{
 		$sHeaderName = \strtolower($sHeaderName);
 		$this->exchangeArray(array_filter($this->getArrayCopy(), function ($oHeader) use ($sHeaderName) {
@@ -71,7 +71,7 @@ class HeaderCollection extends \MailSo\Base\Collection
 		return $this;
 	}
 
-	public function GetAsEmailCollection(string $sHeaderName): ?EmailCollection
+	public function GetAsEmailCollection(string $sHeaderName) : ?EmailCollection
 	{
 		if ($oHeader = $this->GetByName($sHeaderName)) {
 			return new EmailCollection($oHeader->EncodedValue());
@@ -79,14 +79,14 @@ class HeaderCollection extends \MailSo\Base\Collection
 		return new EmailCollection();
 	}
 
-	public function ParameterValue(string $sHeaderName, string $sParamName): string
+	public function ParameterValue(string $sHeaderName, string $sParamName) : string
 	{
 		$oHeader = $this->GetByName($sHeaderName);
 		$oParameters = $oHeader ? $oHeader->Parameters() : null;
 		return (null !== $oParameters) ? $oParameters->ParameterValueByName($sParamName) : '';
 	}
 
-	public function GetByName(string $sHeaderName): ?Header
+	public function GetByName(string $sHeaderName) : ?Header
 	{
 		$sHeaderNameLower = \strtolower($sHeaderName);
 		foreach ($this as $oHeader) {
@@ -97,7 +97,7 @@ class HeaderCollection extends \MailSo\Base\Collection
 		return null;
 	}
 
-	public function SetParentCharset(string $sParentCharset): self
+	public function SetParentCharset(string $sParentCharset) : self
 	{
 		if (\strlen($sParentCharset) && $this->sParentCharset !== $sParentCharset) {
 			foreach ($this as $oHeader) {
@@ -108,7 +108,7 @@ class HeaderCollection extends \MailSo\Base\Collection
 		return $this;
 	}
 
-	public function Parse(string $sRawHeaders, string $sParentCharset = ''): self
+	public function Parse(string $sRawHeaders, string $sParentCharset = '') : self
 	{
 		$this->Clear();
 
@@ -136,12 +136,14 @@ class HeaderCollection extends \MailSo\Base\Collection
 					$sHeadersValue = \rtrim($sHeadersValue);
 				}
 
-				// RFC 5322 unfolding removes the line break and keeps the folding
-				// whitespace; RFC 2047 6.2 drops it only between two encoded words.
-				if ('=?' === \substr(\ltrim($sHeadersValue), 0, 2) && '?=' === \substr($sValue, -2)) {
-					$sValue .= \ltrim($sHeadersValue);
+				if ('=?' === \substr(\ltrim($sHeadersValue), 0, 2)) {
+					$sHeadersValue = \ltrim($sHeadersValue);
+				}
+
+				if ('=?' === \substr($sHeadersValue, 0, 2)) {
+					$sValue .= $sHeadersValue;
 				} else {
-					$sValue .= ' '.\ltrim($sHeadersValue);
+					$sValue .= "\n".$sHeadersValue;
 				}
 			} else {
 				if (null !== $sName) {
@@ -180,7 +182,7 @@ class HeaderCollection extends \MailSo\Base\Collection
 	 * spf=pass (ORIGINATING: domain of "snappymail@domain.tld" designates 0.0.0.0 as permitted sender) smtp.mailfrom="snappymail@domain.tld";
 	 * dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=domain.tld (policy=none)
 	 */
-	public function AuthStatuses(): array
+	public function AuthStatuses() : array
 	{
 		$aResult = [
 			'dkim' => [],
@@ -222,13 +224,13 @@ class HeaderCollection extends \MailSo\Base\Collection
 		return $aResult;
 	}
 
-	public function __toString(): string
+	public function __toString() : string
 	{
 		return \implode("\r\n", $this->getArrayCopy());
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		return array(
 			'@Object' => 'Collection/MimeHeaderCollection',
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Parameter.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Parameter.php
index 276ad2a0d..e73ce1df5 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Parameter.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Parameter.php
@@ -27,7 +27,7 @@ class Parameter implements \JsonSerializable
 		$this->sValue = $sValue;
 	}
 
-	public static function FromString(string $sRawParam): self
+	public static function FromString(string $sRawParam) : self
 	{
 		$oParameter = new self('', '');
 
@@ -40,22 +40,22 @@ class Parameter implements \JsonSerializable
 		return $oParameter;
 	}
 
-	public function Name(): string
+	public function Name() : string
 	{
 		return $this->sName;
 	}
 
-	public function Value(): string
+	public function Value() : string
 	{
 		return $this->sValue;
 	}
 
-	public function setValue(string $sValue): void
+	public function setValue(string $sValue) : void
 	{
 		$this->sValue = $sValue;
 	}
 
-	public function ToString(bool $bConvertSpecialsName = false): string
+	public function ToString(bool $bConvertSpecialsName = false) : string
 	{
 		if (!\strlen($this->sName)) {
 			return '';
@@ -72,13 +72,13 @@ class Parameter implements \JsonSerializable
 		return $this->sName . '="' . $this->sValue . '"';
 	}
 
-	public function __toString(): string
+	public function __toString() : string
 	{
 		return $this->ToString();
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		return array(
 			'name' => $this->sName,
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/ParameterCollection.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/ParameterCollection.php
index c008e2a85..688fa48ea 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/ParameterCollection.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/ParameterCollection.php
@@ -24,25 +24,25 @@ class ParameterCollection extends \MailSo\Base\Collection
 		\strlen($sRawParams) && $this->Parse($sRawParams);
 	}
 
-	public function append($oParameter, bool $bToTop = false): void
+	public function append($oParameter, bool $bToTop = false) : void
 	{
 		assert($oParameter instanceof Parameter);
 		parent::offsetSet(\strtolower($oParameter->Name()), $oParameter);
 	}
 
-	public function ParameterValueByName(string $sName): string
+	public function ParameterValueByName(string $sName) : string
 	{
 		$oParam = $this->getParameter($sName);
 		return $oParam ? $oParam->Value() : '';
 	}
 
-	public function getParameter(string $sName): ?Parameter
+	public function getParameter(string $sName) : ?Parameter
 	{
 		$sName = \strtolower(\trim($sName));
 		return parent::offsetExists($sName) ? parent::offsetGet($sName) : null;
 	}
 
-	public function setParameter(string $sName, string $sValue): void
+	public function setParameter(string $sName, string $sValue) : void
 	{
 		$oParam = $this->getParameter($sName);
 		if ($oParam) {
@@ -52,7 +52,7 @@ class ParameterCollection extends \MailSo\Base\Collection
 		}
 	}
 
-	public function Parse(string $sRawParams): self
+	public function Parse(string $sRawParams) : self
 	{
 		$this->Clear();
 
@@ -67,7 +67,7 @@ class ParameterCollection extends \MailSo\Base\Collection
 		return $this;
 	}
 
-	public function ToString(bool $bConvertSpecialsName = false): string
+	public function ToString(bool $bConvertSpecialsName = false) : string
 	{
 		$aResult = array();
 		foreach ($this as $oParam) {
@@ -79,14 +79,14 @@ class ParameterCollection extends \MailSo\Base\Collection
 		return \count($aResult) ? \implode('; ', $aResult) : '';
 	}
 
-	public function __toString(): string
+	public function __toString() : string
 	{
 		return $this->ToString();
 	}
 
 /*
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		$aResult = array();
 		foreach ($this as $oParam) {
@@ -99,7 +99,7 @@ class ParameterCollection extends \MailSo\Base\Collection
 	}
 */
 
-	private function reParseParameters(): void
+	private function reParseParameters() : void
 	{
 		$aDataToReParse = $this->getArrayCopy();
 		$sCharset = \MailSo\Base\Enumerations\Charset::UTF_8;
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/ConnectSettings.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/ConnectSettings.php
index 45e636e8f..3da957592 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Net/ConnectSettings.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Net/ConnectSettings.php
@@ -83,7 +83,7 @@ class ConnectSettings implements \JsonSerializable
 		}
 	}
 
-	public function fixUsername(string $value, bool $allowShorten = true): string
+	public function fixUsername(string $value, bool $allowShorten = true) : string
 	{
 		$value = \SnappyMail\IDN::emailToAscii($value);
 //		$value = \SnappyMail\IDN::emailToAscii(\MailSo\Base\Utils::Trim($value));
@@ -104,7 +104,7 @@ class ConnectSettings implements \JsonSerializable
 		return $value;
 	}
 
-	public static function fromArray(array $aSettings): self
+	public static function fromArray(array $aSettings) : self
 	{
 		$object = new static;
 		$object->host = $aSettings['host'];
@@ -128,8 +128,8 @@ class ConnectSettings implements \JsonSerializable
 		return $object;
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		return array(
 //			'@Object' => 'Object/ConnectSettings',
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/SSLContext.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/SSLContext.php
index e477a7b81..e34972061 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Net/SSLContext.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Net/SSLContext.php
@@ -39,7 +39,7 @@ class SSLContext implements \JsonSerializable
 
 	public function __construct()
 	{
-		$oConfig = \RainLoop\Api::Config();
+		$oConfig = \RainLoop\API::Config();
 		$this->verify_peer = !!$oConfig->Get('ssl', 'verify_certificate', true);
 		$this->verify_peer_name = !!$oConfig->Get('ssl', 'verify_certificate', true);
 		$this->allow_self_signed = !!$oConfig->Get('ssl', 'allow_self_signed', false);
@@ -50,7 +50,7 @@ class SSLContext implements \JsonSerializable
 		$this->local_cert = \trim($oConfig->Get('ssl', 'local_cert', ''));
 	}
 
-	public static function fromArray(array $settings): self
+	public static function fromArray(array $settings) : self
 	{
 		$object = new static;
 		foreach ($settings as $key => $value) {
@@ -59,8 +59,8 @@ class SSLContext implements \JsonSerializable
 		return $object;
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		$aResult = \get_object_vars($this);
 //		$aResult['@Object'] = 'Object/SSLContext';
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Settings.php b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Settings.php
index 9918decf3..7bd769272 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Settings.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Settings.php
@@ -23,7 +23,7 @@ class Settings extends \MailSo\Net\ConnectSettings
 
 	public bool $authLiteral = true;
 
-	public static function fromArray(array $aSettings): self
+	public static function fromArray(array $aSettings) : self
 	{
 		$object = parent::fromArray($aSettings);
 		$object->enabled = !empty($aSettings['enabled']);
@@ -31,8 +31,8 @@ class Settings extends \MailSo\Net\ConnectSettings
 		return $object;
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		return \array_merge(
 			parent::jsonSerialize(),
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Settings.php b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Settings.php
index fa7fc869b..de25b99cd 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Settings.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Settings.php
@@ -33,11 +33,11 @@ class Settings extends \MailSo\Net\ConnectSettings
 	public function __construct()
 	{
 		parent::__construct();
-		$oConfig = \RainLoop\Api::Config();
+		$oConfig = \RainLoop\API::Config();
 		$this->viewErrors = !!$oConfig->Get('labs', 'smtp_show_server_errors', false);
 	}
 
-	public static function fromArray(array $aSettings): self
+	public static function fromArray(array $aSettings) : self
 	{
 		$object = parent::fromArray($aSettings);
 		$object->useAuth = !empty($aSettings['useAuth']);
@@ -48,8 +48,8 @@ class Settings extends \MailSo\Net\ConnectSettings
 		return $object;
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		return \array_merge(
 			parent::jsonSerialize(),
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 4ca6cf8e2..515839fc1 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
@@ -203,8 +203,7 @@ class SmtpClient extends \MailSo\Net\NetClient
 					$SASL->verify($sResult);
 					// Now end the authentication
 					$sRequest = '';
-					$this->sendRaw($sRequest, true, '');
-					$this->validateResponse(235, '');
+					$this->sendRequestWithCheck($sRequest, 235);
 				} else switch ($type) {
 				// RFC 4616
 				case 'PLAIN':
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 0e39503f9..e1f93e00b 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -167,7 +167,10 @@ class Actions
 		return $this->oConfig;
 	}
 
-	protected function fabrica(string $sName, ?Model\Account $oAccount = null): mixed
+	/**
+	 * @return mixed
+	 */
+	protected function fabrica(string $sName, ?Model\Account $oAccount = null)
 	{
 		$mResult = null;
 		$this->oPlugins->RunHook('main.fabrica', array($sName, &$mResult), false);
@@ -502,7 +505,7 @@ class Actions
 		return $this->oPlugins;
 	}
 
-	public function LoggerAuthHelper(?Model\Account $oAccount, string $sLogin = '', bool $admin = false): void
+	protected function LoggerAuthHelper(?Model\Account $oAccount, string $sLogin = '', bool $admin = false): void
 	{
 		if ($sLogin) {
 			$sHost = $admin ? $this->Http()->GetHost(true, true) : \MailSo\Base\Utils::getEmailAddressDomain($sLogin);
@@ -588,7 +591,6 @@ class Actions
 						'ListInlineAttachments' => false,
 						'CollapseBlockquotes' => $oConfig->Get('defaults', 'collapse_blockquotes', true),
 						'MaxBlockquotesLevel' => 0,
-						'minFontSize' => 5,
 						'simpleAttachmentsList' => false,
 						'listGrouped' => $oConfig->Get('defaults', 'mail_list_grouped', false),
 						'MessagesPerPage' => \max(10, \intval($oConfig->Get('webmail', 'messages_per_page', 25)) ?: 25),
@@ -685,7 +687,6 @@ class Actions
 					$aResult['ListInlineAttachments'] = (bool)$oSettings->GetConf('ListInlineAttachments', $aResult['ListInlineAttachments']);
 					$aResult['CollapseBlockquotes'] = (bool)$oSettings->GetConf('CollapseBlockquotes', $aResult['CollapseBlockquotes']);
 					$aResult['MaxBlockquotesLevel'] = (int)$oSettings->GetConf('MaxBlockquotesLevel', $aResult['MaxBlockquotesLevel']);
-					$aResult['minFontSize'] = (int)$oSettings->GetConf('minFontSize', $aResult['minFontSize']);
 					$aResult['simpleAttachmentsList'] = (bool)$oSettings->GetConf('simpleAttachmentsList', $aResult['simpleAttachmentsList']);
 					$aResult['listGrouped'] = (bool)$oSettings->GetConf('listGrouped', $aResult['listGrouped']);
 					$aResult['ContactsAutosave'] = (bool)$oSettings->GetConf('ContactsAutosave', $aResult['ContactsAutosave']);
@@ -955,7 +956,12 @@ class Actions
 		return $this;
 	}
 
-	public function GetActionParam(string $sKey, mixed $mDefault = null): mixed
+	/**
+	 * @param mixed $mDefault = null
+	 *
+	 * @return mixed
+	 */
+	public function GetActionParam(string $sKey, $mDefault = null)
 	{
 		return isset($this->aCurrentActionParams[$sKey]) ?
 			$this->aCurrentActionParams[$sKey] : $mDefault;
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 4e78236e9..2a4e40bb0 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
@@ -210,7 +210,6 @@ trait Accounts
 			'mainEmail' => \RainLoop\Api::Actions()->getMainAccountFromToken()->Email(),
 			'contactsAllowed' => $this->AddressBookProvider($oAccount)->IsActive(),
 			'HideUnsubscribed' => false,
-			'defaultSort' => '',
 			'useThreads' => (bool) $oConfig->Get('defaults', 'mail_use_threads', false),
 			'threadAlgorithm' => '',
 			'ReplySameFolder' => (bool) $oConfig->Get('defaults', 'mail_reply_same_folder', false),
@@ -227,7 +226,6 @@ trait Accounts
 			$aResult['TrashFolder'] = (string) $oSettingsLocal->GetConf('TrashFolder', '');
 			$aResult['ArchiveFolder'] = (string) $oSettingsLocal->GetConf('ArchiveFolder', '');
 			$aResult['HideUnsubscribed'] = (bool) $oSettingsLocal->GetConf('HideUnsubscribed', $aResult['HideUnsubscribed']);
-			$aResult['defaultSort'] = (string) $oSettingsLocal->GetConf('defaultSort', $aResult['defaultSort']);
 			$aResult['useThreads'] = (bool) $oSettingsLocal->GetConf('UseThreads', $aResult['useThreads']);
 			$aResult['threadAlgorithm'] = (string) $oSettingsLocal->GetConf('threadAlgorithm', $aResult['threadAlgorithm']);
 			$aResult['ReplySameFolder'] = (bool) $oSettingsLocal->GetConf('ReplySameFolder', $aResult['ReplySameFolder']);
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
index c2f4db681..970703a77 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
@@ -14,15 +14,6 @@ trait Admin
 	public function IsAdminLoggined(bool $bThrowExceptionOnFalse = true) : bool
 	{
 		if ($this->Config()->Get('security', 'allow_admin_panel', true)) {
-			// [PATCH ronzz.org] OIDC bridge: nginx auth_request (webmail-admin.ronzz.org)
-			// sets X-NC-Admin after validating the Nextcloud session. Honored only on the
-			// dedicated admin host (admin_panel.host); the header is stripped/overridden
-			// at nginx for any other path.
-			if (!empty($_SERVER['HTTP_X_NC_ADMIN'])
-				&& \strtolower((string) $this->Config()->Get('admin_panel', 'host', '')) === \strtolower($this->Http()->GetHost()))
-			{
-				return true;
-			}
 			$sAdminKey = $this->getAdminAuthKey();
 			if ($sAdminKey && $this->Cacher(null, true)->Get(KeyPathHelper::SessionAdminKey($sAdminKey))) {
 				return true;
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 bb037054b..e8579308f 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
@@ -71,8 +71,7 @@ trait AdminDomains
 		return $this->DefaultResponse(array(
 			'email' => $sEmail,
 			'login' => $sCredentials['imapUser'],
-			'name' => $sCredentials['domain'] ? $sCredentials['domain']->Name() : null,
-//			'domain' => $sCredentials['domain'],
+			'domain' => $sCredentials['domain'],
 			'whitelist' => $sCredentials['domain'] ? $sCredentials['domain']->ValidateWhiteList($sEmail) : null
 		));
 	}
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 3e6dd5a07..5d8a4c291 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
@@ -3,11 +3,13 @@
 namespace RainLoop\Actions;
 
 use RainLoop\Enumerations\Capa;
-use RainLoop\Exceptions\ClientException;
 
 trait Contacts
 {
-	protected ?\RainLoop\Providers\AddressBook $oAddressBookProvider = null;
+	/**
+	 * @var \RainLoop\Providers\AddressBook
+	 */
+	protected $oAddressBookProvider = null;
 
 	public function AddressBookProvider(?\RainLoop\Model\Account $oAccount = null): \RainLoop\Providers\AddressBook
 	{
@@ -59,66 +61,18 @@ trait Contacts
 		return $this->DefaultResponse($bResult);
 	}
 
-	public function DoTestContactsSyncData() : array
-	{
-		if (!$this->GetCapa(Capa::CONTACTS)) {
-			throw new ClientException(\RainLoop\Notifications::ContactsSyncError, null, 'Disallowed');
-		}
-
-		$oAccount = $this->getAccountFromToken();
-
-		$sPassword = $this->GetActionParam('Password', '');
-		if (static::APP_DUMMY === $sPassword) {
-			$mData = $this->getContactsSyncData($oAccount);
-			$sPassword = isset($mData['Password']) ? $mData['Password'] : '';
-		}
-		$sPasswordHMAC = null;
-		if ($sPassword) {
-			$oMainAccount = $this->getMainAccountFromToken();
-			$sPassword = \SnappyMail\Crypt::EncryptToJSON($sPassword, $oMainAccount->CryptKey());
-			if ($sPassword) {
-				$sPasswordHMAC = \hash_hmac('sha1', $sPassword, $oMainAccount->CryptKey());
-			}
-		}
-
-		$oDriver = $this->fabrica('address-book', $oAccount);
-		if (!$oDriver) {
-			throw new ClientException(\RainLoop\Notifications::ContactsSyncError, null, 'No driver');
-		}
-		$oDriver->SetEmail($this->GetMainEmail($oAccount));
-		$oDriver->setDAVClientConfig([
-			'Mode' => 2, // readonly
-			'User' => $this->GetActionParam('User', ''),
-			'Password' => $sPassword,
-			'Url' => $this->GetActionParam('Url', ''),
-			'PasswordHMAC' => $sPasswordHMAC
-		]);
-
-		$oClient = $oDriver->getDavClient();
-		if (!$oClient) {
-			throw new ClientException(\RainLoop\Notifications::ContactsSyncError, null, 'No client');
-		}
-		$oClient->propFind($oClient->urlPath, [
-			'{DAV:}getlastmodified',
-			'{DAV:}resourcetype',
-			'{DAV:}getetag'
-		], 1);
-
-		return $this->TrueResponse();
-	}
-
 	public function DoContactsSync() : array
 	{
 		$oAccount = $this->getAccountFromToken();
 		$oAddressBookProvider = $this->AddressBookProvider($oAccount);
 		if (!$oAddressBookProvider) {
-			throw new ClientException(\RainLoop\Notifications::ContactsSyncError, null, 'No AddressBookProvider');
+			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::ContactsSyncError, null, 'No AddressBookProvider');
 		}
 		\ignore_user_abort(true);
 		\SnappyMail\HTTP\Stream::start(/*$binary = false*/);
 		\SnappyMail\HTTP\Stream::JSON(['messsage'=>'start']);
 		if (!$oAddressBookProvider->Sync()) {
-			throw new ClientException(\RainLoop\Notifications::ContactsSyncError, null, 'AddressBookProvider->Sync() failed');
+			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::ContactsSyncError, null, 'AddressBookProvider->Sync() failed');
 		}
 		return $this->TrueResponse();
 	}
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 1153e9bee..8b04bbdad 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
@@ -1255,7 +1255,6 @@ trait Messages
 			$oPart->SubParts->append($oSignaturePart);
 		} else {
 			$sCertificate = $this->GetActionParam('signCertificate', '');
-			$sCertificateChain = $this->GetActionParam('signCertificateChain', '');
 			$sPrivateKey = $this->GetActionParam('signPrivateKey', '');
 			if ('S/MIME' === $this->GetActionParam('sign', '')) {
 				$sID = $this->GetActionParam('identityID', '');
@@ -1264,7 +1263,6 @@ trait Messages
 					 && ($oIdentity->Id() === $sID || $oIdentity->Email() === $oFrom->GetEmail())
 					) {
 						$sCertificate = $oIdentity->smimeCertificate;
-						$sCertificateChain = $oIdentity->smimeCertificateChain;
 						$sPrivateKey = $oIdentity->smimeKey;
 						break;
 					}
@@ -1305,7 +1303,6 @@ trait Messages
 
 				$SMIME = $this->SMIME();
 				$SMIME->setCertificate($sCertificate);
-				$SMIME->setCertificateChain($sCertificateChain);
 				$SMIME->setPrivateKey($sPrivateKey, $oPassphrase);
 				$sSignature = $SMIME->sign($tmp, $detached);
 
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 a87b6d1da..939610695 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
@@ -287,14 +287,6 @@ trait Pgp
 		return $this->DefaultResponse(($key && $keyId && Backup::PGPKey($key, $keyId)));
 	}
 
-	public function DoDeletePGPKey(): array
-	{
-		$key = $this->GetActionParam('key', '');
-		$keyId = $this->GetActionParam('keyId', '');
-		$success = $key && Backup::PGPKey($key, $keyId, true);
-		return $this->DefaultResponse($success, ['code' => (int)!$success]);
-	}
-
 	/**
 	 * https://datatracker.ietf.org/doc/html/rfc3156#section-5
 	 */
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 8a2414387..84310f213 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
@@ -7,7 +7,10 @@ use RainLoop\Utils;
 
 trait Response
 {
-	public function DefaultResponse(mixed $mResult, array $aAdditionalParams = array(), string $sActionName = ''): array
+	/**
+	 * @param mixed $mResult
+	 */
+	public function DefaultResponse($mResult, array $aAdditionalParams = array(), string $sActionName = '') : array
 	{
 		if (false === $mResult) {
 			if (!isset($aAdditionalParams['code'])) {
@@ -25,12 +28,12 @@ trait Response
 		), $aAdditionalParams);
 	}
 
-	public function TrueResponse(array $aAdditionalParams = array()): array
+	public function TrueResponse(array $aAdditionalParams = array()) : array
 	{
 		return $this->DefaultResponse(true, $aAdditionalParams);
 	}
 
-	public function FalseResponse(int $iErrorCode = 0, string $sErrorMessage = '', string $sAdditionalErrorMessage = ''): array
+	public function FalseResponse(int $iErrorCode = 0, string $sErrorMessage = '', string $sAdditionalErrorMessage = '') : array
 	{
 		return $this->DefaultResponse(false, [
 			'code' => $iErrorCode,
@@ -39,7 +42,7 @@ trait Response
 		]);
 	}
 
-	public function ExceptionResponse(\Throwable $oException): array
+	public function ExceptionResponse(\Throwable $oException) : array
 	{
 		$iErrorCode = Notifications::UnknownError;
 		$sErrorMessage = $oException->getMessage();
@@ -66,8 +69,13 @@ trait Response
 		]);
 	}
 
+	/**
+	 * @param mixed $mResponse
+	 *
+	 * @return mixed
+	 */
 	private $aCheckableFolder = null;
-	private function responseObject(mixed $mResponse, string $sParent = ''): mixed
+	private function responseObject($mResponse, string $sParent = '')
 	{
 		if (!($mResponse instanceof \JsonSerializable)) {
 			if (\is_object($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 d5ec47272..9d70fbbbd 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
@@ -3,7 +3,6 @@
 namespace RainLoop\Actions;
 
 use RainLoop\Enumerations\Capa;
-use SnappyMail\Nextcloud;
 
 trait Themes
 {
@@ -72,8 +71,8 @@ trait Themes
 		}
 
 		if (\class_exists('OC', false)) {
-			$sDir = Nextcloud::themesDir();
-			if ($sDir && ($rDirH = \opendir($sDir))) {
+			$sDir = \OC::$SERVERROOT . '/themes'; // custom user themes
+			if (\is_dir($sDir) && ($rDirH = \opendir($sDir))) {
 				while (($sFile = \readdir($rDirH)) !== false) {
 					if ('.' !== $sFile[0] && \is_dir("{$sDir}/{$sFile}") && \file_exists("{$sDir}/{$sFile}/snappymail/style.css")) {
 						$aCache[] = $sFile . '@nextcloud';
@@ -114,8 +113,8 @@ trait Themes
 		$bLess = false;
 
 		if ('@nextcloud' === \substr($sTheme, -10)) {
-			$sBase = Nextcloud::webRoot() . '/';
-			$sThemeCSSFile = Nextcloud::themesDir() . '/' . \str_replace('@nextcloud', '/snappymail/style.css', $sTheme);
+			$sBase = \OC::$WEBROOT . '/';
+			$sThemeCSSFile = \OC::$SERVERROOT . '/themes/' . \str_replace('@nextcloud', '/snappymail/style.css', $sTheme);
 		} else {
 			$bCustomTheme = '@custom' === \substr($sTheme, -7);
 			if ($bCustomTheme) {
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 a60783edd..014f403e7 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
@@ -183,7 +183,6 @@ trait User
 		$this->setSettingsFromParams($oSettings, 'ListInlineAttachments', 'bool');
 		$this->setSettingsFromParams($oSettings, 'CollapseBlockquotes', 'bool');
 		$this->setSettingsFromParams($oSettings, 'MaxBlockquotesLevel', 'int');
-		$this->setSettingsFromParams($oSettings, 'minFontSize', 'int');
 		$this->setSettingsFromParams($oSettings, 'simpleAttachmentsList', 'bool');
 		$this->setSettingsFromParams($oSettings, 'listGrouped', 'bool');
 		$this->setSettingsFromParams($oSettings, 'ContactsAutosave', 'bool');
@@ -205,7 +204,6 @@ trait User
 		$this->setSettingsFromParams($oSettings, 'Resizer5Width', 'int');
 		$this->setSettingsFromParams($oSettings, 'Resizer5Height', 'int');
 
-		$this->setSettingsFromParams($oSettingsLocal, 'defaultSort', 'string');
 		$this->setSettingsFromParams($oSettingsLocal, 'UseThreads', 'bool');
 		$this->setSettingsFromParams($oSettingsLocal, 'threadAlgorithm', 'string');
 		$this->setSettingsFromParams($oSettingsLocal, 'ReplySameFolder', 'bool');
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 685821507..f73d0017e 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
@@ -42,12 +42,6 @@ abstract class Api
 		$CSP->report = $oConfig->Get('security', 'csp_report', false);
 		$CSP->report_only = $oConfig->Get('debug', 'enable', false); // || SNAPPYMAIL_DEV
 
-		// Allow favicon host, if present
-		$parsedFaviconUrl = parse_url($oConfig->Get('webmail', 'favicon_url', ''));
-		if (is_array($parsedFaviconUrl) && array_key_exists('host', $parsedFaviconUrl)) {
-			$CSP->add('img-src', $parsedFaviconUrl['host']);
-		}
-
 		// Allow https: due to remote images in e-mails or use proxy
 		if (!$oConfig->Get('labs', 'use_local_proxy_for_external_images', '')) {
 			$CSP->add('img-src', 'https:');
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 6d1e3db30..2a87abf36 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
@@ -33,47 +33,56 @@ abstract class AbstractConfig implements \ArrayAccess, \JsonSerializable
 			\MailSo\Base\Utils::FunctionsCallable(array('apcu_fetch', 'apcu_store'));
 	}
 
-	public function offsetExists(mixed $offset): bool
+	public function offsetExists($offset) : bool
 	{
 	}
 
-	public function offsetGet(mixed $offset): mixed
+	#[\ReturnTypeWillChange]
+	public function offsetGet($offset)
 	{
 		$offset = \explode('/', $offset, 2);
 		$this->Get($offset[0], $offset[1]);
 	}
 
-	public function offsetSet(mixed $offset, mixed $value): void
+	public function offsetSet($offset, $value) : void
 	{
 		$offset = \explode('/', $offset, 2);
 		$this->Set($offset[0], $offset[1], $value);
 	}
 
-	public function offsetUnset(mixed $offset): void
+	public function offsetUnset($offset) : void
 	{
 	}
 
-	protected abstract function defaultValues(): array;
+	protected abstract function defaultValues() : array;
 
-	public function IsInited(): bool
+	public function IsInited() : bool
 	{
 		return \is_array($this->aData) && \count($this->aData);
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		return $this->aData;;
 	}
 
-	public function Get(string $sSection, string $sName, mixed $mDefault = null): mixed
+	/**
+	 * @param mixed $mDefault = null
+	 *
+	 * @return mixed
+	 */
+	public function Get(string $sSection, string $sName, $mDefault = null)
 	{
 		return isset($this->aData[$sSection][$sName][0])
 			? $this->aData[$sSection][$sName][0]
 			: $mDefault;
 	}
 
-	public function Set(string $sSectionKey, string $sParamKey, mixed $mParamValue): void
+	/**
+	 * @param mixed $mParamValue
+	 */
+	public function Set(string $sSectionKey, string $sParamKey, $mParamValue) : void
 	{
 		if (isset($this->aData[$sSectionKey][$sParamKey][0])) {
 			if (!\is_scalar($mParamValue)) {
@@ -100,7 +109,7 @@ abstract class AbstractConfig implements \ArrayAccess, \JsonSerializable
 		}
 	}
 
-	public function getDecrypted(string $sSection, string $sName, mixed $mDefault = null)
+	public function getDecrypted(string $sSection, string $sName, $mDefault = null)
 	{
 		// $salt = \basename($this->sFile) not possible due to RainLoop\Plugins\Property
 		if (!empty($this->aData[$sSection][$sName][0])) try {
@@ -110,19 +119,19 @@ abstract class AbstractConfig implements \ArrayAccess, \JsonSerializable
 		return $mDefault;
 	}
 
-	public function setEncrypted(string $sSectionKey, string $sParamKey, mixed $mParamValue): void
+	public function setEncrypted(string $sSectionKey, string $sParamKey, $mParamValue) : void
 	{
 		// $salt = \basename($this->sFile) not possible due to RainLoop\Plugins\Property
 		$mParamValue = \SnappyMail\Crypt::EncryptToJSON($mParamValue, \APP_SALT);
 		$this->Set($sSectionKey, $sParamKey, $mParamValue);
 	}
 
-	private function cacheKey(): string
+	private function cacheKey() : string
 	{
 		return 'config:'.\sha1($this->sFile).':'.\sha1($this->sAdditionalFile).':';
 	}
 
-	private function loadDataFromCache(): bool
+	private function loadDataFromCache() : bool
 	{
 		if ($this->bUseApcCache) {
 			$iMTime = \filemtime($this->sFile);
@@ -148,7 +157,7 @@ abstract class AbstractConfig implements \ArrayAccess, \JsonSerializable
 		return false;
 	}
 
-	private function storeDataToCache(): bool
+	private function storeDataToCache() : bool
 	{
 		if ($this->bUseApcCache) {
 			$iMTime = \filemtime($this->sFile);
@@ -170,7 +179,7 @@ abstract class AbstractConfig implements \ArrayAccess, \JsonSerializable
 		return false;
 	}
 
-	private function clearCache(): bool
+	private function clearCache() : bool
 	{
 		if ($this->bUseApcCache) {
 			$sKey = $this->cacheKey();
@@ -184,7 +193,7 @@ abstract class AbstractConfig implements \ArrayAccess, \JsonSerializable
 		return false;
 	}
 
-	public function Load(): bool
+	public function Load() : bool
 	{
 		$sFile = $this->sFile;
 		if (!\file_exists($sFile) && \str_ends_with($sFile, '.json')) {
@@ -239,7 +248,7 @@ abstract class AbstractConfig implements \ArrayAccess, \JsonSerializable
 		return $this->Save();
 	}
 
-	public function Save(): bool
+	public function Save() : bool
 	{
 		if (\file_exists($this->sFile) && !\is_writable($this->sFile)) {
 			return false;
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 fe8c0082a..0621cff84 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
@@ -14,7 +14,7 @@ class Application extends \RainLoop\Config\AbstractConfig
 			APP_CONFIGURATION_NAME);
 	}
 
-	public function Load(): bool
+	public function Load() : bool
 	{
 		$bResult = parent::Load();
 
@@ -64,7 +64,12 @@ class Application extends \RainLoop\Config\AbstractConfig
 		return $bResult;
 	}
 
-	public function Get(string $sSection, string $sName, mixed $mDefault = null): mixed
+	/**
+	 * @param mixed $mDefault = null
+	 *
+	 * @return mixed
+	 */
+	public function Get(string $sSection, string $sName, $mDefault = null)
 	{
 		$mResult = parent::Get($sSection, $sName, $mDefault);
 		if ($this->aReplaceEnv && \is_string($mResult)) {
@@ -87,7 +92,7 @@ class Application extends \RainLoop\Config\AbstractConfig
 		return $mResult;
 	}
 
-	public function Set(string $sSectionKey, string $sParamKey, $mParamValue): void
+	public function Set(string $sSectionKey, string $sParamKey, $mParamValue) : void
 	{
 		// Workarounds for the changed application structure
 		if ('webmail' === $sSectionKey) {
@@ -138,17 +143,17 @@ class Application extends \RainLoop\Config\AbstractConfig
 		parent::Set($sSectionKey, $sParamKey, $mParamValue);
 	}
 
-	public function SetPassword(\SnappyMail\SensitiveString $oPassword): void
+	public function SetPassword(\SnappyMail\SensitiveString $oPassword) : void
 	{
 		$this->Set('security', 'admin_password', \password_hash($oPassword, PASSWORD_DEFAULT));
 	}
 
-	public function ValidatePassword(\SnappyMail\SensitiveString $oPassword): bool
+	public function ValidatePassword(\SnappyMail\SensitiveString $oPassword) : bool
 	{
 		return \strlen($oPassword) && \password_verify($oPassword, $this->Get('security', 'admin_password', ''));
 	}
 
-	public function Save(): bool
+	public function Save() : bool
 	{
 		$this->Set('version', 'current', APP_VERSION);
 		$this->Set('version', 'saved', \gmdate('r'));
@@ -156,7 +161,7 @@ class Application extends \RainLoop\Config\AbstractConfig
 		return parent::Save();
 	}
 
-	protected function defaultValues(): array
+	protected function defaultValues() : array
 	{
 		$value = \ini_get('upload_max_filesize');
 		$upload_max_filesize = \intval($value);
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Plugin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Plugin.php
index 67f87f841..59f5d845b 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Plugin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Plugin.php
@@ -31,13 +31,13 @@ class Plugin extends \RainLoop\Config\AbstractConfig
 		parent::__construct('plugin-'.$sPluginName.'.json');
 	}
 
-	protected function defaultValues(): array
+	protected function defaultValues() : array
 	{
 		return $this->aMap;
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		$aData = [];
 		foreach (parent::jsonSerialize() as $sSectionKey => $aSectionValue) {
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 792cf6030..d3dcd9154 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
@@ -23,38 +23,38 @@ abstract class Account implements \JsonSerializable
 
 	private ?Domain $oDomain = null;
 
-	public function Email(): string
+	public function Email() : string
 	{
 		return $this->sEmail;
 	}
 
-	public function Name(): string
+	public function Name() : string
 	{
 		return $this->sName;
 	}
 
-	public function ImapUser(): string
+	public function ImapUser() : string
 	{
 		return $this->sImapUser;
 	}
 
-	public function ImapPass(): string
+	public function ImapPass() : string
 	{
 		return $this->oImapPass ? $this->oImapPass->getValue() : '';
 	}
 
-	public function SmtpUser(): string
+	public function SmtpUser() : string
 	{
 		return $this->sSmtpUser ?: ($this->oDomain ? $this->oDomain->SmtpSettings()->fixUsername($this->sEmail) : '');
 //		return $this->sSmtpUser ?: $this->sEmail ?: $this->sImapUser;
 	}
 
-	public function Domain(): ?Domain
+	public function Domain() : ?Domain
 	{
 		return $this->oDomain;
 	}
 
-	public function Hash(): string
+	public function Hash() : string
 	{
 		return \sha1(\implode(APP_SALT, [
 			$this->sEmail,
@@ -64,28 +64,28 @@ abstract class Account implements \JsonSerializable
 		]));
 	}
 
-	public function setImapUser(string $sImapUser): void
+	public function setImapUser(string $sImapUser) : void
 	{
 		$this->sImapUser = $sImapUser;
 	}
 
-	public function setImapPass(SensitiveString $oPassword): void
+	public function setImapPass(SensitiveString $oPassword) : void
 	{
 		$this->oImapPass = $oPassword;
 	}
 
-	public function setSmtpUser(string $sSmtpUser): void
+	public function setSmtpUser(string $sSmtpUser) : void
 	{
 		$this->sSmtpUser = $sSmtpUser;
 	}
 
-	public function setSmtpPass(SensitiveString $oPassword): void
+	public function setSmtpPass(SensitiveString $oPassword) : void
 	{
 		$this->oSmtpPass = $oPassword;
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		$result = [
 			'email' => $this->sEmail,
@@ -122,7 +122,7 @@ abstract class Account implements \JsonSerializable
 	/**
 	 * Converts old numeric array to new associative array
 	 */
-	public static function convertArray(array $aAccount): array
+	public static function convertArray(array $aAccount) : array
 	{
 		if (isset($aAccount['email'])) {
 			return $aAccount;
@@ -193,7 +193,7 @@ abstract class Account implements \JsonSerializable
 		return $oAccount;
 	}
 
-	public function ImapConnectAndLogin(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Imap\ImapClient $oImapClient, \RainLoop\Config\Application $oConfig): bool
+	public function ImapConnectAndLogin(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Imap\ImapClient $oImapClient, \RainLoop\Config\Application $oConfig) : bool
 	{
 		$oSettings = $this->Domain()->ImapSettings();
 		$oSettings->timeout = \max($oSettings->timeout, (int) $oConfig->Get('imap', 'timeout', $oSettings->timeout));
@@ -218,7 +218,7 @@ abstract class Account implements \JsonSerializable
 		return $this->netClientLogin($oImapClient, $oPlugins);
 	}
 
-	public function SmtpConnectAndLogin(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Smtp\SmtpClient $oSmtpClient): bool
+	public function SmtpConnectAndLogin(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Smtp\SmtpClient $oSmtpClient) : bool
 	{
 		$oSettings = $this->Domain()->SmtpSettings();
 		$oSettings->username = $this->SmtpUser();
@@ -257,7 +257,7 @@ abstract class Account implements \JsonSerializable
 		return $this->netClientLogin($oSieveClient, $oPlugins);
 	}
 
-	private function netClientLogin(\MailSo\Net\NetClient $oClient, \RainLoop\Plugins\Manager $oPlugins): bool
+	private function netClientLogin(\MailSo\Net\NetClient $oClient, \RainLoop\Plugins\Manager $oPlugins) : bool
 	{
 /*
 		$encrypted = !empty(\stream_get_meta_data($oClient->ConnectionResource())['crypto']);
@@ -280,7 +280,7 @@ abstract class Account implements \JsonSerializable
 
 /*
 	// Stores settings in AdditionalAccount else MainAccount
-	public function settingsLocal(): \RainLoop\Settings
+	public function settingsLocal() : \RainLoop\Settings
 	{
 		return \RainLoop\Api::Actions()->SettingsProvider(true)->Load($this);
 	}
@@ -289,19 +289,19 @@ abstract class Account implements \JsonSerializable
 	/**
 	 * @deprecated since v2.36.1
 	 */
-	public function IncLogin(): string
+	public function IncLogin() : string
 	{
 		return $this->ImapUser();
 	}
-	public function IncPassword(): string
+	public function IncPassword() : string
 	{
 		return $this->ImapPass();
 	}
-	public function OutLogin(): string
+	public function OutLogin() : string
 	{
 		return $this->SmtpUser();
 	}
-	public function SetPassword(SensitiveString $oPassword): void
+	public function SetPassword(SensitiveString $oPassword) : void
 	{
 		$this->oImapPass = $oPassword;
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php
index c7c55a7d4..b9c7d3c86 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php
@@ -39,7 +39,7 @@ class Domain implements \JsonSerializable
 		$this->whiteList = \trim($this->whiteList);
 	}
 
-	public function Name(): string
+	public function Name() : string
 	{
 		return $this->Name;
 	}
@@ -47,7 +47,7 @@ class Domain implements \JsonSerializable
 	/**
 	 * @deprecated
 	 */
-	public function IncHost(): string
+	public function IncHost() : string
 	{
 		\trigger_error('Deprecated function called.', \E_USER_DEPRECATED);
 		return $this->IMAP->host;
@@ -56,7 +56,7 @@ class Domain implements \JsonSerializable
 	/**
 	 * @deprecated
 	 */
-	public function IncPort(): int
+	public function IncPort() : int
 	{
 		\trigger_error('Deprecated function called.', \E_USER_DEPRECATED);
 		return $this->IMAP->port;
@@ -65,7 +65,7 @@ class Domain implements \JsonSerializable
 	/**
 	 * @deprecated
 	 */
-	public function IncShortLogin(): bool
+	public function IncShortLogin() : bool
 	{
 		\trigger_error('Deprecated function called.', \E_USER_DEPRECATED);
 		return $this->IMAP->shortLogin;
@@ -74,7 +74,7 @@ class Domain implements \JsonSerializable
 	/**
 	 * @deprecated
 	 */
-	public function UseSieve(): bool
+	public function UseSieve() : bool
 	{
 		\trigger_error('Deprecated function called.', \E_USER_DEPRECATED);
 		return $this->Sieve->enabled;
@@ -83,7 +83,7 @@ class Domain implements \JsonSerializable
 	/**
 	 * @deprecated
 	 */
-	public function OutHost(): string
+	public function OutHost() : string
 	{
 		\trigger_error('Deprecated function called.', \E_USER_DEPRECATED);
 		return $this->SMTP->host;
@@ -92,19 +92,19 @@ class Domain implements \JsonSerializable
 	/**
 	 * @deprecated
 	 */
-	public function OutPort(): int
+	public function OutPort() : int
 	{
 		\trigger_error('Deprecated function called.', \E_USER_DEPRECATED);
 		return $this->SMTP->port;
 	}
 
-	public function SetAliasName(string $sAliasName): void
+	public function SetAliasName(string $sAliasName) : void
 	{
 //		$this->aliasName = \SnappyMail\IDN::toAscii($sAliasName);
 		$this->aliasName = \strtolower(\idn_to_ascii($sAliasName));
 	}
 
-	public function ValidateWhiteList(string $sEmail): bool
+	public function ValidateWhiteList(string $sEmail) : bool
 	{
 		$sW = $this->whiteList;
 		if (!$sW) {
@@ -125,17 +125,17 @@ class Domain implements \JsonSerializable
 		return false;
 	}
 
-	public function ImapSettings(): \MailSo\Imap\Settings
+	public function ImapSettings() : \MailSo\Imap\Settings
 	{
 		return $this->IMAP;
 	}
 
-	public function SieveSettings(): \MailSo\Sieve\Settings
+	public function SieveSettings() : \MailSo\Sieve\Settings
 	{
 		return $this->Sieve;
 	}
 
-	public function SmtpSettings(): \MailSo\Smtp\Settings
+	public function SmtpSettings() : \MailSo\Smtp\Settings
 	{
 		return $this->SMTP;
 	}
@@ -143,7 +143,7 @@ class Domain implements \JsonSerializable
 	/**
 	 * See jsonSerialize() for valid values
 	 */
-	public static function fromArray(string $sName, array $aDomain): ?self
+	public static function fromArray(string $sName, array $aDomain) : ?self
 	{
 		if (!\strlen($sName)) {
 			return null;
@@ -186,7 +186,7 @@ class Domain implements \JsonSerializable
 	/**
 	 * Used by old RainLoop ToIniString()
 	 */
-	public static function fromIniArray(string $sName, array $aDomain): ?self
+	public static function fromIniArray(string $sName, array $aDomain) : ?self
 	{
 		$oDomain = null;
 		if (\strlen($sName) && \strlen($aDomain['imap_host'])) {
@@ -220,7 +220,7 @@ class Domain implements \JsonSerializable
 	/**
 	 * Use by old RainLoop fromIniArray()
 	 */
-	public static function StrConnectionSecurityTypeToCons(string $sType): int
+	public static function StrConnectionSecurityTypeToCons(string $sType) : int
 	{
 		switch (\strtoupper($sType))
 		{
@@ -232,8 +232,8 @@ class Domain implements \JsonSerializable
 		return ConnectionSecurityType::NONE;
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		$aResult = array(
 //			'@Object' => 'Object/Domain',
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 0a51d94ae..f31e77a9c 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
@@ -31,7 +31,6 @@ class Identity implements \JsonSerializable
 
 	private ?SensitiveString $smimeKey = null;
 	private string $smimeCertificate = '';
-	private string $smimeCertificateChain = '';
 
 	function __construct(string $sId = '', string $sEmail = '')
 	{
@@ -49,7 +48,7 @@ class Identity implements \JsonSerializable
 		}
 	}
 
-	function toMime(): \MailSo\Mime\Email
+	function toMime() : \MailSo\Mime\Email
 	{
 		return new \MailSo\Mime\Email($this->sEmail, $this->sName);
 	}
@@ -115,7 +114,6 @@ class Identity implements \JsonSerializable
 			$this->pgpSign = !empty($aData['pgpSign']);
 			$this->smimeKey = new SensitiveString(isset($aData['smimeKey']) ? $aData['smimeKey'] : '');
 			$this->smimeCertificate = isset($aData['smimeCertificate']) ? $aData['smimeCertificate'] : '';
-			$this->smimeCertificateChain = isset($aData['smimeCertificateChain']) ? $aData['smimeCertificateChain'] : '';
 			return true;
 		}
 
@@ -138,13 +136,12 @@ class Identity implements \JsonSerializable
 			'pgpEncrypt' => $this->pgpEncrypt,
 			'pgpSign' => $this->pgpSign,
 			'smimeKey' => (string) $this->smimeKey,
-			'smimeCertificate' => $this->smimeCertificate,
-			'smimeCertificateChain' => $this->smimeCertificateChain
+			'smimeCertificate' => $this->smimeCertificate
 		);
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		return array(
 			'@Object' => 'Object/Identity',
@@ -161,7 +158,6 @@ class Identity implements \JsonSerializable
 			'pgpSign' => $this->pgpSign,
 			'smimeKey' => (string) $this->smimeKey,
 			'smimeCertificate' => $this->smimeCertificate,
-			'smimeCertificateChain' => $this->smimeCertificateChain,
 			'exists' => $this->exists
 		);
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Pdo/Base.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Pdo/Base.php
index 631c1c0f2..8de393fe7 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Pdo/Base.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Pdo/Base.php
@@ -19,15 +19,15 @@ abstract class Base
 		return !!\class_exists('PDO');
 	}
 
-	abstract protected function getPdoSettings(): \RainLoop\Pdo\Settings;
+	abstract protected function getPdoSettings() : \RainLoop\Pdo\Settings;
 
-	public function sqliteNoCaseCollationHelper(string $sStr1, string $sStr2): int
+	public function sqliteNoCaseCollationHelper(string $sStr1, string $sStr2) : int
 	{
 		$this->oLogger->WriteDump(array($sStr1, $sStr2));
 		return \strcmp(\mb_strtoupper($sStr1, 'UTF-8'), \mb_strtoupper($sStr2, 'UTF-8'));
 	}
 
-	public static function getAvailableDrivers(): array
+	public static function getAvailableDrivers() : array
 	{
 		return \class_exists('PDO', false)
 			? \array_values(\array_intersect(['mysql', 'pgsql', 'sqlite'], \PDO::getAvailableDrivers()))
@@ -38,7 +38,7 @@ abstract class Base
 	 *
 	 * @throws \Exception
 	 */
-	protected function getPDO(): \PDO
+	protected function getPDO() : \PDO
 	{
 		if ($this->oPDO) {
 			return $this->oPDO;
@@ -100,7 +100,7 @@ abstract class Base
 		return $oPdo;
 	}
 
-	protected function lastInsertId(?string $sTabelName = null, ?string $sColumnName = null): string
+	protected function lastInsertId(?string $sTabelName = null, ?string $sColumnName = null) : string
 	{
 		$mName = null;
 		if ('pgsql' === $this->sDbType && null !== $sTabelName && $sColumnName !== null) {
@@ -110,22 +110,22 @@ abstract class Base
 		return null === $mName ? $this->getPDO()->lastInsertId() : $this->getPDO()->lastInsertId($mName);
 	}
 
-	protected function beginTransaction(): bool
+	protected function beginTransaction() : bool
 	{
 		return $this->getPDO()->beginTransaction();
 	}
 
-	protected function commit(): bool
+	protected function commit() : bool
 	{
 		return $this->getPDO()->commit();
 	}
 
-	protected function rollBack(): bool
+	protected function rollBack() : bool
 	{
 		return $this->getPDO()->rollBack();
 	}
 
-	protected function prepareAndExecute(string $sSql, array $aParams = array(), bool $bMultiplyParams = false, bool $bLogParams = false): ?\PDOStatement
+	protected function prepareAndExecute(string $sSql, array $aParams = array(), bool $bMultiplyParams = false, bool $bLogParams = false) : ?\PDOStatement
 	{
 		if ($this->bExplain && !$bMultiplyParams) {
 			$this->prepareAndExplain($sSql, $aParams);
@@ -180,7 +180,10 @@ abstract class Base
 		}
 	}
 
-	protected function writeLog(mixed $mData): void
+	/**
+	 * @param mixed $mData
+	 */
+	protected function writeLog($mData)
 	{
 		if ($this->oLogger) {
 			if ($mData instanceof \Throwable) {
@@ -193,13 +196,13 @@ abstract class Base
 		}
 	}
 
-	public function quoteValue(string $sValue): string
+	public function quoteValue(string $sValue) : string
 	{
 		$oPdo = $this->getPDO();
 		return $oPdo ? $oPdo->quote((string) $sValue, \PDO::PARAM_STR) : '\'\'';
 	}
 
-	protected function getVersion(string $sName): ?int
+	protected function getVersion(string $sName) : ?int
 	{
 		$oPdo = $this->getPDO();
 		if ($oPdo) {
@@ -221,7 +224,7 @@ abstract class Base
 		return null;
 	}
 
-	protected function setVersion(string $sName, int $iVersion): bool
+	protected function setVersion(string $sName, int $iVersion) : bool
 	{
 		$bResult = false;
 		$oPdo = $this->getPDO();
@@ -280,7 +283,7 @@ abstract class Base
 		return $bResult;
 	}
 
-	protected function dataBaseUpgrade(string $sName, array $aData = array()): bool
+	protected function dataBaseUpgrade(string $sName, array $aData = array()) : bool
 	{
 		$iFromVersion = null;
 		try
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/AbstractPlugin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/AbstractPlugin.php
index 2085fec4b..76ed987a9 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/AbstractPlugin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/AbstractPlugin.php
@@ -39,18 +39,18 @@ abstract class AbstractPlugin
 		$this->sName = static::NAME;
 	}
 
-	public function Name(): string
+	public function Name() : string
 	{
 		return $this->sName;
 	}
 
-	public function Description(): string
+	public function Description() : string
 	{
 		$sFile = $this->Path().'/README';
 		return \is_readable($sFile) ? \file_get_contents($sFile) : static::DESCRIPTION;
 	}
 
-	public function UseLangs(?bool $bLangs = null): bool
+	public function UseLangs(?bool $bLangs = null) : bool
 	{
 		if (null !== $bLangs) {
 			$this->bLangs = $bLangs;
@@ -59,47 +59,47 @@ abstract class AbstractPlugin
 		return $this->bLangs;
 	}
 
-	protected function configMapping(): array
+	protected function configMapping() : array
 	{
 		return array();
 	}
 
-	public function Supported(): string
+	public function Supported() : string
 	{
 		return '';
 	}
 
-	public function Init(): void
+	public function Init() : void
 	{
 
 	}
 
-	public function FilterAppDataPluginSection(bool $bAdmin, bool $bAuth, array &$aConfig): void
+	public function FilterAppDataPluginSection(bool $bAdmin, bool $bAuth, array &$aConfig) : void
 	{
 
 	}
 
-	final public function Hash(): string
+	final public function Hash() : string
 	{
 		return static::class . '@' . static::VERSION;
 	}
 
-	final public function Config(): \RainLoop\Config\Plugin
+	final public function Config() : \RainLoop\Config\Plugin
 	{
 		return $this->oPluginConfig;
 	}
 
-	final public function Manager(): \RainLoop\Plugins\Manager
+	final public function Manager() : \RainLoop\Plugins\Manager
 	{
 		return $this->oPluginManager;
 	}
 
-	final public function Path(): string
+	final public function Path() : string
 	{
 		return $this->sPath;
 	}
 
-	final public function ConfigMap(bool $flatten = false): array
+	final public function ConfigMap(bool $flatten = false) : array
 	{
 		if (null === $this->aConfigMap) {
 			$this->aConfigMap = $this->configMapping();
@@ -126,28 +126,28 @@ abstract class AbstractPlugin
 		return $this->aConfigMap;
 	}
 
-	final public function SetPath(string $sPath): self
+	final public function SetPath(string $sPath) : self
 	{
 		$this->sPath = $sPath;
 
 		return $this;
 	}
 
-	final public function SetName(string $sName): self
+	final public function SetName(string $sName) : self
 	{
 		$this->sName = $sName;
 
 		return $this;
 	}
 
-	final public function SetPluginManager(\RainLoop\Plugins\Manager $oPluginManager): self
+	final public function SetPluginManager(\RainLoop\Plugins\Manager $oPluginManager) : self
 	{
 		$this->oPluginManager = $oPluginManager;
 
 		return $this;
 	}
 
-	final public function SetPluginConfig(\RainLoop\Config\Plugin $oPluginConfig): self
+	final public function SetPluginConfig(\RainLoop\Config\Plugin $oPluginConfig) : self
 	{
 		$this->oPluginConfig = $oPluginConfig;
 		if ($oPluginConfig->IsInited() && !$oPluginConfig->Load()) {
@@ -156,7 +156,7 @@ abstract class AbstractPlugin
 		return $this;
 	}
 
-	final protected function addHook(string $sHookName, string $sFunctionName): self
+	final protected function addHook(string $sHookName, string $sFunctionName) : self
 	{
 		if ($this->oPluginManager) {
 			$this->oPluginManager->AddHook($sHookName, array($this, $sFunctionName));
@@ -165,7 +165,7 @@ abstract class AbstractPlugin
 		return $this;
 	}
 
-	final protected function addCss(string $sFile, bool $bAdminScope = false): self
+	final protected function addCss(string $sFile, bool $bAdminScope = false) : self
 	{
 		if ($this->oPluginManager) {
 			$this->oPluginManager->AddCss($this->sPath.'/'.$sFile, $bAdminScope);
@@ -174,7 +174,7 @@ abstract class AbstractPlugin
 		return $this;
 	}
 
-	final protected function addJs(string $sFile, bool $bAdminScope = false): self
+	final protected function addJs(string $sFile, bool $bAdminScope = false) : self
 	{
 		if ($this->oPluginManager) {
 			$this->oPluginManager->AddJs($this->sPath.'/'.$sFile, $bAdminScope);
@@ -183,7 +183,7 @@ abstract class AbstractPlugin
 		return $this;
 	}
 
-	final protected function addTemplate(string $sFile, bool $bAdminScope = false): self
+	final protected function addTemplate(string $sFile, bool $bAdminScope = false) : self
 	{
 		if ($this->oPluginManager) {
 			$this->oPluginManager->AddTemplate($this->sPath.'/'.$sFile, $bAdminScope);
@@ -192,7 +192,7 @@ abstract class AbstractPlugin
 		return $this;
 	}
 
-	final protected function addPartHook(string $sActionName, string $sFunctionName): self
+	final protected function addPartHook(string $sActionName, string $sFunctionName) : self
 	{
 		if ($this->oPluginManager) {
 			$this->oPluginManager->AddAdditionalPartAction($sActionName, array($this, $sFunctionName));
@@ -201,7 +201,7 @@ abstract class AbstractPlugin
 		return $this;
 	}
 
-	final protected function addJsonHook(string $sActionName, string $sFunctionName = ''): self
+	final protected function addJsonHook(string $sActionName, string $sFunctionName = '') : self
 	{
 		if ($this->oPluginManager) {
 			$this->oPluginManager->AddAdditionalJsonAction($sActionName, array($this, $sFunctionName ?: $sActionName));
@@ -210,7 +210,10 @@ abstract class AbstractPlugin
 		return $this;
 	}
 
-	final protected function jsonResponse(string $sFunctionName, mixed $mData): false|string|array
+	/**
+	 * @return mixed false|string|array
+	 */
+	final protected function jsonResponse(string $sFunctionName, $mData)
 	{
 		return $this->oPluginManager
 			? $this->oPluginManager->JsonResponseHelper(
@@ -218,21 +221,26 @@ abstract class AbstractPlugin
 			: \json_encode($mData);
 	}
 
-	final public function jsonParam(string $sKey, mixed $mDefault = null): mixed
+	/**
+	 * @param mixed $mDefault = null
+	 *
+	 * @return mixed
+	 */
+	final public function jsonParam(string $sKey, $mDefault = null)
 	{
 		return $this->oPluginManager
 			? $this->oPluginManager->Actions()->GetActionParam($sKey, $mDefault)
 			: $mDefault;
 	}
 
-	final public function getUserSettings(): array
+	final public function getUserSettings() : array
 	{
 		return $this->oPluginManager
 			? $this->oPluginManager->GetUserPluginSettings($this->Name())
 			: array();
 	}
 
-	final public function saveUserSettings(array $aSettings): bool
+	final public function saveUserSettings(array $aSettings) : bool
 	{
 		return $this->oPluginManager
 			&& $this->oPluginManager->SaveUserPluginSettings($this->Name(), $aSettings);
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Helper.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Helper.php
index 9f85f9659..b4168bf80 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Helper.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Helper.php
@@ -4,7 +4,7 @@ namespace RainLoop\Plugins;
 
 class Helper
 {
-	static public function ValidateWildcardValues(string $sString, string $sWildcardValues, ?string &$sFoundValue = null) : bool
+	static public function ValidateWildcardValues(string $sString, string $sWildcardValues, string &$sFoundValue = null) : bool
 	{
 		$sFoundValue = '';
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
index 1fd444d8b..58b1328ec 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
@@ -45,7 +45,7 @@ class Manager
 		}
 	}
 
-	public function loadPlugin(string $sName): bool
+	public function loadPlugin(string $sName) : bool
 	{
 		if (!isset($this->aPlugins[$sName])) {
 			$oPlugin = $this->CreatePluginByName($sName);
@@ -57,7 +57,7 @@ class Manager
 		return isset($this->aPlugins[$sName]);
 	}
 
-	protected static function getPluginPath(string $sName): ?string
+	protected static function getPluginPath(string $sName) : ?string
 	{
 		$sPath = APP_PLUGINS_PATH.$sName;
 		if (\is_readable("{$sPath}/index.php")) {
@@ -69,7 +69,7 @@ class Manager
 		return null;
 	}
 
-	public function CreatePluginByName(string $sName): ?\RainLoop\Plugins\AbstractPlugin
+	public function CreatePluginByName(string $sName) : ?\RainLoop\Plugins\AbstractPlugin
 	{
 		$oPlugin = null;
 
@@ -90,7 +90,7 @@ class Manager
 		return $oPlugin;
 	}
 
-	public function InstalledPlugins(): array
+	public function InstalledPlugins() : array
 	{
 		$aList = array();
 
@@ -121,7 +121,7 @@ class Manager
 		return $aList;
 	}
 
-	public function convertPluginFolderNameToClassName(string $sFolderName): string
+	public function convertPluginFolderNameToClassName(string $sFolderName) : string
 	{
 		$aParts = \array_map('ucfirst', \array_map('strtolower',
 			\explode(' ', \preg_replace('/[^a-z0-9]+/', ' ', $sFolderName))));
@@ -129,7 +129,7 @@ class Manager
 		return \implode($aParts).'Plugin';
 	}
 
-	public function loadPluginByName(string $sName): ?string
+	public function loadPluginByName(string $sName) : ?string
 	{
 		if (\preg_match('/^[a-z0-9\\-]+$/', $sName)) {
 			$sClassName = $this->convertPluginFolderNameToClassName($sName);
@@ -148,12 +148,12 @@ class Manager
 		return null;
 	}
 
-	public function Actions(): \RainLoop\Actions
+	public function Actions() : \RainLoop\Actions
 	{
 		return $this->oActions;
 	}
 
-	public function Hash(): string
+	public function Hash() : string
 	{
 		return \md5(
 			\array_reduce($this->aPlugins, function($sResult, $oPlugin){
@@ -164,12 +164,12 @@ class Manager
 		);
 	}
 
-	public function HaveJs(bool $bAdminScope = false): bool
+	public function HaveJs(bool $bAdminScope = false) : bool
 	{
 		return $this->bIsEnabled && \count($this->aJs[$bAdminScope ? 1 : 0]);
 	}
 
-	public function CompileCss(bool $bAdminScope, bool &$bLess, bool $bMinified): string
+	public function CompileCss(bool $bAdminScope, bool &$bLess, bool $bMinified) : string
 	{
 		$aResult = array();
 		if ($this->bIsEnabled) {
@@ -189,7 +189,7 @@ class Manager
 		return \implode("\n", $aResult);
 	}
 
-	public function CompileJs(bool $bAdminScope = false, bool $bMinified = false): string
+	public function CompileJs(bool $bAdminScope = false, bool $bMinified = false) : string
 	{
 		$aResult = array();
 		if ($this->bIsEnabled) {
@@ -209,7 +209,7 @@ class Manager
 		return \implode("\n", $aResult);
 	}
 
-	public function CompileTemplate(array &$aList, bool $bAdminScope = false): void
+	public function CompileTemplate(array &$aList, bool $bAdminScope = false) : void
 	{
 		if ($this->bIsEnabled) {
 			$aTemplates = $bAdminScope ? $this->aAdminTemplates : $this->aTemplates;
@@ -222,7 +222,7 @@ class Manager
 		}
 	}
 
-	public function InitAppData(bool $bAdmin, array &$aAppData, ?\RainLoop\Model\Account $oAccount = null): self
+	public function InitAppData(bool $bAdmin, array &$aAppData, ?\RainLoop\Model\Account $oAccount = null) : self
 	{
 		if ($this->bIsEnabled && isset($aAppData['Plugins']) && \is_array($aAppData['Plugins'])) {
 			$bAuth = !empty($aAppData['Auth']);
@@ -255,7 +255,10 @@ class Manager
 		return $this;
 	}
 
-	public function AddHook(string $sHookName, callable $mCallbak): self
+	/**
+	 * @param mixed $mCallbak
+	 */
+	public function AddHook(string $sHookName, $mCallbak) : self
 	{
 		if ($this->bIsEnabled && \is_callable($mCallbak)) {
 			$sHookName = \strtolower($sHookName);
@@ -267,7 +270,7 @@ class Manager
 		return $this;
 	}
 
-	public function AddCss(string $sFile, bool $bAdminScope = false): self
+	public function AddCss(string $sFile, bool $bAdminScope = false) : self
 	{
 		if ($this->bIsEnabled) {
 			$this->aCss[$bAdminScope ? 1 : 0][] = $sFile;
@@ -275,7 +278,7 @@ class Manager
 		return $this;
 	}
 
-	public function AddJs(string $sFile, bool $bAdminScope = false): self
+	public function AddJs(string $sFile, bool $bAdminScope = false) : self
 	{
 		if ($this->bIsEnabled) {
 			$this->aJs[$bAdminScope ? 1 : 0][$sFile] = $sFile;
@@ -284,7 +287,7 @@ class Manager
 		return $this;
 	}
 
-	public function AddTemplate(string $sFile, bool $bAdminScope = false): self
+	public function AddTemplate(string $sFile, bool $bAdminScope = false) : self
 	{
 		if ($this->bIsEnabled) {
 			if ($bAdminScope) {
@@ -321,7 +324,7 @@ class Manager
 	}
 */
 
-	public function RunHook(string $sHookName, array $aArg = array(), bool $bLogHook = true): self
+	public function RunHook(string $sHookName, array $aArg = array(), bool $bLogHook = true) : self
 	{
 		if ($this->bIsEnabled) {
 			$sHookName = \strtolower($sHookName);
@@ -341,7 +344,10 @@ class Manager
 		return $this;
 	}
 
-	public function AddAdditionalPartAction(string $sActionName, callable $mCallbak): self
+	/**
+	 * @param mixed $mCallbak
+	 */
+	public function AddAdditionalPartAction(string $sActionName, $mCallbak) : self
 	{
 		if ($this->bIsEnabled && \is_callable($mCallbak)) {
 			$sActionName = \strtolower($sActionName);
@@ -355,7 +361,7 @@ class Manager
 		return $this;
 	}
 
-	public function RunAdditionalPart(string $sActionName, array $aParts = array()): bool
+	public function RunAdditionalPart(string $sActionName, array $aParts = array()) : bool
 	{
 		$bResult = false;
 		if ($this->bIsEnabled) {
@@ -370,7 +376,7 @@ class Manager
 		return $bResult;
 	}
 
-	public function AddAdditionalJsonAction(string $sActionName, callable $mCallback): self
+	public function AddAdditionalJsonAction(string $sActionName, callable $mCallback) : self
 	{
 		$sActionName = "DoPlugin{$sActionName}";
 		if ($this->bIsEnabled && \strlen($sActionName) && !isset($this->aAdditionalJson[$sActionName])) {
@@ -379,22 +385,28 @@ class Manager
 		return $this;
 	}
 
-	public function HasAdditionalJson(string $sActionName): bool
+	public function HasAdditionalJson(string $sActionName) : bool
 	{
 		return $this->bIsEnabled && isset($this->aAdditionalJson[$sActionName]);
 	}
 
-	public function RunAdditionalJson(string $sActionName): mixed
+	/**
+	 * @return mixed
+	 */
+	public function RunAdditionalJson(string $sActionName)
 	{
-		return $this->HasAdditionalJson($sActionName) ? $this->aAdditionalJson[$sActionName](): false;
+		return $this->HasAdditionalJson($sActionName) ? $this->aAdditionalJson[$sActionName]() : false;
 	}
 
-	public function JsonResponseHelper(string $sFunctionName, mixed $mData): array
+	/**
+	 * @param mixed $mData
+	 */
+	public function JsonResponseHelper(string $sFunctionName, $mData) : array
 	{
 		return $this->oActions->DefaultResponse($mData, [], $sFunctionName);
 	}
 
-	public function GetUserPluginSettings(string $sPluginName): array
+	public function GetUserPluginSettings(string $sPluginName) : array
 	{
 		$oAccount = $this->oActions->getAccountFromToken();
 		if ($oAccount) {
@@ -410,7 +422,7 @@ class Manager
 		return array();
 	}
 
-	public function SaveUserPluginSettings(string $sPluginName, array $aSettings): bool
+	public function SaveUserPluginSettings(string $sPluginName, array $aSettings) : bool
 	{
 		$oAccount = $this->oActions->getAccountFromToken();
 		if ($oAccount) {
@@ -440,7 +452,7 @@ class Manager
 		return false;
 	}
 
-	public function ReadLang(string $sLang, array &$aLang): void
+	public function ReadLang(string $sLang, array &$aLang) : void
 	{
 		if ($this->bIsEnabled) {
 			foreach ($this->aPlugins as $oPlugin) {
@@ -480,22 +492,22 @@ class Manager
 		}
 	}
 
-	public function IsEnabled(): bool
+	public function IsEnabled() : bool
 	{
 		return $this->bIsEnabled;
 	}
 
-	public function count(): int
+	public function count() : int
 	{
 		return $this->bIsEnabled ? \count($this->aPlugins) : 0;
 	}
 
-	public function WriteLog(string $sDesc, int $iType = \LOG_INFO): void
+	public function WriteLog(string $sDesc, int $iType = \LOG_INFO) : void
 	{
 		$this->logWrite($sDesc, $iType, 'PLUGIN');
 	}
 
-	public function WriteException(string $sDesc, int $iType = \LOG_INFO): void
+	public function WriteException(string $sDesc, int $iType = \LOG_INFO) : void
 	{
 		$this->logException($sDesc, $iType, 'PLUGIN');
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Property.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Property.php
index 7531f9266..8a6504ff4 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Property.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Property.php
@@ -8,7 +8,10 @@ class Property implements \JsonSerializable
 {
 	private string $sName;
 
-	private mixed $mValue;
+	/**
+	 * @var mixed
+	 */
+	private $mValue;
 
 	private string $sLabel = '';
 
@@ -18,7 +21,10 @@ class Property implements \JsonSerializable
 
 	private bool $bAllowedInJs = false;
 
-	private mixed $mDefaultValue = '';
+	/**
+	 * @var mixed
+	 */
+	private $mDefaultValue = '';
 
 	private array $aOptions = [];
 
@@ -31,18 +37,21 @@ class Property implements \JsonSerializable
 		$this->sName = $sName;
 	}
 
-	public static function NewInstance(string $sName): self
+	public static function NewInstance(string $sName) : self
 	{
 		return new self($sName);
 	}
 
-	public function SetType(int $iType): self
+	public function SetType(int $iType) : self
 	{
 		$this->iType = (int) $iType;
 		return $this;
 	}
 
-	public function SetValue(mixed $mValue): void
+	/**
+	 * @param mixed $mValue
+	 */
+	public function SetValue($mValue) : void
 	{
 		$this->mValue = null;
 		switch ($this->iType) {
@@ -78,7 +87,7 @@ class Property implements \JsonSerializable
 	/**
 	 * @param mixed $mDefaultValue
 	 */
-	public function SetDefaultValue($mDefaultValue): self
+	public function SetDefaultValue($mDefaultValue) : self
 	{
 		if (\is_array($mDefaultValue)) {
 			$this->aOptions = $mDefaultValue;
@@ -88,89 +97,95 @@ class Property implements \JsonSerializable
 		return $this;
 	}
 
-	public function SetOptions(array $aOptions): self
+	public function SetOptions(array $aOptions) : self
 	{
 		$this->aOptions = $aOptions;
 		return $this;
 	}
 
-	public function SetPlaceholder(string $sPlaceholder): self
+	public function SetPlaceholder(string $sPlaceholder) : self
 	{
 		$this->sPlaceholder = $sPlaceholder;
 		return $this;
 	}
 
-	public function SetLabel(string $sLabel): self
+	public function SetLabel(string $sLabel) : self
 	{
 		$this->sLabel = $sLabel;
 		return $this;
 	}
 
-	public function SetDescription(string $sDesc): self
+	public function SetDescription(string $sDesc) : self
 	{
 		$this->sDesc = $sDesc;
 		return $this;
 	}
 
-	public function SetAllowedInJs(bool $bValue = true): self
+	public function SetAllowedInJs(bool $bValue = true) : self
 	{
 		$this->bAllowedInJs = $bValue;
 		return $this;
 	}
 
-	public function SetEncrypted(bool $bValue = true): self
+	public function SetEncrypted(bool $bValue = true) : self
 	{
 		$this->encrypted = $bValue;
 		return $this;
 	}
 
-	public function Name(): string
+	public function Name() : string
 	{
 		return $this->sName;
 	}
 
-	public function AllowedInJs(): bool
+	public function AllowedInJs() : bool
 	{
 		return $this->bAllowedInJs;
 	}
 
-	public function Description(): string
+	public function Description() : string
 	{
 		return $this->sDesc;
 	}
 
-	public function Label(): string
+	public function Label() : string
 	{
 		return $this->sLabel;
 	}
 
-	public function Type(): int
+	public function Type() : int
 	{
 		return $this->iType;
 	}
 
-	public function DefaultValue(): mixed
+	/**
+	 * @return mixed
+	 */
+	public function DefaultValue()
 	{
 		return $this->mDefaultValue;
 	}
 
-	public function Options(): array
+	public function Options() : array
 	{
 		return $this->aOptions;
 	}
 
-	public function Placeholder(): string
+	public function Placeholder() : string
 	{
 		return $this->sPlaceholder;
 	}
 
-	public function Value(): mixed
+	/**
+	 * @return mixed
+	 */
+	public function Value()
 	{
 		return $this->mValue;
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		$mValue = $this->mValue;
 		if ($this->encrypted && $mValue) try {
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/PropertyCollection.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/PropertyCollection.php
index 2ed849fc0..f8f2cd26f 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/PropertyCollection.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/PropertyCollection.php
@@ -5,15 +5,18 @@ namespace RainLoop\Plugins;
 //class PropertyCollection extends \MailSo\Base\Collection
 class PropertyCollection extends \ArrayObject implements \JsonSerializable
 {
-	private string $sLabel;
+	/**
+	 * @var string
+	 */
+	private $sLabel;
 
 	function __construct(string $sLabel)
 	{
 		$this->sLabel = $sLabel;
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		return array(
 			'@Object' => 'Object/PluginProperty',
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php
index 2342d716c..affaecd99 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php
@@ -4,7 +4,10 @@ namespace RainLoop\Providers;
 
 class AddressBook extends AbstractProvider
 {
-	private ?AddressBook\AddressBookInterface $oDriver;
+	/**
+	 * @var \RainLoop\Providers\AddressBook\AddressBookInterface
+	 */
+	private $oDriver;
 
 	public function __construct(?AddressBook\AddressBookInterface $oDriver)
 	{
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php
index 80b9706fd..6d572a5b1 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php
@@ -84,7 +84,7 @@ trait CardDAV
 		return $mResult;
 	}
 
-	protected function davClientRequest(DAVClient $oClient, string $sCmd, string $sUrl, mixed $mData = null): ?\SnappyMail\HTTP\Response
+	protected function davClientRequest(DAVClient $oClient, string $sCmd, string $sUrl, $mData = null) : ?\SnappyMail\HTTP\Response
 	{
 		\MailSo\Base\Utils::ResetTimeLimit();
 
@@ -111,7 +111,7 @@ trait CardDAV
 		return null;
 	}
 
-	private function detectionPropFind(DAVClient $oClient, string $sPath): ?array
+	private function detectionPropFind(DAVClient $oClient, string $sPath) : ?array
 	{
 		try
 		{
@@ -133,7 +133,7 @@ trait CardDAV
 	private function getContactsPaths(DAVClient $oClient, string $sPath, string $sUser,
 		#[\SensitiveParameter]
 		string $sPassword,
-		string $sProxy = ''): array
+		string $sProxy = '') : array
 	{
 		$aContactsPaths = array();
 
@@ -263,11 +263,19 @@ trait CardDAV
 	/**
 	 * Checks if remote path resourcetype is an addressbook
 	 */
-	private function checkContactsPath(DAVClient $oClient, string $sPath): bool
+	private function checkContactsPath(DAVClient $oClient, string $sPath) : bool
 	{
-		$aResponse = $oClient->propFind($sPath, array(
-			'{DAV:}resourcetype'
-		), 1);
+		$aResponse = null;
+		try
+		{
+			$aResponse = $oClient->propFind($sPath, array(
+				'{DAV:}resourcetype'
+			), 1);
+		}
+		catch (\Throwable $oException)
+		{
+			$this->logException($oException);
+		}
 
 		$bGood = false;
 		if (\is_array($aResponse)) {
@@ -290,7 +298,7 @@ trait CardDAV
 		#[\SensitiveParameter]
 		string $sPassword,
 		string $sProxy = ''
-	): DAVClient
+	) : DAVClient
 	{
 		if (!\preg_match('/^http[s]?:\/\//i', $sUrl)) {
 			$sUrl = \preg_replace('/^fruux\.com/i', 'dav.fruux.com', $sUrl);
@@ -331,7 +339,7 @@ trait CardDAV
 		return $oClient;
 	}
 
-	public function getDavClient(): ?DAVClient
+	protected function getDavClient() : ?DAVClient
 	{
 		if (!$this->aDAVConfig['Mode']) {
 			return null;
@@ -397,18 +405,14 @@ trait CardDAV
 
 			$bGood = $sNewPath && $this->checkContactsPath($oClient, $sNewPath);
 			if (!$bGood) {
-				throw new \RainLoop\Exceptions\ClientException(
-					\RainLoop\Notifications::ContactsSyncError,
-					null,
-					'Contacts path not found at: '.$sPath
-				);
+				$this->logWrite('Contacts path not found at: '.$sPath, \LOG_INFO, 'DAV');
 			}
 		}
 
 		return $bGood ? $oClient : null;
 	}
 
-	private static function hasDAVCollection($aItem): bool
+	private static function hasDAVCollection($aItem)
 	{
 		return !empty($aItem['{DAV:}resourcetype'])
 			&& \is_array($aItem['{DAV:}resourcetype'])
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Contact.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Contact.php
index a84718e1a..8d08f28be 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Contact.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Contact.php
@@ -78,8 +78,8 @@ class Contact implements \JsonSerializable
 		$this->IdContactStr = $sUid;
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		return array(
 			'@Object' => 'Object/Contact',
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Property.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Property.php
index f0f1401a0..9a496d3ac 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Property.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Property.php
@@ -6,15 +6,30 @@ use RainLoop\Providers\AddressBook\Enumerations\PropertyType;
 
 class Property implements \JsonSerializable
 {
-	public int $IdProperty = 0;
+	/**
+	 * @var int
+	 */
+	public $IdProperty = 0;
 
-	public int $Type;
+	/**
+	 * @var int
+	 */
+	public $Type;
 
-	public string $TypeStr;
+	/**
+	 * @var string
+	 */
+	public $TypeStr;
 
-	public string $Value;
+	/**
+	 * @var string
+	 */
+	public $Value;
 
-	public int $Frec = 0;
+	/**
+	 * @var int
+	 */
+	public $Frec = 0;
 
 	public function __construct(int $iType = PropertyType::UNKNOWN, string $sValue = '', string $sTypeStr = '')
 	{
@@ -23,7 +38,8 @@ class Property implements \JsonSerializable
 		$this->TypeStr = $sTypeStr;
 	}
 
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		throw new \Exception('Obsolete ' . __CLASS__ . '::jsonSerialize()');
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Legacy.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Legacy.php
index da91df01f..6a125ebfd 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Legacy.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Legacy.php
@@ -9,7 +9,10 @@ use
 
 class Legacy
 {
-	private static function yieldPropertyHelper(mixed $oArrayProp, int $iType): iterable
+	/**
+	 * @param mixed $oProp
+	 */
+	private static function yieldPropertyHelper($oArrayProp, int $iType) : iterable
 	{
 		$aTmp = [];
 		foreach ($oArrayProp as $oProp) {
@@ -28,7 +31,10 @@ class Legacy
 		}
 	}
 
-	private static function getPropertyValueHelper(mixed $oProp, bool $bOldVersion): string
+	/**
+	 * @param mixed $oProp
+	 */
+	private static function getPropertyValueHelper($oProp, bool $bOldVersion) : string
 	{
 		$sValue = \trim($oProp);
 		if ($bOldVersion && !isset($oProp->parameters['CHARSET'])) {
@@ -42,7 +48,7 @@ class Legacy
 		return \MailSo\Base\Utils::Utf8Clear($sValue);
 	}
 
-	public static function VCardToProperties(\Sabre\VObject\Component\VCard $oVCard): iterable
+	public static function VCardToProperties(\Sabre\VObject\Component\VCard $oVCard) : iterable
 	{
 		yield new Property(PropertyType::JCARD, \json_encode($oVCard));
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
index 00e2c18fd..5d025bfaa 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
@@ -70,26 +70,26 @@ class PdoAddressBook
 		return \in_array($sType, static::getAvailableDrivers()) ? $sType : 'sqlite';
 	}
 
-	public function IsSupported(): bool
+	public function IsSupported() : bool
 	{
 		$aDrivers = static::getAvailableDrivers();
 		return \is_array($aDrivers) && \in_array($this->settings->driver, $aDrivers);
 	}
 
-	public function SetEmail(string $sEmail): bool
+	public function SetEmail(string $sEmail) : bool
 	{
 		$this->iUserID = $this->getUserId($sEmail);
 		return 0 < $this->iUserID;
 	}
 
-	private function flushDeletedContacts(): bool
+	private function flushDeletedContacts() : bool
 	{
 		return !!$this->prepareAndExecute('DELETE FROM rainloop_ab_contacts WHERE id_user = :id_user AND deleted = 1', array(
 			':id_user' => array($this->iUserID, \PDO::PARAM_INT)
 		));
 	}
 
-	private function prepareDatabaseSyncData(): array
+	private function prepareDatabaseSyncData() : array
 	{
 		$aResult = array();
 		$oStmt = $this->prepareAndExecute('SELECT id_contact, id_contact_str, changed, deleted, etag
@@ -122,20 +122,14 @@ class PdoAddressBook
 		return $aResult;
 	}
 
-	public function Sync(): bool
+	public function Sync() : bool
 	{
 		if (1 > $this->iUserID) {
 			\SnappyMail\Log::warning('PdoAddressBook', 'Sync() invalid $iUserID');
 			return false;
 		}
 
-		try {
-			$oClient = $this->getDavClient();
-		} catch (\Throwable $e) {
-			\SnappyMail\Log::error('DAV', $e->getMessage());
-//			$this->logException($oException);
-			return false;
-		}
+		$oClient = $this->getDavClient();
 		if (!$oClient) {
 			\SnappyMail\Log::warning('PdoAddressBook', 'Sync() invalid DavClient');
 			return false;
@@ -161,31 +155,6 @@ class PdoAddressBook
 
 		$bReadWrite = $this->isDAVReadWrite();
 
-		/**
-		 * An empty list on either side is far more often a fault than a real
-		 * "delete everything": a fresh or rebuilt local store, a DAV listing
-		 * that failed to parse, a stale server-side index. Acting on it
-		 * destroys data the other side still holds, so skip the deletions in
-		 * that direction and let the following import/export reconcile.
-		 */
-		$iLocalLive = 0;
-		foreach ($aLocalSyncData as $aGuardData) {
-			if (empty($aGuardData['deleted'])) {
-				++$iLocalLive;
-			}
-		}
-		$iRemoteCount = \count($aRemoteSyncData);
-		$bProtectRemote = (0 === $iLocalLive && 0 < $iRemoteCount);
-		$bProtectLocal  = (0 === $iRemoteCount && 0 < $iLocalLive);
-		if ($bProtectRemote) {
-			\SnappyMail\Log::warning('PdoAddressBook', "Sync() local store is empty while remote holds"
-				. " {$iRemoteCount} contacts: importing only, no remote deletions");
-		}
-		if ($bProtectLocal) {
-			\SnappyMail\Log::warning('PdoAddressBook', "Sync() remote listing is empty while local holds"
-				. " {$iLocalLive} contacts: keeping local, no local deletions");
-		}
-
 		// Delete remote when Mode = read + write
 		if ($bReadWrite) {
 			\SnappyMail\Log::info('PdoAddressBook', 'Sync() is import and export');
@@ -194,7 +163,7 @@ class PdoAddressBook
 				if ($aData['deleted']) {
 					++$iCount;
 					unset($aLocalSyncData[$sKey]);
-					if (!$bProtectRemote && isset($aRemoteSyncData[$sKey], $aRemoteSyncData[$sKey]['vcf'])) {
+					if (isset($aRemoteSyncData[$sKey], $aRemoteSyncData[$sKey]['vcf'])) {
 						\SnappyMail\HTTP\Stream::JSON(['messsage'=>"Delete remote {$sKey}"]);
 						$this->davClientRequest($oClient, 'DELETE', $sPath.$aRemoteSyncData[$sKey]['vcf']);
 					}
@@ -209,11 +178,9 @@ class PdoAddressBook
 
 		// Delete local
 		$aIdsForDeletion = array();
-		if (!$bProtectLocal) {
-			foreach ($aLocalSyncData as $sKey => $aData) {
-				if (!empty($aData['etag']) && !isset($aRemoteSyncData[$sKey])) {
-					$aIdsForDeletion[] = $aData['id_contact'];
-				}
+		foreach ($aLocalSyncData as $sKey => $aData) {
+			if (!empty($aData['etag']) && !isset($aRemoteSyncData[$sKey])) {
+				$aIdsForDeletion[] = $aData['id_contact'];
 			}
 		}
 		if (\count($aIdsForDeletion)) {
@@ -330,7 +297,7 @@ class PdoAddressBook
 		return true;
 	}
 
-	public function Export(string $sType = 'vcf'): bool
+	public function Export(string $sType = 'vcf') : bool
 	{
 		if (1 > $this->iUserID) {
 			\SnappyMail\Log::warning('PdoAddressBook', 'Export() invalid $iUserID');
@@ -365,7 +332,7 @@ class PdoAddressBook
 		return true;
 	}
 
-	public function ContactSave(Contact $oContact): bool
+	public function ContactSave(Contact $oContact) : bool
 	{
 		if (1 > $this->iUserID) {
 			\SnappyMail\Log::warning('PdoAddressBook', 'ContactSave() invalid $iUserID');
@@ -465,7 +432,7 @@ class PdoAddressBook
 		return 0 < $iIdContact;
 	}
 
-	public function DeleteContacts(array $aContactIds): bool
+	public function DeleteContacts(array $aContactIds) : bool
 	{
 		if (1 > $this->iUserID) {
 			\SnappyMail\Log::warning('PdoAddressBook', 'DeleteContacts() invalid $iUserID');
@@ -494,7 +461,7 @@ class PdoAddressBook
 		return true;
 	}
 
-	public function DeleteAllContacts(string $sEmail): bool
+	public function DeleteAllContacts(string $sEmail) : bool
 	{
 		$iUserID = $this->getUserId($sEmail);
 
@@ -506,7 +473,7 @@ class PdoAddressBook
 		return true;
 	}
 
-	protected function getContactsFromPDO(?\PDOStatement $oStmt): array
+	protected function getContactsFromPDO(?\PDOStatement $oStmt) : array
 	{
 		if ($oStmt) {
 			$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
@@ -648,7 +615,7 @@ class PdoAddressBook
 		return [];
 	}
 
-	public function GetContacts(int $iOffset = 0, int $iLimit = 20, string $sSearch = '', int &$iResultCount = 0): array
+	public function GetContacts(int $iOffset = 0, int $iLimit = 20, string $sSearch = '', int &$iResultCount = 0) : array
 	{
 		if (1 > $this->iUserID) {
 			return [];
@@ -727,7 +694,10 @@ class PdoAddressBook
 		return [];
 	}
 
-	public function GetContactByEmail(string $sEmail): ?Contact
+	/**
+	 * @param mixed $mID
+	 */
+	public function GetContactByEmail(string $sEmail) : ?Contact
 	{
 		$sLowerSearch = $this->specialConvertSearchValueLower($sEmail);
 
@@ -748,23 +718,20 @@ class PdoAddressBook
 			$aParams[':search_lower'] = array($sLowerSearch, \PDO::PARAM_STR);
 		}
 
-		// This query selects id_contact only, so it must not be handed to
-		// getContactsFromPDO(), which unconditionally reads id_contact_str,
-		// changed, etag and jcard from every row. Look the contact up by id
-		// instead: GetContactByID() selects those columns, so the Contact it
-		// returns carries a real etag and changed value rather than 0.
-		$oStmt = $this->prepareAndExecute($sSql, $aParams);
-		if ($oStmt) {
-			$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
-			if (\is_array($aFetch) && \count($aFetch) && !empty($aFetch[0]['id_contact'])) {
-				return $this->GetContactByID((int) $aFetch[0]['id_contact']);
-			}
-		}
+		$oContact = null;
+		$iIdContact = 0;
 
-		return null;
+		$aContacts = $this->getContactsFromPDO(
+			$this->prepareAndExecute($sSql, $aParams)
+		);
+
+		return $aContacts ? $aContacts[0] : null;
 	}
 
-	public function GetContactByID(mixed $mID, bool $bIsStrID = false): ?Contact
+	/**
+	 * @param mixed $mID
+	 */
+	public function GetContactByID($mID, bool $bIsStrID = false) : ?Contact
 	{
 		$mID = \trim($mID);
 
@@ -807,7 +774,7 @@ class PdoAddressBook
 	/**
 	 * @throws \ValueError
 	 */
-	public function GetSuggestions(string $sSearch, int $iLimit = 20): array
+	public function GetSuggestions(string $sSearch, int $iLimit = 20) : array
 	{
 		if (1 > $this->iUserID) {
 			return [];
@@ -972,7 +939,7 @@ class PdoAddressBook
 	/**
 	 * @throws \ValueError
 	 */
-	public function IncFrec(array $aEmails, bool $bCreateAuto = true): bool
+	public function IncFrec(array $aEmails, bool $bCreateAuto = true) : bool
 	{
 		if (1 > $this->iUserID) {
 			return false;
@@ -1025,7 +992,7 @@ class PdoAddressBook
 					$sEmail = \trim($oItem->GetEmail(true));
 					if (\strlen($sEmail)) {
 						$aEmailsToUpdate[] = $sEmail;
-						return !\in_array(\mb_strtolower($sEmail), $aExists);
+						return !\in_array($sEmail, $aExists);
 					}
 				}
 				return false;
@@ -1092,7 +1059,7 @@ class PdoAddressBook
 		));
 	}
 
-	public function Test(): string
+	public function Test() : string
 	{
 		$sResult = '';
 		try {
@@ -1115,7 +1082,7 @@ class PdoAddressBook
 		return $sResult;
 	}
 
-	private function SyncDatabase(): bool
+	private function SyncDatabase() : bool
 	{
 		static $mCache = null;
 		if (null !== $mCache) {
@@ -1137,7 +1104,7 @@ class PdoAddressBook
 		return $mCache;
 	}
 
-	private function getContactFreq(int $iUserID, int $iIdContact): array
+	private function getContactFreq(int $iUserID, int $iIdContact) : array
 	{
 		$aResult = array();
 
@@ -1163,7 +1130,7 @@ class PdoAddressBook
 		return $aResult;
 	}
 
-	private function specialConvertSearchValue(string $sSearch, string $sEscapeSign = '='): string
+	private function specialConvertSearchValue(string $sSearch, string $sEscapeSign = '=') : string
 	{
 		return '%'.\str_replace(array($sEscapeSign, '_', '%'),
 			array($sEscapeSign.$sEscapeSign, $sEscapeSign.'_', $sEscapeSign.'%'), $sSearch).'%';
@@ -1176,7 +1143,7 @@ class PdoAddressBook
 				(string) \mb_strtolower($sSearch)).'%';
 	}
 
-	protected function getPdoSettings(): \RainLoop\Pdo\Settings
+	protected function getPdoSettings() : \RainLoop\Pdo\Settings
 	{
 		$sSslCa = $this->settings->sslCa;
 		if ($sSslCa && !\is_file($sSslCa)) {
@@ -1190,7 +1157,7 @@ class PdoAddressBook
 	/**
 	 * @throws \ValueError
 	 */
-	protected function getUserId(string $sEmail, bool $bSkipInsert = false, bool $bCache = true): int
+	protected function getUserId(string $sEmail, bool $bSkipInsert = false, bool $bCache = true) : int
 	{
 		static $aCache = array();
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Utils.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Utils.php
index 839b04905..983e67aa7 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Utils.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Utils.php
@@ -89,7 +89,7 @@ class Utils
 */
 	);
 
-	public static function CsvStreamToContacts(/*resource*/ $rFile, string $sDelimiter): iterable
+	public static function CsvStreamToContacts(/*resource*/ $rFile, string $sDelimiter) : iterable
 	{
 		\setlocale(LC_CTYPE, 'en_US.UTF-8');
 
@@ -140,7 +140,7 @@ class Utils
 		}
 	}
 
-	public static function VCardToCsv($stream, VCard $oVCard, bool $bWithHeader = false): int|false
+	public static function VCardToCsv($stream, VCard $oVCard, bool $bWithHeader = false)/* : int|false*/
 	{
 		$aData = array();
 		if ($bWithHeader) {
@@ -198,7 +198,7 @@ class Utils
 		));
 	}
 
-	public static function VcfStreamToContacts(/*resource*/ $rFile): iterable
+	public static function VcfStreamToContacts(/*resource*/ $rFile) : iterable
 	{
 		$oVCardSplitter = new \Sabre\VObject\Splitter\VCard($rFile);
 		if ($oVCardSplitter) {
@@ -213,7 +213,7 @@ class Utils
 		}
 	}
 /*
-	public static function QrCode(string $sVcfData): string
+	public static function QrCode(string $sVcfData) : string
 	{
 		MECARD:N:djmaze;ORG:SnappyMail;TEL:+31012345678;URL:https\://snappymail.eu;EMAIL:info@snappymail.eu;ADR:address line;;
 		VCARD
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Files/FileStorage.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Files/FileStorage.php
index 8e85d74f6..ded1e1c4d 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Files/FileStorage.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Files/FileStorage.php
@@ -4,21 +4,28 @@ namespace RainLoop\Providers\Files;
 
 class FileStorage implements \RainLoop\Providers\Files\IFiles
 {
-	private array $aResources = array();
+	/**
+	 * @var array
+	 */
+	private $aResources;
 
-	private ?string $sDataPath;
+	/**
+	 * @var string
+	 */
+	private $sDataPath;
 
 	public function __construct(string $sStoragePath)
 	{
+		$this->aResources = array();
 		$this->sDataPath = \rtrim(\trim($sStoragePath), '\\/');
 	}
 
-	public function GenerateLocalFullFileName(\RainLoop\Model\Account $oAccount, string $sKey): string
+	public function GenerateLocalFullFileName(\RainLoop\Model\Account $oAccount, string $sKey) : string
 	{
 		return $this->generateFullFileName($oAccount, $sKey, true);
 	}
 
-	public function PutFile(\RainLoop\Model\Account $oAccount, string $sKey, /*resource*/ $rSource): bool
+	public function PutFile(\RainLoop\Model\Account $oAccount, string $sKey, /*resource*/ $rSource) : bool
 	{
 		$bResult = false;
 		if ($rSource) {
@@ -31,7 +38,7 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
 		return $bResult;
 	}
 
-	public function MoveUploadedFile(\RainLoop\Model\Account $oAccount, string $sKey, string $sSource): bool
+	public function MoveUploadedFile(\RainLoop\Model\Account $oAccount, string $sKey, string $sSource) : bool
 	{
 		return \move_uploaded_file($sSource,
 			$this->generateFullFileName($oAccount, $sKey, true));
@@ -59,13 +66,13 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
 		return $mResult;
 	}
 
-	public function GetFileName(\RainLoop\Model\Account $oAccount, string $sKey): string|false
+	public function GetFileName(\RainLoop\Model\Account $oAccount, string $sKey) /*: string|false*/
 	{
 		$sFileName = $this->generateFullFileName($oAccount, $sKey);
 		return \file_exists($sFileName) ? $sFileName : false;
 	}
 
-	public function Clear(\RainLoop\Model\Account $oAccount, string $sKey): bool
+	public function Clear(\RainLoop\Model\Account $oAccount, string $sKey) : bool
 	{
 		$sFileName = $this->generateFullFileName($oAccount, $sKey);
 		if (\file_exists($sFileName)) {
@@ -77,18 +84,18 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
 		return false;
 	}
 
-	public function FileSize(\RainLoop\Model\Account $oAccount, string $sKey): int|false
+	public function FileSize(\RainLoop\Model\Account $oAccount, string $sKey) /*: int|false*/
 	{
 		$sFileName = $this->generateFullFileName($oAccount, $sKey);
 		return \file_exists($sFileName) ? \filesize($sFileName) : false;
 	}
 
-	public function FileExists(\RainLoop\Model\Account $oAccount, string $sKey): bool
+	public function FileExists(\RainLoop\Model\Account $oAccount, string $sKey) : bool
 	{
 		return \file_exists($this->generateFullFileName($oAccount, $sKey));
 	}
 
-	public function GC(int $iTimeToClearInHours = 24): bool
+	public function GC(int $iTimeToClearInHours = 24) : bool
 	{
 		if (0 < $iTimeToClearInHours) {
 			$iTimeToClear = 3600 * $iTimeToClearInHours;
@@ -106,7 +113,7 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
 		return false;
 	}
 
-	public function CloseAllOpenedFiles(): bool
+	public function CloseAllOpenedFiles() : bool
 	{
 		if (\is_array($this->aResources) && \count($this->aResources))
 		{
@@ -122,7 +129,7 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
 		return true;
 	}
 
-	private function generateFullFileName(\RainLoop\Model\Account $oAccount, string $sKey, bool $bMkDir = false): string
+	private function generateFullFileName(\RainLoop\Model\Account $oAccount, string $sKey, bool $bMkDir = false) : string
 	{
 		if ($oAccount instanceof \RainLoop\Model\AdditionalAccount) {
 			$sEmail = $oAccount->ParentEmail();
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage.php
index bc4f47096..eb9fa58c3 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage.php
@@ -2,8 +2,6 @@
 
 namespace RainLoop\Providers;
 
-use RainLoop\Model\Account;
-
 class Storage extends \RainLoop\Providers\AbstractProvider
 {
 	/**
@@ -16,55 +14,77 @@ class Storage extends \RainLoop\Providers\AbstractProvider
 		$this->oDriver = $oDriver;
 	}
 
-	private function verifyAccount(Account|string|null $mAccount, int $iStorageType): bool
+	/**
+	 * @param \RainLoop\Model\Account|string|null $mAccount
+	 */
+	private function verifyAccount($mAccount, int $iStorageType) : bool
 	{
 		return \RainLoop\Providers\Storage\Enumerations\StorageType::NOBODY === $iStorageType
-			|| $mAccount instanceof Account
+			|| $mAccount instanceof \RainLoop\Model\Account
 			|| \is_string($mAccount);
 	}
 
-	public function Put(Account|string|null $mAccount, int $iStorageType, string $sKey, string $sValue): bool
+	/**
+	 * @param \RainLoop\Model\Account|string|null $mAccount
+	 * @param mixed $sValue
+	 */
+	public function Put($mAccount, int $iStorageType, string $sKey, string $sValue) : bool
 	{
 		return $this->verifyAccount($mAccount, $iStorageType)
 			? $this->oDriver->Put($mAccount, $iStorageType, $sKey, $sValue)
 			: false;
 	}
 
-	public function Get(Account|string|null $mAccount, int $iStorageType, string $sKey, mixed $mDefault = false): mixed
+	/**
+	 * @param \RainLoop\Model\Account|string|null $mAccount
+	 * @param mixed $mDefault = false
+	 *
+	 * @return mixed
+	 */
+	public function Get($mAccount, int $iStorageType, string $sKey, $mDefault = false)
 	{
 		return $this->verifyAccount($mAccount, $iStorageType)
 			? $this->oDriver->Get($mAccount, $iStorageType, $sKey, $mDefault)
 			: $mDefault;
 	}
 
-	public function Clear(Account|string|null $mAccount, int $iStorageType, string $sKey): bool
+	/**
+	 * @param \RainLoop\Model\Account|string|null $mAccount
+	 */
+	public function Clear($mAccount, int $iStorageType, string $sKey) : bool
 	{
 		return $this->verifyAccount($mAccount, $iStorageType)
 			? $this->oDriver->Clear($mAccount, $iStorageType, $sKey)
 			: false;
 	}
 
-	public function DeleteStorage(Account|string $mAccount): bool
+	/**
+	 * @param \RainLoop\Model\Account|string $mAccount
+	 */
+	public function DeleteStorage($mAccount) : bool
 	{
 		return $this->oDriver->DeleteStorage($mAccount);
 	}
 
-	public function GenerateFilePath(Account|string|null $mAccount, int $iStorageType, bool $bMkDir = false): string
+	/**
+	 * @param \RainLoop\Model\Account|string|null $mAccount
+	 */
+	public function GenerateFilePath($mAccount, int $iStorageType, bool $bMkDir = false) : string
 	{
 		return $this->oDriver->GenerateFilePath($mAccount, $iStorageType, $bMkDir);
 	}
 
-	public function IsActive(): bool
+	public function IsActive() : bool
 	{
 		return true;
 	}
 
-	public function IsLocal(): bool
+	public function IsLocal() : bool
 	{
 		return $this->oDriver->IsLocal();
 	}
 
-	public function GC(): void
+	public function GC() : void
 	{
 		$this->oDriver->GC();
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/FileStorage.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/FileStorage.php
index e2f93bff6..962c10690 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/FileStorage.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/FileStorage.php
@@ -3,7 +3,6 @@
 namespace RainLoop\Providers\Storage;
 
 use RainLoop\Providers\Storage\Enumerations\StorageType;
-use RainLoop\Model\Account;
 
 class FileStorage implements \RainLoop\Providers\Storage\IStorage
 {
@@ -19,7 +18,10 @@ class FileStorage implements \RainLoop\Providers\Storage\IStorage
 		$this->bLocal = $bLocal;
 	}
 
-	public function Put(Account|string|null $mAccount, int $iStorageType, string $sKey, string $sValue): bool
+	/**
+	 * @param \RainLoop\Model\Account|string|null $mAccount
+	 */
+	public function Put($mAccount, int $iStorageType, string $sKey, string $sValue) : bool
 	{
 		$sFileName = $this->generateFileName($mAccount, $iStorageType, $sKey, true);
 		try {
@@ -31,7 +33,13 @@ class FileStorage implements \RainLoop\Providers\Storage\IStorage
 		return false;
 	}
 
-	public function Get(Account|string|null $mAccount, int $iStorageType, string $sKey, mixed $mDefault = false): mixed
+	/**
+	 * @param \RainLoop\Model\Account|string|null $mAccount
+	 * @param mixed $mDefault = false
+	 *
+	 * @return mixed
+	 */
+	public function Get($mAccount, int $iStorageType, string $sKey, $mDefault = false)
 	{
 		$mValue = false;
 		$sFileName = $this->generateFileName($mAccount, $iStorageType, $sKey);
@@ -45,13 +53,19 @@ class FileStorage implements \RainLoop\Providers\Storage\IStorage
 		return false === $mValue ? $mDefault : $mValue;
 	}
 
-	public function Clear(Account|string|null $mAccount, int $iStorageType, string $sKey): bool
+	/**
+	 * @param \RainLoop\Model\Account|string|null $mAccount
+	 */
+	public function Clear($mAccount, int $iStorageType, string $sKey) : bool
 	{
 		$sFileName = $this->generateFileName($mAccount, $iStorageType, $sKey);
 		return $sFileName && \file_exists($sFileName) && \unlink($sFileName);
 	}
 
-	public function DeleteStorage(Account|string|null $mAccount): bool
+	/**
+	 * @param \RainLoop\Model\Account|string $mAccount
+	 */
+	public function DeleteStorage($mAccount) : bool
 	{
 		$sPath = $this->generateFileName($mAccount, StorageType::CONFIG, '');
 		if ($sPath && \is_dir($sPath)) {
@@ -65,7 +79,10 @@ class FileStorage implements \RainLoop\Providers\Storage\IStorage
 		return $this->bLocal;
 	}
 
-	public function GenerateFilePath(Account|string|null $mAccount, int $iStorageType, bool $bMkDir = false): string
+	/**
+	 * @param \RainLoop\Model\Account|string|null $mAccount
+	 */
+	public function GenerateFilePath($mAccount, int $iStorageType, bool $bMkDir = false) : string
 	{
 		$sEmail = $sSubFolder = $sFilePath = '';
 		if (null === $mAccount || StorageType::NOBODY === $iStorageType) {
@@ -125,7 +142,10 @@ class FileStorage implements \RainLoop\Providers\Storage\IStorage
 		return $sFilePath;
 	}
 
-	protected function generateFileName(Account|string|null $mAccount, int $iStorageType, string $sKey, bool $bMkDir = false): string
+	/**
+	 * @param \RainLoop\Model\Account|string|null $mAccount
+	 */
+	protected function generateFileName($mAccount, int $iStorageType, string $sKey, bool $bMkDir = false) : string
 	{
 		$sFilePath = $this->GenerateFilePath($mAccount, $iStorageType, $bMkDir);
 		if ($sFilePath) {
@@ -138,7 +158,7 @@ class FileStorage implements \RainLoop\Providers\Storage\IStorage
 		return $sFilePath;
 	}
 
-	public function GC(): void
+	public function GC() : void
 	{
 		\clearstatcache();
 		foreach (\glob("{$this->sDataPath}/*", GLOB_ONLYDIR) as $sDomain) {
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/IStorage.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/IStorage.php
index 882510cf3..66bf5b93b 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/IStorage.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/IStorage.php
@@ -2,15 +2,25 @@
 
 namespace RainLoop\Providers\Storage;
 
-use RainLoop\Model\Account;
-
 interface IStorage
 {
-	public function Put(Account|string|null $mAccount, int $iStorageType, string $sKey, string $sValue): bool;
+	/**
+	 * @param \RainLoop\Model\Account|null $mAccount
+	 */
+	public function Put($mAccount, int $iStorageType, string $sKey, string $sValue) : bool;
 
-	public function Get(Account|string|null $mAccount, int $iStorageType, string $sKey, mixed $mDefault = false): mixed;
+	/**
+	 * @param \RainLoop\Model\Account|null $mAccount
+	 * @param mixed $mDefault = false
+	 *
+	 * @return mixed
+	 */
+	public function Get($mAccount, int $iStorageType, string $sKey, $mDefault = false);
 
-	public function Clear(Account|string|null $mAccount, int $iStorageType, string $sKey): bool;
+	/**
+	 * @param \RainLoop\Model\Account|null $mAccount
+	 */
+	public function Clear($mAccount, int $iStorageType, string $sKey) : bool;
 
-	public function IsLocal(): bool;
+	public function IsLocal() : bool;
 }
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 b3ad82241..9b0ee7e23 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
@@ -279,10 +279,7 @@ class ServiceActions
 	public function ServiceProxyExternal() : string
 	{
 		$sData = empty($this->aPaths[1]) ? '' : $this->aPaths[1];
-		if ($sData
-		  && $this->Config()->Get('labs', 'use_local_proxy_for_external_images', false)
-		  && $this->oActions->getMainAccountFromToken()
-		) {
+		if ($sData && $this->Config()->Get('labs', 'use_local_proxy_for_external_images', false)) {
 			$this->oActions->verifyCacheByKey($sData);
 			$sUrl = \MailSo\Base\Utils::UrlSafeBase64Decode($sData);
 			if (!empty($sUrl)) {
@@ -339,7 +336,7 @@ class ServiceActions
 					$sMethodName = 'Raw'.$sAction;
 					if (\method_exists($this->oActions, $sMethodName)) {
 						\header('X-Raw-Action: '.$sMethodName);
-						\header('Content-Security-Policy: script-src \'none\'; child-src \'none\'; object-src \'none\'');
+						\header('Content-Security-Policy: script-src \'none\'; child-src \'none\'');
 
 						$sRawError = '';
 						$this->oActions->SetActionParams(array(
@@ -542,7 +539,7 @@ class ServiceActions
 	}
 
 	/**
-	 * Login with the \RainLoop\Api::CreateUserSsoHash() generated hash
+	 * Login with the \RainLoop\API::CreateUserSsoHash() generated hash
 	 */
 	public function ServiceSso() : string
 	{
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 96cac627c..bf0bf23ad 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Settings.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Settings.php
@@ -38,18 +38,26 @@ class Settings implements \JsonSerializable
 		return $this->aData;
 	}
 
-//	public function jsonSerialize(): array
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		return $this->aData;;
 	}
 
-	public function GetConf(string $sName, mixed $mDefValue = null): mixed
+	/**
+	 * @param mixed $mDefValue = null
+	 *
+	 * @return mixed
+	 */
+	public function GetConf(string $sName, $mDefValue = null)
 	{
 		return isset($this->aData[$sName]) ? $this->aData[$sName] : $mDefValue;
 	}
 
-	public function SetConf(string $sName, mixed $mValue): void
+	/**
+	 * @param mixed $mValue
+	 */
+	public function SetConf(string $sName, $mValue) : void
 	{
 		$this->aData[$sName] = $mValue;
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
index 135f59fcb..c72d127f0 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
@@ -21,7 +21,7 @@ class Utils
 	 * @param mixed $value
 	 * @param int $flags Bitmask
 	 */
-	public static function jsonEncode(mixed $value, int $flags = \JSON_INVALID_UTF8_SUBSTITUTE): string
+	public static function jsonEncode($value, int $flags = \JSON_INVALID_UTF8_SUBSTITUTE) : string
 	{
 		try {
 			/* Issue with \SnappyMail\HTTP\Stream
@@ -36,7 +36,7 @@ class Utils
 		return '';
 	}
 
-	public static function EncodeKeyValuesQ(array $aValues, string $sCustomKey = ''): string
+	public static function EncodeKeyValuesQ(array $aValues, string $sCustomKey = '') : string
 	{
 		return \SnappyMail\Crypt::EncryptUrlSafe(
 			$aValues,
@@ -44,7 +44,7 @@ class Utils
 		);
 	}
 
-	public static function DecodeKeyValuesQ(string $sEncodedValues, string $sCustomKey = ''): array
+	public static function DecodeKeyValuesQ(string $sEncodedValues, string $sCustomKey = '') : array
 	{
 		return \SnappyMail\Crypt::DecryptUrlSafe(
 			$sEncodedValues,
@@ -52,7 +52,7 @@ class Utils
 		) ?: array();
 	}
 
-	public static function GetSessionToken(bool $generate = true): ?string
+	public static function GetSessionToken(bool $generate = true) : ?string
 	{
 		$sToken = \SnappyMail\Cookies::get(self::SESSION_TOKEN);
 		if (!$sToken) {
@@ -66,7 +66,7 @@ class Utils
 		return \sha1('Session'.APP_SALT.$sToken.'Token'.APP_SALT);
 	}
 
-	public static function GetConnectionToken(): string
+	public static function GetConnectionToken() : string
 	{
 		$oActions = \RainLoop\Api::Actions();
 		$oAccount = $oActions->getAccountFromToken(false);
@@ -85,13 +85,13 @@ class Utils
 		return '0-' . \sha1('Connection'.APP_SALT.$sToken.'Token'.APP_SALT);
 	}
 
-	public static function GetCsrfToken(): string
+	public static function GetCsrfToken() : string
 	{
 		return self::GetConnectionToken();
 //		return \sha1('Csrf'.APP_SALT.self::GetConnectionToken().'Token'.APP_SALT);
 	}
 
-	public static function UpdateConnectionToken(): void
+	public static function UpdateConnectionToken() : void
 	{
 		$sToken = \SnappyMail\Cookies::get(self::CONNECTION_TOKEN);
 		if ($sToken) {
@@ -99,7 +99,7 @@ class Utils
 		}
 	}
 
-	public static function ClearHtmlOutput(string $sHtml): string
+	public static function ClearHtmlOutput(string $sHtml) : string
 	{
 //		return $sHtml;
 		return \preg_replace('/>\\s+</', '> <', \preg_replace(
@@ -109,7 +109,7 @@ class Utils
 		));
 	}
 
-	public static function WebPath(): string
+	public static function WebPath() : string
 	{
 		static $sAppPath;
 		if (!$sAppPath) {
@@ -120,7 +120,7 @@ class Utils
 		return $sAppPath;
 	}
 
-	public static function WebVersionPath(): string
+	public static function WebVersionPath() : string
 	{
 		return self::WebPath() . 'snappymail/v/' . APP_VERSION . '/';
 		/**
@@ -130,12 +130,12 @@ class Utils
 //		return self::WebPath() . \str_replace(APP_INDEX_ROOT_PATH, '', APP_VERSION_ROOT_PATH);
 	}
 
-	public static function WebStaticPath(string $path = ''): string
+	public static function WebStaticPath(string $path = '') : string
 	{
 		return self::WebVersionPath() . 'static/' . $path;
 	}
 
-	public static function inOpenBasedir(string $name): string
+	public static function inOpenBasedir(string $name) : string
 	{
 		static $open_basedir;
 		if (null === $open_basedir) {
@@ -153,7 +153,7 @@ class Utils
 		return true;
 	}
 
-	public static function saveFile(string $filename, string $data): void
+	public static function saveFile(string $filename, string $data) : void
 	{
 		$dir = \dirname($filename);
 		if (!\is_dir($dir) && !\mkdir($dir, 0700, true)) {
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/BirthdayCalendarGenerator.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/BirthdayCalendarGenerator.php
index 11ae8be14..49793b0d4 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/BirthdayCalendarGenerator.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/BirthdayCalendarGenerator.php
@@ -95,7 +95,7 @@ class BirthdayCalendarGenerator
             // We've seen clients (ez-vcard) putting "BDAY:" properties
             // without a value into vCards. If we come across those, we'll
             // skip them.
-            if ('' === $object->BDAY->getValue()) {
+            if (empty($object->BDAY->getValue())) {
                 continue;
             }
 
@@ -116,7 +116,7 @@ class BirthdayCalendarGenerator
             // Skip if we can't parse the BDAY value.
             try {
                 $dateParts = DateTimeParser::parseVCardDateTime($object->BDAY->getValue());
-            } catch (InvalidDataException) {
+            } catch (InvalidDataException $e) {
                 continue;
             }
 
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Cli.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Cli.php
index 386cf2c73..69af6f470 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Cli.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Cli.php
@@ -92,7 +92,7 @@ class Cli
         // @codeCoverageIgnoreEnd
 
         try {
-            [$options, $positional] = $this->parseArguments($argv);
+            list($options, $positional) = $this->parseArguments($argv);
 
             if (isset($options['q'])) {
                 $this->quiet = true;
@@ -110,10 +110,27 @@ class Cli
 
                         return 0;
                     case 'format':
-                        $this->format = match ($value) {
-                            'jcard', 'jcal', 'vcard21', 'vcard30', 'vcard40', 'icalendar20', 'json', 'mimedir', 'icalendar', 'vcard' => $value,
-                            default => throw new \InvalidArgumentException('Unknown format: '.$value),
-                        };
+                        switch ($value) {
+                            // jcard/jcal documents
+                            case 'jcard':
+                            case 'jcal':
+                                // specific document versions
+                            case 'vcard21':
+                            case 'vcard30':
+                            case 'vcard40':
+                            case 'icalendar20':
+                                // specific formats
+                            case 'json':
+                            case 'mimedir':
+                                // icalendar/vcard
+                            case 'icalendar':
+                            case 'vcard':
+                                $this->format = $value;
+                                break;
+
+                            default:
+                                throw new \InvalidArgumentException('Unknown format: '.$value);
+                        }
                         break;
                     case 'pretty':
                         $this->pretty = true;
@@ -122,11 +139,28 @@ class Cli
                         $this->forgiving = true;
                         break;
                     case 'inputformat':
-                        $this->inputFormat = match ($value) {
-                            'jcard', 'jcal', 'json' => 'json',
-                            'mimedir', 'icalendar', 'vcard', 'vcard21', 'vcard30', 'vcard40', 'icalendar20' => 'mimedir',
-                            default => throw new \InvalidArgumentException('Unknown format: '.$value),
-                        };
+                        switch ($value) {
+                            // json formats
+                            case 'jcard':
+                            case 'jcal':
+                            case 'json':
+                                $this->inputFormat = 'json';
+                                break;
+
+                                // mimedir formats
+                            case 'mimedir':
+                            case 'icalendar':
+                            case 'vcard':
+                            case 'vcard21':
+                            case 'vcard30':
+                            case 'vcard40':
+                            case 'icalendar20':
+                                $this->inputFormat = 'mimedir';
+                                break;
+
+                            default:
+                                throw new \InvalidArgumentException('Unknown format: '.$value);
+                        }
                         break;
                     default:
                         throw new \InvalidArgumentException('Unknown option: '.$name);
@@ -147,7 +181,7 @@ class Cli
                 throw new \InvalidArgumentException('Too many arguments');
             }
 
-            if (!in_array($positional[0], ['validate', 'repair', 'convert', 'color'], true)) {
+            if (!in_array($positional[0], ['validate', 'repair', 'convert', 'color'])) {
                 throw new \InvalidArgumentException('Unknown command: '.$positional[0]);
             }
         } catch (\InvalidArgumentException $e) {
@@ -167,14 +201,14 @@ class Cli
         }
 
         if (null === $this->inputFormat) {
-            if (str_ends_with($this->inputPath, '.json')) {
+            if ('.json' === substr($this->inputPath, -5)) {
                 $this->inputFormat = 'json';
             } else {
                 $this->inputFormat = 'mimedir';
             }
         }
         if (null === $this->format) {
-            if (str_ends_with($this->outputPath, '.json')) {
+            if ('.json' === substr($this->outputPath, -5)) {
                 $this->format = 'json';
             } else {
                 $this->format = 'mimedir';
@@ -185,13 +219,12 @@ class Cli
 
         try {
             while ($input = $this->readInput()) {
-                // @phpstan-ignore method.dynamicName
                 $returnCode = $this->$command($input);
                 if (0 !== $returnCode) {
                     $realCode = $returnCode;
                 }
             }
-        } catch (EofException) {
+        } catch (EofException $e) {
             // end of file
         } catch (\Exception $e) {
             $this->log('Error: '.$e->getMessage(), 'red');
@@ -375,7 +408,7 @@ HELP
             }
             fwrite($this->stdout, json_encode($vObj->jsonSerialize(), $jsonOptions));
         } else {
-            fwrite($this->stdout, (string) $vObj->serialize());
+            fwrite($this->stdout, $vObj->serialize());
         }
 
         return 0;
@@ -505,7 +538,7 @@ HELP
         $this->cWrite('red', ':');
 
         if ($property instanceof Property\Binary) {
-            $this->cWrite('default', 'embedded binary stripped. ('.strlen((string) $property->getValue()).' bytes)');
+            $this->cWrite('default', 'embedded binary stripped. ('.strlen($property->getValue()).' bytes)');
         } else {
             $parts = $property->getParts();
             $first1 = true;
@@ -560,17 +593,17 @@ HELP
 
             $v = $argv[$ii];
 
-            if (str_starts_with((string) $v, '--')) {
+            if ('--' === substr($v, 0, 2)) {
                 // This is a long-form option.
-                $optionName = substr((string) $v, 2);
+                $optionName = substr($v, 2);
                 $optionValue = true;
                 if (strpos($optionName, '=')) {
-                    [$optionName, $optionValue] = explode('=', $optionName);
+                    list($optionName, $optionValue) = explode('=', $optionName);
                 }
                 $options[$optionName] = $optionValue;
-            } elseif (str_starts_with((string) $v, '-') && strlen((string) $v) > 1) {
+            } elseif ('-' === substr($v, 0, 1) && strlen($v) > 1) {
                 // This is a short-form option.
-                foreach (str_split(substr((string) $v, 1)) as $option) {
+                foreach (str_split(substr($v, 1)) as $option) {
                     $options[$option] = true;
                 }
             } else {
@@ -595,9 +628,6 @@ HELP
         if (!$this->parser) {
             if ('-' !== $this->inputPath) {
                 $this->stdin = fopen($this->inputPath, 'r');
-                if (false === $this->stdin) {
-                    throw new InvalidDataException('Cannot open "'.$this->inputPath);
-                }
             }
 
             if ('mimedir' === $this->inputFormat) {
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component.php
index 0849c5a8e..da2c5ebd4 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component.php
@@ -2,6 +2,7 @@
 
 namespace Sabre\VObject;
 
+use Sabre\VObject;
 use Sabre\Xml;
 
 /**
@@ -14,7 +15,7 @@ use Sabre\Xml;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  *
- * @property Property\FlatText UID
+ * @property VObject\Property\FlatText UID
  */
 class Component extends Node
 {
@@ -140,7 +141,7 @@ class Component extends Node
             // If there's no dot in the name, it's an exact property name,
             // we can just wipe out all those properties.
             //
-            if (!str_contains($item, '.')) {
+            if (false === strpos($item, '.')) {
                 unset($this->children[strtoupper($item)]);
 
                 return;
@@ -210,8 +211,8 @@ class Component extends Node
     {
         $group = null;
         $name = strtoupper($name);
-        if (str_contains($name, '.')) {
-            [$group, $name] = explode('.', $name, 2);
+        if (false !== strpos($name, '.')) {
+            list($group, $name) = explode('.', $name, 2);
         }
         if ('' === $name) {
             $name = null;
@@ -222,14 +223,16 @@ class Component extends Node
 
             if (is_null($group)) {
                 return $result;
+            } else {
+                // If we have a group filter as well, we need to narrow it down
+                // more.
+                return array_filter(
+                    $result,
+                    function ($child) use ($group) {
+                        return $child instanceof Property && (null !== $child->group ? strtoupper($child->group) : '') === $group;
+                    }
+                );
             }
-
-            // If we have a group filter as well, we need to narrow it down
-            // more.
-            return array_filter(
-                $result,
-                fn ($child) => $child instanceof Property && (null !== $child->group ? strtoupper($child->group) : '') === $group
-            );
         }
 
         // If we got to this point, it means there was no 'name' specified for
@@ -366,7 +369,7 @@ class Component extends Node
 
         $writer->startElement(strtolower($this->name));
 
-        if ([] !== $properties) {
+        if (!empty($properties)) {
             $writer->startElement('properties');
 
             foreach ($properties as $property) {
@@ -376,7 +379,7 @@ class Component extends Node
             $writer->endElement();
         }
 
-        if ([] !== $components) {
+        if (!empty($components)) {
             $writer->startElement('components');
 
             foreach ($components as $component) {
@@ -420,12 +423,13 @@ class Component extends Node
         $matches = $this->select($name);
         if (0 === count($matches)) {
             return null;
-        }
-        $firstMatch = current($matches);
-        /* @var $firstMatch Property */
-        $firstMatch->setIterator(new ElementList(array_values($matches)));
+        } else {
+            $firstMatch = current($matches);
+            /* @var $firstMatch Property */
+            $firstMatch->setIterator(new ElementList(array_values($matches)));
 
-        return $firstMatch;
+            return $firstMatch;
+        }
     }
 
     /**
@@ -539,7 +543,7 @@ class Component extends Node
         $messages = [];
 
         foreach ($this->children() as $child) {
-            $name = strtoupper((string) $child->name);
+            $name = strtoupper($child->name);
             if (!isset($propertyCounters[$name])) {
                 $propertyCounters[$name] = 1;
             } else {
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VAlarm.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VAlarm.php
index 47474dfbf..3e5797b0a 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VAlarm.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VAlarm.php
@@ -32,14 +32,20 @@ class VAlarm extends VObject\Component
     public function getEffectiveTriggerTime(): \DateTimeImmutable
     {
         $trigger = $this->TRIGGER;
-        if (!isset($trigger['VALUE']) || ($trigger['VALUE'] && 'DURATION' === strtoupper((string) $trigger['VALUE']))) {
+        if (!isset($trigger['VALUE']) || ($trigger['VALUE'] && 'DURATION' === strtoupper($trigger['VALUE']))) {
             $triggerDuration = VObject\DateTimeParser::parseDuration($this->TRIGGER);
-            $related = (isset($trigger['RELATED']) && 'END' === strtoupper($trigger['RELATED'])) ? 'END' : 'START';
+            $related = (isset($trigger['RELATED']) && 'END' == strtoupper($trigger['RELATED'])) ? 'END' : 'START';
 
             /** @var VEvent|VTodo $parentComponent */
             $parentComponent = $this->parent;
             if ('START' === $related) {
-                $effectiveTrigger = $parentComponent->DTSTART->getDateTime();
+                if ('VTODO' === $parentComponent->name) {
+                    $propName = 'DUE';
+                } else {
+                    $propName = 'DTSTART';
+                }
+
+                $effectiveTrigger = $parentComponent->$propName->getDateTime();
             } else {
                 if ('VTODO' === $parentComponent->name) {
                     $endProp = 'DUE';
@@ -96,9 +102,9 @@ class VAlarm extends VObject\Component
             }
 
             return false;
+        } else {
+            return $start <= $effectiveTrigger && $end > $effectiveTrigger;
         }
-
-        return $start <= $effectiveTrigger && $end > $effectiveTrigger;
     }
 
     /**
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VAvailability.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VAvailability.php
index a4db47642..ff6e9bd65 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VAvailability.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VAvailability.php
@@ -33,7 +33,7 @@ class VAvailability extends VObject\Component
      */
     public function isInTimeRange(\DateTimeInterface $start, \DateTimeInterface $end): bool
     {
-        [$effectiveStart, $effectiveEnd] = $this->getEffectiveStartEnd();
+        list($effectiveStart, $effectiveEnd) = $this->getEffectiveStartEnd();
 
         return
             (is_null($effectiveStart) || $start < $effectiveEnd)
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VCalendar.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VCalendar.php
index 879fcee29..b317e02c8 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VCalendar.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VCalendar.php
@@ -20,8 +20,8 @@ use Sabre\VObject\Recur\NoInstancesException;
  *
  * @property VEvent VEVENT
  * @property VJournal VJOURNAL
- * @property Property\Text ORG
- * @property Property\FlatText METHOD
+ * @property VObject\Property\Text ORG
+ * @property VObject\Property\FlatText METHOD
  */
 class VCalendar extends VObject\Document
 {
@@ -51,21 +51,21 @@ class VCalendar extends VObject\Document
      * List of value-types, and which classes they map to.
      */
     public static array $valueMap = [
-        'BINARY' => Property\Binary::class,
-        'BOOLEAN' => Property\Boolean::class,
-        'CAL-ADDRESS' => Property\ICalendar\CalAddress::class,
-        'DATE' => Property\ICalendar\Date::class,
-        'DATE-TIME' => Property\ICalendar\DateTime::class,
-        'DURATION' => Property\ICalendar\Duration::class,
-        'FLOAT' => Property\FloatValue::class,
-        'INTEGER' => Property\IntegerValue::class,
-        'PERIOD' => Property\ICalendar\Period::class,
-        'RECUR' => Property\ICalendar\Recur::class,
-        'TEXT' => Property\Text::class,
-        'TIME' => Property\Time::class,
-        'UNKNOWN' => Property\Unknown::class, // jCard / jCal-only.
-        'URI' => Property\Uri::class,
-        'UTC-OFFSET' => Property\UtcOffset::class,
+        'BINARY' => VObject\Property\Binary::class,
+        'BOOLEAN' => VObject\Property\Boolean::class,
+        'CAL-ADDRESS' => VObject\Property\ICalendar\CalAddress::class,
+        'DATE' => VObject\Property\ICalendar\Date::class,
+        'DATE-TIME' => VObject\Property\ICalendar\DateTime::class,
+        'DURATION' => VObject\Property\ICalendar\Duration::class,
+        'FLOAT' => VObject\Property\FloatValue::class,
+        'INTEGER' => VObject\Property\IntegerValue::class,
+        'PERIOD' => VObject\Property\ICalendar\Period::class,
+        'RECUR' => VObject\Property\ICalendar\Recur::class,
+        'TEXT' => VObject\Property\Text::class,
+        'TIME' => VObject\Property\Time::class,
+        'UNKNOWN' => VObject\Property\Unknown::class, // jCard / jCal-only.
+        'URI' => VObject\Property\Uri::class,
+        'UTC-OFFSET' => VObject\Property\UtcOffset::class,
     ];
 
     /**
@@ -73,82 +73,78 @@ class VCalendar extends VObject\Document
      */
     public static array $propertyMap = [
         // Calendar properties
-        'CALSCALE' => Property\FlatText::class,
-        'METHOD' => Property\FlatText::class,
-        'PRODID' => Property\FlatText::class,
-        'VERSION' => Property\FlatText::class,
+        'CALSCALE' => VObject\Property\FlatText::class,
+        'METHOD' => VObject\Property\FlatText::class,
+        'PRODID' => VObject\Property\FlatText::class,
+        'VERSION' => VObject\Property\FlatText::class,
 
         // Component properties
-        'ATTACH' => Property\Uri::class,
-        'CATEGORIES' => Property\Text::class,
-        'CLASS' => Property\FlatText::class,
-        'COMMENT' => Property\FlatText::class,
-        'DESCRIPTION' => Property\FlatText::class,
-        'GEO' => Property\FloatValue::class,
-        'LOCATION' => Property\FlatText::class,
-        'PERCENT-COMPLETE' => Property\IntegerValue::class,
-        'PRIORITY' => Property\IntegerValue::class,
-        'RESOURCES' => Property\Text::class,
-        'STATUS' => Property\FlatText::class,
-        'SUMMARY' => Property\FlatText::class,
+        'ATTACH' => VObject\Property\Uri::class,
+        'CATEGORIES' => VObject\Property\Text::class,
+        'CLASS' => VObject\Property\FlatText::class,
+        'COMMENT' => VObject\Property\FlatText::class,
+        'DESCRIPTION' => VObject\Property\FlatText::class,
+        'GEO' => VObject\Property\FloatValue::class,
+        'LOCATION' => VObject\Property\FlatText::class,
+        'PERCENT-COMPLETE' => VObject\Property\IntegerValue::class,
+        'PRIORITY' => VObject\Property\IntegerValue::class,
+        'RESOURCES' => VObject\Property\Text::class,
+        'STATUS' => VObject\Property\FlatText::class,
+        'SUMMARY' => VObject\Property\FlatText::class,
 
         // Date and Time Component Properties
-        'COMPLETED' => Property\ICalendar\DateTime::class,
-        'DTEND' => Property\ICalendar\DateTime::class,
-        'DUE' => Property\ICalendar\DateTime::class,
-        'DTSTART' => Property\ICalendar\DateTime::class,
-        'DURATION' => Property\ICalendar\Duration::class,
-        'FREEBUSY' => Property\ICalendar\Period::class,
-        'TRANSP' => Property\FlatText::class,
+        'COMPLETED' => VObject\Property\ICalendar\DateTime::class,
+        'DTEND' => VObject\Property\ICalendar\DateTime::class,
+        'DUE' => VObject\Property\ICalendar\DateTime::class,
+        'DTSTART' => VObject\Property\ICalendar\DateTime::class,
+        'DURATION' => VObject\Property\ICalendar\Duration::class,
+        'FREEBUSY' => VObject\Property\ICalendar\Period::class,
+        'TRANSP' => VObject\Property\FlatText::class,
 
         // Time Zone Component Properties
-        'TZID' => Property\FlatText::class,
-        'TZNAME' => Property\FlatText::class,
-        'TZOFFSETFROM' => Property\UtcOffset::class,
-        'TZOFFSETTO' => Property\UtcOffset::class,
-        'TZURL' => Property\Uri::class,
+        'TZID' => VObject\Property\FlatText::class,
+        'TZNAME' => VObject\Property\FlatText::class,
+        'TZOFFSETFROM' => VObject\Property\UtcOffset::class,
+        'TZOFFSETTO' => VObject\Property\UtcOffset::class,
+        'TZURL' => VObject\Property\Uri::class,
 
         // Relationship Component Properties
-        'ATTENDEE' => Property\ICalendar\CalAddress::class,
-        'CONTACT' => Property\FlatText::class,
-        'ORGANIZER' => Property\ICalendar\CalAddress::class,
-        'RECURRENCE-ID' => Property\ICalendar\DateTime::class,
-        'RELATED-TO' => Property\FlatText::class,
-        'URL' => Property\Uri::class,
-        'UID' => Property\FlatText::class,
+        'ATTENDEE' => VObject\Property\ICalendar\CalAddress::class,
+        'CONTACT' => VObject\Property\FlatText::class,
+        'ORGANIZER' => VObject\Property\ICalendar\CalAddress::class,
+        'RECURRENCE-ID' => VObject\Property\ICalendar\DateTime::class,
+        'RELATED-TO' => VObject\Property\FlatText::class,
+        'URL' => VObject\Property\Uri::class,
+        'UID' => VObject\Property\FlatText::class,
 
         // Recurrence Component Properties
-        'EXDATE' => Property\ICalendar\DateTime::class,
-        'RDATE' => Property\ICalendar\DateTime::class,
-        'RRULE' => Property\ICalendar\Recur::class,
-        'EXRULE' => Property\ICalendar\Recur::class, // Deprecated since rfc5545
+        'EXDATE' => VObject\Property\ICalendar\DateTime::class,
+        'RDATE' => VObject\Property\ICalendar\DateTime::class,
+        'RRULE' => VObject\Property\ICalendar\Recur::class,
+        'EXRULE' => VObject\Property\ICalendar\Recur::class, // Deprecated since rfc5545
 
         // Alarm Component Properties
-        'ACTION' => Property\FlatText::class,
-        'REPEAT' => Property\IntegerValue::class,
-        'TRIGGER' => Property\ICalendar\Duration::class,
+        'ACTION' => VObject\Property\FlatText::class,
+        'REPEAT' => VObject\Property\IntegerValue::class,
+        'TRIGGER' => VObject\Property\ICalendar\Duration::class,
 
         // Change Management Component Properties
-        'CREATED' => Property\ICalendar\DateTime::class,
-        'DTSTAMP' => Property\ICalendar\DateTime::class,
-        'LAST-MODIFIED' => Property\ICalendar\DateTime::class,
-        'SEQUENCE' => Property\IntegerValue::class,
+        'CREATED' => VObject\Property\ICalendar\DateTime::class,
+        'DTSTAMP' => VObject\Property\ICalendar\DateTime::class,
+        'LAST-MODIFIED' => VObject\Property\ICalendar\DateTime::class,
+        'SEQUENCE' => VObject\Property\IntegerValue::class,
 
         // Request Status
-        'REQUEST-STATUS' => Property\Text::class,
+        'REQUEST-STATUS' => VObject\Property\Text::class,
 
         // Additions from draft-daboo-valarm-extensions-04
-        'ALARM-AGENT' => Property\Text::class,
-        'ACKNOWLEDGED' => Property\ICalendar\DateTime::class,
-        'PROXIMITY' => Property\Text::class,
-        'DEFAULT-ALARM' => Property\Boolean::class,
+        'ALARM-AGENT' => VObject\Property\Text::class,
+        'ACKNOWLEDGED' => VObject\Property\ICalendar\DateTime::class,
+        'PROXIMITY' => VObject\Property\Text::class,
+        'DEFAULT-ALARM' => VObject\Property\Boolean::class,
 
         // Additions from draft-daboo-calendar-availability-05
-        'BUSYTYPE' => Property\Text::class,
-
-        // RFC 7986 properties
-        'NAME' => Property\FlatText::class,
-        'COLOR' => Property\FlatText::class,
+        'BUSYTYPE' => VObject\Property\Text::class,
     ];
 
     /**
@@ -168,12 +164,12 @@ class VCalendar extends VObject\Document
      *
      * @param string|null $componentName filter by component name
      *
-     * @return Component[]
+     * @return VObject\Component[]
      */
-    public function getBaseComponents(?string $componentName = null): array
+    public function getBaseComponents(string $componentName = null): array
     {
         $isBaseComponent = function ($component): bool {
-            if (!$component instanceof Component) {
+            if (!$component instanceof VObject\Component) {
                 return false;
             }
             if ('VTIMEZONE' === $component->name) {
@@ -218,11 +214,13 @@ class VCalendar extends VObject\Document
      * If there is no such component, null will be returned.
      *
      * @param string|null $componentName filter by component name
+     *
+     * @return VObject\Component|null
      */
-    public function getBaseComponent(?string $componentName = null): ?Component
+    public function getBaseComponent(string $componentName = null): ?Component
     {
         $isBaseComponent = function ($component): bool {
-            if (!$component instanceof Component) {
+            if (!$component instanceof VObject\Component) {
                 return false;
             }
             if ('VTIMEZONE' === $component->name) {
@@ -277,7 +275,7 @@ class VCalendar extends VObject\Document
      * @throws InvalidDataException
      * @throws VObject\Recur\MaxInstancesExceededException
      */
-    public function expand(\DateTimeInterface $start, \DateTimeInterface $end, ?\DateTimeZone $timeZone = null): VCalendar
+    public function expand(\DateTimeInterface $start, \DateTimeInterface $end, \DateTimeZone $timeZone = null): VCalendar
     {
         $newChildren = [];
         $recurringEvents = [];
@@ -331,7 +329,7 @@ class VCalendar extends VObject\Document
         foreach ($recurringEvents as $events) {
             try {
                 $it = new EventIterator($events, null, $timeZone);
-            } catch (NoInstancesException) {
+            } catch (NoInstancesException $e) {
                 // This event is recurring, but it doesn't have a single
                 // instance. We are skipping this event from the output
                 // entirely.
@@ -383,18 +381,6 @@ class VCalendar extends VObject\Document
 
             'CALSCALE' => '?',
             'METHOD' => '?',
-
-            // RFC 7986 calendar properties
-            'UID' => '?',
-            'LAST-MODIFIED' => '?',
-            'URL' => '?',
-            'REFRESH-INTERVAL' => '?',
-            'SOURCE' => '?',
-            'COLOR' => '?',
-            'NAME' => '*',
-            'DESCRIPTION' => '*',
-            'CATEGORIES' => '*',
-            'IMAGE' => '*',
         ];
     }
 
@@ -440,7 +426,7 @@ class VCalendar extends VObject\Document
             if ($child instanceof Component) {
                 ++$componentsFound;
 
-                if (!in_array($child->name, ['VEVENT', 'VTODO', 'VJOURNAL'], true)) {
+                if (!in_array($child->name, ['VEVENT', 'VTODO', 'VJOURNAL'])) {
                     continue;
                 }
                 $componentTypes[] = $child->name;
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VCard.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VCard.php
index 62223aaeb..81f78f422 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VCard.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VCard.php
@@ -82,7 +82,7 @@ class VCard extends VObject\Document
         'ROLE' => VObject\Property\FlatText::class,
         'LOGO' => VObject\Property\Binary::class,
         // 'AGENT'   => 'Sabre\\VObject\\Property\\',      // Todo: is an embedded vCard. Probably rare, so
-        // not supported at the moment
+                                 // not supported at the moment
         'ORG' => VObject\Property\Text::class,
         'NOTE' => VObject\Property\FlatText::class,
         'REV' => VObject\Property\VCard\TimeStamp::class,
@@ -132,13 +132,6 @@ class VCard extends VObject\Document
         'ORG-DIRECTORY' => VObject\Property\FlatText::class,
 
         'X-CRYPTO' => VObject\Property\XCrypto::class,
-
-        // rfc9554 properties
-        'CREATED' => VObject\Property\VCard\TimeStamp::class,
-        'GRAMGENDER' => VObject\Property\FlatText::class,
-        'LANGUAGE' => VObject\Property\VCard\LanguageTag::class,
-        'PRONOUNS' => VObject\Property\FlatText::class,
-        'SOCIALPROFILE' => VObject\Property\Uri::class,
     ];
 
     /**
@@ -333,11 +326,6 @@ class VCard extends VObject\Document
             'CALURI' => '*',
             'CATEGORIES' => '*',
             'CLIENTPIDMAP' => '*',
-            'CREATED' => '?',
-            'GRAMGENDER' => '*',
-            'LANGUAGE' => '?',
-            'PRONOUNS' => '*',
-            'SOCIALPROFILE' => '*',
             'EMAIL' => '*',
             'FBURL' => '*',
             'IMPP' => '*',
@@ -423,34 +411,6 @@ class VCard extends VObject\Document
         return null;
     }
 
-    /**
-     * Returns a property with a specific TYPE value (ADR, TEL, or EMAIL).
-     *
-     * This function will return null if the exact property list does not exist.
-     *
-     * For example to get the property of `TEL;TYPE=HOME,CELL`
-     * you would call `getByTypes('TEL', ['HOME', 'CELL'])`
-     *
-     * @param string[] $types
-     *
-     * @return \ArrayAccess|array|null
-     */
-    public function getByTypes(string $propertyName, array $types)
-    {
-        $types = array_map(strtolower(...), $types);
-        foreach ($this->select($propertyName) as $field) {
-            if (isset($field['TYPE'])) {
-                $parts = array_map(strtolower(...), $field['TYPE']->getParts());
-
-                if (!array_diff($types, $parts) && !array_diff($parts, $types)) {
-                    return $field;
-                }
-            }
-        }
-
-        return null;
-    }
-
     /**
      * This method should return a list of default property values.
      */
@@ -493,9 +453,11 @@ class VCard extends VObject\Document
         $propertiesByGroup = [];
 
         foreach ($this->children() as $property) {
-            $group = $property->group ?? '';
+            $group = $property->group;
 
-            $propertiesByGroup[$group] ??= [];
+            if (!isset($propertiesByGroup[$group])) {
+                $propertiesByGroup[$group] = [];
+            }
 
             $propertiesByGroup[$group][] = $property;
         }
@@ -503,9 +465,9 @@ class VCard extends VObject\Document
         $writer->startElement(strtolower($this->name));
 
         foreach ($propertiesByGroup as $group => $properties) {
-            if ('' !== $group) {
+            if (!empty($group)) {
                 $writer->startElement('group');
-                $writer->writeAttribute('name', strtolower((string) $group));
+                $writer->writeAttribute('name', strtolower($group));
             }
 
             foreach ($properties as $property) {
@@ -525,7 +487,7 @@ class VCard extends VObject\Document
                 }
             }
 
-            if ('' !== $group) {
+            if (!empty($group)) {
                 $writer->endElement();
             }
         }
@@ -541,7 +503,7 @@ class VCard extends VObject\Document
         $className = parent::getClassNameForPropertyName($propertyName);
 
         // In vCard 4, BINARY no longer exists, and we need URI instead.
-        if (VObject\Property\Binary::class === $className && self::VCARD40 === $this->getDocumentType()) {
+        if (VObject\Property\Binary::class == $className && self::VCARD40 === $this->getDocumentType()) {
             return VObject\Property\Uri::class;
         }
 
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VEvent.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VEvent.php
index b1a762690..e29e56322 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VEvent.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VEvent.php
@@ -41,10 +41,10 @@ class VEvent extends VObject\Component
      */
     public function isInTimeRange(\DateTimeInterface $start, \DateTimeInterface $end): bool
     {
-        if ($this->RRULE || $this->RDATE) {
+        if ($this->RRULE) {
             try {
                 $it = new EventIterator($this, null, $start->getTimezone());
-            } catch (NoInstancesException) {
+            } catch (NoInstancesException $e) {
                 // If we've caught this exception, there are no instances
                 // for the event that fall into the specified time-range.
                 return false;
@@ -117,7 +117,6 @@ class VEvent extends VObject\Component
             'DTSTART' => $hasMethod ? '?' : '1',
             'CLASS' => '?',
             'CREATED' => '?',
-            'COLOR' => '?',
             'DESCRIPTION' => '?',
             'GEO' => '?',
             'LAST-MODIFIED' => '?',
@@ -138,9 +137,7 @@ class VEvent extends VObject\Component
             'ATTENDEE' => '*',
             'CATEGORIES' => '*',
             'COMMENT' => '*',
-            'CONFERENCE' => '*',
             'CONTACT' => '*',
-            'IMAGE' => '*',
             'EXDATE' => '*',
             'REQUEST-STATUS' => '*',
             'RELATED-TO' => '*',
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VFreeBusy.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VFreeBusy.php
index 623652ff9..a9891c92c 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VFreeBusy.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VFreeBusy.php
@@ -41,7 +41,7 @@ class VFreeBusy extends VObject\Component
                 // Every period is formatted as [start]/[end]. The start is an
                 // absolute UTC time, the end may be an absolute UTC time, or
                 // duration (relative) value.
-                [$busyStart, $busyEnd] = explode('/', $period);
+                list($busyStart, $busyEnd) = explode('/', $period);
 
                 $busyStart = VObject\DateTimeParser::parse($busyStart);
                 $busyEnd = VObject\DateTimeParser::parse($busyEnd);
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VJournal.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VJournal.php
index 79c14dece..30e40adf7 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VJournal.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VJournal.php
@@ -62,7 +62,6 @@ class VJournal extends VObject\Component
 
             'CLASS' => '?',
             'CREATED' => '?',
-            'COLOR' => '?',
             'DTSTART' => '?',
             'LAST-MODIFIED' => '?',
             'ORGANIZER' => '?',
@@ -79,7 +78,6 @@ class VJournal extends VObject\Component
             'CATEGORIES' => '*',
             'COMMENT' => '*',
             'CONTACT' => '*',
-            'IMAGE' => '*',
             'DESCRIPTION' => '*',
             'EXDATE' => '*',
             'RELATED-TO' => '*',
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VTodo.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VTodo.php
index e0ed15de0..bda49da74 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VTodo.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VTodo.php
@@ -54,9 +54,9 @@ class VTodo extends VObject\Component
                 return
                     ($start < $due || $start <= $dtstart)
                     && ($end > $dtstart || $end >= $due);
+            } else {
+                return $start <= $dtstart && $end > $dtstart;
             }
-
-            return $start <= $dtstart && $end > $dtstart;
         }
         if ($due) {
             return $start < $due && $end >= $due;
@@ -98,14 +98,13 @@ class VTodo extends VObject\Component
             'CLASS' => '?',
             'COMPLETED' => '?',
             'CREATED' => '?',
-            'COLOR' => '?',
             'DESCRIPTION' => '?',
             'DTSTART' => '?',
             'GEO' => '?',
             'LAST-MODIFIED' => '?',
             'LOCATION' => '?',
             'ORGANIZER' => '?',
-            'PERCENT-COMPLETE' => '?',
+            'PERCENT' => '?',
             'PRIORITY' => '?',
             'RECURRENCE-ID' => '?',
             'SEQUENCE' => '?',
@@ -121,9 +120,7 @@ class VTodo extends VObject\Component
             'ATTENDEE' => '*',
             'CATEGORIES' => '*',
             'COMMENT' => '*',
-            'CONFERENCE' => '*',
             'CONTACT' => '*',
-            'IMAGE' => '*',
             'EXDATE' => '*',
             'REQUEST-STATUS' => '*',
             'RELATED-TO' => '*',
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/DateTimeParser.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/DateTimeParser.php
index fad973a8c..8dbb6cfdb 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/DateTimeParser.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/DateTimeParser.php
@@ -27,7 +27,7 @@ class DateTimeParser
      *
      * @throws InvalidDataException
      */
-    public static function parseDateTime(string $dt, ?\DateTimeZone $tz = null): \DateTimeImmutable
+    public static function parseDateTime(string $dt, \DateTimeZone $tz = null): \DateTimeImmutable
     {
         // Format is YYYYMMDD + "T" + hhmmss
         $result = preg_match('/^([0-9]{4})([0-1][0-9])([0-3][0-9])T([0-2][0-9])([0-5][0-9])([0-5][0-9])([Z]?)$/', $dt, $matches);
@@ -42,7 +42,7 @@ class DateTimeParser
 
         try {
             $date = new \DateTimeImmutable($matches[1].'-'.$matches[2].'-'.$matches[3].' '.$matches[4].':'.$matches[5].':'.$matches[6], $tz);
-        } catch (\Exception) {
+        } catch (\Exception $e) {
             throw new InvalidDataException('The supplied iCalendar datetime value is incorrect: '.$dt);
         }
 
@@ -54,7 +54,7 @@ class DateTimeParser
      *
      * @throws InvalidDataException
      */
-    public static function parseDate(string $date, ?\DateTimeZone $tz = null): \DateTimeImmutable
+    public static function parseDate(string $date, \DateTimeZone $tz = null): \DateTimeImmutable
     {
         // Format is YYYYMMDD
         $result = preg_match('/^([0-9]{4})([0-1][0-9])([0-3][0-9])$/', $date, $matches);
@@ -63,11 +63,13 @@ class DateTimeParser
             throw new InvalidDataException('The supplied iCalendar date value is incorrect: '.$date);
         }
 
-        $tz ??= new \DateTimeZone('UTC');
+        if (is_null($tz)) {
+            $tz = new \DateTimeZone('UTC');
+        }
 
         try {
             $date = new \DateTimeImmutable($matches[1].'-'.$matches[2].'-'.$matches[3], $tz);
-        } catch (\Exception) {
+        } catch (\Exception $e) {
             throw new InvalidDataException('The supplied iCalendar date value is incorrect: '.$date);
         }
 
@@ -96,12 +98,12 @@ class DateTimeParser
         }
 
         $parts = [
-            'week',
-            'day',
-            'hour',
-            'minute',
-            'second',
-        ];
+                'week',
+                'day',
+                'hour',
+                'minute',
+                'second',
+            ];
 
         foreach ($parts as $part) {
             $matches[$part] = isset($matches[$part]) && $matches[$part] ? (int) $matches[$part] : 0;
@@ -203,9 +205,9 @@ class DateTimeParser
             return self::parseDuration($date);
         } elseif (8 === strlen($date)) {
             return self::parseDate($date, $referenceTz);
+        } else {
+            return self::parseDateTime($date, $referenceTz);
         }
-
-        return self::parseDateTime($date, $referenceTz);
     }
 
     /**
@@ -327,7 +329,7 @@ class DateTimeParser
 
         $result = [];
         foreach ($parts as $part) {
-            if (!array_key_exists($part, $matches) || '' === $matches[$part]) {
+            if (empty($matches[$part])) {
                 $result[$part] = null;
             } elseif ('-' === $matches[$part] || '--' === $matches[$part]) {
                 $result[$part] = null;
@@ -422,7 +424,7 @@ class DateTimeParser
 
         $result = [];
         foreach ($parts as $part) {
-            if (!array_key_exists($part, $matches) || '' === $matches[$part]) {
+            if (empty($matches[$part])) {
                 $result[$part] = null;
             } elseif ('-' === $matches[$part]) {
                 $result[$part] = null;
@@ -539,7 +541,7 @@ class DateTimeParser
         $parts['year0'] = &$parts['year'];
 
         foreach ($parts as $part => &$value) {
-            if (array_key_exists($part, $matches) && '' !== $matches[$part]) {
+            if (!empty($matches[$part])) {
                 $value = $matches[$part];
             }
         }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Document.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Document.php
index 8319b49be..b311987d7 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Document.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Document.php
@@ -2,6 +2,8 @@
 
 namespace Sabre\VObject;
 
+use Sabre\VObject;
+
 /**
  * Document.
  *
@@ -16,7 +18,7 @@ namespace Sabre\VObject;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  *
- * @property Property\FlatText VERSION
+ * @property VObject\Property\FlatText VERSION
  */
 abstract class Document extends Component
 {
@@ -118,10 +120,10 @@ abstract class Document extends Component
     public function create(string $name)
     {
         if (isset(static::$componentMap[strtoupper($name)])) {
-            return $this->createComponent(...func_get_args());
+            return call_user_func_array([$this, 'createComponent'], func_get_args());
+        } else {
+            return call_user_func_array([$this, 'createProperty'], func_get_args());
         }
-
-        return $this->createProperty(...func_get_args());
     }
 
     /**
@@ -138,7 +140,7 @@ abstract class Document extends Component
      * an iCalendar object, this may be something like CALSCALE:GREGORIAN. To
      * ensure that this does not happen, set $defaults to false.
      */
-    public function createComponent(string $name, ?array $children = null, bool $defaults = true): Component
+    public function createComponent(string $name, array $children = null, bool $defaults = true): Component
     {
         $name = strtoupper($name);
         $class = Component::class;
@@ -146,7 +148,9 @@ abstract class Document extends Component
         if (isset(static::$componentMap[$name])) {
             $class = static::$componentMap[$name];
         }
-        $children ??= [];
+        if (is_null($children)) {
+            $children = [];
+        }
 
         return new $class($this, $name, $children, $defaults);
     }
@@ -165,7 +169,7 @@ abstract class Document extends Component
      *
      * @throws InvalidDataException
      */
-    public function createProperty(string $name, $value = null, ?array $parameters = null, ?string $valueType = null, ?int $lineIndex = null, ?string $lineString = null): Property
+    public function createProperty(string $name, $value = null, array $parameters = null, string $valueType = null): Property
     {
         // If there's a . in the name, it means it's prefixed by a group name.
         if (false !== ($i = strpos($name, '.'))) {
@@ -178,31 +182,28 @@ abstract class Document extends Component
 
         $class = null;
 
-        // If a VALUE parameter is supplied, we have to use that
-        // According to https://datatracker.ietf.org/doc/html/rfc5545#section-3.2.20
-        //  If the property's value is the default value type, then this
-        //  parameter need not be specified.  However, if the property's
-        //  default value type is overridden by some other allowable value
-        //  type, then this parameter MUST be specified.
-        if (!$valueType) {
-            $valueType = $parameters['VALUE'] ?? null;
-        }
-
         if ($valueType) {
             // The valueType argument comes first to figure out the correct
             // class.
             $class = $this->getClassNameForPropertyValue($valueType);
         }
 
-        // If the value parameter is not set or set to something we do not recognize
-        // we do not attempt to interpret or parse the datass value as specified in
-        // https://datatracker.ietf.org/doc/html/rfc5545#section-3.2.20
-        // So when we so far did not get a class-name, we use the default for the property
-        $class ??= $this->getClassNameForPropertyName($name);
+        if (is_null($class)) {
+            // If a VALUE parameter is supplied, we should use that.
+            if (isset($parameters['VALUE'])) {
+                $class = $this->getClassNameForPropertyValue($parameters['VALUE']);
+                if (is_null($class)) {
+                    throw new InvalidDataException('Unsupported VALUE parameter for '.$name.' property. You supplied "'.$parameters['VALUE'].'"');
+                }
+            } else {
+                $class = $this->getClassNameForPropertyName($name);
+            }
+        }
+        if (is_null($parameters)) {
+            $parameters = [];
+        }
 
-        $parameters ??= [];
-
-        return new $class($this, $name, $value, $parameters, $group, $lineIndex, $lineString);
+        return new $class($this, $name, $value, $parameters, $group);
     }
 
     /**
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/FreeBusyData.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/FreeBusyData.php
index 6cdf2b937..405a5886d 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/FreeBusyData.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/FreeBusyData.php
@@ -11,19 +11,25 @@ namespace Sabre\VObject;
  */
 class FreeBusyData
 {
+    /**
+     * Start timestamp.
+     */
+    protected int $start;
+
+    /**
+     * End timestamp.
+     */
+    protected int $end;
+
     /**
      * A list of free-busy times.
      */
     protected array $data;
 
-    public function __construct(/**
-     * Start timestamp.
-     */
-        protected int $start, /**
-     * End timestamp.
-     */
-        protected int $end)
+    public function __construct(int $start, int $end)
     {
+        $this->start = $start;
+        $this->end = $end;
         $this->data = [];
 
         $this->data[] = [
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/FreeBusyGenerator.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/FreeBusyGenerator.php
index 9eec5c8d7..2f222e4e5 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/FreeBusyGenerator.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/FreeBusyGenerator.php
@@ -72,14 +72,16 @@ class FreeBusyGenerator
      * Check the setTimeRange and setObjects methods for details about the
      * arguments.
      */
-    public function __construct(?\DateTimeInterface $start = null, ?\DateTimeInterface $end = null, $objects = null, ?\DateTimeZone $timeZone = null)
+    public function __construct(\DateTimeInterface $start = null, \DateTimeInterface $end = null, $objects = null, \DateTimeZone $timeZone = null)
     {
         $this->setTimeRange($start, $end);
 
         if ($objects) {
             $this->setObjects($objects);
         }
-        $timeZone ??= new \DateTimeZone('UTC');
+        if (is_null($timeZone)) {
+            $timeZone = new \DateTimeZone('UTC');
+        }
         $this->setTimeZone($timeZone);
     }
 
@@ -136,7 +138,7 @@ class FreeBusyGenerator
      *
      * @throws \Exception
      */
-    public function setTimeRange(?\DateTimeInterface $start = null, ?\DateTimeInterface $end = null): void
+    public function setTimeRange(\DateTimeInterface $start = null, \DateTimeInterface $end = null): void
     {
         if (!$start) {
             $start = new \DateTimeImmutable(Settings::$minDate);
@@ -215,7 +217,7 @@ class FreeBusyGenerator
         $new = [];
 
         foreach ($old as $vavail) {
-            [$compStart, $compEnd] = $vavail->getEffectiveStartEnd();
+            list($compStart, $compEnd) = $vavail->getEffectiveStartEnd();
 
             // We don't care about date-times that are earlier or later than the
             // start and end of the freebusy report, so this gets normalized
@@ -235,7 +237,7 @@ class FreeBusyGenerator
             // Going through our existing list of components to see if there's
             // a higher priority component that already fully covers this one.
             foreach ($new as $higherVavail) {
-                [$higherStart, $higherEnd] = $higherVavail->getEffectiveStartEnd();
+                list($higherStart, $higherEnd) = $higherVavail->getEffectiveStartEnd();
                 if (
                     (is_null($higherStart) || $higherStart < $compStart)
                     && (is_null($higherEnd) || $higherEnd > $compEnd)
@@ -257,7 +259,7 @@ class FreeBusyGenerator
         // priority components to override the lower ones.
         foreach (array_reverse($new) as $vavail) {
             $busyType = isset($vavail->BUSYTYPE) ? strtoupper($vavail->BUSYTYPE) : 'BUSY-UNAVAILABLE';
-            [$vavailStart, $vavailEnd] = $vavail->getEffectiveStartEnd();
+            list($vavailStart, $vavailEnd) = $vavail->getEffectiveStartEnd();
 
             // Making the component size no larger than the requested free-busy
             // report range.
@@ -279,7 +281,7 @@ class FreeBusyGenerator
             // Looping over the AVAILABLE components.
             if (isset($vavail->AVAILABLE)) {
                 foreach ($vavail->AVAILABLE as $available) {
-                    [$availStart, $availEnd] = $available->getEffectiveStartEnd();
+                    list($availStart, $availEnd) = $available->getEffectiveStartEnd();
                     $fbData->add(
                         $availStart->getTimeStamp(),
                         $availEnd->getTimeStamp(),
@@ -360,7 +362,7 @@ class FreeBusyGenerator
                         if ($component->RRULE) {
                             try {
                                 $iterator = new EventIterator($object, (string) $component->UID, $this->timeZone);
-                            } catch (NoInstancesException) {
+                            } catch (NoInstancesException $e) {
                                 // This event is recurring, but it doesn't have a single
                                 // instance. We are skipping this event from the output
                                 // entirely.
@@ -435,12 +437,12 @@ class FreeBusyGenerator
                                 continue;
                             }
 
-                            $values = explode(',', (string) $freebusy);
+                            $values = explode(',', $freebusy);
                             foreach ($values as $value) {
-                                [$startTime, $endTime] = explode('/', $value);
+                                list($startTime, $endTime) = explode('/', $value);
                                 $startTime = DateTimeParser::parseDateTime($startTime);
 
-                                if (str_starts_with($endTime, 'P') || str_starts_with($endTime, '-P')) {
+                                if ('P' === substr($endTime, 0, 1) || '-P' === substr($endTime, 0, 2)) {
                                     $duration = DateTimeParser::parseDuration($endTime);
                                     $endTime = clone $startTime;
                                     $endTime = $endTime->add($duration);
@@ -505,7 +507,7 @@ class FreeBusyGenerator
         $vfreebusy->add($dtstamp);
 
         foreach ($fbData->getData() as $busyTime) {
-            $busyType = strtoupper((string) $busyTime['type']);
+            $busyType = strtoupper($busyTime['type']);
 
             // Ignoring all the FREE parts, because those are already assumed.
             if ('FREE' === $busyType) {
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ITip/Broker.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ITip/Broker.php
index 19de8b16b..f792fd990 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ITip/Broker.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ITip/Broker.php
@@ -113,7 +113,7 @@ class Broker
      * @throws MaxInstancesExceededException
      * @throws NoInstancesException
      */
-    public function processMessage(Message $itipMessage, ?VCalendar $existingObject = null)
+    public function processMessage(Message $itipMessage, VCalendar $existingObject = null)
     {
         // We only support events at the moment.
         if ('VEVENT' !== $itipMessage->component) {
@@ -228,7 +228,7 @@ class Broker
 
             $eventInfo = $oldEventInfo;
 
-            if (in_array($eventInfo['organizer'], $userHref, true)) {
+            if (in_array($eventInfo['organizer'], $userHref)) {
                 // This is an organizer deleting the event.
                 $eventInfo['attendees'] = [];
                 // Increasing the sequence, but only if the organizer deleted
@@ -237,7 +237,7 @@ class Broker
             } else {
                 // This is an attendee deleting the event.
                 foreach ($eventInfo['attendees'] as $key => $attendee) {
-                    if (in_array($attendee['href'], $userHref, true)) {
+                    if (in_array($attendee['href'], $userHref)) {
                         $eventInfo['attendees'][$key]['instances'] = ['master' => ['id' => 'master', 'partstat' => 'DECLINED'],
                         ];
                     }
@@ -246,29 +246,16 @@ class Broker
             $baseCalendar = $oldCalendar;
         }
 
-        // Check if the user is the organizer
-        if (in_array($eventInfo['organizer'], $userHref, true)) {
+        if (in_array($eventInfo['organizer'], $userHref)) {
             return $this->parseEventForOrganizer($baseCalendar, $eventInfo, $oldEventInfo);
-        }
-
-        // Check if the user is an attendee
-        foreach ($eventInfo['attendees'] as $attendee) {
-            if (in_array($attendee['href'], $userHref, true)) {
-                // If this is a event update, we always generate a reply
-                if ($oldCalendar) {
+        } elseif ($oldCalendar) {
+            // We need to figure out if the user is an attendee, but we're only
+            // doing so if there's an oldCalendar, because we only want to
+            // process updates, not creation of new events.
+            foreach ($eventInfo['attendees'] as $attendee) {
+                if (in_array($attendee['href'], $userHref)) {
                     return $this->parseEventForAttendee($baseCalendar, $eventInfo, $oldEventInfo, $attendee['href']);
                 }
-
-                // If this is a new event, we only generate a reply if the participation status is set
-                foreach ($attendee['instances'] as $instance) {
-                    if (isset($instance['partstat']) && 'NEEDS-ACTION' !== $instance['partstat']) {
-                        // Attendee has responded (ACCEPTED/DECLINED/TENTATIVE) - generate REPLY
-                        return $this->parseEventForAttendee($baseCalendar, $eventInfo, $oldEventInfo, $attendee['href']);
-                    }
-                }
-
-                // User is attendee but no response to process
-                break;
             }
         }
 
@@ -281,7 +268,7 @@ class Broker
      * This is message from an organizer, and is either a new event
      * invite, or an update to an existing one.
      */
-    protected function processMessageRequest(Message $itipMessage, ?VCalendar $existingObject = null): ?VCalendar
+    protected function processMessageRequest(Message $itipMessage, VCalendar $existingObject = null): ?VCalendar
     {
         if (!$existingObject) {
             // This is a new invite, and we're just going to copy over
@@ -309,7 +296,7 @@ class Broker
      * attendee got removed from an event, or an event got cancelled
      * altogether.
      */
-    protected function processMessageCancel(Message $itipMessage, ?VCalendar $existingObject = null): ?VCalendar
+    protected function processMessageCancel(Message $itipMessage, VCalendar $existingObject = null): ?VCalendar
     {
         if (!$existingObject) {
             // The event didn't exist in the first place, so we're just
@@ -334,7 +321,7 @@ class Broker
      * @throws MaxInstancesExceededException
      * @throws NoInstancesException
      */
-    protected function processMessageReply(Message $itipMessage, ?VCalendar $existingObject = null): ?VCalendar
+    protected function processMessageReply(Message $itipMessage, VCalendar $existingObject = null): ?VCalendar
     {
         // A reply can only be processed based on an existing object.
         // If the object is not available, the reply is ignored.
@@ -346,15 +333,12 @@ class Broker
 
         // Finding all the instances the attendee replied to.
         foreach ($itipMessage->message->VEVENT as $vevent) {
-            // Use the Unix timestamp returned by getTimestamp as a unique identifier for the recurrence.
-            // The Unix timestamp will be the same for an event, even if the reply from the attendee
-            // used a different format/timezone to express the event date-time.
-            $recurId = isset($vevent->{'RECURRENCE-ID'}) ? $vevent->{'RECURRENCE-ID'}->getDateTime()->getTimestamp() : 'master';
+            $recurId = isset($vevent->{'RECURRENCE-ID'}) ? $vevent->{'RECURRENCE-ID'}->getValue() : 'master';
             $attendee = $vevent->ATTENDEE;
             $instances[$recurId] = $attendee['PARTSTAT']->getValue();
             if (isset($vevent->{'REQUEST-STATUS'})) {
                 $requestStatus = $vevent->{'REQUEST-STATUS'}->getValue();
-                [$requestStatus] = explode(';', $requestStatus);
+                list($requestStatus) = explode(';', $requestStatus);
             }
         }
 
@@ -362,8 +346,7 @@ class Broker
         // all the instances where we have a reply for.
         $masterObject = null;
         foreach ($existingObject->VEVENT as $vevent) {
-            // Use the Unix timestamp returned by getTimestamp as a unique identifier for the recurrence.
-            $recurId = isset($vevent->{'RECURRENCE-ID'}) ? $vevent->{'RECURRENCE-ID'}->getDateTime()->getTimestamp() : 'master';
+            $recurId = isset($vevent->{'RECURRENCE-ID'}) ? $vevent->{'RECURRENCE-ID'}->getValue() : 'master';
             if ('master' === $recurId) {
                 $masterObject = $vevent;
             }
@@ -410,10 +393,7 @@ class Broker
                 $newObject = $recurrenceIterator->getEventObject();
                 $recurrenceIterator->next();
 
-                // Compare the Unix timestamp returned by getTimestamp with the previously calculated timestamp.
-                // If they are the same, then this is a matching recurrence, even though its date-time may have
-                // been expressed in a different format/timezone.
-                if (isset($newObject->{'RECURRENCE-ID'}) && $newObject->{'RECURRENCE-ID'}->getDateTime()->getTimestamp() === $recurId) {
+                if (isset($newObject->{'RECURRENCE-ID'}) && $newObject->{'RECURRENCE-ID'}->getValue() === $recurId) {
                     $found = true;
                 }
                 --$iterations;
@@ -492,6 +472,7 @@ class Broker
         }
 
         $messages = [];
+
         foreach ($attendees as $attendee) {
             // An organizer can also be an attendee. We should not generate any
             // messages for those.
@@ -515,11 +496,10 @@ class Broker
                 $icalMsg->add(clone $timezone);
             }
 
-            if (!$attendee['newInstances'] || 'CANCELLED' === $eventInfo['status']) {
-                // If there are no instances the attendee is a part of, it means
-                // the attendee was removed and we need to send them a CANCEL message.
-                // Also If the meeting STATUS property was changed to CANCELLED
-                // we need to send the attendee a CANCEL message.
+            if (!$attendee['newInstances']) {
+                // If there are no instances the attendee is a part of, it
+                // means the attendee was removed and we need to send him a
+                // CANCEL.
                 $message->method = 'CANCEL';
 
                 $icalMsg->METHOD = $message->method;
@@ -566,7 +546,7 @@ class Broker
 
                 $message->significantChange =
                     'REQUEST' === $attendee['forceSend']
-                    || count($oldAttendeeInstances) !== count($newAttendeeInstances)
+                    || count($oldAttendeeInstances) != count($newAttendeeInstances)
                     || count(array_diff($oldAttendeeInstances, $newAttendeeInstances)) > 0
                     || $oldEventInfo['significantChangeHash'] !== $eventInfo['significantChangeHash'];
 
@@ -576,9 +556,9 @@ class Broker
                         // We need to find a list of events that the attendee
                         // is not a part of to add to the list of exceptions.
                         $exceptions = [];
-                        foreach ($eventInfo['instances'] as $eventInstanceId => $vevent) {
-                            if (!isset($attendee['newInstances'][$eventInstanceId])) {
-                                $exceptions[] = $eventInstanceId;
+                        foreach ($eventInfo['instances'] as $instanceId => $vevent) {
+                            if (!isset($attendee['newInstances'][$instanceId])) {
+                                $exceptions[] = $instanceId;
                             }
                         }
 
@@ -592,9 +572,6 @@ class Broker
                                 ));
                             } else {
                                 $currentEvent->EXDATE = $exceptions;
-                                if ($currentEvent->DTSTART['TZID']) {
-                                    $currentEvent->EXDATE['TZID'] = clone $currentEvent->DTSTART['TZID'];
-                                }
                             }
                         }
 
@@ -603,13 +580,15 @@ class Broker
                         unset($currentEvent->ORGANIZER['SCHEDULE-FORCE-SEND']);
                         unset($currentEvent->ORGANIZER['SCHEDULE-STATUS']);
 
-                        foreach ($currentEvent->ATTENDEE as $currentEventAttendee) {
-                            unset($currentEventAttendee['SCHEDULE-FORCE-SEND']);
-                            unset($currentEventAttendee['SCHEDULE-STATUS']);
+                        foreach ($currentEvent->ATTENDEE as $attendee) {
+                            unset($attendee['SCHEDULE-FORCE-SEND']);
+                            unset($attendee['SCHEDULE-STATUS']);
 
                             // We're adding PARTSTAT=NEEDS-ACTION to ensure that
                             // iOS shows an "Inbox Item"
-                            $currentEventAttendee['PARTSTAT'] ??= 'NEEDS-ACTION';
+                            if (!isset($attendee['PARTSTAT'])) {
+                                $attendee['PARTSTAT'] = 'NEEDS-ACTION';
+                            }
                         }
                     }
 
@@ -646,12 +625,7 @@ class Broker
             return [];
         }
 
-        $oldInstances =
-            is_array($oldEventInfo['attendees'])
-            && array_key_exists($attendee, $oldEventInfo['attendees'])
-            && is_array($oldEventInfo['attendees'][$attendee])
-            && array_key_exists('instances', $oldEventInfo['attendees'][$attendee])
-            && is_array($oldEventInfo['attendees'][$attendee]['instances']) ?
+        $oldInstances = !empty($oldEventInfo['attendees'][$attendee]['instances']) ?
             $oldEventInfo['attendees'][$attendee]['instances'] :
             [];
 
@@ -682,7 +656,7 @@ class Broker
         // We only need to do that though, if the master event is not declined.
         if (isset($instances['master']) && 'DECLINED' !== $instances['master']['newstatus']) {
             foreach ($eventInfo['exdate'] as $exDate) {
-                if (!in_array($exDate, $oldEventInfo['exdate'] ?? [], true)) {
+                if (!in_array($exDate, $oldEventInfo['exdate'])) {
                     if (isset($instances[$exDate])) {
                         $instances[$exDate]['newstatus'] = 'DECLINED';
                     } else {
@@ -725,7 +699,7 @@ class Broker
         $hasReply = false;
 
         foreach ($instances as $instance) {
-            if ($instance['oldstatus'] === $instance['newstatus'] && 'REPLY' !== $eventInfo['organizerForceSend']) {
+            if ($instance['oldstatus'] == $instance['newstatus'] && 'REPLY' !== $eventInfo['organizerForceSend']) {
                 // Skip
                 continue;
             }
@@ -757,7 +731,7 @@ class Broker
                 // EXDATE
                 $dt = DateTimeParser::parse($instance['id'], $eventInfo['timezone']);
                 // Treat is as a DATE field
-                if (strlen((string) $instance['id']) <= 8) {
+                if (strlen($instance['id']) <= 8) {
                     $event->add('DTSTART', $dt, ['VALUE' => 'DATE']);
                 } else {
                     $event->add('DTSTART', $dt);
@@ -769,7 +743,7 @@ class Broker
             if ('master' !== $instance['id']) {
                 $dt = DateTimeParser::parse($instance['id'], $eventInfo['timezone']);
                 // Treat is as a DATE field
-                if (strlen((string) $instance['id']) <= 8) {
+                if (strlen($instance['id']) <= 8) {
                     $event->add('RECURRENCE-ID', $dt, ['VALUE' => 'DATE']);
                 } else {
                     $event->add('RECURRENCE-ID', $dt);
@@ -792,9 +766,9 @@ class Broker
             $message->message = $icalMsg;
 
             return [$message];
+        } else {
+            return [];
         }
-
-        return [];
     }
 
     /**
@@ -861,7 +835,7 @@ class Broker
                     $organizer = $vevent->ORGANIZER->getNormalizedValue();
                     $organizerName = $vevent->ORGANIZER['CN'] ?? null;
                 } else {
-                    if (strtoupper($organizer) !== strtoupper((string) $vevent->ORGANIZER->getNormalizedValue())) {
+                    if (strtoupper($organizer) !== strtoupper($vevent->ORGANIZER->getNormalizedValue())) {
                         throw new SameOrganizerForAllComponentsException('Every instance of the event must have the same organizer.');
                     }
                 }
@@ -887,7 +861,7 @@ class Broker
                 foreach ($vevent->select('RRULE') as $rr) {
                     foreach ($rr->getParts() as $key => $val) {
                         // ignore default values (https://github.com/sabre-io/vobject/issues/126)
-                        if ('INTERVAL' === $key && '1' === (string) $val) {
+                        if ('INTERVAL' === $key && 1 == $val) {
                             continue;
                         }
                         if (is_array($val)) {
@@ -899,7 +873,7 @@ class Broker
                 sort($rrule);
             }
             if (isset($vevent->STATUS)) {
-                $status = strtoupper((string) $vevent->STATUS->getValue());
+                $status = strtoupper($vevent->STATUS->getValue());
             }
 
             $recurId = isset($vevent->{'RECURRENCE-ID'}) ? $vevent->{'RECURRENCE-ID'}->getValue() : 'master';
@@ -910,14 +884,11 @@ class Broker
                     $timezone = $vevent->{'RECURRENCE-ID'}->getDateTime()->getTimeZone();
                 }
             }
-
-            $instances[$recurId] = $vevent;
-
             if (isset($vevent->ATTENDEE)) {
                 foreach ($vevent->ATTENDEE as $attendee) {
                     if ($this->scheduleAgentServerRules
                         && isset($attendee['SCHEDULE-AGENT'])
-                        && 'CLIENT' === strtoupper((string) $attendee['SCHEDULE-AGENT']->getValue())
+                        && 'CLIENT' === strtoupper($attendee['SCHEDULE-AGENT']->getValue())
                     ) {
                         continue;
                     }
@@ -951,10 +922,10 @@ class Broker
                         ];
                     }
                 }
+                $instances[$recurId] = $vevent;
             }
 
             foreach ($this->significantChangeProperties as $prop) {
-                // @phpstan-ignore property.dynamicName
                 if (isset($vevent->$prop)) {
                     $propertyValues = $vevent->select($prop);
 
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ITip/Message.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ITip/Message.php
index 505e07f25..9aa93996a 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ITip/Message.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ITip/Message.php
@@ -32,12 +32,12 @@ class Message
      * Contains the ITip method, which is something like REQUEST, REPLY or
      * CANCEL.
      */
-    public ?string $method = null;
+    public ?string $method;
 
     /**
      * The current sequence number for the event.
      */
-    public ?int $sequence = null;
+    public ?int $sequence;
 
     /**
      * The senders' email address.
@@ -52,7 +52,7 @@ class Message
      * The name of the sender. This is often populated from a CN parameter from
      * either the ORGANIZER or ATTENDEE, depending on the message.
      */
-    public ?string $senderName = null;
+    public ?string $senderName;
 
     /**
      * The recipient's email address.
@@ -63,7 +63,7 @@ class Message
      * The name of the recipient. This is usually populated with the CN
      * parameter from the ATTENDEE or ORGANIZER property, if it's available.
      */
-    public ?string $recipientName = null;
+    public ?string $recipientName;
 
     /**
      * After the message has been delivered, this should contain a string such
@@ -107,9 +107,10 @@ class Message
     {
         if (!$this->scheduleStatus) {
             return false;
-        }
-        [$scheduleStatus] = explode(';', $this->scheduleStatus);
+        } else {
+            list($scheduleStatus) = explode(';', $this->scheduleStatus);
 
-        return $scheduleStatus;
+            return $scheduleStatus;
+        }
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Node.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Node.php
index 47889a2ab..0dbe7cfad 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Node.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Node.php
@@ -42,7 +42,7 @@ abstract class Node implements \IteratorAggregate, \ArrayAccess, \Countable, \Js
     /**
      * Reference to the parent object, if this is not the top object.
      */
-    public ?Node $parent = null;
+    public ?Node $parent;
 
     /**
      * Iterator override.
@@ -52,7 +52,7 @@ abstract class Node implements \IteratorAggregate, \ArrayAccess, \Countable, \Js
     /**
      * The root document.
      */
-    protected ?Component $root = null;
+    protected ?Component $root;
 
     /**
      * Serializes the node into a mimedir format.
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/PHPUnitAssertions.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/PHPUnitAssertions.php
index aad5438a5..1976c3afd 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/PHPUnitAssertions.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/PHPUnitAssertions.php
@@ -41,7 +41,7 @@ trait PHPUnitAssertions
                 $input = Reader::read($input);
             }
             if (!$input instanceof Component) {
-                self::fail('Input must be a string, stream or VObject component');
+                $this->fail('Input must be a string, stream or VObject component');
             }
             unset($input->PRODID);
             if ($input instanceof Component\VCalendar && 'GREGORIAN' === (string) $input->CALSCALE) {
@@ -51,28 +51,23 @@ trait PHPUnitAssertions
             return $input;
         };
 
-        /**
-         * @var string $expectedSerialized
-         */
-        $expectedSerialized = $getObj($expected)->serialize();
-        $actualSerialized = $getObj($actual)->serialize();
+        $expected = $getObj($expected)->serialize();
+        $actual = $getObj($actual)->serialize();
 
         // Finding wildcards in expected.
-        $result = preg_match_all('|^([A-Z]+):\\*\\*ANY\\*\\*\r$|m', $expectedSerialized, $matches, PREG_SET_ORDER);
-
-        self::assertNotFalse($result);
+        preg_match_all('|^([A-Z]+):\\*\\*ANY\\*\\*\r$|m', $expected, $matches, PREG_SET_ORDER);
 
         foreach ($matches as $match) {
-            $actualSerialized = preg_replace(
+            $actual = preg_replace(
                 '|^'.preg_quote($match[1], '|').':(.*)\r$|m',
                 $match[1].':**ANY**'."\r",
-                (string) $actualSerialized
+                $actual
             );
         }
 
-        self::assertEquals(
-            $expectedSerialized,
-            $actualSerialized,
+        $this->assertEquals(
+            $expected,
+            $actual,
             $message
         );
     }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parameter.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parameter.php
index c97e76ea9..c5217f1dc 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parameter.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parameter.php
@@ -16,7 +16,7 @@ use Sabre\Xml;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class Parameter extends Node implements \Stringable
+class Parameter extends Node
 {
     /**
      * Parameter name.
@@ -74,12 +74,83 @@ class Parameter extends Node implements \Stringable
      */
     public static function guessParameterNameByValue(string $value): string
     {
-        $name = match (strtoupper($value)) {
-            '7-BIT', 'QUOTED-PRINTABLE', 'BASE64' => 'ENCODING',
-            'WORK', 'HOME', 'PREF', 'DOM', 'INTL', 'POSTAL', 'PARCEL', 'VOICE', 'FAX', 'MSG', 'CELL', 'PAGER', 'BBS', 'MODEM', 'CAR', 'ISDN', 'VIDEO', 'AOL', 'APPLELINK', 'ATTMAIL', 'CIS', 'EWORLD', 'INTERNET', 'IBMMAIL', 'MCIMAIL', 'POWERSHARE', 'PRODIGY', 'TLX', 'X400', 'GIF', 'CGM', 'WMF', 'BMP', 'DIB', 'PICT', 'TIFF', 'PDF', 'PS', 'JPEG', 'MPEG', 'MPEG2', 'AVI', 'QTIME', 'WAVE', 'PCM', 'AIFF', 'X509', 'PGP' => 'TYPE',
-            'INLINE', 'URL', 'CONTENT-ID', 'CID' => 'VALUE',
-            default => '',
-        };
+        switch (strtoupper($value)) {
+            // Encodings
+            case '7-BIT':
+            case 'QUOTED-PRINTABLE':
+            case 'BASE64':
+                $name = 'ENCODING';
+                break;
+
+                // Common types
+            case 'WORK':
+            case 'HOME':
+            case 'PREF':
+                // Delivery Label Type
+            case 'DOM':
+            case 'INTL':
+            case 'POSTAL':
+            case 'PARCEL':
+                // Telephone types
+            case 'VOICE':
+            case 'FAX':
+            case 'MSG':
+            case 'CELL':
+            case 'PAGER':
+            case 'BBS':
+            case 'MODEM':
+            case 'CAR':
+            case 'ISDN':
+            case 'VIDEO':
+                // EMAIL types (lol)
+            case 'AOL':
+            case 'APPLELINK':
+            case 'ATTMAIL':
+            case 'CIS':
+            case 'EWORLD':
+            case 'INTERNET':
+            case 'IBMMAIL':
+            case 'MCIMAIL':
+            case 'POWERSHARE':
+            case 'PRODIGY':
+            case 'TLX':
+            case 'X400':
+                // Photo / Logo format types
+            case 'GIF':
+            case 'CGM':
+            case 'WMF':
+            case 'BMP':
+            case 'DIB':
+            case 'PICT':
+            case 'TIFF':
+            case 'PDF':
+            case 'PS':
+            case 'JPEG':
+            case 'MPEG':
+            case 'MPEG2':
+            case 'AVI':
+            case 'QTIME':
+                // Sound Digital Audio Type
+            case 'WAVE':
+            case 'PCM':
+            case 'AIFF':
+                // Key types
+            case 'X509':
+            case 'PGP':
+                $name = 'TYPE';
+                break;
+
+                // Value types
+            case 'INLINE':
+            case 'URL':
+            case 'CONTENT-ID':
+            case 'CID':
+                $name = 'VALUE';
+                break;
+
+            default:
+                $name = '';
+        }
 
         return $name;
     }
@@ -106,9 +177,9 @@ class Parameter extends Node implements \Stringable
     {
         if (is_array($this->value)) {
             return implode(',', $this->value);
+        } else {
+            return $this->value;
         }
-
-        return $this->value;
     }
 
     /**
@@ -130,9 +201,9 @@ class Parameter extends Node implements \Stringable
             return $this->value;
         } elseif (is_null($this->value)) {
             return [];
+        } else {
+            return [$this->value];
         }
-
-        return [$this->value];
     }
 
     /**
@@ -163,8 +234,7 @@ class Parameter extends Node implements \Stringable
     {
         return in_array(
             strtolower($value),
-            array_map(strtolower(...), (array) $this->value),
-            true
+            array_map('strtolower', (array) $this->value)
         );
     }
 
@@ -208,19 +278,20 @@ class Parameter extends Node implements \Stringable
                 // added + as well.
                 if (!preg_match('#(?: [\n":;\^,\+] )#x', $item)) {
                     return $out.$item;
-                }
-                // Enclosing in double-quotes, and using RFC6868 for encoding any
-                // special characters
-                $out .= '"'.strtr(
-                    $item,
-                    [
-                        '^' => '^^',
-                        "\n" => '^n',
-                        '"' => '^\'',
-                    ]
-                ).'"';
+                } else {
+                    // Enclosing in double-quotes, and using RFC6868 for encoding any
+                    // special characters
+                    $out .= '"'.strtr(
+                        $item,
+                        [
+                            '^' => '^^',
+                            "\n" => '^n',
+                            '"' => '^\'',
+                        ]
+                    ).'"';
 
-                return $out;
+                    return $out;
+                }
             }
         );
     }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/Json.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/Json.php
index e54a61c7e..a732075d5 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/Json.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/Json.php
@@ -27,12 +27,12 @@ class Json extends Parser
     /**
      * The input data.
      */
-    protected ?array $input = null;
+    protected ?array $input;
 
     /**
      * Root component.
      */
-    protected ?Document $root = null;
+    protected ?Document $root;
 
     /**
      * This method starts the parsing process.
@@ -61,11 +61,16 @@ class Json extends Parser
             $this->options = $options;
         }
 
-        $this->root = match ($this->input[0]) {
-            'vcalendar' => new VCalendar([], false),
-            'vcard' => new VCard([], false),
-            default => throw new ParseException('The root component must either be a vcalendar, or a vcard'),
-        };
+        switch ($this->input[0]) {
+            case 'vcalendar':
+                $this->root = new VCalendar([], false);
+                break;
+            case 'vcard':
+                $this->root = new VCard([], false);
+                break;
+            default:
+                throw new ParseException('The root component must either be a vcalendar, or a vcard');
+        }
         foreach ($this->input[1] as $prop) {
             $this->root->add($this->parseProperty($prop));
         }
@@ -92,13 +97,17 @@ class Json extends Parser
         $self = $this;
 
         $properties = array_map(
-            $self->parseProperty(...),
+            function ($jProp) use ($self) {
+                return $self->parseProperty($jProp);
+            },
             $jComp[1]
         );
 
         if (isset($jComp[2])) {
             $components = array_map(
-                $self->parseComponent(...),
+                function ($jComp) use ($self) {
+                    return $self->parseComponent($jComp);
+                },
                 $jComp[2]
             );
         } else {
@@ -122,10 +131,10 @@ class Json extends Parser
         list(
             $propertyName,
             $parameters,
-            $valueType,
+            $valueType
         ) = $jProp;
 
-        $propertyName = strtoupper((string) $propertyName);
+        $propertyName = strtoupper($propertyName);
 
         // This is the default class we would be using if we didn't know the
         // value type. We're using this value later in this function.
@@ -135,7 +144,7 @@ class Json extends Parser
 
         $value = array_slice($jProp, 3);
 
-        $valueType = strtoupper((string) $valueType);
+        $valueType = strtoupper($valueType);
 
         if (isset($parameters['group'])) {
             $propertyName = $parameters['group'].'.'.$propertyName;
@@ -160,7 +169,7 @@ class Json extends Parser
         // If the value type we received (e.g.: TEXT) was not the default value
         // type for the given property (e.g.: BDAY), we need to add a VALUE=
         // parameter.
-        if ($defaultPropertyClass !== $prop::class) {
+        if ($defaultPropertyClass !== get_class($prop)) {
             $prop['VALUE'] = $valueType;
         }
 
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/MimeDir.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/MimeDir.php
index 1263ced8e..bbef0ea6b 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/MimeDir.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/MimeDir.php
@@ -26,11 +26,6 @@ use Sabre\VObject\Property;
  */
 class MimeDir extends Parser
 {
-    public const TOKEN_PROPNAME = 1;
-    public const TOKEN_PROPVALUE = 2;
-    public const TOKEN_PARAMNAME = 3;
-    public const TOKEN_PARAMVALUE = 4;
-
     /**
      * The input stream.
      *
@@ -41,7 +36,7 @@ class MimeDir extends Parser
     /**
      * Root component.
      */
-    protected ?Document $root = null;
+    protected ?Document $root;
 
     /**
      * By default, all input will be assumed to be UTF-8.
@@ -84,12 +79,6 @@ class MimeDir extends Parser
             $this->setInput($input);
         }
 
-        if (!\is_resource($this->input)) {
-            // Null was passed as input, but there was no existing input buffer
-            // There is nothing to parse.
-            throw new ParseException('No input provided to parse');
-        }
-
         if (0 !== $options) {
             $this->options = $options;
         }
@@ -111,7 +100,7 @@ class MimeDir extends Parser
      */
     public function setCharset(string $charset): void
     {
-        if (!in_array($charset, self::$SUPPORTED_CHARSETS, true)) {
+        if (!in_array($charset, self::$SUPPORTED_CHARSETS)) {
             throw new \InvalidArgumentException('Unsupported encoding. (Supported encodings: '.implode(', ', self::$SUPPORTED_CHARSETS).')');
         }
         $this->charset = $charset;
@@ -155,18 +144,23 @@ class MimeDir extends Parser
 
         // BOM is ZERO WIDTH NO-BREAK SPACE (U+FEFF).
         // It's 0xEF 0xBB 0xBF in UTF-8 hex.
-        if (3 <= strlen((string) $line)
+        if (3 <= strlen($line)
             && 0xEF === ord($line[0])
             && 0xBB === ord($line[1])
             && 0xBF === ord($line[2])) {
-            $line = \substr((string) $line, 3);
+            $line = \substr($line, 3);
         }
 
-        $class = match (strtoupper((string) $line)) {
-            'BEGIN:VCALENDAR' => VCalendar::$componentMap['VCALENDAR'],
-            'BEGIN:VCARD' => VCard::$componentMap['VCARD'],
-            default => throw new ParseException('This parser only supports VCARD and VCALENDAR files'),
-        };
+        switch (strtoupper($line)) {
+            case 'BEGIN:VCALENDAR':
+                $class = VCalendar::$componentMap['VCALENDAR'];
+                break;
+            case 'BEGIN:VCARD':
+                $class = VCard::$componentMap['VCARD'];
+                break;
+            default:
+                throw new ParseException('This parser only supports VCARD and VCALENDAR files');
+        }
 
         $this->root = new $class([], false);
 
@@ -174,10 +168,10 @@ class MimeDir extends Parser
             // Reading until we hit END:
             try {
                 $line = $this->readLine();
-            } catch (EofException) {
+            } catch (EofException $oEx) {
                 $line = 'END:'.$this->root->name;
             }
-            if ('END:' === strtoupper(\substr((string) $line, 0, 4))) {
+            if ('END:' === strtoupper(\substr($line, 0, 4))) {
                 break;
             }
             $result = $this->parseLine($line);
@@ -186,7 +180,7 @@ class MimeDir extends Parser
             }
         }
 
-        $name = strtoupper(\substr((string) $line, 4));
+        $name = strtoupper(\substr($line, 4));
         if ($name !== $this->root->name) {
             throw new ParseException('Invalid MimeDir file. expected: "END:'.$this->root->name.'" got: "END:'.$name.'"');
         }
@@ -215,7 +209,7 @@ class MimeDir extends Parser
             while (true) {
                 // Reading until we hit END:
                 $line = $this->readLine();
-                if ('END:' === strtoupper(\substr((string) $line, 0, 4))) {
+                if ('END:' === strtoupper(\substr($line, 0, 4))) {
                     break;
                 }
                 $result = $this->parseLine($line);
@@ -224,21 +218,22 @@ class MimeDir extends Parser
                 }
             }
 
-            $name = strtoupper(\substr((string) $line, 4));
+            $name = strtoupper(\substr($line, 4));
             if ($name !== $component->name) {
                 throw new ParseException('Invalid MimeDir file. expected: "END:'.$component->name.'" got: "END:'.$name.'"');
             }
 
             return $component;
-        }
-        // Property reader
-        $property = $this->readProperty($line);
-        if (!$property) {
-            // Ignored line
-            return false;
-        }
+        } else {
+            // Property reader
+            $property = $this->readProperty($line);
+            if (!$property) {
+                // Ignored line
+                return false;
+            }
 
-        return $property;
+            return $property;
+        }
     }
 
     /**
@@ -359,12 +354,6 @@ class MimeDir extends Parser
             'value' => null,
         ];
 
-        /*
-         * Keep track on the last token we parsed in order to do
-         * better error checking
-         */
-        $lastToken = null;
-
         $lastParam = null;
 
         /*
@@ -390,16 +379,10 @@ class MimeDir extends Parser
                         // option is set to ignore invalid lines, we ignore this line
                         // This can happen when servers provide faulty data as iCloud
                         //  frequently does with X-APPLE-STRUCTURED-LOCATION
-                        $lastToken = self::TOKEN_PARAMVALUE;
                         continue;
                     }
                     throw new ParseException('Invalid Mimedir file. Line starting at '.$this->startLine.' did not follow iCalendar/vCard conventions');
                 }
-
-                if ('=' === $match[0][0] && self::TOKEN_PARAMNAME !== $lastToken) {
-                    throw new ParseException('Invalid Mimedir file. Line starting at '.$this->startLine.': Missing parameter name for parameter value "'.$match['paramValue'].'"');
-                }
-
                 if (\is_null($property['parameters'][$lastParam])) {
                     $property['parameters'][$lastParam] = $value;
                 } elseif (is_array($property['parameters'][$lastParam])) {
@@ -413,23 +396,21 @@ class MimeDir extends Parser
                         $value,
                     ];
                 }
-                $lastToken = self::TOKEN_PARAMVALUE;
                 continue;
             }
             if (isset($match['paramName'])) {
                 $lastParam = strtoupper($match['paramName']);
-                $property['parameters'][$lastParam] ??= null;
-                $lastToken = self::TOKEN_PARAMNAME;
+                if (!isset($property['parameters'][$lastParam])) {
+                    $property['parameters'][$lastParam] = null;
+                }
                 continue;
             }
             if (isset($match['propValue'])) {
                 $property['value'] = $match['propValue'];
-                $lastToken = self::TOKEN_PROPVALUE;
                 continue;
             }
-            if (isset($match['name']) && 0 < strlen($match['name'])) {
+            if (isset($match['name']) && $match['name']) {
                 $property['name'] = strtoupper($match['name']);
-                $lastToken = self::TOKEN_PROPNAME;
                 continue;
             }
 
@@ -438,8 +419,10 @@ class MimeDir extends Parser
             // @codeCoverageIgnoreEnd
         }
 
-        $property['value'] ??= '';
-        if (!isset($property['name']) || 0 === strlen($property['name'])) {
+        if (\is_null($property['value'])) {
+            $property['value'] = '';
+        }
+        if (!$property['name']) {
             if ($this->options & self::OPTION_IGNORE_INVALID_LINES) {
                 return false;
             }
@@ -462,7 +445,7 @@ class MimeDir extends Parser
             }
         }
 
-        $propObj = $this->root->createProperty($property['name'], null, $namedParameters, null, $this->startLine, $line);
+        $propObj = $this->root->createProperty($property['name'], null, $namedParameters);
 
         foreach ($namelessParameters as $namelessParameter) {
             $propObj->add(null, $namelessParameter);
@@ -682,7 +665,7 @@ class MimeDir extends Parser
         // missing a whitespace. So if 'forgiving' is turned on, we will take
         // those as well.
         if ($this->options & self::OPTION_FORGIVING) {
-            while (str_ends_with($value, '=') && $this->lineBuffer) {
+            while ('=' === \substr($value, -1) && $this->lineBuffer) {
                 // Reading the line
                 $this->readLine();
                 // Grabbing the raw form
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/Parser.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/Parser.php
index c5126445a..29921d182 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/Parser.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/Parser.php
@@ -30,6 +30,11 @@ abstract class Parser
      */
     public const OPTION_IGNORE_INVALID_LINES = 2;
 
+    /**
+     * Bitmask of parser options.
+     */
+    protected int $options;
+
     /**
      * Creates the parser.
      *
@@ -37,11 +42,12 @@ abstract class Parser
      *
      * @param int $options any parser options (OPTION constants)
      */
-    public function __construct($input = null, protected int $options = 0)
+    public function __construct($input = null, int $options = 0)
     {
         if (!is_null($input)) {
             $this->setInput($input);
         }
+        $this->options = $options;
     }
 
     /**
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/XML.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/XML.php
index 46abd8020..43e42e6d5 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/XML.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/XML.php
@@ -28,17 +28,17 @@ class XML extends Parser
     /**
      * The input data.
      */
-    protected ?array $input = null;
+    protected ?array $input;
 
     /**
      * A pointer/reference to the input.
      */
-    private ?array $pointer = null;
+    private ?array $pointer;
 
     /**
      * Document, root component.
      */
-    protected ?Document $root = null;
+    protected ?Document $root;
 
     /**
      * Creates the parser.
@@ -112,7 +112,7 @@ class XML extends Parser
      */
     protected function parseVCalendarComponents(Component $parentComponent): void
     {
-        foreach ($this->pointer['value'] ?? [] as $children) {
+        foreach ($this->pointer['value'] ?: [] as $children) {
             switch (static::getTagName($children['name'])) {
                 case 'properties':
                     $this->pointer = &$children['value'];
@@ -145,8 +145,8 @@ class XML extends Parser
      */
     protected function parseProperties(Component $parentComponent, string $propertyNamePrefix = ''): void
     {
-        foreach ($this->pointer ?? [] as $xmlProperty) {
-            [$namespace, $tagName] = SabreXml\Service::parseClarkNotation($xmlProperty['name']);
+        foreach ($this->pointer ?: [] as $xmlProperty) {
+            list($namespace, $tagName) = SabreXml\Service::parseClarkNotation($xmlProperty['name']);
 
             $propertyName = $tagName;
             $propertyValue = [];
@@ -322,7 +322,7 @@ class XML extends Parser
      */
     protected function parseComponent(Component $parentComponent): void
     {
-        $components = $this->pointer['value'] ?? [];
+        $components = $this->pointer['value'] ?: [];
 
         foreach ($components as $component) {
             $componentName = static::getTagName($component['name']);
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property.php
index 7432e5064..53a252fb2 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property.php
@@ -14,8 +14,27 @@ use Sabre\Xml;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-abstract class Property extends Node implements \Stringable
+abstract class Property extends Node
 {
+    /**
+     * The root document.
+     */
+    public ?Component $root;
+
+    /**
+     * Property name.
+     *
+     * This will contain a string such as DTSTART, SUMMARY, FN.
+     */
+    public ?string $name;
+
+    /**
+     * Property group.
+     *
+     * This is only used in vcards
+     */
+    public ?string $group;
+
     /**
      * List of parameters.
      */
@@ -32,20 +51,6 @@ abstract class Property extends Node implements \Stringable
      */
     public string $delimiter = ';';
 
-    /**
-     * The line number in the original iCalendar / vCard file
-     *   that corresponds with the current node
-     *   if the node was read from a file.
-     */
-    public ?int $lineIndex;
-
-    /**
-     * The line string from the original iCalendar / vCard file
-     *   that corresponds with the current node
-     *   if the node was read from a file.
-     */
-    public ?string $lineString;
-
     /**
      * Creates the generic property.
      *
@@ -56,13 +61,13 @@ abstract class Property extends Node implements \Stringable
      * @param array             $parameters List of parameters
      * @param string|null       $group      The vcard property group
      */
-    public function __construct(public ?Component $root, /**
-     * Property name.
-     *
-     * This will contain a string such as DTSTART, SUMMARY, FN.
-     */
-        public ?string $name, $value = null, array $parameters = [], public ?string $group = null, ?int $lineIndex = null, ?string $lineString = null)
+    public function __construct(Component $root, ?string $name, $value = null, array $parameters = [], string $group = null)
     {
+        $this->name = $name;
+        $this->group = $group;
+
+        $this->root = $root;
+
         foreach ($parameters as $k => $v) {
             $this->add($k, $v);
         }
@@ -70,14 +75,6 @@ abstract class Property extends Node implements \Stringable
         if (!is_null($value)) {
             $this->setValue($value);
         }
-
-        if (!is_null($lineIndex)) {
-            $this->lineIndex = $lineIndex;
-        }
-
-        if (!is_null($lineString)) {
-            $this->lineString = $lineString;
-        }
     }
 
     /**
@@ -104,7 +101,7 @@ abstract class Property extends Node implements \Stringable
     public function getValue()
     {
         if (is_array($this->value)) {
-            if (0 === count($this->value)) {
+            if (0 == count($this->value)) {
                 return null;
             } elseif (1 === count($this->value)) {
                 return $this->value[0];
@@ -136,9 +133,9 @@ abstract class Property extends Node implements \Stringable
             return [];
         } elseif (is_array($this->value)) {
             return $this->value;
+        } else {
+            return [$this->value];
         }
-
-        return [$this->value];
     }
 
     /**
@@ -223,7 +220,7 @@ abstract class Property extends Node implements \Stringable
         );
 
         // remove single space after last CRLF
-        return \substr((string) $str, 0, -1);
+        return \substr($str, 0, -1);
     }
 
     /**
@@ -263,7 +260,7 @@ abstract class Property extends Node implements \Stringable
             if ('VALUE' === $parameter->name) {
                 continue;
             }
-            $parameters[strtolower((string) $parameter->name)] = $parameter->jsonSerialize();
+            $parameters[strtolower($parameter->name)] = $parameter->jsonSerialize();
         }
         // In jCard, we need to encode the property-group as a separate 'group'
         // parameter.
@@ -273,7 +270,7 @@ abstract class Property extends Node implements \Stringable
 
         return array_merge(
             [
-                strtolower((string) $this->name),
+                strtolower($this->name),
                 (object) $parameters,
                 strtolower($this->getValueType()),
             ],
@@ -310,13 +307,13 @@ abstract class Property extends Node implements \Stringable
             $parameters[] = $parameter;
         }
 
-        $writer->startElement(strtolower((string) $this->name));
+        $writer->startElement(strtolower($this->name));
 
-        if ([] !== $parameters) {
+        if (!empty($parameters)) {
             $writer->startElement('parameters');
 
             foreach ($parameters as $parameter) {
-                $writer->startElement(strtolower((string) $parameter->name));
+                $writer->startElement(strtolower($parameter->name));
                 $writer->write($parameter);
                 $writer->endElement();
             }
@@ -501,7 +498,7 @@ abstract class Property extends Node implements \Stringable
         }
 
         // Checking if the property name does not contain any invalid bytes.
-        if (!preg_match('/^([A-Z0-9-]+)$/', (string) $this->name)) {
+        if (!preg_match('/^([A-Z0-9-]+)$/', $this->name)) {
             $warnings[] = [
                 'level' => $options & self::REPAIR ? 1 : 3,
                 'message' => 'The property name: '.$this->name.' contains invalid characters. Only A-Z, 0-9 and - are allowed',
@@ -553,7 +550,7 @@ abstract class Property extends Node implements \Stringable
                         }
                         break;
                 }
-                if ($allowedEncoding && !in_array(strtoupper($encoding), $allowedEncoding, true)) {
+                if ($allowedEncoding && !in_array(strtoupper($encoding), $allowedEncoding)) {
                     $warnings[] = [
                         'level' => 3,
                         'message' => 'ENCODING='.strtoupper($encoding).' is not valid for this document type.',
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Binary.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Binary.php
index 9d68f415e..25cda8d25 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Binary.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Binary.php
@@ -54,7 +54,7 @@ class Binary extends Property
      */
     public function setRawMimeDirValue(string $val): void
     {
-        $this->value = base64_decode($val, true);
+        $this->value = base64_decode($val);
     }
 
     /**
@@ -62,7 +62,7 @@ class Binary extends Property
      */
     public function getRawMimeDirValue(): string
     {
-        return base64_encode((string) $this->value);
+        return base64_encode($this->value);
     }
 
     /**
@@ -83,7 +83,7 @@ class Binary extends Property
      */
     public function getJsonValue(): array
     {
-        return [base64_encode((string) $this->getValue())];
+        return [base64_encode($this->getValue())];
     }
 
     /**
@@ -93,7 +93,7 @@ class Binary extends Property
      */
     public function setJsonValue(array $value): void
     {
-        $value = array_map(base64_decode(...), $value);
+        $value = array_map('base64_decode', $value);
         parent::setJsonValue($value);
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Boolean.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Boolean.php
index f33fbafdc..cdc3408aa 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Boolean.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Boolean.php
@@ -56,7 +56,9 @@ class Boolean extends Property
     public function setXmlValue(array $value): void
     {
         $value = array_map(
-            fn ($value) => 'true' === $value,
+            function ($value) {
+                return 'true' === $value;
+            },
             $value
         );
         parent::setXmlValue($value);
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/FloatValue.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/FloatValue.php
index 32b02a972..7a36e0976 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/FloatValue.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/FloatValue.php
@@ -67,7 +67,7 @@ class FloatValue extends Property
      */
     public function getJsonValue(): array
     {
-        $val = array_map(floatval(...), $this->getParts());
+        $val = array_map('floatval', $this->getParts());
 
         // Special-casing the GEO property.
         //
@@ -86,7 +86,7 @@ class FloatValue extends Property
      */
     public function setXmlValue(array $value): void
     {
-        $value = array_map(floatval(...), $value);
+        $value = array_map('floatval', $value);
         parent::setXmlValue($value);
     }
 
@@ -101,7 +101,7 @@ class FloatValue extends Property
         // See:
         // http://tools.ietf.org/html/rfc6321#section-3.4.1.2
         if ('GEO' === $this->name) {
-            $value = array_map(floatval(...), $this->getParts());
+            $value = array_map('floatval', $this->getParts());
 
             $writer->writeElement('latitude', $value[0]);
             $writer->writeElement('longitude', $value[1]);
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/CalAddress.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/CalAddress.php
index a2b13eee7..01969e87d 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/CalAddress.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/CalAddress.php
@@ -43,10 +43,10 @@ class CalAddress extends Text
     public function getNormalizedValue(): string
     {
         $input = $this->getValue();
-        if (!strpos((string) $input, ':')) {
+        if (!strpos($input, ':')) {
             return $input;
         }
-        [$schema, $everythingElse] = explode(':', (string) $input, 2);
+        list($schema, $everythingElse) = explode(':', $input, 2);
         $schema = strtolower($schema);
         if ('mailto' === $schema) {
             $everythingElse = strtolower($everythingElse);
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/DateTime.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/DateTime.php
index cd92475f3..7ee907972 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/DateTime.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/DateTime.php
@@ -111,7 +111,7 @@ class DateTime extends Property
             !$this->hasTime()
             || (
                 !isset($this['TZID'])
-                && !str_contains((string) $this->getValue(), 'Z')
+                && false === strpos($this->getValue(), 'Z')
             );
     }
 
@@ -128,7 +128,7 @@ class DateTime extends Property
      *
      * @throws InvalidDataException
      */
-    public function getDateTime(?\DateTimeZone $timeZone = null): ?\DateTimeImmutable
+    public function getDateTime(\DateTimeZone $timeZone = null): ?\DateTimeImmutable
     {
         $dt = $this->getDateTimes($timeZone);
         if (!$dt) {
@@ -149,7 +149,7 @@ class DateTime extends Property
      *
      * @throws InvalidDataException
      */
-    public function getDateTimes(?\DateTimeZone $timeZone = null): array
+    public function getDateTimes(\DateTimeZone $timeZone = null): array
     {
         // Does the property have a TZID?
         /** @var Property\FlatText $tzid */
@@ -205,7 +205,7 @@ class DateTime extends Property
                 }
                 if (is_null($tz)) {
                     $tz = $d->getTimeZone();
-                    $isUtc = in_array($tz->getName(), ['UTC', 'GMT', 'Z', '+00:00'], true);
+                    $isUtc = in_array($tz->getName(), ['UTC', 'GMT', 'Z', '+00:00']);
                     if (!$isUtc) {
                         $this->offsetSet('TZID', $tz->getName());
                     }
@@ -257,15 +257,15 @@ class DateTime extends Property
         $isFloating = $this->isFloating();
 
         $tz = $dts[0]->getTimeZone();
-        $isUtc = !$isFloating && in_array($tz->getName(), ['UTC', 'GMT', 'Z'], true);
+        $isUtc = !$isFloating && in_array($tz->getName(), ['UTC', 'GMT', 'Z']);
 
         return array_map(
             function (\DateTimeInterface $dt) use ($hasTime, $isUtc) {
                 if ($hasTime) {
                     return $dt->format('Y-m-d\\TH:i:s').($isUtc ? 'Z' : '');
+                } else {
+                    return $dt->format('Y-m-d');
                 }
-
-                return $dt->format('Y-m-d');
             },
             $dts
         );
@@ -286,7 +286,9 @@ class DateTime extends Property
         // those.
         $this->setValue(
             array_map(
-                fn ($item) => strtr($item, [':' => '', '-' => '']),
+                function ($item) {
+                    return strtr($item, [':' => '', '-' => '']);
+                },
                 $value
             )
         );
@@ -304,7 +306,7 @@ class DateTime extends Property
     public function offsetSet($offset, $value): void
     {
         parent::offsetSet($offset, $value);
-        if ('VALUE' !== strtoupper((string) $offset)) {
+        if ('VALUE' !== strtoupper($offset)) {
             return;
         }
 
@@ -345,7 +347,7 @@ class DateTime extends Property
                         DateTimeParser::parseDateTime($value);
                         break;
                 }
-            } catch (InvalidDataException) {
+            } catch (InvalidDataException $e) {
                 $messages[] = [
                     'level' => 3,
                     'message' => 'The supplied value ('.$value.') is not a correct '.$valueType,
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Period.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Period.php
index da9d972b1..7632cb4d1 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Period.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Period.php
@@ -64,17 +64,14 @@ class Period extends Property
     public function setJsonValue(array $value): void
     {
         $value = array_map(
-            fn ($item) => strtr(implode('/', $item), [':' => '', '-' => '']),
+            function ($item) {
+                return strtr(implode('/', $item), [':' => '', '-' => '']);
+            },
             $value
         );
         parent::setJsonValue($value);
     }
 
-    public function appendUtc(string $strDate)
-    {
-        return !str_ends_with($strDate, 'Z') ? '' : 'Z';
-    }
-
     /**
      * Returns the value, in the format it should be encoded for json.
      *
@@ -86,21 +83,21 @@ class Period extends Property
     {
         $return = [];
         foreach ($this->getParts() as $item) {
-            [$start, $end] = explode('/', (string) $item, 2);
+            list($start, $end) = explode('/', $item, 2);
 
-            $startDt = DateTimeParser::parseDateTime($start)->format('Y-m-d\\TH:i:s').$this->appendUtc($start);
+            $start = DateTimeParser::parseDateTime($start);
 
             // This is a duration value.
             if ('P' === $end[0]) {
                 $return[] = [
-                    $startDt,
+                    $start->format('Y-m-d\\TH:i:s'),
                     $end,
                 ];
             } else {
-                $endDt = DateTimeParser::parseDateTime($end)->format('Y-m-d\\TH:i:s').$this->appendUtc($end);
+                $end = DateTimeParser::parseDateTime($end);
                 $return[] = [
-                    $startDt,
-                    $endDt,
+                    $start->format('Y-m-d\\TH:i:s'),
+                    $end->format('Y-m-d\\TH:i:s'),
                 ];
             }
         }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Recur.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Recur.php
index f3d45158a..9a1e9e643 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Recur.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Recur.php
@@ -29,14 +29,14 @@ class Recur extends Property
     /**
      * Reference to the parent object, if this is not the top object.
      */
-    public ?Node $parent = null;
+    public ?Node $parent;
 
     /**
      * Updates the current value.
      *
      * This may be either a single, or multiple strings in an array.
      *
-     * @param string|array|object $value
+     * @param string|array $value
      */
     public function setValue($value): void
     {
@@ -52,17 +52,17 @@ class Recur extends Property
                     $v = strtoupper($v);
 
                     // The value had multiple sub-values
-                    if (str_contains($v, ',')) {
+                    if (false !== strpos($v, ',')) {
                         $v = explode(',', $v);
                     }
-                    if (0 === strcmp((string) $k, 'until')) {
+                    if (0 === strcmp($k, 'until')) {
                         $v = strtr($v, [':' => '', '-' => '']);
                     }
                 } elseif (is_array($v)) {
-                    $v = array_map(strtoupper(...), $v);
+                    $v = array_map('strtoupper', $v);
                 }
 
-                $newVal[strtoupper((string) $k)] = $v;
+                $newVal[strtoupper($k)] = $v;
             }
             $this->value = $newVal;
         } elseif (is_string($value)) {
@@ -151,13 +151,13 @@ class Recur extends Property
     {
         $values = [];
         foreach ($this->getParts() as $k => $v) {
-            if (0 === strcmp((string) $k, 'UNTIL')) {
+            if (0 === strcmp($k, 'UNTIL')) {
                 $date = new DateTime($this->root, null, $v);
-                $values[strtolower((string) $k)] = $date->getJsonValue()[0];
-            } elseif (0 === strcmp((string) $k, 'COUNT')) {
-                $values[strtolower((string) $k)] = intval($v);
+                $values[strtolower($k)] = $date->getJsonValue()[0];
+            } elseif (0 === strcmp($k, 'COUNT')) {
+                $values[strtolower($k)] = intval($v);
             } else {
-                $values[strtolower((string) $k)] = $v;
+                $values[strtolower($k)] = $v;
             }
         }
 
@@ -186,20 +186,13 @@ class Recur extends Property
         $newValue = [];
         foreach (explode(';', $value) as $part) {
             // Skipping empty parts.
-            if ('' === $part) {
+            if (empty($part)) {
                 continue;
             }
-
-            $parts = explode('=', $part);
-
-            if (2 !== count($parts)) {
-                throw new InvalidDataException('The supplied iCalendar RRULE part is incorrect: '.$part);
-            }
-
-            [$partName, $partValue] = $parts;
+            list($partName, $partValue) = explode('=', $part);
 
             // The value itself had multiple values..
-            if (str_contains($partValue, ',')) {
+            if (false !== strpos($partValue, ',')) {
                 $partValue = explode(',', $partValue);
             }
             $newValue[$partName] = $partValue;
@@ -243,7 +236,7 @@ class Recur extends Property
                 if ($repair) {
                     unset($values[$key]);
                 }
-            } elseif ('BYMONTH' === $key) {
+            } elseif ('BYMONTH' == $key) {
                 $byMonth = (array) $value;
                 foreach ($byMonth as $i => $v) {
                     if (!is_numeric($v) || (int) $v < 1 || (int) $v > 12) {
@@ -262,13 +255,13 @@ class Recur extends Property
                     }
                 }
                 // if there is no valid entry left, remove the whole value
-                if (is_array($value) && ([] === $values[$key])) {
+                if (is_array($value) && empty($values[$key])) {
                     unset($values[$key]);
                 }
-            } elseif ('BYWEEKNO' === $key) {
+            } elseif ('BYWEEKNO' == $key) {
                 $byWeekNo = (array) $value;
                 foreach ($byWeekNo as $i => $v) {
-                    if (!is_numeric($v) || (int) $v < -53 || 0 === (int) $v || (int) $v > 53) {
+                    if (!is_numeric($v) || (int) $v < -53 || 0 == (int) $v || (int) $v > 53) {
                         $warnings[] = [
                             'level' => $repair ? 1 : 3,
                             'message' => 'BYWEEKNO in RRULE must have value(s) from -53 to -1, or 1 to 53!',
@@ -284,13 +277,13 @@ class Recur extends Property
                     }
                 }
                 // if there is no valid entry left, remove the whole value
-                if (is_array($value) && ([] === $values[$key])) {
+                if (is_array($value) && empty($values[$key])) {
                     unset($values[$key]);
                 }
-            } elseif ('BYYEARDAY' === $key) {
+            } elseif ('BYYEARDAY' == $key) {
                 $byYearDay = (array) $value;
                 foreach ($byYearDay as $i => $v) {
-                    if (!is_numeric($v) || (int) $v < -366 || 0 === (int) $v || (int) $v > 366) {
+                    if (!is_numeric($v) || (int) $v < -366 || 0 == (int) $v || (int) $v > 366) {
                         $warnings[] = [
                             'level' => $repair ? 1 : 3,
                             'message' => 'BYYEARDAY in RRULE must have value(s) from -366 to -1, or 1 to 366!',
@@ -306,7 +299,7 @@ class Recur extends Property
                     }
                 }
                 // if there is no valid entry left, remove the whole value
-                if (is_array($value) && ([] === $values[$key])) {
+                if (is_array($value) && empty($values[$key])) {
                     unset($values[$key]);
                 }
             }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/IntegerValue.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/IntegerValue.php
index 1cd7273cc..f1ae55d17 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/IntegerValue.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/IntegerValue.php
@@ -62,7 +62,7 @@ class IntegerValue extends Property
      */
     public function setXmlValue(array $value): void
     {
-        $value = array_map(intval(...), $value);
+        $value = array_map('intval', $value);
         parent::setXmlValue($value);
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Text.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Text.php
index e585026fc..c606ad812 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Text.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Text.php
@@ -64,14 +64,14 @@ class Text extends Property
      * @param array             $parameters List of parameters
      * @param string|null       $group      The vcard property group
      */
-    public function __construct(Component $root, string $name, $value = null, array $parameters = [], ?string $group = null)
+    public function __construct(Component $root, string $name, $value = null, array $parameters = [], string $group = null)
     {
         // There's two types of multi-valued text properties:
         // 1. multivalue properties.
         // 2. structured value properties
         //
         // The former is always separated by a comma, the latter by semicolon.
-        if (in_array($name, $this->structuredValues, true)) {
+        if (in_array($name, $this->structuredValues)) {
             $this->delimiter = ';';
         }
 
@@ -155,7 +155,7 @@ class Text extends Property
         // Structured text values should always be returned as a single
         // array-item. Multi-value text should be returned as multiple items in
         // the top-array.
-        if (in_array($this->name, $this->structuredValues, true)) {
+        if (in_array($this->name, $this->structuredValues)) {
             return [$this->getParts()];
         }
 
@@ -213,7 +213,7 @@ class Text extends Property
 
         // If the resulting value contains a \n, we must encode it as
         // quoted-printable.
-        if (str_contains((string) $val, "\n")) {
+        if (false !== \strpos($val, "\n")) {
             $str .= ';ENCODING=QUOTED-PRINTABLE:';
             $lastLine = $str;
             $out = '';
@@ -222,13 +222,13 @@ class Text extends Property
             // encode newlines for us. Specifically, the \r\n sequence must in
             // vcards be encoded as =0D=OA and we must insert soft-newlines
             // every 75 bytes.
-            for ($ii = 0; $ii < \strlen((string) $val); ++$ii) {
+            for ($ii = 0; $ii < \strlen($val); ++$ii) {
                 $ord = \ord($val[$ii]);
                 // These characters are encoded as themselves.
                 if ($ord >= 32 && $ord <= 126) {
                     $lastLine .= $val[$ii];
                 } else {
-                    $lastLine .= '='.\strtoupper(\bin2hex((string) $val[$ii]));
+                    $lastLine .= '='.\strtoupper(\bin2hex($val[$ii]));
                 }
                 if (\strlen($lastLine) >= 75) {
                     // Soft line break
@@ -241,21 +241,22 @@ class Text extends Property
             }
 
             return $out;
-        }
-        $str .= ':'.$val;
+        } else {
+            $str .= ':'.$val;
 
-        $str = \preg_replace(
-            '/(
+            $str = \preg_replace(
+                '/(
                     (?:^.)?         # 1 additional byte in first line because of missing single space (see next line)
                     .{1,74}         # max 75 bytes per line (1 byte is used for a single space added after every CRLF)
                     (?![\x80-\xbf]) # prevent splitting multibyte characters
                 )/x',
-            "$1\r\n ",
-            $str
-        );
+                "$1\r\n ",
+                $str
+            );
 
-        // remove single space after last CRLF
-        return \substr((string) $str, 0, -1);
+            // remove single space after last CRLF
+            return \substr($str, 0, -1);
+        }
     }
 
     /**
@@ -270,7 +271,7 @@ class Text extends Property
             foreach ($items as $i => $item) {
                 $writer->writeElement(
                     $item,
-                    ('' !== $values[$i] && [] !== $values[$i]) ? $values[$i] : null
+                    !empty($values[$i]) ? $values[$i] : null
                 );
             }
         };
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Time.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Time.php
index 9c4016c64..ed314fc0d 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Time.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Time.php
@@ -104,7 +104,7 @@ class Time extends Text
                 $timeStr .= 'Z';
             } else {
                 $timeStr .=
-                    preg_replace('/([0-9]{2})([0-9]{2})$/', '$1:$2', (string) $parts['timezone']);
+                    preg_replace('/([0-9]{2})([0-9]{2})$/', '$1:$2', $parts['timezone']);
             }
         }
 
@@ -118,7 +118,9 @@ class Time extends Text
     public function setXmlValue(array $value): void
     {
         $value = array_map(
-            fn ($value) => str_replace(':', '', $value),
+            function ($value) {
+                return str_replace(':', '', $value);
+            },
             $value
         );
         parent::setXmlValue($value);
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Uri.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Uri.php
index dce7bf4bb..228b7090f 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Uri.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Uri.php
@@ -38,7 +38,7 @@ class Uri extends Text
     public function parameters(): array
     {
         $parameters = parent::parameters();
-        if (!isset($parameters['VALUE']) && in_array($this->name, ['URL', 'PHOTO'], true)) {
+        if (!isset($parameters['VALUE']) && in_array($this->name, ['URL', 'PHOTO'])) {
             // If we are encoding a URI value, and this URI value has no
             // VALUE=URI parameter, we add it anyway.
             //
@@ -74,10 +74,14 @@ class Uri extends Text
             $matches = preg_split($regex, $val, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
             $newVal = '';
             foreach ($matches as $match) {
-                match ($match) {
-                    '\:' => $newVal .= ':',
-                    default => $newVal .= $match,
-                };
+                switch ($match) {
+                    case '\:':
+                        $newVal .= ':';
+                        break;
+                    default:
+                        $newVal .= $match;
+                        break;
+                }
             }
             $this->value = $newVal;
         } else {
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/UtcOffset.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/UtcOffset.php
index 52d81f1f6..09aab0151 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/UtcOffset.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/UtcOffset.php
@@ -42,7 +42,9 @@ class UtcOffset extends Text
     public function setJsonValue(array $value): void
     {
         $value = array_map(
-            fn ($value) => str_replace(':', '', $value),
+            function ($value) {
+                return str_replace(':', '', $value);
+            },
             $value
         );
         parent::setJsonValue($value);
@@ -56,8 +58,10 @@ class UtcOffset extends Text
     public function getJsonValue(): array
     {
         return array_map(
-            fn ($value) => substr((string) $value, 0, -2).':'.
-                   substr((string) $value, -2),
+            function ($value) {
+                return substr($value, 0, -2).':'.
+                       substr($value, -2);
+            },
             parent::getJsonValue()
         );
     }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/DateAndOrTime.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/DateAndOrTime.php
index 9a7693961..e87bf1b3a 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/DateAndOrTime.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/DateAndOrTime.php
@@ -77,7 +77,7 @@ class DateAndOrTime extends Property
     public function setDateTime(\DateTimeInterface $dt): void
     {
         $tz = $dt->getTimeZone();
-        $isUtc = in_array($tz->getName(), ['UTC', 'GMT', 'Z'], true);
+        $isUtc = in_array($tz->getName(), ['UTC', 'GMT', 'Z']);
 
         if ($isUtc) {
             $value = $dt->format('Ymd\\THis\\Z');
@@ -232,10 +232,14 @@ class DateAndOrTime extends Property
         $value = '';
 
         // $d = defined
-        $d = (fn ($part): bool => !is_null($parts[$part]));
+        $d = function ($part) use ($parts): bool {
+            return !is_null($parts[$part]);
+        };
 
         // $r = read
-        $r = (fn ($part) => $parts[$part]);
+        $r = function ($part) use ($parts) {
+            return $parts[$part];
+        };
 
         // From the Relax NG Schema.
         //
@@ -337,7 +341,7 @@ class DateAndOrTime extends Property
 
         try {
             DateTimeParser::parseVCardDateTime($value);
-        } catch (InvalidDataException) {
+        } catch (InvalidDataException $e) {
             $messages[] = [
                 'level' => 3,
                 'message' => 'The supplied value ('.$value.') is not a correct DATE-AND-OR-TIME property',
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/EventIterator.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/EventIterator.php
index 5db409350..d79cf3132 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/EventIterator.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/EventIterator.php
@@ -89,9 +89,11 @@ class EventIterator implements \Iterator
      * @throws NoInstancesException
      * @throws InvalidDataException
      */
-    public function __construct($input, ?string $uid = null, ?\DateTimeZone $timeZone = null)
+    public function __construct($input, string $uid = null, \DateTimeZone $timeZone = null)
     {
-        $timeZone ??= new \DateTimeZone('UTC');
+        if (is_null($timeZone)) {
+            $timeZone = new \DateTimeZone('UTC');
+        }
         $this->timeZone = $timeZone;
 
         if (is_array($input)) {
@@ -162,12 +164,8 @@ class EventIterator implements \Iterator
         }
 
         if (isset($this->masterEvent->RDATE)) {
-            $rdateValues = [];
-            foreach ($this->masterEvent->RDATE as $rdate) {
-                $rdateValues = array_merge($rdateValues, $rdate->getParts());
-            }
             $this->recurIterator = new RDateIterator(
-                $rdateValues,
+                $this->masterEvent->RDATE->getParts(),
                 $this->startDate
             );
         } elseif (isset($this->masterEvent->RRULE)) {
@@ -230,10 +228,11 @@ class EventIterator implements \Iterator
         }
         if ($this->currentOverriddenEvent && $this->currentOverriddenEvent->DTEND) {
             return $this->currentOverriddenEvent->DTEND->getDateTime($this->timeZone);
-        }
-        $end = clone $this->currentDate;
+        } else {
+            $end = clone $this->currentDate;
 
-        return $end->modify('+'.$this->eventDuration.' seconds');
+            return $end->modify('+'.$this->eventDuration.' seconds');
+        }
     }
 
     /**
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/RDateIterator.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/RDateIterator.php
index b9bd0beff..4ad688f9d 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/RDateIterator.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/RDateIterator.php
@@ -26,13 +26,9 @@ class RDateIterator implements \Iterator
      *
      * @param string|array $rrule
      */
-    public function __construct($rrule, /**
-     * The reference start date/time for the rrule.
-     *
-     * All calculations are based on this initial date.
-     */
-        protected \DateTimeInterface $startDate)
+    public function __construct($rrule, \DateTimeInterface $start)
     {
+        $this->startDate = $start;
         $this->parseRDate($rrule);
         $this->currentDate = clone $this->startDate;
     }
@@ -121,6 +117,13 @@ class RDateIterator implements \Iterator
         }
     }
 
+    /**
+     * The reference start date/time for the rrule.
+     *
+     * All calculations are based on this initial date.
+     */
+    protected \DateTimeInterface $startDate;
+
     /**
      * The date of the current iteration. You can get this by calling
      * ->current().
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/RRuleIterator.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/RRuleIterator.php
index 6f1f28ae3..888556eea 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/RRuleIterator.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/RRuleIterator.php
@@ -37,13 +37,9 @@ class RRuleIterator implements \Iterator
      *
      * @throws InvalidDataException
      */
-    public function __construct($rrule, /**
-     * The reference start date/time for the rrule.
-     *
-     * All calculations are based on this initial date.
-     */
-        protected \DateTimeInterface $startDate)
+    public function __construct($rrule, \DateTimeInterface $start)
     {
+        $this->startDate = $start;
         $this->parseRRule($rrule);
         $this->currentDate = clone $this->startDate;
     }
@@ -150,20 +146,19 @@ class RRuleIterator implements \Iterator
         }
     }
 
+    /**
+     * The reference start date/time for the rrule.
+     *
+     * All calculations are based on this initial date.
+     */
+    protected \DateTimeInterface $startDate;
+
     /**
      * The date of the current iteration. You can get this by calling
      * ->current().
      */
     protected ?\DateTimeInterface $currentDate;
 
-    /**
-     * The number of hours that the next occurrence of an event
-     * jumped forward, usually because summer time started and
-     * the requested time-of-day like 0230 did not exist on that
-     * day. And so the event was scheduled 1 hour later at 0330.
-     */
-    protected int $hourJump = 0;
-
     /**
      * Frequency is one of: secondly, minutely, hourly, daily, weekly, monthly,
      * yearly.
@@ -281,65 +276,12 @@ class RRuleIterator implements \Iterator
 
     /* Functions that advance the iterator {{{ */
 
-    /**
-     * Gets the original start time of the RRULE.
-     *
-     * The value is formatted as a string with 24-hour:minute:second
-     */
-    protected function startTime(): string
-    {
-        return $this->startDate->format('H:i:s');
-    }
-
-    /**
-     * Advances currentDate by the interval.
-     * The time is set from the original startDate.
-     * If the recurrence is on a day when summer time started, then the
-     * time on that day may have jumped forward, for example, from 0230 to 0330.
-     * Using the original time means that the next recurrence will be calculated
-     * based on the original start time and the day/week/month/year interval.
-     * So the start time of the next occurrence can correctly revert to 0230.
-     */
-    protected function advanceTheDate(string $interval): void
-    {
-        $this->currentDate = $this->currentDate->modify($interval.' '.$this->startTime());
-    }
-
-    /**
-     * Does the processing for adjusting the time of multi-hourly events when summer time starts.
-     */
-    protected function adjustForTimeJumpsOfHourlyEvent(\DateTimeInterface $previousEventDateTime): void
-    {
-        if (0 === $this->hourJump) {
-            // Remember if the clock time jumped forward on the next occurrence.
-            // That happens if the next event time is on a day when summer time starts
-            // and the event time is in the non-existent hour of the day.
-            // For example, an event that normally starts at 02:30 will
-            // have to start at 03:30 on that day.
-            // If the interval is just 1 hour, then there is no "jumping back" to do.
-            // The events that day will happen, for example, at 0030 0130 0330 0430 0530...
-            if ($this->interval > 1) {
-                $expectedHourOfNextDate = ((int) $previousEventDateTime->format('G') + $this->interval) % 24;
-                $actualHourOfNextDate = (int) $this->currentDate->format('G');
-                $this->hourJump = $actualHourOfNextDate - $expectedHourOfNextDate;
-            }
-        } else {
-            // The hour "jumped" for the previous occurrence, to avoid the non-existent time.
-            // currentDate got set ahead by (usually) 1 hour on that day.
-            // Adjust it back for this next occurrence.
-            $this->currentDate = $this->currentDate->sub(new \DateInterval('PT'.$this->hourJump.'H'));
-            $this->hourJump = 0;
-        }
-    }
-
     /**
      * Does the processing for advancing the iterator for hourly frequency.
      */
     protected function nextHourly(): void
     {
-        $previousEventDateTime = clone $this->currentDate;
         $this->currentDate = $this->currentDate->modify('+'.$this->interval.' hours');
-        $this->adjustForTimeJumpsOfHourlyEvent($previousEventDateTime);
     }
 
     /**
@@ -348,29 +290,29 @@ class RRuleIterator implements \Iterator
     protected function nextDaily(): void
     {
         if (!$this->byHour && !$this->byDay) {
-            $this->advanceTheDate('+'.$this->interval.' days');
+            $this->currentDate = $this->currentDate->modify('+'.$this->interval.' days');
 
             return;
         }
 
         $recurrenceHours = [];
-        if ($this->byHour) {
+        if (!empty($this->byHour)) {
             $recurrenceHours = $this->getHours();
         }
 
         $recurrenceDays = [];
-        if ($this->byDay) {
+        if (!empty($this->byDay)) {
             $recurrenceDays = $this->getDays();
         }
 
         $recurrenceMonths = [];
-        if ($this->byMonth) {
+        if (!empty($this->byMonth)) {
             $recurrenceMonths = $this->getMonths();
         }
 
         do {
             if ($this->byHour) {
-                if ('23' === $this->currentDate->format('G')) {
+                if ('23' == $this->currentDate->format('G')) {
                     // to obey the interval rule
                     $this->currentDate = $this->currentDate->modify('+'.($this->interval - 1).' days');
                 }
@@ -395,9 +337,9 @@ class RRuleIterator implements \Iterator
                 return;
             }
         } while (
-            ($this->byDay && !in_array((int) $currentDay, $recurrenceDays, true))
-            || ($this->byHour && !in_array($currentHour, $recurrenceHours, true))
-            || ($this->byMonth && !in_array($currentMonth, $recurrenceMonths, true))
+            ($this->byDay && !in_array($currentDay, $recurrenceDays))
+            || ($this->byHour && !in_array($currentHour, $recurrenceHours))
+            || ($this->byMonth && !in_array($currentMonth, $recurrenceMonths))
         );
     }
 
@@ -407,7 +349,7 @@ class RRuleIterator implements \Iterator
     protected function nextWeekly(): void
     {
         if (!$this->byHour && !$this->byDay) {
-            $this->advanceTheDate('+'.$this->interval.' weeks');
+            $this->currentDate = $this->currentDate->modify('+'.$this->interval.' weeks');
 
             return;
         }
@@ -429,7 +371,7 @@ class RRuleIterator implements \Iterator
             if ($this->byHour) {
                 $this->currentDate = $this->currentDate->modify('+1 hours');
             } else {
-                $this->advanceTheDate('+1 days');
+                $this->currentDate = $this->currentDate->modify('+1 days');
             }
 
             // Current day of the week
@@ -439,18 +381,18 @@ class RRuleIterator implements \Iterator
             $currentHour = (int) $this->currentDate->format('G');
 
             // We need to roll over to the next week
-            if ($currentDay === $firstDay && (!$this->byHour || 0 === $currentHour)) {
+            if ($currentDay === $firstDay && (!$this->byHour || '0' == $currentHour)) {
                 $this->currentDate = $this->currentDate->modify('+'.($this->interval - 1).' weeks');
 
                 // We need to go to the first day of this week, but only if we
                 // are not already on this first day of this week.
-                if ((int) $this->currentDate->format('w') !== $firstDay) {
+                if ($this->currentDate->format('w') != $firstDay) {
                     $this->currentDate = $this->currentDate->modify('last '.$this->dayNames[$this->dayMap[$this->weekStart]]);
                 }
             }
 
             // We have a match
-        } while (($this->byDay && !in_array($currentDay, $recurrenceDays, true)) || ($this->byHour && !in_array((string) $currentHour, $recurrenceHours, true)));
+        } while (($this->byDay && !in_array($currentDay, $recurrenceDays)) || ($this->byHour && !in_array($currentHour, $recurrenceHours)));
     }
 
     /**
@@ -466,21 +408,21 @@ class RRuleIterator implements \Iterator
             // occur to the next month. We Must skip these invalid
             // entries.
             if ($currentDayOfMonth < 29) {
-                $this->advanceTheDate('+'.$this->interval.' months');
+                $this->currentDate = $this->currentDate->modify('+'.$this->interval.' months');
             } else {
                 $increase = 0;
                 do {
                     ++$increase;
                     $tempDate = clone $this->currentDate;
-                    $tempDate = $tempDate->modify('+ '.($this->interval * $increase).' months '.$this->startTime());
-                } while ($tempDate->format('j') !== $currentDayOfMonth);
+                    $tempDate = $tempDate->modify('+ '.($this->interval * $increase).' months');
+                } while ($tempDate->format('j') != $currentDayOfMonth);
                 $this->currentDate = $tempDate;
             }
 
             return;
         }
 
-        $selectedOccurrence = -1;
+        $occurrence = -1;
         while (true) {
             $occurrences = $this->getMonthlyOccurrences();
 
@@ -488,7 +430,6 @@ class RRuleIterator implements \Iterator
                 // The first occurrence that's higher than the current
                 // day of the month wins.
                 if ($occurrence > $currentDayOfMonth) {
-                    $selectedOccurrence = $occurrence;
                     break 2;
                 }
             }
@@ -524,15 +465,11 @@ class RRuleIterator implements \Iterator
             }
         }
 
-        // Set the currentDate to the year and month that we are in, and the day of the month that we have selected.
-        // That day could be a day when summer time starts, and if the time of the event is, for example, 0230,
-        // then 0230 will not be a valid time on that day. So always apply the start time from the original startDate.
-        // The "modify" method will set the time forward to 0330, for example, if needed.
         $this->currentDate = $this->currentDate->setDate(
             (int) $this->currentDate->format('Y'),
             (int) $this->currentDate->format('n'),
-            (int) $selectedOccurrence
-        )->modify($this->startTime());
+            (int) $occurrence
+        );
     }
 
     /**
@@ -545,9 +482,9 @@ class RRuleIterator implements \Iterator
         $currentDayOfMonth = $this->currentDate->format('j');
 
         // No sub-rules, so we just advance by year
-        if (!$this->byMonth) {
+        if (empty($this->byMonth)) {
             // Unless it was a leap day!
-            if (2 === (int) $currentMonth && 29 === (int) $currentDayOfMonth) {
+            if (2 == $currentMonth && 29 == $currentDayOfMonth) {
                 $counter = 0;
                 do {
                     ++$counter;
@@ -561,7 +498,7 @@ class RRuleIterator implements \Iterator
                     // functions instead.
                     $nextDate = clone $this->currentDate;
                     $nextDate = $nextDate->modify('+ '.($this->interval * $counter).' years');
-                } while (2 !== (int) $nextDate->format('n'));
+                } while (2 != $nextDate->format('n'));
 
                 $this->currentDate = $nextDate;
 
@@ -632,7 +569,7 @@ class RRuleIterator implements \Iterator
                             $date = $date->sub(new \DateInterval('P'.abs($byYearDay + 1).'D'));
                         }
 
-                        if ($date > $this->currentDate && in_array((int) $date->format('N'), $dayOffsets, true)) {
+                        if ($date > $this->currentDate && in_array($date->format('N'), $dayOffsets)) {
                             $checkDates[] = $date;
                         }
                     }
@@ -649,7 +586,7 @@ class RRuleIterator implements \Iterator
             }
 
             // The easiest form
-            $this->advanceTheDate('+'.$this->interval.' years');
+            $this->currentDate = $this->currentDate->modify('+'.$this->interval.' years');
 
             return;
         }
@@ -663,7 +600,7 @@ class RRuleIterator implements \Iterator
         // If we got a byDay or getMonthDay filter, we must first expand
         // further.
         if ($this->byDay || $this->byMonthDay) {
-            $selectedOccurrence = -1;
+            $occurrence = -1;
             while (true) {
                 $occurrences = $this->getMonthlyOccurrences();
 
@@ -673,12 +610,7 @@ class RRuleIterator implements \Iterator
                     // If we advanced to the next month or year, the first
                     // occurrence is always correct.
                     if ($occurrence > $currentDayOfMonth || $advancedToNewMonth) {
-                        // only consider byMonth matches,
-                        // otherwise, we don't follow RRule correctly
-                        if (in_array((string) $currentMonth, $this->byMonth, true)) {
-                            $selectedOccurrence = $occurrence;
-                            break 2;
-                        }
+                        break 2;
                     }
                 }
 
@@ -692,12 +624,12 @@ class RRuleIterator implements \Iterator
                         $currentYear += $this->interval;
                         $currentMonth = 1;
                     }
-                } while (!in_array((string) $currentMonth, $this->byMonth, true));
+                } while (!in_array($currentMonth, $this->byMonth));
 
                 $this->currentDate = $this->currentDate->setDate(
                     (int) $currentYear,
-                    $currentMonth,
-                    $currentDayOfMonth
+                    (int) $currentMonth,
+                    (int) $currentDayOfMonth
                 );
 
                 // To prevent running this forever (better: until we hit the max date of DateTimeImmutable) we simply
@@ -713,25 +645,28 @@ class RRuleIterator implements \Iterator
             $this->currentDate = $this->currentDate->setDate(
                 (int) $currentYear,
                 (int) $currentMonth,
-                (int) $selectedOccurrence
-            )->modify($this->startTime());
+                (int) $occurrence
+            );
+
+            return;
+        } else {
+            // These are the 'byMonth' rules, if there are no byDay or
+            // byMonthDay sub-rules.
+            do {
+                ++$currentMonth;
+                if ($currentMonth > 12) {
+                    $currentYear += $this->interval;
+                    $currentMonth = 1;
+                }
+            } while (!in_array($currentMonth, $this->byMonth));
+            $this->currentDate = $this->currentDate->setDate(
+                (int) $currentYear,
+                (int) $currentMonth,
+                (int) $currentDayOfMonth
+            );
 
             return;
         }
-        // These are the 'byMonth' rules, if there are no byDay or
-        // byMonthDay sub-rules.
-        do {
-            ++$currentMonth;
-            if ($currentMonth > 12) {
-                $currentYear += $this->interval;
-                $currentMonth = 1;
-            }
-        } while (!in_array((string) $currentMonth, $this->byMonth, true));
-        $this->currentDate = $this->currentDate->setDate(
-            (int) $currentYear,
-            $currentMonth,
-            (int) $currentDayOfMonth
-        )->modify($this->startTime());
     }
 
     /* }}} */
@@ -751,14 +686,13 @@ class RRuleIterator implements \Iterator
         }
 
         foreach ($rrule as $key => $value) {
-            $key = strtoupper((string) $key);
+            $key = strtoupper($key);
             switch ($key) {
                 case 'FREQ':
-                    $value = strtolower((string) $value);
+                    $value = strtolower($value);
                     if (!in_array(
                         $value,
-                        ['secondly', 'minutely', 'hourly', 'daily', 'weekly', 'monthly', 'yearly'],
-                        true
+                        ['secondly', 'minutely', 'hourly', 'daily', 'weekly', 'monthly', 'yearly']
                     )) {
                         throw new InvalidDataException('Unknown value for FREQ='.strtoupper($value));
                     }
@@ -806,7 +740,7 @@ class RRuleIterator implements \Iterator
                 case 'BYDAY':
                     $value = (array) $value;
                     foreach ($value as $part) {
-                        if (!preg_match('#^  (-|\+)? ([1-5])? (MO|TU|WE|TH|FR|SA|SU) $#xi', (string) $part)) {
+                        if (!preg_match('#^  (-|\+)? ([1-5])? (MO|TU|WE|TH|FR|SA|SU) $# xi', $part)) {
                             throw new InvalidDataException('Invalid part in BYDAY clause: '.$part);
                         }
                     }
@@ -820,7 +754,7 @@ class RRuleIterator implements \Iterator
                 case 'BYYEARDAY':
                     $this->byYearDay = (array) $value;
                     foreach ($this->byYearDay as $byYearDay) {
-                        if (!is_numeric($byYearDay) || (int) $byYearDay < -366 || 0 === (int) $byYearDay || (int) $byYearDay > 366) {
+                        if (!is_numeric($byYearDay) || (int) $byYearDay < -366 || 0 == (int) $byYearDay || (int) $byYearDay > 366) {
                             throw new InvalidDataException('BYYEARDAY in RRULE must have value(s) from 1 to 366, or -366 to -1!');
                         }
                     }
@@ -829,7 +763,7 @@ class RRuleIterator implements \Iterator
                 case 'BYWEEKNO':
                     $this->byWeekNo = (array) $value;
                     foreach ($this->byWeekNo as $byWeekNo) {
-                        if (!is_numeric($byWeekNo) || (int) $byWeekNo < -53 || 0 === (int) $byWeekNo || (int) $byWeekNo > 53) {
+                        if (!is_numeric($byWeekNo) || (int) $byWeekNo < -53 || 0 == (int) $byWeekNo || (int) $byWeekNo > 53) {
                             throw new InvalidDataException('BYWEEKNO in RRULE must have value(s) from 1 to 53, or -53 to -1!');
                         }
                     }
@@ -849,7 +783,7 @@ class RRuleIterator implements \Iterator
                     break;
 
                 case 'WKST':
-                    $this->weekStart = strtoupper((string) $value);
+                    $this->weekStart = strtoupper($value);
                     break;
 
                 default:
@@ -889,7 +823,7 @@ class RRuleIterator implements \Iterator
         // that point and add it to the results.
         if ($this->byDay) {
             foreach ($this->byDay as $day) {
-                $dayName = $this->dayNames[$this->dayMap[substr((string) $day, -2)]];
+                $dayName = $this->dayNames[$this->dayMap[substr($day, -2)]];
 
                 // Dayname will be something like 'wednesday'. Now we need to find
                 // all wednesdays in this month.
@@ -910,8 +844,8 @@ class RRuleIterator implements \Iterator
                 // So now we have 'all wednesdays' for month. It is however
                 // possible that the user only really wanted the 1st, 2nd or last
                 // wednesday.
-                if (strlen((string) $day) > 2) {
-                    $offset = (int) substr((string) $day, 0, -2);
+                if (strlen($day) > 2) {
+                    $offset = (int) substr($day, 0, -2);
 
                     if ($offset > 0) {
                         // It is possible that the day does not exist, such as a
@@ -946,7 +880,7 @@ class RRuleIterator implements \Iterator
                     $byMonthDayResults[] = $monthDay;
                 } else {
                     // Negative values
-                    $byMonthDayResults[] = (int) $startDate->format('t') + 1 + $monthDay;
+                    $byMonthDayResults[] = $startDate->format('t') + 1 + $monthDay;
                 }
             }
         }
@@ -1015,7 +949,7 @@ class RRuleIterator implements \Iterator
             // The day may be preceded with a positive (+n) or
             // negative (-n) integer. However, this does not make
             // sense in 'weekly' so we ignore it here.
-            $recurrenceDays[] = $this->dayMap[substr((string) $byDay, -2)];
+            $recurrenceDays[] = $this->dayMap[substr($byDay, -2)];
         }
 
         return $recurrenceDays;
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Splitter/ICalendar.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Splitter/ICalendar.php
index edbba68cc..ccf0d1add 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Splitter/ICalendar.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Splitter/ICalendar.php
@@ -46,7 +46,7 @@ class ICalendar implements SplitterInterface
     {
         $data = VObject\Reader::read($input, $options);
 
-        if (!$data instanceof VCalendar) {
+        if (!$data instanceof VObject\Component\VCalendar) {
             throw new VObject\ParseException('Supplied input could not be parsed as VCALENDAR.');
         }
 
@@ -96,8 +96,8 @@ class ICalendar implements SplitterInterface
             }
 
             return $object;
+        } else {
+            return null;
         }
-
-        return null;
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Splitter/VCard.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Splitter/VCard.php
index a802dbe75..e63ae837d 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Splitter/VCard.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Splitter/VCard.php
@@ -22,6 +22,13 @@ use Sabre\VObject\Parser\MimeDir;
  */
 class VCard implements SplitterInterface
 {
+    /**
+     * File handle.
+     *
+     * @var resource
+     */
+    protected $input;
+
     /**
      * Persistent parser.
      */
@@ -35,12 +42,10 @@ class VCard implements SplitterInterface
      * @param resource $input
      * @param int      $options parser options, see the OPTIONS constants
      */
-    public function __construct(/**
-     * File handle.
-     */
-        protected $input, int $options = 0)
+    public function __construct($input, int $options = 0)
     {
-        $this->parser = new MimeDir($this->input, $options);
+        $this->input = $input;
+        $this->parser = new MimeDir($input, $options);
     }
 
     /**
@@ -56,10 +61,10 @@ class VCard implements SplitterInterface
         try {
             $object = $this->parser->parse();
 
-            if (!$object instanceof Component\VCard) {
+            if (!$object instanceof VObject\Component\VCard) {
                 throw new VObject\ParseException('The supplied input contained non-VCARD data.');
             }
-        } catch (VObject\EofException) {
+        } catch (VObject\EofException $e) {
             return null;
         }
 
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimeZoneUtil.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimeZoneUtil.php
index 19333e86a..8c2a374fb 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimeZoneUtil.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimeZoneUtil.php
@@ -41,7 +41,9 @@ class TimeZoneUtil
 
     private static function getInstance(): self
     {
-        self::$instance ??= new self();
+        if (null === self::$instance) {
+            self::$instance = new self();
+        }
 
         return self::$instance;
     }
@@ -70,7 +72,7 @@ class TimeZoneUtil
      * Alternatively, if $failIfUncertain is set to true, it will throw an
      * exception if we cannot accurately determine the timezone.
      */
-    private function findTimeZone(string $tzid, ?Component $vcalendar = null, bool $failIfUncertain = false): \DateTimeZone
+    private function findTimeZone(string $tzid, Component $vcalendar = null, bool $failIfUncertain = false): \DateTimeZone
     {
         foreach ($this->timezoneFinders as $timezoneFinder) {
             $timezone = $timezoneFinder->find($tzid, $failIfUncertain);
@@ -115,7 +117,7 @@ class TimeZoneUtil
         self::getInstance()->addFinder($key, $finder);
     }
 
-    public static function getTimeZone(string $tzid, ?Component $vcalendar = null, bool $failIfUncertain = false): \DateTimeZone
+    public static function getTimeZone(string $tzid, Component $vcalendar = null, bool $failIfUncertain = false): \DateTimeZone
     {
         return self::getInstance()->findTimeZone($tzid, $vcalendar, $failIfUncertain);
     }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromOffset.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromOffset.php
index 418fd6ba9..d50cb969c 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromOffset.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromOffset.php
@@ -24,24 +24,6 @@ class FindFromOffset implements TimezoneFinder
             // @codeCoverageIgnoreEnd
         }
 
-        if (0 === strncasecmp($tzid, 'UTC', 3)) {
-            $offset = substr($tzid, 3);
-            if (6 === strlen($offset) && ':' === $offset[3]) {
-                $offset = substr($offset, 0, 3).substr($offset, 4);
-            }
-
-            if (5 !== strlen($offset)
-                || ('+' !== $offset[0] && '-' !== $offset[0])
-                || 4 !== strspn(substr($offset, 1), '0123456789')
-                || (int) substr($offset, 1, 2) > 23
-                || (int) substr($offset, 3, 2) > 59
-            ) {
-                return null;
-            }
-
-            return new \DateTimeZone($offset);
-        }
-
         return null;
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromTimezoneIdentifier.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromTimezoneIdentifier.php
index 5e56b82f1..ba84d45eb 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromTimezoneIdentifier.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromTimezoneIdentifier.php
@@ -40,13 +40,13 @@ class FindFromTimezoneIdentifier implements TimezoneFinder
 
         try {
             if (
-                in_array($tzid, $tzIdentifiers, true)
+                in_array($tzid, $tzIdentifiers)
                 || preg_match('/^GMT(\+|-)([0-9]{4})$/', $tzid, $matches)
-                || in_array($tzid, $this->getIdentifiersBC(), true)
+                || in_array($tzid, $this->getIdentifiersBC())
             ) {
                 return new \DateTimeZone($tzid);
             }
-        } catch (\Exception) {
+        } catch (\Exception $e) {
         }
 
         return null;
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromTimezoneMap.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromTimezoneMap.php
index 5beb5450d..83466b28e 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromTimezoneMap.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromTimezoneMap.php
@@ -18,18 +18,11 @@ class FindFromTimezoneMap implements TimezoneFinder
         '/^\((UTC|GMT)(\+|\-)[\d]{2}\.[\d]{2}\) (.*)/',
     ];
 
-    /**
-     * @throws void
-     */
     public function find(string $tzid, ?bool $failIfUncertain = false): ?\DateTimeZone
     {
         // Next, we check if the tzid is somewhere in our tzid map.
         if ($this->hasTzInMap($tzid)) {
-            try {
-                return new \DateTimeZone($this->getTzFromMap($tzid));
-            } catch (\Exception) {
-                return null;
-            }
+            return new \DateTimeZone($this->getTzFromMap($tzid));
         }
 
         // Some Microsoft products prefix the offset first, so let's strip that off
@@ -41,11 +34,7 @@ class FindFromTimezoneMap implements TimezoneFinder
             }
             $tzidAlternate = $matches[3];
             if ($this->hasTzInMap($tzidAlternate)) {
-                try {
-                    return new \DateTimeZone($this->getTzFromMap($tzidAlternate));
-                } catch (\Exception) {
-                    return null;
-                }
+                return new \DateTimeZone($this->getTzFromMap($tzidAlternate));
             }
         }
 
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/GuessFromLicEntry.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/GuessFromLicEntry.php
index 7212117f7..486b33796 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/GuessFromLicEntry.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/GuessFromLicEntry.php
@@ -23,7 +23,7 @@ class GuessFromLicEntry implements TimezoneGuesser
         // Libical generators may specify strings like
         // "SystemV/EST5EDT". For those we must remove the
         // SystemV part.
-        if (str_starts_with($lic, 'SystemV/')) {
+        if ('SystemV/' === substr($lic, 0, 8)) {
             $lic = substr($lic, 8);
         }
 
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/GuessFromMsTzId.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/GuessFromMsTzId.php
index 82060bd27..392333cb0 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/GuessFromMsTzId.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/GuessFromMsTzId.php
@@ -105,7 +105,7 @@ class GuessFromMsTzId implements TimezoneGuesser
         $cdoId = (int) $vtimezone->{'X-MICROSOFT-CDO-TZID'}->getValue();
 
         // 2 can mean both Europe/Lisbon and Europe/Sarajevo.
-        if (2 === $cdoId && str_contains((string) $vtimezone->TZID, 'Sarajevo')) {
+        if (2 === $cdoId && false !== strpos((string) $vtimezone->TZID, 'Sarajevo')) {
             return new \DateTimeZone('Europe/Sarajevo');
         }
 
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/VCardConverter.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/VCardConverter.php
index 39969d558..88d74602c 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/VCardConverter.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/VCardConverter.php
@@ -38,10 +38,10 @@ class VCardConverter
             return clone $input;
         }
 
-        if (!in_array($inputVersion, [Document::VCARD21, Document::VCARD30, Document::VCARD40], true)) {
+        if (!in_array($inputVersion, [Document::VCARD21, Document::VCARD30, Document::VCARD40])) {
             throw new \InvalidArgumentException('Only vCard 2.1, 3.0 and 4.0 are supported for the input data');
         }
-        if (!in_array($targetVersion, [Document::VCARD30, Document::VCARD40], true)) {
+        if (!in_array($targetVersion, [Document::VCARD30, Document::VCARD40])) {
             throw new \InvalidArgumentException('You can only use vCard 3.0 or 4.0 for the target version');
         }
 
@@ -69,7 +69,7 @@ class VCardConverter
     protected function convertProperty(Component\VCard $input, Component\VCard $output, Property $property, int $targetVersion): void
     {
         // Skipping these, those are automatically added.
-        if (in_array($property->name, ['VERSION', 'PRODID'], true)) {
+        if (in_array($property->name, ['VERSION', 'PRODID'])) {
             return;
         }
 
@@ -93,8 +93,8 @@ class VCardConverter
         );
 
         if (Document::VCARD30 === $targetVersion) {
-            if ($property instanceof Uri && in_array($property->name, ['PHOTO', 'LOGO', 'SOUND'], true)) {
-                /** @var Uri $newProperty */
+            if ($property instanceof Property\Uri && in_array($property->name, ['PHOTO', 'LOGO', 'SOUND'])) {
+                /** @var Property\Uri $newProperty */
                 $newProperty = $this->convertUriToBinary($output, $newProperty);
             } elseif ($property instanceof Property\VCard\DateAndOrTime) {
                 // In vCard 4, the birth year may be optional. This is not the
@@ -111,7 +111,7 @@ class VCardConverter
                     $newProperty['X-APPLE-OMIT-YEAR'] = '1604';
                 }
 
-                if ('ANNIVERSARY' === $newProperty->name) {
+                if ('ANNIVERSARY' == $newProperty->name) {
                     // Microsoft non-standard anniversary
                     $newProperty->name = 'X-ANNIVERSARY';
 
@@ -127,7 +127,7 @@ class VCardConverter
                     $output->add('ITEM'.$x.'.X-ABLABEL', '_$!<Anniversary>!$_');
                 }
             } elseif ('KIND' === $property->name) {
-                switch (strtolower((string) $property->getValue())) {
+                switch (strtolower($property->getValue())) {
                     case 'org':
                         // vCard 3.0 does not have an equivalent to KIND:ORG,
                         // but apple has an extension that means the same
@@ -149,12 +149,12 @@ class VCardConverter
             }
         } elseif (Document::VCARD40 === $targetVersion) {
             // These properties were removed in vCard 4.0
-            if (in_array($property->name, ['NAME', 'MAILER', 'LABEL', 'CLASS'], true)) {
+            if (in_array($property->name, ['NAME', 'MAILER', 'LABEL', 'CLASS'])) {
                 return;
             }
 
-            if ($property instanceof Binary) {
-                /** @var Binary $newProperty */
+            if ($property instanceof Property\Binary) {
+                /** @var Property\Binary $newProperty */
                 $newProperty = $this->convertBinaryToUri($output, $newProperty, $parameters);
             } elseif ($property instanceof Property\VCard\DateAndOrTime && isset($parameters['X-APPLE-OMIT-YEAR'])) {
                 // If a property such as BDAY contained 'X-APPLE-OMIT-YEAR',
@@ -171,12 +171,12 @@ class VCardConverter
             }
             switch ($property->name) {
                 case 'X-ABSHOWAS':
-                    if ('COMPANY' === strtoupper((string) $property->getValue())) {
+                    if ('COMPANY' === strtoupper($property->getValue())) {
                         $newProperty = $output->createProperty('KIND', 'ORG');
                     }
                     break;
                 case 'X-ADDRESSBOOKSERVER-KIND':
-                    if ('GROUP' === strtoupper((string) $property->getValue())) {
+                    if ('GROUP' === strtoupper($property->getValue())) {
                         $newProperty = $output->createProperty('KIND', 'GROUP');
                     }
                     break;
@@ -256,7 +256,7 @@ class VCardConverter
      *
      * @throws InvalidDataException
      */
-    protected function convertBinaryToUri(Component\VCard $output, Binary $newProperty, array &$parameters): Uri
+    protected function convertBinaryToUri(Component\VCard $output, Property\Binary $newProperty, array &$parameters): Uri
     {
         $value = $newProperty->getValue();
         /** @var Uri $newProperty */
@@ -274,11 +274,10 @@ class VCardConverter
             $newTypes = [];
             foreach ($parameters['TYPE']->getParts() as $typePart) {
                 if (in_array(
-                    strtoupper((string) $typePart),
-                    ['JPEG', 'PNG', 'GIF'],
-                    true
+                    strtoupper($typePart),
+                    ['JPEG', 'PNG', 'GIF']
                 )) {
-                    $mimeType = 'image/'.strtolower((string) $typePart);
+                    $mimeType = 'image/'.strtolower($typePart);
                 } else {
                     $newTypes[] = $typePart;
                 }
@@ -293,7 +292,7 @@ class VCardConverter
             }
         }
 
-        $newProperty->setValue('data:'.$mimeType.';base64,'.base64_encode((string) $value));
+        $newProperty->setValue('data:'.$mimeType.';base64,'.base64_encode($value));
 
         return $newProperty;
     }
@@ -305,16 +304,16 @@ class VCardConverter
      * be valid in vCard 3.0 as well, we should convert those to BINARY if
      * possible, to improve compatibility.
      *
-     * @return Binary|Uri|null
+     * @return Property\Binary|Property\Uri|null
      *
      * @throws InvalidDataException
      */
-    protected function convertUriToBinary(Component\VCard $output, Uri $newProperty): Property
+    protected function convertUriToBinary(Component\VCard $output, Property\Uri $newProperty): Property
     {
         $value = $newProperty->getValue();
 
         // Only converting data: uris
-        if (!str_starts_with((string) $value, 'data:')) {
+        if ('data:' !== substr($value, 0, 5)) {
             return $newProperty;
         }
 
@@ -326,12 +325,12 @@ class VCardConverter
             'BINARY'
         );
 
-        $mimeType = substr((string) $value, 5, strpos((string) $value, ',') - 5);
+        $mimeType = substr($value, 5, strpos($value, ',') - 5);
         if (strpos($mimeType, ';')) {
             $mimeType = substr($mimeType, 0, strpos($mimeType, ';'));
-            $newProperty->setValue(base64_decode(substr((string) $value, strpos((string) $value, ',') + 1), true));
+            $newProperty->setValue(base64_decode(substr($value, strpos($value, ',') + 1)));
         } else {
-            $newProperty->setValue(substr((string) $value, strpos((string) $value, ',') + 1));
+            $newProperty->setValue(substr($value, strpos($value, ',') + 1));
         }
         unset($value);
 
@@ -368,7 +367,7 @@ class VCardConverter
                 // that's now PREF=1.
                 case 'TYPE':
                     foreach ($param->getParts() as $paramPart) {
-                        if ('PREF' === strtoupper((string) $paramPart)) {
+                        if ('PREF' === strtoupper($paramPart)) {
                             $newProperty->add('PREF', '1');
                         } else {
                             $newProperty->add($param->name, $paramPart);
@@ -403,7 +402,7 @@ class VCardConverter
                 case 'ENCODING':
                     // This value only existed in vCard 2.1, and should be
                     // removed for anything else.
-                    if ('QUOTED-PRINTABLE' !== strtoupper((string) $param->getValue())) {
+                    if ('QUOTED-PRINTABLE' !== strtoupper($param->getValue())) {
                         $newProperty->add($param->name, $param->getParts());
                     }
                     break;
@@ -414,7 +413,7 @@ class VCardConverter
                      * Any other PREF numbers we'll drop.
                      */
                 case 'PREF':
-                    if ('1' === (string) $param->getValue()) {
+                    if ('1' == $param->getValue()) {
                         $newProperty->add('TYPE', 'PREF');
                     }
                     break;
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Version.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Version.php
index e851a6507..893f272d3 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Version.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Version.php
@@ -14,5 +14,5 @@ class Version
     /**
      * Full version number.
      */
-    public const VERSION = '5.0.0';
+    public const VERSION = '4.5.2';
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/exchangezones.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/exchangezones.php
index f42944b3b..89bddc27c 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/exchangezones.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/exchangezones.php
@@ -17,7 +17,6 @@ return [
     'Greenwich Mean Time: Dublin, Edinburgh, Lisbon, London' => 'Europe/Lisbon',
     'Greenwich Mean Time; Dublin, Edinburgh, London' => 'Europe/London',
     'Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna' => 'Europe/Berlin',
-    'Amsterdam, Berlin, Bern, Rom, Stockholm, Wien' => 'Europe/Berlin',
     'Belgrade, Pozsony, Budapest, Ljubljana, Prague' => 'Europe/Prague',
     'Brussels, Copenhagen, Madrid, Paris' => 'Europe/Paris',
     'Paris, Madrid, Brussels, Copenhagen' => 'Europe/Paris',
@@ -40,12 +39,12 @@ return [
     'Kabul' => 'Asia/Kabul',
     'Ekaterinburg' => 'Asia/Yekaterinburg',
     'Islamabad, Karachi, Tashkent' => 'Asia/Karachi',
-    'Kolkata, Chennai, Mumbai, New Delhi, India Standard Time' => 'Asia/Kolkata',
+    'Kolkata, Chennai, Mumbai, New Delhi, India Standard Time' => 'Asia/Calcutta',
     'Kathmandu, Nepal' => 'Asia/Kathmandu',
     'Almaty, Novosibirsk, North Central Asia' => 'Asia/Almaty',
     'Astana, Dhaka' => 'Asia/Dhaka',
     'Sri Jayawardenepura, Sri Lanka' => 'Asia/Colombo',
-    'Rangoon' => 'Asia/Yangon',
+    'Rangoon' => 'Asia/Rangoon',
     'Bangkok, Hanoi, Jakarta' => 'Asia/Bangkok',
     'Krasnoyarsk' => 'Asia/Krasnoyarsk',
     'Beijing, Chongqing, Hong Kong SAR, Urumqi' => 'Asia/Shanghai',
@@ -72,7 +71,7 @@ return [
     'Mid-Atlantic' => 'America/Noronha',
     'Brasilia' => 'America/Sao_Paulo', // Best guess
     'Buenos Aires' => 'America/Argentina/Buenos_Aires',
-    'Greenland' => 'America/Nuuk',
+    'Greenland' => 'America/Godthab',
     'Newfoundland' => 'America/St_Johns',
     'Atlantic Time (Canada)' => 'America/Halifax',
     'Caracas, La Paz' => 'America/Caracas',
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/lotuszones.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/lotuszones.php
index 45e76f7d6..9115ac743 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/lotuszones.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/lotuszones.php
@@ -34,7 +34,7 @@ return [
     'Newfoundland' => 'America/St_Johns',
     'Argentina' => 'America/Argentina/Buenos_Aires',
     'E. South America' => 'America/Belem',
-    'Greenland' => 'America/Nuuk',
+    'Greenland' => 'America/Godthab',
     'Montevideo' => 'America/Montevideo',
     'SA Eastern' => 'America/Belem',
     // 'Mid-Atlantic'           => 'Etc/GMT-2', // conflict with windows timezones.
@@ -71,12 +71,12 @@ return [
     'Ekaterinburg' => 'Asia/Yekaterinburg',
     'Pakistan' => 'Asia/Karachi',
     'West Asia' => 'Asia/Tashkent',
-    'India' => 'Asia/Kolkata',
+    'India' => 'Asia/Calcutta',
     'Sri Lanka' => 'Asia/Colombo',
     'Nepal' => 'Asia/Kathmandu',
     'Central Asia' => 'Asia/Dhaka',
     'N. Central Asia' => 'Asia/Almaty',
-    'Myanmar' => 'Asia/Yangon',
+    'Myanmar' => 'Asia/Rangoon',
     'North Asia' => 'Asia/Krasnoyarsk',
     'SE Asia' => 'Asia/Bangkok',
     'China' => 'Asia/Shanghai',
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/windowszones.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/windowszones.php
index 2dd9120e3..2049a95c1 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/windowszones.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/windowszones.php
@@ -11,142 +11,142 @@
  */
 
 return [
-    'AUS Central Standard Time' => 'Australia/Darwin',
-    'AUS Eastern Standard Time' => 'Australia/Sydney',
-    'Afghanistan Standard Time' => 'Asia/Kabul',
-    'Alaskan Standard Time' => 'America/Anchorage',
-    'Aleutian Standard Time' => 'America/Adak',
-    'Altai Standard Time' => 'Asia/Barnaul',
-    'Arab Standard Time' => 'Asia/Riyadh',
-    'Arabian Standard Time' => 'Asia/Dubai',
-    'Arabic Standard Time' => 'Asia/Baghdad',
-    'Argentina Standard Time' => 'America/Argentina/Buenos_Aires',
-    'Astrakhan Standard Time' => 'Europe/Astrakhan',
-    'Atlantic Standard Time' => 'America/Halifax',
-    'Aus Central W. Standard Time' => 'Australia/Eucla',
-    'Azerbaijan Standard Time' => 'Asia/Baku',
-    'Azores Standard Time' => 'Atlantic/Azores',
-    'Bahia Standard Time' => 'America/Bahia',
-    'Bangladesh Standard Time' => 'Asia/Dhaka',
-    'Belarus Standard Time' => 'Europe/Minsk',
-    'Bougainville Standard Time' => 'Pacific/Bougainville',
-    'Canada Central Standard Time' => 'America/Regina',
-    'Cape Verde Standard Time' => 'Atlantic/Cape_Verde',
-    'Caucasus Standard Time' => 'Asia/Yerevan',
-    'Cen. Australia Standard Time' => 'Australia/Adelaide',
-    'Central America Standard Time' => 'America/Guatemala',
-    'Central Asia Standard Time' => 'Asia/Almaty',
-    'Central Brazilian Standard Time' => 'America/Cuiaba',
-    'Central Europe Standard Time' => 'Europe/Budapest',
-    'Central European Standard Time' => 'Europe/Warsaw',
-    'Central Pacific Standard Time' => 'Pacific/Guadalcanal',
-    'Central Standard Time' => 'America/Chicago',
-    'Central Standard Time (Mexico)' => 'America/Mexico_City',
-    'Chatham Islands Standard Time' => 'Pacific/Chatham',
-    'China Standard Time' => 'Asia/Shanghai',
-    'Cuba Standard Time' => 'America/Havana',
-    'Dateline Standard Time' => 'Etc/GMT+12',
-    'E. Africa Standard Time' => 'Africa/Nairobi',
-    'E. Australia Standard Time' => 'Australia/Brisbane',
-    'E. Europe Standard Time' => 'Europe/Chisinau',
-    'E. South America Standard Time' => 'America/Sao_Paulo',
-    'Easter Island Standard Time' => 'Pacific/Easter',
-    'Eastern Standard Time' => 'America/New_York',
-    'Eastern Standard Time (Mexico)' => 'America/Cancun',
-    'Egypt Standard Time' => 'Africa/Cairo',
-    'Ekaterinburg Standard Time' => 'Asia/Yekaterinburg',
-    'FLE Standard Time' => 'Europe/Kyiv',
-    'Fiji Standard Time' => 'Pacific/Fiji',
-    'GMT Standard Time' => 'Europe/London',
-    'GTB Standard Time' => 'Europe/Bucharest',
-    'Georgian Standard Time' => 'Asia/Tbilisi',
-    'Greenland Standard Time' => 'America/Nuuk',
-    'Greenwich Standard Time' => 'Atlantic/Reykjavik',
-    'Haiti Standard Time' => 'America/Port-au-Prince',
-    'Hawaiian Standard Time' => 'Pacific/Honolulu',
-    'India Standard Time' => 'Asia/Kolkata',
-    'Iran Standard Time' => 'Asia/Tehran',
-    'Israel Standard Time' => 'Asia/Jerusalem',
-    'Jordan Standard Time' => 'Asia/Amman',
-    'Kaliningrad Standard Time' => 'Europe/Kaliningrad',
-    'Korea Standard Time' => 'Asia/Seoul',
-    'Libya Standard Time' => 'Africa/Tripoli',
-    'Line Islands Standard Time' => 'Pacific/Kiritimati',
-    'Lord Howe Standard Time' => 'Australia/Lord_Howe',
-    'Magadan Standard Time' => 'Asia/Magadan',
-    'Magallanes Standard Time' => 'America/Punta_Arenas',
-    'Marquesas Standard Time' => 'Pacific/Marquesas',
-    'Mauritius Standard Time' => 'Indian/Mauritius',
-    'Middle East Standard Time' => 'Asia/Beirut',
-    'Montevideo Standard Time' => 'America/Montevideo',
-    'Morocco Standard Time' => 'Africa/Casablanca',
-    'Mountain Standard Time' => 'America/Denver',
-    'Mountain Standard Time (Mexico)' => 'America/Chihuahua',
-    'Myanmar Standard Time' => 'Asia/Yangon',
-    'N. Central Asia Standard Time' => 'Asia/Novosibirsk',
-    'Namibia Standard Time' => 'Africa/Windhoek',
-    'Nepal Standard Time' => 'Asia/Kathmandu',
-    'New Zealand Standard Time' => 'Pacific/Auckland',
-    'Newfoundland Standard Time' => 'America/St_Johns',
-    'Norfolk Standard Time' => 'Pacific/Norfolk',
-    'North Asia East Standard Time' => 'Asia/Irkutsk',
-    'North Asia Standard Time' => 'Asia/Krasnoyarsk',
-    'North Korea Standard Time' => 'Asia/Pyongyang',
-    'Omsk Standard Time' => 'Asia/Omsk',
-    'Pacific SA Standard Time' => 'America/Santiago',
-    'Pacific Standard Time' => 'America/Los_Angeles',
-    'Pacific Standard Time (Mexico)' => 'America/Tijuana',
-    'Pakistan Standard Time' => 'Asia/Karachi',
-    'Paraguay Standard Time' => 'America/Asuncion',
-    'Qyzylorda Standard Time' => 'Asia/Qyzylorda',
-    'Romance Standard Time' => 'Europe/Paris',
-    'Russia Time Zone 10' => 'Asia/Srednekolymsk',
-    'Russia Time Zone 11' => 'Asia/Kamchatka',
-    'Russia Time Zone 3' => 'Europe/Samara',
-    'Russian Standard Time' => 'Europe/Moscow',
-    'SA Eastern Standard Time' => 'America/Cayenne',
-    'SA Pacific Standard Time' => 'America/Bogota',
-    'SA Western Standard Time' => 'America/La_Paz',
-    'SE Asia Standard Time' => 'Asia/Bangkok',
-    'Saint Pierre Standard Time' => 'America/Miquelon',
-    'Sakhalin Standard Time' => 'Asia/Sakhalin',
-    'Samoa Standard Time' => 'Pacific/Apia',
-    'Sao Tome Standard Time' => 'Africa/Sao_Tome',
-    'Saratov Standard Time' => 'Europe/Saratov',
-    'Singapore Standard Time' => 'Asia/Singapore',
-    'South Africa Standard Time' => 'Africa/Johannesburg',
-    'Sri Lanka Standard Time' => 'Asia/Colombo',
-    'Sudan Standard Time' => 'Africa/Khartoum',
-    'Syria Standard Time' => 'Asia/Damascus',
-    'Taipei Standard Time' => 'Asia/Taipei',
-    'Tasmania Standard Time' => 'Australia/Hobart',
-    'Tocantins Standard Time' => 'America/Araguaina',
-    'Tokyo Standard Time' => 'Asia/Tokyo',
-    'Tomsk Standard Time' => 'Asia/Tomsk',
-    'Tonga Standard Time' => 'Pacific/Tongatapu',
-    'Transbaikal Standard Time' => 'Asia/Chita',
-    'Turkey Standard Time' => 'Europe/Istanbul',
-    'Turks And Caicos Standard Time' => 'America/Grand_Turk',
-    'US Eastern Standard Time' => 'America/Indiana/Indianapolis',
-    'US Mountain Standard Time' => 'America/Phoenix',
-    'UTC' => 'Etc/GMT',
-    'UTC+12' => 'Etc/GMT-12',
-    'UTC+13' => 'Etc/GMT-13',
-    'UTC-02' => 'Etc/GMT+2',
-    'UTC-08' => 'Etc/GMT+8',
-    'UTC-09' => 'Etc/GMT+9',
-    'UTC-11' => 'Etc/GMT+11',
-    'Ulaanbaatar Standard Time' => 'Asia/Ulaanbaatar',
-    'Venezuela Standard Time' => 'America/Caracas',
-    'Vladivostok Standard Time' => 'Asia/Vladivostok',
-    'Volgograd Standard Time' => 'Europe/Volgograd',
-    'W. Australia Standard Time' => 'Australia/Perth',
-    'W. Central Africa Standard Time' => 'Africa/Lagos',
-    'W. Europe Standard Time' => 'Europe/Berlin',
-    'W. Mongolia Standard Time' => 'Asia/Hovd',
-    'West Asia Standard Time' => 'Asia/Tashkent',
-    'West Bank Standard Time' => 'Asia/Hebron',
-    'West Pacific Standard Time' => 'Pacific/Port_Moresby',
-    'Yakutsk Standard Time' => 'Asia/Yakutsk',
-    'Yukon Standard Time' => 'America/Whitehorse',
+  'AUS Central Standard Time' => 'Australia/Darwin',
+  'AUS Eastern Standard Time' => 'Australia/Sydney',
+  'Afghanistan Standard Time' => 'Asia/Kabul',
+  'Alaskan Standard Time' => 'America/Anchorage',
+  'Aleutian Standard Time' => 'America/Adak',
+  'Altai Standard Time' => 'Asia/Barnaul',
+  'Arab Standard Time' => 'Asia/Riyadh',
+  'Arabian Standard Time' => 'Asia/Dubai',
+  'Arabic Standard Time' => 'Asia/Baghdad',
+  'Argentina Standard Time' => 'America/Buenos_Aires',
+  'Astrakhan Standard Time' => 'Europe/Astrakhan',
+  'Atlantic Standard Time' => 'America/Halifax',
+  'Aus Central W. Standard Time' => 'Australia/Eucla',
+  'Azerbaijan Standard Time' => 'Asia/Baku',
+  'Azores Standard Time' => 'Atlantic/Azores',
+  'Bahia Standard Time' => 'America/Bahia',
+  'Bangladesh Standard Time' => 'Asia/Dhaka',
+  'Belarus Standard Time' => 'Europe/Minsk',
+  'Bougainville Standard Time' => 'Pacific/Bougainville',
+  'Canada Central Standard Time' => 'America/Regina',
+  'Cape Verde Standard Time' => 'Atlantic/Cape_Verde',
+  'Caucasus Standard Time' => 'Asia/Yerevan',
+  'Cen. Australia Standard Time' => 'Australia/Adelaide',
+  'Central America Standard Time' => 'America/Guatemala',
+  'Central Asia Standard Time' => 'Asia/Almaty',
+  'Central Brazilian Standard Time' => 'America/Cuiaba',
+  'Central Europe Standard Time' => 'Europe/Budapest',
+  'Central European Standard Time' => 'Europe/Warsaw',
+  'Central Pacific Standard Time' => 'Pacific/Guadalcanal',
+  'Central Standard Time' => 'America/Chicago',
+  'Central Standard Time (Mexico)' => 'America/Mexico_City',
+  'Chatham Islands Standard Time' => 'Pacific/Chatham',
+  'China Standard Time' => 'Asia/Shanghai',
+  'Cuba Standard Time' => 'America/Havana',
+  'Dateline Standard Time' => 'Etc/GMT+12',
+  'E. Africa Standard Time' => 'Africa/Nairobi',
+  'E. Australia Standard Time' => 'Australia/Brisbane',
+  'E. Europe Standard Time' => 'Europe/Chisinau',
+  'E. South America Standard Time' => 'America/Sao_Paulo',
+  'Easter Island Standard Time' => 'Pacific/Easter',
+  'Eastern Standard Time' => 'America/New_York',
+  'Eastern Standard Time (Mexico)' => 'America/Cancun',
+  'Egypt Standard Time' => 'Africa/Cairo',
+  'Ekaterinburg Standard Time' => 'Asia/Yekaterinburg',
+  'FLE Standard Time' => 'Europe/Kiev',
+  'Fiji Standard Time' => 'Pacific/Fiji',
+  'GMT Standard Time' => 'Europe/London',
+  'GTB Standard Time' => 'Europe/Bucharest',
+  'Georgian Standard Time' => 'Asia/Tbilisi',
+  'Greenland Standard Time' => 'America/Godthab',
+  'Greenwich Standard Time' => 'Atlantic/Reykjavik',
+  'Haiti Standard Time' => 'America/Port-au-Prince',
+  'Hawaiian Standard Time' => 'Pacific/Honolulu',
+  'India Standard Time' => 'Asia/Calcutta',
+  'Iran Standard Time' => 'Asia/Tehran',
+  'Israel Standard Time' => 'Asia/Jerusalem',
+  'Jordan Standard Time' => 'Asia/Amman',
+  'Kaliningrad Standard Time' => 'Europe/Kaliningrad',
+  'Korea Standard Time' => 'Asia/Seoul',
+  'Libya Standard Time' => 'Africa/Tripoli',
+  'Line Islands Standard Time' => 'Pacific/Kiritimati',
+  'Lord Howe Standard Time' => 'Australia/Lord_Howe',
+  'Magadan Standard Time' => 'Asia/Magadan',
+  'Magallanes Standard Time' => 'America/Punta_Arenas',
+  'Marquesas Standard Time' => 'Pacific/Marquesas',
+  'Mauritius Standard Time' => 'Indian/Mauritius',
+  'Middle East Standard Time' => 'Asia/Beirut',
+  'Montevideo Standard Time' => 'America/Montevideo',
+  'Morocco Standard Time' => 'Africa/Casablanca',
+  'Mountain Standard Time' => 'America/Denver',
+  'Mountain Standard Time (Mexico)' => 'America/Chihuahua',
+  'Myanmar Standard Time' => 'Asia/Rangoon',
+  'N. Central Asia Standard Time' => 'Asia/Novosibirsk',
+  'Namibia Standard Time' => 'Africa/Windhoek',
+  'Nepal Standard Time' => 'Asia/Katmandu',
+  'New Zealand Standard Time' => 'Pacific/Auckland',
+  'Newfoundland Standard Time' => 'America/St_Johns',
+  'Norfolk Standard Time' => 'Pacific/Norfolk',
+  'North Asia East Standard Time' => 'Asia/Irkutsk',
+  'North Asia Standard Time' => 'Asia/Krasnoyarsk',
+  'North Korea Standard Time' => 'Asia/Pyongyang',
+  'Omsk Standard Time' => 'Asia/Omsk',
+  'Pacific SA Standard Time' => 'America/Santiago',
+  'Pacific Standard Time' => 'America/Los_Angeles',
+  'Pacific Standard Time (Mexico)' => 'America/Tijuana',
+  'Pakistan Standard Time' => 'Asia/Karachi',
+  'Paraguay Standard Time' => 'America/Asuncion',
+  'Qyzylorda Standard Time' => 'Asia/Qyzylorda',
+  'Romance Standard Time' => 'Europe/Paris',
+  'Russia Time Zone 10' => 'Asia/Srednekolymsk',
+  'Russia Time Zone 11' => 'Asia/Kamchatka',
+  'Russia Time Zone 3' => 'Europe/Samara',
+  'Russian Standard Time' => 'Europe/Moscow',
+  'SA Eastern Standard Time' => 'America/Cayenne',
+  'SA Pacific Standard Time' => 'America/Bogota',
+  'SA Western Standard Time' => 'America/La_Paz',
+  'SE Asia Standard Time' => 'Asia/Bangkok',
+  'Saint Pierre Standard Time' => 'America/Miquelon',
+  'Sakhalin Standard Time' => 'Asia/Sakhalin',
+  'Samoa Standard Time' => 'Pacific/Apia',
+  'Sao Tome Standard Time' => 'Africa/Sao_Tome',
+  'Saratov Standard Time' => 'Europe/Saratov',
+  'Singapore Standard Time' => 'Asia/Singapore',
+  'South Africa Standard Time' => 'Africa/Johannesburg',
+  'Sri Lanka Standard Time' => 'Asia/Colombo',
+  'Sudan Standard Time' => 'Africa/Khartoum',
+  'Syria Standard Time' => 'Asia/Damascus',
+  'Taipei Standard Time' => 'Asia/Taipei',
+  'Tasmania Standard Time' => 'Australia/Hobart',
+  'Tocantins Standard Time' => 'America/Araguaina',
+  'Tokyo Standard Time' => 'Asia/Tokyo',
+  'Tomsk Standard Time' => 'Asia/Tomsk',
+  'Tonga Standard Time' => 'Pacific/Tongatapu',
+  'Transbaikal Standard Time' => 'Asia/Chita',
+  'Turkey Standard Time' => 'Europe/Istanbul',
+  'Turks And Caicos Standard Time' => 'America/Grand_Turk',
+  'US Eastern Standard Time' => 'America/Indianapolis',
+  'US Mountain Standard Time' => 'America/Phoenix',
+  'UTC' => 'Etc/GMT',
+  'UTC+12' => 'Etc/GMT-12',
+  'UTC+13' => 'Etc/GMT-13',
+  'UTC-02' => 'Etc/GMT+2',
+  'UTC-08' => 'Etc/GMT+8',
+  'UTC-09' => 'Etc/GMT+9',
+  'UTC-11' => 'Etc/GMT+11',
+  'Ulaanbaatar Standard Time' => 'Asia/Ulaanbaatar',
+  'Venezuela Standard Time' => 'America/Caracas',
+  'Vladivostok Standard Time' => 'Asia/Vladivostok',
+  'Volgograd Standard Time' => 'Europe/Volgograd',
+  'W. Australia Standard Time' => 'Australia/Perth',
+  'W. Central Africa Standard Time' => 'Africa/Lagos',
+  'W. Europe Standard Time' => 'Europe/Berlin',
+  'W. Mongolia Standard Time' => 'Asia/Hovd',
+  'West Asia Standard Time' => 'Asia/Tashkent',
+  'West Bank Standard Time' => 'Asia/Hebron',
+  'West Pacific Standard Time' => 'Pacific/Port_Moresby',
+  'Yakutsk Standard Time' => 'Asia/Yakutsk',
+  'Yukon Standard Time' => 'America/Whitehorse',
 ];
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/ContextStackTrait.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/ContextStackTrait.php
index 7c082f5fb..b514f3754 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/ContextStackTrait.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/ContextStackTrait.php
@@ -110,7 +110,7 @@ trait ContextStackTrait
             $this->elementMap,
             $this->contextUri,
             $this->namespaceMap,
-            $this->classMap,
+            $this->classMap
         ) = array_pop($this->contextStack);
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Deserializer/functions.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Deserializer/functions.php
index cb5b7ca56..949aa720e 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Deserializer/functions.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Deserializer/functions.php
@@ -212,13 +212,11 @@ function valueObject(Reader $reader, string $className, string $namespace): obje
 
     $reader->read();
     do {
-        if (Reader::ELEMENT === $reader->nodeType && $reader->namespaceURI === $namespace) {
+        if (Reader::ELEMENT === $reader->nodeType && $reader->namespaceURI == $namespace) {
             if (property_exists($valueObject, $reader->localName)) {
                 if (is_array($defaultProperties[$reader->localName])) {
-                    // @phpstan-ignore property.dynamicName
                     $valueObject->{$reader->localName}[] = $reader->parseCurrentElement()['value'];
                 } else {
-                    // @phpstan-ignore property.dynamicName
                     $valueObject->{$reader->localName} = $reader->parseCurrentElement()['value'];
                 }
             } else {
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Base.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Base.php
index 10fe97838..7c597fa8c 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Base.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Base.php
@@ -19,13 +19,19 @@ use Sabre\Xml;
  */
 class Base implements Xml\Element
 {
+    /**
+     * @var mixed PHP value to serialize
+     */
+    protected $value;
+
     /**
      * Constructor.
      *
      * @param mixed $value PHP value to serialize
      */
-    public function __construct(protected $value = null)
+    public function __construct($value = null)
     {
+        $this->value = $value;
     }
 
     /**
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Cdata.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Cdata.php
index 54e3879ee..8e16afbae 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Cdata.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Cdata.php
@@ -21,15 +21,17 @@ use Sabre\Xml;
  */
 class Cdata implements Xml\XmlSerializable
 {
+    /**
+     * CDATA element value.
+     */
+    protected string $value;
+
     /**
      * Constructor.
      */
-    public function __construct(
-        /**
-         * CDATA element value.
-         */
-        protected string $value,
-    ) {
+    public function __construct(string $value)
+    {
+        $this->value = $value;
     }
 
     /**
@@ -50,6 +52,6 @@ class Cdata implements Xml\XmlSerializable
      */
     public function xmlSerialize(Xml\Writer $writer): void
     {
-        $writer->writeCdata($this->value);
+        $writer->writeCData($this->value);
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Elements.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Elements.php
index 44d296bd3..b62a2f3ea 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Elements.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Elements.php
@@ -37,17 +37,21 @@ use Sabre\Xml\Serializer;
  */
 class Elements implements Xml\Element
 {
+    /**
+     * Value to serialize.
+     *
+     * @var array<int, mixed>
+     */
+    protected array $value;
+
     /**
      * Constructor.
      *
      * @param array<int, mixed> $value
      */
-    public function __construct(
-        /**
-         * Value to serialize.
-         */
-        protected array $value = [],
-    ) {
+    public function __construct(array $value = [])
+    {
+        $this->value = $value;
     }
 
     /**
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/KeyValue.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/KeyValue.php
index 862c181c3..54c31eb26 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/KeyValue.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/KeyValue.php
@@ -37,17 +37,21 @@ use Sabre\Xml\Deserializer;
  */
 class KeyValue implements Xml\Element
 {
+    /**
+     * Value to serialize.
+     *
+     * @var array<string, mixed>
+     */
+    protected array $value;
+
     /**
      * Constructor.
      *
      * @param array<string, mixed> $value
      */
-    public function __construct(
-        /**
-         * Value to serialize.
-         */
-        protected array $value = [],
-    ) {
+    public function __construct(array $value = [])
+    {
+        $this->value = $value;
     }
 
     /**
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Uri.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Uri.php
index 583aff618..e54d706a9 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Uri.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Uri.php
@@ -26,15 +26,17 @@ use function Sabre\Uri\resolve;
  */
 class Uri implements Xml\Element
 {
+    /**
+     * Uri element value.
+     */
+    protected string $value;
+
     /**
      * Constructor.
      */
-    public function __construct(
-        /**
-         * Uri element value.
-         */
-        protected string $value,
-    ) {
+    public function __construct(string $value)
+    {
+        $this->value = $value;
     }
 
     /**
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/XmlFragment.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/XmlFragment.php
index 908fe5b22..94f745b4c 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/XmlFragment.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/XmlFragment.php
@@ -24,15 +24,17 @@ use Sabre\Xml\Writer;
  */
 class XmlFragment implements Element
 {
+    /**
+     * The inner XML value.
+     */
+    protected string $xml;
+
     /**
      * Constructor.
      */
-    public function __construct(
-        /**
-         * The inner XML value.
-         */
-        protected string $xml,
-    ) {
+    public function __construct(string $xml)
+    {
+        $this->xml = $xml;
     }
 
     /**
@@ -70,7 +72,7 @@ class XmlFragment implements Element
 <xml-fragment xmlns="http://sabre.io/ns">{$this->getXml()}</xml-fragment>
 XML;
 
-        $reader->XML($xml);
+        $reader->xml($xml);
 
         while ($reader->read()) {
             if ($reader->depth < 1) {
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/LibXMLException.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/LibXMLException.php
index 0f760c849..5c642a3bf 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/LibXMLException.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/LibXMLException.php
@@ -17,6 +17,13 @@ use LibXMLError;
  */
 class LibXMLException extends ParseException
 {
+    /**
+     * The error list.
+     *
+     * @var \LibXMLError[]
+     */
+    protected array $errors;
+
     /**
      * Creates the exception.
      *
@@ -24,12 +31,10 @@ class LibXMLException extends ParseException
      *
      * @param \LibXMLError[] $errors
      */
-    public function __construct(/**
-     * The error list.
-     */
-        protected array $errors, int $code = 0, ?\Throwable $previousException = null)
+    public function __construct(array $errors, int $code = 0, ?\Throwable $previousException = null)
     {
-        parent::__construct($this->errors[0]->message.' on line '.$this->errors[0]->line.', column '.$this->errors[0]->column, $code, $previousException);
+        $this->errors = $errors;
+        parent::__construct($errors[0]->message.' on line '.$errors[0]->line.', column '.$errors[0]->column, $code, $previousException);
     }
 
     /**
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Reader.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Reader.php
index 8d01f710a..a85bd058c 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Reader.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Reader.php
@@ -33,7 +33,7 @@ class Reader extends \XMLReader
      */
     public function getClark(): ?string
     {
-        if ('' === $this->localName) {
+        if (!$this->localName) {
             return null;
         }
 
@@ -67,7 +67,7 @@ class Reader extends \XMLReader
                 if (!$this->read()) {
                     $errors = libxml_get_errors();
                     libxml_clear_errors();
-                    if (count($errors) > 0) {
+                    if ($errors) {
                         throw new LibXMLException($errors);
                     }
                 }
@@ -77,7 +77,7 @@ class Reader extends \XMLReader
             // last line of defense in case errors did occur above
             $errors = libxml_get_errors();
             libxml_clear_errors();
-            if (count($errors) > 0) {
+            if ($errors) {
                 throw new LibXMLException($errors);
             }
         } finally {
@@ -153,7 +153,7 @@ class Reader extends \XMLReader
             if (!$this->read()) {
                 $errors = libxml_get_errors();
                 libxml_clear_errors();
-                if (count($errors) > 0) {
+                if ($errors) {
                     throw new LibXMLException($errors);
                 }
                 throw new ParseException('This should never happen (famous last words)');
@@ -165,7 +165,7 @@ class Reader extends \XMLReader
                 if (!$this->isValid()) {
                     $errors = libxml_get_errors();
 
-                    if (count($errors) > 0) {
+                    if ($errors) {
                         libxml_clear_errors();
                         throw new LibXMLException($errors);
                     }
@@ -199,7 +199,7 @@ class Reader extends \XMLReader
             }
         }
 
-        return count($elements) > 0 ? $elements : $text;
+        return $elements ?: $text;
     }
 
     /**
@@ -210,8 +210,8 @@ class Reader extends \XMLReader
         $result = '';
         $previousDepth = $this->depth;
 
-        while ($this->read() && $this->depth !== $previousDepth) {
-            if (in_array($this->nodeType, [\XMLReader::TEXT, \XMLReader::CDATA, \XMLReader::WHITESPACE], true)) {
+        while ($this->read() && $this->depth != $previousDepth) {
+            if (in_array($this->nodeType, [\XMLReader::TEXT, \XMLReader::CDATA, \XMLReader::WHITESPACE])) {
                 $result .= $this->value;
             }
         }
@@ -266,7 +266,7 @@ class Reader extends \XMLReader
         $attributes = [];
 
         while ($this->moveToNextAttribute()) {
-            if ('' !== $this->namespaceURI) {
+            if ($this->namespaceURI) {
                 // Ignoring 'xmlns', it doesn't make any sense.
                 if ('http://www.w3.org/2000/xmlns/' === $this->namespaceURI) {
                     continue;
@@ -290,10 +290,10 @@ class Reader extends \XMLReader
     public function getDeserializerForElementName(string $name): callable
     {
         if (!array_key_exists($name, $this->elementMap)) {
-            if (str_starts_with($name, '{}') && array_key_exists(substr($name, 2), $this->elementMap)) {
+            if ('{}' == substr($name, 0, 2) && array_key_exists(substr($name, 2), $this->elementMap)) {
                 $name = substr($name, 2);
             } else {
-                return Element\Base::xmlDeserialize(...);
+                return ['Sabre\\Xml\\Element\\Base', 'xmlDeserialize'];
             }
         }
 
@@ -302,8 +302,8 @@ class Reader extends \XMLReader
             return $deserializer;
         }
 
-        if (is_subclass_of($deserializer, XmlDeserializable::class)) {
-            return fn (Reader $reader) => $deserializer::xmlDeserialize($reader);
+        if (is_subclass_of($deserializer, 'Sabre\\Xml\\XmlDeserializable')) {
+            return [$deserializer, 'xmlDeserialize'];
         }
 
         throw new \LogicException('Could not use this type as a deserializer: '.get_debug_type($deserializer).' for element: '.$name);
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Serializer/functions.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Serializer/functions.php
index 66685bf43..4e0856a0c 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Serializer/functions.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Serializer/functions.php
@@ -123,7 +123,7 @@ function valueObject(Writer $writer, object $valueObject, string $namespace): vo
  *
  * You can even mix the two array syntaxes.
  *
- * @param string|int|float|bool|array<int|string, mixed>|object|null $value
+ * @param string|int|float|bool|array<int|string, mixed>|object $value
  */
 function standardSerializer(Writer $writer, $value): void
 {
@@ -133,9 +133,9 @@ function standardSerializer(Writer $writer, $value): void
     } elseif ($value instanceof XmlSerializable) {
         // XmlSerializable classes or Element classes.
         $value->xmlSerialize($writer);
-    } elseif (is_object($value) && isset($writer->classMap[$value::class])) {
+    } elseif (is_object($value) && isset($writer->classMap[get_class($value)])) {
         // It's an object which class appears in the classmap.
-        $writer->classMap[$value::class]($writer, $value);
+        $writer->classMap[get_class($value)]($writer, $value);
     } elseif (is_callable($value)) {
         // A callback
         $value($writer);
@@ -144,8 +144,8 @@ function standardSerializer(Writer $writer, $value): void
         // describes a 'name' and optionally 'attributes' and 'value'.
 
         $name = $value['name'];
-        $attributes = $value['attributes'] ?? [];
-        $value = $value['value'] ?? null;
+        $attributes = isset($value['attributes']) ? $value['attributes'] : [];
+        $value = isset($value['value']) ? $value['value'] : null;
 
         $writer->startElement($name);
         $writer->writeAttributes($attributes);
@@ -157,7 +157,7 @@ function standardSerializer(Writer $writer, $value): void
                 // This item has a numeric index. We just loop through the
                 // array and throw it back in the writer.
                 standardSerializer($writer, $item);
-            } elseif (is_array($item) && isset($item['attributes'])) {
+            } elseif (is_string($name) && is_array($item) && isset($item['attributes'])) {
                 // The key is used for a name, but $item has 'attributes' and
                 // possibly 'value'
                 $writer->startElement($name);
@@ -176,7 +176,7 @@ function standardSerializer(Writer $writer, $value): void
             }
         }
     } elseif (is_object($value)) {
-        throw new \InvalidArgumentException('The writer cannot serialize objects of class: '.$value::class);
+        throw new \InvalidArgumentException('The writer cannot serialize objects of class: '.get_class($value));
     } elseif (!is_null($value)) {
         throw new \InvalidArgumentException('The writer cannot serialize values of type: '.get_debug_type($value));
     }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Service.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Service.php
index 1f1b3585b..ad18b6f4e 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Service.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Service.php
@@ -109,21 +109,14 @@ class Service
      */
     public function parse($input, ?string $contextUri = null, ?string &$rootElementName = null)
     {
-        if (!is_string($input)) {
+        if (is_resource($input)) {
             // Unfortunately the XMLReader doesn't support streams. When it
             // does, we can optimize this.
-            if (is_resource($input)) {
-                $input = (string) stream_get_contents($input);
-            } else {
-                // Input is not a string and not a resource.
-                // Therefore, it has to be a closed resource.
-                // Effectively empty input has been passed in.
-                $input = '';
-            }
+            $input = (string) stream_get_contents($input);
         }
 
         // If input is empty, then it's safe to throw an exception
-        if ('' === $input) {
+        if (empty($input)) {
             throw new ParseException('The input element to parse is empty. Do not attempt to parse');
         }
 
@@ -160,21 +153,14 @@ class Service
      */
     public function expect($rootElementName, $input, ?string $contextUri = null)
     {
-        if (!is_string($input)) {
+        if (is_resource($input)) {
             // Unfortunately the XMLReader doesn't support streams. When it
             // does, we can optimize this.
-            if (is_resource($input)) {
-                $input = (string) stream_get_contents($input);
-            } else {
-                // Input is not a string and not a resource.
-                // Therefore, it has to be a closed resource.
-                // Effectively empty input has been passed in.
-                $input = '';
-            }
+            $input = (string) stream_get_contents($input);
         }
 
         // If input is empty, then it's safe to throw an exception
-        if ('' === $input) {
+        if (empty($input)) {
             throw new ParseException('The input element to parse is empty. Do not attempt to parse');
         }
 
@@ -254,12 +240,14 @@ class Service
      */
     public function mapValueObject(string $elementName, string $className): void
     {
-        [$namespace] = self::parseClarkNotation($elementName);
+        list($namespace) = self::parseClarkNotation($elementName);
 
         require_once __DIR__ . '/Deserializer/functions.php';
-        $this->elementMap[$elementName] = (fn (Reader $reader) => \Sabre\Xml\Deserializer\valueObject($reader, $className, $namespace));
+        $this->elementMap[$elementName] = function (Reader $reader) use ($className, $namespace) {
+            return \Sabre\Xml\Deserializer\valueObject($reader, $className, $namespace);
+        };
         require_once __DIR__ . '/Serializer/functions.php';
-        $this->classMap[$className] = function (Writer $writer, $valueObject) use ($namespace): void {
+        $this->classMap[$className] = function (Writer $writer, $valueObject) use ($namespace) {
             \Sabre\Xml\Serializer\valueObject($writer, $valueObject, $namespace);
         };
         $this->valueObjectMap[$className] = $elementName;
@@ -278,12 +266,12 @@ class Service
      */
     public function writeValueObject(object $object, ?string $contextUri = null): string
     {
-        if (!isset($this->valueObjectMap[$object::class])) {
-            throw new \InvalidArgumentException('"'.$object::class.'" is not a registered value object class. Register your class with mapValueObject.');
+        if (!isset($this->valueObjectMap[get_class($object)])) {
+            throw new \InvalidArgumentException('"'.get_class($object).'" is not a registered value object class. Register your class with mapValueObject.');
         }
 
         return $this->write(
-            $this->valueObjectMap[$object::class],
+            $this->valueObjectMap[get_class($object)],
             $object,
             $contextUri
         );
@@ -304,7 +292,7 @@ class Service
         static $cache = [];
 
         if (!isset($cache[$str])) {
-            if (1 !== preg_match('/^{([^}]*)}(.*)$/', $str, $matches)) {
+            if (!preg_match('/^{([^}]*)}(.*)$/', $str, $matches)) {
                 throw new \InvalidArgumentException('\''.$str.'\' is not a valid clark-notation formatted string');
             }
 
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Version.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Version.php
index 88f4128a5..f38e87c27 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Version.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Version.php
@@ -16,5 +16,5 @@ class Version
     /**
      * Full version number.
      */
-    public const VERSION = '4.1.0';
+    public const VERSION = '4.0.5';
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Writer.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Writer.php
index ed08eb216..77bdae02c 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Writer.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Writer.php
@@ -123,11 +123,11 @@ class Writer extends \XMLWriter
     public function startElement($name): bool
     {
         if ('{' === $name[0]) {
-            [$namespace, $localName] =
+            list($namespace, $localName) =
                 Service::parseClarkNotation($name);
 
             if (array_key_exists($namespace, $this->namespaceMap)) {
-                $result = $this->startElementNs(
+                $result = $this->startElementNS(
                     '' === $this->namespaceMap[$namespace] ? null : $this->namespaceMap[$namespace],
                     $localName,
                     null
@@ -139,8 +139,10 @@ class Writer extends \XMLWriter
                     $result = $this->startElement($localName);
                     $this->writeAttribute('xmlns', '');
                 } else {
-                    $this->adhocNamespaces[$namespace] ??= 'x'.(count($this->adhocNamespaces) + 1);
-                    $result = $this->startElementNs($this->adhocNamespaces[$namespace], $localName, $namespace);
+                    if (!isset($this->adhocNamespaces[$namespace])) {
+                        $this->adhocNamespaces[$namespace] = 'x'.(count($this->adhocNamespaces) + 1);
+                    }
+                    $result = $this->startElementNS($this->adhocNamespaces[$namespace], $localName, $namespace);
                 }
             }
         } else {
@@ -149,7 +151,7 @@ class Writer extends \XMLWriter
 
         if (!$this->namespacesWritten) {
             foreach ($this->namespaceMap as $namespace => $prefix) {
-                $this->writeAttribute(is_string($prefix) && '' !== $prefix ? 'xmlns:'.$prefix : 'xmlns', $namespace);
+                $this->writeAttribute($prefix ? 'xmlns:'.$prefix : 'xmlns', $namespace);
             }
             $this->namespacesWritten = true;
         }
@@ -234,7 +236,7 @@ class Writer extends \XMLWriter
 
         list(
             $namespace,
-            $localName,
+            $localName
         ) = Service::parseClarkNotation($name);
 
         if (array_key_exists($namespace, $this->namespaceMap)) {
@@ -246,9 +248,11 @@ class Writer extends \XMLWriter
         }
 
         // We don't know the namespace, we must add it in-line
-        $this->adhocNamespaces[$namespace] ??= 'x'.(count($this->adhocNamespaces) + 1);
+        if (!isset($this->adhocNamespaces[$namespace])) {
+            $this->adhocNamespaces[$namespace] = 'x'.(count($this->adhocNamespaces) + 1);
+        }
 
-        return $this->writeAttributeNs(
+        return $this->writeAttributeNS(
             $this->adhocNamespaces[$namespace],
             $localName,
             $namespace,
diff --git a/snappymail/v/0.0.0/app/libraries/polyfill/php8.php b/snappymail/v/0.0.0/app/libraries/polyfill/php8.php
new file mode 100644
index 000000000..92a5dc534
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/polyfill/php8.php
@@ -0,0 +1,76 @@
+<?php
+
+if (\PHP_VERSION_ID < 80000)
+{
+	interface Stringable
+	{
+		public function __toString() : string;
+	}
+
+	if (!class_exists('ValueError')) {
+		class ValueError extends Error
+		{
+		}
+	}
+
+	if (!function_exists('str_contains')) {
+		function str_contains(string $haystack, string $needle) : bool
+		{
+			return false !== strpos($haystack, $needle);
+		}
+	}
+
+	if (!function_exists('str_starts_with')) {
+		function str_starts_with(string $haystack, string $needle) : bool
+		{
+			return 0 === strncmp($haystack, $needle, strlen($needle));
+		}
+	}
+
+	if (!function_exists('str_ends_with')) {
+		function str_ends_with(string $haystack, string $needle) : bool
+		{
+			$length = strlen($needle);
+			return $length ? substr($haystack, -$length) === $needle : true;
+		}
+	}
+
+	if (!function_exists('get_debug_type')) {
+		function get_debug_type($value): string
+		{
+			$type = gettype($value);
+			switch ($type) {
+				case 'NULL': return 'null';
+				case 'boolean': return 'bool';
+				case 'double': return 'float';
+				case 'integer': return 'int';
+				case 'object':
+//					if ($value instanceof __PHP_Incomplete_Class) return '__PHP_Incomplete_Class';
+					$class = get_class($value);
+					if (false === strpos($class, '@')) {
+						return $class;
+					}
+					$parent = get_parent_class($class);
+					if ($parent) {
+						return $parent . '@anonymous';
+					}
+					$implements = class_implements($class);
+					if ($implements) {
+						return key($implements) . '@anonymous';
+					}
+					return 'class@anonymous';
+				case 'resource':
+					$type = get_resource_type($value);
+					if (null === $type) {
+						return 'unknown';
+					}
+					if ('Unknown' === $type) {
+						$type = 'closed';
+					}
+					return "resource ($type)";
+				default:
+					return $type;
+			}
+		}
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/base32.php b/snappymail/v/0.0.0/app/libraries/snappymail/base32.php
deleted file mode 100644
index d65e4c389..000000000
--- a/snappymail/v/0.0.0/app/libraries/snappymail/base32.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-namespace SnappyMail;
-
-class Base32
-{
-	private string $chars;
-
-	function __construct(string $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567')
-	{
-		$this->chars = $chars;
-	}
-
-	public function random(int $length): string
-	{
-		$secret = '';
-		while (0 < $length--) {
-			$secret .= $this->chars[\random_int(0,31)];
-		}
-		return $secret;
-	}
-
-	public function encode(string $data, bool $padding = false, int $chunklen = 0, string $end = "\r\n"): string
-	{
-		$sl = \is_string($data) ? \strlen($data) : 0;
-
-		$base32 = '';
-		$remainder = 0;
-		$remainderSize = 0;
-
-		for ($i = 0; $i < $sl; ++$i) {
-			$remainder = ($remainder << 8) | \ord($data[$i]);
-			$remainderSize += 8;
-			while ($remainderSize > 4) {
-				$remainderSize -= 5;
-				$base32 .= $this->chars[($remainder & (31 << $remainderSize)) >> $remainderSize];
-			}
-		}
-
-		if ($remainderSize > 0) {
-			// remainderSize < 5:
-			$base32 .= $this->chars[($remainder << (5 - $remainderSize)) & 31];
-		}
-
-		if ($padding) {
-			$base32 .= \str_repeat('=', (8 - \ceil(($sl % 5) * 8 / 5)) % 8);
-		}
-
-		return 0 < $chunklen
-			? \chunk_split($base32, $chunklen, $end)
-			: $base32;
-	}
-
-	public function decode(string $data, bool $strict = false): ?string
-	{
-		$data = \strtoupper(\rtrim($data, "=\x20\t\n\r\0\x0B"));
-		$dataSize = \strlen($data);
-		$buf = 0;
-		$bufSize = 0;
-		$res = '';
-		$charMap = \array_flip(\str_split($this->chars));
-		for ($i = 0; $i < $dataSize; ++$i) {
-			$c = $data[$i];
-			if (isset($charMap[$c])) {
-				$buf = ($buf << 5) | $charMap[$c];
-				$bufSize += 5;
-				if ($bufSize > 7) {
-					$bufSize -= 8;
-					$res .= \chr(($buf & (0xff << $bufSize)) >> $bufSize);
-				}
-			} else if ($strict && false === \strpos(" \r\n\t", $c)) {
-				\trigger_error('Base32 string contains unexpected char #'.\ord($c)." at offset {$i}");
-				return null;
-			}
-		}
-		return $res;
-	}
-
-	public function verify(string $data): bool
-	{
-		return (bool) \preg_match('/^['.\preg_quote($this->chars).' \\r\\n\\t]+=*$/D', $data);
-	}
-
-}
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 066352dcc..77ea6f29a 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php
@@ -10,7 +10,7 @@ abstract class Crypt
 {
 	protected static $cipher = '';
 
-	public static function listCiphers(): array
+	public static function listCiphers() : array
 	{
 		$list = array();
 		if (\function_exists('openssl_get_cipher_methods')) {
@@ -25,12 +25,12 @@ abstract class Crypt
 		return $list;
 	}
 
-	public static function cipherSupported(string $cipher): bool
+	public static function cipherSupported(string $cipher) : bool
 	{
 		return \in_array($cipher, static::listCiphers());
 	}
 
-	public static function setCipher(string $cipher): bool
+	public static function setCipher(string $cipher) : bool
 	{
 		if (static::cipherSupported($cipher)) {
 			static::$cipher = $cipher;
@@ -46,7 +46,7 @@ abstract class Crypt
 	private static function Passphrase(
 		#[\SensitiveParameter]
 		?string $key
-	): string
+	) : string
 	{
 		if (!$key) {
 			if (empty($_COOKIE['smctoken'])) {
@@ -61,7 +61,7 @@ abstract class Crypt
 	public static function Decrypt(array $data,
 		#[\SensitiveParameter]
 		?string $key = null
-	): mixed
+	) /* : mixed */
 	{
 		if (3 === \count($data) && isset($data[0], $data[1], $data[2]) && \strlen($data[0])) {
 			$fn = "{$data[0]}Decrypt";
@@ -86,7 +86,7 @@ abstract class Crypt
 	public static function DecryptFromJSON(string $data,
 		#[\SensitiveParameter]
 		?string $key = null
-	): mixed
+	) /* : mixed */
 	{
 		$data = static::jsonDecode($data);
 		if (!\is_array($data)) {
@@ -99,7 +99,7 @@ abstract class Crypt
 	public static function DecryptUrlSafe(string $data,
 		#[\SensitiveParameter]
 		?string $key = null
-	): mixed
+	) /* : mixed */
 	{
 		$data = \explode('.', $data);
 		if (!\is_array($data)) {
@@ -114,7 +114,7 @@ abstract class Crypt
 		$data,
 		#[\SensitiveParameter]
 		?string $key = null
-	): array
+	) : array
 	{
 		$data = \json_encode($data);
 
@@ -152,7 +152,7 @@ abstract class Crypt
 		$data,
 		#[\SensitiveParameter]
 		?string $key = null
-	): string
+	) : string
 	{
 		return \json_encode(\array_map('base64_encode', static::Encrypt($data, $key)));
 	}
@@ -162,7 +162,7 @@ abstract class Crypt
 		$data,
 		#[\SensitiveParameter]
 		?string $key = null
-	): string
+	) : string
 	{
 		return \implode('.', \array_map('MailSo\\Base\\Utils::UrlSafeBase64Encode', static::Encrypt($data, $key)));
 	}
@@ -170,7 +170,7 @@ abstract class Crypt
 	public static function SodiumDecrypt(string $data, string $nonce,
 		#[\SensitiveParameter]
 		?string $key = null
-	): string|false
+	) /* : string|false */
 	{
 		if (!\is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_decrypt')) {
 			throw new \Exception('sodium_crypto_aead_xchacha20poly1305_ietf_decrypt not callable');
@@ -189,7 +189,7 @@ abstract class Crypt
 		string $nonce,
 		#[\SensitiveParameter]
 		?string $key = null
-	): string
+	) : string
 	{
 		if (!\is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_encrypt')) {
 			throw new \Exception('sodium_crypto_aead_xchacha20poly1305_ietf_encrypt not callable');
@@ -209,7 +209,7 @@ abstract class Crypt
 	public static function OpenSSLDecrypt(string $data, string $iv,
 		#[\SensitiveParameter]
 		?string $key = null
-	): string|false
+	) /* : string|false */
 	{
 		if (!$data || !$iv) {
 			throw new \ValueError('$data or $iv is empty string');
@@ -236,7 +236,7 @@ abstract class Crypt
 		string $iv,
 		#[\SensitiveParameter]
 		?string $key = null
-	): string
+	) : string
 	{
 		if (!$data || !$iv) {
 			throw new \ValueError('$data or $iv is empty string');
@@ -264,7 +264,7 @@ abstract class Crypt
 	public static function XxteaDecrypt(string $data, string $salt,
 		#[\SensitiveParameter]
 		?string $key = null
-	): mixed
+	) /* : mixed */
 	{
 		if (!$data || !$salt) {
 			throw new \ValueError('$data or $salt is empty string');
@@ -281,7 +281,7 @@ abstract class Crypt
 		string $salt,
 		#[\SensitiveParameter]
 		?string $key = null
-	): string
+	) : string
 	{
 		if (!$data || !$salt) {
 			throw new \ValueError('$data or $salt is empty string');
@@ -296,7 +296,7 @@ abstract class Crypt
 		return $result;
 	}
 
-	private static function jsonDecode(string $data): mixed
+	private static function jsonDecode(string $data) /*: mixed*/
 	{
 		return \json_decode($data, true, 512, JSON_THROW_ON_ERROR);
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/dns.php b/snappymail/v/0.0.0/app/libraries/snappymail/dns.php
index 67ffc8ded..ee0ca7517 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/dns.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/dns.php
@@ -2,11 +2,6 @@
 
 namespace SnappyMail;
 
-// Sockets extension not loaded?
-if (!defined('AF_INET6')) {
-	define('AF_INET6', true);
-}
-
 abstract class DNS
 {
 	/**
@@ -57,8 +52,11 @@ abstract class DNS
 	public static function MX(string $domain) : array
 	{
 		$mxhosts = array();
-		foreach (\dns_get_record($host, \DNS_MX) ?: array() as $record) {
-			$mxhosts[$record['pri']] = $record['target'];
+		$values = \dns_get_record($domain, \DNS_MX);
+		if ($values) {
+			foreach ($values as $record) {
+				$mxhosts[$record['pri']] = $record['target'];
+			}
 		}
 		if (!$mxhosts) {
 			\getmxrr($domain, $mxhosts);
@@ -70,27 +68,13 @@ abstract class DNS
 	public static function SRV(string $domain) : array
 	{
 		$result = array();
-		foreach (\dns_get_record($host, \DNS_SRV) ?: array() as $record) {
-			$result[$record['pri']] = $record;
+		$values = \dns_get_record($domain, \DNS_SRV);
+		if ($values) {
+			foreach ($values as $record) {
+				$result[$record['pri']] = $record;
+			}
 		}
 		\ksort($result);
 		return \array_values($result);
 	}
-
-	public static function IP(string $domain): array
-	{
-		$ips = array();
-		foreach (\dns_get_record($domain, \DNS_A | (\AF_INET6 ? \DNS_AAAA : 0)) ?: array() as $record) {
-			if (!empty($record['ip'])) {
-				$ips[] = $record['ip'];
-			}
-			if (!empty($record['ipv6'])) {
-				$ips[] = $record['ipv6'];
-			}
-		}
-		if (!$ips) {
-			$ips = \gethostbynamel($host);
-		}
-		return $ips ?: array();
-	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/file/mimetype.php b/snappymail/v/0.0.0/app/libraries/snappymail/file/mimetype.php
index 7fc04b9af..6156145da 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/file/mimetype.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/file/mimetype.php
@@ -43,18 +43,15 @@ abstract class MimeType
 				\fclose($fp);
 			}
 			if ('application/zip' === \str_replace('/x-', '/', $mime)) {
-				if (\class_exists('ZipArchive')) {
-					$zip = new \ZipArchive();
-					if ($zip->open($filename, \ZIPARCHIVE::RDONLY)) {
-						if (false !== $zip->locateName('word/_rels/document.xml.rels')) {
-							return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
-						}
-						if (false !== $zip->locateName('xl/_rels/workbook.xml.rels')) {
-							return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
-						}
+				$zip = new \ZipArchive();
+				if ($zip->open($filename, \ZIPARCHIVE::RDONLY)) {
+					if (false !== $zip->locateName('word/_rels/document.xml.rels')) {
+						return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
+					}
+					if (false !== $zip->locateName('xl/_rels/workbook.xml.rels')) {
+						return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
 					}
 				}
-				$mime = \str_replace('/x-', '/', $mime);
 			}
 		}
 		return $mime ? static::detectDeeper($mime, $name ?: $filename) : null;
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/file/temporary.php b/snappymail/v/0.0.0/app/libraries/snappymail/file/temporary.php
index 1300a0f12..f466c2474 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/file/temporary.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/file/temporary.php
@@ -42,7 +42,7 @@ class Temporary
 		return $this->fp;
 	}
 
-	public function writeFromStream(/*resource*/ $from): int|false
+	public function writeFromStream(/*resource*/ $from)/* : int|false*/
 	{
 		$fp = $this->fopen();
 //		return \stream_copy_to_stream($from, $fp); // Fails
@@ -51,12 +51,12 @@ class Temporary
 		return $bytes;
 	}
 
-	public function putContents(mixed $data, int $flags = 0): int|false
+	public function putContents($data, int $flags = 0)/* : int|false*/
 	{
 		return \file_put_contents($this->filename, $data /*, $flags, $context*/);
 	}
 
-	public function getContents(): string|false
+	public function getContents()/* : string|false*/
 	{
 		return \file_get_contents($this->filename);
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/base.php b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/base.php
index 794aa9735..d94de5454 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/base.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/base.php
@@ -91,7 +91,7 @@ abstract class Base
 		}
 	}
 
-	public static function isSupported(): bool
+	public static function isSupported() : bool
 	{
 		return \is_callable('shell_exec') && \is_callable('proc_open');
 	}
@@ -104,7 +104,7 @@ abstract class Base
 	/**
 	 * Decrypts a given text
 	 */
-	public function decrypt(string $text): string|false
+	public function decrypt(string $text) /*: string|false */
 	{
 		return false;
 	}
@@ -112,7 +112,7 @@ abstract class Base
 	/**
 	 * Decrypts a given file
 	 */
-	public function decryptFile(string $filename): string|false
+	public function decryptFile(string $filename) /*: string|false */
 	{
 		return false;
 	}
@@ -120,7 +120,7 @@ abstract class Base
 	/**
 	 * Decrypts a given stream
 	 */
-	public function decryptStream($fp, /*string|resource*/ $output = null): string|false
+	public function decryptStream($fp, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		return false;
 	}
@@ -128,7 +128,7 @@ abstract class Base
 	/**
 	 * Decrypts and verifies a given text
 	 */
-	public function decryptVerify(string $text, string &$plaintext): array|false
+	public function decryptVerify(string $text, string &$plaintext) /*: array|false*/
 	{
 		return false;
 	}
@@ -136,7 +136,7 @@ abstract class Base
 	/**
 	 * Decrypts and verifies a given file
 	 */
-	public function decryptVerifyFile(string $filename, string &$plaintext): array|false
+	public function decryptVerifyFile(string $filename, string &$plaintext) /*: array|false*/
 	{
 		return false;
 	}
@@ -144,7 +144,7 @@ abstract class Base
 	/**
 	 * Encrypts a given text
 	 */
-	public function encrypt(string $plaintext, /*string|resource*/ $output = null): string|false
+	public function encrypt(string $plaintext, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		return false;
 	}
@@ -152,12 +152,12 @@ abstract class Base
 	/**
 	 * Encrypts a given text
 	 */
-	public function encryptFile(string $filename, /*string|resource*/ $output = null): string|false
+	public function encryptFile(string $filename, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		return false;
 	}
 
-	public function encryptStream(/*resource*/ $fp, /*string|resource*/ $output = null): string|false
+	public function encryptStream(/*resource*/ $fp, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		return false;
 	}
@@ -165,7 +165,7 @@ abstract class Base
 	/**
 	 * Encrypts and signs a given text
 	 */
-	public function encryptSign(string $plaintext): string|false
+	public function encryptSign(string $plaintext) /*: string|false*/
 	{
 		return false;
 	}
@@ -173,7 +173,7 @@ abstract class Base
 	/**
 	 * Encrypts and signs a given text
 	 */
-	public function encryptSignFile(string $filename): string|false
+	public function encryptSignFile(string $filename) /*: string|false*/
 	{
 		return false;
 	}
@@ -181,7 +181,7 @@ abstract class Base
 	/**
 	 * Exports a public or private key
 	 */
-	public function export(string $fingerprint, ?SensitiveString $passphrase = null): string|false
+	public function export(string $fingerprint, ?SensitiveString $passphrase = null) /*: string|false*/
 	{
 		return false;
 	}
@@ -189,7 +189,7 @@ abstract class Base
 	/**
 	 * Imports a key
 	 */
-	public function import(string $keydata): array|false
+	public function import(string $keydata) /*: array|false*/
 	{
 		return false;
 	}
@@ -197,7 +197,7 @@ abstract class Base
 	/**
 	 * Imports a key
 	 */
-	public function importFile(string $filename): array|false
+	public function importFile(string $filename) /*: array|false*/
 	{
 		return false;
 	}
@@ -210,7 +210,7 @@ abstract class Base
 	/**
 	 * Returns an array with information about all keys that matches the given pattern
 	 */
-	public function keyInfo(string $pattern, bool $private = false): array
+	public function keyInfo(string $pattern, bool $private = false) : array
 	{
 		return [];
 	}
@@ -220,14 +220,14 @@ abstract class Base
 	 * GNUPG_ERROR_WARNING, GNUPG_ERROR_EXCEPTION and GNUPG_ERROR_SILENT.
 	 * By default GNUPG_ERROR_SILENT is used.
 	 */
-	public function setErrorMode(int $errormode): void
+	public function setErrorMode(int $errormode) : void
 	{
 	}
 
 	/**
 	 * Signs a given text
 	 */
-	public function sign(string $plaintext, /*string|resource*/ $output = null): string|false
+	public function sign(string $plaintext, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		return false;
 	}
@@ -235,7 +235,7 @@ abstract class Base
 	/**
 	 * Signs a given file
 	 */
-	public function signFile(string $filename, /*string|resource*/ $output = null): string|false
+	public function signFile(string $filename, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		return false;
 	}
@@ -243,7 +243,7 @@ abstract class Base
 	/**
 	 * Signs a given file
 	 */
-	public function signStream($fp, /*string|resource*/ $output = null): string|false
+	public function signStream($fp, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		return false;
 	}
@@ -251,7 +251,7 @@ abstract class Base
 	/**
 	 * Verifies a signed text
 	 */
-	public function verify(string $signed_text, string $signature, ?string &$plaintext = null): array|false
+	public function verify(string $signed_text, string $signature, string &$plaintext = null) /*: array|false*/
 	{
 		return false;
 	}
@@ -259,7 +259,7 @@ abstract class Base
 	/**
 	 * Verifies a signed file
 	 */
-	public function verifyFile(string $filename, string $signature, ?string &$plaintext = null): array|false
+	public function verifyFile(string $filename, string $signature, string &$plaintext = null) /*: array|false*/
 	{
 		return false;
 	}
@@ -267,12 +267,12 @@ abstract class Base
 	/**
 	 * Verifies a signed file
 	 */
-	public function verifyStream($fp, string $signature, ?string &$plaintext = null): array|false
+	public function verifyStream($fp, string $signature, string &$plaintext = null) /*: array|false*/
 	{
 		return false;
 	}
 
-	public function getEncryptedMessageKeys(/*string|resource*/ $data): array
+	public function getEncryptedMessageKeys(/*string|resource*/ $data) : array
 	{
 		return [];
 	}
@@ -284,7 +284,7 @@ abstract class Base
 	/**
 	 * Add a key for decryption
 	 */
-	public function addDecryptKey(string $fingerprint, SensitiveString $passphrase): bool
+	public function addDecryptKey(string $fingerprint, SensitiveString $passphrase) : bool
 	{
 		$this->addPinentry($fingerprint, $passphrase);
 		return true;
@@ -293,7 +293,7 @@ abstract class Base
 	/**
 	 * Add a key for encryption
 	 */
-	public function addEncryptKey(string $fingerprint): bool
+	public function addEncryptKey(string $fingerprint) : bool
 	{
 		$this->encryptKeys[$fingerprint] = 1;
 		return true;
@@ -302,13 +302,13 @@ abstract class Base
 	/**
 	 * Add a key for signing
 	 */
-	public function addSignKey(string $fingerprint, SensitiveString $passphrase): bool
+	public function addSignKey(string $fingerprint, SensitiveString $passphrase) : bool
 	{
 		$this->addPinentry($fingerprint, $passphrase);
 		return true;
 	}
 
-	public function clear(): bool
+	public function clear() : bool
 	{
 		$this->clearPinentries();
 		$this->clearEncryptKeys();
@@ -318,7 +318,7 @@ abstract class Base
 	/**
 	 * Removes all keys which were set for decryption before
 	 */
-	public function clearDecryptKeys(): bool
+	public function clearDecryptKeys() : bool
 	{
 		return $this->clearPinentries();
 	}
@@ -326,7 +326,7 @@ abstract class Base
 	/**
 	 * Removes all keys which were set for encryption before
 	 */
-	public function clearEncryptKeys(): bool
+	public function clearEncryptKeys() : bool
 	{
 		$this->encryptKeys = [];
 		return true;
@@ -335,7 +335,7 @@ abstract class Base
 	/**
 	 * Removes all keys which were set for signing before
 	 */
-	public function clearSignKeys(): bool
+	public function clearSignKeys() : bool
 	{
 		return $this->clearPinentries();
 	}
@@ -343,7 +343,7 @@ abstract class Base
 	/**
 	 * Returns the engine info
 	 */
-	public function getEngineInfo(): array
+	public function getEngineInfo() : array
 	{
 		return [
 			'protocol' => null,
@@ -357,7 +357,7 @@ abstract class Base
 	 * Add private key passphrase for decrypt, sign or export
 	 * $keyId or fingerprint
 	 */
-	public function addPinentry(string $keyId, SensitiveString $passphrase): self
+	public function addPinentry(string $keyId, SensitiveString $passphrase)
 	{
 		/**
 		 * Test first?
@@ -378,7 +378,7 @@ abstract class Base
 	/**
 	 * Removes all keys which were set for decryption, signing and export
 	 */
-	public function clearPinentries(): bool
+	public function clearPinentries() : bool
 	{
 		$this->pinentries = [];
 		return true;
@@ -388,18 +388,18 @@ abstract class Base
 	 * Toggle the armored output
 	 * When true the output is ASCII
 	 */
-	public function setArmor(bool $armor = true): bool
+	public function setArmor(bool $armor = true) : bool
 	{
 		$this->armor = $armor;
 		return true;
 	}
 
-	protected function _debug(string $msg): void
+	protected function _debug(string $msg) : void
 	{
 		\SnappyMail\Log::debug('GPG', $msg);
 	}
 
-	protected function setInput(&$input): void
+	protected function setInput(&$input) : void
 	{
 		if (\is_resource($input)) {
 			// https://github.com/the-djmaze/snappymail/issues/331
@@ -434,10 +434,10 @@ abstract class Base
 	public function agent()
 	{
 //		$home = \escapeshellarg($this->options['homedir']);
-//		echo \shell_exec('gpg-agent --daemon --homedir $home 2>&1');
+//		echo `gpg-agent --daemon --homedir $home 2>&1`;
 	}
 
-	protected function getPassphrase(string $key): string
+	protected function getPassphrase($key)
 	{
 		$passphrase  = '';
 		$keyIdLength = \strlen($key);
@@ -454,7 +454,7 @@ abstract class Base
 		return '';
 	}
 
-	protected function proc_close(): int
+	protected function proc_close() : int
 	{
 		$exitCode = 0;
 
@@ -485,9 +485,9 @@ abstract class Base
 		return $exitCode;
 	}
 
-	protected static function findBinary($name): ?string
+	protected static function findBinary($name) : ?string
 	{
-		$binary = \function_exists('shell_exec') ? \trim((string) \shell_exec('which ' . \escapeshellarg($name))) : '';
+		$binary = \function_exists('shell_exec') ? \trim((string) `which $name`) : '';
 		if ($binary && \RainLoop\Utils::inOpenBasedir($binary) && \is_executable($binary)) {
 			return $binary;
 		}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php
index 543b9a5c2..2815c8010 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php
@@ -50,7 +50,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 		// How to use gpgme-json ?
 		$this->binary = static::findBinary('gpg');
 
-		$info = \preg_replace('/\R +/', ' ', \shell_exec(\escapeshellcmd($this->binary) . ' --with-colons --list-config'));
+		$info = \preg_replace('/\R +/', ' ', `$this->binary --with-colons --list-config`);
 		if (\preg_match('/cfg:version:([0-9]+\\.[0-9]+\\.[0-9]+)/', $info, $match)) {
 			$this->version = $match[1];
 		}
@@ -71,7 +71,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 		}
 	}
 
-	public static function isSupported(): bool
+	public static function isSupported() : bool
 	{
 		return parent::isSupported() && static::findBinary('gpg');
 	}
@@ -99,7 +99,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Decrypts a given text
 	 */
-	public function decrypt(string $text): string|false
+	public function decrypt(string $text) /*: string|false */
 	{
 		return $this->_decrypt($text);
 	}
@@ -107,7 +107,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Decrypts a given file
 	 */
-	public function decryptFile(string $filename): string|false
+	public function decryptFile(string $filename) /*: string|false */
 	{
 		$fp = \fopen($filename, 'rb');
 		try {
@@ -123,7 +123,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Decrypts a given stream
 	 */
-	public function decryptStream($fp, /*string|resource*/ $output = null): string|false
+	public function decryptStream($fp, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		if (!$fp || !\is_resource($fp)) {
 			throw new \Exception('Invalid stream resource');
@@ -135,7 +135,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Decrypts and verifies a given text
 	 */
-	public function decryptVerify(string $text, string &$plaintext): array|false
+	public function decryptVerify(string $text, string &$plaintext) /*: array|false*/
 	{
 		// TODO: https://github.com/the-djmaze/snappymail/issues/89
 		return false;
@@ -144,7 +144,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Decrypts and verifies a given file
 	 */
-	public function decryptVerifyFile(string $filename, string &$plaintext): array|false
+	public function decryptVerifyFile(string $filename, string &$plaintext) /*: array|false*/
 	{
 		// TODO: https://github.com/the-djmaze/snappymail/issues/89
 		return false;
@@ -175,7 +175,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Encrypts a given text
 	 */
-	public function encrypt(string $plaintext, /*string|resource*/ $output = null): string|false
+	public function encrypt(string $plaintext, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		return $this->_encrypt($plaintext, $output);
 	}
@@ -183,7 +183,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Encrypts a given text
 	 */
-	public function encryptFile(string $filename, /*string|resource*/ $output = null): string|false
+	public function encryptFile(string $filename, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		$fp = \fopen($filename, 'rb');
 		try {
@@ -196,7 +196,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 		}
 	}
 
-	public function encryptStream(/*resource*/ $fp, /*string|resource*/ $output = null): string|false
+	public function encryptStream(/*resource*/ $fp, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		if (!$fp || !\is_resource($fp)) {
 			throw new \Exception('Invalid stream resource');
@@ -208,7 +208,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Encrypts and signs a given text
 	 */
-	public function encryptSign(string $plaintext): string|false
+	public function encryptSign(string $plaintext) /*: string|false*/
 	{
 		return false;
 	}
@@ -216,7 +216,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Encrypts and signs a given text
 	 */
-	public function encryptSignFile(string $filename): string|false
+	public function encryptSignFile(string $filename) /*: string|false*/
 	{
 		return false;
 	}
@@ -224,7 +224,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Exports a public or private key
 	 */
-	public function export(string $fingerprint, ?SensitiveString $passphrase = null): string|false
+	public function export(string $fingerprint, ?SensitiveString $passphrase = null) /*: string|false*/
 	{
 //		\SnappyMail\Log::debug('GnuPG', "export({$fingerprint}, {$passphrase})");
 		$private = null !== $passphrase;
@@ -246,7 +246,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Returns the errortext, if a function fails
 	 */
-	public function getError(): string|false
+	public function getError() /*: string|false*/
 	{
 		return false;
 	}
@@ -254,7 +254,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Returns the error info
 	 */
-	public function getErrorInfo(): array
+	public function getErrorInfo() : array
 	{
 		return [];
 	}
@@ -262,7 +262,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Returns the currently active protocol for all operations
 	 */
-	public function getProtocol(): int
+	public function getProtocol() : int
 	{
 		return 0; // GPGME_PROTOCOL_OpenPGP
 	}
@@ -272,7 +272,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	 * Also saves revocation certificate in {homedir}/openpgp-revocs.d/
 	 * https://www.gnupg.org/documentation/manuals/gnupg/OpenPGP-Key-Management.html
 	 */
-	public function generateKey(string $uid, SensitiveString $passphrase): string|false
+	public function generateKey(string $uid, SensitiveString $passphrase) /*: string|false*/
 	{
 		$settings = new PGPKeySettings;
 		$settings->name = $uid;
@@ -338,7 +338,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 		return $fingerprint;
 	}
 
-	protected function _importKey($input): array|false
+	protected function _importKey($input) /*: array|false*/
 	{
 		$arguments = ['--import'];
 
@@ -374,7 +374,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Imports a key
 	 */
-	public function import(string $keydata): array|false
+	public function import(string $keydata) /*: array|false*/
 	{
 		if (!$keydata) {
 			throw new \Exception('No valid input data found.');
@@ -385,7 +385,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Imports a key
 	 */
-	public function importFile(string $filename): array|false
+	public function importFile(string $filename) /*: array|false*/
 	{
 		$fp = \fopen($filename, 'rb');
 		try {
@@ -398,12 +398,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 		}
 	}
 
-	/**
-	 * Import remote key from WKD
-		gpg --auto-key-locate clear,wkd --locate-keys releases@snappymail.eu
-	 */
-
-	public function deleteKey(string $keyId, bool $private): bool
+	public function deleteKey(string $keyId, bool $private) : bool
 	{
 		$key = $this->keyInfo($keyId, $private);
 		if (!$key) {
@@ -430,13 +425,14 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Returns an array with information about all keys that matches the given pattern
 	 */
-	public function keyInfo(string $pattern, bool $private = false): array
+	public function keyInfo(string $pattern, bool $private = false) : array
 	{
 		// According to The file 'doc/DETAILS' in the GnuPG distribution, using
 		// double '--with-fingerprint' also prints the fingerprint for subkeys.
 		$arguments = [
 			'--with-colons',
 			'--with-fingerprint',
+			'--with-fingerprint',
 			'--fixed-list-mode',
 			$private ? '--list-secret-keys' : '--list-public-keys'
 		];
@@ -558,7 +554,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Returns an array with information about all keys that matches the given pattern
 	 */
-	public function allKeysInfo(string $pattern): array
+	public function allKeysInfo(string $pattern) : array
 	{
 		$keys = [
 			'public' => [],
@@ -584,7 +580,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	 * GNUPG_ERROR_WARNING, GNUPG_ERROR_EXCEPTION and GNUPG_ERROR_SILENT.
 	 * By default GNUPG_ERROR_SILENT is used.
 	 */
-	public function setErrorMode(int $errormode): void
+	public function setErrorMode(int $errormode) : void
 	{
 	}
 
@@ -593,13 +589,13 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	 * GNUPG_SIG_MODE_NORMAL, GNUPG_SIG_MODE_DETACH, GNUPG_SIG_MODE_CLEAR
 	 * By default GNUPG_SIG_MODE_CLEAR
 	 */
-	public function setSignMode(int $signmode): bool
+	public function setSignMode(int $signmode) : bool
 	{
 		$this->signmode = $signmode;
 		return true;
 	}
 
-	protected function _sign(/*string|resource*/ $input, /*string|resource*/ $output = null, bool $textmode = true): string|false
+	protected function _sign(/*string|resource*/ $input, /*string|resource*/ $output = null, bool $textmode = true) /*: string|false*/
 	{
 		if (empty($this->pinentries)) {
 			throw new \Exception('No signing keys specified.');
@@ -643,7 +639,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Signs a given text
 	 */
-	public function sign(string $plaintext, /*string|resource*/ $output = null): string|false
+	public function sign(string $plaintext, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		return $this->_sign($plaintext, $output);
 	}
@@ -651,7 +647,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Signs a given file
 	 */
-	public function signFile(string $filename, /*string|resource*/ $output = null): string|false
+	public function signFile(string $filename, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		$fp = \fopen($filename, 'rb');
 		try {
@@ -667,7 +663,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Signs a given file
 	 */
-	public function signStream($fp, /*string|resource*/ $output = null): string|false
+	public function signStream($fp, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		if (!$fp || !\is_resource($fp)) {
 			throw new \Exception('Invalid stream resource');
@@ -676,7 +672,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 		return $this->_sign($fp, $output);
 	}
 
-	protected function _verify($input, string $signature): array|false
+	protected function _verify($input, string $signature) /*: array|false*/
 	{
 		$arguments = ['--verify'];
 		if ($signature) {
@@ -743,7 +739,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Verifies a signed text
 	 */
-	public function verify(string $signed_text, string $signature, ?string &$plaintext = null): array|false
+	public function verify(string $signed_text, string $signature, string &$plaintext = null) /*: array|false*/
 	{
 		return $this->_verify($signed_text, $signature);
 	}
@@ -751,7 +747,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Verifies a signed file
 	 */
-	public function verifyFile(string $filename, string $signature, ?string &$plaintext = null): array|false
+	public function verifyFile(string $filename, string $signature, string &$plaintext = null) /*: array|false*/
 	{
 		$fp = \fopen($filename, 'rb');
 		try {
@@ -767,7 +763,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Verifies a signed file
 	 */
-	public function verifyStream($fp, string $signature, ?string &$plaintext = null): array|false
+	public function verifyStream($fp, string $signature, string &$plaintext = null) /*: array|false*/
 	{
 		if (!$fp || !\is_resource($fp)) {
 			throw new \Exception('Invalid stream resource');
@@ -776,7 +772,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 		return $this->_verify($fp, $signature);
 	}
 
-	public function getEncryptedMessageKeys(/*string|resource*/ $data): array
+	public function getEncryptedMessageKeys(/*string|resource*/ $data) : array
 	{
 		$this->_debug('BEGIN DETECT MESSAGE KEY IDs');
 		$this->setInput($data);
@@ -807,7 +803,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 		return $output ? true : ($result ? $result['output'] : false);
 	}
 
-	private function exec(array $arguments, bool $throw = true): array|false
+	private function exec(array $arguments, bool $throw = true) /*: array|false*/
 	{
 		if (\version_compare($this->version, '2.2.5', '<')) {
 			\SnappyMail\Log::error('GPG', "{$this->version} too old");
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/procpipes.php b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/procpipes.php
index d9c04cbf9..1d0c02d3d 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/procpipes.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/procpipes.php
@@ -26,20 +26,21 @@ class ProcPipes
 		$this->closeAll();
 	}
 
-	public function closeAll(): void
+	public function closeAll() : void
 	{
-		$this->pipes && \array_all(\array_keys($this->pipes), [$this, 'close']);
-		$this->pipes = [];
+		foreach (\array_keys($this->pipes) as $number) {
+			$this->close($number);
+		}
 	}
 
-	public function get(int $number): mixed
+	public function get(int $number)
 	{
 		if (\array_key_exists($number, $this->pipes) && \is_resource($this->pipes[$number])) {
 			return $this->pipes[$number];
 		}
 	}
 
-	public function close(int $number): void
+	public function close(int $number) : void
 	{
 		if (\array_key_exists($number, $this->pipes)) {
 			\fflush($this->pipes[$number]);
@@ -49,7 +50,7 @@ class ProcPipes
 	}
 
 	private $buffers = [];
-	public function readPipeLines(int $number): iterable
+	public function readPipeLines(int $number) : iterable
 	{
 		$pipe = $this->get($number);
 		if ($pipe) {
@@ -67,7 +68,7 @@ class ProcPipes
 		}
 	}
 
-	public function writePipe(int $number, string $data, int $length = 0): int
+	public function writePipe(int $number, string $data, int $length = 0) : int
 	{
 		$pipe = $this->get($number);
 		if ($pipe) {
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/smime.php b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/smime.php
index bbba86b59..203a180b0 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/smime.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/smime.php
@@ -43,7 +43,7 @@ class SMIME extends Base
 		// How to use gpgme-json ?
 		$this->binary = static::findBinary('gpgsm');
 
-		$info = \preg_replace('/\R +/', ' ', \shell_exec(\escapeshellcmd($this->binary) . ' --version') );
+		$info = \preg_replace('/\R +/', ' ', `$this->binary --version`);
 		if (\preg_match('/gpgsm.+([0-9]+\\.[0-9]+\\.[0-9]+)/', $info, $match)) {
 			$this->version = $match[1];
 		}
@@ -58,7 +58,7 @@ class SMIME extends Base
 		}
 	}
 
-	public static function isSupported(): bool
+	public static function isSupported() : bool
 	{
 		return parent::isSupported() && static::findBinary('gpgsm');
 	}
@@ -97,7 +97,7 @@ class SMIME extends Base
 	/**
 	 * Decrypts a given text
 	 */
-	public function decrypt(string $text): string|false
+	public function decrypt(string $text) /*: string|false */
 	{
 		return $this->_decrypt($text);
 	}
@@ -105,7 +105,7 @@ class SMIME extends Base
 	/**
 	 * Decrypts a given file
 	 */
-	public function decryptFile(string $filename): string|false
+	public function decryptFile(string $filename) /*: string|false */
 	{
 		$fp = \fopen($filename, 'rb');
 		try {
@@ -121,7 +121,7 @@ class SMIME extends Base
 	/**
 	 * Decrypts a given stream
 	 */
-	public function decryptStream($fp, /*string|resource*/ $output = null): string|false
+	public function decryptStream($fp, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		if (!$fp || !\is_resource($fp)) {
 			throw new \Exception('Invalid stream resource');
@@ -132,7 +132,7 @@ class SMIME extends Base
 	/**
 	 * Decrypts and verifies a given text
 	 */
-	public function decryptVerify(string $text, string &$plaintext): array|false
+	public function decryptVerify(string $text, string &$plaintext) /*: array|false*/
 	{
 		// TODO: https://github.com/the-djmaze/snappymail/issues/89
 		return false;
@@ -141,7 +141,7 @@ class SMIME extends Base
 	/**
 	 * Decrypts and verifies a given file
 	 */
-	public function decryptVerifyFile(string $filename, string &$plaintext): array|false
+	public function decryptVerifyFile(string $filename, string &$plaintext) /*: array|false*/
 	{
 		// TODO: https://github.com/the-djmaze/snappymail/issues/89
 		return false;
@@ -178,7 +178,7 @@ class SMIME extends Base
 	/**
 	 * Encrypts a given text
 	 */
-	public function encrypt(string $plaintext, /*string|resource*/ $output = null): string|false
+	public function encrypt(string $plaintext, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		return $this->_encrypt($plaintext, $output);
 	}
@@ -186,7 +186,7 @@ class SMIME extends Base
 	/**
 	 * Encrypts a given text
 	 */
-	public function encryptFile(string $filename, /*string|resource*/ $output = null): string|false
+	public function encryptFile(string $filename, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		$fp = \fopen($filename, 'rb');
 		try {
@@ -199,7 +199,7 @@ class SMIME extends Base
 		}
 	}
 
-	public function encryptStream(/*resource*/ $fp, /*string|resource*/ $output = null): string|false
+	public function encryptStream(/*resource*/ $fp, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		if (!$fp || !\is_resource($fp)) {
 			throw new \Exception('Invalid stream resource');
@@ -210,7 +210,7 @@ class SMIME extends Base
 	/**
 	 * Encrypts and signs a given text
 	 */
-	public function encryptSign(string $plaintext): string|false
+	public function encryptSign(string $plaintext) /*: string|false*/
 	{
 		return false;
 	}
@@ -218,7 +218,7 @@ class SMIME extends Base
 	/**
 	 * Encrypts and signs a given text
 	 */
-	public function encryptSignFile(string $filename): string|false
+	public function encryptSignFile(string $filename) /*: string|false*/
 	{
 		return false;
 	}
@@ -226,7 +226,7 @@ class SMIME extends Base
 	/**
 	 * Exports a public or private key
 	 */
-	public function export(string $fingerprint, ?SensitiveString $passphrase = null): string|false
+	public function export(string $fingerprint, ?SensitiveString $passphrase = null) /*: string|false*/
 	{
 		$private = null !== $passphrase;
 		$keys = $this->keyInfo($fingerprint, $private);
@@ -244,7 +244,7 @@ class SMIME extends Base
 		return $result['output'];
 	}
 
-	protected function _importKey($input): array|false
+	protected function _importKey($input) /*: array|false*/
 	{
 		$arguments = ['--import'];
 
@@ -284,7 +284,7 @@ class SMIME extends Base
 	/**
 	 * Imports a key
 	 */
-	public function import(string $keydata): array|false
+	public function import(string $keydata) /*: array|false*/
 	{
 		if (!$keydata) {
 			throw new \Exception('No valid input data found.');
@@ -295,7 +295,7 @@ class SMIME extends Base
 	/**
 	 * Imports a key
 	 */
-	public function importFile(string $filename): array|false
+	public function importFile(string $filename) /*: array|false*/
 	{
 		$fp = \fopen($filename, 'rb');
 		try {
@@ -335,7 +335,7 @@ class SMIME extends Base
 	/**
 	 * Returns an array with information about all keys that matches the given pattern
 	 */
-	public function keyInfo(string $pattern, bool $private = false): array
+	public function keyInfo(string $pattern, bool $private = false) : array
 	{
 		// According to The file 'doc/DETAILS' in the GnuPG distribution, using
 		// double '--with-fingerprint' also prints the fingerprint for subkeys.
@@ -457,7 +457,7 @@ class SMIME extends Base
 		return $keys;
 	}
 
-	protected function _sign(/*string|resource*/ $input, /*string|resource*/ $output = null): string|false
+	protected function _sign(/*string|resource*/ $input, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		if (empty($this->pinentries)) {
 			throw new \Exception('No signing keys specified.');
@@ -492,7 +492,7 @@ class SMIME extends Base
 	/**
 	 * Signs a given text
 	 */
-	public function sign(string $plaintext, /*string|resource*/ $output = null): string|false
+	public function sign(string $plaintext, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		return $this->_sign($plaintext, $output);
 	}
@@ -500,7 +500,7 @@ class SMIME extends Base
 	/**
 	 * Signs a given file
 	 */
-	public function signFile(string $filename, /*string|resource*/ $output = null): string|false
+	public function signFile(string $filename, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		$fp = \fopen($filename, 'rb');
 		try {
@@ -516,7 +516,7 @@ class SMIME extends Base
 	/**
 	 * Signs a given file
 	 */
-	public function signStream($fp, /*string|resource*/ $output = null): string|false
+	public function signStream($fp, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		if (!$fp || !\is_resource($fp)) {
 			throw new \Exception('Invalid stream resource');
@@ -524,7 +524,7 @@ class SMIME extends Base
 		return $this->_sign($fp, $output);
 	}
 
-	protected function _verify($input, string $signature): array|false
+	protected function _verify($input, string $signature) /*: array|false*/
 	{
 		$arguments = ['--verify'];
 		if ($signature) {
@@ -589,7 +589,7 @@ class SMIME extends Base
 	/**
 	 * Verifies a signed text
 	 */
-	public function verify(string $signed_text, string $signature, ?string &$plaintext = null): array|false
+	public function verify(string $signed_text, string $signature, string &$plaintext = null) /*: array|false*/
 	{
 		return $this->_verify($signed_text, $signature);
 	}
@@ -597,7 +597,7 @@ class SMIME extends Base
 	/**
 	 * Verifies a signed file
 	 */
-	public function verifyFile(string $filename, string $signature, ?string &$plaintext = null): array|false
+	public function verifyFile(string $filename, string $signature, string &$plaintext = null) /*: array|false*/
 	{
 		$fp = \fopen($filename, 'rb');
 		try {
@@ -613,7 +613,7 @@ class SMIME extends Base
 	/**
 	 * Verifies a signed file
 	 */
-	public function verifyStream($fp, string $signature, ?string &$plaintext = null): array|false
+	public function verifyStream($fp, string $signature, string &$plaintext = null) /*: array|false*/
 	{
 		if (!$fp || !\is_resource($fp)) {
 			throw new \Exception('Invalid stream resource');
@@ -621,7 +621,7 @@ class SMIME extends Base
 		return $this->_verify($fp, $signature);
 	}
 
-	public function getEncryptedMessageKeys(/*string|resource*/ $data): array
+	public function getEncryptedMessageKeys(/*string|resource*/ $data) : array
 	{
 		$this->_debug('BEGIN DETECT MESSAGE KEY IDs');
 		$this->setInput($data);
@@ -643,7 +643,7 @@ class SMIME extends Base
 		return $info['ENC_TO'];
 	}
 
-	private function exec(array $arguments, bool $throw = true): array|false
+	private function exec(array $arguments, bool $throw = true) /*: array|false*/
 	{
 		if (\version_compare($this->version, '2.2.5', '<')) {
 			\SnappyMail\Log::error('GPG', "{$this->version} too old");
@@ -1015,7 +1015,7 @@ class SMIME extends Base
 		];
 	}
 
-	protected function getPassphrase(string $key): string
+	protected function getPassphrase($key)
 	{
 		$passphrase  = '';
 		$keyIdLength = \strlen($key);
@@ -1032,7 +1032,7 @@ class SMIME extends Base
 		return '';
 	}
 
-	protected function proc_close(): int
+	protected function proc_close() : int
 	{
 		$exitCode = 0;
 
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/http/request.php b/snappymail/v/0.0.0/app/libraries/snappymail/http/request.php
index 04d9dd63a..0bdf9468e 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/http/request.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/http/request.php
@@ -76,7 +76,7 @@ abstract class Request
 		$this->stream = $stream;
 	}
 
-	public function setCABundleFile(?string $file)
+	public function setCABundleFile($file)
 	{
 		$this->ca_bundle = $file;
 	}
@@ -87,7 +87,7 @@ abstract class Request
 	 *
 	 * @return bool
 	 */
-	public function canFetchURI(string $uri)
+	public function canFetchURI($uri)
 	{
 		if ('https:' === \substr($uri, 0, 6) && !$this->supportsSSL()) {
 			\trigger_error('HTTPS URI unsupported fetching '.$uri, E_USER_WARNING);
@@ -111,7 +111,7 @@ abstract class Request
 
 	abstract protected function __doRequest(string &$method, string &$request_url, &$body, array $extra_headers) : Response;
 
-	public function doRequest(string $method, string $request_url, string|array|null $body = null, array $extra_headers = array()) : ?Response
+	public function doRequest($method, $request_url, $body = null, array $extra_headers = array()) : ?Response
 	{
 		$method = \strtoupper($method);
 		$url    = $request_url;
@@ -157,12 +157,12 @@ abstract class Request
 	 * Return whether a URI should be allowed. Override this method to conform to your local policy.
 	 * By default, will attempt to fetch any http or https URI.
 	 */
-	public static function URIHasAllowedScheme(string $uri) : bool
+	public static function URIHasAllowedScheme($uri) : bool
 	{
 		return (bool) \preg_match('#^https?://#i', $uri);
 	}
 
-	public static function getSchemePort(string $scheme) : int
+	public static function getSchemePort($scheme) : int
 	{
 		return self::$scheme_ports[$scheme] ?? 0;
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/http/request/curl.php b/snappymail/v/0.0.0/app/libraries/snappymail/http/request/curl.php
index f25fef1c0..2185d0c8f 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/http/request/curl.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/http/request/curl.php
@@ -6,8 +6,9 @@ use SnappyMail\HTTP\Response;
 
 class CURL extends \SnappyMail\HTTP\Request
 {
-	private array $response_headers = array();
-	private string $response_body = '';
+	private
+		$response_headers = array(),
+		$response_body = '';
 
 	public function supportsSSL() : bool
 	{
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/http/response.php b/snappymail/v/0.0.0/app/libraries/snappymail/http/response.php
index 1c2f3b692..d52624415 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/http/response.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/http/response.php
@@ -12,7 +12,7 @@ class Response
 		$headers = array(), # The headers returned from the final_uri
 		$body;              # The body returned from the final_uri
 
-	function __construct(string $request_uri, int $status = 0, ?array $headers = null, string $body = '')
+	function __construct(string $request_uri, int $status = 0, ?array $headers = null, $body = null)
 	{
 		if ($headers) {
 			$name = null;
@@ -39,7 +39,16 @@ class Response
 		$this->request_uri = $request_uri;
 		$this->final_uri   = $request_uri;
 		$this->status      = (int) $status;
-		$this->body = $body;
+		if (\function_exists('gzinflate') && isset($this->headers['content-encoding'])
+		 && (false !== \stripos($this->headers['content-encoding'], 'gzip'))) {
+			$this->body = \gzinflate(\substr($body, 10, -4));
+			if (false === $this->body) {
+				$err = \error_get_last() ?: ['message' => 'gzinflate failed'];
+				throw new \RuntimeException("{$err['message']} for {$request_uri}");
+			}
+		} else {
+			$this->body = $body;
+		}
 	}
 
 	function __get($k)
@@ -47,21 +56,10 @@ class Response
 		return \property_exists($this, $k) ? $this->$k : null;
 	}
 
-	public function decoded(): string|false
-	{
-		$body = $this->body;
-		if (\function_exists('gzinflate') && isset($this->headers['content-encoding'])
-		 && (false !== \stripos($this->headers['content-encoding'], 'gzip'))) {
-			$body = \gzinflate(\substr($body, 10, -4));
-			if (false === $body) {
-				$err = \error_get_last() ?: ['message' => 'gzinflate failed'];
-				throw new \RuntimeException("{$err['message']} for {$request_uri}");
-			}
-		}
-		return $body;
-	}
-
-	public function getHeader(mixed $names): string|array|null
+	/**
+	 * returns string, array or null
+	 */
+	public function getHeader($names)
 	{
 		$names = \is_array($names) ? $names : array($names);
 		foreach ($names as $n) {
@@ -73,12 +71,12 @@ class Response
 		return null;
 	}
 
-	public function getHeaders(): array
+	public function getHeaders() : array
 	{
 		return $this->headers;
 	}
 
-	public function getRedirectLocation(): ?string
+	public function getRedirectLocation() : ?string
 	{
 		if ($location = $this->getHeader('location')) {
 			$uri = \is_array($location) ? $location[0] : $location;
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/integrity.php b/snappymail/v/0.0.0/app/libraries/snappymail/integrity.php
index 97873d50c..e6d25e6bd 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/integrity.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/integrity.php
@@ -57,7 +57,6 @@ abstract class Integrity
 */
 			echo "<h3>gzip encoded</h3>";
 			$response = $HTTP->doRequest('HEAD', $uri . $file . '.gz');
-//			$response = $HTTP->doRequest('HEAD', $uri . $file, null, ['Accept-Encoding: gzip']);
 			echo '<details><summary>Status: ' . $response->status . '</summary><pre>' . \print_r($response->headers, 1) . '</pre></details>';
 			$size = \filesize(APP_VERSION_ROOT_PATH.$file . '.gz');
 			if ($size == intval($response->getHeader('content-length'))) {
@@ -72,8 +71,7 @@ abstract class Integrity
 			}
 
 			echo "<h3>brotli encoded</h3>";
-			$response = $HTTP->doRequest('HEAD', $uri . $file, null, ['Accept-Encoding: br']);
-//			$response = $HTTP->doRequest('HEAD', $uri . $file . '.br');
+			$response = $HTTP->doRequest('HEAD', $uri . $file . '.br');
 			echo '<details><summary>Status: ' . $response->status . '</summary><pre>' . \print_r($response->headers, 1) . '</pre></details>';
 			$size = \filesize(APP_VERSION_ROOT_PATH.$file . '.br');
 			if ($size == intval($response->getHeader('content-length'))) {
@@ -91,8 +89,8 @@ abstract class Integrity
 
 	public static function phpVersion()
 	{
-		if (PHP_VERSION_ID < 80200) {
-			return 'Your PHP version ('.PHP_VERSION.') is lower than the minimal required 8.2.0!';
+		if (PHP_VERSION_ID < 70400) {
+			return 'Your PHP version ('.PHP_VERSION.') is lower than the minimal required 7.4.0!';
 		}
 	}
 
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/jwt.php b/snappymail/v/0.0.0/app/libraries/snappymail/jwt.php
index 5dfd9cedf..e919455d2 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/jwt.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/jwt.php
@@ -6,15 +6,15 @@ use MailSo\Base\Utils;
 
 abstract class JWT
 {
-	private static function jsonEncode(mixed $data): string|false
+	private static function jsonEncode($data)
 	{
-		return Utils::UrlSafeBase64Encode(\json_encode($payload, \JSON_THROW_ON_ERROR));
+		return Utils::UrlSafeBase64Encode(\json_encode($payload, JSON_THROW_ON_ERROR));
 	}
 
-	private static function jsonDecode(string $data): mixed
+	private static function jsonDecode($data)
 	{
 		$data = Utils::UrlSafeBase64Decode($data);
-		return \json_decode($data, false, 8, \JSON_BIGINT_AS_STRING | \JSON_THROW_ON_ERROR);
+		return \json_decode($data, false, 8, JSON_BIGINT_AS_STRING | JSON_THROW_ON_ERROR);
 	}
 
 	/**
@@ -26,7 +26,7 @@ abstract class JWT
 	 * @param int           $timestamp      Allow the current timestamp to be specified. default time()
 	 * @param int           $leeway         When checking nbf (Not Before) Claim, iat (Issued At) Claim or expiration times, we want to provide some extra leeway time to account for clock skew.
 	 */
-	public static function decode(string $jwt, string|array $key, ?int $timestamp = null, int $leeway = 0): object
+	public static function decode(string $jwt, $key, ?int $timestamp = null, int $leeway = 0) : object
 	{
 		$timestamp = $timestamp ?: \time();
 
@@ -101,7 +101,7 @@ abstract class JWT
 	 *
 	 * @return string A signed JWT
 	 */
-	public static function encode(object|array $payload, string $key, string $alg = 'HS256', mixed $keyId = null, array $header = array()): string
+	public static function encode($payload, string $key, string $alg = 'HS256', $keyId = null, array $header = array()) : string
 	{
 		$header = \array_merge($header, array('typ' => 'JWT', 'alg' => $alg));
 		if ($keyId) {
@@ -125,10 +125,7 @@ abstract class JWT
 	 *
 	 * @return string An encrypted message
 	 */
-	public static function sign(string $msg, $key, string $alg = 'HS256',
-		#[\SensitiveParameter]
-		string $passphrase = ''
-	): string
+	public static function sign(string $msg, $key, string $alg = 'HS256', string $passphrase = '') : string
 	{
 		switch ($alg)
 		{
@@ -142,13 +139,19 @@ abstract class JWT
 						throw new \ValueError('Invalid key, reason: ' . \openssl_error_string());
 					}
 				}
-				$details = \openssl_pkey_get_details($key);
-				if (!isset($details['key']) || OPENSSL_KEYTYPE_RSA !== $details['type']) {
-					throw new \ValueError('Key is not compatible with RSA signatures');
-				}
-				$signature = '';
-				if (!\openssl_sign($msg, $signature, $key, 'SHA'.\substr($alg,2))) {
-					throw new \DomainException('OpenSSL unable to sign data: ' . \openssl_error_string());
+				try {
+					$details = \openssl_pkey_get_details($key);
+					if (!isset($details['key']) || OPENSSL_KEYTYPE_RSA !== $details['type']) {
+						throw new \ValueError('Key is not compatible with RSA signatures');
+					}
+					$signature = '';
+					if (!\openssl_sign($msg, $signature, $key, 'SHA'.\substr($alg,2))) {
+						throw new \DomainException('OpenSSL unable to sign data: ' . \openssl_error_string());
+					}
+				} finally {
+					if ($free_key) {
+						\openssl_pkey_free($key);
+					}
 				}
 				return $signature;
 
@@ -176,7 +179,7 @@ abstract class JWT
 	 *
 	 * @return bool
 	 */
-	private static function verify(string $msg, string $signature, $key, string $alg): bool
+	private static function verify(string $msg, string $signature, $key, string $alg) : bool
 	{
 		switch ($alg)
 		{
@@ -190,13 +193,19 @@ abstract class JWT
 						throw new \ValueError('Invalid key, reason: ' . openssl_error_string());
 					}
 				}
-				$details = \openssl_pkey_get_details($key);
-				if (!isset($details['key']) || OPENSSL_KEYTYPE_RSA !== $details['type']) {
-					throw new \ValueError('Key is not compatible with RSA signatures');
-				}
-				$success = \openssl_verify($msg, $signature, $key, 'SHA'.\substr($alg,2));
-				if (-1 == $success) {
-					throw new \DomainException('OpenSSL unable to verify data: ' . \openssl_error_string());
+				try {
+					$details = \openssl_pkey_get_details($key);
+					if (!isset($details['key']) || OPENSSL_KEYTYPE_RSA !== $details['type']) {
+						throw new \ValueError('Key is not compatible with RSA signatures');
+					}
+					$success = \openssl_verify($msg, $signature, $key, 'SHA'.\substr($alg,2));
+					if (-1 == $success) {
+						throw new \DomainException('OpenSSL unable to verify data: ' . \openssl_error_string());
+					}
+				} finally {
+					if ($free_key) {
+						\openssl_pkey_free($key);
+					}
 				}
 				return $success;
 
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/log.php b/snappymail/v/0.0.0/app/libraries/snappymail/log.php
index 9f40dcb6f..a3c4db69f 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/log.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/log.php
@@ -63,7 +63,8 @@ abstract class Log
 			}
 
 			if (\class_exists('OC')) {
-				\SnappyMail\Nextcloud::log($level, $msg);
+//				\OCP\Log\logger('snappymail')->log(\intval($level), $msg);
+				\OCP\Log\logger('snappymail')->{static::$levels[$level]}($msg);
 			}
 */
 		}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/nextcloud.php b/snappymail/v/0.0.0/app/libraries/snappymail/nextcloud.php
deleted file mode 100644
index e62e99924..000000000
--- a/snappymail/v/0.0.0/app/libraries/snappymail/nextcloud.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-namespace SnappyMail;
-
-/**
- * Nextcloud 34+
- * @CarlSchwan 2026-03-10
- * refactor: remove long deprecated IServerContainer methods
- *
- * https://github.com/nextcloud/server/commit/39c14c383b698467711a2de09870d7c032d92f63
- */
-abstract class Nextcloud
-{
-
-	public static function themesDir(): ?string
-	{
-		if (\class_exists('OC', false)) {
-			$sDir = \OC::$SERVERROOT . '/themes'; // custom user themes
-			if (\is_dir($sDir)) {
-				return $sDir;
-			}
-		}
-		return null;
-	}
-
-	public static function webRoot(): ?string
-	{
-		return \class_exists('OC', false) ? \OC::$WEBROOT : null;
-	}
-
-	public static function getConfig(): object
-	{
-		return \method_exists(\OC::$server, 'getConfig')
-			? \OC::$server->getConfig()
-			// Nextcloud 34+
-			: \OC::$server->get(\OCP\IAppConfig);
-	}
-
-	public static function getSystemConfigValue(string $key, mixed $default = null): mixed
-	{
-		return \method_exists(\OC::$server, 'getSystemConfig')
-			? \OC::$server->getSystemConfig()->getValue($key, $default)
-			// Nextcloud 34+
-			: \OC::$server->get(\OCP\IConfig::class)->getSystemValue($key, $default);
-	}
-
-	public static function getUserSession(): mixed
-	{
-		return \method_exists(\OC::$server, 'getUserSession')
-			? \OC::$server->getUserSession()
-			// Nextcloud 34+
-			: \OC::$server->get(\OCP\IUserSession::class);
-	}
-
-	public static function setUserSessionValue(string $key, mixed $value): void
-	{
-		if (\method_exists(\OC::$server, 'getUserSession')) {
-			\OC::$server->getUserSession()[$key] = $value;
-		} else {
-			// Nextcloud 34+
-			\OC::$server->get(\OCP\IUserSession::class)->getSession()->set($key, $value);
-		}
-	}
-
-	private static
-		$levels = [
-			\LOG_EMERG   => 'EMERGENCY',
-			\LOG_ALERT   => 'ALERT',
-			\LOG_CRIT    => 'CRITICAL',
-			\LOG_ERR     => 'ERROR',
-			\LOG_WARNING => 'WARNING',
-			\LOG_NOTICE  => 'NOTICE',
-			\LOG_INFO    => 'INFO',
-			\LOG_DEBUG   => 'DEBUG',
-		];
-
-	public static function log(int $level, string $msg): void
-	{
-		// https://www.php-fig.org/psr/psr-3/#3-psrlogloggerinterface
-		if (\class_exists('OCP\Log\logger')) {
-//			\OCP\Log\logger('snappymail')->log($level, $msg);
-			\OCP\Log\logger('snappymail')->{static::$levels[$level]}($msg);
-		}
-	}
-}
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
index f16acbd67..18b18cb1f 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/backup.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/backup.php
@@ -9,7 +9,7 @@ namespace SnappyMail\PGP;
 
 class Backup
 {
-	public static function PGPKey(string $key, string $keyId = '', $doDelete = false) : bool
+	public static function PGPKey(string $key, string $keyId = '') : bool
 	{
 		$oActions = \RainLoop\Api::Actions();
 		$oAccount = $oActions->getMainAccountFromToken();
@@ -21,23 +21,15 @@ class Backup
 				true
 			);
 			if (\str_contains($key, 'PGP PRIVATE KEY')) {
-				$fileName = "{$dir}{$keyId}.key";
-				if ($doDelete) {
-					return !file_exists($fileName) || unlink($fileName);
-				}
 				$hash = $oAccount->CryptKey();
 				$key = \SnappyMail\Crypt::Encrypt($key, $hash);
 				$key[1] = \base64_encode($key[1]);
 				$key[2] = \base64_encode($key[2]);
 				$key[3] = \hash_hmac('sha1', $key[2], $hash);
-				return !!\file_put_contents($fileName, \json_encode($key));
+				return !!\file_put_contents("{$dir}{$keyId}.key", \json_encode($key));
 			}
 			if (\str_contains($key, 'PGP PUBLIC KEY')) {
-				$fileName = "{$dir}{$keyId}_public.asc";
-				if ($doDelete) {
-					return !file_exists($fileName) || unlink($fileName);
-				}
-				return !!\file_put_contents($fileName, $key);
+				return !!\file_put_contents("{$dir}{$keyId}_public.asc", $key);
 			}
 		}
 		return false;
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/keyservers.php b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/keyservers.php
index 938aee764..74a509c5a 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/keyservers.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/keyservers.php
@@ -28,7 +28,6 @@ abstract class Keyservers
 		'https://pool.sks-keyservers.net',
 		'https://keys.mailvelope.com',
 		'https://keyserver.ubuntu.com',
-		'hkps://openpgpkeyserver.com',
 */
 	];
 
@@ -177,7 +176,7 @@ abstract class Keyservers
 	 * Sends a PGP public key to a public keyserver.
 	 *
 	 * @param string $host
-	 * @param string $key  The PGP public key.
+	 * @param mixed $key  The PGP public key.
 	 *
 	 * @throws Exception
 	 */
@@ -197,18 +196,10 @@ abstract class Keyservers
 */
 	}
 
-	/**
-	 * https://wiki.gnupg.org/WKD
-	 * gpg --with-wkd-hash --fingerprint releases@snappymail.eu
-	 * gpg --no-armor --export releases@snappymail.eu > i4cdqgcarfjdjnba6y4jnf498asg8c6p
-     */
-	public static function wkd(string $host, string $emailAddress)
+	/** https://wiki.gnupg.org/WKD */
+	public static function wkd(string $host, string $keyid)
 	{
 /*
-		$localPart = \explode('@', $emailAddress)[0];
-		$b32 = new \SnappyMail\Base32('ybndrfg8ejkmcpqxot1uwisza345h769');
-		$keyid = $b32->encode(\sha1($localPart, true));
-
 		"https://{$host}/.well-known/openpgpkey/hu/{$keyid}";
 		/** https://wiki.gnupg.org/WKD
 			DNS:
@@ -217,8 +208,8 @@ abstract class Keyservers
 			https://openpgpkey.example.com/.well-known/openpgpkey/example.com/hu/
 			else       https://example.com/.well-known/openpgpkey/hu/
 
-			An example: https://snappymail.eu/.well-known/openpgpkey/hu/i4cdqgcarfjdjnba6y4jnf498asg8c6p
-			is the direct method URL for "releases@snappymail.eu"
+			An example: https://example.com/.well-known/openpgpkey/hu/it5sewh54rxz33fwmr8u6dy4bbz8itz4
+			is the direct method URL for "bernhard.reiter@example.com"
 		*/
 	}
 
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/pecl.php b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/pecl.php
index bdbaaefe8..d89ba02cc 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/pecl.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/pecl.php
@@ -50,11 +50,11 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 
 	function __destruct()
 	{
-		$this->GnuPG?->cleardecryptkeys();
-		$this->GnuPG?->clearsignkeys();
+		$this->GnuPG->cleardecryptkeys();
+		$this->GnuPG->clearsignkeys();
 	}
 
-	public static function isSupported(): bool
+	public static function isSupported() : bool
 	{
 		// Disabled due to failures with "no passphrase" while a passphrase does exist
 		return false && \class_exists('gnupg') && \version_compare(\phpversion('gnupg'), '1.5', '>=');
@@ -68,7 +68,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 		}
 	}
 
-	public function getGPG(bool $throw = true): ?GPG
+	public function getGPG(bool $throw = true) : ?GPG
 	{
 		if (!$this->GPG) {
 			if (GPG::isSupported()) {
@@ -83,7 +83,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Add a key for decryption
 	 */
-	public function addDecryptKey(string $fingerprint, SensitiveString $passphrase): bool
+	public function addDecryptKey(string $fingerprint, SensitiveString $passphrase) : bool
 	{
 //		\SnappyMail\Log::debug('GnuPG', "addDecryptKey({$fingerprint}, {$passphrase})");
 		return $this->GnuPG->adddecryptkey($fingerprint, \strval($passphrase)) || $this->gnupgError();
@@ -92,7 +92,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Add a key for encryption
 	 */
-	public function addEncryptKey(string $fingerprint): bool
+	public function addEncryptKey(string $fingerprint) : bool
 	{
 		return $this->GnuPG->addencryptkey($fingerprint) || $this->gnupgError();
 	}
@@ -100,7 +100,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Add a key for signing
 	 */
-	public function addSignKey(string $fingerprint, SensitiveString $passphrase): bool
+	public function addSignKey(string $fingerprint, SensitiveString $passphrase) : bool
 	{
 //		\SnappyMail\Log::debug('GnuPG', "addSignKey({$fingerprint}, {$passphrase})");
 		return $this->GnuPG->addsignkey($fingerprint, \strval($passphrase)) || $this->gnupgError();
@@ -109,7 +109,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Removes all keys which were set for decryption before
 	 */
-	public function clearDecryptKeys(): bool
+	public function clearDecryptKeys() : bool
 	{
 		return $this->GnuPG->cleardecryptkeys();
 	}
@@ -117,7 +117,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Removes all keys which were set for encryption before
 	 */
-	public function clearEncryptKeys(): bool
+	public function clearEncryptKeys() : bool
 	{
 		return $this->GnuPG->clearencryptkeys();
 	}
@@ -125,7 +125,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Removes all keys which were set for signing before
 	 */
-	public function clearSignKeys(): bool
+	public function clearSignKeys() : bool
 	{
 		return $this->GnuPG->clearsignkeys();
 	}
@@ -133,7 +133,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Decrypts a given text
 	 */
-	public function decrypt(string $text): string|false
+	public function decrypt(string $text) /*: string|false */
 	{
 		$result = $this->GnuPG->decrypt($text);
 		(false === $result) && $this->gnupgError();
@@ -143,7 +143,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Decrypts a given file
 	 */
-	public function decryptFile(string $filename): string|false
+	public function decryptFile(string $filename) /*: string|false */
 	{
 		$result = $this->GnuPG->decrypt(\file_get_contents($filename));
 		(false === $result) && $this->gnupgError();
@@ -153,7 +153,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Decrypts a given resource
 	 */
-	public function decryptStream(/*resource*/ $fp, /*string|resource*/ $output = null): string|false
+	public function decryptStream(/*resource*/ $fp, /*string|resource*/ $output = null) /*: string|false */
 	{
 		if (!$fp || !\is_resource($fp)) {
 			throw new \Exception('Invalid stream resource');
@@ -167,7 +167,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Decrypts and verifies a given text
 	 */
-	public function decryptVerify(string $text, string &$plaintext): array|false
+	public function decryptVerify(string $text, string &$plaintext) /*: array|false*/
 	{
 		$result = $this->GnuPG->decryptverify($text, $plaintext);
 		(false === $result) && $this->gnupgError();
@@ -177,26 +177,22 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Decrypts and verifies a given file
 	 */
-	public function decryptVerifyFile(string $filename, string &$plaintext): array|false
+	public function decryptVerifyFile(string $filename, string &$plaintext) /*: array|false*/
 	{
 		$result = $this->GnuPG->decryptverify(\file_get_contents($filename), $plaintext);
 		(false === $result) && $this->gnupgError();
 		return $result;
 	}
 
-	/**
-	 * Delete a key from the keyring
-	 */
-	public function deleteKey(string $keyId, bool $private): bool
+	public function deleteKey(string $keyId, bool $private) : bool
 	{
-//		return $this->GnuPG->deletekey($keyId, $private);
 		return $this->getGPG()->deleteKey($keyId, $private);
 	}
 
 	/**
 	 * Encrypts a given text
 	 */
-	public function encrypt(string $plaintext): string|false
+	public function encrypt(string $plaintext) /*: string|false*/
 	{
 		return $this->GnuPG->encrypt($plaintext) ?: $this->gnupgError();
 	}
@@ -204,12 +200,12 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Encrypts a given text
 	 */
-	public function encryptFile(string $filename): string|false
+	public function encryptFile(string $filename) /*: string|false*/
 	{
 		return $this->GnuPG->encrypt(\file_get_contents($filename)) ?: $this->gnupgError();
 	}
 
-	public function encryptStream(/*resource*/ $fp, /*string|resource*/ $output = null): string|false
+	public function encryptStream(/*resource*/ $fp, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		\rewind($fp);
 		return $this->GnuPG->encrypt(\stream_get_contents($fp)) ?: $this->gnupgError();
@@ -218,7 +214,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Exports a key
 	 */
-	public function export(string $fingerprint, ?SensitiveString $passphrase = null): string|false
+	public function export(string $fingerprint, ?SensitiveString $passphrase = null) /*: string|false*/
 	{
 		if (null !== $passphrase) {
 			return $this->getGPG()->export($fingerprint, $passphrase);
@@ -229,7 +225,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Returns the engine info
 	 */
-	public function getEngineInfo(): array
+	public function getEngineInfo() : array
 	{
 		return $this->GnuPG->getengineinfo();
 	}
@@ -237,7 +233,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Returns the errortext, if a function fails
 	 */
-	public function getError(): string|false
+	public function getError() /*: string|false*/
 	{
 		return $this->GnuPG->geterror();
 	}
@@ -245,7 +241,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Returns the error info
 	 */
-	public function getErrorInfo(): array
+	public function getErrorInfo() : array
 	{
 		return $this->GnuPG->geterrorinfo();
 	}
@@ -253,7 +249,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Returns the currently active protocol for all operations
 	 */
-	public function getProtocol(): int
+	public function getProtocol() : int
 	{
 		return $this->GnuPG->getprotocol();
 	}
@@ -261,7 +257,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Generates a key
 	 */
-	public function generateKey(string $uid, SensitiveString $passphrase): string|false
+	public function generateKey(string $uid, SensitiveString $passphrase) /*: string|false*/
 	{
 		$GPG = $this->getGPG(false);
 		return $GPG ? $GPG->generateKey($uid, $passphrase) : false;
@@ -270,7 +266,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Imports a key
 	 */
-	public function import(string $keydata): array|false
+	public function import(string $keydata) /*: array|false*/
 	{
 		return $this->GnuPG->import($keydata);
 	}
@@ -278,12 +274,12 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Imports a key
 	 */
-	public function importFile(string $filename): array|false
+	public function importFile(string $filename) /*: array|false*/
 	{
 		return $this->GnuPG->import(\file_get_contents($filename)) ?: $this->gnupgError();
 	}
 
-	public function keyInfo(string $pattern, bool $private = false): array
+	public function keyInfo(string $pattern, bool $private = false) : array
 	{
 		return $this->GnuPG->keyinfo($pattern, $private ? 1 : 0);
 	}
@@ -291,7 +287,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Returns an array with information about all keys that matches the given pattern
 	 */
-	public function allKeysInfo(string $pattern): array
+	public function allKeysInfo(string $pattern) : array
 	{
 		$keys = [
 			'public' => [],
@@ -316,7 +312,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	 * Toggle armored output
 	 * When true the output is ASCII
 	 */
-	public function setArmor(bool $armor = true): bool
+	public function setArmor(bool $armor = true) : bool
 	{
 		return $this->GnuPG->setarmor($armor ? 1 : 0);
 	}
@@ -326,7 +322,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	 * GNUPG_ERROR_WARNING, GNUPG_ERROR_EXCEPTION and GNUPG_ERROR_SILENT.
 	 * By default GNUPG_ERROR_SILENT is used.
 	 */
-	public function setErrorMode(int $errormode): void
+	public function setErrorMode(int $errormode) : void
 	{
 		$this->GnuPG->seterrormode($errormode);
 	}
@@ -336,7 +332,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	 * GNUPG_SIG_MODE_NORMAL, GNUPG_SIG_MODE_DETACH and GNUPG_SIG_MODE_CLEAR.
 	 * By default GNUPG_SIG_MODE_CLEAR
 	 */
-	public function setSignMode(int $signmode): bool
+	public function setSignMode(int $signmode) : bool
 	{
 		return $this->GnuPG->setsignmode($signmode);
 	}
@@ -344,7 +340,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Signs a given text
 	 */
-	public function sign(string $plaintext): string|false
+	public function sign(string $plaintext) /*: string|false*/
 	{
 		return $this->GnuPG->sign($plaintext) ?: $this->gnupgError();
 	}
@@ -352,7 +348,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Signs a given file
 	 */
-	public function signFile(string $filename): string|false
+	public function signFile(string $filename) /*: string|false*/
 	{
 		return $this->GnuPG->sign(\file_get_contents($filename)) ?: $this->gnupgError();
 	}
@@ -360,7 +356,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Signs a given file
 	 */
-	public function signStream($fp, /*string|resource*/ $output = null): string|false
+	public function signStream($fp, /*string|resource*/ $output = null) /*: string|false*/
 	{
 		\rewind($fp);
 		return $this->GnuPG->sign(\stream_get_contents($fp)) ?: $this->gnupgError();
@@ -369,7 +365,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Verifies a signed text
 	 */
-	public function verify(string $signed_text, string $signature, ?string &$plaintext = null): array|false
+	public function verify(string $signed_text, string $signature, string &$plaintext = null) /*: array|false*/
 	{
 		$result = $this->GnuPG->verify($signed_text, $signature ?: false, $plaintext) ?: $this->gnupgError();
 		if (!$result) {
@@ -382,7 +378,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Verifies a signed file
 	 */
-	public function verifyFile(string $filename, string $signature, ?string &$plaintext = null): array|false
+	public function verifyFile(string $filename, string $signature, string &$plaintext = null) /*: array|false*/
 	{
 		return $this->GnuPG->verify(\file_get_contents($filename), $signature, $plaintext) ?: $this->gnupgError();
 	}
@@ -390,7 +386,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface
 	/**
 	 * Verifies a given resource
 	 */
-	public function verifyStream(/*resource*/ $fp, string $signature, ?string &$plaintext = null): array|false
+	public function verifyStream(/*resource*/ $fp, string $signature, string &$plaintext = null) /*: array|false */
 	{
 		if (!$fp || !\is_resource($fp)) {
 			throw new \Exception('Invalid stream resource');
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/pgpinterface.php b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/pgpinterface.php
index aba3d703e..3a5dd2ad6 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/pgpinterface.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/pgpinterface.php
@@ -6,40 +6,40 @@ use SnappyMail\SensitiveString;
 
 interface PGPInterface
 {
-	public static function isSupported(): bool;
+	public static function isSupported() : bool;
 //	public function addPinentry(string $keyId, SensitiveString $passphrase);
-//	public function clearPinentries(): bool
-	public function addDecryptKey(string $fingerprint, SensitiveString $passphrase): bool;
-	public function addEncryptKey(string $fingerprint): bool;
-	public function addSignKey(string $fingerprint, SensitiveString $passphrase): bool;
-	public function clearDecryptKeys(): bool;
-	public function clearEncryptKeys(): bool;
-	public function clearSignKeys(): bool;
-	public function decrypt(string $text): string|false;
-	public function decryptFile(string $filename): string|false;
-	public function decryptStream(/*resource*/ $fp, /*string|resource*/ $output = null): string|false;
-	public function decryptVerify(string $text, string &$plaintext): array|false;
-	public function decryptVerifyFile(string $filename, string &$plaintext): array|false;
-	public function deleteKey(string $keyId, bool $private): bool;
-	public function encrypt(string $plaintext): string|false;
-	public function encryptFile(string $filename): string|false;
-	public function encryptStream(/*resource*/ $fp, /*string|resource*/ $output = null): string|false;
-	public function export(string $fingerprint, ?SensitiveString $passphrase = null): string|false;
-	public function getEngineInfo(): array;
-	public function getError(): string|false;
-	public function getErrorInfo(): array;
-	public function getProtocol(): int;
-	public function generateKey(string $uid, SensitiveString $passphrase): string|false;
-	public function import(string $keydata): array|false;
-	public function importFile(string $filename): array|false;
-	public function allKeysInfo(string $pattern): array;
-	public function setArmor(bool $armor = true): bool;
-	public function setErrorMode(int $errormode): void;
-	public function setSignMode(int $signmode): bool;
-	public function sign(string $plaintext): string|false;
-	public function signFile(string $filename): string|false;
-	public function signStream($fp, /*string|resource*/ $output = null): string|false;
-	public function verify(string $signed_text, string $signature, ?string &$plaintext = null): array|false;
-	public function verifyFile(string $filename, string $signature, ?string &$plaintext = null): array|false;
-	public function verifyStream(/*resource*/ $fp, string $signature, ?string &$plaintext = null): array|false;
+//	public function clearPinentries() : bool
+	public function addDecryptKey(string $fingerprint, SensitiveString $passphrase) : bool;
+	public function addEncryptKey(string $fingerprint) : bool;
+	public function addSignKey(string $fingerprint, SensitiveString $passphrase) : bool;
+	public function clearDecryptKeys() : bool;
+	public function clearEncryptKeys() : bool;
+	public function clearSignKeys() : bool;
+	public function decrypt(string $text) /*: string|false */;
+	public function decryptFile(string $filename) /*: string|false */;
+	public function decryptStream(/*resource*/ $fp, /*string|resource*/ $output = null) /*: string|false */;
+	public function decryptVerify(string $text, string &$plaintext) /*: array|false*/;
+	public function decryptVerifyFile(string $filename, string &$plaintext) /*: array|false*/;
+	public function deleteKey(string $keyId, bool $private) : bool;
+	public function encrypt(string $plaintext) /*: string|false*/;
+	public function encryptFile(string $filename) /*: string|false*/;
+	public function encryptStream(/*resource*/ $fp, /*string|resource*/ $output = null) /*: string|false*/;
+	public function export(string $fingerprint, ?SensitiveString $passphrase = null) /*: string|false*/;
+	public function getEngineInfo() : array;
+	public function getError() /*: string|false*/;
+	public function getErrorInfo() : array;
+	public function getProtocol() : int;
+	public function generateKey(string $uid, SensitiveString $passphrase) /*: string|false*/;
+	public function import(string $keydata) /*: array|false*/;
+	public function importFile(string $filename) /*: array|false*/;
+	public function allKeysInfo(string $pattern) : array;
+	public function setArmor(bool $armor = true) : bool;
+	public function setErrorMode(int $errormode) : void;
+	public function setSignMode(int $signmode) : bool;
+	public function sign(string $plaintext) /*: string|false*/;
+	public function signFile(string $filename) /*: string|false*/;
+	public function signStream($fp, /*string|resource*/ $output = null) /*: string|false*/;
+	public function verify(string $signed_text, string $signature, string &$plaintext = null) /*: array|false*/;
+	public function verifyFile(string $filename, string $signature, string &$plaintext = null) /*: array|false*/;
+	public function verifyStream(/*resource*/ $fp, string $signature, string &$plaintext = null) /*: array|false */;
 }
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/sensitivestring.php b/snappymail/v/0.0.0/app/libraries/snappymail/sensitivestring.php
index 63d0dc418..bac6afb17 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/sensitivestring.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/sensitivestring.php
@@ -61,7 +61,8 @@ class SensitiveString /* extends SensitiveParameterValue | SensitiveParameter */
 		return $this->getValue();
 	}
 
-	public function jsonSerialize(): mixed
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
 	{
 		throw new \Exception("JSON serialization of 'SnappyMail\\SensitiveString' is not allowed");
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/smime/certificate.php b/snappymail/v/0.0.0/app/libraries/snappymail/smime/certificate.php
index 289d50366..2a12ba905 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/smime/certificate.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/smime/certificate.php
@@ -34,9 +34,7 @@ class Certificate
 	 * A string having the format file://path/to/cert.pem; the named file must contain a PEM encoded certificate
 	 * A string containing the content of a certificate, PEM encoded, may start with -----BEGIN CERTIFICATE-----
 	 */
-	function __construct(\OpenSSLCertificate|string $x509cert = null,
-		#[\SensitiveParameter]
-		\OpenSSLAsymmetricKey|\OpenSSLCertificate|array|string $privateKey = null)
+	function __construct($x509cert = null, $privateKey = null)
 	{
 		if ($x509cert) {
 			$x509cert = \openssl_x509_read($x509cert);
@@ -57,7 +55,7 @@ class Certificate
 	/**
 	 * Verifies if a certificate can be used for a particular purpose
 	 */
-	public function checkPurpose(int $purpose, array $cainfo = array(), ?string $untrustedfile = null): bool|int
+	public function checkPurpose(int $purpose, array $cainfo = array(), ?string $untrustedfile = null)/*: bool|int*/
 	{
 		if ($this->x509) {
 			return \openssl_x509_checkpurpose($this->x509, $purpose, $cainfo, $untrustedfile);
@@ -65,14 +63,14 @@ class Certificate
 		return false;
 	}
 
-	public function canSign(): bool
+	public function canSign() : bool
 	{
 		return $this->x509
 			? true === \openssl_x509_checkpurpose($this->x509, \X509_PURPOSE_SMIME_SIGN)
 			: false;
 	}
 
-	public function canEncrypt(): bool
+	public function canEncrypt() : bool
 	{
 		return $this->x509
 			? true === \openssl_x509_checkpurpose($this->x509, \X509_PURPOSE_SMIME_ENCRYPT)
@@ -82,7 +80,7 @@ class Certificate
 	/**
 	 * Returns the certificate in a PEM encoded format string
 	 */
-	public function export(bool $notext = true): ?string
+	public function export(bool $notext = true) : ?string
 	{
 		if ($this->x509) {
 			$output = '';
@@ -96,7 +94,7 @@ class Certificate
 	/**
 	 * Returns the fingerprint or digest of the certificate
 	 */
-	public function fingerprint(string $hash_algorithm = 'sha1', bool $raw_output = false): string|bool
+	public function fingerprint(string $hash_algorithm = 'sha1', bool $raw_output = false)/*: string|bool*/
 	{
 		return $this->x509 ? \openssl_x509_fingerprint($this->x509, $hash_algorithm, $raw_output) : false;
 	}
@@ -104,17 +102,17 @@ class Certificate
 	/**
 	 * Returns the certificate information as an array
 	 */
-	public function info(bool $shortnames = true): array|bool
+	public function info(bool $shortnames = true) /*: array|bool*/
 	{
 		return $this->x509 ? \openssl_x509_parse($this->x509, $shortnames) : false;
 	}
 
-	public static function getCipherMethods(bool $aliases = false): array
+	public static function getCipherMethods(bool $aliases = false) : array
 	{
 		return \openssl_get_cipher_methods($aliases);
 	}
 
-	public function createSelfSigned(\SnappyMail\SensitiveString $passphrase, ?string $privateKey = null): array
+	public function createSelfSigned(\SnappyMail\SensitiveString $passphrase, ?string $privateKey = null) : array
 	{
 		$options = array(
 			'config'             => __DIR__ . '/openssl.cnf',
@@ -177,7 +175,7 @@ class Certificate
 		#[\SensitiveParameter]
 		string $pass = '',
 		array $args = array()
-	): string
+	) : string
 	{
 		$out = '';
     	\openssl_pkcs12_export($this->x509, $out, $this->pkey, $pass, $args);
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/smime/openssl.php b/snappymail/v/0.0.0/app/libraries/snappymail/smime/openssl.php
index a7c4e892d..1bb35c2d9 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/smime/openssl.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/smime/openssl.php
@@ -19,19 +19,18 @@ class OpenSSL
 	// Used for sign and decrypt
 	private $certificate; // OpenSSLCertificate|array|string
 	private $privateKey; // OpenSSLAsymmetricKey|OpenSSLCertificate|array|string
-	private ?string $certificateChain = null;
 
 	function __construct(string $homedir)
 	{
 		$this->homedir = $homedir;
 	}
 
-	public function getCertificate(string $filename): string|false
+	public function getCertificate(string $filename)/* : string*/
 	{
 		return \file_get_contents("{$this->homedir}/{$filename}");
 	}
 
-	public function storeCertificate(string $certificate): bool
+	public function storeCertificate(string $certificate) : bool
 	{
 		$data = \openssl_x509_parse(\openssl_x509_read($certificate));
 		if (!$data) {
@@ -51,7 +50,7 @@ class OpenSSL
 		return true;
 	}
 
-	public function certificates(bool $force = false): array
+	public function certificates(bool $force = false) : array
 	{
 		$cacheFile = "{$this->homedir}/certificates.json";
 		$result = (!$force && \file_exists($cacheFile))
@@ -111,17 +110,17 @@ class OpenSSL
 		return $result;
 	}
 
-	public function privateKeys(): array
+	public function privateKeys() : array
 	{
 //		\glob("{$this->homedir}/*.key");
 	}
 
-	public static function isSupported(): bool
+	public static function isSupported() : bool
 	{
 		return \defined('PKCS7_DETACHED');
 	}
 
-	public function setCertificate(OpenSSLCertificate|string $certificate): void
+	public function setCertificate(/*OpenSSLCertificate|string*/$certificate)
 	{
 		$this->certificate = \openssl_x509_read($certificate);
 		if (!$this->certificate) {
@@ -132,18 +131,9 @@ class OpenSSL
 		}
 	}
 
-	public function setCertificateChain(?string $certificateChain): void
-	{
-		if ($certificateChain === "") {
-			$this->certificateChain = null;
-		} else {
-			$this->certificateChain = $certificateChain;
-		}
-	}
-
-	public function setPrivateKey(OpenSSLAsymmetricKey|string $privateKey,
+	public function setPrivateKey(/*OpenSSLAsymmetricKey|string*/$privateKey,
 		?\SnappyMail\SensitiveString $passphrase = null
-	): void
+	) : void
 	{
 		$this->privateKey = \openssl_pkey_get_private($privateKey, $passphrase);
 		if (!$this->privateKey) {
@@ -171,7 +161,7 @@ class OpenSSL
 	}
 
 /*
-	public function asn1parse(string|Temporary $input): ?string
+	public function asn1parse(/*string|Temporary* / $input) : ?string
 	{
 		if (\is_string($input)) {
 			$tmp = new Temporary('smimein-');
@@ -180,10 +170,10 @@ class OpenSSL
 			}
 			$input = $tmp;
 		}
-		\shell_exec('openssl asn1parse -in $input->filename()');
+		`openssl asn1parse -in $input->filename()`
 	}
 */
-	public function decrypt(string|Temporary $input): ?string
+	public function decrypt(/*string|Temporary*/ $input) : ?string
 	{
 		if (\is_string($input)) {
 			$tmp = new Temporary('smimein-');
@@ -204,7 +194,7 @@ class OpenSSL
 		return $output->getContents();
 	}
 
-	public function encrypt(string|Temporary $input, array $certificates): ?string
+	public function encrypt(/*string|Temporary*/$input, array $certificates) : ?string
 	{
 		if (\is_string($input)) {
 			$tmp = new Temporary('smimein-');
@@ -245,7 +235,7 @@ class OpenSSL
 		return $data;
 	}
 
-	public function sign(string|Temporary $input, bool $detached = true): ?string
+	public function sign(/*string|Temporary*/$input, bool $detached = true)
 	{
 		if (\is_string($input)) {
 			$tmp = new Temporary('smimein-');
@@ -254,13 +244,6 @@ class OpenSSL
 			}
 			$input = $tmp;
 		}
-		if (\is_string($this->certificateChain)) {
-			$tmp = new Temporary('smimechain-');
-			if (!$tmp->putContents($this->certificateChain)) {
-				return null;
-			}
-			$certificateChain = $tmp;
-		}
 		$output = new Temporary('smimeout-');
 		if (!\openssl_pkcs7_sign(
 			$input->filename(),
@@ -269,7 +252,7 @@ class OpenSSL
 			$this->privateKey,
 			$this->headers,
 			$detached ? \PKCS7_DETACHED | \PKCS7_BINARY : 0, // | PKCS7_NOCERTS | PKCS7_NOATTR
-			$certificateChain ?? null
+			$this->untrusted_certificates_filename
 		)) {
 			throw new \RuntimeException('OpenSSL sign: ' . \openssl_error_string());
 		}
@@ -314,7 +297,7 @@ class OpenSSL
 	/**
 	 * $opaque = true, when the message is not detached
 	 */
-	public function verify(string|Temporary $input, ?string $signers_certificates_filename = null, bool $opaque = false): ?array
+	public function verify(/*string|Temporary*/$input, ?string $signers_certificates_filename = null, bool $opaque = false)
 	{
 		if (\is_string($input)) {
 			$tmp = new Temporary('smimein-');
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/stream/tar.php b/snappymail/v/0.0.0/app/libraries/snappymail/stream/tar.php
index 3009f53b3..53509561b 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/stream/tar.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/stream/tar.php
@@ -39,7 +39,7 @@ class TAR
 		$this->close();
 	}
 
-	public function pushHttpHeaders(string $name): void
+	public function pushHttpHeaders(string $name) : void
 	{
 		if ($i = \ob_get_level()) {
 			# Clear buffers:
@@ -61,7 +61,7 @@ class TAR
 		\MailSo\Base\Http::setContentDisposition('attachment', ['filename' => $name]);
 	}
 
-	public function close(): void
+	public function close() : void
 	{
 		if ($this->out) {
 			if ($this->started) {
@@ -81,7 +81,7 @@ class TAR
 		}
 	}
 
-	public function addFile($fileinfo, ?string $name = null): bool
+	public function addFile($fileinfo, ?string $name = null) : bool
 	{
 		if (!($fileinfo instanceof \SplFileInfo)) {
 			$fileinfo = new \SplFileInfo($fileinfo);
@@ -113,7 +113,7 @@ class TAR
 		return true;
 	}
 
-	public function addFromStream($resource, string $name, int $time = 0): bool
+	public function addFromStream($resource, string $name, int $time = 0) : bool
 	{
 		if (\is_resource($resource)) {
 			$temp = new TarTempResource();
@@ -155,7 +155,7 @@ class TAR
 		return true;
 	}
 
-	public function addFromString(string $name, string $data, int $time = 0): bool
+	public function addFromString(string $name, string $data, int $time = 0) : bool
 	{
 		$this->writeEntryHeader(
 			\strtr($name, '\\', '/'),
@@ -174,7 +174,7 @@ class TAR
 		return true;
 	}
 
-	public function addDir(string $dirname, ?\SplFileInfo $fileinfo = null): void
+	public function addDir(string $dirname, ?\SplFileInfo $fileinfo = null) : void
 	{
 		$this->writeEntryHeader(
 			\rtrim(\strtr($dirname, '\\', '/'), '/') . '/',
@@ -187,7 +187,7 @@ class TAR
 		);
 	}
 
-	public function addRecursive(string $dir, string $target_dir = '', $ignore = '#/(\\.hg(/|$)|\\.hgignore)#'): void
+	public function addRecursive(string $dir, string $target_dir = '', $ignore = '#/(\\.hg(/|$)|\\.hgignore)#') : void
 	{
 		if (!$this->out) {
 			throw new \Exception('Stream closed');
@@ -217,7 +217,7 @@ class TAR
 		}
 	}
 
-	protected function start(): void
+	protected function start()
 	{
 		if ($this->started) {
 			return;
@@ -239,7 +239,7 @@ class TAR
 		}
 	}
 
-	protected function write(string $string): int|bool
+	protected function write($string)/* : int|bool*/
 	{
 		if (!$this->out) {
 			throw new \Exception('Stream closed');
@@ -265,7 +265,7 @@ class TAR
 		return $written;
 	}
 
-	protected function writeEntryHeader($name, $type, $size, $uid = 0, $gid = 0, $perm = 0, $mtime = 0, $link = '', $prefix  = ''): void
+	protected function writeEntryHeader($name, $type, $size, $uid = 0, $gid = 0, $perm = 0, $mtime = 0, $link = '', $prefix  = '')
 	{
 		// handle long filename length
 		$paxdata = $paxname = '';
@@ -331,7 +331,7 @@ class TAR
 	}
 
 	// Writes Pre-POSIX.1-1988 (i.e. v7) and POSIX UStar headers
-	protected function writeUStarEntryHeader($name, $type, $size, $uid = 0, $gid = 0, $perm = 0, $mtime = 0, $link = '', $prefix  = ''): void
+	protected function writeUStarEntryHeader($name, $type, $size, $uid = 0, $gid = 0, $perm = 0, $mtime = 0, $link = '', $prefix  = '')
 	{
 		$data = \pack('a100a8a8a8a12A12',
 			$name,
@@ -362,7 +362,10 @@ class TAR
 
 class TarTempResource extends \SplTempFileObject
 {
-	public function getOwner(): int|false { return 0; }
-	public function getGroup(): int|false { return 0; }
-	public function getPerms(): int|false { return 420; }
+	#[\ReturnTypeWillChange]
+	public function getOwner()/*: int|false*/ { return 0; }
+	#[\ReturnTypeWillChange]
+	public function getGroup()/*: int|false*/ { return 0; }
+	#[\ReturnTypeWillChange]
+	public function getPerms()/*: int|false*/ { return 420; }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/tar.php b/snappymail/v/0.0.0/app/libraries/snappymail/tar.php
index 80ae166a1..e36c165e1 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/tar.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/tar.php
@@ -18,7 +18,10 @@ class TAR
 		$this->alias = $alias ?: $filename;
 	}
 
-	public function extractTo(string $directory, array|string|null $files = null, bool $overwrite = false) : bool
+	/**
+	 * @param $files array|string|null
+	 */
+	public function extractTo(string $directory, $files = null, bool $overwrite = false) : bool
 	{
 		$fp = \gzopen($this->filename, 'rb');
 		if (!$fp) {
diff --git a/snappymail/v/0.0.0/app/localization/ar/user.json b/snappymail/v/0.0.0/app/localization/ar/user.json
index d47ff6eea..676857698 100644
--- a/snappymail/v/0.0.0/app/localization/ar/user.json
+++ b/snappymail/v/0.0.0/app/localization/ar/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Using <strong>%SIZE% (%PROC%%)<\/strong> of your <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
 		"NO_SORT": "Mail server does not support sorting",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(تم إعتراضها من قبل المتصفح)",
 		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
 		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"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)",
diff --git a/snappymail/v/0.0.0/app/localization/be/user.json b/snappymail/v/0.0.0/app/localization/be/user.json
index 9ea86d14c..6e2fa9f5d 100644
--- a/snappymail/v/0.0.0/app/localization/be/user.json
+++ b/snappymail/v/0.0.0/app/localization/be/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Выкарыстана <strong>%SIZE% (%PROC%%)<\/strong> з <strong>%LIMIT%<\/strong>",
 		"SORT": "Сартаванне",
 		"NO_SORT": "Паштовы сервер не падтрымлівае сартаванне",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Дата па ўзрастанні",
 		"SORT_DATE_DESC": "Дата па спаданні",
 		"SORT_SIZE_ASC": "Памер па ўзрастанні",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Заблакавана браўзэрам)",
 		"COLLAPSE_BLOCKQUOTES": "Згортваць блок с працытаваным тэкстам",
 		"MAX_QUOTE_LEVEL": "Максімальны ўзровень адлюстравання працытаванага тэксту",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"LIST_INLINE_ATTACHMENTS": "Паказваць укладанні ў спісе",
 		"LIST_SIMPLE_ATTACHMENTS": "Просты спіс укладанняў",
 		"LIST_MESSAGES_GROUPED": "Группаванне спісу паведамленняў (пры сартаванні по даце альбо адпраўніку)",
diff --git a/snappymail/v/0.0.0/app/localization/bg/user.json b/snappymail/v/0.0.0/app/localization/bg/user.json
index 5b2b59194..dbecf23d7 100644
--- a/snappymail/v/0.0.0/app/localization/bg/user.json
+++ b/snappymail/v/0.0.0/app/localization/bg/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Използване на <strong>%SIZE% (%PROC%%)<\/strong> от вашите <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
 		"NO_SORT": "Mail server does not support sorting",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Блокирано от браузъра)",
 		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
 		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"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)",
diff --git a/snappymail/v/0.0.0/app/localization/ca/LICENSE-RainLoop b/snappymail/v/0.0.0/app/localization/ca/LICENSE-RainLoop
deleted file mode 100644
index 1a6999c1a..000000000
--- a/snappymail/v/0.0.0/app/localization/ca/LICENSE-RainLoop
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022 RainLoopTeam
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff --git a/snappymail/v/0.0.0/app/localization/ca/README.md b/snappymail/v/0.0.0/app/localization/ca/README.md
deleted file mode 100644
index 17336a3c9..000000000
--- a/snappymail/v/0.0.0/app/localization/ca/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Catalan translation
-
-Catalan (`ca`, Català) translation for SnappyMail. A complete linguistic pass
-was applied on 2026-10-16; see [review notes](REVIEW.md). Further corrections
-from Catalan-speaking users are welcome.
-
-Existing translations were adapted from RainLoop's official Catalan resources:
-https://github.com/RainLoop/rainloop-webmail/tree/9bf8fa5b63d7e6871ee533126a7e1b1c85ee45b5/rainloop/v/0.0.0/app/localization
-
-SnappyMail-specific strings were translated for this contribution. Preserve the
-original MIT copyright and permission notice in `LICENSE-RainLoop` when reusing
-the adapted RainLoop texts. The translation includes user, admin and static
-messages, plus the relative-time fallback resource.
-
-Native language selector on a test login page (no authenticated session or mail):
-
-![Català in the native selector](selector.png)
diff --git a/snappymail/v/0.0.0/app/localization/ca/REVIEW.md b/snappymail/v/0.0.0/app/localization/ca/REVIEW.md
deleted file mode 100644
index ffa6bcdc5..000000000
--- a/snappymail/v/0.0.0/app/localization/ca/REVIEW.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Catalan linguistic review — 2026-10-16
-
-Reviewed the full user, administration, static and relative-time resources
-against their English originals: 567 user entries, 140 administration entries
-and 7 static entries. This pass changes 210 entries (161 user,
-46 administration, 3 static), including typography.
-
-## Editorial criteria
-
-- Use the Softcatalà distinction between short imperative commands in buttons
-  (for example, *Desa*, *Xifra*) and the *vós* form when addressing users in
-  explanations, questions or instructions (*Introduïu*, *Seleccioneu*, *Voleu*).
-- Prefer consistent terms such as *desar*, *xifrar/desxifrar*, *conversa*,
-  *text sense format* and *emmagatzematge*. Preserve proper names such as Sieve.
-- Correct semantic errors, not only spelling: `STOP_LABEL` must stop further
-  processing, `LABEL_UNREAD` marks messages as unread, and the domain allow-list
-  describes permitted **users**, not domains.
-- Distinguish read/display receipts from delivery receipts. Preserve all message
-  variables, including `%READ-RECEIPT%`.
-- Remove inherited RainLoop product references from SnappyMail interface text.
-- Preserve JSON keys, technical flags, placeholders and required HTML structure.
-  Use consistent apostrophes and quotation marks in displayed Catalan text.
-
-## Representative corrections
-
-| Before | After | Reason |
-| --- | --- | --- |
-| No aturis el processament de les regles | Atura el processament de les regles següents | The previous wording reversed the action. |
-| No llegeixis els missatges seleccionats | Marca els missatges seleccionats com a no llegits | Describes changing the unread flag. |
-| Net | Text sense format | Correct meaning of the plain-text editor option. |
-| scripts de sedàs | scripts Sieve | Sieve is a protocol name. |
-| Emmagatzeatge | Emmagatzematge | Spelling correction. |
-| Llista de dominis… | Llista d’usuaris del domini… | The allow-list contains users. |
-| El RainLoop està actualitzat. | SnappyMail està actualitzat. | Correct product name. |
-
-## References
-
-- [Softcatalà linguistic style](https://www.softcatala.org/guia-estil-de-softcatala/aspectes-linguistics/)
-- [TERMCAT criteria for software localization](https://arxiu.termcat.cat/criteris/localitzacio-productes-informatics.pdf)
-
-This is a linguistic review of this contribution, not an endorsement by either
-organization. Further review and corrections from Catalan-speaking maintainers
-remain welcome.
diff --git a/snappymail/v/0.0.0/app/localization/ca/admin.json b/snappymail/v/0.0.0/app/localization/ca/admin.json
deleted file mode 100644
index ef5639570..000000000
--- a/snappymail/v/0.0.0/app/localization/ca/admin.json
+++ /dev/null
@@ -1,182 +0,0 @@
-{
-	"GLOBAL": {
-		"ADD": "Afegeix",
-		"CLOSE": "Tanca",
-		"SAVE": "Desa",
-		"TEST": "Prova",
-		"UPDATE": "Actualitza",
-		"USERNAME": "Nom d’usuari",
-		"PASSWORD": "Contrasenya",
-		"CANCEL": "Cancel·la",
-		"SEARCH": "Cerca",
-		"YES": "Sí",
-		"NO": "No"
-	},
-	"LOGIN": {
-		"LABEL_LOGIN": "Nom d’usuari",
-		"LABEL_TOTP": "Codi TOTP",
-		"BUTTON_LOGIN": "Accedeix al tauler d’administració"
-	},
-	"TOP_PANEL": {
-		"LABEL_ADMIN_PANEL": "Tauler d’administració"
-	},
-	"SETTINGS_LABELS": {
-		"GENERAL": "General",
-		"LOGIN": "Inici de sessió",
-		"BRANDING": "Imatge de marca",
-		"CONTACTS": "Contactes",
-		"DOMAINS": "Dominis",
-		"SECURITY": "Seguretat",
-		"PACKAGES": "Extensions",
-		"CONFIG": "Configuració",
-		"ABOUT": "Quant a"
-	},
-	"TAB_GENERAL": {
-		"LEGEND_INTERFACE": "Interfície",
-		"LABEL_LANGUAGE": "Llengua",
-		"LABEL_LANGUAGE_ADMIN": "Llengua (administració)",
-		"LABEL_THEME": "Tema",
-		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Permet la selecció de llengua a la pantalla de configuració",
-		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Permet la selecció del tema a la pantalla de configuració",
-		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Permet la selecció del fons a la pantalla de configuració",
-		"LABEL_SHOW_THUMBNAILS": "Mostra les miniatures (adjunts)",
-		"LEGEND_MAIN": "Principal",
-		"LABEL_ATTACHMENT_SIZE_LIMIT": "Límit de mida dels adjunts",
-		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "Permet comptes addicionals",
-		"LABEL_ALLOW_IDENTITIES": "Permet identitats múltiples",
-		"ALERT_DATA_ACCESS": "La carpeta de dades és accessible des de l’exterior. Configureu el servidor web per impedir-hi l’accés extern. Més informació:",
-		"ALERT_WARNING": "Avís!",
-		"HTML_ALERT_WEAK_PASSWORD": "Esteu utilitzant la contrasenya d’administració predeterminada.\n<br>\nPer motius de seguretat,\n<strong><a href=\"#/security\">canvieu-la</a></strong>\nara per una altra.\n"
-	},
-	"TAB_LOGIN": {
-		"LEGEND_LOGIN_SCREEN": "Pantalla d’inici de sessió",
-		"LABEL_DEFAULT_DOMAIN": "Domini predeterminat",
-		"LABEL_DETERMINE_USER_DOMAIN": "Intenta determinar el domini de l’usuari",
-		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Permet triar la llengua a la pantalla d’inici de sessió",
-		"LABEL_DETERMINE_USER_LANGUAGE": "Intenta determinar la llengua de l’usuari"
-	},
-	"TAB_BRANDING": {
-		"LEGEND_BRANDING": "Imatge de marca",
-		"LABEL_PAGE_TITLE": "Títol de la pàgina",
-		"LABEL_LOADING_DESCRIPTION": "Text durant la càrrega",
-		"LABEL_FAVICON_URL": "URL de la icona de favorits"
-	},
-	"TAB_CONTACTS": {
-		"LEGEND_CONTACTS": "Contactes",
-		"LEGEND_STORAGE": "Emmagatzematge (PDO)",
-		"LABEL_ENABLE_CONTACTS": "Activa els contactes",
-		"LABEL_ALLOW_SYNC": "Permet la sincronització dels contactes (amb el servidor extern CardDAV)",
-		"LABEL_STORAGE_TYPE": "Tipus",
-		"LABEL_STORAGE_DSN": "DSN (nom de la font de dades)",
-		"LABEL_STORAGE_USER": "Usuari",
-		"LABEL_STORAGE_PASSWORD": "Contrasenya",
-		"SQLITE_GLOBAL": "Utilitza una base de dades global en lloc d’una per compte",
-		"ALERT_NOTICE": "Atenció!",
-		"SUGGESTIONS_LIMIT": "Límit de suggeriments",
-		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "No useu aquest tipus de base de dades amb un gran nombre d’usuaris actius.",
-		"HTML_ALERT_DOES_NOT_SUPPORTED": "El sistema no admet els contactes.\n<br>\nHeu d’instal·lar o activar l’extensió <strong>PDO (SQLite / MySQL / PostgreSQL)</strong> al servidor.\n"
-	},
-	"TAB_DOMAINS": {
-		"LEGEND_DOMAINS": "Dominis",
-		"BUTTON_ADD_DOMAIN": "Afegeix un domini",
-		"BUTTON_ADD_ALIAS": "Afegeix un àlies",
-		"DELETE_ARE_YOU_SURE": "Voleu continuar?",
-		"HTML_DOMAINS_HELPER": "Llista de dominis als quals el correu web pot accedir.\n<br>\nFeu clic al nom d’un domini per configurar-lo.\n"
-	},
-	"TAB_SECURITY": {
-		"LEGEND_SECURITY": "Seguretat",
-		"LABEL_USE_IMAGE_PROXY": "Utilitza un servidor intermediari local per a les imatges externes",
-		"LABEL_AUTO_VERIFY": "Verifica les signatures automàticament",
-		"LABEL_SHOW_PHP_INFO": "Mostra la informació de PHP",
-		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Credencials d’accés al tauler d’administració",
-		"LABEL_CURRENT_PASSWORD": "Contrasenya actual",
-		"LABEL_NEW_PASSWORD": "Contrasenya nova",
-		"LABEL_REPEAT_PASSWORD": "Repetiu la contrasenya",
-		"LABEL_REQUIRE_VERIFICATION": "Exigeix la verificació del certificat SSL utilitzat (IMAP / SMTP)",
-		"CRYPTO": "Criptografia",
-		"LABEL_ALLOW_SELF_SIGNED": "Permet els certificats autosignats"
-	},
-	"TAB_PACKAGES": {
-		"LABEL_ENABLE_PLUGINS": "Activa les extensions",
-		"LEGEND_AVAILABLE_FOR_UPDATE": "Actualitzacions disponibles",
-		"LEGEND_AVAILABLE_FOR_INSTALLATION": "Extensions disponibles per instal·lar",
-		"LEGEND_INSTALLED_PACKAGES": "Paquets instal·lats",
-		"ALERT_CANNOT_ACCESS_REPOSITORY": "Ara no es pot accedir al repositori."
-	},
-	"TAB_ABOUT": {
-		"LEGEND_ABOUT": "Quant a",
-		"LABEL_TAG_HINT": "Client de correu electrònic senzill, modern i ràpid basat en la web",
-		"LABEL_ALL_RIGHTS_RESERVED": "Tots els drets reservats.",
-		"HINT_READ_CHANGE_LOG": "Llegiu el registre de canvis abans d’actualitzar.",
-		"HINT_IS_UP_TO_DATE": "SnappyMail està actualitzat.",
-		"HTML_NEW_VERSION": "Hi ha disponible una versió nova: <b>%VERSION%</b>.",
-		"LABEL_UPDATING": "S’està actualitzant…",
-		"LABEL_CHECKING": "S’està comprovant si hi ha actualitzacions…",
-		"BUTTON_RELEASES": "Versions publicades"
-	},
-	"POPUPS_DOMAIN_ALIAS": {
-		"TITLE_ADD_DOMAIN_ALIAS": "Afegeix un àlies",
-		"LABEL_ALIAS": "Àlies",
-		"LABEL_DOMAIN": "Domini"
-	},
-	"POPUPS_DOMAIN": {
-		"TITLE_ADD_DOMAIN": "Afegeix un domini",
-		"TITLE_ADD_DOMAIN_WITH_NAME": "Afegeix el domini «%NAME%»",
-		"TITLE_EDIT_DOMAIN": "Edita el domini «%NAME%»",
-		"LABEL_NAME": "Nom",
-		"NAME_HELPER": "S’admet el comodí *",
-		"LABEL_SERVER": "Servidor",
-		"LABEL_PORT": "Port",
-		"LABEL_SECURE": "Seguretat",
-		"TIMEOUT": "Temps d’espera",
-		"DISABLE_CAPABILITIES": "Desactiva capacitats",
-		"LIMITS": "Límits",
-		"FOLDERS": "Carpetes",
-		"MESSAGES": "Missatges",
-		"SECURE_OPTION_NONE": "Cap",
-		"LABEL_ALLOW_SIEVE_SCRIPTS": "Permet scripts Sieve",
-		"LABEL_USE_SHORT_LOGIN": "Utilitza el nom d’usuari sense el domini",
-		"LABEL_LOWERCASE_LOGIN": "Nom d’usuari en minúscules, sense distingir majúscules i minúscules",
-		"LABEL_USE_AUTH": "Utilitza l’autenticació",
-		"LABEL_SET_SENDER": "Utilitza el nom d’usuari com a remitent",
-		"LABEL_AUTH_PLAIN_LINE": "Força l’autenticació amb una sola ordre AUTH PLAIN",
-		"LABEL_USE_PHP_MAIL": "Utilitza la funció mail() de PHP",
-		"BUTTON_WHITE_LIST": "Usuaris permesos",
-		"NEW_DOMAIN_DESC": "Aquesta configuració de domini us permetrà treballar amb les adreces de correu de <strong>%NAME%</strong>.\n",
-		"WHITE_LIST_ALERT": "Llista d’usuaris del domini que poden accedir al correu web.\nSepareu-los amb espais.\n",
-		"VALID_SPAM_HEADERS": "Capçaleres vàlides de correu brossa",
-		"VALID_VIRUS_HEADERS": "Capçaleres vàlides de virus"
-	},
-	"POPUPS_PLUGIN": {
-		"TITLE_PLUGIN": "Extensió",
-		"DESC_NOTHING_TO_CONFIGURE": "No hi ha res per configurar."
-	},
-	"POPUPS_ASK": {
-		"DESC_WANT_CLOSE_THIS_WINDOW": "Segur que voleu tancar aquesta finestra?"
-	},
-	"POPUPS_LANGUAGES": {
-		"TITLE_LANGUAGES": "Trieu la llengua"
-	},
-	"HINTS": {
-		"BETA": "beta",
-		"WARNING": "Avís!"
-	},
-	"ERRORS": {
-		"DOMAIN_ALREADY_EXISTS": "El domini ja existeix.",
-		"UNKNOWN_ERROR": "Error desconegut"
-	},
-	"NOTIFICATIONS": {
-		"RequestError": "La sol·licitud ha fallat",
-		"RequestAborted": "S’ha cancel·lat la sol·licitud",
-		"RequestTimeout": "S’ha esgotat el temps d’espera de la sol·licitud",
-		"InvalidToken": "Testimoni no vàlid",
-		"AuthError": "Ha fallat l’autenticació",
-		"DomainAlreadyExists": "El domini ja existeix.",
-		"CantSavePluginSettings": "No es pot desar la configuració.",
-		"CantInstallPackage": "No s’ha pogut instal·lar l’extensió",
-		"CantDeletePackage": "No s’ha pogut eliminar l’extensió",
-		"InvalidPluginPackage": "Paquet d’extensió no vàlid",
-		"UnsupportedPluginPackage": "Paquet d’extensió no compatible",
-		"UnknownError": "Error desconegut"
-	}
-}
diff --git a/snappymail/v/0.0.0/app/localization/ca/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/ca/relativetimeformat.js
deleted file mode 100644
index a981c01f9..000000000
--- a/snappymail/v/0.0.0/app/localization/ca/relativetimeformat.js
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "long": {
-    "year": {
-      "past": {
-        "one": "fa {0} any",
-        "other": "fa {0} anys"
-      },
-      "future": {
-        "one": "d’aquí a {0} any",
-        "other": "d’aquí a {0} anys"
-      }
-    },
-    "month": {
-      "past": {
-        "one": "fa {0} mes",
-        "other": "fa {0} mesos"
-      },
-      "future": {
-        "one": "d’aquí a {0} mes",
-        "other": "d’aquí a {0} mesos"
-      }
-    },
-    "week": {
-      "past": {
-        "one": "fa {0} setmana",
-        "other": "fa {0} setmanes"
-      },
-      "future": {
-        "one": "d’aquí a {0} setmana",
-        "other": "d’aquí a {0} setmanes"
-      }
-    },
-    "day": {
-      "past": {
-        "one": "fa {0} dia",
-        "other": "fa {0} dies"
-      },
-      "future": {
-        "one": "d’aquí a {0} dia",
-        "other": "d’aquí a {0} dies"
-      }
-    },
-    "hour": {
-      "past": {
-        "one": "fa {0} hora",
-        "other": "fa {0} hores"
-      },
-      "future": {
-        "one": "d’aquí a {0} hora",
-        "other": "d’aquí a {0} hores"
-      }
-    },
-    "minute": {
-      "past": {
-        "one": "fa {0} minut",
-        "other": "fa {0} minuts"
-      },
-      "future": {
-        "one": "d’aquí a {0} minut",
-        "other": "d’aquí a {0} minuts"
-      }
-    },
-    "second": {
-      "past": {
-        "one": "fa {0} segon",
-        "other": "fa {0} segons"
-      },
-      "future": {
-        "one": "d’aquí a {0} segon",
-        "other": "d’aquí a {0} segons"
-      }
-    }
-  },
-  plural: n => n === 1 ? "one" : "other"
-}
diff --git a/snappymail/v/0.0.0/app/localization/ca/selector.png b/snappymail/v/0.0.0/app/localization/ca/selector.png
deleted file mode 100644
index 01bb1b564..000000000
Binary files a/snappymail/v/0.0.0/app/localization/ca/selector.png and /dev/null differ
diff --git a/snappymail/v/0.0.0/app/localization/ca/static.json b/snappymail/v/0.0.0/app/localization/ca/static.json
deleted file mode 100644
index 348cacc0e..000000000
--- a/snappymail/v/0.0.0/app/localization/ca/static.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"BACK_LINK": "Torna a carregar",
-	"NO_SCRIPT_TITLE": "Aquesta aplicació necessita JavaScript.",
-	"NO_SCRIPT_DESC": "El navegador no té activat JavaScript.\nActiveu-lo a la configuració del navegador i torneu-ho a provar.",
-	"NO_COOKIE_TITLE": "Aquesta aplicació necessita galetes.",
-	"NO_COOKIE_DESC": "El navegador no té activades les galetes.\nActiveu-les a la configuració del navegador i torneu-ho a provar.",
-	"BAD_BROWSER_TITLE": "El navegador està obsolet.",
-	"BAD_BROWSER_DESC": "Per utilitzar totes les funcions de l’aplicació,\nbaixeu i instal·leu un navegador actualitzat."
-}
diff --git a/snappymail/v/0.0.0/app/localization/ca/user.json b/snappymail/v/0.0.0/app/localization/ca/user.json
deleted file mode 100644
index 2c803dc84..000000000
--- a/snappymail/v/0.0.0/app/localization/ca/user.json
+++ /dev/null
@@ -1,647 +0,0 @@
-{
-	"LANG_DIR": "ltr",
-	"GLOBAL": {
-		"TO_ARCHIVE": "Arxiva",
-		"ARE_YOU_SURE": "Voleu continuar?",
-		"BACK": "Enrere",
-		"BCC": "C/o",
-		"CANCEL": "Cancel·la",
-		"CC": "A/c",
-		"CLEAR": "Neteja",
-		"CLOSE": "Tanca",
-		"CONTACTS": "Contactes",
-		"DELETE": "Suprimeix",
-		"UNDELETE": "Restaura",
-		"DONE": "Fet",
-		"EMAIL": "Adreça de correu",
-		"FROM": "De",
-		"LOADING": "S’està carregant…",
-		"LOGOUT": "Tanca la sessió",
-		"MORE": "Més",
-		"MOVE_TO": "Mou a",
-		"COPY_TO": "Copia a",
-		"NAME": "Nom",
-		"NONE": "Cap",
-		"TO_SPAM": "Mou els missatges al correu brossa",
-		"NOT_SPAM": "No és correu brossa",
-		"USERNAME": "Nom d’usuari",
-		"PASSWORD": "Contrasenya",
-		"REMEMBER": "Recorda",
-		"REPLY_TO": "Respon a",
-		"SAVE": "Desa",
-		"SAVE_CHANGES": "Voleu desar els canvis?",
-		"SEARCH": "Cerca",
-		"SPAM": "Correu brossa",
-		"SUBJECT": "Assumpte",
-		"TEST": "Prova",
-		"TO": "Per a",
-		"SERVER_MESSAGE": "Missatge del servidor",
-		"YES": "Sí",
-		"NO": "No",
-		"INACTIVE": "Inactiu",
-		"DEFAULT": "predeterminat",
-		"HELP": "Ajuda",
-		"TEXT": "Text",
-		"ATTACHMENTS": "Adjunts"
-	},
-	"LOGIN": {
-		"LABEL_LOGIN": "Nom d’usuari",
-		"LABEL_SIGN_ME": "Recorda’m",
-		"BUTTON_SIGN_IN": "Inicia la sessió"
-	},
-	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Afegeix un compte"
-	},
-	"SEARCH": {
-		"TITLE_ADV": "Cerca avançada",
-		"TEXT": "Text",
-		"HAS_ATTACHMENT": "Té fitxers adjunts",
-		"FLAGGED": "Destacats",
-		"UNSEEN": "No llegits",
-		"DATE": "Data",
-		"DATE_ALL": "Qualsevol data",
-		"BEFORE_3_DAYS": "De fa més de 3 dies",
-		"BEFORE_7_DAYS": "De fa més d’una setmana",
-		"BEFORE_MONTH": "De fa més d’un mes",
-		"BEFORE_3_MONTHS": "De fa més de 3 mesos",
-		"BEFORE_6_MONTHS": "De fa més de 6 mesos",
-		"BEFORE_YEAR": "De fa més d’un any",
-		"SINCE_3_DAYS": "Antiguitat de fins a 3 dies",
-		"SINCE_7_DAYS": "Antiguitat de fins a 1 setmana",
-		"SINCE_MONTH": "Antiguitat de fins a 1 mes",
-		"SINCE_3_MONTHS": "Antiguitat de fins a 3 mesos",
-		"SINCE_6_MONTHS": "Antiguitat de fins a 6 mesos",
-		"SINCE_YEAR": "Antiguitat de fins a 1 any",
-		"SUBFOLDERS": "Subcarpetes",
-		"SUBFOLDERS_NONE": "Cap",
-		"SUBFOLDERS_SUBTREE": "Totes",
-		"SUBFOLDERS_SUBTREE_ONE": "Un nivell",
-		"REPLIED": "Respostos",
-		"KEYWORD": "Etiqueta"
-	},
-	"FOLDER_LIST": {
-		"BUTTON_COMPOSE": "Escriu",
-		"BUTTON_NEW_MESSAGE": "Missatge nou",
-		"INBOX_NAME": "Bústia d’entrada",
-		"SENT_NAME": "Enviats",
-		"DRAFTS_NAME": "Esborranys",
-		"TRASH_NAME": "Paperera",
-		"ARCHIVE_NAME": "Arxiu"
-	},
-	"IMAP": {
-		"ACL_RIGHTS": "Permisos",
-		"ACL_A": "Administra",
-		"ACL_E": "Elimina definitivament",
-		"ACL_I": "Insereix missatges",
-		"ACL_K": "Crea subcarpetes",
-		"ACL_L": "Mostra els missatges",
-		"ACL_P": "Envia correu",
-		"ACL_R": "Selecciona una carpeta",
-		"ACL_S": "Etiqueta \\SEEN",
-		"ACL_T": "Etiqueta \\DELETED",
-		"ACL_W": "Altres etiquetes",
-		"ACL_X": "Elimina o canvia el nom de la carpeta"
-	},
-	"MESSAGE_LIST": {
-		"BUTTON_RELOAD": "Torna a carregar la llista de missatges",
-		"BUTTON_EMPTY_FOLDER": "Buida la carpeta",
-		"BUTTON_MULTY_FORWARD": "Reenvia com a fitxers adjunts",
-		"BUTTON_DELETE_WITHOUT_MOVE": "Suprimeix definitivament",
-		"MENU_SET_SEEN": "Marca com a llegit",
-		"MENU_SET_ALL_SEEN": "Marca’ls tots com a llegits",
-		"MENU_UNSET_SEEN": "Marca com a no llegit",
-		"MENU_SET_FLAG": "Destaca",
-		"MENU_UNSET_FLAG": "Deixa de destacar",
-		"MENU_SELECT_ALL": "Selecciona-ho tot",
-		"MENU_SELECT_INVERT": "Inverteix la selecció",
-		"MENU_SELECT_UNSEEN": "No llegits",
-		"MENU_SELECT_SEEN": "Llegits",
-		"MENU_SELECT_FLAGGED": "Destacats",
-		"MENU_SELECT_UNFLAGGED": "Sense destacar",
-		"DOWNLOAD_ALL_ATTACHMENTS": "Baixa tots els fitxers adjunts",
-		"EMPTY_LIST": "No hi ha missatges.",
-		"EMPTY_SEARCH_LIST": "Cap missatge coincideix amb la cerca.",
-		"SEARCH_RESULT_FOR": "Resultats de la cerca de «%SEARCH%»",
-		"BACK_TO_MESSAGE_LIST": "Torna a la llista de missatges",
-		"PUT_MESSAGE_HERE": "Deixeu anar el missatge aquí per veure’l a la llista.",
-		"TODAY_AT": "avui a les %TIME%",
-		"YESTERDAY_AT": "ahir a les %TIME%",
-		"NEW_MESSAGE_NOTIFICATION": "Teniu %COUNT% missatges nous.",
-		"QUOTA_SIZE": "S’utilitzen <strong>%SIZE% (%PROC%%)</strong> de <strong>%LIMIT%</strong>",
-		"SORT": "Ordena",
-		"NO_SORT": "El servidor de correu no permet ordenar els missatges",
-		"SORT_ARRIVAL_ASC": "Data de recepció ascendent",
-		"SORT_ARRIVAL_DESC": "Data de recepció descendent",
-		"SORT_DATE_ASC": "Data ascendent",
-		"SORT_DATE_DESC": "Data descendent",
-		"SORT_SIZE_ASC": "Mida ascendent",
-		"SORT_SIZE_DESC": "Mida descendent",
-		"SORT_SUBJECT_ASC": "Assumpte A–Z",
-		"SORT_SUBJECT_DESC": "Assumpte Z–A",
-		"SORT_FROM_ASC": "Remitent A–Z",
-		"SORT_FROM_DESC": "Remitent Z–A"
-	},
-	"MESSAGE": {
-		"BUTTON_EDIT": "Edita",
-		"BUTTON_UNSUBSCRIBE": "Cancel·la la subscripció a la llista",
-		"BUTTON_REPLY": "Respon",
-		"BUTTON_REPLY_ALL": "Respon a tothom",
-		"BUTTON_FORWARD": "Reenvia",
-		"BUTTON_FORWARD_AS_ATTACHMENT": "Reenvia com a fitxer adjunt",
-		"BUTTON_EDIT_AS_NEW": "Edita com a missatge nou",
-		"BUTTON_SHOW_IMAGES": "Mostra les imatges externes",
-		"BUTTON_NOTIFY_READ_RECEIPT": "El remitent ha demanat rebre una notificació quan llegiu aquest missatge.",
-		"BUTTON_IN_NEW_WINDOW": "Mostra en una finestra separada",
-		"BUTTON_THREAD_LIST": "Llista de missatges de la conversa",
-		"BUTTON_THREAD_PREV": "Anterior",
-		"BUTTON_THREAD_NEXT": "Següent",
-		"BUTTON_THREAD_MORE": "Més missatges",
-		"MENU_HEADERS": "Mostra les capçaleres del missatge",
-		"MENU_VIEW_ORIGINAL": "Mostra el codi font",
-		"HTML_VIEW": "Mostra el missatge en HTML",
-		"PLAIN_VIEW": "Mostra el missatge en text sense format",
-		"SWAP_COLORS": "Intercanvia el color de fons predeterminat",
-		"MENU_DOWNLOAD_ORIGINAL": "Baixa com a fitxer .eml",
-		"MENU_FILTER_SIMILAR": "Filtra missatges semblants",
-		"MENU_PRINT": "Imprimeix",
-		"EMPTY_SUBJECT_TEXT": "(Sense assumpte)",
-		"LABEL_DATE": "Data",
-		"LABEL_FROM_SHORT": "de",
-		"LABEL_TO_SHORT": "per a",
-		"PRINT_LABEL_ATTACHMENTS": "Adjunts",
-		"MESSAGE_VIEW_DESC": "Seleccioneu qualsevol missatge de la llista per veure’l aquí.",
-		"MESSAGE_VIEW_MOVE_DESC": "Feu clic al nom de la carpeta del tauler de l’esquerra per seleccionar la destinació.",
-		"LINK_DOWNLOAD_AS_ZIP": "Baixa en format ZIP",
-		"SPAM_SCORE": "Puntuació de correu brossa",
-		"HAS_VIRUS_WARNING": "AVÍS: s’ha detectat un virus",
-		"TAGS": "Etiquetes",
-		"NEW_TAG": "Etiqueta nova",
-		"ENABLE_TRACKING_LINKS": "Activa els enllaços de seguiment",
-		"TRACKING_ENABLED": "Ara es farà el seguiment dels enllaços quan hi feu clic."
-	},
-	"MESSAGE_TAGS": {
-		"$important": "Important",
-		"$todo": "Per fer",
-		"$label1": "Important",
-		"$label2": "Feina",
-		"$label3": "Personal",
-		"$label4": "Per fer",
-		"$label5": "Més endavant"
-	},
-	"READ_RECEIPT": {
-		"SUBJECT": "Confirmació de lectura (missatge mostrat) - %SUBJECT%",
-		"BODY": "Aquesta és una confirmació de lectura del missatge que vau enviar a %READ-RECEIPT%.\n\nNota: aquesta confirmació només indica que el missatge s’ha mostrat a l’ordinador del destinatari.\nNo garanteix que el destinatari hagi llegit o entès el contingut del missatge.\n"
-	},
-	"SUGGESTIONS": {
-		"SEARCHING_DESC": "S’està cercant…"
-	},
-	"CONTACTS": {
-		"TAB_CONTACT": "Contacte",
-		"TAB_LOCATIONS": "Ubicacions",
-		"TAB_BUSINESS": "Feina",
-		"LABEL_ORGANIZATION": "Organització",
-		"LABEL_DEPARTMENT": "Departament",
-		"LABEL_TITLE": "Càrrec",
-		"TAB_CRYPTO": "Criptografia",
-		"ASK": "Pregunta",
-		"NEVER": "Mai",
-		"ALWAYS": "Sempre",
-		"ALWAYS_IF_POSSIBLE": "Sempre que sigui possible",
-		"BUTTON_ADD_CONTACT": "Afegeix un contacte",
-		"BUTTON_CREATE_CONTACT": "Crea",
-		"BUTTON_IMPORT": "Importa (csv, vcf, vCard)",
-		"BUTTON_EXPORT_VCARD": "Exporta (vcf, vCard)",
-		"BUTTON_EXPORT_CSV": "Exporta (csv)",
-		"ERROR_IMPORT_FILE": "Error d’importació (format de fitxer no vàlid)",
-		"EMPTY_LIST": "Aquí no hi ha cap contacte",
-		"EMPTY_SEARCH": "No s’ha trobat cap contacte",
-		"CLEAR_SEARCH": "Neteja la cerca",
-		"CONTACT_VIEW_DESC": "Seleccioneu un contacte de la llista per veure’l aquí.",
-		"LABEL_BIRTHDAY": "Data de naixement",
-		"DISPLAY_NAME": "Nom per mostrar",
-		"LAST_NAME": "Cognoms",
-		"FIRST_NAME": "Nom",
-		"MIDDLE_NAME": "Segon nom",
-		"NAME_PREFIX": "Prefix del nom",
-		"NAME_SUFFIX": "Sufix del nom",
-		"NICK_NAME": "Àlies",
-		"LABEL_READ_ONLY": "Només de lectura",
-		"ADD_MENU_LABEL": "Afegeix",
-		"ADD_MENU_NICKNAME": "Àlies",
-		"ADD_MENU_NOTE": "Nota",
-		"ADD_MENU_PHONE": "Telèfon",
-		"ADD_MENU_URL": "URL",
-		"ADD_MENU_ADDRESS": "Adreça",
-		"ADD_MENU_BIRTHDAY": "Data de naixement",
-		"ADD_MENU_TAGS": "Etiquetes",
-		"BUTTON_SHARE_ALL": "Tothom",
-		"BUTTON_SYNC": "Sincronització (CardDAV)",
-		"SEND_TO_ALL_CONTACT_EMAILS": "Envia a totes les adreces del contacte"
-	},
-	"COMPOSE": {
-		"LINK_SHOW_INPUTS": "Mostra tots els camps",
-		"BUTTON_SEND": "Envia",
-		"BUTTON_MINIMIZE": "Minimitza",
-		"SAVED_TIME": "Desat a les %TIME%",
-		"SAVED_ERROR_ON_SEND": "El missatge s’ha enviat, però no s’ha desat a la carpeta de missatges enviats.",
-		"DISCARD_UNSAVED_DATA": "Voleu descartar les dades no desades?",
-		"ATTACH_FILES": "Adjunta fitxers",
-		"ATTACH_DROP_FILES_DESC": "Deixeu anar fitxers aquí",
-		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% va escriure",
-		"FORWARD_MESSAGE_TOP_TITLE": "-------- Missatge reenviat -------",
-		"FORWARD_MESSAGE_TOP_SENT": "Enviat",
-		"EMPTY_TO_ERROR_DESC": "Indiqueu almenys un destinatari.",
-		"NO_ATTACHMENTS_HERE_DESC": "No hi ha cap fitxer adjunt.",
-		"ATTACHMENTS_ERROR_DESC": "No s’han pogut pujar tots els fitxers adjunts.",
-		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Encara s’estan pujant fitxers adjunts.",
-		"ALLOW_SPELLCHECK": "Activa el corrector ortogràfic del navegador",
-		"ALLOW_DRAFT_AUTOSAVE": "Desa l’esborrany automàticament",
-		"BUTTON_REQUEST_READ_RECEIPT": "Demana una confirmació de lectura",
-		"BUTTON_MARK_AS_IMPORTANT": "Marca com a important",
-		"BUTTON_REQUEST_DSN": "Demana una confirmació de lliurament",
-		"BUTTON_REQUIRE_TLS": "Exigeix un lliurament segur",
-		"ERROR_EMPTY_BODY": "El cos del missatge és buit"
-	},
-	"POPUPS_ASK": {
-		"EXIT_ARE_YOU_SURE": "Segur que voleu sortir?",
-		"DESC_WANT_CLOSE_THIS_WINDOW": "Segur que voleu tancar aquesta finestra?",
-		"DESC_WANT_DELETE_MESSAGES": "Segur que voleu suprimir els missatges?"
-	},
-	"POPUPS_LANGUAGES": {
-		"TITLE_LANGUAGES": "Trieu la llengua"
-	},
-	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Afegeix un compte",
-		"BUTTON_ADD_ACCOUNT": "Afegeix-lo",
-		"TITLE_UPDATE_ACCOUNT": "Actualitza el compte"
-	},
-	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Afegeix una identitat",
-		"TITLE_UPDATE_IDENTITY": "Actualitza la identitat",
-		"LABEL": "Etiqueta",
-		"BUTTON_ADD_IDENTITY": "Afegeix-la",
-		"SIGNATURE": "Signatura",
-		"LABEL_SIGNATURE_INSERT_BEFORE": "Insereix aquesta signatura abans del text citat en les respostes."
-	},
-	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Crea una carpeta",
-		"LABEL_PARENT": "Carpeta superior",
-		"BUTTON_CREATE": "Crea-la",
-		"TITLE_CREATING_PROCESS": "S’està creant la carpeta…"
-	},
-	"POPUPS_CLEAR_FOLDER": {
-		"TITLE_CLEAR_FOLDER": "Voleu suprimir tots els missatges de la carpeta?",
-		"DANGER_DESC_WARNING": "Avís",
-		"DANGER_DESC_HTML_1": "Aquesta acció suprimirà definitivament tots els missatges de la carpeta <strong>%FOLDER%</strong>.",
-		"DANGER_DESC_HTML_2": "Un cop iniciat, el procés no es pot aturar ni cancel·lar.",
-		"TITLE_CLEARING_PROCESS": "S’està buidant la carpeta…"
-	},
-	"CRYPTO": {
-		"SIGN": "Signa",
-		"ENCRYPT": "Xifra",
-		"DECRYPT": "Desxifra",
-		"VERIFY": "Verifica",
-		"GOOD_SIGNATURE": "Signatura vàlida de %USER%",
-		"ERROR": "Error de %TYPE%: %ERROR%",
-		"CREATE_SELF_SIGNED": "Crea un certificat autosignat",
-		"VALID_UNTIL": "Vàlid fins al",
-		"PRIVATE_KEY": "Clau privada",
-		"CHANGE_PASS": "Canvia la contrasenya",
-		"CURRENT_PASS": "Contrasenya actual",
-		"NEW_PASS": "Contrasenya nova",
-		"ASK_CRYPTKEY_PASS": "La contrasenya d’accés ha canviat. Introduïu la contrasenya anterior per desxifrar les dades."
-	},
-	"OPENPGP": {
-		"POPUP_IMPORT_TITLE": "Importa una clau OpenPGP",
-		"POPUP_IMPORT_BUTTON": "Importa-la",
-		"POPUP_VIEW_TITLE": "Mostra una clau OpenPGP",
-		"POPUP_VIEW_BUTTON": "Selecciona",
-		"POPUP_GENERATE_TITLE": "Genera un parell de claus OpenPGP",
-		"POPUP_GENERATE_BUTTON": "Genera",
-		"LABEL_KEY_TYPE": "Tipus",
-		"SIGNED_MESSAGE": "Missatge signat amb OpenPGP",
-		"ENCRYPTED_MESSAGE": "Missatge xifrat amb OpenPGP",
-		"STORE_IN_GNUPG": "Desa al servidor amb GnuPG",
-		"STORE_PUBLIC_KEY_IN_GNUPG": "Desa la clau pública al servidor amb GnuPG",
-		"STORE_PRIVATE_KEY_IN_GNUPG": "Desa la clau privada al servidor amb GnuPG",
-		"BACKUP_ON_SERVER": "Desa al servidor amb xifratge",
-		"BACKUP_PUBLIC_KEY_ON_SERVER": "Desa una còpia de la clau pública al servidor",
-		"BACKUP_PRIVATE_KEY_ON_SERVER": "Desa una còpia de la clau privada al servidor"
-	},
-	"SMIME": {
-		"POPUP_IMPORT_TITLE": "Importa un certificat S/MIME",
-		"CERTIFICATE": "Certificat",
-		"CERTIFICATES": "Certificats S/MIME",
-		"SIGNED_MESSAGE": "Missatge signat amb S/MIME",
-		"ENCRYPTED_MESSAGE": "Missatge xifrat amb S/MIME",
-		"PRIVATE_KEY_OF": "Clau privada S/MIME de %EMAIL%"
-	},
-	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Crea un filtre",
-		"TITLE_EDIT_FILTER": "Edita el filtre",
-		"LEGEND_CONDITIONS": "Condicions",
-		"LEGEND_ACTIONS": "Accions",
-		"BUTTON_ADD_CONDITION": "Afegeix-hi una condició",
-		"SELECT_ACTION_MOVE_TO": "Mou a",
-		"SELECT_ACTION_FORWARD_TO": "Reenvia a",
-		"SELECT_ACTION_REJECT": "Rebutja",
-		"SELECT_ACTION_VACATION_MESSAGE": "Missatge de vacances",
-		"SELECT_ACTION_DISCARD": "Descarta-ho",
-		"SELECT_FIELD_RECIPIENTS": "Destinataris (Per a o A/c)",
-		"SELECT_FIELD_HEADER": "Capçalera",
-		"SELECT_FIELD_BODY": "Cos",
-		"SELECT_FIELD_SIZE": "Mida",
-		"SELECT_TYPE_CONTAINS": "Conté",
-		"SELECT_TYPE_NOT_CONTAINS": "No conté",
-		"SELECT_TYPE_MATCHES": "Coincideix amb (s’admeten * i ?)",
-		"SELECT_TYPE_NOT_MATCHES": "No coincideix amb (s’admeten * i ?)",
-		"SELECT_TYPE_REGEXP": "Expressió regular",
-		"SELECT_TYPE_NOT_REGEXP": "No coincideix amb l’expressió regular",
-		"SELECT_TYPE_EQUAL_TO": "Igual a",
-		"SELECT_TYPE_NOT_EQUAL_TO": "No igual a",
-		"SELECT_TYPE_OVER": "Més gran que",
-		"SELECT_TYPE_UNDER": "Més petit que",
-		"SELECT_TYPE_TEXT": "Text",
-		"SELECT_TYPE_RAW": "Sense processar",
-		"SELECT_MATCH_ANY": "Coincideix amb QUALSEVOL de les regles següents",
-		"SELECT_MATCH_ALL": "Coincideix amb TOTES les regles següents",
-		"MARK_AS_READ_LABEL": "Marca com a llegit",
-		"REPLY_INTERVAL_LABEL": "Interval de resposta (dies)",
-		"KEEP_LABEL": "Mantén-ho",
-		"STOP_LABEL": "Atura el processament de les regles següents",
-		"VACATION_SUBJECT_LABEL": "Assumpte (opcional)",
-		"VACATION_MESSAGE_LABEL": "Missatge",
-		"VACATION_RECIPIENTS_LABEL": "Destinataris (separats per comes)",
-		"REJECT_MESSAGE_LABEL": "Missatge de rebuig",
-		"ALL_INCOMING_MESSAGES_DESC": "Tots els missatges d’entrada"
-	},
-	"POPUPS_SIEVE_SCRIPT": {
-		"TITLE_CREATE": "Crea un script",
-		"TITLE_EDIT": "Edita l’script",
-		"BUTTON_ADD_FILTER": "Afegeix-hi un filtre",
-		"BUTTON_RAW_SCRIPT": "Utilitza un script d’usuari personalitzat",
-		"CAPABILITY_LABEL": "Capacitats",
-		"CHANGES_NEED_TO_BE_SAVED_DESC": "Cal desar aquests canvis al servidor."
-	},
-	"POPUPS_SYSTEM_FOLDERS": {
-		"TITLE_SYSTEM_FOLDERS": "Seleccioneu carpetes del sistema",
-		"SELECT_CHOOSE_ONE": "Trieu-ne una",
-		"SELECT_UNUSE_NAME": "No l’utilitzis",
-		"NOTIFICATION_SENT": "No heu seleccionat la carpeta del sistema «Enviats», on es desen els missatges enviats.\nSi no els voleu desar, seleccioneu l’opció «No l’utilitzis».\n",
-		"NOTIFICATION_DRAFTS": "No heu seleccionat la carpeta del sistema «Esborranys», on es desen els missatges mentre els redacteu.",
-		"NOTIFICATION_SPAM": "No heu seleccionat la carpeta del sistema «Correu brossa», on es mouen els missatges marcats com a correu brossa.\nSi els voleu suprimir definitivament, seleccioneu l’opció «No l’utilitzis».\n",
-		"NOTIFICATION_TRASH": "No heu seleccionat la carpeta del sistema «Paperera», on es mouen els missatges suprimits.\nSi els voleu suprimir definitivament, seleccioneu l’opció «No l’utilitzis».\n",
-		"NOTIFICATION_ARCHIVE": "No heu seleccionat la carpeta del sistema «Arxiu», on es desen els missatges arxivats."
-	},
-	"TITLES": {
-		"MAILBOX": "Bústia de correu",
-		"SETTINGS": "Configuració"
-	},
-	"UPLOAD": {
-		"ERROR_FILE_IS_TOO_BIG": "El fitxer és massa gran",
-		"ERROR_FILE_PARTIALLY_UPLOADED": "El fitxer només s’ha carregat parcialment a causa d’un error desconegut",
-		"ERROR_NO_FILE_UPLOADED": "No s’ha carregat cap fitxer",
-		"ERROR_MISSING_TEMP_FOLDER": "Manca el fitxer temporal",
-		"ERROR_ON_SAVING_FILE": "S’ha produït un error en desar el fitxer.",
-		"ERROR_FILE_TYPE": "Tipus de fitxer no vàlid",
-		"ERROR_UNKNOWN": "S’ha produït un error desconegut en pujar el fitxer."
-	},
-	"EDITOR": {
-		"PLAIN": "HTML <-> TEXT",
-		"SOURCE": "HTML <-> CODI FONT",
-		"FONTFAMILY": "Tipus de lletra",
-		"FONTSIZE": "Mida de la lletra",
-		"DIR": "Direcció del text",
-		"DIR_LTR": "D’esquerra a dreta",
-		"DIR_RTL": "De dreta a esquerra",
-		"DIR_AUTO": "Automàtica",
-		"TEXTCOLOR": "Color del text",
-		"BACKGROUNDCOLOR": "Color de fons",
-		"BOLD": "Negreta",
-		"ITALIC": "Cursiva",
-		"UNDERLINE": "Subratllat",
-		"STRIKE": "Ratllat",
-		"SUB": "Subíndex",
-		"SUP": "Superíndex",
-		"OL": "Llista numerada",
-		"UL": "Llista amb pics",
-		"QUOTE": "Citació",
-		"INDENTDECREASE": "Disminueix el sagnat",
-		"INDENTINCREASE": "Augmenta el sagnat",
-		"LINK": "Enllaç",
-		"IMAGEURL": "URL de la imatge",
-		"IMAGEUPLOAD": "Selecciona una imatge",
-		"UNDO": "Desfés",
-		"REDO": "Refés",
-		"REMOVESTYLE": "Elimina el format"
-	},
-	"SETTINGS_LABELS": {
-		"GENERAL": "General",
-		"CONTACTS": "Contactes",
-		"FOLDERS": "Carpetes",
-		"ACCOUNTS": "Comptes",
-		"FILTERS": "Filtres",
-		"SECURITY": "Seguretat",
-		"THEMES": "Temes"
-	},
-	"SETTINGS_FILTERS": {
-		"SIMPLE": "Simple",
-		"ADVANCED": "Avançat",
-		"BUTTON_ADD_SCRIPT": "Afegeix un script",
-		"SUBNAME_MOVE_TO": "Mou a «%FOLDER%»",
-		"SUBNAME_FORWARD_TO": "Reenvia a «%EMAIL%»",
-		"SUBNAME_REJECT": "Rebutja",
-		"SUBNAME_VACATION_MESSAGE": "Missatge de vacances",
-		"SUBNAME_DISCARD": "Descarta-ho"
-	},
-	"SETTINGS_SECURITY": {
-		"LEGEND_SECURITY": "Seguretat",
-		"LABEL_AUTOLOGOUT": "Tancament automàtic de sessió",
-		"FORGET_KEY_PASS": "Oblida la contrasenya de la clau privada",
-		"NEVER": "Mai"
-	},
-	"SETTINGS_GENERAL": {
-		"LANGUAGE": "Llengua",
-		"HOUR_FORMAT": "Format de l’hora",
-		"IDENTITY": "Identitat",
-		"LAYOUT": "Disposició",
-		"LAYOUT_NO_SPLIT": "Sense divisió",
-		"LAYOUT_VERTICAL_SPLIT": "Divisió vertical",
-		"LAYOUT_HORIZONTAL_SPLIT": "Divisió horitzontal",
-		"SHOW_NEXT_MESSAGE": "Mostra el missatge següent en moure o eliminar el missatge actual",
-		"EDITOR": "Editor de text predeterminat",
-		"EDITOR_HTML": "HTML",
-		"EDITOR_PLAIN": "Text sense format",
-		"VIEW_OPTIONS": "Opcions de visualització",
-		"USE_PREVIEW_PANE": "Utilitza la subfinestra de previsualització",
-		"HIDE_DELETED_MESSAGES": "Amaga els missatges marcats per eliminar",
-		"USE_CHECKBOXES_IN_LIST": "Mostra les caselles a la llista",
-		"USE_THREADS": "Agrupa els missatges en converses",
-		"THREAD_ALGORITHM": "Algorisme d’agrupació de converses",
-		"REPLY_SAME_FOLDER": "Desa les respostes a la carpeta del missatge al qual es respon",
-		"PREFER_HTML": "Prefereix HTML al text sense format",
-		"PREFER_HTML_INFO": "De vegades els missatges inclouen tots dos formats. Aquesta opció permet triar si es mostra la part HTML o la part de text sense format.",
-		"REMOVE_COLORS": "Elimina els colors de fons i del text del cos del missatge",
-		"ALLOW_STYLES": "Permet CSS amb <style>",
-		"MESSAGE_PER_PAGE": "Missatges per pàgina",
-		"CHECK_MAIL_INTERVAL": "Interval de comprovació del correu",
-		"MARK_MESSAGE_READ_AFTER": "Marca el missatge com a llegit després de",
-		"MSG_DEFAULT_ACTION": "Acció predeterminada",
-		"SECONDS": "segons",
-		"MINUTES": "minuts",
-		"NOTIFICATIONS": "Notificacions",
-		"SOUND_NOTIFICATION": "Notificació acústica",
-		"CHROME_NOTIFICATION_DESC": "Mostra notificacions emergents per als missatges nous",
-		"CHROME_NOTIFICATION_DESC_DENIED": "(El navegador les ha bloquejades)",
-		"COLLAPSE_BLOCKQUOTES": "Replega el text citat",
-		"MAX_QUOTE_LEVEL": "Nombre màxim de nivells visibles de text citat",
-		"LIST_INLINE_ATTACHMENTS": "Mostra a la llista els fitxers adjunts inserits al missatge",
-		"LIST_SIMPLE_ATTACHMENTS": "Llista simple de fitxers adjunts",
-		"LIST_MESSAGES_GROUPED": "Agrupa els missatges de la llista en ordenar per data o remitent",
-		"EXTERNAL_IMAGES": "Imatges externes",
-		"IMAGES_OPTION_ASK": "Pregunta sempre",
-		"IMAGES_OPTION_WHITELIST": "Permet les adreces de confiança; pregunta en els altres casos",
-		"IMAGES_OPTION_ALWAYS": "Mostra sempre",
-		"IMAGES_WHITELIST": "Adreces de confiança per mostrar imatges",
-		"MESSAGE_POPUP_WINDOW": "Obre les finestres emergents en una finestra nova en lloc d’una pestanya",
-		"MAILTO": "Registra com a gestor d’enllaços «mailto:»",
-		"HTML_TO_MD": "Converteix l’HTML a Markdown en lloc de text sense format"
-	},
-	"SETTINGS_CONTACTS": {
-		"LABEL_CONTACTS_AUTOSAVE": "Afegeix els destinataris a la llibreta d’adreces automàticament",
-		"LEGEND_CONTACTS_SYNC": "Sincronització remota (CardDAV)",
-		"LABEL_CONTACTS_SYNC_ENABLE": "Activa la sincronització remota",
-		"LABEL_CONTACTS_SYNC_SERVER": "Servidor",
-		"LABEL_CONTACTS_SYNC_AB_URL": "URL de la llibreta d’adreces",
-		"LABEL_CONTACTS_SYNC_USER": "Usuari",
-		"SYNC_READ": "Només de lectura"
-	},
-	"SETTINGS_THEMES": {
-		"LEGEND_THEMES": "Temes",
-		"LABEL_BACKGROUND": "Fons",
-		"LABEL_FONTS": "Tipus de lletra",
-		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Puja una imatge de fons (JPG, PNG)",
-		"ERROR_FILE_IS_TOO_BIG": "El fitxer és massa gran",
-		"ERROR_FILE_TYPE_ERROR": "Tipus de fitxer no vàlid (només JPG i PNG)",
-		"ERROR_UNKNOWN": "S’ha produït un error desconegut en pujar el fitxer."
-	},
-	"SETTINGS_FOLDERS": {
-		"LEGEND_FOLDERS": "Llista de carpetes",
-		"BUTTON_CREATE": "Crea una carpeta",
-		"BUTTON_SYSTEM": "Carpetes del sistema",
-		"BUTTON_SUBSCRIBE": "Subscriu-te a la carpeta",
-		"BUTTON_UNSUBSCRIBE": "Cancel·la la subscripció a la carpeta",
-		"LOADING_PROCESS": "S’està actualitzant la llista de carpetes…",
-		"CREATING_PROCESS": "S’està creant la carpeta…",
-		"DELETING_PROCESS": "S’està suprimint la carpeta…",
-		"RENAMING_PROCESS": "S’està canviant el nom de la carpeta…",
-		"TO_MANY_FOLDERS_DESC_1": "Teniu massa carpetes.",
-		"TO_MANY_FOLDERS_DESC_2": "Només n’hem mostrat una part per evitar problemes de rendiment.",
-		"HELP_DELETE_FOLDER": "Suprimeix la carpeta",
-		"HELP_SHOW_HIDE_FOLDER": "Mostra o amaga la carpeta",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Activa o desactiva la comprovació de missatges nous",
-		"HIDE_UNSUBSCRIBED": "Amaga les carpetes sense subscripció",
-		"UNHIDE_KOLAB_FOLDERS": "Mostra les carpetes Kolab ocultes",
-		"TYPE_CALENDAR": "Calendari",
-		"TYPE_CONFIGURATION": "Configuració",
-		"TYPE_CONTACTS": "Contactes",
-		"TYPE_FILES": "Fitxers",
-		"TYPE_JOURNAL": "Diari",
-		"TYPE_NOTES": "Notes",
-		"TYPE_TASKS": "Tasques"
-	},
-	"SETTINGS_ACCOUNTS": {
-		"LEGEND_ACCOUNTS": "Comptes",
-		"LEGEND_IDENTITIES": "Identitats",
-		"LEGEND_ACCOUNTS_AND_IDENTITIES": "Comptes i identitats",
-		"BUTTON_ADD_ACCOUNT": "Afegeix un compte",
-		"BUTTON_ADD_IDENTITY": "Afegeix una identitat",
-		"LOADING_PROCESS": "S’està actualitzant…",
-		"SHOW_UNREAD": "Mostra el nombre de missatges no llegits"
-	},
-	"SETTINGS_OPENPGP": {
-		"BUTTON_IMPORT_KEY": "Importa una clau",
-		"BUTTON_GENERATE_KEY_PAIR": "Genera un parell de claus",
-		"IMPORT_FROM_SERVER": "Importa del servidor",
-		"TITLE_PRIVATE": "Privat",
-		"TITLE_PUBLIC": "Públic",
-		"GET_MAILVELOPE": "Obteniu l’extensió Mailvelope per al navegador."
-	},
-	"SHORTCUTS_HELP": {
-		"LEGEND_SHORTCUTS_HELP": "Ajuda per a les dreceres de teclat",
-		"TAB_MAILBOX": "Bústia de correu",
-		"TAB_MESSAGE_LIST": "Llista de missatges",
-		"TAB_MESSAGE_VIEW": "Vista de missatges",
-		"TAB_COMPOSE": "Escriu",
-		"LABEL_OPEN_USER_DROPDOWN": "Obre el desplegable d’usuaris",
-		"LABEL_REPLY": "Respon",
-		"LABEL_REPLY_ALL": "Respon a tothom",
-		"LABEL_FORWARD": "Reenvia",
-		"LABEL_FORWARD_MULTIPLY": "Reenvia com a fitxers adjunts",
-		"LABEL_CHECK_ALL": "Selecciona tots els missatges",
-		"LABEL_DELETE": "Suprimeix",
-		"LABEL_OPEN_THREAD": "Obre la conversa seleccionada",
-		"LABEL_MOVE": "Mou",
-		"LABEL_READ": "Marca els missatges seleccionats com a llegits",
-		"LABEL_UNREAD": "Marca els missatges seleccionats com a no llegits",
-		"LABEL_IMPORTANT": "Destaca els missatges seleccionats",
-		"LABEL_CANCEL_SEARCH": "Cancel·la la cerca",
-		"LABEL_FULLSCREEN_ENTER": "Pantalla completa (disposició de previsualització)",
-		"LABEL_VIEW_MESSAGE_ENTER": "Mostra el missatge (sense disposició de previsualització)",
-		"LABEL_SWITCH_TO_MESSAGE": "Canvia el focus al missatge seleccionat",
-		"LABEL_SWITCH_TO_FOLDER_LIST": "Canvia el focus a la llista de carpetes",
-		"LABEL_FULLSCREEN_TOGGLE": "Commuta el mode de pantalla completa",
-		"LABEL_BLOCKQUOTES_TOGGLE": "Mostra o amaga el text citat dels missatges",
-		"LABEL_THREAD_NEXT": "Missatge següent de la conversa",
-		"LABEL_THREAD_PREV": "Missatge anterior de la conversa",
-		"LABEL_EXIT_FULLSCREEN": "Surt del mode de pantalla completa",
-		"LABEL_CLOSE_MESSAGE": "Tanca el missatge (sense disposició de previsualització)",
-		"LABEL_SWITCH_TO_LIST": "Torna el focus a la llista de missatges",
-		"LABEL_OPEN_COMPOSE_POPUP": "Obre la finestra de redacció",
-		"LABEL_MINIMIZE_COMPOSE_POPUP": "Minimitza la finestra de redacció",
-		"LABEL_OPEN_IDENTITIES_DROPDOWN": "Obre el desplegable d’identitats",
-		"LABEL_SAVE_MESSAGE": "Desa el missatge",
-		"LABEL_SEND_MESSAGE": "Envia el missatge",
-		"LABEL_CLOSE_COMPOSE": "Tanca la finestra de redacció"
-	},
-	"NOTIFICATIONS": {
-		"RequestError": "La sol·licitud ha fallat",
-		"RequestAborted": "S’ha cancel·lat la sol·licitud",
-		"RequestTimeout": "S’ha esgotat el temps d’espera de la sol·licitud",
-		"InvalidToken": "Testimoni no vàlid",
-		"AuthError": "Ha fallat l’autenticació",
-		"ConnectionError": "No es pot connectar amb el servidor.",
-		"DomainAlreadyExists": "El domini ja existeix.",
-		"DomainNotAllowed": "El domini no es permet.",
-		"AccountNotAllowed": "El compte no es permet.",
-		"CryptKeyError": "La contrasenya d’accés ha canviat",
-		"ContactsSyncError": "Error de sincronització dels contactes",
-		"CantGetMessageList": "No es pot obtenir la llista de missatges.",
-		"CantGetMessage": "No es pot obtenir el missatge.",
-		"CantDeleteMessage": "No es pot suprimir el missatge.",
-		"CantCopyMessage": "No s’ha pogut copiar el missatge",
-		"CantMoveMessage": "No es pot moure el missatge.",
-		"CantSaveMessage": "No es pot desar el missatge.",
-		"CantSendMessage": "No es pot enviar el missatge.",
-		"InvalidRecipients": "Destinataris no vàlids",
-		"CantSaveFilters": "No es poden desar els filtres.",
-		"CantGetFilters": "No es poden obtenir els filtres.",
-		"CantActivateFiltersScript": "No s’ha pogut activar l’script de filtres",
-		"CantDeleteFiltersScript": "No s’ha pogut eliminar l’script de filtres",
-		"FiltersAreNotCorrect": "Els filtres no són correctes.",
-		"CantCreateFolder": "No es pot crear la carpeta.",
-		"CantRenameFolder": "No es pot canviar el nom de la carpeta.",
-		"CantDeleteFolder": "No es pot suprimir la carpeta.",
-		"CantDeleteNonEmptyFolder": "No es pot suprimir una carpeta que no és buida.",
-		"CantSubscribeFolder": "No es pot activar la subscripció a la carpeta.",
-		"CantUnsubscribeFolder": "No es pot cancel·lar la subscripció a la carpeta.",
-		"DemoSendMessageError": "Per raons de seguretat, aquest compte no està autoritzat a enviar missatges a adreces de correu electrònic externes.",
-		"DemoAccountError": "Per raons de seguretat, aquest compte no té permís per a aquesta acció.",
-		"AccountAlreadyExists": "El compte ja existeix.",
-		"AccountDoesNotExist": "El compte no existeix.",
-		"AccountSwitchFailed": "No s’ha pogut canviar al compte «%EMAIL%».",
-		"MailServerError": "Hi ha hagut un error en accedir al servidor de correu.",
-		"InvalidInputArgument": "Argument d’entrada no vàlid",
-		"UnknownError": "Error desconegut"
-	}
-}
diff --git a/snappymail/v/0.0.0/app/localization/cs/admin.json b/snappymail/v/0.0.0/app/localization/cs/admin.json
index 304fd630d..bbaa149ee 100644
--- a/snappymail/v/0.0.0/app/localization/cs/admin.json
+++ b/snappymail/v/0.0.0/app/localization/cs/admin.json
@@ -9,8 +9,8 @@
 		"PASSWORD": "Heslo",
 		"CANCEL": "Zrušit",
 		"SEARCH": "Nebyly nalezeny žádné kontakty",
-		"YES": "Ano",
-		"NO": "Ne"
+		"YES": "Yes",
+		"NO": "No"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
@@ -70,7 +70,7 @@
 		"LABEL_STORAGE_DSN": "Dsn",
 		"LABEL_STORAGE_USER": "Uživatel",
 		"LABEL_STORAGE_PASSWORD": "Heslo",
-		"SQLITE_GLOBAL": "Použít globální databázi místo databáze pro každý účet",
+		"SQLITE_GLOBAL": "Use a global DB instead of per account",
 		"ALERT_NOTICE": "Upozornění!",
 		"SUGGESTIONS_LIMIT": "Suggestions limit",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Nepoužívejte tento typ databáze při velkém počtu aktivních uživatelů.",
@@ -129,17 +129,17 @@
 		"LABEL_PORT": "Port",
 		"LABEL_SECURE": "Zabezpečení",
 		"TIMEOUT": "Timeout",
-		"DISABLE_CAPABILITIES": "Zakázat capabilities",
-		"LIMITS": "Limity",
-		"FOLDERS": "Složky",
-		"MESSAGES": "Zprávy",
+		"DISABLE_CAPABILITIES": "Disable capabilities",
+		"LIMITS": "Limits",
+		"FOLDERS": "Folders",
+		"MESSAGES": "Messages",
 		"SECURE_OPTION_NONE": "Žádné",
 		"LABEL_ALLOW_SIEVE_SCRIPTS": "Povolit SIEVE skripty",
 		"LABEL_USE_SHORT_LOGIN": "Používat krátký login",
 		"LABEL_LOWERCASE_LOGIN": "Lowercase login (case-insensitive)",
 		"LABEL_USE_AUTH": "Používat autorizaci",
-		"LABEL_SET_SENDER": "Použít přihlašovací jméno jako odesílatele",
-		"LABEL_AUTH_PLAIN_LINE": "Vynutit přihlášení pomocí jednoho příkazu AUTH PLAIN",
+		"LABEL_SET_SENDER": "Use login as sender",
+		"LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login",
 		"LABEL_USE_PHP_MAIL": "Používat php mail() funkci",
 		"BUTTON_WHITE_LIST": "White List",
 		"NEW_DOMAIN_DESC": "Konfigurace této domény umožní používat <strong>%NAME%<\/strong> adresy.",
diff --git a/snappymail/v/0.0.0/app/localization/cs/user.json b/snappymail/v/0.0.0/app/localization/cs/user.json
index 7e1a5c526..724217cc7 100644
--- a/snappymail/v/0.0.0/app/localization/cs/user.json
+++ b/snappymail/v/0.0.0/app/localization/cs/user.json
@@ -11,7 +11,7 @@
 		"CLOSE": "Zavřít (Esc)",
 		"CONTACTS": "Adresář",
 		"DELETE": "Odstranit",
-		"UNDELETE": "Obnovit",
+		"UNDELETE": "Undelete",
 		"DONE": "Dokončit",
 		"EMAIL": "Email",
 		"FROM": "Odesílatel",
@@ -22,24 +22,24 @@
 		"COPY_TO": "Kopírovat do",
 		"NAME": "Přijaté",
 		"NONE": "Žádný",
-		"TO_SPAM": "Přesunout zprávu(y) do spamu",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "Není to spam",
 		"USERNAME": "Uživatelské jméno",
 		"PASSWORD": "Heslo",
-		"REMEMBER": "Zapamatovat",
+		"REMEMBER": "Remember",
 		"REPLY_TO": "Adresa odpovědi",
 		"SAVE": "Uložit",
-		"SAVE_CHANGES": "Uložit změny?",
+		"SAVE_CHANGES": "Save changes?",
 		"SEARCH": "Nebyly nalezeny žádné kontakty",
-		"SPAM": "Spam",
+		"SPAM": "Je to spam",
 		"SUBJECT": "Předmět",
 		"TEST": "Test",
 		"TO": "Příjemce",
-		"SERVER_MESSAGE": "Zpráva serveru",
+		"SERVER_MESSAGE": "Server message",
 		"YES": "Ano",
 		"NO": "Ne",
-		"INACTIVE": "Neaktivní",
-		"DEFAULT": "Výchozí",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "výchozí",
 		"HELP": "Nápověda",
 		"TEXT": "Text",
 		"ATTACHMENTS": "Přílohy"
@@ -60,22 +60,22 @@
 		"UNSEEN": "Nepřečtené",
 		"DATE": "Datum",
 		"DATE_ALL": "Kdykoliv",
-		"BEFORE_3_DAYS": "Starší než 3 dny",
-		"BEFORE_7_DAYS": "Starší než 1 týden",
-		"BEFORE_MONTH": "Starší než 1 měsíc",
-		"BEFORE_3_MONTHS": "Starší než 3 měsíce",
-		"BEFORE_6_MONTHS": "Starší než 6 měsíců",
-		"BEFORE_YEAR": "Starší než 1 rok",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
 		"SINCE_3_DAYS": "Ne starší než 3 dny",
 		"SINCE_7_DAYS": "Ne starší než týden",
 		"SINCE_MONTH": "Ne starší než měsíc",
 		"SINCE_3_MONTHS": "Ne starší než 3 měsíce",
 		"SINCE_6_MONTHS": "Ne starší než 6 měsíců",
 		"SINCE_YEAR": "Ne starší než 1 rok",
-		"SUBFOLDERS": "Podsložky",
-		"SUBFOLDERS_NONE": "Žádné",
-		"SUBFOLDERS_SUBTREE": "Všechny",
-		"SUBFOLDERS_SUBTREE_ONE": "Jedna úroveň",
+		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS_NONE": "None",
+		"SUBFOLDERS_SUBTREE": "All",
+		"SUBFOLDERS_SUBTREE_ONE": "One level",
 		"REPLIED": "Odpovězeno",
 		"KEYWORD": "Tag"
 	},
@@ -89,18 +89,18 @@
 		"ARCHIVE_NAME": "Archiv"
 	},
 	"IMAP": {
-		"ACL_RIGHTS": "Oprávnění",
-		"ACL_A": "Spravovat",
-		"ACL_E": "Vymazat",
-		"ACL_I": "Vkládat zprávy",
-		"ACL_K": "Vytvářet podsložky",
-		"ACL_L": "Zobrazit zprávy",
-		"ACL_P": "Odesílat poštu",
-		"ACL_R": "Vybrat složku",
-		"ACL_S": "\\SEEN značka",
-		"ACL_T": "\\DELETED značka",
-		"ACL_W": "Ostatní značky",
-		"ACL_X": "Smazat\/Přejmenovat složku"
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Obnovit seznam zpráv",
@@ -118,7 +118,7 @@
 		"MENU_SELECT_SEEN": "Přečtené",
 		"MENU_SELECT_FLAGGED": "Označené",
 		"MENU_SELECT_UNFLAGGED": "Neoznačené",
-		"DOWNLOAD_ALL_ATTACHMENTS": "Stáhnout všechny přílohy",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Seznam je prázdný",
 		"EMPTY_SEARCH_LIST": "Vašemu vyhledávání neodpovídají žádné zprávy.",
 		"SEARCH_RESULT_FOR": "Výsledky vyhledávání pro \"%SEARCH%\"",
@@ -128,18 +128,16 @@
 		"YESTERDAY_AT": "Včera v %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "Máte %COUNT% nových zpráv!",
 		"QUOTA_SIZE": "Používáte <strong>%SIZE% (%PROC%%)<\/strong> z vašich <strong>%LIMIT%<\/strong>",
-		"SORT": "Seřadit",
-		"NO_SORT": "Server nepodporuje řazení",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
-		"SORT_DATE_ASC": "Datum vzestupně",
-		"SORT_DATE_DESC": "Datum sestupně",
-		"SORT_SIZE_ASC": "Velikost vzestupně",
-		"SORT_SIZE_DESC": "Velikost sestupně",
-		"SORT_SUBJECT_ASC": "Předmět A-Z",
-		"SORT_SUBJECT_DESC": "Předmět Z-A",
-		"SORT_FROM_ASC": "Od A-Z",
-		"SORT_FROM_DESC": "Od Z-A"
+		"SORT": "Sort",
+		"NO_SORT": "Mail server does not support sorting",
+		"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"
 	},
 	"MESSAGE": {
 		"BUTTON_EDIT": "Editovat",
@@ -158,9 +156,9 @@
 		"BUTTON_THREAD_MORE": "Více zpráv",
 		"MENU_HEADERS": "Zobrazit hlavičku zprávy",
 		"MENU_VIEW_ORIGINAL": "Zobrazit zdroj",
-		"HTML_VIEW": "Zobrazit HTML zprávu",
-		"PLAIN_VIEW": "Zobrazit prostý text",
-		"SWAP_COLORS": "Prohodit výchozí barvy (pozadí)",
+		"HTML_VIEW": "View HTML message",
+		"PLAIN_VIEW": "View plain text message",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": "Stáhnout jako soubor .eml",
 		"MENU_FILTER_SIMILAR": "Filtrovat zprávy jako tato",
 		"MENU_PRINT": "Tisknout",
@@ -172,21 +170,21 @@
 		"MESSAGE_VIEW_DESC": "Vyberte zprávu ze seznamu pro její zobrazení zde.",
 		"MESSAGE_VIEW_MOVE_DESC": "Vyberte cílovou složku v levém panelu.",
 		"LINK_DOWNLOAD_AS_ZIP": "Stáhnout jako zip",
-		"SPAM_SCORE": "Spam skóre",
-		"HAS_VIRUS_WARNING": "VAROVÁNÍ: detekován virus",
-		"TAGS": "Tagy",
-		"NEW_TAG": "Nový tag",
-		"ENABLE_TRACKING_LINKS": "Povolit sledování odkazů",
-		"TRACKING_ENABLED": "Odkazy jsou nyní při kliknutí sledovány!"
+		"SPAM_SCORE": "Spam Score",
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
 	},
 	"MESSAGE_TAGS": {
-		"$important": "Důležité",
-		"$todo": "Úkol",
-		"$label1": "Důležité",
-		"$label2": "Práce",
-		"$label3": "Osobní",
-		"$label4": "Úkol",
-		"$label5": "Později"
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Potvrzení o zobrazení zprávy - %SUBJECT%",
@@ -196,17 +194,17 @@
 		"SEARCHING_DESC": "Hledám..."
 	},
 	"CONTACTS": {
-		"TAB_CONTACT": "Kontakt",
-		"TAB_LOCATIONS": "Umístění",
-		"TAB_BUSINESS": "Firma",
-		"LABEL_ORGANIZATION": "Organizace",
-		"LABEL_DEPARTMENT": "Oddělení",
-		"LABEL_TITLE": "Titul",
-		"TAB_CRYPTO": "Šifrování",
-		"ASK": "Zeptat se",
-		"NEVER": "Nikdy",
-		"ALWAYS": "Vždy",
-		"ALWAYS_IF_POSSIBLE": "Vždy když je to možné",
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
 		"BUTTON_ADD_CONTACT": "Přidat kontakt",
 		"BUTTON_CREATE_CONTACT": "Vytvořit",
 		"BUTTON_IMPORT": "Importovat (csv, vcf, vCard)",
@@ -221,9 +219,9 @@
 		"DISPLAY_NAME": "Zobrazované jméno",
 		"LAST_NAME": "Příjmení",
 		"FIRST_NAME": "Jméno",
-		"MIDDLE_NAME": "Prostřední jméno",
-		"NAME_PREFIX": "Titul před",
-		"NAME_SUFFIX": "Titul za",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
 		"NICK_NAME": "Přezdívku",
 		"LABEL_READ_ONLY": "Jen pro čtení",
 		"ADD_MENU_LABEL": "Přidat",
@@ -236,7 +234,7 @@
 		"ADD_MENU_TAGS": "Tagy",
 		"BUTTON_SHARE_ALL": "Vše",
 		"BUTTON_SYNC": "Synchronizace (CardDAV)",
-		"SEND_TO_ALL_CONTACT_EMAILS": "Poslat na všechny emailové adresy kontaktu"
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "zobrazit všechna pole",
@@ -247,23 +245,23 @@
 		"DISCARD_UNSAVED_DATA": "Neuložit změny?",
 		"ATTACH_FILES": "Připojit soubory",
 		"ATTACH_DROP_FILES_DESC": "Soubory přetáhněte sem",
-		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% napsal",
-		"FORWARD_MESSAGE_TOP_TITLE": "-------- Přeposlaná zpráva -------",
+		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% wrote",
+		"FORWARD_MESSAGE_TOP_TITLE": "-------- Forwarded message -------",
 		"FORWARD_MESSAGE_TOP_SENT": "Odeslat",
 		"EMPTY_TO_ERROR_DESC": "Zadejte prosím alespoň jednoho příjemce",
 		"NO_ATTACHMENTS_HERE_DESC": "Žádné přílohy.",
 		"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": "Povolit kontrolu pravopisu prohlížeče",
+		"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": "Vyžadovat bezpečné doručení",
-		"ERROR_EMPTY_BODY": "Tělo zprávy je prázdné"
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"EXIT_ARE_YOU_SURE": "Opravdu chcete ukončit?",
+		"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?"
 	},
@@ -278,9 +276,9 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Opravdu přidat",
 		"TITLE_UPDATE_IDENTITY": "Uložit změny",
-		"LABEL": "Štítek",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Přidat",
-		"SIGNATURE": "Podpis",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "V odpovědích vložit podpis před citovaný text."
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -300,16 +298,16 @@
 		"SIGN": "Podpis",
 		"ENCRYPT": "Šifrování",
 		"DECRYPT": "Dešifrovat",
-		"VERIFY": "Ověřit",
+		"VERIFY": "Verify",
 		"GOOD_SIGNATURE": "Ověřený podpis od %USER%",
 		"ERROR": "%TYPE% chyba: %ERROR%",
-		"CREATE_SELF_SIGNED": "Vytvořit samopodepsaný",
-		"VALID_UNTIL": "Platný do",
-		"PRIVATE_KEY": "Soukromý klíč",
-		"CHANGE_PASS": "Změnit heslo",
-		"CURRENT_PASS": "Aktuální heslo",
-		"NEW_PASS": "Nové heslo",
-		"ASK_CRYPTKEY_PASS": "Vaše přihlašovací heslo se změnilo. Vyplňte prosím své staré přihlašovací heslo pro dešifrování dat"
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
 	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Import OpenPGP klíče",
@@ -318,23 +316,23 @@
 		"POPUP_VIEW_BUTTON": "Vybrat",
 		"POPUP_GENERATE_TITLE": "Generovat OpenPGP klíče",
 		"POPUP_GENERATE_BUTTON": "Generovat",
-		"LABEL_KEY_TYPE": "Typ",
+		"LABEL_KEY_TYPE": "Type",
 		"SIGNED_MESSAGE": "Zpráva podepsaná OpenPGP",
 		"ENCRYPTED_MESSAGE": "Zpráva šifrovaná OpenPGP",
-		"STORE_IN_GNUPG": "Uložit na server v GnuPG",
-		"STORE_PUBLIC_KEY_IN_GNUPG": "Uložit veřejný klíč na server v GnuPG",
-		"STORE_PRIVATE_KEY_IN_GNUPG": "Uložit soukromý klíč na server v GnuPG",
-		"BACKUP_ON_SERVER": "Uložit (šifrované) na server",
-		"BACKUP_PUBLIC_KEY_ON_SERVER": "Zálohovat veřejný klíč na server",
-		"BACKUP_PRIVATE_KEY_ON_SERVER": "Zálohovat soukromý klíč na server"
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
 	},
 	"SMIME": {
-		"POPUP_IMPORT_TITLE": "Import S\/MIME certifikátu",
-		"CERTIFICATE": "Certifikát",
-		"CERTIFICATES": "S\/MIME certifikáty",
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
 		"SIGNED_MESSAGE": "Zpráva podepsaná S\/MIME",
 		"ENCRYPTED_MESSAGE": "Zpráva šifrovaná S\/MIME",
-		"PRIVATE_KEY_OF": "Soukromý klíč S\/MIME pro %EMAIL%"
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Vytvořit filtr",
@@ -349,13 +347,13 @@
 		"SELECT_ACTION_DISCARD": "Zahodit",
 		"SELECT_FIELD_RECIPIENTS": "Příjemci (Komu nebo Kopie)",
 		"SELECT_FIELD_HEADER": "Hlavička",
-		"SELECT_FIELD_BODY": "Tělo",
+		"SELECT_FIELD_BODY": "Body",
 		"SELECT_FIELD_SIZE": "Velikost",
 		"SELECT_TYPE_CONTAINS": "Obsahuje",
 		"SELECT_TYPE_NOT_CONTAINS": "Neobsahuje",
-		"SELECT_TYPE_MATCHES": "Odpovídá (můžete použít * a ? )",
-		"SELECT_TYPE_NOT_MATCHES": "Neodpovídá (můžete použít * a ? )",
-		"SELECT_TYPE_REGEXP": "Regulární výraz",
+		"SELECT_TYPE_MATCHES": "Odpovídá (můžete použit * a ? )",
+		"SELECT_TYPE_NOT_MATCHES": "Neodpovídá (můžete použit * a ? )",
+		"SELECT_TYPE_REGEXP": "egulární výraz",
 		"SELECT_TYPE_NOT_REGEXP": "Není regulární výraz",
 		"SELECT_TYPE_EQUAL_TO": "Rovná se",
 		"SELECT_TYPE_NOT_EQUAL_TO": "Nerovná se",
@@ -365,10 +363,10 @@
 		"SELECT_TYPE_RAW": "Raw",
 		"SELECT_MATCH_ANY": "Vyhovuje alespoň jednomu pravidlu",
 		"SELECT_MATCH_ALL": "Vyhovuje všem pravidlům",
-		"MARK_AS_READ_LABEL": "Označit jako přečtené",
+		"MARK_AS_READ_LABEL": "Odznačit jako přečtené",
 		"REPLY_INTERVAL_LABEL": "Interval odpovědi (dny)",
 		"KEEP_LABEL": "Zachovat",
-		"STOP_LABEL": "Zastavit další zpracování pravidel",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "Předmět (volitelný)",
 		"VACATION_MESSAGE_LABEL": "Zpráva",
 		"VACATION_RECIPIENTS_LABEL": "Příjemci (odděleni čárkou)",
@@ -376,12 +374,12 @@
 		"ALL_INCOMING_MESSAGES_DESC": "Všechny příchozí zprávy"
 	},
 	"POPUPS_SIEVE_SCRIPT": {
-		"TITLE_CREATE": "Vytvořit skript",
-		"TITLE_EDIT": "Upravit skript",
-		"BUTTON_ADD_FILTER": "Přidat filtr",
-		"BUTTON_RAW_SCRIPT": "Použít vlastní uživatelský skript",
+		"TITLE_CREATE": "Create Script",
+		"TITLE_EDIT": "Edit Script",
+		"BUTTON_ADD_FILTER": "Add a Filter",
+		"BUTTON_RAW_SCRIPT": "Use Custom User Script",
 		"CAPABILITY_LABEL": "Schopnost",
-		"CHANGES_NEED_TO_BE_SAVED_DESC": "Tyto změny musí být uloženy na server."
+		"CHANGES_NEED_TO_BE_SAVED_DESC": "These changes need to be saved to the server."
 	},
 	"POPUPS_SYSTEM_FOLDERS": {
 		"TITLE_SYSTEM_FOLDERS": "Spravovat systémové složky",
@@ -404,36 +402,36 @@
 		"ERROR_MISSING_TEMP_FOLDER": "Chybí dočasný soubor",
 		"ERROR_ON_SAVING_FILE": "Nastala neznámá chyba při ukládání",
 		"ERROR_FILE_TYPE": "Neplatný typ souboru",
-		"ERROR_UNKNOWN": "Nastala neznámá chyba při nahrávání"
+		"ERROR_UNKNOWN": "Nastala neznámá chyba při nahrávaní"
 	},
 	"EDITOR": {
 		"PLAIN": "HTML <-> TEXT",
-		"SOURCE": "HTML <-> ZDROJ",
-		"FONTFAMILY": "Rodina písma",
-		"FONTSIZE": "Velikost písma",
-		"DIR": "Směr textu",
-		"DIR_LTR": "Zleva doprava",
-		"DIR_RTL": "Zprava doleva",
-		"DIR_AUTO": "Automaticky",
-		"TEXTCOLOR": "Barva textu",
-		"BACKGROUNDCOLOR": "Barva pozadí",
-		"BOLD": "Tučné",
-		"ITALIC": "Kurzíva",
-		"UNDERLINE": "Podtržení",
-		"STRIKE": "Přeškrtnutí",
-		"SUB": "Dolní index",
-		"SUP": "Horní index",
-		"OL": "Číslovaný seznam",
-		"UL": "Nečíslovaný seznam",
-		"QUOTE": "Citace",
-		"INDENTDECREASE": "Zmenšit odsazení",
-		"INDENTINCREASE": "Zvětšit odsazení",
-		"LINK": "Odkaz",
-		"IMAGEURL": "URL obrázku",
-		"IMAGEUPLOAD": "Výběr obrázku",
-		"UNDO": "Zpět",
-		"REDO": "Znovu",
-		"REMOVESTYLE": "Odstranit styl"
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Všeobecné",
@@ -445,9 +443,9 @@
 		"THEMES": "Motivy"
 	},
 	"SETTINGS_FILTERS": {
-		"SIMPLE": "Jednoduché",
-		"ADVANCED": "Pokročilé",
-		"BUTTON_ADD_SCRIPT": "Přidat skript",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
+		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Přesunout do \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Přeposlat to \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Odmítnout",
@@ -457,56 +455,55 @@
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Zabezpečení",
 		"LABEL_AUTOLOGOUT": "Automatické odhlášení",
-		"FORGET_KEY_PASS": "Zapomenout heslo k soukromému klíči",
+		"FORGET_KEY_PASS": "Forget private key passphrase",
 		"NEVER": "Nikdy"
 	},
 	"SETTINGS_GENERAL": {
 		"LANGUAGE": "Jazyk",
-		"HOUR_FORMAT": "Formát času",
+		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Uživatel",
 		"LAYOUT": "Rozložení",
 		"LAYOUT_NO_SPLIT": "Nerozdělovat",
 		"LAYOUT_VERTICAL_SPLIT": "Vertikální rozdělení",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontální rozdělení",
-		"SHOW_NEXT_MESSAGE": "Zobrazit další zprávu při přesunutí\/odstranění aktuální zprávy",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Přednastavený editor zpráv",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Text",
 		"VIEW_OPTIONS": "Možnosti zobrazení",
-		"USE_PREVIEW_PANE": "Používat panel rychlého zobrazení",
+		"USE_PREVIEW_PANE": "Používáte panel rychlého zobrazení",
 		"HIDE_DELETED_MESSAGES": "Skrýt zprávy označené ke smazání",
 		"USE_CHECKBOXES_IN_LIST": "Zobrazení zaškrtávacích políček v seznamu",
 		"USE_THREADS": "Zobrazit jako konverzace",
-		"THREAD_ALGORITHM": "Algoritmus konverzací",
+		"THREAD_ALGORITHM": "Threads algorithm",
 		"REPLY_SAME_FOLDER": "Ukládat odpovědi do složky se zprávou, které se týkají",
-		"PREFER_HTML": "Upřednostnit HTML před prostým textem",
-		"PREFER_HTML_INFO": "Zprávy někdy přicházejí v obou formátech. Tato volba určuje, zda chcete zobrazit HTML část nebo prostý text.",
-		"REMOVE_COLORS": "Odstranit barvy pozadí a textu z těla zprávy",
-		"ALLOW_STYLES": "Povolit CSS styly",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"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",
 		"MESSAGE_PER_PAGE": "Zpráv na stranu",
-		"CHECK_MAIL_INTERVAL": "Interval kontroly pošty",
-		"MARK_MESSAGE_READ_AFTER": "Označit zprávu jako přečtenou po",
-		"MSG_DEFAULT_ACTION": "Výchozí akce",
-		"SECONDS": "sekund",
-		"MINUTES": "minut",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
+		"SECONDS": "seconds",
+		"MINUTES": "minutes",
 		"NOTIFICATIONS": "Notifikace",
 		"SOUND_NOTIFICATION": "Zvukové notifikace",
 		"CHROME_NOTIFICATION_DESC": "Zobrazovat upozornění na nové zprávy",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Zablokované prohlížečem)",
-		"COLLAPSE_BLOCKQUOTES": "Sbalit citovaný text",
-		"MAX_QUOTE_LEVEL": "Maximální počet úrovní zobrazených citací",
-		"MIN_FONT_SIZE": "Minimum Font Size",
-		"LIST_INLINE_ATTACHMENTS": "Zobrazit vložené přílohy v seznamu",
-		"LIST_SIMPLE_ATTACHMENTS": "Jednoduchý seznam příloh",
-		"LIST_MESSAGES_GROUPED": "Seskupit zprávy v seznamu (při řazení podle data nebo odesílatele)",
-		"EXTERNAL_IMAGES": "Externí obrázky",
-		"IMAGES_OPTION_ASK": "Vždy se zeptat",
-		"IMAGES_OPTION_WHITELIST": "Seznam povolených nebo se zeptat",
-		"IMAGES_OPTION_ALWAYS": "Vždy zobrazit",
-		"IMAGES_WHITELIST": "Seznam povolených obrázků",
-		"MESSAGE_POPUP_WINDOW": "Otevřít zprávu v novém okně místo záložky",
-		"MAILTO": "Registrovat jako výchozí program pro 'mailto:' odkazy",
-		"HTML_TO_MD": "Převést HTML na Markdown místo prostého textu"
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"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",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automaticky přidávat adresy příjemců do Adresáře",
@@ -515,12 +512,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Server",
 		"LABEL_CONTACTS_SYNC_AB_URL": "URL adresáře",
 		"LABEL_CONTACTS_SYNC_USER": "Uživatel",
-		"SYNC_READ": "Pouze pro čtení"
+		"SYNC_READ": "Read only"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Motivy",
 		"LABEL_BACKGROUND": "Pozadí",
-		"LABEL_FONTS": "Písma",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Nahrát obrázek pozadí (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Soubor je příliš velký",
 		"ERROR_FILE_TYPE_ERROR": "Nesprávný typ souboru (povolené jsou pouze JPG a PNG)",
@@ -541,15 +538,15 @@
 		"HELP_DELETE_FOLDER": "Smazat složku",
 		"HELP_SHOW_HIDE_FOLDER": "Zobrazit\/skrýt složku",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Kontrovat nové příchozí zprávy",
-		"HIDE_UNSUBSCRIBED": "Skrýt neodebírané složky",
-		"UNHIDE_KOLAB_FOLDERS": "Zobrazit Kolab složky",
-		"TYPE_CALENDAR": "Kalendář",
-		"TYPE_CONFIGURATION": "Konfigurace",
-		"TYPE_CONTACTS": "Kontakty",
-		"TYPE_FILES": "Soubory",
-		"TYPE_JOURNAL": "Deník",
-		"TYPE_NOTES": "Poznámky",
-		"TYPE_TASKS": "Úkoly"
+		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
+		"TYPE_CALENDAR": "Calendar",
+		"TYPE_CONFIGURATION": "Configuration",
+		"TYPE_CONTACTS": "Contacts",
+		"TYPE_FILES": "Files",
+		"TYPE_JOURNAL": "Journal",
+		"TYPE_NOTES": "Notes",
+		"TYPE_TASKS": "Tasks"
 	},
 	"SETTINGS_ACCOUNTS": {
 		"LEGEND_ACCOUNTS": "Seznam účtů",
@@ -557,16 +554,16 @@
 		"LEGEND_ACCOUNTS_AND_IDENTITIES": "Účty a aliasy",
 		"BUTTON_ADD_ACCOUNT": "Přidat účet",
 		"BUTTON_ADD_IDENTITY": "Přidat alias",
-		"LOADING_PROCESS": "Aktualizuji seznam účtů",
-		"SHOW_UNREAD": "Zobrazit počet nepřečtených zpráv"
+		"LOADING_PROCESS": "Aktualizace seznamu účtů",
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importovat klíč",
 		"BUTTON_GENERATE_KEY_PAIR": "Generovat klíče",
-		"IMPORT_FROM_SERVER": "Importovat ze serveru",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Soukromý",
 		"TITLE_PUBLIC": "Veřejný",
-		"GET_MAILVELOPE": "Získat rozšíření Mailvelope pro prohlížeč"
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Klávesové zkratky",
@@ -606,29 +603,29 @@
 		"LABEL_CLOSE_COMPOSE": "Zavřít okno se zprávou"
 	},
 	"NOTIFICATIONS": {
-		"RequestError": "Požadavek selhal",
-		"RequestAborted": "Požadavek byl zrušen",
-		"RequestTimeout": "Časový limit požadavku vypršel",
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
 		"InvalidToken": "Neplatný token",
 		"AuthError": "Ověření selhalo",
 		"ConnectionError": "Nepodařilo se připojit k serveru",
 		"DomainAlreadyExists": "Tato doména již existuje",
 		"DomainNotAllowed": "Doména není povolená",
 		"AccountNotAllowed": "Účet není povolený",
-		"CryptKeyError": "Vaše přihlašovací heslo se změnilo",
+		"CryptKeyError": "Your login passphrase has changed",
 		"ContactsSyncError": "Chyba při synchronizaci kontaktů",
 		"CantGetMessageList": "Chyba při vytváření seznamu zpráv",
 		"CantGetMessage": "Zprávu se nepodařilo načíst",
 		"CantDeleteMessage": "Zprávu se nepodařilo odstranit",
-		"CantCopyMessage": "Zprávu se nepodařilo zkopírovat",
+		"CantCopyMessage": "Can't copy message",
 		"CantMoveMessage": "Zprávu se nepodařilo přesunout",
 		"CantSaveMessage": "Zprávu se nepodařilo uložit",
 		"CantSendMessage": "Zprávu se nepodařilo odeslat",
-		"InvalidRecipients": "Neplatní příjemci",
+		"InvalidRecipients": "Neplatný příjemci",
 		"CantSaveFilters": "Nelze uložit filtry",
 		"CantGetFilters": "Nelze načíst filtry",
-		"CantActivateFiltersScript": "Nelze aktivovat skript filtrů",
-		"CantDeleteFiltersScript": "Nelze odstranit skript filtrů",
+		"CantActivateFiltersScript": "Can't activate filters script",
+		"CantDeleteFiltersScript": "Can't delete filters script",
 		"FiltersAreNotCorrect": "Filtry nejsou validní",
 		"CantCreateFolder": "Složku se nepodařilo vytvořit",
 		"CantRenameFolder": "Složku se nepodařilo přejmenovat",
@@ -640,7 +637,7 @@
 		"DemoAccountError": "Z důvodu bezpečnosti tento účet nemá oprávnění toto provést!",
 		"AccountAlreadyExists": "Účet už existuje",
 		"AccountDoesNotExist": "Účet neexistuje",
-		"AccountSwitchFailed": "Přepnutí na účet \"%EMAIL%\" selhalo",
+		"AccountSwitchFailed": "Switch to account \"%EMAIL%\" failed",
 		"MailServerError": "Nastala chyba během přístupu na poštovní server",
 		"InvalidInputArgument": "Nevalidní vstupní argument",
 		"UnknownError": "Neznámá chyba"
diff --git a/snappymail/v/0.0.0/app/localization/da/user.json b/snappymail/v/0.0.0/app/localization/da/user.json
index 608209514..bc246b57b 100644
--- a/snappymail/v/0.0.0/app/localization/da/user.json
+++ b/snappymail/v/0.0.0/app/localization/da/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Du bruger <strong>%SIZE% (%PROC%%)<\/strong> af <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
 		"NO_SORT": "Mail server does not support sorting",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Blokeret af browseren)",
 		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
 		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"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)",
diff --git a/snappymail/v/0.0.0/app/localization/de/user.json b/snappymail/v/0.0.0/app/localization/de/user.json
index 6a3ff1a12..3869a6065 100644
--- a/snappymail/v/0.0.0/app/localization/de/user.json
+++ b/snappymail/v/0.0.0/app/localization/de/user.json
@@ -27,8 +27,6 @@
 		"USERNAME": "Nutzername",
 		"PASSWORD": "Passwort",
 		"REMEMBER": "Zugangsdaten merken",
-		"REMEMBER_FOR_SESSION": "Aktuelle Sitzung merken",
-		"REMEMBER_PERMANENT": "Dauerhaft merken",
 		"REPLY_TO": "Antwort an",
 		"SAVE": "Speichern",
 		"SAVE_CHANGES": "Änderungen speichern?",
@@ -132,8 +130,6 @@
 		"QUOTA_SIZE": "Sie nutzen <strong>%SIZE% (%PROC%%)<\/strong> von <strong>%LIMIT%<\/strong>.",
 		"SORT": "Sortieren",
 		"NO_SORT": "Ihr Mailserver unterstützt das Sortieren von E-Mails nicht",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Datum aufsteigend",
 		"SORT_DATE_DESC": "Datum absteigend",
 		"SORT_SIZE_ASC": "Größe aufsteigend",
@@ -333,7 +329,6 @@
 	"SMIME": {
 		"POPUP_IMPORT_TITLE": "S\/MIME-Zertifikat importieren",
 		"CERTIFICATE": "Zertifikat",
-		"CERTIFICATECHAIN": "Zwischenzertifikat(e)",
 		"CERTIFICATES": "S\/MIME-Zertifikate",
 		"SIGNED_MESSAGE": "S\/MIME-signierte Nachricht",
 		"ENCRYPTED_MESSAGE": "S\/MIME-verschlüsselte Nachricht",
@@ -461,8 +456,7 @@
 		"LEGEND_SECURITY": "Sicherheit",
 		"LABEL_AUTOLOGOUT": "Automatische Abmeldung",
 		"FORGET_KEY_PASS": "Passphrase für privaten Schlüssel vergessen",
-		"NEVER": "Nie",
-		"LABEL_STORED_PASS": "Passphrase gespeichert"
+		"NEVER": "Nie"
 	},
 	"SETTINGS_GENERAL": {
 		"LANGUAGE": "Sprache",
@@ -499,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Vom Browser blockiert)",
 		"COLLAPSE_BLOCKQUOTES": "zitierten Text ausblenden",
 		"MAX_QUOTE_LEVEL": "Maximal sichtbare Ebenen von zitiertem Text",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"LIST_INLINE_ATTACHMENTS": "Inline-Anhänge in der Liste anzeigen",
 		"LIST_SIMPLE_ATTACHMENTS": "Vereinfachte Liste der Anhänge",
 		"LIST_MESSAGES_GROUPED": "Nachrichten bei Sortierung nach Datum oder Absender gruppieren",
@@ -612,7 +605,7 @@
 	"NOTIFICATIONS": {
 		"RequestError": "Anfrage fehlgeschlagen",
 		"RequestAborted": "Anfrage abgebrochen",
-		"RequestTimeout": "Zeitüberschreitung der Anfrage",
+		"RequestTimeout": "Antrag auf Auslieferung",
 		"InvalidToken": "Ungültiger Token",
 		"AuthError": "Authentifizierung fehlgeschlagen",
 		"ConnectionError": "Serververbindung kann nicht hergestellt werden",
diff --git a/snappymail/v/0.0.0/app/localization/el/user.json b/snappymail/v/0.0.0/app/localization/el/user.json
index c7f148411..0223b0029 100644
--- a/snappymail/v/0.0.0/app/localization/el/user.json
+++ b/snappymail/v/0.0.0/app/localization/el/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Χρησιμοποιούνται <strong>%SIZE% (%PROC%%)<\/strong> από <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
 		"NO_SORT": "Mail server does not support sorting",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Αποκλείστηκε από το φυλλομετρητή)",
 		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
 		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"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)",
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 7c53b9d39..2439964e3 100644
--- a/snappymail/v/0.0.0/app/localization/en/user.json
+++ b/snappymail/v/0.0.0/app/localization/en/user.json
@@ -27,8 +27,6 @@
 		"USERNAME": "Username",
 		"PASSWORD": "Passphrase",
 		"REMEMBER": "Remember",
-		"REMEMBER_FOR_SESSION": "Remember for this Session",
-		"REMEMBER_PERMANENT": "Remember Permanently",
 		"REPLY_TO": "Reply-To",
 		"SAVE": "Save",
 		"SAVE_CHANGES": "Save changes?",
@@ -132,8 +130,6 @@
 		"QUOTA_SIZE": "Using <strong>%SIZE% (%PROC%%)<\/strong> of your <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
 		"NO_SORT": "Mail server does not support sorting",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -333,7 +329,6 @@
 	"SMIME": {
 		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
 		"CERTIFICATE": "Certificate",
-		"CERTIFICATECHAIN": "Intermediate Certificate(s)",
 		"CERTIFICATES": "S\/MIME Certificates",
 		"SIGNED_MESSAGE": "S\/MIME signed message",
 		"ENCRYPTED_MESSAGE": "S\/MIME encrypted message",
@@ -461,8 +456,7 @@
 		"LEGEND_SECURITY": "Security",
 		"LABEL_AUTOLOGOUT": "Auto Logout",
 		"FORGET_KEY_PASS": "Forget private key passphrase",
-		"NEVER": "Never",
-		"LABEL_STORED_PASS": "Remembered Passphrase"
+		"NEVER": "Never"
 	},
 	"SETTINGS_GENERAL": {
 		"LANGUAGE": "Language",
@@ -499,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Blocked by the browser)",
 		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
 		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"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)",
diff --git a/snappymail/v/0.0.0/app/localization/es/user.json b/snappymail/v/0.0.0/app/localization/es/user.json
index 6b55c0a20..ef00f08a2 100644
--- a/snappymail/v/0.0.0/app/localization/es/user.json
+++ b/snappymail/v/0.0.0/app/localization/es/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Usando <strong>%SIZE% (%PROC%%)<\/strong> de sus <strong>%LIMIT%<\/strong>",
 		"SORT": "Ordenar",
 		"NO_SORT": "El servidor no soporta clasificación",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Fecha ascendente",
 		"SORT_DATE_DESC": "Fecha descendente",
 		"SORT_SIZE_ASC": "Tamaño ascendente",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado por el navegador)",
 		"COLLAPSE_BLOCKQUOTES": "Colapsar texto citado",
 		"MAX_QUOTE_LEVEL": "Niveles máximos de texto citado visibles",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"LIST_INLINE_ATTACHMENTS": "Mostrar adjuntos en línea en la lista",
 		"LIST_SIMPLE_ATTACHMENTS": "Lista simple de adjuntos",
 		"LIST_MESSAGES_GROUPED": "Listar mensajes agrupados (al ordenar por fecha o remitente)",
diff --git a/snappymail/v/0.0.0/app/localization/et/user.json b/snappymail/v/0.0.0/app/localization/et/user.json
index 9b62e373d..c66d9cbbc 100644
--- a/snappymail/v/0.0.0/app/localization/et/user.json
+++ b/snappymail/v/0.0.0/app/localization/et/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Kasutad <strong>%SIZE% (%PROC%%)<\/strong> lubatud kettamahust <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
 		"NO_SORT": "Mail server does not support sorting",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Veebilehitseja poolt blokeeritud)",
 		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
 		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"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)",
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 54abcd1f4..dca831e9f 100644
--- a/snappymail/v/0.0.0/app/localization/eu/user.json
+++ b/snappymail/v/0.0.0/app/localization/eu/user.json
@@ -11,9 +11,9 @@
 		"CLOSE": "Itxi",
 		"CONTACTS": "Kontaktuak",
 		"DELETE": "Ezabatu",
-		"UNDELETE": "Berreskuratu",
+		"UNDELETE": "Undelete",
 		"DONE": "Eginda",
-		"EMAIL": "E-mail",
+		"EMAIL": "Email",
 		"FROM": "Nork",
 		"LOADING": "Kargatzen",
 		"LOGOUT": "Saioa itxi",
@@ -22,11 +22,11 @@
 		"COPY_TO": "Kopiatu hona",
 		"NAME": "Izena",
 		"NONE": "Bat ere ez",
-		"TO_SPAM": "Eraman mezua(k) Spam-era",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "Ez da spama",
 		"USERNAME": "Erabiltzaile-izena",
 		"PASSWORD": "Pasahitza",
-		"REMEMBER": "Gogoratu",
+		"REMEMBER": "Remember",
 		"REPLY_TO": "Erantzun",
 		"SAVE": "Gorde",
 		"SAVE_CHANGES": "Aldaketak gorde?",
@@ -45,7 +45,7 @@
 		"ATTACHMENTS": "Eranskinak"
 	},
 	"LOGIN": {
-		"LABEL_LOGIN": "Hasi saioa",
+		"LABEL_LOGIN": "Login",
 		"LABEL_SIGN_ME": "Gogora nazazu",
 		"BUTTON_SIGN_IN": "Sartu"
 	},
@@ -60,12 +60,12 @@
 		"UNSEEN": "Irakurri gabe",
 		"DATE": "Data",
 		"DATE_ALL": "Denak",
-		"BEFORE_3_DAYS": "3 egun baino zaharragoa",
-		"BEFORE_7_DAYS": "Aste 1 baino zaharragoa",
-		"BEFORE_MONTH": "Hilabete 1 baino zaharragoa",
-		"BEFORE_3_MONTHS": "3 hilabete baino zaharragoa",
-		"BEFORE_6_MONTHS": "6 hilabete baino zaharragoa",
-		"BEFORE_YEAR": "Urte 1 baino zaharragoa",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
 		"SINCE_3_DAYS": "3 egun arterakoak",
 		"SINCE_7_DAYS": "Astebetako arterakoak",
 		"SINCE_MONTH": "Hilabete arterakoak",
@@ -89,26 +89,26 @@
 		"ARCHIVE_NAME": "Artxiboa"
 	},
 	"IMAP": {
-		"ACL_RIGHTS": "Baimenak",
-		"ACL_A": "Administratu",
-		"ACL_E": "Ezabatu",
-		"ACL_I": "Txertatu mezuak",
-		"ACL_K": "Sortu azpi-karpetak",
-		"ACL_L": "Erakutsi mezuak",
-		"ACL_P": "Bidali posta",
-		"ACL_R": "Hautatu karpeta",
-		"ACL_S": "\\IKUSITAKO etiketa",
-		"ACL_T": "\\EZABATUTAKO etiketa",
-		"ACL_W": "Beste etiketak",
-		"ACL_X": "Ezabatu/Berrizendatu karpeta"
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Eguneratu mezuen zerrenda",
 		"BUTTON_EMPTY_FOLDER": "Hustu karpeta",
-		"BUTTON_MULTY_FORWARD": "Bidali eranskin gisa",
-		"BUTTON_DELETE_WITHOUT_MOVE": "Ezabatu betirako",
-		"MENU_SET_SEEN": "Irakurritako gisa markatu",
-		"MENU_SET_ALL_SEEN": "Dena irakurritako gisa markatu",
+		"BUTTON_MULTY_FORWARD": "Erantsi bezala bidali",
+		"BUTTON_DELETE_WITHOUT_MOVE": "Beteriako ezabatu",
+		"MENU_SET_SEEN": "Irakurri bezala markatu",
+		"MENU_SET_ALL_SEEN": "Dena irakurri bezala markatu",
 		"MENU_UNSET_SEEN": "Irakurri gabe bezala markatu",
 		"MENU_SET_FLAG": "Markatu",
 		"MENU_UNSET_FLAG": "Desmarkatu",
@@ -122,16 +122,14 @@
 		"EMPTY_LIST": "Hustu zerrenda.",
 		"EMPTY_SEARCH_LIST": "Zure bilaketarekin bat datorren mezurik ez.",
 		"SEARCH_RESULT_FOR": "\"%SEARCH%\"-erako bilaketa emaitzak",
-		"BACK_TO_MESSAGE_LIST": "Itzuli mezuen zerrendara",
+		"BACK_TO_MESSAGE_LIST": "itzuli mezuen zerrendara",
 		"PUT_MESSAGE_HERE": "Bota mezua hemen zerrendan ikusteko",
 		"TODAY_AT": "gaur %TIME%-etan",
 		"YESTERDAY_AT": "atzo %TIME%-etan",
 		"NEW_MESSAGE_NOTIFICATION": "%COUNT% mezu berri dituzu!",
 		"QUOTA_SIZE": "<strong>%SIZE% (%PROC%%)<\/strong> erabiliz zure <strong>%LIMIT%<\/strong>-tik",
 		"SORT": "Ordenatu",
-		"NO_SORT": "Posta zerbitzariak ez du ordenatzen",
-		"SORT_ARRIVAL_ASC": "Zaharrenetik berrienera",
-		"SORT_ARRIVAL_DESC": "Berrienetik zaharrenera",
+		"NO_SORT": "Mail server does not support sorting",
 		"SORT_DATE_ASC": "Data goraka",
 		"SORT_DATE_DESC": "Data beheraka",
 		"SORT_SIZE_ASC": "Tamaina goraka",
@@ -160,7 +158,7 @@
 		"MENU_VIEW_ORIGINAL": "Erakutsi jatorrizkoa",
 		"HTML_VIEW": "Ikusi HTML mezua",
 		"PLAIN_VIEW": "Ikusi testu soil mezua",
-		"SWAP_COLORS": "Aldatu atzeko planoaren kolorea",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": "Deskargatu .eml fitxategi bezala",
 		"MENU_FILTER_SIMILAR": "Iragazi hau bezalako mezuak",
 		"MENU_PRINT": "Inprimatu",
@@ -172,12 +170,12 @@
 		"MESSAGE_VIEW_DESC": "Aukeratu zerrendako edozein mezua hemen ikusteko.",
 		"MESSAGE_VIEW_MOVE_DESC": "Klikatu karpetaren izena ezkerreko panelean helburua aukeratzeko.",
 		"LINK_DOWNLOAD_AS_ZIP": "Deskargatu zip gisa",
-		"SPAM_SCORE": "Spam puntuzioa",
+		"SPAM_SCORE": "Spam Puntuzioa",
 		"HAS_VIRUS_WARNING": "KONTUZ: virusa detektatu da",
 		"TAGS": "Etiketak",
 		"NEW_TAG": "Etiketa berria",
-		"ENABLE_TRACKING_LINKS": "Gaitu jarraipen-estekak",
-		"TRACKING_ENABLED": "Estekak orain jarraipena dute klikatzean!"
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
 	},
 	"MESSAGE_TAGS": {
 		"$important": "Garrantzitsua",
@@ -221,14 +219,14 @@
 		"DISPLAY_NAME": "Erakusteko izena",
 		"LAST_NAME": "Abizenak",
 		"FIRST_NAME": "Izena",
-		"MIDDLE_NAME": "Bigarren izena",
-		"NAME_PREFIX": "Aurrizkia",
-		"NAME_SUFFIX": "Atzizkia",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
 		"NICK_NAME": "Ezizena",
 		"LABEL_READ_ONLY": "Irakurtzeko bakarrik",
 		"ADD_MENU_LABEL": "Gehitu",
 		"ADD_MENU_NICKNAME": "Ezizena",
-		"ADD_MENU_NOTE": "Iruzkina",
+		"ADD_MENU_NOTE": "Ezizena",
 		"ADD_MENU_PHONE": "Telefonoa",
 		"ADD_MENU_URL": "URL",
 		"ADD_MENU_ADDRESS": "Helbidea",
@@ -236,13 +234,13 @@
 		"ADD_MENU_TAGS": "Etiketak",
 		"BUTTON_SHARE_ALL": "Denak",
 		"BUTTON_SYNC": "Sinkronizazioa (CardDAV)",
-		"SEND_TO_ALL_CONTACT_EMAILS": "Bidali kontaktu guztiei"
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
-		"LINK_SHOW_INPUTS": "Erakutsi eremu guztiak",
+		"LINK_SHOW_INPUTS": "erakutsi eremu guztiak",
 		"BUTTON_SEND": "Bidali",
 		"BUTTON_MINIMIZE": "Minimizatu",
-		"SAVED_TIME": "%TIME%-etan gordea",
+		"SAVED_TIME": "%TIME%-n gordea",
 		"SAVED_ERROR_ON_SEND": "Mezua bidali da baina ez da gorde bidalitako elementuen karpetan",
 		"DISCARD_UNSAVED_DATA": "Baztertu gorde gabeko datuak?",
 		"ATTACH_FILES": "Erantsi fitxategiak",
@@ -250,20 +248,20 @@
 		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% idatzia",
 		"FORWARD_MESSAGE_TOP_TITLE": "-------- Birbidalitako mezua -------",
 		"FORWARD_MESSAGE_TOP_SENT": "Bidalita",
-		"EMPTY_TO_ERROR_DESC": "Gehitu jasotzaile bat gutxienez",
+		"EMPTY_TO_ERROR_DESC": "Mesedez, gehitu gutxienez jasotzaile bat",
 		"NO_ATTACHMENTS_HERE_DESC": "Ez dago eranskinik hemen.",
 		"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": "Automatikoki gorde zirriborroa",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatikoi gorde zirriborroa",
 		"BUTTON_REQUEST_READ_RECEIPT": "Eskatu irakurketa-agiria",
-		"BUTTON_MARK_AS_IMPORTANT": "Markatu garrantzitsu gisa",
+		"BUTTON_MARK_AS_IMPORTANT": "MArkatu garrantzitsu bezala",
 		"BUTTON_REQUEST_DSN": "Eskatu jasotze-agiria",
-		"BUTTON_REQUIRE_TLS": "Eskatu entrega segurua",
-		"ERROR_EMPTY_BODY": "Mezua hutsik dago"
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"EXIT_ARE_YOU_SURE": "Ziur zaude irten nahi duzula?",
+		"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?"
 	},
@@ -271,20 +269,20 @@
 		"TITLE_LANGUAGES": "Aukeratu zure hizkuntza"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Gehitu kontua",
+		"TITLE_ADD_ACCOUNT": "Kontua gehitu",
 		"BUTTON_ADD_ACCOUNT": "Gehitu",
-		"TITLE_UPDATE_ACCOUNT": "Eguneratu kontua"
+		"TITLE_UPDATE_ACCOUNT": "Kontua eguneratu"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Gehitu nortasuna",
-		"TITLE_UPDATE_IDENTITY": "Eguneratu nortasuna",
-		"LABEL": "Etiketa",
+		"TITLE_ADD_IDENTITY": "Nortasuna gehitu",
+		"TITLE_UPDATE_IDENTITY": "Nortasuna eguneratu",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Gehitu",
-		"SIGNATURE": "Sinadura",
-		"LABEL_SIGNATURE_INSERT_BEFORE": "Txertatu sinadura hau erantzunaren aurretik"
+		"SIGNATURE": "Signature",
+		"LABEL_SIGNATURE_INSERT_BEFORE": "Txertatu sinadura hau erantzuteko testuaren aurretik"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Sortu karpeta",
+		"TITLE_CREATE_FOLDER": "Karpeta sortu",
 		"LABEL_PARENT": "Karpeta gurasoa",
 		"BUTTON_CREATE": "Sortu",
 		"TITLE_CREATING_PROCESS": "Karpeta sortzen"
@@ -303,13 +301,13 @@
 		"VERIFY": "Egiaztatu",
 		"GOOD_SIGNATURE": "%USER%-en sinadura egokia",
 		"ERROR": "%TYPE% errorea: %ERROR%",
-		"CREATE_SELF_SIGNED": "Sortu sinadura automatikoa",
-		"VALID_UNTIL": "Noiz arte balio du",
-		"PRIVATE_KEY": "Gako pribatua",
-		"CHANGE_PASS": "Aldatu pasaesaldia",
-		"CURRENT_PASS": "Uneko pasaesaldia",
-		"NEW_PASS": "Pasaesaldi berria",
-		"ASK_CRYPTKEY_PASS": "Saioaren pasahitza aldatu egin da. Bete zure saio-hasierako pasahitz zaharrean deszifratzeko"
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login password to decrypt data"
 	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Inportatu OpenPGP gakoa",
@@ -322,19 +320,19 @@
 		"SIGNED_MESSAGE": "OpenPGP sinatutako mezua",
 		"ENCRYPTED_MESSAGE": "OpenPGP zifratutako mezua",
 		"STORE_IN_GNUPG": "Zerbitzarian gorden GnuPG-n",
-		"STORE_PUBLIC_KEY_IN_GNUPG": "Gorde gako publikoa GnuPGko zerbitzarian",
-		"STORE_PRIVATE_KEY_IN_GNUPG": "Gorde gako pribatua GnuPGko zerbitzarian",
-		"BACKUP_ON_SERVER": "Gorde zerbitzarian (zifratuta)",
-		"BACKUP_PUBLIC_KEY_ON_SERVER": "Gorde gako publikoa zerbitzarian",
-		"BACKUP_PRIVATE_KEY_ON_SERVER": "Gorde gako pribatua zerbitzarian"
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
+		"BACKUP_ON_SERVER": "Zerbitzarian gorde (zifratuta)",
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
 	},
 	"SMIME": {
-		"POPUP_IMPORT_TITLE": "Inportatu S\/MIME ziurtagiria",
-		"CERTIFICATE": "Ziurtagiria",
-		"CERTIFICATES": "S\/MIME ziurtagiria",
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
 		"SIGNED_MESSAGE": "S\/MIME sinatutako mezua",
 		"ENCRYPTED_MESSAGE": "S\/MIME zifratutako mezua",
-		"PRIVATE_KEY_OF": "S\/MIME %EMAIL%-ren gako pribatua"
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Sortu iragazkia",
@@ -362,13 +360,13 @@
 		"SELECT_TYPE_OVER": "Gainean",
 		"SELECT_TYPE_UNDER": "Azpian",
 		"SELECT_TYPE_TEXT": "Testua",
-		"SELECT_TYPE_RAW": "Gordina",
+		"SELECT_TYPE_RAW": "Raw",
 		"SELECT_MATCH_ANY": "Bat etortzeak hurrengo EDOZEIN araurekin",
 		"SELECT_MATCH_ALL": "Bat etortzeak hurrengo arau GUZTIEKIN",
 		"MARK_AS_READ_LABEL": "Markatu irakurri bezala",
 		"REPLY_INTERVAL_LABEL": "Erantzuteko tartea (egunak)",
-		"KEEP_LABEL": "Mantenua",
-		"STOP_LABEL": "Utzi arauak gehiago izapidetzeari",
+		"KEEP_LABEL": "Mantenu",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "Gaia (hautazkoa)",
 		"VACATION_MESSAGE_LABEL": "Mezua",
 		"VACATION_RECIPIENTS_LABEL": "Hartzaileak (komaz bananduta)",
@@ -376,8 +374,8 @@
 		"ALL_INCOMING_MESSAGES_DESC": "Iristen diren mezu guztiak"
 	},
 	"POPUPS_SIEVE_SCRIPT": {
-		"TITLE_CREATE": "Sortu scripta",
-		"TITLE_EDIT": "Editatu scripta",
+		"TITLE_CREATE": "Sortu Scripta",
+		"TITLE_EDIT": "Editatu Scripta",
 		"BUTTON_ADD_FILTER": "Gehitu iragazkia",
 		"BUTTON_RAW_SCRIPT": "Erabili erabiltzailearen script pertsonal bat",
 		"CAPABILITY_LABEL": "Gaitasunak",
@@ -403,37 +401,37 @@
 		"ERROR_NO_FILE_UPLOADED": "Ez da fitxategirik kargatu",
 		"ERROR_MISSING_TEMP_FOLDER": "Fitxategi tenporala falta da",
 		"ERROR_ON_SAVING_FILE": "Fitxategi-kargako errore ezezagun bat gertatu da",
-		"ERROR_FILE_TYPE": "Fitxategi-mota ez baliozkoa",
+		"ERROR_FILE_TYPE": "Ez baliozko fitxategi-mota",
 		"ERROR_UNKNOWN": "Fitxategi-kargako errore ezezagun bat gertatu da"
 	},
 	"EDITOR": {
 		"PLAIN": "HTML <-> TESTUA",
 		"SOURCE": "HTML <-> JATORRIA",
-		"FONTFAMILY": "Letra mota",
-		"FONTSIZE": "Letra tamaina",
-		"DIR": "Testuaren noranzkoa",
-		"DIR_LTR": "Eskerretik eskuinera",
-		"DIR_RTL": "Eskuinetik eskerrera",
-		"DIR_AUTO": "Automatikoa",
-		"TEXTCOLOR": "Testuaren kolorea",
-		"BACKGROUNDCOLOR": "Atzeko planoaren kolorea",
-		"BOLD": "Lodia",
-		"ITALIC": "Etzana",
-		"UNDERLINE": "Azpimarratua",
-		"STRIKE": "Marratua",
-		"SUB": "Azpi-indizea",
-		"SUP": "Goi-indizea",
-		"OL": "Zerrenda ordenatua",
-		"UL": "Ordenik gabeko zerrenda",
-		"QUOTE": "Aipua",
-		"INDENTDECREASE": "Txikitu koska",
-		"INDENTINCREASE": "Handitu koska",
-		"LINK": "Esteka",
-		"IMAGEURL": "Irudiaren URLa",
-		"IMAGEUPLOAD": "Aukeratu irudia",
-		"UNDO": "Desegin",
-		"REDO": "Berregin",
-		"REMOVESTYLE": "Kendu estiloa"
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Orokorra",
@@ -447,7 +445,7 @@
 	"SETTINGS_FILTERS": {
 		"SIMPLE": "Arrunta",
 		"ADVANCED": "Aurretatua",
-		"BUTTON_ADD_SCRIPT": "Gehitu scripta",
+		"BUTTON_ADD_SCRIPT": "Gehitu Scripta",
 		"SUBNAME_MOVE_TO": "Mugitu \"%FOLDER%\"-era",
 		"SUBNAME_FORWARD_TO": "Birbidali \"%EMAIL%\"-era",
 		"SUBNAME_REJECT": "Errefusatu",
@@ -457,18 +455,18 @@
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Segurtasuna",
 		"LABEL_AUTOLOGOUT": "Saioa automatikoki itxi",
-		"FORGET_KEY_PASS": "Ahaztu gako pribatuaren pasaesaldia",
-		"NEVER": "Inoiz ez"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "Inoiz"
 	},
 	"SETTINGS_GENERAL": {
 		"LANGUAGE": "Hizkuntza",
-		"HOUR_FORMAT": "Ordu-formatua",
+		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Nortasuna",
 		"LAYOUT": "Diseinua",
 		"LAYOUT_NO_SPLIT": "Zatitu gabe",
 		"LAYOUT_VERTICAL_SPLIT": "Zatiketa bertikala",
 		"LAYOUT_HORIZONTAL_SPLIT": "Zatiketa horizontala",
-		"SHOW_NEXT_MESSAGE": "Erakutsi hurrengo mezua unekoa mugitu edo ezabatzean",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Berezko testu editorea",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Formaturik gabea",
@@ -477,36 +475,35 @@
 		"HIDE_DELETED_MESSAGES": "Ezkutatu ezabatzeko markatutako mezuak",
 		"USE_CHECKBOXES_IN_LIST": "Bistaratu kontrol laukiak zerrendan",
 		"USE_THREADS": "Erabili hariak",
-		"THREAD_ALGORITHM": "Harien algoritmoa",
+		"THREAD_ALGORITHM": "Threads algorithm",
 		"REPLY_SAME_FOLDER": "Kokatu erantzunak erantzundako mezuaren karpeta berean",
 		"PREFER_HTML": "Lehenetsi HTMLa testu arruntari",
 		"PREFER_HTML_INFO": "Mezuak batzuetan bi formatuetan datoz. Aukera honekin HTML edo testu arrunt partea erakustea aukera dezakezu.",
 		"REMOVE_COLORS": "Kendu atzealdeko irudia eta testuaren kolorean mezuaren gorputzetik",
-		"ALLOW_STYLES": "Gaitu <style> CSS",
+		"ALLOW_STYLES": "Allow <style> CSS",
 		"MESSAGE_PER_PAGE": "Orrialdeko mezuak",
-		"CHECK_MAIL_INTERVAL": "Posta begiratzeko tartea",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
 		"MARK_MESSAGE_READ_AFTER": "Markatu mezua irakurrita ondoren",
 		"MSG_DEFAULT_ACTION": "Lehenetsitako ekintza",
-		"SECONDS": "segundo",
-		"MINUTES": "minutu",
+		"SECONDS": "segundu",
+		"MINUTES": "minutes",
 		"NOTIFICATIONS": "Jakinarazpenak",
 		"SOUND_NOTIFICATION": "Soinu-jakinarazpena",
 		"CHROME_NOTIFICATION_DESC": "Erakutsi mezu berrien jakinarazpen popup-ak",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Nabigatzaileak blokeatuta)",
-		"COLLAPSE_BLOCKQUOTES": "Bildu aipuko testua",
-		"MAX_QUOTE_LEVEL": "Ageriko aipamen-maila maximoak",
-		"MIN_FONT_SIZE": "Minimum Font Size",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
 		"LIST_INLINE_ATTACHMENTS": "Erakutsi sareko eranskinak zerrendan",
 		"LIST_SIMPLE_ATTACHMENTS": "Eranskinen zerrenda arrunta",
-		"LIST_MESSAGES_GROUPED": "Zerrendatu mezuak taldekatuak (ordena jatorria edo data denean)",
-		"EXTERNAL_IMAGES": "Kanpoko irudiak",
-		"IMAGES_OPTION_ASK": "Galdetu beti",
-		"IMAGES_OPTION_WHITELIST": "Zerrenda zuria edo galdetu",
-		"IMAGES_OPTION_ALWAYS": "Erakutsi bete",
-		"IMAGES_WHITELIST": "Irudien zerrenda zuria",
-		"MESSAGE_POPUP_WINDOW": "Agertu popup-ean fitxa berrian ordez",
-		"MAILTO": "Erregistratu 'mailto:' esteken kudeatzaile gisa",
-		"HTML_TO_MD": "Bihurtu HTML Markdown-era formaturik gabeko testuraren ordez"
+		"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",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatikoki gehitu hartzaileak helbide-liburura",
@@ -558,12 +555,12 @@
 		"BUTTON_ADD_ACCOUNT": "Gehitu kontu bat",
 		"BUTTON_ADD_IDENTITY": "Gehitu identitate bat",
 		"LOADING_PROCESS": "Eguneratzen...",
-		"SHOW_UNREAD": "Erakutsi irakurri gabeko mezuen kopurua"
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Inportatu Gakoa",
 		"BUTTON_GENERATE_KEY_PAIR": "Sortu Gako Parea",
-		"IMPORT_FROM_SERVER": "Inportatu zerbitzaritik",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Pribatua",
 		"TITLE_PUBLIC": "Publikoa",
 		"GET_MAILVELOPE": "Lortu Mailvelope nabigatzaileko gehigarria."
diff --git a/snappymail/v/0.0.0/app/localization/fa/user.json b/snappymail/v/0.0.0/app/localization/fa/user.json
index 3888bc47c..75592f471 100644
--- a/snappymail/v/0.0.0/app/localization/fa/user.json
+++ b/snappymail/v/0.0.0/app/localization/fa/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "استفاده <strong>%SIZE% (%PROC%%)<\/strong> از<strong>%LIMIT%<\/strong> برای شما",
 		"SORT": "Sort",
 		"NO_SORT": "Mail server does not support sorting",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(مسدود شده توسط مرورگر)",
 		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
 		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"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)",
diff --git a/snappymail/v/0.0.0/app/localization/fi/user.json b/snappymail/v/0.0.0/app/localization/fi/user.json
index 6e3eb1d9c..f14ed8416 100644
--- a/snappymail/v/0.0.0/app/localization/fi/user.json
+++ b/snappymail/v/0.0.0/app/localization/fi/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Käytät <strong>%SIZE% (%PROC%%)<\/strong> sinulle varatusta <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
 		"NO_SORT": "Mail server does not support sorting",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Estetty selaimessa)",
 		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
 		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"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)",
diff --git a/snappymail/v/0.0.0/app/localization/fr/user.json b/snappymail/v/0.0.0/app/localization/fr/user.json
index fb39cb0c0..1df10a859 100644
--- a/snappymail/v/0.0.0/app/localization/fr/user.json
+++ b/snappymail/v/0.0.0/app/localization/fr/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Vous utilisez <strong>%SIZE% (%PROC%%)<\/strong> sur <strong>%LIMIT%<\/strong>",
 		"SORT": "Trier",
 		"NO_SORT": "Le serveur de messagerie ne prend pas en charge le tri",
-		"SORT_ARRIVAL_ASC": "Arrivée ascendante",
-		"SORT_ARRIVAL_DESC": "Arrivée décroissante",
 		"SORT_DATE_ASC": "Date ascendante",
 		"SORT_DATE_DESC": "Date décroissante",
 		"SORT_SIZE_ASC": "Taille ascendante",
@@ -247,7 +245,7 @@
 		"DISCARD_UNSAVED_DATA": "Abandonner les données non enregistrées ?",
 		"ATTACH_FILES": "Joindre des fichiers",
 		"ATTACH_DROP_FILES_DESC": "Glisser les fichiers ici",
-		"REPLY_MESSAGE_TITLE": "%DATETIME% %EMAIL% a écrit ",
+		"REPLY_MESSAGE_TITLE": "%DATETIME% %EMAIL% a écrit",
 		"FORWARD_MESSAGE_TOP_TITLE": "-------- Message transféré -------",
 		"FORWARD_MESSAGE_TOP_SENT": "Envoyé",
 		"EMPTY_TO_ERROR_DESC": "Merci de spécifier au moins un destinataire",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Bloqué par le navigateur)",
 		"COLLAPSE_BLOCKQUOTES": "Réduire le texte cité",
 		"MAX_QUOTE_LEVEL": "Niveau maximum de texte cité visible",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"LIST_INLINE_ATTACHMENTS": "Afficher les pièces jointes intégrées dans la liste",
 		"LIST_SIMPLE_ATTACHMENTS": "Liste simple des pièces jointes",
 		"LIST_MESSAGES_GROUPED": "Lister les messages groupés (lors du tri par Date ou Destinataire)",
diff --git a/snappymail/v/0.0.0/app/localization/hu/user.json b/snappymail/v/0.0.0/app/localization/hu/user.json
index 911790cb5..94e4bf9f6 100644
--- a/snappymail/v/0.0.0/app/localization/hu/user.json
+++ b/snappymail/v/0.0.0/app/localization/hu/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Felhasználva <strong>%SIZE% (%PROC%%)<\/strong> ebből: <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
 		"NO_SORT": "Mail server does not support sorting",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(a böngésző blokkolta)",
 		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
 		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"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)",
diff --git a/snappymail/v/0.0.0/app/localization/id/user.json b/snappymail/v/0.0.0/app/localization/id/user.json
index f2482e3aa..4c02611c6 100644
--- a/snappymail/v/0.0.0/app/localization/id/user.json
+++ b/snappymail/v/0.0.0/app/localization/id/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Menggunakan <strong>%SIZE% (%PROC%%)<\/strong> dari <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
 		"NO_SORT": "Mail server does not support sorting",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(diblokir oleh browser)",
 		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
 		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"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)",
diff --git a/snappymail/v/0.0.0/app/localization/is/user.json b/snappymail/v/0.0.0/app/localization/is/user.json
index d9c9c6de6..bbf9b8da0 100644
--- a/snappymail/v/0.0.0/app/localization/is/user.json
+++ b/snappymail/v/0.0.0/app/localization/is/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Notar <strong>%SIZE% (%PROC%%)<\/strong> af <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
 		"NO_SORT": "Mail server does not support sorting",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Lokað af vafra)",
 		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
 		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"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)",
diff --git a/snappymail/v/0.0.0/app/localization/it/user.json b/snappymail/v/0.0.0/app/localization/it/user.json
index c55c8dff3..3829b1444 100644
--- a/snappymail/v/0.0.0/app/localization/it/user.json
+++ b/snappymail/v/0.0.0/app/localization/it/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Stai usando <strong>%SIZE% (%PROC%%)<\/strong> su <strong>%LIMIT%<\/strong>",
 		"SORT": "Riordina",
 		"NO_SORT": "Il mail server non supporta l'ordinamento",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Data crescente",
 		"SORT_DATE_DESC": "Data decrescente",
 		"SORT_SIZE_ASC": "Dimensione crescente",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Bloccate dal browser)",
 		"COLLAPSE_BLOCKQUOTES": "Nascondi testo quotato",
 		"MAX_QUOTE_LEVEL": "Livelli massimi visibilità testo quotato",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"LIST_INLINE_ATTACHMENTS": "Visualizza lista degli allegati in linea",
 		"LIST_SIMPLE_ATTACHMENTS": "Lista semplice allegati",
 		"LIST_MESSAGES_GROUPED": "Lista messaggi raggruppati (quando riordinati per data o mittente)",
diff --git a/snappymail/v/0.0.0/app/localization/ja/user.json b/snappymail/v/0.0.0/app/localization/ja/user.json
index c24c8d205..1bcab0ebc 100644
--- a/snappymail/v/0.0.0/app/localization/ja/user.json
+++ b/snappymail/v/0.0.0/app/localization/ja/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "<strong>%SIZE% (%PROC%%)<\/strong>\/<strong>%LIMIT%<\/strong>を使用中",
 		"SORT": "Sort",
 		"NO_SORT": "Mail server does not support sorting",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "日付で昇順",
 		"SORT_DATE_DESC": "日付で降順",
 		"SORT_SIZE_ASC": "サイズで昇順",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(ブラウザでブロックされています)",
 		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
 		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"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)",
diff --git a/snappymail/v/0.0.0/app/localization/ko/user.json b/snappymail/v/0.0.0/app/localization/ko/user.json
index abcd658f5..02b0bb0d5 100644
--- a/snappymail/v/0.0.0/app/localization/ko/user.json
+++ b/snappymail/v/0.0.0/app/localization/ko/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "총 <strong>%LIMIT%<\/strong> 중 <strong>%PROC%%<\/strong>을(를) 사용 중입니다.",
 		"SORT": "Sort",
 		"NO_SORT": "Mail server does not support sorting",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(브라우저에 의해 차단됨)",
 		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
 		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"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)",
diff --git a/snappymail/v/0.0.0/app/localization/langs.json b/snappymail/v/0.0.0/app/localization/langs.json
index a23a38b25..b8f948516 100644
--- a/snappymail/v/0.0.0/app/localization/langs.json
+++ b/snappymail/v/0.0.0/app/localization/langs.json
@@ -1,7 +1,6 @@
 {
     "LANGS_NAMES": {
         "id": "Bahasa Indonesia",
-        "ca": "Català",
         "cs": "Čeština",
         "da": "Dansk",
         "de": "Deutsch",
@@ -240,4 +239,4 @@
         "za": "Zhuang",
         "zu": "Zulu"
     }
-}
+}
\ No newline at end of file
diff --git a/snappymail/v/0.0.0/app/localization/lt/user.json b/snappymail/v/0.0.0/app/localization/lt/user.json
index ac72ad101..483b0a2b6 100644
--- a/snappymail/v/0.0.0/app/localization/lt/user.json
+++ b/snappymail/v/0.0.0/app/localization/lt/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Naudojate <strong>%SIZE% (%PROC%%)<\/strong> iš savo turimų <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
 		"NO_SORT": "Mail server does not support sorting",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Blokuoja naršyklė)",
 		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
 		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"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)",
diff --git a/snappymail/v/0.0.0/app/localization/lv/user.json b/snappymail/v/0.0.0/app/localization/lv/user.json
index b611f8225..20ed39cc2 100644
--- a/snappymail/v/0.0.0/app/localization/lv/user.json
+++ b/snappymail/v/0.0.0/app/localization/lv/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Izmantots <strong>%SIZE% (%PROC%%)<\/strong> no <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
 		"NO_SORT": "Mail server does not support sorting",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Parlūkprogramma bloķēja)",
 		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
 		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"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)",
diff --git a/snappymail/v/0.0.0/app/localization/nb/user.json b/snappymail/v/0.0.0/app/localization/nb/user.json
index a8f95e122..fa14ab14b 100644
--- a/snappymail/v/0.0.0/app/localization/nb/user.json
+++ b/snappymail/v/0.0.0/app/localization/nb/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Bruker <strong> %SIZE% ( %PROC%% ) <\/strong> av <strong> %LIMIT% <\/strong>",
 		"SORT": "Sort",
 		"NO_SORT": "Mail server does not support sorting",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Dato, stigende",
 		"SORT_DATE_DESC": "Dato, synkende",
 		"SORT_SIZE_ASC": "Størrelse, stigende",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(blokkert av nettleser)",
 		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
 		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"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)",
diff --git a/snappymail/v/0.0.0/app/localization/nl/user.json b/snappymail/v/0.0.0/app/localization/nl/user.json
index 25964de24..5c898ef85 100644
--- a/snappymail/v/0.0.0/app/localization/nl/user.json
+++ b/snappymail/v/0.0.0/app/localization/nl/user.json
@@ -27,8 +27,6 @@
 		"USERNAME": "Gebruikersnaam",
 		"PASSWORD": "Wachtwoord",
 		"REMEMBER": "Onthouden",
-		"REMEMBER_FOR_SESSION": "Onthoud voor deze sessie",
-		"REMEMBER_PERMANENT": "Onthoud permanent",
 		"REPLY_TO": "Antwoordadres",
 		"SAVE": "Opslaan",
 		"SAVE_CHANGES": "Wijzigingen opslaan?",
@@ -132,8 +130,6 @@
 		"QUOTA_SIZE": "U gebruikt <strong>%SIZE% (%PROC%%)<\/strong> van <strong>%LIMIT%<\/strong>",
 		"SORT": "Sorteren",
 		"NO_SORT": "Mail server ondersteund sorteren niet",
-		"SORT_ARRIVAL_ASC": "Ontvangen oplopend",
-		"SORT_ARRIVAL_DESC": "Ontvangen aflopend",
 		"SORT_DATE_ASC": "Datum oplopend",
 		"SORT_DATE_DESC": "Datum aflopend",
 		"SORT_SIZE_ASC": "Grootte oplopend",
@@ -460,8 +456,7 @@
 		"LEGEND_SECURITY": "Beveiliging",
 		"LABEL_AUTOLOGOUT": "Automatisch uitloggen",
 		"FORGET_KEY_PASS": "Vergeet privésleutel wachtwoord",
-		"NEVER": "Nooit",
-		"LABEL_STORED_PASS": "Wachtwoordzin opgeslagen"
+		"NEVER": "Nooit"
 	},
 	"SETTINGS_GENERAL": {
 		"LANGUAGE": "Taal",
@@ -498,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Geblokkeerd door de browser)",
 		"COLLAPSE_BLOCKQUOTES": "Geciteerde tekst inklappen",
 		"MAX_QUOTE_LEVEL": "Maximaal zichtbare geciteerde tekstniveaus",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"LIST_INLINE_ATTACHMENTS": "Toon inline bijlagen in lijst",
 		"LIST_SIMPLE_ATTACHMENTS": "Simpele bijlagen lijst",
 		"LIST_MESSAGES_GROUPED": "Toon berichten gegroepeerd (bij sorteren op Datum of Van)",
diff --git a/snappymail/v/0.0.0/app/localization/pl/user.json b/snappymail/v/0.0.0/app/localization/pl/user.json
index ba8a169ee..b4a11b0af 100644
--- a/snappymail/v/0.0.0/app/localization/pl/user.json
+++ b/snappymail/v/0.0.0/app/localization/pl/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Wykorzystano <strong>%SIZE% (%PROC%%)<\/strong> z <strong>%LIMIT%<\/strong>",
 		"SORT": "Sortowanie",
 		"NO_SORT": "Serwer pocztowy nie wspiera sortowania",
-		"SORT_ARRIVAL_ASC": "Odebrano rosnąco",
-		"SORT_ARRIVAL_DESC": "Odebrano malejąco",
 		"SORT_DATE_ASC": "Data rosnąco",
 		"SORT_DATE_DESC": "Data malejąco",
 		"SORT_SIZE_ASC": "Wielkość rosnąco",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Zablokowane przez przeglądarkę)",
 		"COLLAPSE_BLOCKQUOTES": "Zwiń cytowany tekst",
 		"MAX_QUOTE_LEVEL": "Maksymalna ilość poziomów cytowanego tekstu",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"LIST_INLINE_ATTACHMENTS": "Pokaż załączniki wbudowane na liście",
 		"LIST_SIMPLE_ATTACHMENTS": "Prosta lista załączników",
 		"LIST_MESSAGES_GROUPED": "Grupuj listę wiadomości (kiedy sortowana po dacie lub \"Od\")",
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 e10e78c3f..0ac96760e 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
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Utilizando <strong>%SIZE% (%PROC%%)<\/strong> de <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
 		"NO_SORT": "Mail server does not support sorting",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado pelo navegador)",
 		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
 		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"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)",
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 e5da381a7..da1ed6de6 100644
--- a/snappymail/v/0.0.0/app/localization/pt/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Está a usar <strong>%SIZE% (%PROC%%)<\/strong> dos <strong>%LIMIT%<\/strong>",
 		"SORT": "Ordenar",
 		"NO_SORT": "O servidor de correio não suporta ordenação",
-		"SORT_ARRIVAL_ASC": "Chegada ascendente",
-		"SORT_ARRIVAL_DESC": "Chegada descendente",
 		"SORT_DATE_ASC": "Data ascendente",
 		"SORT_DATE_DESC": "Data descendente",
 		"SORT_SIZE_ASC": "Tamanho ascendente",
@@ -219,11 +217,11 @@
 		"CONTACT_VIEW_DESC": "Escolha o contacto na lista para visualizá-lo.",
 		"LABEL_BIRTHDAY": "Aniversário",
 		"DISPLAY_NAME": "Nome a apresentar",
-		"LAST_NAME": "Apelido",
-		"FIRST_NAME": "Nome",
-		"MIDDLE_NAME": "Nome do meio",
-		"NAME_PREFIX": "Prefixo do nome",
-		"NAME_SUFFIX": "Sufixo do nome",
+		"LAST_NAME": "Ultimo nome",
+		"FIRST_NAME": "Primeiro nome",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
 		"NICK_NAME": "Alcunha",
 		"LABEL_READ_ONLY": "Só de leitura",
 		"ADD_MENU_LABEL": "Adicionar",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado pelo navegador)",
 		"COLLAPSE_BLOCKQUOTES": "Minimizar texto citado",
 		"MAX_QUOTE_LEVEL": "Níveis máximos de texto citado visíveis",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"LIST_INLINE_ATTACHMENTS": "Mostrar na lista de anexos os anexos integrados no corpo",
 		"LIST_SIMPLE_ATTACHMENTS": "Lista simples de anexos",
 		"LIST_MESSAGES_GROUPED": "Agrupar mensagens listadas (quando ordenadas por data ou remetente)",
diff --git a/snappymail/v/0.0.0/app/localization/ro/user.json b/snappymail/v/0.0.0/app/localization/ro/user.json
index 9705bf33d..e82b3080a 100644
--- a/snappymail/v/0.0.0/app/localization/ro/user.json
+++ b/snappymail/v/0.0.0/app/localization/ro/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Ați folosit <strong>%SIZE% (%PROC%%)<\/strong> din <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
 		"NO_SORT": "Mail server does not support sorting",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(browser-ul blocat)",
 		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
 		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"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)",
diff --git a/snappymail/v/0.0.0/app/localization/ru/user.json b/snappymail/v/0.0.0/app/localization/ru/user.json
index 48d9ea398..e3bd2dfad 100644
--- a/snappymail/v/0.0.0/app/localization/ru/user.json
+++ b/snappymail/v/0.0.0/app/localization/ru/user.json
@@ -27,13 +27,11 @@
 		"USERNAME": "Имя пользователя",
 		"PASSWORD": "Пароль",
 		"REMEMBER": "Запомнить",
-		"REMEMBER_FOR_SESSION": "Запомнить Временное",
-		"REMEMBER_PERMANENT": "Запомнить Навсегда",
 		"REPLY_TO": "Ответить-на",
 		"SAVE": "Сохранить",
 		"SAVE_CHANGES": "Сохранить изменения?",
 		"SEARCH": "Поиск",
-		"SPAM": "Спам",
+		"SPAM": "В спам",
 		"SUBJECT": "Тема",
 		"TEST": "Тест",
 		"TO": "Кому",
@@ -62,12 +60,12 @@
 		"UNSEEN": "Непрочитанные",
 		"DATE": "Дата",
 		"DATE_ALL": "За всё время",
-		"BEFORE_3_DAYS": "Старше 3 дней",
-		"BEFORE_7_DAYS": "Старше недели",
-		"BEFORE_MONTH": "Старше месяца",
-		"BEFORE_3_MONTHS": "Старше 3 месяцев",
-		"BEFORE_6_MONTHS": "Старше полугода",
-		"BEFORE_YEAR": "Старше года",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
 		"SINCE_3_DAYS": "За три дня",
 		"SINCE_7_DAYS": "За неделю",
 		"SINCE_MONTH": "За месяц",
@@ -132,8 +130,6 @@
 		"QUOTA_SIZE": "Использовано <strong>%SIZE% (%PROC%%)<\/strong> из <strong>%LIMIT%<\/strong>",
 		"SORT": "Сортировка",
 		"NO_SORT": "Почтовый сервер не поддерживает сортировку",
-		"SORT_ARRIVAL_ASC": "Получено (по возрастанию)",
-		"SORT_ARRIVAL_DESC": "Получено (по убыванию)",
 		"SORT_DATE_ASC": "Дата по возрастанию",
 		"SORT_DATE_DESC": "Дата по убыванию",
 		"SORT_SIZE_ASC": "Размер по возрастанию",
@@ -162,7 +158,7 @@
 		"MENU_VIEW_ORIGINAL": "Просмотреть оригинал",
 		"HTML_VIEW": "Просмотр сообщения в HTML",
 		"PLAIN_VIEW": "Просмотр простого текстового сообщения",
-		"SWAP_COLORS": "Переключить цвет фона по умолчанию",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": "Скачать как .eml файл",
 		"MENU_FILTER_SIMILAR": "Фильтровать похожие",
 		"MENU_PRINT": "Распечатать",
@@ -178,8 +174,8 @@
 		"HAS_VIRUS_WARNING": "ВНИМАНИЕ: Обнаружен вирус!",
 		"TAGS": "Метки",
 		"NEW_TAG": "Новая метка",
-		"ENABLE_TRACKING_LINKS": "Включить отслеживание ссылок",
-		"TRACKING_ENABLED": "Теперь клики по ссылкам отслеживаются!"
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
 	},
 	"MESSAGE_TAGS": {
 		"$important": "Важное",
@@ -305,13 +301,13 @@
 		"VERIFY": "Проверить",
 		"GOOD_SIGNATURE": "Подтвержденная сигнатура для %USER%",
 		"ERROR": "%TYPE% ошибка: %ERROR%",
-		"CREATE_SELF_SIGNED": "Создать самоподписанный",
-		"VALID_UNTIL": "Действителен до",
-		"PRIVATE_KEY": "Закрытый ключ (PK)",
-		"CHANGE_PASS": "Изменить парольную фразу",
-		"CURRENT_PASS": "Текущая парольная фраза",
-		"NEW_PASS": "Новая парольная фраза",
-		"ASK_CRYPTKEY_PASS": "Ваша парольная фраза была изменена. Введите вашу старую фразу для расшифровки данных"
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
 	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Импорт OpenPGP ключа",
@@ -323,20 +319,20 @@
 		"LABEL_KEY_TYPE": "Тип",
 		"SIGNED_MESSAGE": "OpenPGP подписанное сообщение",
 		"ENCRYPTED_MESSAGE": "OpenPGP шифрованное сообщение",
-		"STORE_IN_GNUPG": "Хранение на сервере в GnuPG",
-		"STORE_PUBLIC_KEY_IN_GNUPG": "Хранение открытого ключа на сервере в GnuPG",
-		"STORE_PRIVATE_KEY_IN_GNUPG": "Хранение закрытого ключа на сервере в GnuPG",
+		"STORE_IN_GNUPG": "Хранить на сервере в GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
 		"BACKUP_ON_SERVER": "Хранить (с шифрованием) на сервере",
-		"BACKUP_PUBLIC_KEY_ON_SERVER": "Хранить открытый ключ на сервере",
-		"BACKUP_PRIVATE_KEY_ON_SERVER": "Хранить закрытый ключ на сервере"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
 	},
 	"SMIME": {
-		"POPUP_IMPORT_TITLE": "Импорт сертификата S\/MIME",
-		"CERTIFICATE": "Сертификат",
-		"CERTIFICATES": "Сертификаты S\/MIME",
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
 		"SIGNED_MESSAGE": "S\/MIME подписанное сообщение",
 		"ENCRYPTED_MESSAGE": "S\/MIME шифрованное сообщение",
-		"PRIVATE_KEY_OF": "S\/MIME приватный ключ для %EMAIL%"
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Создать фильтр",
@@ -411,31 +407,31 @@
 	"EDITOR": {
 		"PLAIN": "HTML <-> TEXT",
 		"SOURCE": "HTML <-> SOURCE",
-		"FONTFAMILY": "Шрифт",
-		"FONTSIZE": "Размер шрифта",
-		"DIR": "Направление текста",
-		"DIR_LTR": "Слева направо",
-		"DIR_RTL": "Справа налево",
-		"DIR_AUTO": "Автоматически",
-		"TEXTCOLOR": "Цвет текста",
-		"BACKGROUNDCOLOR": "Цвет фона",
-		"BOLD": "Жирный",
-		"ITALIC": "Курсив",
-		"UNDERLINE": "Подчеркнутый",
-		"STRIKE": "Зачеркнутый",
-		"SUB": "Подстрочный индекс",
-		"SUP": "Надстрочный индекс",
-		"OL": "Упорядоченный список",
-		"UL": "Неупорядоченный список",
-		"QUOTE": "Блок-цитата",
-		"INDENTDECREASE": "Уменьшить отступ",
-		"INDENTINCREASE": "Увеличить отступ",
-		"LINK": "Ссылка",
-		"IMAGEURL": "URL-адрес изображения",
-		"IMAGEUPLOAD": "Выбрать на устройстве",
-		"UNDO": "Отменить",
-		"REDO": "Повторить",
-		"REMOVESTYLE": "Очистить стиль"
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Основные",
@@ -459,9 +455,8 @@
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Безопасность",
 		"LABEL_AUTOLOGOUT": "Автоматический выход",
-		"FORGET_KEY_PASS": "Забыть парольную фразу закрытого ключа",
-		"NEVER": "Никогда",
-		"LABEL_STORED_PASS": "Remembered Passphrase"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "Никогда"
 	},
 	"SETTINGS_GENERAL": {
 		"LANGUAGE": "Язык",
@@ -480,7 +475,7 @@
 		"HIDE_DELETED_MESSAGES": "Скрыть сообщения, помеченные для удаления",
 		"USE_CHECKBOXES_IN_LIST": "Показывать чекбоксы в списках",
 		"USE_THREADS": "Сворачивать письма в переписках",
-		"THREAD_ALGORITHM": "Группировка по беседам",
+		"THREAD_ALGORITHM": "Threads algorithm",
 		"REPLY_SAME_FOLDER": "Помещать ответы в ту же папку, где находится оригинал",
 		"PREFER_HTML": "Предпочитать HTML обычному тексту",
 		"PREFER_HTML_INFO": "Сообщения иногда приходят в обоих форматах. Этот параметр определяет, хотите ли вы, чтобы отображалась HTML-часть или обычный текст.",
@@ -498,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Блокировано браузером)",
 		"COLLAPSE_BLOCKQUOTES": "Сворачивать блок с процитированным текстом",
 		"MAX_QUOTE_LEVEL": "Максимальный уровень отображения процитированного текста",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"LIST_INLINE_ATTACHMENTS": "Показывать вложения в списке",
 		"LIST_SIMPLE_ATTACHMENTS": "Простой список вложений",
 		"LIST_MESSAGES_GROUPED": "Группировка списка сообщений (при сортировке по дате или отправителю)",
@@ -507,9 +501,9 @@
 		"IMAGES_OPTION_WHITELIST": "Белый список или спрашивать",
 		"IMAGES_OPTION_ALWAYS": "Показать всегда",
 		"IMAGES_WHITELIST": "Форматы из белого списка",
-		"MESSAGE_POPUP_WINDOW": "Всплывающее окно в новом окне вместо вкладки",
-		"MAILTO": "Установить в качестве обработчика ссылок 'mailto:' по умолчанию",
-		"HTML_TO_MD": "Преобразование HTML в Markdown вместо обычного текста"
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Автоматически добавлять получателей писем в адресную книгу",
@@ -566,7 +560,7 @@
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Импортировать ключ",
 		"BUTTON_GENERATE_KEY_PAIR": "Новый ключ",
-		"IMPORT_FROM_SERVER": "Импортировать с сервера",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Приватный",
 		"TITLE_PUBLIC": "Публичный",
 		"GET_MAILVELOPE": "Получить дополнение для браузера Mailvelope."
@@ -618,7 +612,7 @@
 		"DomainAlreadyExists": "Домен уже существует",
 		"DomainNotAllowed": "Данный домен не разрешен",
 		"AccountNotAllowed": "Данный аккаунт не разрешен",
-		"CryptKeyError": "Ваша парольная фраза была изменена",
+		"CryptKeyError": "Your login passphrase has changed",
 		"ContactsSyncError": "Ошибка синхронизации контактов",
 		"CantGetMessageList": "Не могу получить список писем",
 		"CantGetMessage": "Не могу получить письмо",
diff --git a/snappymail/v/0.0.0/app/localization/sk/user.json b/snappymail/v/0.0.0/app/localization/sk/user.json
index 2ebe077b3..520cfe073 100644
--- a/snappymail/v/0.0.0/app/localization/sk/user.json
+++ b/snappymail/v/0.0.0/app/localization/sk/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Používate <strong>%SIZE% (%PROC%%)<\/strong> z vašich <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
 		"NO_SORT": "Mail server does not support sorting",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Zablokované prehliadačom)",
 		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
 		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"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)",
diff --git a/snappymail/v/0.0.0/app/localization/sl/user.json b/snappymail/v/0.0.0/app/localization/sl/user.json
index 75ded310e..e1c9116f5 100644
--- a/snappymail/v/0.0.0/app/localization/sl/user.json
+++ b/snappymail/v/0.0.0/app/localization/sl/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Uporabljenih <strong>%SIZE% (%PROC%%)<\/strong> od <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
 		"NO_SORT": "Mail server does not support sorting",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Zavrnil brskalnik)",
 		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
 		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"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)",
diff --git a/snappymail/v/0.0.0/app/localization/sv/user.json b/snappymail/v/0.0.0/app/localization/sv/user.json
index 961aa9d14..07e071708 100644
--- a/snappymail/v/0.0.0/app/localization/sv/user.json
+++ b/snappymail/v/0.0.0/app/localization/sv/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Använder <strong>%SIZE% (%PROC%%)<\/strong> av dina <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
 		"NO_SORT": "Mail server does not support sorting",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Blockat av webbläsaren)",
 		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
 		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"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)",
diff --git a/snappymail/v/0.0.0/app/localization/tr/user.json b/snappymail/v/0.0.0/app/localization/tr/user.json
index b248cc4d1..dfa6a222e 100644
--- a/snappymail/v/0.0.0/app/localization/tr/user.json
+++ b/snappymail/v/0.0.0/app/localization/tr/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Size ayrılan <strong>%LIMIT%<\/strong>'dan <strong>%SIZE% (%PROC%%)<\/strong> kullanıyorsunuz",
 		"SORT": "Sort",
 		"NO_SORT": "Mail server does not support sorting",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Tarayıcınız tarafından engellendi)",
 		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
 		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"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)",
diff --git a/snappymail/v/0.0.0/app/localization/uk/admin.json b/snappymail/v/0.0.0/app/localization/uk/admin.json
deleted file mode 100644
index d32964f95..000000000
--- a/snappymail/v/0.0.0/app/localization/uk/admin.json
+++ /dev/null
@@ -1,182 +0,0 @@
-{
-	"GLOBAL": {
-		"ADD": "Додати",
-		"CLOSE": "Закрити",
-		"SAVE": "Зберегти",
-		"TEST": "Тест",
-		"UPDATE": "Оновити",
-		"USERNAME": "Ім'я користувача",
-		"PASSWORD": "Пароль",
-		"CANCEL": "Скасувати",
-		"SEARCH": "Пошук",
-		"YES": "Так",
-		"NO": "Ні"
-	},
-	"LOGIN": {
-		"LABEL_LOGIN": "Логін",
-		"LABEL_TOTP": "Код підтвердження TOTP",
-		"BUTTON_LOGIN": "Увійти в панель адміністратора"
-	},
-	"TOP_PANEL": {
-		"LABEL_ADMIN_PANEL": "Панель управління адміністратора"
-	},
-	"SETTINGS_LABELS": {
-		"GENERAL": "Загальні",
-		"LOGIN": "Вхід",
-		"BRANDING": "Брендінг",
-		"CONTACTS": "Контакти",
-		"DOMAINS": "Домени",
-		"SECURITY": "Безпека",
-		"PACKAGES": "Плагіни",
-		"CONFIG": "Файл конфігурації",
-		"ABOUT": "Про програму"
-	},
-	"TAB_GENERAL": {
-		"LEGEND_INTERFACE": "Інтерфейс",
-		"LABEL_LANGUAGE": "Мова",
-		"LABEL_LANGUAGE_ADMIN": "Мова (Панелі Адміністратора)",
-		"LABEL_THEME": "Тема за замовчуванням",
-		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Дозволити користувачу вибір мови",
-		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Дозволити користувачу вибір теми",
-		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Дозволити користувачу вибір фону",
-		"LABEL_SHOW_THUMBNAILS": "Показувати мініатюри (для вкладень)",
-		"LEGEND_MAIN": "Основне",
-		"LABEL_ATTACHMENT_SIZE_LIMIT": "Ліміт розміру вкладень",
-		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "Дозволити додаткові облікові записи",
-		"LABEL_ALLOW_IDENTITIES": "Дозволити кілька варіантів відправника",
-		"ALERT_DATA_ACCESS": "Папка даних SnappyMail доступна. Будь ласка, налаштуйте свій веб-сервер так, щоб приховати папку даних із зовнішнього доступу. Детальніше тут:",
-		"ALERT_WARNING": "Увага!",
-		"HTML_ALERT_WEAK_PASSWORD": "Ви використовуєте стандартний пароль адміністратора.\n<br>\nЗ міркувань безпеки, будь ласка,\n<strong><a href=\"#\/security\">змініть пароль<\/a><\/strong> просто зараз.\n"
-	},
-	"TAB_LOGIN": {
-		"LEGEND_LOGIN_SCREEN": "Сторінка Входу",
-		"LABEL_DEFAULT_DOMAIN": "Основний домен",
-		"LABEL_DETERMINE_USER_DOMAIN": "Намагатися визначити домен користувача",
-		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Дозволити вибір мови на сторінці входу",
-		"LABEL_DETERMINE_USER_LANGUAGE": "Намагатися визначити мову користувача"
-	},
-	"TAB_BRANDING": {
-		"LEGEND_BRANDING": "Брендінг",
-		"LABEL_PAGE_TITLE": "Назва сторінки (Title)",
-		"LABEL_LOADING_DESCRIPTION": "Назва при завантаженні та на сторінці входу",
-		"LABEL_FAVICON_URL": "Значок (favicon)"
-	},
-	"TAB_CONTACTS": {
-		"LEGEND_CONTACTS": "Контакти",
-		"LEGEND_STORAGE": "Сховище (СУБД)",
-		"LABEL_ENABLE_CONTACTS": "Увімкнути контакти",
-		"LABEL_ALLOW_SYNC": "Дозволити синхронізацію контактів (із зовнішнім CardDAV сервером)",
-		"LABEL_STORAGE_TYPE": "Тип",
-		"LABEL_STORAGE_DSN": "Dsn",
-		"LABEL_STORAGE_USER": "Користувач",
-		"LABEL_STORAGE_PASSWORD": "Пароль",
-		"SQLITE_GLOBAL": "Використати глобальну БД для всіх, замість окремого для кожного облікового запису",
-		"ALERT_NOTICE": "Увага!",
-		"SUGGESTIONS_LIMIT": "Ліміт пропозицій",
-		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Не використовуйте цей тип бази даних з великою кількістю активних користувачів.",
-		"HTML_ALERT_DOES_NOT_SUPPORTED": "Ваша система не підтримує контактів.\n<br>\nВам необхідно встановити чи увімкнути <strong>СУБД (SQLite \/ MySQL \/ PostgreSQL)<\/strong> PHP-розширення на вашому сервері.\n"
-	},
-	"TAB_DOMAINS": {
-		"LEGEND_DOMAINS": "Домени",
-		"BUTTON_ADD_DOMAIN": "Додати домен",
-		"BUTTON_ADD_ALIAS": "Додати аліас",
-		"DELETE_ARE_YOU_SURE": "Ви впевнені?",
-		"HTML_DOMAINS_HELPER": "Список доменів до яких дозволено доступ.\n<br>\nНатисніть на ім'я, щоб настроїти домен.\n"
-	},
-	"TAB_SECURITY": {
-		"LEGEND_SECURITY": "Безпека",
-		"LABEL_USE_IMAGE_PROXY": "Використовувати локальний проксі для зовнішніх зображень",
-		"LABEL_AUTO_VERIFY": "Перевіряти підписи автоматично",
-		"LABEL_SHOW_PHP_INFO": "Показати PHP інформацію",
-		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Облікові дані для доступу до панелі адміністратора",
-		"LABEL_CURRENT_PASSWORD": "Поточний пароль",
-		"LABEL_NEW_PASSWORD": "Новий пароль",
-		"LABEL_REPEAT_PASSWORD": "Повторити пароль",
-		"LABEL_REQUIRE_VERIFICATION": "Вимагати перевірку SSL сертифікату",
-		"CRYPTO": "Шифрування",
-		"LABEL_ALLOW_SELF_SIGNED": "Дозволити самопідписані сертифікати"
-	},
-	"TAB_PACKAGES": {
-		"LABEL_ENABLE_PLUGINS": "Увімкнути плагіни",
-		"LEGEND_AVAILABLE_FOR_UPDATE": "Є оновлення для наступних плагінів",
-		"LEGEND_AVAILABLE_FOR_INSTALLATION": "Доступні плагіни",
-		"LEGEND_INSTALLED_PACKAGES": "Встановлені плагіни",
-		"ALERT_CANNOT_ACCESS_REPOSITORY": "Наразі не вдається отримати доступ до сховища пакетів."
-	},
-	"TAB_ABOUT": {
-		"LEGEND_ABOUT": "Про програму",
-		"LABEL_TAG_HINT": "Простий, сучасний та швидкий веб-клієнт електронної пошти\n",
-		"LABEL_ALL_RIGHTS_RESERVED": "Всі права захищені.",
-		"HINT_READ_CHANGE_LOG": "Будь ласка, ознайомтеся зі змінами перед оновленням.\n",
-		"HINT_IS_UP_TO_DATE": "Версія SnappyMail актуальна.",
-		"HTML_NEW_VERSION": "Нова <b>%VERSION%<\/b> версія доступна.",
-		"LABEL_UPDATING": "Оновлення",
-		"LABEL_CHECKING": "Перевірка",
-		"BUTTON_RELEASES": "Релізи"
-	},
-	"POPUPS_DOMAIN_ALIAS": {
-		"TITLE_ADD_DOMAIN_ALIAS": "Додати аліас",
-		"LABEL_ALIAS": "Аліас",
-		"LABEL_DOMAIN": "Домен"
-	},
-	"POPUPS_DOMAIN": {
-		"TITLE_ADD_DOMAIN": "Додати домен",
-		"TITLE_ADD_DOMAIN_WITH_NAME": "Додати домен \"%NAME%\"",
-		"TITLE_EDIT_DOMAIN": "Редагувати домен \"%NAME%\"",
-		"LABEL_NAME": "Імя",
-		"NAME_HELPER": "підтримуються шаблони",
-		"LABEL_SERVER": "Сервер",
-		"LABEL_PORT": "Порт",
-		"LABEL_SECURE": "Безпека",
-		"TIMEOUT": "Тайм-аут",
-		"DISABLE_CAPABILITIES": "Вимкнути функції",
-		"LIMITS": "Ліміти",
-		"FOLDERS": "Папки",
-		"MESSAGES": "Листи",
-		"SECURE_OPTION_NONE": "Немає",
-		"LABEL_ALLOW_SIEVE_SCRIPTS": "Дозволити Sieve скрипти",
-		"LABEL_USE_SHORT_LOGIN": "Використовувати короткий логін",
-		"LABEL_LOWERCASE_LOGIN": "Логін у нижньому регістрі (незалежно від регістру)",
-		"LABEL_USE_AUTH": "Використовувати автентифікацію",
-		"LABEL_SET_SENDER": "Використовувати логін як відправника",
-		"LABEL_AUTH_PLAIN_LINE": "Примусовий вхід командою AUTH PLAIN",
-		"LABEL_USE_PHP_MAIL": "Використовувати mail() функцію",
-		"BUTTON_WHITE_LIST": "Білий список",
-		"NEW_DOMAIN_DESC": "Ця конфігурація дозволить вам працювати з <strong>%NAME%<\/strong> адресами.",
-		"WHITE_LIST_ALERT": "Список користувачів домену, до яких дозволено доступ.\nВикористовуйте пробіл як роздільник.\n",
-		"VALID_SPAM_HEADERS": "Valid SPAM headers",
-		"VALID_VIRUS_HEADERS": "Valid virus headers"
-	},
-	"POPUPS_PLUGIN": {
-		"TITLE_PLUGIN": "Плагін",
-		"DESC_NOTHING_TO_CONFIGURE": "Нічого налаштовувати"
-	},
-	"POPUPS_ASK": {
-		"DESC_WANT_CLOSE_THIS_WINDOW": "Ви впевнені, що хочете закрити це вікно?"
-	},
-	"POPUPS_LANGUAGES": {
-		"TITLE_LANGUAGES": "Виберіть мову"
-	},
-	"HINTS": {
-		"BETA": "beta",
-		"WARNING": "Увага!"
-	},
-	"ERRORS": {
-		"DOMAIN_ALREADY_EXISTS": "Домен вже існує",
-		"UNKNOWN_ERROR": "Невідома помилка"
-	},
-	"NOTIFICATIONS": {
-		"RequestError": "Запит не виконано",
-		"RequestAborted": "Запит перерваний",
-		"RequestTimeout": "Минув час запиту",
-		"InvalidToken": "Невірний токен запиту",
-		"AuthError": "Не вдалося авторизуватись",
-		"DomainAlreadyExists": "Домен вже існує",
-		"CantSavePluginSettings": "Не можу зберегти налаштування",
-		"CantInstallPackage": "Помилка встановлення плагіна",
-		"CantDeletePackage": "Помилка видалення плагіна",
-		"InvalidPluginPackage": "Помилка пакета плагіна",
-		"UnsupportedPluginPackage": "Для роботи плагіна потрібна повна підтримка сервера",
-		"UnknownError": "Невідома помилка"
-	}
-}
diff --git a/snappymail/v/0.0.0/app/localization/uk/user.json b/snappymail/v/0.0.0/app/localization/uk/user.json
index 2247fe49f..2e5105f5b 100644
--- a/snappymail/v/0.0.0/app/localization/uk/user.json
+++ b/snappymail/v/0.0.0/app/localization/uk/user.json
@@ -4,14 +4,14 @@
 		"TO_ARCHIVE": "Архівування",
 		"ARE_YOU_SURE": "Ви впевнені?",
 		"BACK": "Назад",
-		"BCC": "Прихована копія",
+		"BCC": "Прихована",
 		"CANCEL": "Відмінити",
 		"CC": "Копія",
 		"CLEAR": "Очистити",
 		"CLOSE": "Закрити (Esc)",
 		"CONTACTS": "Контакти",
 		"DELETE": "Видалити",
-		"UNDELETE": "Відновити",
+		"UNDELETE": "Undelete",
 		"DONE": "Зроблено",
 		"EMAIL": "Пошта",
 		"FROM": "Від",
@@ -20,26 +20,26 @@
 		"MORE": "Ще",
 		"MOVE_TO": "Перемістити",
 		"COPY_TO": "Копіювати в",
-		"NAME": "Ім'я",
-		"NONE": "Нічого",
-		"TO_SPAM": "Перемістити повідомлення у спам",
+		"NAME": "Вхідні",
+		"NONE": "None",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "Не спам",
 		"USERNAME": "Ім'я користувача",
 		"PASSWORD": "Пароль",
-		"REMEMBER": "Запам'ятати",
-		"REPLY_TO": "Відповідь сюди",
+		"REMEMBER": "Remember",
+		"REPLY_TO": "Reply-To",
 		"SAVE": "Зберегти",
-		"SAVE_CHANGES": "Зберегти зміни?",
-		"SEARCH": "Пошук",
-		"SPAM": "Спам",
+		"SAVE_CHANGES": "Save changes?",
+		"SEARCH": "Контакти не знайдено",
+		"SPAM": "В спам",
 		"SUBJECT": "Тема",
 		"TEST": "Тест",
 		"TO": "Кому",
-		"SERVER_MESSAGE": "Повідомлення сервера",
+		"SERVER_MESSAGE": "Server message",
 		"YES": "Так",
 		"NO": "Ні",
-		"INACTIVE": "Не активне",
-		"DEFAULT": "за замовчуванням",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "default",
 		"HELP": "Допомога",
 		"TEXT": "Текст",
 		"ATTACHMENTS": "Файли"
@@ -56,51 +56,51 @@
 		"TITLE_ADV": "Розширений пошук листів",
 		"TEXT": "Текст",
 		"HAS_ATTACHMENT": "З файлами",
-		"FLAGGED": "Із зірочкою",
+		"FLAGGED": "Відмічені",
 		"UNSEEN": "Непрочитані",
 		"DATE": "Дата",
 		"DATE_ALL": "За весь час",
-		"BEFORE_3_DAYS": "Старше 3 днів",
-		"BEFORE_7_DAYS": "Старше 1 тижня",
-		"BEFORE_MONTH": "Старше 1 місяця",
-		"BEFORE_3_MONTHS": "Старше 3 місяців",
-		"BEFORE_6_MONTHS": "Старше 6 місяців",
-		"BEFORE_YEAR": "Старше 1 року",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
 		"SINCE_3_DAYS": "За три дні",
 		"SINCE_7_DAYS": "За тиждень",
 		"SINCE_MONTH": "За місяць",
 		"SINCE_3_MONTHS": "За 3 місяці",
 		"SINCE_6_MONTHS": "За півроку",
 		"SINCE_YEAR": "За рік",
-		"SUBFOLDERS": "Підпапки",
-		"SUBFOLDERS_NONE": "Нічого",
-		"SUBFOLDERS_SUBTREE": "Усі",
-		"SUBFOLDERS_SUBTREE_ONE": "Один рівень",
-		"REPLIED": "Відповів",
-		"KEYWORD": "Тег"
+		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS_NONE": "None",
+		"SUBFOLDERS_SUBTREE": "All",
+		"SUBFOLDERS_SUBTREE_ONE": "One level",
+		"REPLIED": "відповів",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Написати",
-		"BUTTON_NEW_MESSAGE": "Новий лист",
+		"BUTTON_NEW_MESSAGE": "New message",
 		"INBOX_NAME": "Вхідні",
 		"SENT_NAME": "Вихідні",
-		"DRAFTS_NAME": "Чернетки",
+		"DRAFTS_NAME": "Чорновики",
 		"TRASH_NAME": "Кошик",
 		"ARCHIVE_NAME": "Архів"
 	},
 	"IMAP": {
-		"ACL_RIGHTS": "Права",
-		"ACL_A": "Адмініструвати",
-		"ACL_E": "Видалити",
-		"ACL_I": "Вставте повідомлення",
-		"ACL_K": "Створити вкладені папки",
-		"ACL_L": "Показати повідомлення",
-		"ACL_P": "Надіслати лист",
-		"ACL_R": "Виберіть папку",
-		"ACL_S": "\\ПЕРЕГЛЯНУТИ тег",
-		"ACL_T": "\\ВИДАЛЕНО тег",
-		"ACL_W": "Інші теги",
-		"ACL_X": "Видалити\/Перейменувати папку"
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Оновити список листів",
@@ -110,15 +110,15 @@
 		"MENU_SET_SEEN": "Відмітити як прочитане",
 		"MENU_SET_ALL_SEEN": "Відмітити всі як прочитані",
 		"MENU_UNSET_SEEN": "Відмітити як непрочитане",
-		"MENU_SET_FLAG": "Встановити зірочку",
-		"MENU_UNSET_FLAG": "Зняти зірочку",
+		"MENU_SET_FLAG": "Встановити флаг",
+		"MENU_UNSET_FLAG": "Зняти флаг",
 		"MENU_SELECT_ALL": "Все",
 		"MENU_SELECT_INVERT": "Інвертувати",
 		"MENU_SELECT_UNSEEN": "Непрочитані",
 		"MENU_SELECT_SEEN": "Прочитані",
-		"MENU_SELECT_FLAGGED": "Із Зірочкою",
-		"MENU_SELECT_UNFLAGGED": "Без зірочки",
-		"DOWNLOAD_ALL_ATTACHMENTS": "Завантажити всі вкладення",
+		"MENU_SELECT_FLAGGED": "Відмічені",
+		"MENU_SELECT_UNFLAGGED": "Без поміток",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "В папці немає листів.",
 		"EMPTY_SEARCH_LIST": "Листи не знайдено.",
 		"SEARCH_RESULT_FOR": "Результат пошуку \"%SEARCH%\"",
@@ -128,22 +128,20 @@
 		"YESTERDAY_AT": "вчора в %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "У вас %COUNT% нових повідомлень!",
 		"QUOTA_SIZE": "Використано <strong>%SIZE% (%PROC%%)<\/strong> з <strong>%LIMIT%<\/strong>",
-		"SORT": "Сортувати",
-		"NO_SORT": "Поштовий сервер не підтримує сортування",
-		"SORT_ARRIVAL_ASC": "Доставлено спершу старі",
-		"SORT_ARRIVAL_DESC": "Доставлено спершу нові",
-		"SORT_DATE_ASC": "Дата спершу старі",
-		"SORT_DATE_DESC": "Дата спершу нові",
-		"SORT_SIZE_ASC": "Розмір за зростанням",
-		"SORT_SIZE_DESC": "Розмір за спаданням",
-		"SORT_SUBJECT_ASC": "Тема А-Я",
-		"SORT_SUBJECT_DESC": "Тема Я-А",
-		"SORT_FROM_ASC": "Відправник А-Я",
-		"SORT_FROM_DESC": "Відправник Я-A"
+		"SORT": "Sort",
+		"NO_SORT": "Mail server does not support sorting",
+		"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"
 	},
 	"MESSAGE": {
 		"BUTTON_EDIT": "Редагувати",
-		"BUTTON_UNSUBSCRIBE": "Відписатися",
+		"BUTTON_UNSUBSCRIBE": "Unsubscribe from this list",
 		"BUTTON_REPLY": "Відповісти на Листа",
 		"BUTTON_REPLY_ALL": "Відповісти Всім",
 		"BUTTON_FORWARD": "Переслати",
@@ -158,9 +156,9 @@
 		"BUTTON_THREAD_MORE": "ще листи",
 		"MENU_HEADERS": "Подивитися заголовки",
 		"MENU_VIEW_ORIGINAL": "Подивитися оригінал",
-		"HTML_VIEW": "Переглянути HTML версію",
-		"PLAIN_VIEW": "Переглянути текстову версію",
-		"SWAP_COLORS": "Змінити стандартний (фоновий) колір",
+		"HTML_VIEW": "View HTML message",
+		"PLAIN_VIEW": "View plain text message",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": "Завантажити як .eml файл",
 		"MENU_FILTER_SIMILAR": "Фільтрувати схожі",
 		"MENU_PRINT": "Надрукувати",
@@ -170,23 +168,23 @@
 		"LABEL_TO_SHORT": "кому",
 		"PRINT_LABEL_ATTACHMENTS": "Файли",
 		"MESSAGE_VIEW_DESC": "Виберіть повідомлення для перегляду.",
-		"MESSAGE_VIEW_MOVE_DESC": "Клікніть на папку на лівій панелі, щоб вибрати місце призначення.",
+		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
 		"LINK_DOWNLOAD_AS_ZIP": "Завантажити як zip",
-		"SPAM_SCORE": "Оцінка спаму",
-		"HAS_VIRUS_WARNING": "ПОПЕРЕДЖЕННЯ: виявлено вірус",
-		"TAGS": "Теги",
-		"NEW_TAG": "Новий тег",
-		"ENABLE_TRACKING_LINKS": "Увімкнути відстеження посилань",
-		"TRACKING_ENABLED": "Посилання тепер відстежуються при натисканні!"
+		"SPAM_SCORE": "Spam Score",
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
 	},
 	"MESSAGE_TAGS": {
-		"$important": "Важливе",
-		"$todo": "Зробити",
-		"$label1": "Важливе",
-		"$label2": "Робота",
-		"$label3": "Особисте",
-		"$label4": "Зробити",
-		"$label5": "Пізніше"
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Сповіщення про прочитання цього повідомлення - %SUBJECT%",
@@ -196,17 +194,17 @@
 		"SEARCHING_DESC": "Пошук..."
 	},
 	"CONTACTS": {
-		"TAB_CONTACT": "Контакт",
-		"TAB_LOCATIONS": "Розташування",
-		"TAB_BUSINESS": "Організація",
-		"LABEL_ORGANIZATION": "Компанія",
-		"LABEL_DEPARTMENT": "Департамент",
-		"LABEL_TITLE": "Назва",
-		"TAB_CRYPTO": "Шифрування",
-		"ASK": "Запитувати",
-		"NEVER": "Ніколи",
-		"ALWAYS": "Завжди",
-		"ALWAYS_IF_POSSIBLE": "Завжди якщо можливо",
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
 		"BUTTON_ADD_CONTACT": "Додати контакт",
 		"BUTTON_CREATE_CONTACT": "Зберегти",
 		"BUTTON_IMPORT": "Імпорт (csv, vcf, vCard)",
@@ -221,9 +219,9 @@
 		"DISPLAY_NAME": "Повне ім'я",
 		"LAST_NAME": "Ім'я",
 		"FIRST_NAME": "Прізвище",
-		"MIDDLE_NAME": "По батькові",
-		"NAME_PREFIX": "Префікс імені",
-		"NAME_SUFFIX": "Суфікс імені",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
 		"NICK_NAME": "Нік",
 		"LABEL_READ_ONLY": "Тільки читання",
 		"ADD_MENU_LABEL": "Додати",
@@ -236,34 +234,34 @@
 		"ADD_MENU_TAGS": "Теги",
 		"BUTTON_SHARE_ALL": "Всім",
 		"BUTTON_SYNC": "Синхронизація (CardDAV)",
-		"SEND_TO_ALL_CONTACT_EMAILS": "Надіслати на всі контактні email"
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "Показати всі поля",
 		"BUTTON_SEND": "Надіслати",
-		"BUTTON_MINIMIZE": "Згорнути",
+		"BUTTON_MINIMIZE": "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% написав",
 		"FORWARD_MESSAGE_TOP_TITLE": "-------- Переслане повідомлення -------",
 		"FORWARD_MESSAGE_TOP_SENT": "Надіслано",
 		"EMPTY_TO_ERROR_DESC": "Вкажіть як мінімум одного отримувача",
-		"NO_ATTACHMENTS_HERE_DESC": "Тут немає вкладень.",
-		"ATTACHMENTS_ERROR_DESC": "УВАГА! Не всі вкладення завантажено.",
-		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Ще не всі вкладені файли завантажено",
-		"ALLOW_SPELLCHECK": "Увімкнути перевірку правопису в браузері",
-		"ALLOW_DRAFT_AUTOSAVE": "Автоматично зберігати чернетку",
+		"NO_ATTACHMENTS_HERE_DESC": "No attachments here.",
+		"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": "Позначити як важливе",
-		"BUTTON_REQUEST_DSN": "Запитати звіт про доставку",
-		"BUTTON_REQUIRE_TLS": "Вимагати захищеної доставки",
-		"ERROR_EMPTY_BODY": "Повідомлення порожнє"
+		"BUTTON_MARK_AS_IMPORTANT": "Mark as important",
+		"BUTTON_REQUEST_DSN": "Request a delivery receipt",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"EXIT_ARE_YOU_SURE": "Ви впевнені, що бажаєте вийти?",
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Ви впевнені, що хочете закрити це вікно?",
 		"DESC_WANT_DELETE_MESSAGES": "Ви впевнені, що хочете видалити повідомлення?"
 	},
@@ -273,43 +271,43 @@
 	"POPUPS_ADD_ACCOUNT": {
 		"TITLE_ADD_ACCOUNT": "Додати ще акаунт",
 		"BUTTON_ADD_ACCOUNT": "Додати",
-		"TITLE_UPDATE_ACCOUNT": "Оновити акаунт"
+		"TITLE_UPDATE_ACCOUNT": "Update Account"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Додати відправника",
-		"TITLE_UPDATE_IDENTITY": "Оновити відправника",
-		"LABEL": "Внутрішня назва",
+		"TITLE_ADD_IDENTITY": "Додати Профіль",
+		"TITLE_UPDATE_IDENTITY": "Оновити Профіль",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Додати",
-		"SIGNATURE": "Підпис",
-		"LABEL_SIGNATURE_INSERT_BEFORE": "Вставляти підпис перед цитованим текстом у відповідях"
+		"SIGNATURE": "Signature",
+		"LABEL_SIGNATURE_INSERT_BEFORE": "Insert this signature before quoted text in replies"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Створити папку",
-		"LABEL_PARENT": "Батьківська папка",
+		"TITLE_CREATE_FOLDER": "Створити теку",
+		"LABEL_PARENT": "Батьківська тека",
 		"BUTTON_CREATE": "Створити",
-		"TITLE_CREATING_PROCESS": "Створення папки"
+		"TITLE_CREATING_PROCESS": "Створення теки"
 	},
 	"POPUPS_CLEAR_FOLDER": {
-		"TITLE_CLEAR_FOLDER": "Очистити папку від листів?",
+		"TITLE_CLEAR_FOLDER": "Очистити теку від листів?",
 		"DANGER_DESC_WARNING": "Увага!",
-		"DANGER_DESC_HTML_1": "Ця дія призведе до повного видалення всіх листів з папки <strong>%FOLDER%<\/strong>.",
+		"DANGER_DESC_HTML_1": "Ця дія призведе до повного видалення всіх листів з теки <strong>%FOLDER%<\/strong>.",
 		"DANGER_DESC_HTML_2": "Після початку очищення, процес <strong style=\"color:red\">неможливо<\/strong> буде зупинити чи відмінити.",
-		"TITLE_CLEARING_PROCESS": "Очищення папки..."
+		"TITLE_CLEARING_PROCESS": "Очищення теки..."
 	},
 	"CRYPTO": {
 		"SIGN": "Підпис",
 		"ENCRYPT": "Шифрування",
 		"DECRYPT": "Дешифрувати",
-		"VERIFY": "Перевірити",
+		"VERIFY": "Verify",
 		"GOOD_SIGNATURE": "Підтверджена сигнатура для %USER%",
 		"ERROR": "%TYPE% помилка: %ERROR%",
-		"CREATE_SELF_SIGNED": "Створити самопідписаний",
-		"VALID_UNTIL": "Дійсний до",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
 		"PRIVATE_KEY": "Private key",
-		"CHANGE_PASS": "Змінити пароль",
-		"CURRENT_PASS": "Поточна пароль",
-		"NEW_PASS": "Новий пароль",
-		"ASK_CRYPTKEY_PASS": "Ваш пароль змінено. Щоб розшифрувати дані, введіть старий пароль"
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
 	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Імпорт OpenPGP ключа",
@@ -321,20 +319,20 @@
 		"LABEL_KEY_TYPE": "Type",
 		"SIGNED_MESSAGE": "OpenPGP підписане повідомлення",
 		"ENCRYPTED_MESSAGE": "OpenPGP шифроване повідомлення",
-		"STORE_IN_GNUPG": "Зберігати на сервері в GnuPG",
-		"STORE_PUBLIC_KEY_IN_GNUPG": "Зберігайте public key на сервері в GnuPG",
-		"STORE_PRIVATE_KEY_IN_GNUPG": "Зберігайте private key на сервері в GnuPG",
-		"BACKUP_ON_SERVER": "Зберігати (зашифроване) на сервері",
-		"BACKUP_PUBLIC_KEY_ON_SERVER": "Бекап public key на сервері",
-		"BACKUP_PRIVATE_KEY_ON_SERVER": "Бекап private key на сервері"
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
 	},
 	"SMIME": {
-		"POPUP_IMPORT_TITLE": "Імпорт S\/MIME сертифікат",
-		"CERTIFICATE": "Сертифікат",
-		"CERTIFICATES": "S\/MIME Сертифікати",
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
 		"SIGNED_MESSAGE": "S\/MIME підписане повідомлення",
 		"ENCRYPTED_MESSAGE": "S\/MIME шифроване повідомлення",
-		"PRIVATE_KEY_OF": "S\/MIME private key з %EMAIL%"
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Створити фільтер",
@@ -349,26 +347,26 @@
 		"SELECT_ACTION_DISCARD": "Відклонити",
 		"SELECT_FIELD_RECIPIENTS": "Отримувачі (To or CC)",
 		"SELECT_FIELD_HEADER": "Заголовок",
-		"SELECT_FIELD_BODY": "Тіло",
+		"SELECT_FIELD_BODY": "Body",
 		"SELECT_FIELD_SIZE": "Розмір",
 		"SELECT_TYPE_CONTAINS": "Містить",
 		"SELECT_TYPE_NOT_CONTAINS": "Не містить",
-		"SELECT_TYPE_MATCHES": "Збіги (* та ? підтримуються)",
-		"SELECT_TYPE_NOT_MATCHES": "Заперечення збігів (* та ? підтримуються)",
-		"SELECT_TYPE_REGEXP": "Регулярний вираз",
-		"SELECT_TYPE_NOT_REGEXP": "Не регулярний вираз",
+		"SELECT_TYPE_MATCHES": "Matches (* and ? supported)",
+		"SELECT_TYPE_NOT_MATCHES": "Not Matches (* and ? supported)",
+		"SELECT_TYPE_REGEXP": "Regexp",
+		"SELECT_TYPE_NOT_REGEXP": "Not Regexp",
 		"SELECT_TYPE_EQUAL_TO": "Дорівнює",
 		"SELECT_TYPE_NOT_EQUAL_TO": "Не дорівнює",
-		"SELECT_TYPE_OVER": "Більше",
-		"SELECT_TYPE_UNDER": "Менше",
-		"SELECT_TYPE_TEXT": "Текст",
+		"SELECT_TYPE_OVER": "Over",
+		"SELECT_TYPE_UNDER": "Under",
+		"SELECT_TYPE_TEXT": "Text",
 		"SELECT_TYPE_RAW": "Raw",
-		"SELECT_MATCH_ANY": "Відповідає будь-якому з наступних правил",
-		"SELECT_MATCH_ALL": "Відповідає усім наступним правилам",
-		"MARK_AS_READ_LABEL": "Позначити як прочитане",
-		"REPLY_INTERVAL_LABEL": "Інтервал відповідей (днів)",
-		"KEEP_LABEL": "Тримати",
-		"STOP_LABEL": "Зупинити подальшу обробку правил",
+		"SELECT_MATCH_ANY": "Matching any of the following rules",
+		"SELECT_MATCH_ALL": "Matching all of the following rules",
+		"MARK_AS_READ_LABEL": "Mark as read",
+		"REPLY_INTERVAL_LABEL": "Reply interval (days)",
+		"KEEP_LABEL": "Keep",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "Тема (не обов'язково)",
 		"VACATION_MESSAGE_LABEL": "Повідомлення",
 		"VACATION_RECIPIENTS_LABEL": "Отримувачі (розділяти комами)",
@@ -376,22 +374,22 @@
 		"ALL_INCOMING_MESSAGES_DESC": "Всі повідомлення, що надійшли"
 	},
 	"POPUPS_SIEVE_SCRIPT": {
-		"TITLE_CREATE": "Створити скрипт",
-		"TITLE_EDIT": "Редагувати скрипт",
-		"BUTTON_ADD_FILTER": "Додати фільтр",
-		"BUTTON_RAW_SCRIPT": "Використати користувацький скрипт",
-		"CAPABILITY_LABEL": "Можливості",
-		"CHANGES_NEED_TO_BE_SAVED_DESC": "Ці зміни потрібно зберегти на сервері."
+		"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."
 	},
 	"POPUPS_SYSTEM_FOLDERS": {
-		"TITLE_SYSTEM_FOLDERS": "Виберіть системні папки",
+		"TITLE_SYSTEM_FOLDERS": "Виберіть системні теки",
 		"SELECT_CHOOSE_ONE": "Ще не вибрано",
 		"SELECT_UNUSE_NAME": "Не використовувати",
-		"NOTIFICATION_SENT": "Ви ще не обрали системну папку \"Вихідні\", в яку складаються всі повідомлення післе надсилання.\nЯкщо ви не хочете зберігати вихідні листи, будь ласка, виберіть пункт \"Не використовувати\".\n",
-		"NOTIFICATION_DRAFTS": "Ви ще не обрали системну папку \"Чернетки\", в яку складаються всі збережені повідомлення.",
-		"NOTIFICATION_SPAM": "Ви ще не обрали системну папку \"Спам\", в яку складаються всі спам повідомлення.\nЯкщо ви хочете видаляти листи одразу, будь ласка, виберіть пункт \"Не використовувати\".\n",
-		"NOTIFICATION_TRASH": "Ви ще не обрали системну папку \"Кошик\", в яку складаються всі повідомлення після видалення.\nЯкщо ви хочете видаляти листи одразу, будь ласка, виберіть пункт \"Не використовувати\".\n",
-		"NOTIFICATION_ARCHIVE": "Ви ще не обрали системну папку \"Архів\", в яку складаються всі повідомлення після архівації."
+		"NOTIFICATION_SENT": "Ви ще не обрали системну теку \"Вихідні\", в яку складаються всі повідомлення післе надсилання.\nЯкщо ви не хочете зберігати вихідні листи, будь ласка, виберіть пункт \"Не використовувати\".\n",
+		"NOTIFICATION_DRAFTS": "Ви ще не обрали системну теку \"Чорновики\", в яку складаються всі збережені повідомлення.",
+		"NOTIFICATION_SPAM": "Ви ще не обрали системну теку \"Спам\", в яку складаються всі спам повідомлення.\nЯкщо ви не хочете видаляти листи одразу, будь ласка, виберіть пункт \"Не використовувати\".\n",
+		"NOTIFICATION_TRASH": "Ви ще не обрали системну теку \"Удаленные\", в яку складаються всі повідомлення після видалення.\nЯкщо ви не хочете видаляти листи одразу, будь ласка, виберіть пункт \"Не використовувати\".\n",
+		"NOTIFICATION_ARCHIVE": "Ви ще не обрали системну теку \"Архив\", в яку складаються всі повідомлення після архівації."
 	},
 	"TITLES": {
 		"MAILBOX": "Пошта",
@@ -407,68 +405,68 @@
 		"ERROR_UNKNOWN": "Помилка завантаження файлу"
 	},
 	"EDITOR": {
-		"PLAIN": "HTML <-> ТЕКСТ",
-		"SOURCE": "HTML <-> ДЖЕРЕЛО",
-		"FONTFAMILY": "Сімейство шрифтів",
-		"FONTSIZE": "Розмір шрифту",
-		"DIR": "Напрямок тексту",
-		"DIR_LTR": "Зліва направо",
-		"DIR_RTL": "Справа наліво",
-		"DIR_AUTO": "Автоматично",
-		"TEXTCOLOR": "Колір тексту",
-		"BACKGROUNDCOLOR": "Колір фону",
-		"BOLD": "Жирний",
-		"ITALIC": "Курсив",
-		"UNDERLINE": "Підкреслений",
-		"STRIKE": "Закреслений",
-		"SUB": "Нижній індекс",
-		"SUP": "Верхній індекс",
-		"OL": "Нумерований список",
-		"UL": "Маркований список",
-		"QUOTE": "Блок цитати",
-		"INDENTDECREASE": "Зменшити відступ",
-		"INDENTINCREASE": "Збільшити відступ",
-		"LINK": "Посилання",
-		"IMAGEURL": "URL зображення",
-		"IMAGEUPLOAD": "Вибір зображення",
-		"UNDO": "Скасувати",
-		"REDO": "Повторити",
-		"REMOVESTYLE": "Видалити стиль"
+		"PLAIN": "HTML <-> TEXT",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Основні",
 		"CONTACTS": "Контакти",
-		"FOLDERS": "Папки",
+		"FOLDERS": "Теки",
 		"ACCOUNTS": "Акаунти",
-		"FILTERS": "Фільтри",
+		"FILTERS": "Фильтры",
 		"SECURITY": "Безпека",
 		"THEMES": "Теми"
 	},
 	"SETTINGS_FILTERS": {
-		"SIMPLE": "Прості",
-		"ADVANCED": "Розширені",
-		"BUTTON_ADD_SCRIPT": "Додати скрипт",
-		"SUBNAME_MOVE_TO": "Перемістити до \"%FOLDER%\"",
-		"SUBNAME_FORWARD_TO": "Переслати на \"%EMAIL%\"",
-		"SUBNAME_REJECT": "Відхилити",
-		"SUBNAME_VACATION_MESSAGE": "Повідомлення автовідповідача",
-		"SUBNAME_DISCARD": "Знищити"
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
+		"BUTTON_ADD_SCRIPT": "Add a Script",
+		"SUBNAME_MOVE_TO": "Move to \"%FOLDER%\"",
+		"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",
+		"SUBNAME_REJECT": "Reject",
+		"SUBNAME_VACATION_MESSAGE": "Повідомлення про відпустку",
+		"SUBNAME_DISCARD": "Відклонити"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Безпека",
 		"LABEL_AUTOLOGOUT": "Автовихід",
-		"FORGET_KEY_PASS": "Забувати пароль private key",
+		"FORGET_KEY_PASS": "Forget private key passphrase",
 		"NEVER": "Ніколи"
 	},
 	"SETTINGS_GENERAL": {
 		"LANGUAGE": "Мова",
-		"HOUR_FORMAT": "Формат часу",
-		"IDENTITY": "Акаунт",
-		"LAYOUT": "Макет",
-		"LAYOUT_NO_SPLIT": "Список листів",
-		"LAYOUT_VERTICAL_SPLIT": "Список з вертикальним переглядом",
-		"LAYOUT_HORIZONTAL_SPLIT": "Список з горизонтальним переглядом",
-		"SHOW_NEXT_MESSAGE": "Перейти до наступного повідомлення після видалення\/переміщення поточного",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "Identity",
+		"LAYOUT": "Layout",
+		"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": "Простий",
@@ -477,36 +475,35 @@
 		"HIDE_DELETED_MESSAGES": "Приховати повідомлення, позначені для видалення",
 		"USE_CHECKBOXES_IN_LIST": "Показувати чекбокси у списках",
 		"USE_THREADS": "Згортати листи у листуваннях",
-		"THREAD_ALGORITHM": "У вигляді розмови",
-		"REPLY_SAME_FOLDER": "Поміщати відповіді в ту ж папку, де знаходиться оригінал",
-		"PREFER_HTML": "Перважати HTML над звичайним текстом",
-		"PREFER_HTML_INFO": "Повідомлення іноді надходять в обох форматах. Цей параметр визначає, чи ви хочете, щоб відображалася HTML-частина чи звичайний текст.",
-		"REMOVE_COLORS": "Видалити кольори фону та тексту з тіла повідомлення",
-		"ALLOW_STYLES": "Дозволити <style> CSS",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "Поміщати відповіді в ту ж теку, де знаходиться оригінал",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"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",
 		"MESSAGE_PER_PAGE": "Повідомлень на одній сторінці",
-		"CHECK_MAIL_INTERVAL": "Інтервал перевірки повідомлень",
-		"MARK_MESSAGE_READ_AFTER": "Позначити повідомлення як прочитане після",
-		"MSG_DEFAULT_ACTION": "Дія за замовчуванням",
-		"SECONDS": "секунд",
-		"MINUTES": "хвилин",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
+		"SECONDS": "seconds",
+		"MINUTES": "minutes",
 		"NOTIFICATIONS": "Сповіщення",
 		"SOUND_NOTIFICATION": "Звукове сповіщення",
 		"CHROME_NOTIFICATION_DESC": "Показувати сповіщення про нові повідомлення у підказках",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Заблоковано браузером)",
-		"COLLAPSE_BLOCKQUOTES": "Згорнути цитований текст",
-		"MAX_QUOTE_LEVEL": "Максимальний видимий рівень цитованого тексту",
-		"MIN_FONT_SIZE": "Minimum Font Size",
-		"LIST_INLINE_ATTACHMENTS": "Показати вбудовані вкладення у списку",
-		"LIST_SIMPLE_ATTACHMENTS": "Простий список вкладень",
-		"LIST_MESSAGES_GROUPED": "Показувати повідомлення групами (якщо сортування за датою або відправником)",
-		"EXTERNAL_IMAGES": "Зовнішні зображення",
-		"IMAGES_OPTION_ASK": "Завжди запитувати",
-		"IMAGES_OPTION_WHITELIST": "Білий список чи запитувати",
-		"IMAGES_OPTION_ALWAYS": "Завжди показувати",
-		"IMAGES_WHITELIST": "Білий список зображень",
-		"MESSAGE_POPUP_WINDOW": "Popup в новому вікні замісь нової вкладки",
-		"MAILTO": "Зареєструвати як обробник посилань типу 'mailto:'",
-		"HTML_TO_MD": "Перетворити HTML на MD (Markdown) замість простого тексту"
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"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",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Автоматично додавати отримувачів у адресну книгу",
@@ -515,58 +512,58 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Сервер",
 		"LABEL_CONTACTS_SYNC_AB_URL": "Адресна книга (URL)",
 		"LABEL_CONTACTS_SYNC_USER": "Користувач",
-		"SYNC_READ": "Тільки для читання"
+		"SYNC_READ": "Read only"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Теми Оформлення",
-		"LABEL_BACKGROUND": "Зображення на фоні",
-		"LABEL_FONTS": "Шрифти",
-		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Завантажити фонове зображення (JPG, PNG)",
+		"LABEL_BACKGROUND": "Картинка на фоні",
+		"LABEL_FONTS": "Fonts",
+		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Завантажити фонову картинку (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Файл надто великий",
 		"ERROR_FILE_TYPE_ERROR": "Невірний тип файлу (тільки JPG и PNG)",
 		"ERROR_UNKNOWN": "Помилка завантаження файлу"
 	},
 	"SETTINGS_FOLDERS": {
-		"LEGEND_FOLDERS": "Список Папок",
-		"BUTTON_CREATE": "Створити папку",
-		"BUTTON_SYSTEM": "Системні папки",
+		"LEGEND_FOLDERS": "Список Тек",
+		"BUTTON_CREATE": "Створити Теку",
+		"BUTTON_SYSTEM": "Системні теки",
 		"BUTTON_SUBSCRIBE": "Підписатися",
 		"BUTTON_UNSUBSCRIBE": "Відписатися",
-		"LOADING_PROCESS": "Оновлення списку папок",
-		"CREATING_PROCESS": "Створення папки",
-		"DELETING_PROCESS": "Видалення папки",
-		"RENAMING_PROCESS": "Перейменування папки",
-		"TO_MANY_FOLDERS_DESC_1": "У вас занадто багато папок!",
-		"TO_MANY_FOLDERS_DESC_2": "Ми показали лише частину з них, щоб уникнути проблем з продуктивністю.",
-		"HELP_DELETE_FOLDER": "Видалити папку",
-		"HELP_SHOW_HIDE_FOLDER": "Відобразити\/приховати папку",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Перевірте наявність нових повідомлень",
-		"HIDE_UNSUBSCRIBED": "Приховати папки, на які не підписано",
-		"UNHIDE_KOLAB_FOLDERS": "Показати папки Kolab",
-		"TYPE_CALENDAR": "Календар",
-		"TYPE_CONFIGURATION": "Конфігурація",
-		"TYPE_CONTACTS": "Контакти",
-		"TYPE_FILES": "Файли",
-		"TYPE_JOURNAL": "Журнал",
-		"TYPE_NOTES": "Нотатки",
-		"TYPE_TASKS": "Завдання"
+		"LOADING_PROCESS": "Оновлення списку тек",
+		"CREATING_PROCESS": "Створення теки",
+		"DELETING_PROCESS": "Видалення теки",
+		"RENAMING_PROCESS": "Перейменування теки",
+		"TO_MANY_FOLDERS_DESC_1": "You have too many folders!",
+		"TO_MANY_FOLDERS_DESC_2": "We have shown only a part of them, to avoid performance problems.",
+		"HELP_DELETE_FOLDER": "Видалити теку",
+		"HELP_SHOW_HIDE_FOLDER": "Відобразити\/приховати теку",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Check for new messages",
+		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
+		"TYPE_CALENDAR": "Calendar",
+		"TYPE_CONFIGURATION": "Configuration",
+		"TYPE_CONTACTS": "Contacts",
+		"TYPE_FILES": "Files",
+		"TYPE_JOURNAL": "Journal",
+		"TYPE_NOTES": "Notes",
+		"TYPE_TASKS": "Tasks"
 	},
 	"SETTINGS_ACCOUNTS": {
 		"LEGEND_ACCOUNTS": "Список акаунтів",
-		"LEGEND_IDENTITIES": "Список відправників",
-		"LEGEND_ACCOUNTS_AND_IDENTITIES": "Акаунти та відправники",
+		"LEGEND_IDENTITIES": "Identities",
+		"LEGEND_ACCOUNTS_AND_IDENTITIES": "Accounts and Identities",
 		"BUTTON_ADD_ACCOUNT": "Додати ще акаунт",
-		"BUTTON_ADD_IDENTITY": "Додати відправника",
+		"BUTTON_ADD_IDENTITY": "Add an Identity",
 		"LOADING_PROCESS": "Оновлення списку акаунтів",
-		"SHOW_UNREAD": "Показати кількість непрочитаних повідомлень"
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Імпортувати ключ",
 		"BUTTON_GENERATE_KEY_PAIR": "Новий ключ",
-		"IMPORT_FROM_SERVER": "Імпортувати з сервера",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Приватний",
 		"TITLE_PUBLIC": "Публічний",
-		"GET_MAILVELOPE": "Отримати Mailvelope розширення для браузера."
+		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Сполучення клавіш",
@@ -590,7 +587,7 @@
 		"LABEL_FULLSCREEN_ENTER": "Повноекранний режим",
 		"LABEL_VIEW_MESSAGE_ENTER": "Перегляд повідомлення",
 		"LABEL_SWITCH_TO_MESSAGE": "Переключити фокус на вибране повідомлення",
-		"LABEL_SWITCH_TO_FOLDER_LIST": "Переключити фокус на список папок",
+		"LABEL_SWITCH_TO_FOLDER_LIST": "Переключити фокус на список тек",
 		"LABEL_FULLSCREEN_TOGGLE": "Переключити повноекранний режим",
 		"LABEL_BLOCKQUOTES_TOGGLE": "Перемикання видимості цитат у листі",
 		"LABEL_THREAD_NEXT": "Наступний лист у листуванні",
@@ -599,50 +596,50 @@
 		"LABEL_CLOSE_MESSAGE": "Закрити повідомлення",
 		"LABEL_SWITCH_TO_LIST": "Переключити фокус на список листів",
 		"LABEL_OPEN_COMPOSE_POPUP": "Написати листа",
-		"LABEL_MINIMIZE_COMPOSE_POPUP": "Згорнути вікно",
+		"LABEL_MINIMIZE_COMPOSE_POPUP": "Minimize compose popup",
 		"LABEL_OPEN_IDENTITIES_DROPDOWN": "Вибрати відправника",
 		"LABEL_SAVE_MESSAGE": "Зберегти повідомлення",
 		"LABEL_SEND_MESSAGE": "Надіслати повідомлення",
 		"LABEL_CLOSE_COMPOSE": "Закрити повідомлення"
 	},
 	"NOTIFICATIONS": {
-		"RequestError": "Запит не вдалий",
-		"RequestAborted": "Запит скасовано",
-		"RequestTimeout": "Час очікування запиту минув",
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
 		"InvalidToken": "Невірний токен запиту",
 		"AuthError": "Не вдалося авторизуватися",
 		"ConnectionError": "Помилка з'єднання з сервером.",
 		"DomainAlreadyExists": "Домен вже існує",
 		"DomainNotAllowed": "Цей домен заборонений",
 		"AccountNotAllowed": "Цей акаунт заборонений",
-		"CryptKeyError": "Ваш пароль був змінений",
+		"CryptKeyError": "Your login passphrase has changed",
 		"ContactsSyncError": "Помилка синхронізації контактів",
 		"CantGetMessageList": "Не можу отримати список листів",
 		"CantGetMessage": "Не можу отримати листа",
 		"CantDeleteMessage": "Не можу видалити листа",
-		"CantCopyMessage": "Не можу скопіювати повідомлення",
+		"CantCopyMessage": "Can't copy message",
 		"CantMoveMessage": "Не можу перемістити листа",
 		"CantSaveMessage": "Не можу зберегти листа",
 		"CantSendMessage": "Не можу відправити листа",
 		"InvalidRecipients": "Перевірити правильність вводу всіх адрес.",
 		"CantSaveFilters": "Не можу зберегти фільтри",
-		"CantGetFilters": "Не можу отримати фільтри",
-		"CantActivateFiltersScript": "Не можу активувати скрипт фільру",
-		"CantDeleteFiltersScript": "Не можу видалити скрипт фільтру",
-		"FiltersAreNotCorrect": "Фільтри неправильні",
-		"CantCreateFolder": "Не можу створити папку",
-		"CantRenameFolder": "Не можу перейменувати папку",
-		"CantDeleteFolder": "Не можу видалити папку",
-		"CantDeleteNonEmptyFolder": "Не можу видалити не порожню папку",
-		"CantSubscribeFolder": "Не можу підписати папку",
-		"CantUnsubscribeFolder": "Не можу відписати папку",
+		"CantGetFilters": "Can't get filters",
+		"CantActivateFiltersScript": "Can't activate filters script",
+		"CantDeleteFiltersScript": "Can't delete filters script",
+		"FiltersAreNotCorrect": "Filters are not correct",
+		"CantCreateFolder": "Не можу створити теку",
+		"CantRenameFolder": "Не можу перейменувати теку",
+		"CantDeleteFolder": "Не можу видалити теку",
+		"CantDeleteNonEmptyFolder": "Не можу видалити не порожню теку",
+		"CantSubscribeFolder": "Не можу підписати теку",
+		"CantUnsubscribeFolder": "Не можу відписати теку",
 		"DemoSendMessageError": "Демо акаунту надсилання листів на зовнішні поштові адреси заборонена!",
-		"DemoAccountError": "З міркувань безпеки цей обліковий запис заборонено для цієї дії!",
+		"DemoAccountError": "For security purposes, this account is not allowed for this action!",
 		"AccountAlreadyExists": "акаунт вже додано",
-		"AccountDoesNotExist": "Акаунт не існує",
-		"AccountSwitchFailed": "Перемикання на акаунт \"%EMAIL%\" не вдало",
+		"AccountDoesNotExist": "Account doesn't exist",
+		"AccountSwitchFailed": "Switch to account \"%EMAIL%\" failed",
 		"MailServerError": "Помилка доступу до поштового серверу",
-		"InvalidInputArgument": "Неправильний параметр",
+		"InvalidInputArgument": "Invalid input argument",
 		"UnknownError": "Невідома помилка"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/vi/user.json b/snappymail/v/0.0.0/app/localization/vi/user.json
index 4454aa542..7ccc2f891 100644
--- a/snappymail/v/0.0.0/app/localization/vi/user.json
+++ b/snappymail/v/0.0.0/app/localization/vi/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "Đang sử dụng <strong>%SIZE% (%PROC%%)<\/strong> trong mức <strong>%LIMIT%<\/strong> của bạn",
 		"SORT": "Sắp xếp thư",
 		"NO_SORT": "Mail server does not support sorting",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Thư mới hiện trước",
 		"SORT_DATE_DESC": "Thư cũ hiện trước",
 		"SORT_SIZE_ASC": "Kích cỡ thư nhỏ đến lớn",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(Đang bị chặn bởi trình duyệt web)",
 		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
 		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"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)",
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 3e2590676..c6ef33ce9 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
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "已使用  <strong>%LIMIT%<\/strong> 中的 <strong>%SIZE% (%PROC%%)<\/strong> 儲存空間",
 		"SORT": "排序",
 		"NO_SORT": "郵件伺服器不支援排序",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "日期遞增",
 		"SORT_DATE_DESC": "日期遞減",
 		"SORT_SIZE_ASC": "大小遞增",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(遭瀏覽器封鎖)",
 		"COLLAPSE_BLOCKQUOTES": "摺疊引文",
 		"MAX_QUOTE_LEVEL": "最大化顯示引文",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"LIST_INLINE_ATTACHMENTS": "在清單中顯示內嵌附件",
 		"LIST_SIMPLE_ATTACHMENTS": "簡易附件清單",
 		"LIST_MESSAGES_GROUPED": "郵件清單已分組 (當以日期或寄件者排序)",
diff --git a/snappymail/v/0.0.0/app/localization/zh/user.json b/snappymail/v/0.0.0/app/localization/zh/user.json
index 5ad081b45..cb81edb72 100644
--- a/snappymail/v/0.0.0/app/localization/zh/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh/user.json
@@ -130,8 +130,6 @@
 		"QUOTA_SIZE": "使用了 <strong>%LIMIT%<\/strong> 存储空间中的<strong>%SIZE% (%PROC%%)<\/strong>",
 		"SORT": "排序",
 		"NO_SORT": "邮件服务器不支持排序",
-		"SORT_ARRIVAL_ASC": "Arrived ascending",
-		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "日期升序",
 		"SORT_DATE_DESC": "日期降序",
 		"SORT_SIZE_ASC": "大小升序",
@@ -495,7 +493,6 @@
 		"CHROME_NOTIFICATION_DESC_DENIED": "(被浏览器阻止)",
 		"COLLAPSE_BLOCKQUOTES": "折叠引用文本",
 		"MAX_QUOTE_LEVEL": "最多显示的引用文本层级",
-		"MIN_FONT_SIZE": "Minimum Font Size",
 		"LIST_INLINE_ATTACHMENTS": "在列表中显示内联附件",
 		"LIST_SIMPLE_ATTACHMENTS": "简洁附件列表",
 		"LIST_MESSAGES_GROUPED": "按分组显示消息 (按时间或发件人排序时)",
diff --git a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsAsk.html b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsAsk.html
index 8c5e2a30a..b8f08dae1 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsAsk.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsAsk.html
@@ -9,23 +9,13 @@
 		<label data-i18n="GLOBAL/PASSWORD"></label>
 		<input type="password" data-bind="value: passphrase">
 	</div>
-		<div class="control-group" style="display: inline-flex; align-items: start;flex-direction: column;">
-		<div data-bind="visible: askRemeber, component: {
+	<div data-bind="visible: askRemeber, component: {
 		name: 'Checkbox',
 		params: {
-			label: 'GLOBAL/REMEMBER_FOR_SESSION',
-			value: remember,
-			enable: !rememberPermanent()
-		}
-}"></div>
-			<div data-bind="visible: askRememberPermanent, component: {
-		name: 'Checkbox',
-		params: {
-			label: 'GLOBAL/REMEMBER_PERMANENT',
-			value: rememberPermanent
+			label: 'GLOBAL/REMEMBER',
+			value: remember
 		}
 	}"></div>
-	</div>
 	</form>
 </div>
 <footer>
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 42521ef43..9bc226a08 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
@@ -107,12 +107,6 @@
 			<li role="presentation" data-sort="REVERSE SUBJECT" data-bind="click: changeSort">
 				<a href="#" tabindex="-1" data-icon="𝐒⬆" data-i18n="MESSAGE_LIST/SORT_SUBJECT_DESC"></a>
 			</li>
-			<li class="dividerbar" role="presentation" data-sort="REVERSE ARRIVAL" data-bind="click: changeSort">
-				<a href="#" tabindex="-1" data-icon="📨⬇" data-i18n="MESSAGE_LIST/SORT_ARRIVAL_DESC"></a>
-			</li>
-			<li role="presentation" data-sort="ARRIVAL" data-bind="click: changeSort">
-				<a href="#" tabindex="-1" data-icon="📨⬆" data-i18n="MESSAGE_LIST/SORT_ARRIVAL_ASC"></a>
-			</li>
 		</menu>
 	</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 f3aa8517c..41d9ccdd0 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
@@ -143,8 +143,6 @@
 			<div class="informationShort">
 				<span class="from" data-bind="html: viewFromShort, attr:{ title: message().from }"></span>
 				<i class="fontastic" data-bind="text: dkimIcon, css: dkimIconClass, attr:{ title: dkimTitle }"></i>
-				<i class="fontastic" data-bind="text: dmarcIcon, css: dmarcIconClass, attr:{ title: dmarcTitle }"></i>
-				<i class="fontastic" data-bind="text: spfIcon, css: spfIconClass, attr:{ title: spfTitle }"></i>
 			</div>
 		</div>
 		<div id="messageItem">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
index cfd3ee2ac..0a5e87616 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
@@ -121,7 +121,6 @@
 									autocomplete="off" autocorrect="off" autocapitalize="off"
 									data-bind="textInput: nameSuffix" data-i18n="[placeholder]CONTACTS/NAME_SUFFIX">
 							</div>
-							<hr>
 							<div class="property-line" data-bind="visible: null != nickname()" data-i18n="[title]CONTACTS/ADD_MENU_NICKNAME">
 								<span data-bind="text: nickname"></span>
 								<input type="text"
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 6d0855ff3..201205a66 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
@@ -25,7 +25,7 @@
 					<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: id, value: email, attr: {required: !!id()}">
+						data-bind="visible: id, value: email, attr: {required: id}">
 				</div>
 			</div>
 			<div class="control-group">
@@ -101,10 +101,6 @@
 					<label data-i18n="SMIME/CERTIFICATE"></label>
 					<textarea name="smimeCertificate" class="input-xxlarge" rows="14" autofocus="" autocomplete="off" data-bind="value: smimeCertificate"></textarea>
 				</div>
-				<div class="control-group" data-bind="css: {'error': smimeCertificateChain() && !smimeCertificateChainValid()}">
-					<label data-i18n="SMIME/CERTIFICATECHAIN"></label>
-					<textarea name="smimeCertificateChain" class="input-xxlarge" rows="14" autofocus="" autocomplete="off" data-bind="value: smimeCertificateChain"></textarea>
-				</div>
 				<div class="control-group" data-bind="hidden:smimeCertificate">
 					<label></label>
 					<button type="button" data-bind="click: $root.createSelfSigned" data-i18n="CRYPTO/CREATE_SELF_SIGNED"></button>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
index 9b5c1689c..eac1e5f07 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
@@ -57,8 +57,9 @@
 					<i class="fontastic drag-handle">⬍</i>
 				</td>
 				<td class="e-action">
-					<span class="identity-name" data-bind="text: $data"></span>
-					<span class="identity-default" data-i18n="GLOBAL/DEFAULT"></span>
+					<span class="identity-name" data-bind="text: formattedName()"></span>
+					&nbsp;&nbsp;
+					<span class="identity-default" data-bind="visible: !$context.$index()" data-i18n="GLOBAL/DEFAULT"></span>
 				</td>
 				<td>
 					<a class="btn btn-small btn-danger button-confirm-delete" data-bind="visible: id, css: {'delete-access': askDelete}, click: function(oIdentity) { $root.deleteIdentity(oIdentity); }"
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsContacts.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsContacts.html
index 73c091f9d..6a734ba91 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsContacts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsContacts.html
@@ -39,9 +39,4 @@
 		<input type="password" autocomplete="current-password" autocorrect="off" autocapitalize="off"
 			spellcheck="false" data-bind="value: syncPass">
 	</div>
-	<div class="control-group" data-bind="hidden: !syncUrl()">
-		<label></label>
-		<button class="btn" data-i18n="GLOBAL/TEST" data-bind="click: test"></button>
-	</div>
-	<div class="alert alert-error" data-bind="visible: syncError, text: syncError"></div>
 </form>
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 5fe663658..233149db3 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
@@ -65,11 +65,6 @@
 			<span data-bind="saveTrigger: messagesPerPageTrigger"></span>
 		</div>
 	</div>
-	<div class="control-group" data-bind="visible: sortSupported">
-		<label data-i18n="MESSAGE_LIST/SORT"></label>
-		<select data-bind="options: sortOptions, optionsText: 'text', optionsValue: 'value', value: defaultSort"></select>
-		<span data-bind="saveTrigger: defaultSortTrigger"></span>
-	</div>
 	<div class="control-group">
 		<div>
 			<div data-bind="component: {
@@ -197,14 +192,6 @@
 			}"></div>
 		</div>
 	</div>
-	<div class="control-group">
-		<label data-i18n="SETTINGS_GENERAL/MIN_FONT_SIZE"></label>
-		<div>
-			<input type="number" min="0" step="1" class="span1" data-bind="textInput: minFontSize">
-			px&nbsp;
-			<span data-bind="saveTrigger: minFontSizeTrigger"></span>
-		</div>
-	</div>
 	<div class="control-group">
 		<label data-i18n="SETTINGS_GENERAL/MAX_QUOTE_LEVEL"></label>
 		<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 26f160b65..a516d4b4e 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
@@ -58,20 +58,6 @@
 				<span class="delete-key fontastic" data-bind="visible: !askDelete(), click: openForDeletion">🗑</span>
 			</td>
 		</tr>
-		<tr data-bind="visible: hasStoredPass">
-			<td>
-				<span class="fontastic" data-i18n="[title]SETTINGS_OPENPGP/TITLE_PRIVATE">🔒</span>
-				<span class="key-id" data-bind="text: id"></span>
-				<span>🔑</span><span class="key-user" data-i18n="SETTINGS_SECURITY/LABEL_STORED_PASS"></span>
-			</td>
-			<td>
-				<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askForgetPass()}, click: forgetPass"
-					 data-i18n="GLOBAL/ARE_YOU_SURE"></a>
-			</td>
-			<td>
-				<span class="delete-key fontastic" data-bind="visible: !askForgetPass(), click: openForPassForget">🗑</span>
-			</td>
-		</tr>
 	</tbody>
 	<tbody><tr><th colspan="4" data-i18n="SETTINGS_OPENPGP/TITLE_PUBLIC">Public keys</th></tr></tbody>
 	<tbody data-bind="foreach: gnupgPublicKeys, i18nUpdate: gnupgPublicKeys">
@@ -119,20 +105,6 @@
 				<span class="delete-key fontastic" data-bind="visible: !askDelete(), click: openForDeletion">🗑</span>
 			</td>
 		</tr>
-		<tr data-bind="visible: hasStoredPass">
-			<td>
-				<span class="fontastic" data-i18n="[title]SETTINGS_OPENPGP/TITLE_PRIVATE">🔒</span>
-				<span class="key-id" data-bind="text: id"></span>
-				<span>🔑</span><span class="key-user" data-i18n="SETTINGS_SECURITY/LABEL_STORED_PASS"></span>
-			</td>
-			<td>
-				<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askForgetPass()}, click: forgetPass"
-					 data-i18n="GLOBAL/ARE_YOU_SURE"></a>
-			</td>
-			<td>
-				<span class="delete-key fontastic" data-bind="visible: !askForgetPass(), click: openForPassForget">🗑</span>
-			</td>
-		</tr>
 	</tbody>
 	<tbody><tr><th colspan="4" data-i18n="SETTINGS_OPENPGP/TITLE_PUBLIC">Public keys</th></tr></tbody>
 	<tbody data-bind="foreach: openpgpkeysPublic, i18nUpdate: openpgpkeysPublic">
diff --git a/snappymail/v/0.0.0/imapsync.php b/snappymail/v/0.0.0/imapsync.php
index 3fcc1012c..47cc8dd60 100755
--- a/snappymail/v/0.0.0/imapsync.php
+++ b/snappymail/v/0.0.0/imapsync.php
@@ -183,7 +183,7 @@ function getImapClient(int $host)
 
 	$oImapClient = new \MailSo\Imap\ImapClient;
 //	$oAccount = new \RainLoop\Model\Account;
-	$oImapClient->SetLogger(\RainLoop\Api::Logger());
+	$oImapClient->SetLogger(\RainLoop\API::Logger());
 //	$oPlugins->RunHook('imap.before-connect', array($oAccount, $oImapClient, $ImapSettings));
 	$oImapClient->Connect($ImapSettings);
 //	$oPlugins->RunHook('imap.after-connect', array($oAccount, $oImapClient, $ImapSettings));
diff --git a/snappymail/v/0.0.0/include.php b/snappymail/v/0.0.0/include.php
index 724c81312..947d7a800 100644
--- a/snappymail/v/0.0.0/include.php
+++ b/snappymail/v/0.0.0/include.php
@@ -3,6 +3,11 @@ if (defined('APP_VERSION_ROOT_PATH')) {
 	return;
 }
 
+// PHP 8
+if (PHP_VERSION_ID < 80000) {
+	require __DIR__ . '/app/libraries/polyfill/php8.php';
+}
+
 if (!extension_loaded('ctype')) {
 	require __DIR__ . '/app/libraries/polyfill/ctype.php';
 }
diff --git a/test/header-unfold.php b/test/header-unfold.php
deleted file mode 100644
index 4b33c8d2f..000000000
--- a/test/header-unfold.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-// Run with: php test/header-unfold.php
-// RFC 5322 unfolding keeps the folding whitespace; RFC 2047 drops only the
-// whitespace BETWEEN two encoded words. A plain word followed by a folded
-// encoded word lost its space: "de vos\r\n =?utf-8?Q?=C3=A9quipements?="
-// was shown as "voséquipements" (Symfony Mailer folds subjects this way).
-define('APP_VERSION', 'test');
-spl_autoload_register(static function (string $class): void {
-	if (str_starts_with($class, 'SnappyMail\\')) {
-		$file = dirname(__DIR__).'/snappymail/v/0.0.0/app/libraries/snappymail/'.strtolower(str_replace('\\', '/', substr($class, 11))).'.php';
-	} else {
-		$file = dirname(__DIR__).'/snappymail/v/0.0.0/app/libraries/'.str_replace('\\', '/', $class).'.php';
-	}
-	if (is_file($file)) {
-		require_once $file;
-	}
-});
-
-function check(bool $condition, string $message): void
-{
-	if (!$condition) {
-		throw new RuntimeException($message);
-	}
-}
-
-function subject(string $raw): string
-{
-	$headers = new \MailSo\Mime\HeaderCollection("Subject: {$raw}\r\nX-Next: 1\r\n");
-	return (string) $headers->ValueByName('Subject');
-}
-
-$cases = [
-	// plain word, then a folded encoded word: the space stays
-	"Traiter les =?utf-8?Q?vuln=C3=A9rabilit=C3=A9s?= de vos\r\n =?utf-8?Q?=C3=A9quipements?= : plan de =?utf-8?Q?rem=C3=A9diation?= et\r\n checklist =?utf-8?Q?sign=C3=A9e?="
-		=> 'Traiter les vulnérabilités de vos équipements : plan de remédiation et checklist signée',
-	// two encoded words split across lines: no space between them (RFC 2047 §6.2)
-	"=?utf-8?Q?r=C3=A9pon?=\r\n =?utf-8?Q?se?=" => 'réponse',
-	"=?utf-8?B?w6l0w6k=?=\r\n\t=?utf-8?B?IGZpbg==?=" => 'été fin',
-	// encoded word, then a folded plain word: the space stays
-	"=?utf-8?Q?r=C3=A9union?=\r\n demain" => 'réunion demain',
-	// no encoding at all
-	"Hello\r\n world" => 'Hello world',
-];
-foreach ($cases as $raw => $want) {
-	// exact: a fold is one space, never two ("et  checklist" ended up in replies)
-	$got = subject($raw);
-	check($got === $want, "got [{$got}], want [{$want}]");
-}
-
-echo "header-unfold: ".count($cases)." checks OK\n";
diff --git a/vendors/knockout/build/fragments/extern-post.js b/vendors/knockout/build/fragments/extern-post.js
index 7011c1a5d..f97f952bd 100644
--- a/vendors/knockout/build/fragments/extern-post.js
+++ b/vendors/knockout/build/fragments/extern-post.js
@@ -1,2 +1,2 @@
-    window['ko'] = ko;
+    window['ko'] = koExports;
 })(this);
diff --git a/vendors/knockout/build/fragments/extern-pre.js b/vendors/knockout/build/fragments/extern-pre.js
index 9bb21fae1..19e295221 100644
--- a/vendors/knockout/build/fragments/extern-pre.js
+++ b/vendors/knockout/build/fragments/extern-pre.js
@@ -1,4 +1,5 @@
 (window => {
     // (0, eval)('this') is a robust way of getting a reference to the global object
     // For details, see http://stackoverflow.com/questions/14119988/return-this-0-evalthis/14120023#14120023
-    var document = window['document'];
+    var document = window['document'],
+        koExports = {};
diff --git a/vendors/knockout/build/output/knockout-latest.debug.js b/vendors/knockout/build/output/knockout-latest.debug.js
index 09cabb73d..15d1130f5 100644
--- a/vendors/knockout/build/output/knockout-latest.debug.js
+++ b/vendors/knockout/build/output/knockout-latest.debug.js
@@ -7,10 +7,11 @@
 (window => {
     // (0, eval)('this') is a robust way of getting a reference to the global object
     // For details, see http://stackoverflow.com/questions/14119988/return-this-0-evalthis/14120023#14120023
-    var document = window['document'];
+    var document = window['document'],
+        koExports = {};
 // Internally, all KO objects are attached to koExports (even the non-exported ones whose names will be minified by the closure compiler).
 // In the future, the following "ko" variable may be made distinct from "koExports" so that private objects are not externally reachable.
-const ko = {};
+var ko = typeof koExports !== 'undefined' ? koExports : {};
 // Google Closure Compiler helpers (used only to make the minified file smaller)
 ko.exportSymbol = (koPath, object) => {
     var tokens = koPath.split(".");
@@ -121,7 +122,7 @@ ko.utils = {
         element.textContent = ko.utils.unwrapObservable(textContent)
 };
 
-//ko.exportSymbol('utils', ko.utils);
+ko.exportSymbol('utils', ko.utils);
 ko.exportSymbol('unwrap', ko.utils.unwrapObservable); // Convenient shorthand, because this is used so commonly
 (() => {
 
@@ -195,7 +196,7 @@ ko.utils.domNodeDisposal = (() => {
     };
 
     return {
-        addDisposeCallback : (node, callback) => {
+        'addDisposeCallback' : (node, callback) => {
             if (typeof callback != "function")
                 throw Error("Callback must be a function");
             getDisposeCallbacksCollection(node, 1).add(callback);
@@ -232,8 +233,7 @@ ko.utils.domNodeDisposal = (() => {
 })();
 ko.cleanNode = ko.utils.domNodeDisposal.cleanNode; // Shorthand name for convenience
 ko.removeNode = ko.utils.domNodeDisposal.removeNode; // Shorthand name for convenience
-//ko.exportSymbol('utils.domNodeDisposal', ko.utils.domNodeDisposal);
-ko.exportSymbol('addDisposeCallback', ko.utils.domNodeDisposal.addDisposeCallback);
+ko.exportSymbol('utils.domNodeDisposal', ko.utils.domNodeDisposal);
 ko['extenders'] = {
     'debounce': (target, timeout) => target.limit(callback => debounce(callback, timeout)),
 
@@ -296,7 +296,7 @@ class koSubscription
     disposeWhenNodeIsRemoved(node) {
         // MutationObserver ?
         this._node = node;
-        ko.utils.domNodeDisposal.addDisposeCallback(node, this._domNodeDisposalCallback = this['dispose'].bind(this));
+        ko.utils.domNodeDisposal['addDisposeCallback'](node, this._domNodeDisposalCallback = this['dispose'].bind(this));
     }
 }
 
@@ -882,7 +882,7 @@ ko.computed = (evaluatorFunctionOrOptions, options) => {
     // Attach a DOM node disposal callback so that the computed will be proactively disposed as soon as the node is
     // removed using ko.removeNode. But skip if isActive is false (there will never be any dependencies to dispose).
     if (state.disposeWhenNodeIsRemoved && computedObservable.isActive()) {
-        ko.utils.domNodeDisposal.addDisposeCallback(state.disposeWhenNodeIsRemoved, state.domNodeDisposalCallback = () => {
+        ko.utils.domNodeDisposal['addDisposeCallback'](state.disposeWhenNodeIsRemoved, state.domNodeDisposalCallback = () => {
             computedObservable['dispose']();
         });
     }
@@ -1265,7 +1265,7 @@ ko.selectExtensions = {
         switch (element.nodeName) {
             case 'OPTION':
                 return (element[hasDomDataExpandoProperty] === true)
-                    ? ko.utils.domData.get(element, ko.bindingHandlers['options'].optionValueDomDataKey)
+                    ? ko.utils.domData.get(element, ko.bindingHandlers.options.optionValueDomDataKey)
                     : element.value;
             case 'SELECT':
                 return element.selectedIndex >= 0
@@ -1280,13 +1280,13 @@ ko.selectExtensions = {
         switch (element.nodeName) {
             case 'OPTION':
                 if (typeof value === "string") {
-                    ko.utils.domData.set(element, ko.bindingHandlers['options'].optionValueDomDataKey, undefined);
+                    ko.utils.domData.set(element, ko.bindingHandlers.options.optionValueDomDataKey, undefined);
                     delete element[hasDomDataExpandoProperty];
                     element.value = value;
                 }
                 else {
                     // Store arbitrary object using DomData
-                    ko.utils.domData.set(element, ko.bindingHandlers['options'].optionValueDomDataKey, value);
+                    ko.utils.domData.set(element, ko.bindingHandlers.options.optionValueDomDataKey, value);
                     element[hasDomDataExpandoProperty] = true;
 
                     // Special treatment of numbers is just for backward compatibility. KO 1.2.1 wrote numerical values to element.value.
@@ -1451,7 +1451,7 @@ ko.expressionRewriting = (() => {
         //                      it is !== existing value on that writable observable
         writeValueToProperty: (element, property, allBindings, key, value, checkIfDifferent) => {
             if (!property || !ko.isObservable(property)) {
-                console.log(`"${key}" should contain observable in ${element.outerHTML.replace(/>.+/,'>')}`);
+                console.error(`"${key}" should be observable in ${element.outerHTML.replace(/>.+/,'>')}`);
 //                ko.dataFor(element).key = value;
                 allBindings.get('$data')[key] = value;
             } else if (ko.isWriteableObservable(property) && (!checkIfDifferent || property.peek() !== value)) {
@@ -1538,15 +1538,17 @@ ko.expressionRewriting = (() => {
                 ko.utils.setDomNodeChildren(node, childNodes);
         },
 
+        prepend: (containerNode, nodeToPrepend) => {
+            // Start comments must always have a parent and at least one following sibling (the end comment)
+            isStartComment(containerNode)
+                ? containerNode.nextSibling.before(nodeToPrepend)
+                : containerNode.prepend(nodeToPrepend);
+        },
+
         insertAfter: (containerNode, nodeToInsert, insertAfterNode) => {
             insertAfterNode
                 ? insertAfterNode.after(nodeToInsert)
-                : (
-                    // Start comments must always have a parent and at least one following sibling (the end comment)
-                    isStartComment(containerNode)
-                        ? containerNode.nextSibling.before(nodeToInsert)
-                        : containerNode.prepend(nodeToInsert)
-                );
+                : ko.virtualElements.prepend(containerNode, nodeToInsert);
         },
 
         firstChild: node => {
@@ -1616,7 +1618,6 @@ ko.bindingProvider = new class
             try {
                 let cacheKey = bindingsString,
                     bindingFunction = bindingCache.get(cacheKey);
-/*
                 if (!bindingFunction) {
                     // Build the source for a function that evaluates "expression"
                     // For each scope variable, add an extra level of "with" nesting
@@ -1624,30 +1625,12 @@ ko.bindingProvider = new class
                     // Deprecated: with is no longer recommended
                     var rewrittenBindings = ko.expressionRewriting.preProcessBindings(bindingsString),
                         functionBody = "with($data){return{" + rewrittenBindings + "}}";
-                    bindingFunction = new Function("$context", "$root", "$parent", "$data", functionBody);
+                    bindingFunction = new Function("$context", "$root", "$parent", "$data", "$element", functionBody);
                     bindingCache.set(cacheKey, bindingFunction);
                 }
                 return bindingFunction(bindingContext,
-                    bindingContext["$root"], bindingContext["$parent"], bindingContext["$data"] || {}
+                    bindingContext["$root"], bindingContext["$parent"], bindingContext["$data"] || {}, node
                 );
-*/
-                if (!bindingFunction) {
-                    // Build the source for a function that evaluates "expression"
-                    // Use one "with" that has one secure scope handling Proxy
-                    // Deprecated: with is no longer recommended
-                    bindingFunction = new Function("$context",
-                        "with($context){return{" + ko.expressionRewriting.preProcessBindings(bindingsString) + "}}");
-                    bindingCache.set(cacheKey, bindingFunction);
-                }
-                bindingContext = new Proxy(
-                    bindingContext,
-                    {
-                        has: () => true,
-//                        get: (target, key) => target['$data'][key] || target[key]
-                        get: (target, key) => Reflect.has(target['$data'], key) ? target['$data'][key] : target[key]
-                    }
-                );
-                return bindingFunction(bindingContext);
             } catch (ex) {
                 ex.message = "Unable to parse bindings.\nBindings value: " + bindingsString
                     + "\nMessage: " + ex.message;
@@ -1790,7 +1773,7 @@ class AsyncCompleteContext {
         this.asyncDescendants = new Set;
         this.childrenComplete = false;
 
-        bindingInfo.asyncContext || ko.utils.domNodeDisposal.addDisposeCallback(node, asyncContextDispose);
+        bindingInfo.asyncContext || ko.utils.domNodeDisposal['addDisposeCallback'](node, asyncContextDispose);
 
         if (ancestorBindingInfo?.asyncContext) {
             ancestorBindingInfo.asyncContext.asyncDescendants.add(node);
@@ -2190,18 +2173,23 @@ ko.exportSymbol('bindingHandlers', ko.bindingHandlers);
         'init': (element, valueAccessor, ignored1, ignored2, bindingContext) => {
             var currentViewModel,
                 currentLoadingOperationId,
+                afterRenderSub,
                 disposeAssociatedComponentViewModel = () => {
                     var currentViewModelDispose = currentViewModel && currentViewModel['dispose'];
                     if (typeof currentViewModelDispose === 'function') {
                         currentViewModelDispose.call(currentViewModel);
                     }
+                    if (afterRenderSub) {
+                        afterRenderSub['dispose']();
+                    }
+                    afterRenderSub = null;
                     currentViewModel = null;
                     // Any in-flight loading operation is no longer relevant, so make sure we ignore its completion
                     currentLoadingOperationId = null;
                 };
 
             ko.virtualElements.emptyNode(element);
-            ko.utils.domNodeDisposal.addDisposeCallback(element, disposeAssociatedComponentViewModel);
+            ko.utils.domNodeDisposal['addDisposeCallback'](element, disposeAssociatedComponentViewModel);
 
             ko.computed(() => {
                 var componentName = ko.utils.unwrapObservable(valueAccessor()),
@@ -3567,5 +3555,5 @@ ko.utils.compareArrays = (() => {
         itemsForBeforeRemoveCallbacks.forEach(callback => callback && (callback.arrayEntry = deletedItemDummyValue));
     }
 })();
-    window['ko'] = ko;
+    window['ko'] = koExports;
 })(this);
diff --git a/vendors/knockout/build/output/knockout-latest.js b/vendors/knockout/build/output/knockout-latest.js
index e8985c5b2..b9a34d87c 100644
--- a/vendors/knockout/build/output/knockout-latest.js
+++ b/vendors/knockout/build/output/knockout-latest.js
@@ -4,64 +4,64 @@
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */
 
-(Q=>{function L(a,b){return a===b&&a!==Object(a)}function ba(a,b){var d;return()=>{d||(d=setTimeout(()=>{d=0;a()},b))}}function ca(a,b){var d;return()=>{clearTimeout(d);d=setTimeout(a,b)}}function da(a,b){b?.dispose?.()}function ea(a,b){var d=this.Mb,e=d[x];e.X||(this.Na&&this.wa[b]?(d.lb(b,a,this.wa[b]),this.wa[b]=null,--this.Na):e.v[b]||d.lb(b,a,e.A?{S:a}:d.Db(a)),a.ea&&a.Hb())}var J=Q.document;const c={W:(a,b)=>{a=a.split(".");for(var d=c,e=0,g=a.length-1;e<g;e++)d=d[a[e]];d[a[g]]=b},g:{extend:(a,
-b)=>b?Object.assign(a,b):a,K:(a,b)=>a&&Object.entries(a).forEach(d=>b(d[0],d[1])),Ra:a=>[...a.childNodes].forEach(b=>c.removeNode(b)),Xb:a=>{a=[...a];var b=(a[0]?.ownerDocument||J).createElement("div");a.forEach(d=>b.append(c.ia(d)));return b},va:(a,b)=>Array.prototype.map.call(a,b?d=>c.ia(d.cloneNode(!0)):d=>d.cloneNode(!0)),qa:(a,b)=>{c.g.Ra(a);b&&a.append(...b)},ya:(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},Cb:a=>null==a?"":a.trim?a.trim():a.toString().replace(/^[\s\xa0]+|[\s\xa0]+$/g,""),Qa:a=>a.ownerDocument.documentElement.contains(1!==a.nodeType?a.parentNode:a),Eb:(a,b)=>{if(!a?.nodeType)throw Error("element must be a DOM node when calling triggerEvent");a.dispatchEvent(new Event(b))},h:a=>c.V(a)?a():a,$a:(a,b)=>a.textContent=c.g.h(b)}};c.W("unwrap",c.g.h);
-(()=>{let a=0,b="__ko__"+Date.now(),d=new WeakMap;c.g.l={get:(e,g)=>(d.get(e)||{})[g],set:(e,g,m)=>{d.has(e)?d.get(e)[g]=m:d.set(e,{[g]:m});return m},Sa(e,g,m){return this.get(e,g)||this.set(e,g,m)},clear:e=>d.delete(e),Z:()=>a++ +b}})();c.g.N=(()=>{var a=c.g.l.Z(),b={1:1,8:1,9:1},d={1:1,9:1};const e=(f,h)=>{var k=c.g.l.get(f,a);h&&!k&&(k=new Set,c.g.l.set(f,a,k));return k},g=f=>{var h=e(f);h&&(new Set(h)).forEach(k=>k(f));c.g.l.clear(f);d[f.nodeType]&&m(f.childNodes,!0)},m=(f,h)=>{for(var k=[],l,
-p=0;p<f.length;p++)if(!h||8===f[p].nodeType)if(g(k[k.length]=l=f[p]),f[p]!==l)for(;p--&&!k.includes(f[p]););};return{ha:(f,h)=>{if("function"!=typeof h)throw Error("Callback must be a function");e(f,1).add(h)},Za:(f,h)=>{var k=e(f);k&&(k.delete(h),k.size||c.g.l.set(f,a,null))},ia:f=>{c.u.I(()=>{b[f.nodeType]&&(g(f),d[f.nodeType]&&m(f.getElementsByTagName("*")))});return f},removeNode:f=>{c.ia(f);f.parentNode&&f.parentNode.removeChild(f)}}})();c.ia=c.g.N.ia;c.removeNode=c.g.N.removeNode;c.W("addDisposeCallback",
-c.g.N.ha);c.extenders={debounce:(a,b)=>a.Ea(d=>ca(d,b)),rateLimit:(a,b)=>a.Ea(d=>ba(d,b)),notify:(a,b)=>{a.la="always"==b?null:L}};class fa{constructor(a,b,d){this.S=a;this.fb=b;this.Aa=d;this.Ia=!1;this.H=this.da=null}dispose(){this.Ia||(this.H&&c.g.N.Za(this.da,this.H),this.Ia=!0,this.Aa(),this.S=this.fb=this.Aa=this.da=this.H=null)}o(a){this.da=a;c.g.N.ha(a,this.H=this.dispose.bind(this))}}c.P=function(){Object.setPrototypeOf(this,M);M.init(this)};var M={init:a=>{a.R=new Map;a.R.set("change",new Set);
-a.kb=1},subscribe:function(a,b,d){var e=this;d=d||"change";var g=new fa(e,b?a.bind(b):a,()=>{e.R.get(d).delete(g);e.Ja?.(d)});e.Ka?.(d);e.R.has(d)||e.R.set(d,new Set);e.R.get(d).add(g);return g},B(a,b){b=b||"change";"change"===b&&this.Fa();if(this.oa(b)){b="change"===b&&this.Fb||new Set(this.R.get(b));try{c.u.ob(),b.forEach(d=>{d.Ia||d.fb(a)})}finally{c.u.end()}}},za(){return this.kb},Sb(a){return this.za()!==a},Fa(){++this.kb},Ea(a){var b=this,d=c.V(b),e,g,m,f,h;b.sa||(b.sa=b.B,b.B=(l,p)=>{p&&"change"!==
-p?"beforeChange"===p?b.hb(l):b.sa(l,p):b.ib(l)});var k=a(()=>{b.ea=!1;d&&f===b&&(f=b.gb?b.gb():b());var l=g||h&&b.Ca(m,f);h=g=e=!1;l&&b.sa(m=f)});b.ib=(l,p)=>{p&&b.ea||(h=!p);b.Fb=new Set(b.R.get("change"));b.ea=e=!0;f=l;k()};b.hb=l=>{e||(m=l,b.sa(l,"beforeChange"))};b.jb=()=>{h=!0};b.Hb=()=>{b.Ca(m,b.L(!0))&&(g=!0)}},oa(a){return(this.R.get(a)||[]).size},Ca(a,b){return!this.la||!this.la(a,b)},toString:()=>"[object Object]",extend:function(a){var b=this;a&&c.g.K(a,(d,e)=>{d=c.extenders[d];"function"==
-typeof d&&(b=d(b,e)||b)});return b}};c.P.fn=Object.setPrototypeOf(M,Function.prototype);c.Wb=a=>"function"==typeof a?.subscribe&&"function"==typeof a.B;(()=>{let a=[],b,d=0;c.u={ob:e=>{a.push(b);b=e},end:()=>b=a.pop(),Ab:e=>{if(b){if(!c.Wb(e))throw Error("Only subscribable things can act as dependencies");b.Kb.call(b.Lb,e,e.Gb||(e.Gb=++d))}},I(e,g,m){try{return a.push(b),b=void 0,e.apply(g,m||[])}finally{b=a.pop()}},na:()=>b?.m.na(),Da:()=>b?.Da,m:()=>b?.m}})();const A=Symbol("_latestValue");c.$=
-a=>{function b(){if(0<arguments.length)return b.Ca(b[A],arguments[0])&&(b.eb(),b[A]=arguments[0],b.valueHasMutated()),this;c.u.Ab(b);return b[A]}b[A]=a;Object.defineProperty(b,"length",{get:()=>b[A]?.length});c.P.fn.init(b);return Object.setPrototypeOf(b,E)};var E={toJSON:function(){let a=this[A];return a?.toJSON?.()||a},la:L,L(){return this[A]},valueHasMutated:function(){this.B(this[A],"spectate");this.B(this[A])},eb(){this.B(this[A],"beforeChange")}};Object.setPrototypeOf(E,c.P.fn);var D=c.$.$b=
-"__ko_proto__";E[D]=c.$;c.V=a=>{if((a="function"==typeof a&&a[D])&&a!==E[D]&&a!==c.m.fn[D])throw Error("Invalid object that looks like an observable; possibly from another Knockout instance");return!!a};c.wb=a=>"function"==typeof a&&(a[D]===E[D]||a[D]===c.m.fn[D]&&a.Tb);c.W("observable",c.$);c.W("isObservable",c.V);c.W("observable.fn",E);c.observableArray=a=>{a=a||[];if(!Array.isArray(a))throw Error("The argument passed when initializing an observable array must be an array, or null, or undefined.");
-return Object.setPrototypeOf(c.$(a),c.observableArray.fn).extend({trackArrayChanges:!0})};const R=Symbol("IS_OBSERVABLE_ARRAY");c.observableArray.fn=Object.setPrototypeOf({[R]:1,remove:function(a){for(var b=this.L(),d=!1,e="function"!=typeof a||c.V(a)?f=>f===a:a,g=b.length;g--;){var m=b[g];if(e(m)){if(b[g]!==m)throw Error("Array modified during remove; cannot remove item");d||this.eb();d=!0;b.splice(g,1)}}d&&this.valueHasMutated()}},c.$.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.observableArray.fn[a]=function(...b){var d=this.L();this.eb();this.qb(d,a,b);b=d[a](...b);this.valueHasMutated();return b===d?this:b}:c.observableArray.fn[a]=function(...b){return this()[a](...b)})});c.isObservableArray=a=>!(!a||!a[R]);c.extenders.trackArrayChanges=(a,b)=>{function d(){if(k){var q=[].concat(a.L()||[]);if(a.oa("arrayChange")){if(!m||1<k)m=c.g.rb(l,q,a.La);
-var r=m}l=q;m=null;k=0;r?.length&&a.B(r,"arrayChange")}}function e(){g?d():(g=!0,h=a.subscribe(()=>++k,null,"spectate"),l=[].concat(a.L()||[]),m=null,f=a.subscribe(d))}a.La={};"object"==typeof b&&c.g.extend(a.La,b);a.La.sparse=!0;if(!a.qb){var g=!1,m=null,f,h,k=0,l,p=a.Ka,n=a.Ja;a.Ka=q=>{p?.call(a,q);"arrayChange"===q&&e()};a.Ja=q=>{n?.call(a,q);"arrayChange"!==q||a.oa("arrayChange")||(f?.dispose(),h?.dispose(),h=f=null,g=!1,l=void 0)};a.qb=(q,r,t)=>{if(g&&!k){var u=[],z=q.length,w=t.length,y=0,B=
-(ha,ia,ja)=>u[u.length]={status:ha,value:ia,index:ja};switch(r){case "push":y=z;case "unshift":for(q=0;q<w;++q)B("added",t[q],y+q);break;case "pop":y=z-1;case "shift":z&&B("deleted",q[y],y);break;case "splice":y=Math.min(Math.max(0,0>t[0]?z+t[0]:t[0]),z);z=1===w?z:Math.min(y+(t[1]||0),z);w=y+w-2;r=Math.max(z,w);for(var v=[],F=[],C=2;y<r;++y,++C)y<z&&F.push(B("deleted",q[y],y)),y<w&&v.push(B("added",t[C],y));c.g.ub(F,v);break;default:return}m=u}}}};var x=Symbol("_state");c.m=(a,b)=>{function d(){if(0<
-arguments.length){if("function"!==typeof e)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.");e(...arguments);return this}g.X||c.u.Ab(d);(g.U||g.A&&d.pa())&&d.T();return g.J}"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 e=b.write,g={J:void 0,Y:!0,U:!0,Ba:!1,bb:!1,X:!1,Ya:!1,A:!1,zb:b.read,
-o:b.o||null,ja:b.ja,Pa:null,v:{},G:0,cc:null};d[x]=g;d.Tb="function"===typeof e;c.P.fn.init(d);Object.setPrototypeOf(d,K);b.pure&&(g.Ya=!0,g.A=!0,c.g.extend(d,ka));g.o&&(g.bb=!0,g.o.nodeType||(g.o=null));g.A||d.T();g.o&&d.isActive()&&c.g.N.ha(g.o,g.Pa=()=>{d.dispose()});return d};var K={la:L,na(){return this[x].G},Qb(){var a=[];c.g.K(this[x].v,(b,d)=>a[d.fa]=d.S);return a},Ta(a){if(!this[x].G)return!1;var b=this.Qb();return b.includes(a)||!!b.find(d=>d.Ta&&d.Ta(a))},lb(a,b,d){if(this[x].Ya&&b===this)throw Error("A 'pure' computed must not be called recursively");
-this[x].v[a]=d;d.fa=this[x].G++;d.ga=b.za()},pa(){var a,b=this[x].v;for(a in b)if(Object.prototype.hasOwnProperty.call(b,a)){var d=b[a];if(this.ra&&d.S.ea||d.S.Sb(d.ga))return!0}},ec(){this[x].Ba||this.ra?.(!1)},isActive(){var a=this[x];return a.U||0<a.G},fc(){this.ea?this[x].U&&(this[x].Y=!0):this.tb()},Db(a){return a.subscribe(this.tb,this)},tb(){this.ra?this.ra(!0):this.T(!0)},T(a){var b=this[x],d=b.ja,e=!1;if(!b.Ba&&!b.X){if(b.o&&!c.g.Qa(b.o)||d?.()){if(!b.bb){this.dispose();return}}else b.bb=
-!1;try{b.Ba=!0,e=this.Ob(a)}finally{b.Ba=!1}return e}},Ob(a){var b=this[x],d=b.Ya?void 0:!b.G;var e={Mb:this,wa:b.v,Na:b.G};c.u.ob({Lb:e,Kb:ea,m:this,Da:d});b.v={};b.G=0;a:{try{var g=b.zb();break a}finally{c.u.end(),e.Na&&!b.A&&c.g.K(e.wa,da),b.Y=b.U=!1}g=void 0}b.G?e=this.Ca(b.J,g):(this.dispose(),e=!0);e&&(b.A?this.Fa():this.B(b.J,"beforeChange"),b.J=g,this.B(b.J,"spectate"),!b.A&&a&&this.B(b.J),this.jb&&this.jb());d&&this.B(b.J,"awake");return e},L(a){var b=this[x];(b.U&&(a||!b.G)||b.A&&this.pa())&&
-this.T();return b.J},Ea(a){var b=this;c.P.fn.Ea.call(b,a);b.gb=()=>{b[x].A||(b[x].Y?b.T():b[x].U=!1);return b[x].J};b.ra=d=>{b.hb(b[x].J);b[x].U=!0;d&&(b[x].Y=!0);b.ib(b,!d)}},dispose:function(){var a=this[x];!a.A&&a.v&&c.g.K(a.v,(b,d)=>d.dispose?.());a.o&&a.Pa&&c.g.N.Za(a.o,a.Pa);a.v=void 0;a.G=0;a.X=!0;a.Y=!1;a.U=!1;a.A=!1;a.o=void 0;a.ja=void 0;a.zb=void 0}},ka={Ka(a){var b=this,d=b[x];if(!d.X&&d.A&&"change"==a){d.A=!1;if(d.Y||b.pa())d.v=null,d.G=0,b.T()&&b.Fa();else{var e=[];c.g.K(d.v,(g,m)=>
-e[m.fa]=g);e.forEach((g,m)=>{var f=d.v[g],h=b.Db(f.S);h.fa=m;h.ga=f.ga;d.v[g]=h});b.pa()&&b.T()&&b.Fa()}d.X||b.B(d.J,"awake")}},Ja(a){var b=this[x];b.X||"change"!=a||this.oa("change")||(c.g.K(b.v,(d,e)=>{e.dispose&&(b.v[d]={S:e.S,fa:e.fa,ga:e.ga},e.dispose())}),b.A=!0,this.B(void 0,"asleep"))},za(){var a=this[x];a.A&&(a.Y||this.pa())&&this.T();return c.P.fn.za.call(this)}};Object.setPrototypeOf(K,c.P.fn);var N=c.$.$b;K[N]=c.m;c.m.fn=K;c.W("computed",c.m);c.isComputed=a=>"function"==typeof a&&a[N]===
-K[N];c.yb=a=>{if("function"===typeof a)return c.m(a,{pure:!0});a={...a,pure:!0};return c.m(a)};c.C={M:a=>{switch(a.nodeName){case "OPTION":return!0===a.__ko__hasDomDataOptionValue__?c.g.l.get(a,c.i.options.Xa):a.value;case "SELECT":return 0<=a.selectedIndex?c.C.M(a.options[a.selectedIndex]):void 0;default:return a.value}},Ga:(a,b)=>{switch(a.nodeName){case "OPTION":"string"===typeof b?(c.g.l.set(a,c.i.options.Xa,void 0),delete a.__ko__hasDomDataOptionValue__,a.value=b):(c.g.l.set(a,c.i.options.Xa,
-b),a.__ko__hasDomDataOptionValue__=!0,a.value="number"===typeof b?b:"");break;case "SELECT":for(var d=-1,e=""===(b??""),g=a.options.length,m;g--;)if(m=c.C.M(a.options[g]),m==b||""===m&&e){d=g;break}if(0<=d||e&&1<a.size)a.selectedIndex=d;break;default:a.value=b??""}}};c.ma=(()=>{var a=RegExp("\"(?:\\\\.|[^\"])*\"|'(?:\\\\.|[^'])*'|`(?:\\\\.|[^`])*`|/\\*(?:[^*]|\\*+[^*/])*\\*+/|//.*\n|/(?:\\\\.|[^/])+/w*|[^\\s:,/][^,\"'`{}()/:[\\]]*[^\\s,\"'`{}()/:[\\]]|[^\\s]","g"),b=/[\])"'A-Za-z0-9_$]+$/,d={"in":1,
-"return":1,"typeof":1};return{Zb:e=>{e=c.g.Cb(e);123===e.charCodeAt(0)&&(e=e.slice(1,-1));e+="\n,";var g=[],m=e.match(a),f=[],h=0;if(1<m.length){for(var k=0,l;l=m[k++];){var p=l.charCodeAt(0);if(44===p){if(0>=h){n&&f.length&&g.push("'"+n+"':()=>("+f.join("")+")");var n=h=0;f=[];continue}}else if(58===p){if(!h&&!n&&1===f.length){n=f.pop();continue}}else if(47===p&&1<l.length&&(47===l.charCodeAt(1)||42===l.charCodeAt(1)))continue;else 47===p&&k&&1<l.length?(p=m[k-1].match(b))&&!d[p[0]]&&(e=e.slice(e.indexOf(l)+
-1),m=e.match(a),k=-1,l="/"):40===p||123===p||91===p?++h:41===p||125===p||93===p?--h:n||f.length||34!==p&&39!==p||(l=l.slice(1,-1));f.push(l)}if(0<h)throw Error("Unbalanced parentheses, braces, or brackets");}g.push("'$data':()=>$data");return g.join(",")},dc:(e,g)=>-1<e.findIndex(m=>m.key==g),Ha:(e,g,m,f,h,k)=>{g&&c.V(g)?!c.wb(g)||k&&g.L()===h||g(h):(console.log(`"${f}" should contain observable in ${e.outerHTML.replace(/>.+/,">")}`),m.get("$data")[f]=h)}}})();(()=>{function a(f){return 8==f.nodeType&&
-e.test(f.nodeValue)}function b(f){return 8==f.nodeType&&g.test(f.nodeValue)}function d(f,h){for(var k=f,l=1,p=[];k=k.nextSibling;){if(b(k)&&(c.g.l.set(k,m,!0),!--l))return p;p.push(k);a(k)&&++l}if(!h)throw Error("Cannot find closing comment tag to match: "+f.nodeValue);return null}var e=/^\s*ko(?:\s+([\s\S]+))?\s*$/,g=/^\s*\/ko\s*$/,m="__ko_matchedEndComment__";c.s={aa:{},childNodes:f=>a(f)?d(f):f.childNodes,ka:f=>{a(f)?(f=d(f))&&[...f].forEach(h=>c.removeNode(h)):c.g.Ra(f)},qa:(f,h)=>{a(f)?(c.s.ka(f),
-f.after(...h)):c.g.qa(f,h)},Vb:(f,h,k)=>{k?k.after(h):a(f)?f.nextSibling.before(h):f.prepend(h)},firstChild:f=>{if(a(f))return f=f.nextSibling,!f||b(f)?null:f;let h=f.firstChild;if(h&&b(h))throw Error("Found invalid end comment, as the first child of "+f);return h},nextSibling:f=>{if(a(f)){var h=d(f,void 0);f=h?(h.length?h[h.length-1]:f).nextSibling:null}if((h=f.nextSibling)&&b(h)){if(b(h)&&!c.g.l.get(h,m))throw Error("Found end comment without a matching opening comment, as child of "+f);return null}return h},
-Rb:a,bc:f=>(f=f.nodeValue.match(e))?f[1]:null}})();const S=new Map,la=a=>{switch(a.nodeType){case 1:return a.getAttribute("data-bind");case 8:return c.s.bc(a)}return null};c.pb=new class{Yb(a){switch(a.nodeType){case 1:return null!=a.getAttribute("data-bind");case 8:return c.s.Rb(a)}return!1}Pb(a,b){if(a=la(a))try{let d=S.get(a);d||(d=new Function("$context","with($context){return{"+c.ma.Zb(a)+"}}"),S.set(a,d));b=new Proxy(b,{has:()=>!0,get:(e,g)=>Reflect.has(e.$data,g)?e.$data[g]:e[g]});return d(b)}catch(d){throw d.message=
-"Unable to parse bindings.\nBindings value: "+a+"\nMessage: "+d.message,d;}return null}};const G=Symbol("_subscribable"),H=Symbol("_ancestorBindingInfo"),T=Symbol("_dataDependency"),U={},I=c.g.l.Z();c.i={};c.ba=class{constructor(a,b,d,e){var g=this,m=a===U,f=m?void 0:a,h="function"==typeof f&&!c.V(f),k=e?.dataDependency;a=()=>{var p=h?f():f;p=c.g.h(p);b?(c.g.extend(g,b),H in b&&(g[H]=b[H])):g.$root=p;g[G]=l;m?p=g.$data:g.$data=p;d?.(g,b,p);if(b?.[G]&&!c.u.m().Ta(b[G]))b[G]();k&&(g[T]=k);return g.$data};
-if(e?.exportDependencies)a();else{var l=c.yb(a);l.L();l.isActive()?l.la=null:g[G]=void 0}}createChildContext(a,b){return new c.ba(a,this,(d,e)=>{d.$parent=e.$data;b.extend?.(d)},b)}extend(a,b){return new c.ba(U,this,d=>c.g.extend(d,"function"==typeof a?a(d):a),b)}};const V=a=>{a=c.g.l.get(a,I);var b=a?.D;b&&(a.D=null,b.xb())};class ma{constructor(a,b,d){this.H=a;this.da=b;this.ua=new Set;this.F=!1;b.D||c.g.N.ha(a,V);d?.D&&(d.D.ua.add(a),this.Aa=d)}xb(){this.Aa?.D?.Nb(this.H)}Nb(a){this.ua.delete(a);
-this.ua.size||this.sb?.()}sb(){this.F=!0;this.da.D&&!this.ua.size&&(this.da.D=null,c.g.N.Za(this.H,V),c.j.notify(this.H,c.j.ca),this.xb())}}c.j={F:"childrenComplete",ca:"descendantsComplete",subscribe:(a,b,d,e,g)=>{var m=c.g.l.Sa(a,I,{});m.xa||(m.xa=new c.P);g?.notifyImmediately&&m.Wa[b]&&c.u.I(d,e,[a]);return m.xa.subscribe(d,e,b)},notify:(a,b)=>{var d=c.g.l.get(a,I);if(d&&(d.Wa[b]=!0,d.xa?.B(a,b),b==c.j.F))if(d.D)d.D.sb();else if(void 0===d.D&&d.xa?.oa(c.j.ca))throw Error("descendantsComplete event not supported for bindings on this node");
-},ab:(a,b)=>{var d=c.g.l.Sa(a,I,{});d.D||(d.D=new ma(a,d,b[H]));return b[H]==d?b:b.extend(e=>{e[H]=d})}};const X=(a,b)=>{for(var d,e=c.s.firstChild(b);d=e;)e=c.s.nextSibling(d),W(a,d);c.j.notify(b,c.j.F)},W=(a,b)=>{var d=a;if(1===b.nodeType||c.pb.Yb(b))d=Y(b,null,a);d&&!b.matches?.("SCRIPT,TEXTAREA,TEMPLATE")&&X(d,b)},na=a=>{var b=[],d={},e=[],g=m=>{if(!d[m]){var f=c.i[m];f&&(f.after&&(e.push(m),f.after.forEach(h=>{if(a[h]){if(e.includes(h))throw Error("Cannot combine the following bindings, because they have a cyclic dependency: "+
-e.join(", "));g(h)}}),e.length--),b.push({key:m,vb:f}));d[m]=!0}};c.g.K(a,g);return b},Y=(a,b,d)=>{var e=c.g.l.Sa(a,I,{}),g=e.Ib;if(!b){if(g)throw Error("You cannot apply bindings multiple times to the same element.");e.Ib=!0}g||(e.context=d);e.Wa||(e.Wa={});if(b&&"function"!==typeof b)var m=b;else{var f=c.m(()=>{if(m=b?b(d,a):c.pb.Pb(a,d))d[G]?.(),d[T]?.();return m},{o:a});m&&f.isActive()||(f=null)}var h=d,k;if(m){var l=f?n=>()=>f()[n]():n=>m[n],p={get:n=>m[n]&&l(n)(),has:n=>n in m};c.j.F in m&&
-c.j.subscribe(a,c.j.F,()=>{var n=m[c.j.F]();if(n){var q=c.s.childNodes(a);q.length&&n(q,c.dataFor(q[0]))}});c.j.ca in m&&(h=c.j.ab(a,d),c.j.subscribe(a,c.j.ca,()=>{var n=m[c.j.ca]();n&&c.s.firstChild(a)&&n(a)}));na(m).forEach(n=>{var q=n.vb.init,r=n.vb.update,t=n.key;if(8===a.nodeType&&!c.s.aa[t])throw Error("The binding '"+t+"' cannot be used with comment nodes");try{"function"==typeof q&&c.u.I(()=>{var u=q(a,l(t),p,h.$data,h);if(u&&u.controlsDescendantBindings){if(void 0!==k)throw Error("Multiple bindings ("+
-k+" and "+t+") are trying to control descendant bindings of the same element. You cannot use these bindings together on the same element.");k=t}}),"function"==typeof r&&c.m(()=>r(a,l(t),p,h.$data,h),{o:a})}catch(u){throw u.message='Unable to process binding "'+t+": "+m[t]+'"\nMessage: '+u.message,u;}})}return void 0===k&&h};c.ac=a=>c.g.l.get(a,I)?.context;const O=a=>a&&a instanceof c.ba?a:new c.ba(a);c.applyBindingAccessorsToNode=(a,b,d)=>Y(a,b,O(d));c.nb=(a,b)=>{1!==b.nodeType&&8!==b.nodeType||X(O(a),
-b)};c.Jb=(a,b)=>W(O(a),b);c.dataFor=a=>([1,8].includes(a?.nodeType)&&c.ac(a))?.$data;c.W("bindingHandlers",c.i);(()=>{var a=Object.create(null),b=new Map;c.components={get:(m,f)=>{if(b.has(m))f(b.get(m));else{var h=a[m];h?h.subscribe(f):(h=a[m]=new c.P,h.subscribe(f),g(m,k=>{b.set(m,k);delete a[m];h.B(k)}))}},register:(m,f)=>{if(!f)throw Error("Invalid configuration for "+m);if(d[m])throw Error("Component "+m+" is already registered");d[m]=f}};var d=Object.create(null),e=(m,f)=>{throw Error(`Component '${m}': ${f}`);
-},g=(m,f)=>{var h={},k=d[m]||{},l=k.template;k=k.viewModel;if(l){l.element||e(m,"Unknown template value: "+l);l=l.element;var p=J.getElementById(l);p||e(m,"Cannot find element with ID "+l);p.matches("TEMPLATE")||e(m,"Template Source Element not a <template>");h.template=c.g.va(p.content.childNodes)}k&&("function"!==typeof k.createViewModel&&e(m,"Unknown viewModel value: "+k),h.createViewModel=k.createViewModel);f(h.template&&h.createViewModel?h:null)}})();(()=>{var a=0;c.i.component={init:(b,d,e,
-g,m)=>{var f,h,k=()=>{var l=f&&f.dispose;"function"===typeof l&&l.call(f);h=f=null};c.s.ka(b);c.g.N.ha(b,k);c.m(()=>{var l=c.g.h(d());if("string"!==typeof l){var p=c.g.h(l.params);l=c.g.h(l.name)}if(!l)throw Error("No component name specified");var n=c.j.ab(b,m),q=h=++a;c.components.get(l,r=>{if(h===q){k();if(!r)throw Error("Unknown component '"+l+"'");var t=r.template;if(!t)throw Error("Component '"+l+"' has no template");c.s.qa(b,c.g.va(t));f=r.createViewModel(p,{element:b});c.nb(n.createChildContext(f,
-{}),b)}})},{o:b});return{controlsDescendantBindings:!0}}};c.s.aa.component=!0})();c.i.attr={update:(a,b)=>{b=c.g.h(b())||{};c.g.K(b,function(d,e){e=c.g.h(e);var g=d.indexOf(":");g="lookupNamespaceURI"in a&&0<g&&a.lookupNamespaceURI(d.slice(0,g));!1===e||null==e?g?a.removeAttributeNS(g,d):a.removeAttribute(d):(e=e.toString(),g?a.setAttributeNS(g,d,e):a.setAttribute(d,e))})}};(()=>{c.i.checked={after:["value","attr"],init:function(a,b,d){var e="checkbox"==a.type,g="radio"==a.type;if(e||g){const n=c.yb(()=>
-{if(d.has("checkedValue"))return c.g.h(d.get("checkedValue"));if(l)return d.has("value")?c.g.h(d.get("value")):a.value});var m=()=>{if(!c.u.Da()){var q=a.checked,r=n();if(q||!g&&!c.u.na()){var t=c.u.I(b);if(h){var u=k?t.L():t,z=p;p=r;z!==r?q&&(u.push(r),u.remove(z)):q?u.push(r):u.remove(r);k&&c.wb(t)&&t(u)}else e&&(void 0===r?r=q:q||(r=void 0)),c.ma.Ha(a,t,d,"checked",r,!0)}}},f=b(),h=e&&c.g.h(f)instanceof Array,k=!(h&&f.push&&f.splice),l=g||h,p=h?n():void 0;c.m(m,null,{o:a});a.addEventListener("click",
-m);c.m(()=>{var q=c.g.h(b()),r=n();h?(a.checked=q.includes(r),p=r):a.checked=e&&void 0===r?!!q:n()===q},null,{o:a});f=void 0}}};c.i.checkedValue={update:function(a,b){a.value=c.g.h(b())}}})();var P=(a,b,d)=>b&&b.split(/\s+/).forEach(e=>a.classList.toggle(e,d));c.i.css={update:(a,b)=>{b=c.g.h(b());"object"==typeof b?c.g.K(b,(d,e)=>{e=c.g.h(e);P(a,d,!!e)}):(b=c.g.Cb(b),P(a,a.__ko__cssValue,!1),a.__ko__cssValue=b,P(a,b,!0))}};c.i.enable={update:(a,b)=>{(b=c.g.h(b()))&&a.disabled?a.removeAttribute("disabled"):
-b||a.disabled||(a.disabled=!0)}};c.i.disable={update:(a,b)=>c.i.enable.update(a,()=>!c.g.h(b()))};c.i.event={init:function(a,b,d,e,g){c.g.K(b()||{},m=>{"string"==typeof m&&a.addEventListener(m,(...f)=>{var h=b()[m];if(h)try{e=g.$data;var k=h.apply(e,[e,...f])}finally{!0!==k&&f[0].preventDefault()}})})}};const Z=a=>()=>{var b=a(),d=c.V(b)?b.L():b;if(!d||Array.isArray(d))return{foreach:b};c.g.h(b);return{foreach:d.data}};c.i.foreach={init:(a,b)=>c.i.template.init(a,Z(b)),update:(a,b,d,e,g)=>c.i.template.update(a,
-Z(b),d,e,g)};c.s.aa.foreach=!0;c.i.hasfocus={init:(a,b,d)=>{var e=m=>{a.__ko_hasfocusUpdating=!0;m=a.ownerDocument.activeElement===a;c.ma.Ha(a,b(),d,"hasfocus",m,!0);a.__ko_hasfocusLastValue=m;a.__ko_hasfocusUpdating=!1},g=e.bind(null,!0);e=e.bind(null,!1);a.addEventListener("focus",g);a.addEventListener("focusin",g);a.addEventListener("blur",e);a.addEventListener("focusout",e);a.__ko_hasfocusLastValue=!1},update:(a,b)=>{b=!!c.g.h(b());a.__ko_hasfocusUpdating||a.__ko_hasfocusLastValue===b||(b?a.focus():
-a.blur())}};c.i.html={init:()=>({controlsDescendantBindings:!0}),update:(a,b)=>{c.g.Ra(a);b=c.g.h(b());if(null!=b){const d=J.createElement("template");d.innerHTML="string"!=typeof b?b.toString():b;a.appendChild(d.content)}}};(()=>{function a(b,d,e){c.i[b]={init:(g,m,f,h,k)=>{var l,p={};d&&(p={exportDependencies:!0});var n=f.has(c.j.ca);c.m(()=>{var q=c.g.h(m()),r=!e!==!q,t=!l;n&&(k=c.j.ab(g,k));if(r){p.dataDependency=c.u.m();var u=d?k.createChildContext("function"==typeof q?q:m,p):c.u.na()?k.extend(null,
-p):k}t&&c.u.na()&&(l=c.g.va(c.s.childNodes(g),!0));r?(t||c.s.qa(g,c.g.va(l)),c.nb(u,g)):(c.s.ka(g),c.j.notify(g,c.j.F))},{o:g});return{controlsDescendantBindings:!0}}};c.s.aa[b]=!0}a("if");a("ifnot",!1,!0);a("with",!0)})();var aa={};c.i.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 e=a.multiple,g=0!=a.length&&e?a.scrollTop:null,m=c.g.h(b()),f=
-[];b=()=>Array.from(a.options).filter(n=>n.selected);var h=(n,q,r)=>{var t=typeof q;return"function"==t?q(n):"string"==t?n[q]:r},k=(n,q)=>{f.length&&(n=f.includes(c.C.M(q[0])),q[0].selected=n,p&&!n&&c.u.I(c.g.Eb,null,[a,"change"]))};e?f=b().map(c.C.M):0<=a.selectedIndex&&f.push(c.C.M(a.options[a.selectedIndex]));if(m){Array.isArray(m)||(m=[m]);var l=m.filter(n=>n??1)}var p=!1;m=k;d.has("optionsAfterRender")&&"function"==typeof d.get("optionsAfterRender")&&(m=(n,q)=>{k(n,q);c.u.I(d.get("optionsAfterRender"),
-null,[q[0],n!==aa?n:void 0])});c.g.Bb(a,l,(n,q,r)=>{r.length&&(f=r[0].selected?[c.C.M(r[0])]:[],p=!0);q=a.ownerDocument.createElement("option");n===aa?(c.g.$a(q),c.C.Ga(q,void 0)):(r=h(n,d.get("optionsValue"),n),c.C.Ga(q,c.g.h(r)),n=h(n,d.get("optionsText"),r),c.g.$a(q,n));return[q]},{},m);l=f.length;(e?l&&b().length<l:l&&0<=a.selectedIndex?c.C.M(a.options[a.selectedIndex])!==f[0]:l||0<=a.selectedIndex)&&c.u.I(c.g.Eb,null,[a,"change"]);c.u.Da()&&c.j.notify(a,c.j.F);g&&20<Math.abs(g-a.scrollTop)&&
-(a.scrollTop=g)}};c.i.options.Xa=c.g.l.Z();c.i.style={update:(a,b)=>{c.g.K(c.g.h(b()||{}),(d,e)=>{e=c.g.h(e);if(null==e||!1===e)e="";if(/^--/.test(d))a.style.setProperty(d,e);else{d=d.replace(/-(\w)/g,(m,f)=>f.toUpperCase());var g=a.style[d];a.style[d]=e;e===g||a.style[d]!=g||isNaN(e)||(a.style[d]=e+"px")}})}};c.i.submit={init:(a,b,d,e,g)=>{if("function"!=typeof b())throw Error("The value for a submit binding must be a function");a.addEventListener("submit",m=>{var f=b();try{var h=f.call(g.$data,
-a)}finally{!0!==h&&m.preventDefault()}})}};c.i.text={init:()=>({controlsDescendantBindings:!0}),update:(a,b)=>{8===a.nodeType&&(a.text||a.after(a.text=J.createTextNode("")),a=a.text);c.g.$a(a,b())}};c.s.aa.text=!0;c.i.textInput={init:(a,b,d)=>{var e=a.value,g,m,f=()=>{clearTimeout(g);m=g=void 0;var k=a.value;a.checkValidity()&&e!==k&&(e=k,c.ma.Ha(a,b(),d,"textInput",k))},h=()=>{var k=c.g.h(b())??"";void 0!==m&&k===m?setTimeout(h,4):a.value!==k&&(a.value=k,e=a.value)};a.addEventListener("input",f);
-a.addEventListener("change",f);c.m(h,{o:a})}};c.i.value={init:(a,b,d)=>{var e=a.matches("SELECT"),g=a.matches("INPUT");if(!g||"checkbox"!=a.type&&"radio"!=a.type){var m=new Set,f=d.get("valueUpdate"),h=null,k=()=>{h=null;var n=b(),q=c.C.M(a);c.ma.Ha(a,n,d,"value",q)};f&&("string"==typeof f?m.add(f):f.forEach(n=>m.add(n)),m.delete("change"));m.forEach(n=>{var q=k;(n||"").startsWith("after")&&(q=()=>{h=c.C.M(a);setTimeout(k,0)},n=n.slice(5));a.addEventListener(n,q)});var l=g&&"file"==a.type?()=>{var n=
-c.g.h(b());null==n||""===n?a.value="":c.u.I(k)}:()=>{var n=c.g.h(b()),q=c.C.M(a);if(null!==h&&n===h)setTimeout(l,0);else if(n!==q||void 0===q)e?(c.C.Ga(a,n),n!==c.C.M(a)&&c.u.I(k)):c.C.Ga(a,n)};if(e){var p;c.j.subscribe(a,c.j.F,()=>{p?d.get("valueAllowUnset")?l():k():(a.addEventListener("change",k),p=c.m(l,{o:a}))},null,{notifyImmediately:!0})}else a.addEventListener("change",k),c.m(l,{o:a})}else c.applyBindingAccessorsToNode(a,{checkedValue:b})},update:()=>{}};c.i.visible={update:(a,b)=>{b=c.g.h(b());
-var d="none"!=a.style.display;b&&!d?a.style.display="":d&&!b&&(a.style.display="none")}};c.i.hidden={update:(a,b)=>a.hidden=!!c.g.h(b())};(function(a){c.i[a]={init:function(b,d,e,g,m){return c.i.event.init.call(this,b,()=>({[a]:d()}),e,g,m)}}})("click");(()=>{let a=c.g.l.Z();class b{constructor(e){this.Oa=e}Va(...e){let g=this.Oa;if(!e.length)return c.g.l.get(g,a)||(11===this.H?g.content:1===this.H?g:void 0);c.g.l.set(g,a,e[0])}}class d extends b{constructor(e){super(e);e&&(this.H=e.matches("TEMPLATE")&&
-e.content?e.content.nodeType:1)}}c.cb={Oa:d,mb:b}})();(()=>{const a=(h,k,l)=>{var p;for(k=c.s.nextSibling(k);h&&(p=h)!==k;)h=c.s.nextSibling(p),l(p,h)},b=(h,k)=>{if(h.length){var l=h[0],p=l.parentNode;a(l,h[h.length-1],n=>(1===n.nodeType||8===n.nodeType)&&c.Jb(k,n));c.g.ya(h,p)}},d=(h,k,l,p)=>{var n=(h&&(h.nodeType?h:0<h.length?h[0]:null)||l||{}).ownerDocument;if("string"==typeof l){n=n||J;n=n.getElementById(l);if(!n)throw Error("Cannot find template with ID "+l);l=new c.cb.Oa(n)}else if([1,8].includes(l.nodeType))l=
-new c.cb.mb(l);else throw Error("Unknown template type: "+l);l=(l=l.Va?l.Va():null)?[...l.cloneNode(!0).childNodes]:null;if(!Array.isArray(l)||0<l.length&&"number"!=typeof l[0].nodeType)throw Error("Template engine must return an array of DOM nodes");k&&(c.s.qa(h,l),b(l,p),c.j.notify(h,c.j.F));return l},e=(h,k,l)=>c.V(h)?h():"function"===typeof h?h(k,l):h,g=(h,k,l,p)=>{l=l||{};if(p){var n=p.nodeType?p:0<p.length?p[0]:null;return c.m(()=>{var q=k instanceof c.ba?k:new c.ba(k,null,null,{exportDependencies:!0}),
-r=e(h,q.$data,q);d(p,!0,r,q,l)},{ja:()=>!n||!c.g.Qa(n),o:n})}console.log("no targetNodeOrNodeArray")},m=(h,k,l,p,n)=>{var q,r=(w,y)=>{q=n.createChildContext(w,{extend:B=>B.$index=y});w=e(h,w,q);return d(p,!1,w,q,l)},t=(w,y)=>{b(y,q);q=null},u=(w,y)=>{c.u.I(c.g.Bb,null,[p,w,r,l,t,y]);c.j.notify(p,c.j.F)};if(c.isObservableArray(k)){u(k.L());var z=k.subscribe(w=>{u(k(),w)},null,"arrayChange");z.o(p);return z}return c.m(()=>{var w=c.g.h(k)||[];Array.isArray(w)||(w=[w]);u(w)},{o:p})},f=c.g.l.Z();c.i.template=
-{init:(h,k)=>{k=c.g.h(k());if("string"==typeof k||"name"in k)c.s.ka(h);else if(k=c.s.childNodes(h),k.length)k=c.g.Xb(k),(new c.cb.mb(h)).Va(k);else throw Error("Anonymous template defined, but no template content was provided");return{controlsDescendantBindings:!0}},update:(h,k,l,p,n)=>{p=k();k=c.g.h(p);l=null;"string"==typeof k?k={}:p="name"in k?k.name:h;var q=!!p;"foreach"in k?l=m(p,q&&k.foreach||[],k,h,n):q?(l=n,"data"in k&&(l=n.createChildContext(k.data,{exportDependencies:!0})),l=g(p,l,k,h)):
-c.s.ka(h);n=l;c.g.l.get(h,f)?.dispose?.();c.g.l.set(h,f,!n||n.isActive&&!n.isActive()?void 0:n)}};c.s.aa.template=!0})();c.g.ub=(a,b,d)=>{var e=0,g,m=b.length;m&&a.every(f=>{g=b.findIndex(h=>f.value===h.value);0<=g&&(f.moved=b[g].index,b[g].moved=f.index,b.splice(g,1),e=g=0,--m);e+=m;return m&&(!d||e<d)})};c.g.rb=(()=>{var a=(b,d,e,g,m)=>{for(var f=Math.min,h=Math.max,k=[],l=-1,p=b.length,n,q=d.length,r=q-p||1,t=p+q+1,u,z,w;++l<=p;)for(z=u,k.push(u=[]),w=f(q,l+r),n=h(0,l-1);n<=w;n++)u[n]=n?l?b[l-
-1]===d[n-1]?z[n-1]:f(z[n]||t,u[n-1]||t)+1:n+1:l+1;f=[];h=[];r=[];l=p;for(n=q;l||n;)q=k[l][n]-1,n&&q===k[l][n-1]?h.push(f[f.length]={status:e,value:d[--n],index:n}):l&&q===k[l-1][n]?r.push(f[f.length]={status:g,value:b[--l],index:l}):(--n,--l,m.sparse||f.push({status:"retained",value:d[n]}));c.g.ub(r,h,10*p);return f.reverse()};return(b,d,e)=>{b=b||[];d=d||[];return b.length<d.length?a(b,d,"added","deleted",e):a(d,b,"deleted","added",e)}})();(()=>{function a(e,g,m,f,h){var k=[],l=c.m(()=>{var p=g(m,
-h,c.g.ya(k,e))||[];if(0<k.length){var n=k.nodeType?[k]:k;if(0<n.length){var q=n[0],r=q.parentNode;p.forEach(t=>r.insertBefore(t,q));n.forEach(t=>c.removeNode(t))}f&&c.u.I(f,null,[m,p,h])}k.length=0;k.push(...p)},{o:e,ja:()=>!!k.find(c.g.Qa)});return{O:k,Ma:l.isActive()?l:void 0}}var b=c.g.l.Z(),d=c.g.l.Z();c.g.Bb=(e,g,m,f,h,k)=>{g=g||[];Array.isArray(g)||(g=[g]);var l=c.g.l.get(e,b),p=[],n=0,q=0,r=[],t=[],u,z=v=>{u={ta:v,Ua:c.$(q++)};p.push(u)},w=v=>{u=l[v];u.Ua(q++);c.g.ya(u.O,e);p.push(u)};if(l){if(!k||
-l&&l._countWaitingForRemove)k=c.g.rb(Array.prototype.map.call(l,C=>C.ta),g,{sparse:!0});let v,F;for(k.forEach(C=>{v=C.moved;F=C.index;switch(C.status){case "deleted":for(;n<F;)w(n++);void 0===v&&(u=l[n],u.Ma&&(u.Ma.dispose(),u.Ma=void 0),c.g.ya(u.O,e).length&&u&&r.push.apply(r,u.O));n++;break;case "added":for(;q<F;)w(n++);void 0!==v?(t.push(p.length),w(v)):z(C.value)}});q<g.length;)w(n++);p._countWaitingForRemove=0}else g.forEach(z);c.g.l.set(e,b,p);r.forEach(c.removeNode);var y=v=>{c.s.Vb(e,v,B);
-B=v};k=e.ownerDocument.activeElement;if(t.length)for(;null!=(g=t.shift());){for(u=p[g];g--;)if(f=p[g].O,f?.length){var B=f[f.length-1];break}u.O.forEach(y)}p.forEach(v=>{v.O||c.g.extend(v,a(e,m,v.ta,h,v.Ua));v.O.forEach(y);!v.Ub&&h&&(h(v.ta,v.O,v.Ua),v.Ub=!0,B=v.O[v.O.length-1])});e.ownerDocument.activeElement!=k&&k?.focus();[].forEach(v=>v&&(v.ta=d))}})();Q.ko=c})(this);
+(R=>{function L(a,b){return a===b&&a!==Object(a)}function ca(a,b){var d;return()=>{d||(d=setTimeout(()=>{d=0;a()},b))}}function da(a,b){var d;return()=>{clearTimeout(d);d=setTimeout(a,b)}}function ea(a,b){b?.dispose?.()}function fa(a,b){var d=this.Lb,e=d[x];e.X||(this.Ma&&this.va[b]?(d.kb(b,a,this.va[b]),this.va[b]=null,--this.Ma):e.v[b]||d.kb(b,a,e.A?{S:a}:d.Cb(a)),a.ea&&a.Gb())}var J=R.document,M={},c="undefined"!==typeof M?M:{};c.U=(a,b)=>{a=a.split(".");for(var d=c,e=0,g=a.length-1;e<g;e++)d=
+d[a[e]];d[a[g]]=b};c.g={extend:(a,b)=>b?Object.assign(a,b):a,K:(a,b)=>a&&Object.entries(a).forEach(d=>b(d[0],d[1])),Qa:a=>[...a.childNodes].forEach(b=>c.removeNode(b)),Wb:a=>{a=[...a];var b=(a[0]?.ownerDocument||J).createElement("div");a.forEach(d=>b.append(c.ha(d)));return b},ua:(a,b)=>Array.prototype.map.call(a,b?d=>c.ha(d.cloneNode(!0)):d=>d.cloneNode(!0)),pa:(a,b)=>{c.g.Qa(a);b&&a.append(...b)},xa:(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},Bb:a=>null==a?"":a.trim?a.trim():a.toString().replace(/^[\s\xa0]+|[\s\xa0]+$/g,""),Pa:a=>a.ownerDocument.documentElement.contains(1!==a.nodeType?a.parentNode:a),Db:(a,b)=>{if(!a?.nodeType)throw Error("element must be a DOM node when calling triggerEvent");a.dispatchEvent(new Event(b))},h:a=>c.W(a)?a():a,Za:(a,b)=>a.textContent=
+c.g.h(b)};c.U("utils",c.g);c.U("unwrap",c.g.h);(()=>{let a=0,b="__ko__"+Date.now(),d=new WeakMap;c.g.l={get:(e,g)=>(d.get(e)||{})[g],set:(e,g,l)=>{d.has(e)?d.get(e)[g]=l:d.set(e,{[g]:l});return l},Ra(e,g,l){return this.get(e,g)||this.set(e,g,l)},clear:e=>d.delete(e),Z:()=>a++ +b}})();c.g.N=(()=>{var a=c.g.l.Z(),b={1:1,8:1,9:1},d={1:1,9:1};const e=(f,h)=>{var k=c.g.l.get(f,a);h&&!k&&(k=new Set,c.g.l.set(f,a,k));return k},g=f=>{var h=e(f);h&&(new Set(h)).forEach(k=>k(f));c.g.l.clear(f);d[f.nodeType]&&
+l(f.childNodes,!0)},l=(f,h)=>{for(var k=[],m,p=0;p<f.length;p++)if(!h||8===f[p].nodeType)if(g(k[k.length]=m=f[p]),f[p]!==m)for(;p--&&!k.includes(f[p]););};return{addDisposeCallback:(f,h)=>{if("function"!=typeof h)throw Error("Callback must be a function");e(f,1).add(h)},Ya:(f,h)=>{var k=e(f);k&&(k.delete(h),k.size||c.g.l.set(f,a,null))},ha:f=>{c.u.I(()=>{b[f.nodeType]&&(g(f),d[f.nodeType]&&l(f.getElementsByTagName("*")))});return f},removeNode:f=>{c.ha(f);f.parentNode&&f.parentNode.removeChild(f)}}})();
+c.ha=c.g.N.ha;c.removeNode=c.g.N.removeNode;c.U("utils.domNodeDisposal",c.g.N);c.extenders={debounce:(a,b)=>a.Da(d=>da(d,b)),rateLimit:(a,b)=>a.Da(d=>ca(d,b)),notify:(a,b)=>{a.ka="always"==b?null:L}};class ha{constructor(a,b,d){this.S=a;this.eb=b;this.za=d;this.Ha=!1;this.H=this.da=null}dispose(){this.Ha||(this.H&&c.g.N.Ya(this.da,this.H),this.Ha=!0,this.za(),this.S=this.eb=this.za=this.da=this.H=null)}s(a){this.da=a;c.g.N.addDisposeCallback(a,this.H=this.dispose.bind(this))}}c.P=function(){Object.setPrototypeOf(this,
+N);N.init(this)};var N={init:a=>{a.R=new Map;a.R.set("change",new Set);a.jb=1},subscribe:function(a,b,d){var e=this;d=d||"change";var g=new ha(e,b?a.bind(b):a,()=>{e.R.get(d).delete(g);e.Ia?.(d)});e.Ja?.(d);e.R.has(d)||e.R.set(d,new Set);e.R.get(d).add(g);return g},B(a,b){b=b||"change";"change"===b&&this.Ea();if(this.na(b)){b="change"===b&&this.Eb||new Set(this.R.get(b));try{c.u.nb(),b.forEach(d=>{d.Ha||d.eb(a)})}finally{c.u.end()}}},ya(){return this.jb},Rb(a){return this.ya()!==a},Ea(){++this.jb},
+Da(a){var b=this,d=c.W(b),e,g,l,f,h;b.ra||(b.ra=b.B,b.B=(m,p)=>{p&&"change"!==p?"beforeChange"===p?b.gb(m):b.ra(m,p):b.hb(m)});var k=a(()=>{b.ea=!1;d&&f===b&&(f=b.fb?b.fb():b());var m=g||h&&b.Ba(l,f);h=g=e=!1;m&&b.ra(l=f)});b.hb=(m,p)=>{p&&b.ea||(h=!p);b.Eb=new Set(b.R.get("change"));b.ea=e=!0;f=m;k()};b.gb=m=>{e||(l=m,b.ra(m,"beforeChange"))};b.ib=()=>{h=!0};b.Gb=()=>{b.Ba(l,b.L(!0))&&(g=!0)}},na(a){return(this.R.get(a)||[]).size},Ba(a,b){return!this.ka||!this.ka(a,b)},toString:()=>"[object Object]",
+extend:function(a){var b=this;a&&c.g.K(a,(d,e)=>{d=c.extenders[d];"function"==typeof d&&(b=d(b,e)||b)});return b}};c.P.fn=Object.setPrototypeOf(N,Function.prototype);c.Vb=a=>"function"==typeof a?.subscribe&&"function"==typeof a.B;(()=>{let a=[],b,d=0;c.u={nb:e=>{a.push(b);b=e},end:()=>b=a.pop(),zb:e=>{if(b){if(!c.Vb(e))throw Error("Only subscribable things can act as dependencies");b.Jb.call(b.Kb,e,e.Fb||(e.Fb=++d))}},I(e,g,l){try{return a.push(b),b=void 0,e.apply(g,l||[])}finally{b=a.pop()}},ma:()=>
+b?.o.ma(),Ca:()=>b?.Ca,o:()=>b?.o}})();const A=Symbol("_latestValue");c.$=a=>{function b(){if(0<arguments.length)return b.Ba(b[A],arguments[0])&&(b.cb(),b[A]=arguments[0],b.valueHasMutated()),this;c.u.zb(b);return b[A]}b[A]=a;Object.defineProperty(b,"length",{get:()=>b[A]?.length});c.P.fn.init(b);return Object.setPrototypeOf(b,E)};var E={toJSON:function(){let a=this[A];return a?.toJSON?.()||a},ka:L,L(){return this[A]},valueHasMutated:function(){this.B(this[A],"spectate");this.B(this[A])},cb(){this.B(this[A],
+"beforeChange")}};Object.setPrototypeOf(E,c.P.fn);var D=c.$.Zb="__ko_proto__";E[D]=c.$;c.W=a=>{if((a="function"==typeof a&&a[D])&&a!==E[D]&&a!==c.o.fn[D])throw Error("Invalid object that looks like an observable; possibly from another Knockout instance");return!!a};c.vb=a=>"function"==typeof a&&(a[D]===E[D]||a[D]===c.o.fn[D]&&a.Sb);c.U("observable",c.$);c.U("isObservable",c.W);c.U("observable.fn",E);c.observableArray=a=>{a=a||[];if(!Array.isArray(a))throw Error("The argument passed when initializing an observable array must be an array, or null, or undefined.");
+return Object.setPrototypeOf(c.$(a),c.observableArray.fn).extend({trackArrayChanges:!0})};const S=Symbol("IS_OBSERVABLE_ARRAY");c.observableArray.fn=Object.setPrototypeOf({[S]:1,remove:function(a){for(var b=this.L(),d=!1,e="function"!=typeof a||c.W(a)?f=>f===a:a,g=b.length;g--;){var l=b[g];if(e(l)){if(b[g]!==l)throw Error("Array modified during remove; cannot remove item");d||this.cb();d=!0;b.splice(g,1)}}d&&this.valueHasMutated()}},c.$.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.observableArray.fn[a]=function(...b){var d=this.L();this.cb();this.pb(d,a,b);b=d[a](...b);this.valueHasMutated();return b===d?this:b}:c.observableArray.fn[a]=function(...b){return this()[a](...b)})});c.isObservableArray=a=>!(!a||!a[S]);c.extenders.trackArrayChanges=(a,b)=>{function d(){if(k){var q=[].concat(a.L()||[]);if(a.na("arrayChange")){if(!l||1<k)l=c.g.qb(m,q,a.Ka);
+var r=l}m=q;l=null;k=0;r?.length&&a.B(r,"arrayChange")}}function e(){g?d():(g=!0,h=a.subscribe(()=>++k,null,"spectate"),m=[].concat(a.L()||[]),l=null,f=a.subscribe(d))}a.Ka={};"object"==typeof b&&c.g.extend(a.Ka,b);a.Ka.sparse=!0;if(!a.pb){var g=!1,l=null,f,h,k=0,m,p=a.Ja,n=a.Ia;a.Ja=q=>{p?.call(a,q);"arrayChange"===q&&e()};a.Ia=q=>{n?.call(a,q);"arrayChange"!==q||a.na("arrayChange")||(f?.dispose(),h?.dispose(),h=f=null,g=!1,m=void 0)};a.pb=(q,r,u)=>{if(g&&!k){var t=[],z=q.length,w=u.length,y=0,B=
+(ia,ja,ka)=>t[t.length]={status:ia,value:ja,index:ka};switch(r){case "push":y=z;case "unshift":for(q=0;q<w;++q)B("added",u[q],y+q);break;case "pop":y=z-1;case "shift":z&&B("deleted",q[y],y);break;case "splice":y=Math.min(Math.max(0,0>u[0]?z+u[0]:u[0]),z);z=1===w?z:Math.min(y+(u[1]||0),z);w=y+w-2;r=Math.max(z,w);for(var v=[],F=[],C=2;y<r;++y,++C)y<z&&F.push(B("deleted",q[y],y)),y<w&&v.push(B("added",u[C],y));c.g.tb(F,v);break;default:return}l=t}}}};var x=Symbol("_state");c.o=(a,b)=>{function d(){if(0<
+arguments.length){if("function"!==typeof e)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.");e(...arguments);return this}g.X||c.u.zb(d);(g.V||g.A&&d.oa())&&d.T();return g.J}"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 e=b.write,g={J:void 0,Y:!0,V:!0,Aa:!1,ab:!1,X:!1,Xa:!1,A:!1,yb:b.read,
+s:b.s||null,ia:b.ia,Oa:null,v:{},G:0,bc:null};d[x]=g;d.Sb="function"===typeof e;c.P.fn.init(d);Object.setPrototypeOf(d,K);b.pure&&(g.Xa=!0,g.A=!0,c.g.extend(d,la));g.s&&(g.ab=!0,g.s.nodeType||(g.s=null));g.A||d.T();g.s&&d.isActive()&&c.g.N.addDisposeCallback(g.s,g.Oa=()=>{d.dispose()});return d};var K={ka:L,ma(){return this[x].G},Pb(){var a=[];c.g.K(this[x].v,(b,d)=>a[d.fa]=d.S);return a},Sa(a){if(!this[x].G)return!1;var b=this.Pb();return b.includes(a)||!!b.find(d=>d.Sa&&d.Sa(a))},kb(a,b,d){if(this[x].Xa&&
+b===this)throw Error("A 'pure' computed must not be called recursively");this[x].v[a]=d;d.fa=this[x].G++;d.ga=b.ya()},oa(){var a,b=this[x].v;for(a in b)if(Object.prototype.hasOwnProperty.call(b,a)){var d=b[a];if(this.qa&&d.S.ea||d.S.Rb(d.ga))return!0}},dc(){this[x].Aa||this.qa?.(!1)},isActive(){var a=this[x];return a.V||0<a.G},ec(){this.ea?this[x].V&&(this[x].Y=!0):this.sb()},Cb(a){return a.subscribe(this.sb,this)},sb(){this.qa?this.qa(!0):this.T(!0)},T(a){var b=this[x],d=b.ia,e=!1;if(!b.Aa&&!b.X){if(b.s&&
+!c.g.Pa(b.s)||d?.()){if(!b.ab){this.dispose();return}}else b.ab=!1;try{b.Aa=!0,e=this.Nb(a)}finally{b.Aa=!1}return e}},Nb(a){var b=this[x],d=b.Xa?void 0:!b.G;var e={Lb:this,va:b.v,Ma:b.G};c.u.nb({Kb:e,Jb:fa,o:this,Ca:d});b.v={};b.G=0;a:{try{var g=b.yb();break a}finally{c.u.end(),e.Ma&&!b.A&&c.g.K(e.va,ea),b.Y=b.V=!1}g=void 0}b.G?e=this.Ba(b.J,g):(this.dispose(),e=!0);e&&(b.A?this.Ea():this.B(b.J,"beforeChange"),b.J=g,this.B(b.J,"spectate"),!b.A&&a&&this.B(b.J),this.ib&&this.ib());d&&this.B(b.J,"awake");
+return e},L(a){var b=this[x];(b.V&&(a||!b.G)||b.A&&this.oa())&&this.T();return b.J},Da(a){var b=this;c.P.fn.Da.call(b,a);b.fb=()=>{b[x].A||(b[x].Y?b.T():b[x].V=!1);return b[x].J};b.qa=d=>{b.gb(b[x].J);b[x].V=!0;d&&(b[x].Y=!0);b.hb(b,!d)}},dispose:function(){var a=this[x];!a.A&&a.v&&c.g.K(a.v,(b,d)=>d.dispose?.());a.s&&a.Oa&&c.g.N.Ya(a.s,a.Oa);a.v=void 0;a.G=0;a.X=!0;a.Y=!1;a.V=!1;a.A=!1;a.s=void 0;a.ia=void 0;a.yb=void 0}},la={Ja(a){var b=this,d=b[x];if(!d.X&&d.A&&"change"==a){d.A=!1;if(d.Y||b.oa())d.v=
+null,d.G=0,b.T()&&b.Ea();else{var e=[];c.g.K(d.v,(g,l)=>e[l.fa]=g);e.forEach((g,l)=>{var f=d.v[g],h=b.Cb(f.S);h.fa=l;h.ga=f.ga;d.v[g]=h});b.oa()&&b.T()&&b.Ea()}d.X||b.B(d.J,"awake")}},Ia(a){var b=this[x];b.X||"change"!=a||this.na("change")||(c.g.K(b.v,(d,e)=>{e.dispose&&(b.v[d]={S:e.S,fa:e.fa,ga:e.ga},e.dispose())}),b.A=!0,this.B(void 0,"asleep"))},ya(){var a=this[x];a.A&&(a.Y||this.oa())&&this.T();return c.P.fn.ya.call(this)}};Object.setPrototypeOf(K,c.P.fn);var O=c.$.Zb;K[O]=c.o;c.o.fn=K;c.U("computed",
+c.o);c.isComputed=a=>"function"==typeof a&&a[O]===K[O];c.xb=a=>{if("function"===typeof a)return c.o(a,{pure:!0});a={...a,pure:!0};return c.o(a)};c.C={M:a=>{switch(a.nodeName){case "OPTION":return!0===a.__ko__hasDomDataOptionValue__?c.g.l.get(a,c.i.options.Wa):a.value;case "SELECT":return 0<=a.selectedIndex?c.C.M(a.options[a.selectedIndex]):void 0;default:return a.value}},Fa:(a,b)=>{switch(a.nodeName){case "OPTION":"string"===typeof b?(c.g.l.set(a,c.i.options.Wa,void 0),delete a.__ko__hasDomDataOptionValue__,
+a.value=b):(c.g.l.set(a,c.i.options.Wa,b),a.__ko__hasDomDataOptionValue__=!0,a.value="number"===typeof b?b:"");break;case "SELECT":for(var d=-1,e=""===(b??""),g=a.options.length,l;g--;)if(l=c.C.M(a.options[g]),l==b||""===l&&e){d=g;break}if(0<=d||e&&1<a.size)a.selectedIndex=d;break;default:a.value=b??""}}};c.la=(()=>{var a=RegExp("\"(?:\\\\.|[^\"])*\"|'(?:\\\\.|[^'])*'|`(?:\\\\.|[^`])*`|/\\*(?:[^*]|\\*+[^*/])*\\*+/|//.*\n|/(?:\\\\.|[^/])+/w*|[^\\s:,/][^,\"'`{}()/:[\\]]*[^\\s,\"'`{}()/:[\\]]|[^\\s]",
+"g"),b=/[\])"'A-Za-z0-9_$]+$/,d={"in":1,"return":1,"typeof":1};return{Yb:e=>{e=c.g.Bb(e);123===e.charCodeAt(0)&&(e=e.slice(1,-1));e+="\n,";var g=[],l=e.match(a),f=[],h=0;if(1<l.length){for(var k=0,m;m=l[k++];){var p=m.charCodeAt(0);if(44===p){if(0>=h){n&&f.length&&g.push("'"+n+"':()=>("+f.join("")+")");var n=h=0;f=[];continue}}else if(58===p){if(!h&&!n&&1===f.length){n=f.pop();continue}}else if(47===p&&1<m.length&&(47===m.charCodeAt(1)||42===m.charCodeAt(1)))continue;else 47===p&&k&&1<m.length?(p=
+l[k-1].match(b))&&!d[p[0]]&&(e=e.slice(e.indexOf(m)+1),l=e.match(a),k=-1,m="/"):40===p||123===p||91===p?++h:41===p||125===p||93===p?--h:n||f.length||34!==p&&39!==p||(m=m.slice(1,-1));f.push(m)}if(0<h)throw Error("Unbalanced parentheses, braces, or brackets");}g.push("'$data':()=>$data");return g.join(",")},cc:(e,g)=>-1<e.findIndex(l=>l.key==g),Ga:(e,g,l,f,h,k)=>{g&&c.W(g)?!c.vb(g)||k&&g.L()===h||g(h):(console.error(`"${f}" should be observable in ${e.outerHTML.replace(/>.+/,">")}`),l.get("$data")[f]=
+h)}}})();(()=>{function a(f){return 8==f.nodeType&&e.test(f.nodeValue)}function b(f){return 8==f.nodeType&&g.test(f.nodeValue)}function d(f,h){for(var k=f,m=1,p=[];k=k.nextSibling;){if(b(k)&&(c.g.l.set(k,l,!0),!--m))return p;p.push(k);a(k)&&++m}if(!h)throw Error("Cannot find closing comment tag to match: "+f.nodeValue);return null}var e=/^\s*ko(?:\s+([\s\S]+))?\s*$/,g=/^\s*\/ko\s*$/,l="__ko_matchedEndComment__";c.m={aa:{},childNodes:f=>a(f)?d(f):f.childNodes,ja:f=>{a(f)?(f=d(f))&&[...f].forEach(h=>
+c.removeNode(h)):c.g.Qa(f)},pa:(f,h)=>{a(f)?(c.m.ja(f),f.after(...h)):c.g.pa(f,h)},prepend:(f,h)=>{a(f)?f.nextSibling.before(h):f.prepend(h)},Ub:(f,h,k)=>{k?k.after(h):c.m.prepend(f,h)},firstChild:f=>{if(a(f))return f=f.nextSibling,!f||b(f)?null:f;let h=f.firstChild;if(h&&b(h))throw Error("Found invalid end comment, as the first child of "+f);return h},nextSibling:f=>{if(a(f)){var h=d(f,void 0);f=h?(h.length?h[h.length-1]:f).nextSibling:null}if((h=f.nextSibling)&&b(h)){if(b(h)&&!c.g.l.get(h,l))throw Error("Found end comment without a matching opening comment, as child of "+
+f);return null}return h},Qb:a,ac:f=>(f=f.nodeValue.match(e))?f[1]:null}})();const T=new Map;c.ob=new class{Xb(a){switch(a.nodeType){case 1:return null!=a.getAttribute("data-bind");case 8:return c.m.Qb(a)}return!1}Ob(a,b){a:{switch(a.nodeType){case 1:var d=a.getAttribute("data-bind");break a;case 8:d=c.m.ac(a);break a}d=null}if(d)try{let g=T.get(d);if(!g){var e="with($data){return{"+c.la.Yb(d)+"}}";g=new Function("$context","$root","$parent","$data","$element",e);T.set(d,g)}return g(b,b.$root,b.$parent,
+b.$data||{},a)}catch(g){throw g.message="Unable to parse bindings.\nBindings value: "+d+"\nMessage: "+g.message,g;}return null}};const G=Symbol("_subscribable"),H=Symbol("_ancestorBindingInfo"),U=Symbol("_dataDependency"),V={},I=c.g.l.Z();c.i={};c.ba=class{constructor(a,b,d,e){var g=this,l=a===V,f=l?void 0:a,h="function"==typeof f&&!c.W(f),k=e?.dataDependency;a=()=>{var p=h?f():f;p=c.g.h(p);b?(c.g.extend(g,b),H in b&&(g[H]=b[H])):g.$root=p;g[G]=m;l?p=g.$data:g.$data=p;d?.(g,b,p);if(b?.[G]&&!c.u.o().Sa(b[G]))b[G]();
+k&&(g[U]=k);return g.$data};if(e?.exportDependencies)a();else{var m=c.xb(a);m.L();m.isActive()?m.ka=null:g[G]=void 0}}createChildContext(a,b){return new c.ba(a,this,(d,e)=>{d.$parent=e.$data;b.extend?.(d)},b)}extend(a,b){return new c.ba(V,this,d=>c.g.extend(d,"function"==typeof a?a(d):a),b)}};const W=a=>{a=c.g.l.get(a,I);var b=a?.D;b&&(a.D=null,b.wb())};class ma{constructor(a,b,d){this.H=a;this.da=b;this.ta=new Set;this.F=!1;b.D||c.g.N.addDisposeCallback(a,W);d?.D&&(d.D.ta.add(a),this.za=d)}wb(){this.za?.D?.Mb(this.H)}Mb(a){this.ta.delete(a);
+this.ta.size||this.rb?.()}rb(){this.F=!0;this.da.D&&!this.ta.size&&(this.da.D=null,c.g.N.Ya(this.H,W),c.j.notify(this.H,c.j.ca),this.wb())}}c.j={F:"childrenComplete",ca:"descendantsComplete",subscribe:(a,b,d,e,g)=>{var l=c.g.l.Ra(a,I,{});l.wa||(l.wa=new c.P);g?.notifyImmediately&&l.Va[b]&&c.u.I(d,e,[a]);return l.wa.subscribe(d,e,b)},notify:(a,b)=>{var d=c.g.l.get(a,I);if(d&&(d.Va[b]=!0,d.wa?.B(a,b),b==c.j.F))if(d.D)d.D.rb();else if(void 0===d.D&&d.wa?.na(c.j.ca))throw Error("descendantsComplete event not supported for bindings on this node");
+},$a:(a,b)=>{var d=c.g.l.Ra(a,I,{});d.D||(d.D=new ma(a,d,b[H]));return b[H]==d?b:b.extend(e=>{e[H]=d})}};const Y=(a,b)=>{for(var d,e=c.m.firstChild(b);d=e;)e=c.m.nextSibling(d),X(a,d);c.j.notify(b,c.j.F)},X=(a,b)=>{var d=a;if(1===b.nodeType||c.ob.Xb(b))d=Z(b,null,a);d&&!b.matches?.("SCRIPT,TEXTAREA,TEMPLATE")&&Y(d,b)},na=a=>{var b=[],d={},e=[],g=l=>{if(!d[l]){var f=c.i[l];f&&(f.after&&(e.push(l),f.after.forEach(h=>{if(a[h]){if(e.includes(h))throw Error("Cannot combine the following bindings, because they have a cyclic dependency: "+
+e.join(", "));g(h)}}),e.length--),b.push({key:l,ub:f}));d[l]=!0}};c.g.K(a,g);return b},Z=(a,b,d)=>{var e=c.g.l.Ra(a,I,{}),g=e.Hb;if(!b){if(g)throw Error("You cannot apply bindings multiple times to the same element.");e.Hb=!0}g||(e.context=d);e.Va||(e.Va={});if(b&&"function"!==typeof b)var l=b;else{var f=c.o(()=>{if(l=b?b(d,a):c.ob.Ob(a,d))d[G]?.(),d[U]?.();return l},{s:a});l&&f.isActive()||(f=null)}var h=d,k;if(l){var m=f?n=>()=>f()[n]():n=>l[n],p={get:n=>l[n]&&m(n)(),has:n=>n in l};c.j.F in l&&
+c.j.subscribe(a,c.j.F,()=>{var n=l[c.j.F]();if(n){var q=c.m.childNodes(a);q.length&&n(q,c.dataFor(q[0]))}});c.j.ca in l&&(h=c.j.$a(a,d),c.j.subscribe(a,c.j.ca,()=>{var n=l[c.j.ca]();n&&c.m.firstChild(a)&&n(a)}));na(l).forEach(n=>{var q=n.ub.init,r=n.ub.update,u=n.key;if(8===a.nodeType&&!c.m.aa[u])throw Error("The binding '"+u+"' cannot be used with comment nodes");try{"function"==typeof q&&c.u.I(()=>{var t=q(a,m(u),p,h.$data,h);if(t&&t.controlsDescendantBindings){if(void 0!==k)throw Error("Multiple bindings ("+
+k+" and "+u+") are trying to control descendant bindings of the same element. You cannot use these bindings together on the same element.");k=u}}),"function"==typeof r&&c.o(()=>r(a,m(u),p,h.$data,h),{s:a})}catch(t){throw t.message='Unable to process binding "'+u+": "+l[u]+'"\nMessage: '+t.message,t;}})}return void 0===k&&h};c.$b=a=>c.g.l.get(a,I)?.context;const P=a=>a&&a instanceof c.ba?a:new c.ba(a);c.applyBindingAccessorsToNode=(a,b,d)=>Z(a,b,P(d));c.mb=(a,b)=>{1!==b.nodeType&&8!==b.nodeType||Y(P(a),
+b)};c.Ib=(a,b)=>X(P(a),b);c.dataFor=a=>([1,8].includes(a?.nodeType)&&c.$b(a))?.$data;c.U("bindingHandlers",c.i);(()=>{var a=Object.create(null),b=new Map;c.components={get:(l,f)=>{if(b.has(l))f(b.get(l));else{var h=a[l];h?h.subscribe(f):(h=a[l]=new c.P,h.subscribe(f),g(l,k=>{b.set(l,k);delete a[l];h.B(k)}))}},register:(l,f)=>{if(!f)throw Error("Invalid configuration for "+l);if(d[l])throw Error("Component "+l+" is already registered");d[l]=f}};var d=Object.create(null),e=(l,f)=>{throw Error(`Component '${l}': ${f}`);
+},g=(l,f)=>{var h={},k=d[l]||{},m=k.template;k=k.viewModel;if(m){m.element||e(l,"Unknown template value: "+m);m=m.element;var p=J.getElementById(m);p||e(l,"Cannot find element with ID "+m);p.matches("TEMPLATE")||e(l,"Template Source Element not a <template>");h.template=c.g.ua(p.content.childNodes)}k&&("function"!==typeof k.createViewModel&&e(l,"Unknown viewModel value: "+k),h.createViewModel=k.createViewModel);f(h.template&&h.createViewModel?h:null)}})();(()=>{var a=0;c.i.component={init:(b,d,e,
+g,l)=>{var f,h,k,m=()=>{var p=f&&f.dispose;"function"===typeof p&&p.call(f);k&&k.dispose();h=f=k=null};c.m.ja(b);c.g.N.addDisposeCallback(b,m);c.o(()=>{var p=c.g.h(d());if("string"!==typeof p){var n=c.g.h(p.params);p=c.g.h(p.name)}if(!p)throw Error("No component name specified");var q=c.j.$a(b,l),r=h=++a;c.components.get(p,u=>{if(h===r){m();if(!u)throw Error("Unknown component '"+p+"'");var t=u.template;if(!t)throw Error("Component '"+p+"' has no template");c.m.pa(b,c.g.ua(t));f=u.createViewModel(n,
+{element:b});c.mb(q.createChildContext(f,{}),b)}})},{s:b});return{controlsDescendantBindings:!0}}};c.m.aa.component=!0})();c.i.attr={update:(a,b)=>{b=c.g.h(b())||{};c.g.K(b,function(d,e){e=c.g.h(e);var g=d.indexOf(":");g="lookupNamespaceURI"in a&&0<g&&a.lookupNamespaceURI(d.slice(0,g));!1===e||null==e?g?a.removeAttributeNS(g,d):a.removeAttribute(d):(e=e.toString(),g?a.setAttributeNS(g,d,e):a.setAttribute(d,e))})}};(()=>{c.i.checked={after:["value","attr"],init:function(a,b,d){var e="checkbox"==a.type,
+g="radio"==a.type;if(e||g){const n=c.xb(()=>{if(d.has("checkedValue"))return c.g.h(d.get("checkedValue"));if(m)return d.has("value")?c.g.h(d.get("value")):a.value});var l=()=>{if(!c.u.Ca()){var q=a.checked,r=n();if(q||!g&&!c.u.ma()){var u=c.u.I(b);if(h){var t=k?u.L():u,z=p;p=r;z!==r?q&&(t.push(r),t.remove(z)):q?t.push(r):t.remove(r);k&&c.vb(u)&&u(t)}else e&&(void 0===r?r=q:q||(r=void 0)),c.la.Ga(a,u,d,"checked",r,!0)}}},f=b(),h=e&&c.g.h(f)instanceof Array,k=!(h&&f.push&&f.splice),m=g||h,p=h?n():void 0;
+c.o(l,null,{s:a});a.addEventListener("click",l);c.o(()=>{var q=c.g.h(b()),r=n();h?(a.checked=q.includes(r),p=r):a.checked=e&&void 0===r?!!q:n()===q},null,{s:a});f=void 0}}};c.i.checkedValue={update:function(a,b){a.value=c.g.h(b())}}})();var Q=(a,b,d)=>b&&b.split(/\s+/).forEach(e=>a.classList.toggle(e,d));c.i.css={update:(a,b)=>{b=c.g.h(b());"object"==typeof b?c.g.K(b,(d,e)=>{e=c.g.h(e);Q(a,d,!!e)}):(b=c.g.Bb(b),Q(a,a.__ko__cssValue,!1),a.__ko__cssValue=b,Q(a,b,!0))}};c.i.enable={update:(a,b)=>{(b=
+c.g.h(b()))&&a.disabled?a.removeAttribute("disabled"):b||a.disabled||(a.disabled=!0)}};c.i.disable={update:(a,b)=>c.i.enable.update(a,()=>!c.g.h(b()))};c.i.event={init:function(a,b,d,e,g){c.g.K(b()||{},l=>{"string"==typeof l&&a.addEventListener(l,(...f)=>{var h=b()[l];if(h)try{e=g.$data;var k=h.apply(e,[e,...f])}finally{!0!==k&&f[0].preventDefault()}})})}};const aa=a=>()=>{var b=a(),d=c.W(b)?b.L():b;if(!d||Array.isArray(d))return{foreach:b};c.g.h(b);return{foreach:d.data}};c.i.foreach={init:(a,b)=>
+c.i.template.init(a,aa(b)),update:(a,b,d,e,g)=>c.i.template.update(a,aa(b),d,e,g)};c.m.aa.foreach=!0;c.i.hasfocus={init:(a,b,d)=>{var e=l=>{a.__ko_hasfocusUpdating=!0;l=a.ownerDocument.activeElement===a;c.la.Ga(a,b(),d,"hasfocus",l,!0);a.__ko_hasfocusLastValue=l;a.__ko_hasfocusUpdating=!1},g=e.bind(null,!0);e=e.bind(null,!1);a.addEventListener("focus",g);a.addEventListener("focusin",g);a.addEventListener("blur",e);a.addEventListener("focusout",e);a.__ko_hasfocusLastValue=!1},update:(a,b)=>{b=!!c.g.h(b());
+a.__ko_hasfocusUpdating||a.__ko_hasfocusLastValue===b||(b?a.focus():a.blur())}};c.i.html={init:()=>({controlsDescendantBindings:!0}),update:(a,b)=>{c.g.Qa(a);b=c.g.h(b());if(null!=b){const d=J.createElement("template");d.innerHTML="string"!=typeof b?b.toString():b;a.appendChild(d.content)}}};(()=>{function a(b,d,e){c.i[b]={init:(g,l,f,h,k)=>{var m,p={};d&&(p={exportDependencies:!0});var n=f.has(c.j.ca);c.o(()=>{var q=c.g.h(l()),r=!e!==!q,u=!m;n&&(k=c.j.$a(g,k));if(r){p.dataDependency=c.u.o();var t=
+d?k.createChildContext("function"==typeof q?q:l,p):c.u.ma()?k.extend(null,p):k}u&&c.u.ma()&&(m=c.g.ua(c.m.childNodes(g),!0));r?(u||c.m.pa(g,c.g.ua(m)),c.mb(t,g)):(c.m.ja(g),c.j.notify(g,c.j.F))},{s:g});return{controlsDescendantBindings:!0}}};c.m.aa[b]=!0}a("if");a("ifnot",!1,!0);a("with",!0)})();var ba={};c.i.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 e=a.multiple,g=0!=a.length&&e?a.scrollTop:null,l=c.g.h(b()),f=[];b=()=>Array.from(a.options).filter(n=>n.selected);var h=(n,q,r)=>{var u=typeof q;return"function"==u?q(n):"string"==u?n[q]:r},k=(n,q)=>{f.length&&(n=f.includes(c.C.M(q[0])),q[0].selected=n,p&&!n&&c.u.I(c.g.Db,null,[a,"change"]))};e?f=b().map(c.C.M):0<=a.selectedIndex&&f.push(c.C.M(a.options[a.selectedIndex]));if(l){Array.isArray(l)||(l=[l]);var m=l.filter(n=>n??1)}var p=!1;l=k;d.has("optionsAfterRender")&&"function"==typeof d.get("optionsAfterRender")&&
+(l=(n,q)=>{k(n,q);c.u.I(d.get("optionsAfterRender"),null,[q[0],n!==ba?n:void 0])});c.g.Ab(a,m,(n,q,r)=>{r.length&&(f=r[0].selected?[c.C.M(r[0])]:[],p=!0);q=a.ownerDocument.createElement("option");n===ba?(c.g.Za(q),c.C.Fa(q,void 0)):(r=h(n,d.get("optionsValue"),n),c.C.Fa(q,c.g.h(r)),n=h(n,d.get("optionsText"),r),c.g.Za(q,n));return[q]},{},l);m=f.length;(e?m&&b().length<m:m&&0<=a.selectedIndex?c.C.M(a.options[a.selectedIndex])!==f[0]:m||0<=a.selectedIndex)&&c.u.I(c.g.Db,null,[a,"change"]);c.u.Ca()&&
+c.j.notify(a,c.j.F);g&&20<Math.abs(g-a.scrollTop)&&(a.scrollTop=g)}};c.i.options.Wa=c.g.l.Z();c.i.style={update:(a,b)=>{c.g.K(c.g.h(b()||{}),(d,e)=>{e=c.g.h(e);if(null==e||!1===e)e="";if(/^--/.test(d))a.style.setProperty(d,e);else{d=d.replace(/-(\w)/g,(l,f)=>f.toUpperCase());var g=a.style[d];a.style[d]=e;e===g||a.style[d]!=g||isNaN(e)||(a.style[d]=e+"px")}})}};c.i.submit={init:(a,b,d,e,g)=>{if("function"!=typeof b())throw Error("The value for a submit binding must be a function");a.addEventListener("submit",
+l=>{var f=b();try{var h=f.call(g.$data,a)}finally{!0!==h&&l.preventDefault()}})}};c.i.text={init:()=>({controlsDescendantBindings:!0}),update:(a,b)=>{8===a.nodeType&&(a.text||a.after(a.text=J.createTextNode("")),a=a.text);c.g.Za(a,b())}};c.m.aa.text=!0;c.i.textInput={init:(a,b,d)=>{var e=a.value,g,l,f=()=>{clearTimeout(g);l=g=void 0;var k=a.value;a.checkValidity()&&e!==k&&(e=k,c.la.Ga(a,b(),d,"textInput",k))},h=()=>{var k=c.g.h(b())??"";void 0!==l&&k===l?setTimeout(h,4):a.value!==k&&(a.value=k,e=
+a.value)};a.addEventListener("input",f);a.addEventListener("change",f);c.o(h,{s:a})}};c.i.value={init:(a,b,d)=>{var e=a.matches("SELECT"),g=a.matches("INPUT");if(!g||"checkbox"!=a.type&&"radio"!=a.type){var l=new Set,f=d.get("valueUpdate"),h=null,k=()=>{h=null;var n=b(),q=c.C.M(a);c.la.Ga(a,n,d,"value",q)};f&&("string"==typeof f?l.add(f):f.forEach(n=>l.add(n)),l.delete("change"));l.forEach(n=>{var q=k;(n||"").startsWith("after")&&(q=()=>{h=c.C.M(a);setTimeout(k,0)},n=n.slice(5));a.addEventListener(n,
+q)});var m=g&&"file"==a.type?()=>{var n=c.g.h(b());null==n||""===n?a.value="":c.u.I(k)}:()=>{var n=c.g.h(b()),q=c.C.M(a);if(null!==h&&n===h)setTimeout(m,0);else if(n!==q||void 0===q)e?(c.C.Fa(a,n),n!==c.C.M(a)&&c.u.I(k)):c.C.Fa(a,n)};if(e){var p;c.j.subscribe(a,c.j.F,()=>{p?d.get("valueAllowUnset")?m():k():(a.addEventListener("change",k),p=c.o(m,{s:a}))},null,{notifyImmediately:!0})}else a.addEventListener("change",k),c.o(m,{s:a})}else c.applyBindingAccessorsToNode(a,{checkedValue:b})},update:()=>
+{}};c.i.visible={update:(a,b)=>{b=c.g.h(b());var d="none"!=a.style.display;b&&!d?a.style.display="":d&&!b&&(a.style.display="none")}};c.i.hidden={update:(a,b)=>a.hidden=!!c.g.h(b())};(function(a){c.i[a]={init:function(b,d,e,g,l){return c.i.event.init.call(this,b,()=>({[a]:d()}),e,g,l)}}})("click");(()=>{let a=c.g.l.Z();class b{constructor(e){this.Na=e}Ua(...e){let g=this.Na;if(!e.length)return c.g.l.get(g,a)||(11===this.H?g.content:1===this.H?g:void 0);c.g.l.set(g,a,e[0])}}class d extends b{constructor(e){super(e);
+e&&(this.H=e.matches("TEMPLATE")&&e.content?e.content.nodeType:1)}}c.bb={Na:d,lb:b}})();(()=>{const a=(h,k,m)=>{var p;for(k=c.m.nextSibling(k);h&&(p=h)!==k;)h=c.m.nextSibling(p),m(p,h)},b=(h,k)=>{if(h.length){var m=h[0],p=m.parentNode;a(m,h[h.length-1],n=>(1===n.nodeType||8===n.nodeType)&&c.Ib(k,n));c.g.xa(h,p)}},d=(h,k,m,p)=>{var n=(h&&(h.nodeType?h:0<h.length?h[0]:null)||m||{}).ownerDocument;if("string"==typeof m){n=n||J;n=n.getElementById(m);if(!n)throw Error("Cannot find template with ID "+m);
+m=new c.bb.Na(n)}else if([1,8].includes(m.nodeType))m=new c.bb.lb(m);else throw Error("Unknown template type: "+m);m=(m=m.Ua?m.Ua():null)?[...m.cloneNode(!0).childNodes]:null;if(!Array.isArray(m)||0<m.length&&"number"!=typeof m[0].nodeType)throw Error("Template engine must return an array of DOM nodes");k&&(c.m.pa(h,m),b(m,p),c.j.notify(h,c.j.F));return m},e=(h,k,m)=>c.W(h)?h():"function"===typeof h?h(k,m):h,g=(h,k,m,p)=>{m=m||{};if(p){var n=p.nodeType?p:0<p.length?p[0]:null;return c.o(()=>{var q=
+k instanceof c.ba?k:new c.ba(k,null,null,{exportDependencies:!0}),r=e(h,q.$data,q);d(p,!0,r,q,m)},{ia:()=>!n||!c.g.Pa(n),s:n})}console.log("no targetNodeOrNodeArray")},l=(h,k,m,p,n)=>{var q,r=(w,y)=>{q=n.createChildContext(w,{extend:B=>B.$index=y});w=e(h,w,q);return d(p,!1,w,q,m)},u=(w,y)=>{b(y,q);q=null},t=(w,y)=>{c.u.I(c.g.Ab,null,[p,w,r,m,u,y]);c.j.notify(p,c.j.F)};if(c.isObservableArray(k)){t(k.L());var z=k.subscribe(w=>{t(k(),w)},null,"arrayChange");z.s(p);return z}return c.o(()=>{var w=c.g.h(k)||
+[];Array.isArray(w)||(w=[w]);t(w)},{s:p})},f=c.g.l.Z();c.i.template={init:(h,k)=>{k=c.g.h(k());if("string"==typeof k||"name"in k)c.m.ja(h);else if(k=c.m.childNodes(h),k.length)k=c.g.Wb(k),(new c.bb.lb(h)).Ua(k);else throw Error("Anonymous template defined, but no template content was provided");return{controlsDescendantBindings:!0}},update:(h,k,m,p,n)=>{p=k();k=c.g.h(p);m=null;"string"==typeof k?k={}:p="name"in k?k.name:h;var q=!!p;"foreach"in k?m=l(p,q&&k.foreach||[],k,h,n):q?(m=n,"data"in k&&(m=
+n.createChildContext(k.data,{exportDependencies:!0})),m=g(p,m,k,h)):c.m.ja(h);n=m;c.g.l.get(h,f)?.dispose?.();c.g.l.set(h,f,!n||n.isActive&&!n.isActive()?void 0:n)}};c.m.aa.template=!0})();c.g.tb=(a,b,d)=>{var e=0,g,l=b.length;l&&a.every(f=>{g=b.findIndex(h=>f.value===h.value);0<=g&&(f.moved=b[g].index,b[g].moved=f.index,b.splice(g,1),e=g=0,--l);e+=l;return l&&(!d||e<d)})};c.g.qb=(()=>{var a=(b,d,e,g,l)=>{for(var f=Math.min,h=Math.max,k=[],m=-1,p=b.length,n,q=d.length,r=q-p||1,u=p+q+1,t,z,w;++m<=
+p;)for(z=t,k.push(t=[]),w=f(q,m+r),n=h(0,m-1);n<=w;n++)t[n]=n?m?b[m-1]===d[n-1]?z[n-1]:f(z[n]||u,t[n-1]||u)+1:n+1:m+1;f=[];h=[];r=[];m=p;for(n=q;m||n;)q=k[m][n]-1,n&&q===k[m][n-1]?h.push(f[f.length]={status:e,value:d[--n],index:n}):m&&q===k[m-1][n]?r.push(f[f.length]={status:g,value:b[--m],index:m}):(--n,--m,l.sparse||f.push({status:"retained",value:d[n]}));c.g.tb(r,h,10*p);return f.reverse()};return(b,d,e)=>{b=b||[];d=d||[];return b.length<d.length?a(b,d,"added","deleted",e):a(d,b,"deleted","added",
+e)}})();(()=>{function a(e,g,l,f,h){var k=[],m=c.o(()=>{var p=g(l,h,c.g.xa(k,e))||[];if(0<k.length){var n=k.nodeType?[k]:k;if(0<n.length){var q=n[0],r=q.parentNode;p.forEach(u=>r.insertBefore(u,q));n.forEach(u=>c.removeNode(u))}f&&c.u.I(f,null,[l,p,h])}k.length=0;k.push(...p)},{s:e,ia:()=>!!k.find(c.g.Pa)});return{O:k,La:m.isActive()?m:void 0}}var b=c.g.l.Z(),d=c.g.l.Z();c.g.Ab=(e,g,l,f,h,k)=>{g=g||[];Array.isArray(g)||(g=[g]);var m=c.g.l.get(e,b),p=[],n=0,q=0,r=[],u=[],t,z=v=>{t={sa:v,Ta:c.$(q++)};
+p.push(t)},w=v=>{t=m[v];t.Ta(q++);c.g.xa(t.O,e);p.push(t)};if(m){if(!k||m&&m._countWaitingForRemove)k=c.g.qb(Array.prototype.map.call(m,C=>C.sa),g,{sparse:!0});let v,F;for(k.forEach(C=>{v=C.moved;F=C.index;switch(C.status){case "deleted":for(;n<F;)w(n++);void 0===v&&(t=m[n],t.La&&(t.La.dispose(),t.La=void 0),c.g.xa(t.O,e).length&&t&&r.push.apply(r,t.O));n++;break;case "added":for(;q<F;)w(n++);void 0!==v?(u.push(p.length),w(v)):z(C.value)}});q<g.length;)w(n++);p._countWaitingForRemove=0}else g.forEach(z);
+c.g.l.set(e,b,p);r.forEach(c.removeNode);var y=v=>{c.m.Ub(e,v,B);B=v};k=e.ownerDocument.activeElement;if(u.length)for(;null!=(g=u.shift());){for(t=p[g];g--;)if(f=p[g].O,f?.length){var B=f[f.length-1];break}t.O.forEach(y)}p.forEach(v=>{v.O||c.g.extend(v,a(e,l,v.sa,h,v.Ta));v.O.forEach(y);!v.Tb&&h&&(h(v.sa,v.O,v.Ta),v.Tb=!0,B=v.O[v.O.length-1])});e.ownerDocument.activeElement!=k&&k?.focus();[].forEach(v=>v&&(v.sa=d))}})();R.ko=M})(this);
diff --git a/vendors/knockout/src/binding/bindingAttributeSyntax.js b/vendors/knockout/src/binding/bindingAttributeSyntax.js
index 894a8dd38..c15da0dba 100644
--- a/vendors/knockout/src/binding/bindingAttributeSyntax.js
+++ b/vendors/knockout/src/binding/bindingAttributeSyntax.js
@@ -131,7 +131,7 @@ class AsyncCompleteContext {
         this.asyncDescendants = new Set;
         this.childrenComplete = false;
 
-        bindingInfo.asyncContext || ko.utils.domNodeDisposal.addDisposeCallback(node, asyncContextDispose);
+        bindingInfo.asyncContext || ko.utils.domNodeDisposal['addDisposeCallback'](node, asyncContextDispose);
 
         if (ancestorBindingInfo?.asyncContext) {
             ancestorBindingInfo.asyncContext.asyncDescendants.add(node);
diff --git a/vendors/knockout/src/binding/bindingProvider.js b/vendors/knockout/src/binding/bindingProvider.js
index 371712f4e..eae03acca 100644
--- a/vendors/knockout/src/binding/bindingProvider.js
+++ b/vendors/knockout/src/binding/bindingProvider.js
@@ -31,38 +31,28 @@ ko.bindingProvider = new class
             try {
                 let cacheKey = bindingsString,
                     bindingFunction = bindingCache.get(cacheKey);
-/*
                 if (!bindingFunction) {
                     // Build the source for a function that evaluates "expression"
                     // For each scope variable, add an extra level of "with" nesting
                     // Example result: with(sc1) { with(sc0) { return (expression) } }
                     // Deprecated: with is no longer recommended
+/*
+                    functionBody = "$context = new Proxy(
+                        $context,
+                        {
+                            has:()=>true,
+                            get:(target,key)=>Reflect.has(target, key) ? target[key] : target['$data'][key]
+                        }
+                    );with($context){return{" + rewrittenBindings + "}}";
+*/
                     var rewrittenBindings = ko.expressionRewriting.preProcessBindings(bindingsString),
                         functionBody = "with($data){return{" + rewrittenBindings + "}}";
-                    bindingFunction = new Function("$context", "$root", "$parent", "$data", functionBody);
+                    bindingFunction = new Function("$context", "$root", "$parent", "$data", "$element", functionBody);
                     bindingCache.set(cacheKey, bindingFunction);
                 }
                 return bindingFunction(bindingContext,
-                    bindingContext["$root"], bindingContext["$parent"], bindingContext["$data"] || {}
+                    bindingContext["$root"], bindingContext["$parent"], bindingContext["$data"] || {}, node
                 );
-*/
-                if (!bindingFunction) {
-                    // Build the source for a function that evaluates "expression"
-                    // Use one "with" that has one secure scope handling Proxy
-                    // Deprecated: with is no longer recommended
-                    bindingFunction = new Function("$context",
-                        "with($context){return{" + ko.expressionRewriting.preProcessBindings(bindingsString) + "}}");
-                    bindingCache.set(cacheKey, bindingFunction);
-                }
-                bindingContext = new Proxy(
-                    bindingContext,
-                    {
-                        has: () => true,
-//                        get: (target, key) => target['$data'][key] || target[key]
-                        get: (target, key) => Reflect.has(target['$data'], key) ? target['$data'][key] : target[key]
-                    }
-                );
-                return bindingFunction(bindingContext);
             } catch (ex) {
                 ex.message = "Unable to parse bindings.\nBindings value: " + bindingsString
                     + "\nMessage: " + ex.message;
diff --git a/vendors/knockout/src/binding/expressionRewriting.js b/vendors/knockout/src/binding/expressionRewriting.js
index 9cbc1753d..8c4761983 100644
--- a/vendors/knockout/src/binding/expressionRewriting.js
+++ b/vendors/knockout/src/binding/expressionRewriting.js
@@ -134,7 +134,7 @@ ko.expressionRewriting = (() => {
         //                      it is !== existing value on that writable observable
         writeValueToProperty: (element, property, allBindings, key, value, checkIfDifferent) => {
             if (!property || !ko.isObservable(property)) {
-                console.log(`"${key}" should contain observable in ${element.outerHTML.replace(/>.+/,'>')}`);
+                console.error(`"${key}" should be observable in ${element.outerHTML.replace(/>.+/,'>')}`);
 //                ko.dataFor(element).key = value;
                 allBindings.get('$data')[key] = value;
             } else if (ko.isWriteableObservable(property) && (!checkIfDifferent || property.peek() !== value)) {
diff --git a/vendors/knockout/src/binding/selectExtensions.js b/vendors/knockout/src/binding/selectExtensions.js
index 1b8993df8..936315251 100644
--- a/vendors/knockout/src/binding/selectExtensions.js
+++ b/vendors/knockout/src/binding/selectExtensions.js
@@ -9,7 +9,7 @@ ko.selectExtensions = {
         switch (element.nodeName) {
             case 'OPTION':
                 return (element[hasDomDataExpandoProperty] === true)
-                    ? ko.utils.domData.get(element, ko.bindingHandlers['options'].optionValueDomDataKey)
+                    ? ko.utils.domData.get(element, ko.bindingHandlers.options.optionValueDomDataKey)
                     : element.value;
             case 'SELECT':
                 return element.selectedIndex >= 0
@@ -24,13 +24,13 @@ ko.selectExtensions = {
         switch (element.nodeName) {
             case 'OPTION':
                 if (typeof value === "string") {
-                    ko.utils.domData.set(element, ko.bindingHandlers['options'].optionValueDomDataKey, undefined);
+                    ko.utils.domData.set(element, ko.bindingHandlers.options.optionValueDomDataKey, undefined);
                     delete element[hasDomDataExpandoProperty];
                     element.value = value;
                 }
                 else {
                     // Store arbitrary object using DomData
-                    ko.utils.domData.set(element, ko.bindingHandlers['options'].optionValueDomDataKey, value);
+                    ko.utils.domData.set(element, ko.bindingHandlers.options.optionValueDomDataKey, value);
                     element[hasDomDataExpandoProperty] = true;
 
                     // Special treatment of numbers is just for backward compatibility. KO 1.2.1 wrote numerical values to element.value.
diff --git a/vendors/knockout/src/components/componentBinding.js b/vendors/knockout/src/components/componentBinding.js
index 44cbf10fa..2986e37d2 100644
--- a/vendors/knockout/src/components/componentBinding.js
+++ b/vendors/knockout/src/components/componentBinding.js
@@ -5,18 +5,23 @@
         'init': (element, valueAccessor, ignored1, ignored2, bindingContext) => {
             var currentViewModel,
                 currentLoadingOperationId,
+                afterRenderSub,
                 disposeAssociatedComponentViewModel = () => {
                     var currentViewModelDispose = currentViewModel && currentViewModel['dispose'];
                     if (typeof currentViewModelDispose === 'function') {
                         currentViewModelDispose.call(currentViewModel);
                     }
+                    if (afterRenderSub) {
+                        afterRenderSub['dispose']();
+                    }
+                    afterRenderSub = null;
                     currentViewModel = null;
                     // Any in-flight loading operation is no longer relevant, so make sure we ignore its completion
                     currentLoadingOperationId = null;
                 };
 
             ko.virtualElements.emptyNode(element);
-            ko.utils.domNodeDisposal.addDisposeCallback(element, disposeAssociatedComponentViewModel);
+            ko.utils.domNodeDisposal['addDisposeCallback'](element, disposeAssociatedComponentViewModel);
 
             ko.computed(() => {
                 var componentName = ko.utils.unwrapObservable(valueAccessor()),
diff --git a/vendors/knockout/src/namespace.js b/vendors/knockout/src/namespace.js
index 11851c27d..ff46d12a3 100644
--- a/vendors/knockout/src/namespace.js
+++ b/vendors/knockout/src/namespace.js
@@ -1,3 +1,3 @@
 // Internally, all KO objects are attached to koExports (even the non-exported ones whose names will be minified by the closure compiler).
 // In the future, the following "ko" variable may be made distinct from "koExports" so that private objects are not externally reachable.
-const ko = {};
+var ko = typeof koExports !== 'undefined' ? koExports : {};
diff --git a/vendors/knockout/src/subscribables/dependentObservable.js b/vendors/knockout/src/subscribables/dependentObservable.js
index a4eb9fa29..45d00795b 100644
--- a/vendors/knockout/src/subscribables/dependentObservable.js
+++ b/vendors/knockout/src/subscribables/dependentObservable.js
@@ -86,7 +86,7 @@ ko.computed = (evaluatorFunctionOrOptions, options) => {
     // Attach a DOM node disposal callback so that the computed will be proactively disposed as soon as the node is
     // removed using ko.removeNode. But skip if isActive is false (there will never be any dependencies to dispose).
     if (state.disposeWhenNodeIsRemoved && computedObservable.isActive()) {
-        ko.utils.domNodeDisposal.addDisposeCallback(state.disposeWhenNodeIsRemoved, state.domNodeDisposalCallback = () => {
+        ko.utils.domNodeDisposal['addDisposeCallback'](state.disposeWhenNodeIsRemoved, state.domNodeDisposalCallback = () => {
             computedObservable['dispose']();
         });
     }
diff --git a/vendors/knockout/src/subscribables/subscribable.js b/vendors/knockout/src/subscribables/subscribable.js
index 370600811..9bec70101 100644
--- a/vendors/knockout/src/subscribables/subscribable.js
+++ b/vendors/knockout/src/subscribables/subscribable.js
@@ -25,7 +25,7 @@ class koSubscription
     disposeWhenNodeIsRemoved(node) {
         // MutationObserver ?
         this._node = node;
-        ko.utils.domNodeDisposal.addDisposeCallback(node, this._domNodeDisposalCallback = this['dispose'].bind(this));
+        ko.utils.domNodeDisposal['addDisposeCallback'](node, this._domNodeDisposalCallback = this['dispose'].bind(this));
     }
 }
 
diff --git a/vendors/knockout/src/utils.domNodeDisposal.js b/vendors/knockout/src/utils.domNodeDisposal.js
index 92a7adfa8..6ef6ea292 100644
--- a/vendors/knockout/src/utils.domNodeDisposal.js
+++ b/vendors/knockout/src/utils.domNodeDisposal.js
@@ -45,7 +45,7 @@ ko.utils.domNodeDisposal = (() => {
     };
 
     return {
-        addDisposeCallback : (node, callback) => {
+        'addDisposeCallback' : (node, callback) => {
             if (typeof callback != "function")
                 throw Error("Callback must be a function");
             getDisposeCallbacksCollection(node, 1).add(callback);
@@ -82,5 +82,4 @@ ko.utils.domNodeDisposal = (() => {
 })();
 ko.cleanNode = ko.utils.domNodeDisposal.cleanNode; // Shorthand name for convenience
 ko.removeNode = ko.utils.domNodeDisposal.removeNode; // Shorthand name for convenience
-//ko.exportSymbol('utils.domNodeDisposal', ko.utils.domNodeDisposal);
-ko.exportSymbol('addDisposeCallback', ko.utils.domNodeDisposal.addDisposeCallback);
+ko.exportSymbol('utils.domNodeDisposal', ko.utils.domNodeDisposal);
diff --git a/vendors/knockout/src/utils.js b/vendors/knockout/src/utils.js
index ce58dc9e5..a2129c2e3 100644
--- a/vendors/knockout/src/utils.js
+++ b/vendors/knockout/src/utils.js
@@ -96,5 +96,5 @@ ko.utils = {
         element.textContent = ko.utils.unwrapObservable(textContent)
 };
 
-//ko.exportSymbol('utils', ko.utils);
+ko.exportSymbol('utils', ko.utils);
 ko.exportSymbol('unwrap', ko.utils.unwrapObservable); // Convenient shorthand, because this is used so commonly
diff --git a/vendors/knockout/src/virtualElements.js b/vendors/knockout/src/virtualElements.js
index a32807fd0..a4c572dfb 100644
--- a/vendors/knockout/src/virtualElements.js
+++ b/vendors/knockout/src/virtualElements.js
@@ -76,15 +76,17 @@
                 ko.utils.setDomNodeChildren(node, childNodes);
         },
 
+        prepend: (containerNode, nodeToPrepend) => {
+            // Start comments must always have a parent and at least one following sibling (the end comment)
+            isStartComment(containerNode)
+                ? containerNode.nextSibling.before(nodeToPrepend)
+                : containerNode.prepend(nodeToPrepend);
+        },
+
         insertAfter: (containerNode, nodeToInsert, insertAfterNode) => {
             insertAfterNode
                 ? insertAfterNode.after(nodeToInsert)
-                : (
-                    // Start comments must always have a parent and at least one following sibling (the end comment)
-                    isStartComment(containerNode)
-                        ? containerNode.nextSibling.before(nodeToInsert)
-                        : containerNode.prepend(nodeToInsert)
-                );
+                : ko.virtualElements.prepend(containerNode, nodeToInsert);
         },
 
         firstChild: node => {
diff --git a/vendors/squire2/dist/squire-raw.js b/vendors/squire2/dist/squire-raw.js
index d0449d88f..d69f0abe5 100644
--- a/vendors/squire2/dist/squire-raw.js
+++ b/vendors/squire2/dist/squire-raw.js
@@ -45,7 +45,6 @@
   // source/Constants.ts
   var ELEMENT_NODE = 1;
   var TEXT_NODE = 3;
-  var COMMENT_NODE = 8;
   var DOCUMENT_FRAGMENT_NODE = 11;
   var ZWS = "\u200B";
   var ua = navigator.userAgent;
@@ -56,7 +55,7 @@
   var isWebKit = /WebKit\//.test(ua);
   var ctrlKey = isMac || isIOS ? "Meta-" : "Ctrl-";
   var cantFocusEmptyTextNodes = isWebKit;
-  var notWS = /[^ \t\r\n\u200B]/;
+  var notWS = /[^ \t\r\n]/;
 
   // source/node/Category.ts
   var inlineNodeNames = /^(?:#text|A(?:BBR|CRONYM)?|B(?:R|D[IO])?|C(?:ITE|ODE)|D(?:ATA|EL|FN)|EM|FONT|HR|I(?:MG|NS)?|KBD|Q|R(?:P|T|UBY)|S(?:AMP|MALL|PAN|TR(?:IKE|ONG)|U[BP])?|TIME|U|VAR|WBR)$/;
@@ -72,7 +71,6 @@
   var isLeaf = (node) => leafNodeNames.has(node.nodeName);
   var getNodeCategory = (node) => {
     switch (node.nodeType) {
-      case COMMENT_NODE:
       case TEXT_NODE:
         return INLINE;
       case ELEMENT_NODE:
@@ -254,12 +252,11 @@
       return nodeStartAfterStart && nodeEndBeforeEnd;
     }
   };
-  var canDescendInto = (node) => node instanceof Text || node.nodeType === ELEMENT_NODE && !isLeaf(node);
   var moveRangeBoundariesDownTree = (range) => {
     let { startContainer, startOffset, endContainer, endOffset } = range;
     while (!(startContainer instanceof Text)) {
       let child = startContainer.childNodes[startOffset];
-      if (!child || !canDescendInto(child)) {
+      if (!child || isLeaf(child)) {
         if (startOffset) {
           child = startContainer.childNodes[startOffset - 1];
           if (child instanceof Text) {
@@ -281,7 +278,7 @@
     if (endOffset) {
       while (!(endContainer instanceof Text)) {
         const child = endContainer.childNodes[endOffset - 1];
-        if (!child || !canDescendInto(child)) {
+        if (!child || isLeaf(child)) {
           if (child && child.nodeName === "BR" && !isLineBreak(child)) {
             --endOffset;
             continue;
@@ -294,7 +291,7 @@
     } else {
       while (!(endContainer instanceof Text)) {
         const child = endContainer.firstChild;
-        if (!child || !canDescendInto(child)) {
+        if (!child || isLeaf(child)) {
           break;
         }
         endContainer = child;
@@ -371,7 +368,7 @@
       replace(classNames, family) {
         return createElement("SPAN", {
           class: classNames.fontFamily,
-          style: { fontFamily: family }
+          style: "font-family:" + family
         });
       }
     },
@@ -380,7 +377,7 @@
       replace(classNames, size) {
         return createElement("SPAN", {
           class: classNames.fontSize,
-          style: { fontSize: size }
+          style: "font-size:" + size
         });
       }
     },
@@ -541,8 +538,8 @@
     const brs = node.querySelectorAll("BR:last-child");
     let l = brs.length;
     while (l--) {
-      const br = brs[l], parent = br.parentElement;
-      if (!br.nextSibling && 1 === parent.children.length && parent.textContent.trim().length) {
+      const br = brs[l];
+      if (!isLineBreak(br)) {
         br.remove();
       }
     }
@@ -560,9 +557,6 @@
   };
   var fixContainer = (container) => {
     let wrapper = null;
-    if (/^(?:TABLE|TBODY|TR|TH|TD|P)/.test(container.nodeName)) {
-      return container;
-    }
     [...container.childNodes].forEach((child) => {
       if (isInline(child)) {
         wrapper || (wrapper = createElement("DIV"));
@@ -572,13 +566,10 @@
         wrapper = null;
       }
     });
-    wrapper && container.append(fixCursor(wrapper));
+    wrapper && container.append(wrapper);
     return container;
   };
   var split = (node, offset, stopNode, root) => {
-    if (!stopNode.contains(node)) {
-      throw new Error("split: stopNode does not contain node");
-    }
     if (node instanceof Text && node !== stopNode) {
       if (typeof offset !== "number") {
         throw new Error("Offset must be a number to split text node!");
@@ -1029,7 +1020,7 @@
     }
     moveRangeBoundariesDownTree(range);
     range.collapse(false);
-    let stopPoint = getClosest(range.endContainer, root, "BLOCKQUOTE") || root;
+    const stopPoint = getClosest(range.endContainer, root, "BLOCKQUOTE") || root;
     let block = getStartBlockOfRange(range, root);
     let blockContentsAfterSplit = null;
     const firstBlockInFrag = getNextBlock(frag, frag);
@@ -1063,15 +1054,11 @@
         }
       }
       mergeWithBlock(container, firstBlockInFrag, range, root);
-      if (container === root) {
-        range.setEnd(root, getLength(root));
-      } else {
-        offset = Array.from(container.parentNode.childNodes).indexOf(
-          container
-        ) + 1;
-        container = container.parentNode;
-        range.setEnd(container, offset);
-      }
+      offset = Array.from(container.parentNode.childNodes).indexOf(
+        container
+      ) + 1;
+      container = container.parentNode;
+      range.setEnd(container, offset);
     }
     if (getLength(frag)) {
       if (replaceBlock && block) {
@@ -1079,13 +1066,6 @@
         range.collapse(false);
         detach(block);
       }
-      if (!stopPoint.contains(range.endContainer)) {
-        if (!root.contains(range.endContainer)) {
-          range.setEnd(root, getLength(root));
-          range.collapse(false);
-        }
-        stopPoint = getClosest(range.endContainer, root, "BLOCKQUOTE") || root;
-      }
       moveRangeBoundariesUpTree(range, stopPoint, stopPoint, root);
       let nodeAfterSplit = split(
         range.endContainer,
@@ -1169,25 +1149,29 @@
 
   // source/Clipboard.ts
   var indexOf = Array.prototype.indexOf;
-  var extractRange = (range, root, removeRangeFromDocument, toCleanHTML, toPlainText) => {
+  var extractRangeToClipboard = (event, range, root, removeRangeFromDocument, toCleanHTML, toPlainText, plainTextOnly) => {
+    const clipboardData = event.clipboardData;
+    if (!clipboardData) {
+      return false;
+    }
     let text = toPlainText ? "" : getTextContentsOfRange(range);
     const startBlock = getStartBlockOfRange(range, root);
     const endBlock = getEndBlockOfRange(range, root);
-    let parent = range.commonAncestorContainer;
     let copyRoot = root;
-    if (startBlock === endBlock && startBlock?.contains(parent)) {
+    if (startBlock === endBlock && startBlock?.contains(range.commonAncestorContainer)) {
       copyRoot = startBlock;
     }
     let contents;
     if (removeRangeFromDocument) {
       contents = deleteContentsOfRange(range, root);
-      if (!parent.isConnected) {
-        parent = range.commonAncestorContainer;
-      }
     } else {
+      range = range.cloneRange();
+      moveRangeBoundariesDownTree(range);
+      moveRangeBoundariesUpTree(range, copyRoot, copyRoot, root);
       contents = range.cloneContents();
     }
-    while (parent && !(parent instanceof Element)) {
+    let parent = range.commonAncestorContainer;
+    if (parent instanceof Text) {
       parent = parent.parentNode;
     }
     while (parent && parent !== copyRoot) {
@@ -1199,7 +1183,7 @@
     let html;
     if (contents.childNodes.length === 1 && contents.childNodes[0] instanceof Text) {
       text = contents.childNodes[0].data.replace(/ /g, " ");
-      html = void 0;
+      plainTextOnly = true;
     } else {
       const node = createElement("DIV");
       node.append(contents);
@@ -1211,34 +1195,15 @@
     if (toPlainText && html !== void 0) {
       text = toPlainText(html);
     }
-    if (text === html) {
-      html = void 0;
-    }
     if (isWin) {
       text = text.replace(/\r?\n/g, "\r\n");
     }
-    if (html) {
+    if (!plainTextOnly && html && text !== html) {
       html = "<!-- squire -->" + html;
-    }
-    return [text, html];
-  };
-  var extractRangeToClipboard = (event, range, root, removeRangeFromDocument, toCleanHTML, toPlainText, plainTextOnly) => {
-    const clipboardData = event.clipboardData;
-    if (!clipboardData) {
-      return false;
-    }
-    let [text, html] = extractRange(
-      range,
-      root,
-      removeRangeFromDocument,
-      toCleanHTML,
-      toPlainText
-    );
-    event.preventDefault();
-    if (!plainTextOnly && html) {
       clipboardData.setData("text/html", html);
     }
     clipboardData.setData("text/plain", text);
+    event.preventDefault();
     return true;
   };
   var _onCut = function(event) {
@@ -1286,11 +1251,7 @@
   var _onPaste = function(event) {
     const clipboardData = event.clipboardData;
     const items = clipboardData.items;
-    const choosePlain = this._isShiftDown || !!getNearest(
-      this.getSelection().commonAncestorContainer,
-      this._root,
-      "PRE"
-    );
+    const choosePlain = this._isShiftDown;
     let hasRTF = false;
     let hasImage = false;
     let plainItem = null;
@@ -1309,7 +1270,7 @@
         hasImage = true;
       }
     }
-    if (hasImage && !(hasRTF && htmlItem) && !plainItem) {
+    if (hasImage && !(hasRTF && htmlItem)) {
       event.preventDefault();
       this.fireEvent("pasteImage", {
         clipboardData
@@ -1323,122 +1284,42 @@
       });
     } else if (plainItem) {
       plainItem.getAsString((text) => {
+        let isLink = false;
         const range = this.getSelection();
         if (!range.collapsed && notWS.test(range.toString())) {
           const match = this.linkRegExp.exec(text);
-          const isLink = !!match && match[0].length === text.length;
-          if (isLink) {
-            const href = match[1] ? /^(?:ht|f)tps?:/i.test(match[1]) ? match[1] : "http://" + match[1] : "mailto:" + match[0];
-            this.makeLink(href);
-            return;
-          }
+          isLink = !!match && match[0].length === text.length;
+        }
+        if (isLink) {
+          this.makeLink(text);
+        } else {
+          this.insertPlainText(text, true);
         }
-        this.insertPlainText(text, true);
       });
     }
   };
-  var _onDragStart = function() {
-    const range = this.getSelection();
-    if (range && !range.collapsed && this._root.contains(range.commonAncestorContainer)) {
-      this._dragRange = range.cloneRange();
-    } else {
-      this._dragRange = null;
-    }
-  };
-  var _onDragEnd = function() {
-    this._dragRange = null;
-  };
-  var getCaretRangeFromPoint = (x, y, root) => {
-    let range = null;
-    const doc = document;
-    if (doc.caretPositionFromPoint) {
-      const pos = doc.caretPositionFromPoint(x, y);
-      if (pos) {
-        range = document.createRange();
-        range.setStart(pos.offsetNode, pos.offset);
-        range.collapse(true);
-      }
-    } else if (doc.caretRangeFromPoint) {
-      range = doc.caretRangeFromPoint(x, y);
-    }
-    if (range && !root.contains(range.commonAncestorContainer)) {
-      return null;
-    }
-    return range;
-  };
-  var pointIsWithinRange = (point, source) => {
-    return point.compareBoundaryPoints(Range.START_TO_START, source) >= 0 && point.compareBoundaryPoints(Range.END_TO_END, source) <= 0;
-  };
   var _onDrop = function(event) {
-    const dataTransfer = event.dataTransfer;
-    if (!dataTransfer) {
+    if (!event.dataTransfer) {
       return;
     }
-    const types = dataTransfer.types;
+    const types = event.dataTransfer.types;
+    let l = types.length;
     let hasPlain = false;
     let hasHTML = false;
-    for (let i = 0, l = types.length; i < l; i += 1) {
-      switch (types[i]) {
+    while (l--) {
+      switch (types[l]) {
         case "text/plain":
           hasPlain = true;
           break;
         case "text/html":
           hasHTML = true;
           break;
+        default:
+          return;
       }
     }
-    if (!hasPlain && !hasHTML) {
-      return;
-    }
-    event.preventDefault();
-    const root = this._root;
-    let dropRange = getCaretRangeFromPoint(event.clientX, event.clientY, root);
-    const dragRange = this._dragRange;
-    this._dragRange = null;
-    if (!dropRange) {
-      return;
-    }
-    let text, html;
-    if (dragRange) {
-      if (pointIsWithinRange(dropRange, dragRange)) {
-        return;
-      }
-      this._recordUndoState(dragRange, this._isInUndoState);
-      const bookmark = document.createComment("");
-      dropRange.insertNode(bookmark);
-      this._getRangeAndRemoveBookmark(dragRange);
-      [text, html] = extractRange(
-        dragRange,
-        root,
-        dataTransfer.dropEffect !== "copy",
-        this._config.willCutCopy,
-        this._config.toPlainText
-      );
-      bookmark.replaceWith(
-        createElement("INPUT", {
-          id: this.startSelectionId,
-          type: "hidden"
-        }),
-        createElement("INPUT", {
-          id: this.endSelectionId,
-          type: "hidden"
-        })
-      );
-      this._getRangeAndRemoveBookmark(dropRange);
-      resetNodeCategoryCache();
-    } else {
-      this.saveUndoState(dropRange);
-      if (hasHTML) {
-        html = dataTransfer.getData("text/html");
-      } else {
-        text = dataTransfer.getData("text/plain");
-      }
-    }
-    this.setSelection(dropRange);
-    if (html !== void 0) {
-      this.insertHTML(html, true);
-    } else if (text !== void 0) {
-      this.insertPlainText(text, true);
+    if (hasHTML || hasPlain && this.saveUndoState) {
+      this.saveUndoState();
     }
   };
 
@@ -1758,9 +1639,8 @@
     }
     key = modifiers + key;
     const range = this.getSelection();
-    const handler = this._keyHandlers[key];
-    if (handler) {
-      handler(this, event, range);
+    if (this._keyHandlers[key]) {
+      this._keyHandlers[key](this, event, range);
     } else if (!range.collapsed && !event.ctrlKey && !event.metaKey && key.length === 1) {
       this.saveUndoState(range);
       deleteContentsOfRange(range, this._root);
@@ -1787,7 +1667,7 @@
         do {
           if (node.nodeName === "CODE") {
             let next = node.nextSibling;
-            if (!(next instanceof Text) || next.length === 0) {
+            if (!(next instanceof Text)) {
               const textNode = document.createTextNode("\xA0");
               node.parentNode.insertBefore(textNode, next);
               next = textNode;
@@ -1881,7 +1761,6 @@
 
   // source/Editor.ts
   var Squire = class {
-    //    _imageResizer: ImageResizer;
     constructor(root, config) {
       /**
        * Subscribing to these events won't automatically add a listener to the
@@ -1964,7 +1843,6 @@
       this._mayHaveZWS = false;
       this._lastAnchorNode = null;
       this._lastFocusNode = null;
-      this._lastPathRange = null;
       this._path = "";
       this._events = /* @__PURE__ */ new Map();
       this._undoIndex = -1;
@@ -1983,9 +1861,6 @@
       this.addEventListener("cut", _onCut);
       this.addEventListener("copy", _onCopy);
       this.addEventListener("paste", _onPaste);
-      this._dragRange = null;
-      this.addEventListener("dragstart", _onDragStart);
-      this.addEventListener("dragend", _onDragEnd);
       this.addEventListener("drop", _onDrop);
       this.addEventListener(
         "keydown",
@@ -2088,7 +1963,7 @@
           event.preventDefault();
           this.bold();
           break;
-        case "formatItalic":
+        case "formaItalic":
           event.preventDefault();
           this.italic();
           break;
@@ -2282,11 +2157,9 @@
     }
     _getRangeAndRemoveBookmark(range) {
       const root = this._root;
-      const starts = root.querySelectorAll("#" + this.startSelectionId);
-      const ends = root.querySelectorAll("#" + this.endSelectionId);
-      const start = starts[0];
-      const end = ends[0];
-      if (start && end && !!(start.compareDocumentPosition(end) & Node.DOCUMENT_POSITION_FOLLOWING)) {
+      const start = root.querySelector("#" + this.startSelectionId);
+      const end = root.querySelector("#" + this.endSelectionId);
+      if (start && end) {
         let startContainer = start.parentNode;
         let endContainer = end.parentNode;
         const startOffset = Array.from(startContainer.childNodes).indexOf(
@@ -2321,12 +2194,6 @@
           }
         }
       }
-      for (let i = 0; i < starts.length; i += 1) {
-        starts[i].remove();
-      }
-      for (let i = 0; i < ends.length; i += 1) {
-        ends[i].remove();
-      }
       return range || null;
     }
     getSelection() {
@@ -2412,23 +2279,10 @@
     }
     _updatePathOnEvent() {
       if (this._isFocused) {
-        const lastPathRange = this._lastPathRange;
-        const selection = this.getSelection();
-        if (!lastPathRange || !lastPathRange.commonAncestorContainer.isConnected || selection.compareBoundaryPoints(
-          0,
-          // Range.START_TO_START,
-          lastPathRange
-        ) !== 0 || selection.compareBoundaryPoints(
-          2,
-          //Range.END_TO_END
-          lastPathRange
-        ) !== 0) {
-          this._updatePath(selection);
-        }
+        this._updatePath(this.getSelection());
       }
     }
     _updatePath(range, force) {
-      this._lastPathRange = range.cloneRange();
       const anchor = range.startContainer;
       const focus = range.endContainer;
       let newPath;
@@ -2568,16 +2422,9 @@
       return this;
     }
     saveUndoState(range) {
-      let rangeIsFromSelection = false;
-      if (!range) {
-        range = this.getSelection();
-        rangeIsFromSelection = true;
-      }
+      range || (range = this.getSelection());
       this._recordUndoState(range, this._isInUndoState);
       this._getRangeAndRemoveBookmark(range);
-      if (rangeIsFromSelection) {
-        this.setSelection(range);
-      }
       return this;
     }
     undo() {
@@ -2637,26 +2484,14 @@
     }
     getHTML(withBookmark) {
       let range;
-      let html = "";
-      this.modifyDocument(() => {
-        if (withBookmark) {
-          range = this.getSelection();
-          this._saveRangeToBookmark(range);
-        }
-        const resizeContainer = this._root.querySelector(
-          ".squire-image-resize-container"
-        );
-        if (resizeContainer) {
-          resizeContainer.remove();
-        }
-        html = this._getRawHTML().replace(/\u200B/g, "");
-        if (resizeContainer) {
-          this._root.append(resizeContainer);
-        }
-        if (withBookmark) {
-          this._getRangeAndRemoveBookmark(range);
-        }
-      });
+      if (withBookmark) {
+        range = this.getSelection();
+        this._saveRangeToBookmark(range);
+      }
+      const html = this._getRawHTML().replace(/\u200B/g, "");
+      if (withBookmark) {
+        this._getRangeAndRemoveBookmark(range);
+      }
       return html;
     }
     setHTML(html) {
@@ -2805,6 +2640,20 @@
     insertPlainText(plainText, isPaste) {
       const range = this.getSelection();
       if (range.collapsed && getClosest(range.startContainer, this._root, "PRE")) {
+        const startContainer = range.startContainer;
+        let offset = range.startOffset;
+        let textNode;
+        if (!startContainer || !(startContainer instanceof Text)) {
+          const text = document.createTextNode("");
+          startContainer.insertBefore(
+            text,
+            startContainer.childNodes[offset]
+          );
+          textNode = text;
+          offset = 0;
+        } else {
+          textNode = startContainer;
+        }
         let doInsert = true;
         if (isPaste) {
           const event = new CustomEvent("willPaste", {
@@ -2818,27 +2667,6 @@
           doInsert = !event.defaultPrevented;
         }
         if (doInsert) {
-          this.saveUndoState(range);
-          const startContainer = range.startContainer;
-          let offset = range.startOffset;
-          let textNode;
-          if (startContainer instanceof Text) {
-            textNode = startContainer;
-          } else {
-            let nodeBeforeCursor = offset ? startContainer.childNodes[offset - 1] : null;
-            if (nodeBeforeCursor instanceof Text) {
-              textNode = nodeBeforeCursor;
-              offset = textNode.length;
-            } else {
-              const text = document.createTextNode("");
-              startContainer.insertBefore(
-                text,
-                startContainer.childNodes[offset]
-              );
-              textNode = text;
-              offset = 0;
-            }
-          }
           textNode.insertData(offset, plainText);
           range.setStart(textNode, offset + plainText.length);
           range.collapse(true);
@@ -3210,11 +3038,8 @@
     // --- Block formatting
     _ensureBottomLine() {
       const root = this._root;
-      let last = root;
-      do {
-        last = last.lastElementChild;
-      } while (last && isContainer(last));
-      if (!last || !isBlock(last)) {
+      const last = root.lastElementChild;
+      if (!last || last.nodeName !== this._config.blockTag || !isBlock(last)) {
         root.append(this.createDefaultBlock());
       }
     }
@@ -3251,11 +3076,10 @@
       if (block && (parent = getClosest(block, root, "PRE"))) {
         moveRangeBoundariesDownTree(range);
         node = range.startContainer;
-        let offset2 = range.startOffset;
+        const offset2 = range.startOffset;
         if (!(node instanceof Text)) {
           node = document.createTextNode("");
           parent.insertBefore(node, parent.firstChild);
-          offset2 = 0;
         }
         if (!lineBreakOnly && node instanceof Text && (node.data.charAt(offset2 - 1) === "\n" || rangeDoesStartAtBlockBoundary(range, root)) && (node.data.charAt(offset2) === "\n" || rangeDoesEndAtBlockBoundary(range, root))) {
           node.deleteData(offset2 && offset2 - 1, offset2 ? 2 : 1);
@@ -3277,9 +3101,7 @@
           range.setStart(node, 0);
         } else {
           node.insertData(offset2, "\n");
-          if (!node.nextSibling) {
-            parent.append(createElement("BR"));
-          }
+          fixCursor(parent);
           if (node.length === offset2 + 1) {
             range.setStartAfter(node);
           } else {
diff --git a/yarn.lock b/yarn.lock
index c2e7e0c48..3ac1d0184 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,3259 +2,3345 @@
 # yarn lockfile v1
 
 
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.24.7":
+  "integrity" "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA=="
+  "resolved" "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz"
+  "version" "7.24.7"
+  dependencies:
+    "@babel/highlight" "^7.24.7"
+    "picocolors" "^1.0.0"
+
 "@babel/code-frame@7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
-  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
+  "integrity" "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="
+  "resolved" "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz"
+  "version" "7.12.11"
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.29.7":
-  version "7.29.7"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.29.7.tgz#f2fbbfea87c44a21590ec515b778b2c26d8866e7"
-  integrity sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==
+"@babel/generator@^7.24.7":
+  "integrity" "sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA=="
+  "resolved" "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz"
+  "version" "7.24.7"
   dependencies:
-    "@babel/helper-validator-identifier" "^7.29.7"
-    js-tokens "^4.0.0"
-    picocolors "^1.1.1"
+    "@babel/types" "^7.24.7"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    "jsesc" "^2.5.1"
 
-"@babel/generator@^7.29.8":
-  version "7.29.8"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.29.8.tgz#4b0b887885422643339e09022148a4c4ebaa4979"
-  integrity sha512-gZbepsdh3WDtgZKWL+vTPh71LSBrm/Y4/QDZBVCcYfmeTEEuoOYwlSy+G1StfJg+/Zy550u/3TATbm7qDbbMtg==
+"@babel/helper-environment-visitor@^7.24.7":
+  "integrity" "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz"
+  "version" "7.24.7"
   dependencies:
-    "@babel/parser" "^7.29.8"
-    "@babel/types" "^7.29.8"
-    "@jridgewell/gen-mapping" "^0.3.12"
-    "@jridgewell/trace-mapping" "^0.3.28"
-    jsesc "^3.0.2"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-globals@^7.29.7":
-  version "7.29.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-globals/-/helper-globals-7.29.7.tgz#f04a96fbd8473241b1079243f5b3f03a3010ab7b"
-  integrity sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==
-
-"@babel/helper-string-parser@^7.29.7":
-  version "7.29.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz#7f0871d99824d23137d60f86fcf6130fd5a1b51f"
-  integrity sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==
-
-"@babel/helper-validator-identifier@^7.25.9", "@babel/helper-validator-identifier@^7.29.7":
-  version "7.29.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz#bd87084ced0c796ec46bda492de6e83d29e89fc2"
-  integrity sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==
-
-"@babel/highlight@^7.10.4":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.25.9.tgz#8141ce68fc73757946f983b343f1231f4691acc6"
-  integrity sha512-llL88JShoCsth8fF8R4SJnIn+WLvR6ccFxu1H3FlMhDontdcmZWf2HgIZ7AIqV3Xcck1idlohrN4EUBQz6klbw==
+"@babel/helper-function-name@^7.24.7":
+  "integrity" "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz"
+  "version" "7.24.7"
   dependencies:
-    "@babel/helper-validator-identifier" "^7.25.9"
-    chalk "^2.4.2"
-    js-tokens "^4.0.0"
-    picocolors "^1.0.0"
+    "@babel/template" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/parser@^7.29.7", "@babel/parser@^7.29.8", "@babel/parser@^7.29.9", "@babel/parser@^7.7.0":
-  version "7.29.9"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.29.9.tgz#e7ee0a24f752c5296c6455855ccb72662e67ea96"
-  integrity sha512-CjXrNHTnvqBVqHgdBysY3vk2T8tpJHb5/RMeHJBTyVa9xgugCB0CJTx/3oO8RV2QRQP391RWpB7D6hLjm8V9uA==
+"@babel/helper-hoist-variables@^7.24.7":
+  "integrity" "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz"
+  "version" "7.24.7"
   dependencies:
-    "@babel/types" "^7.29.8"
+    "@babel/types" "^7.24.7"
 
-"@babel/template@^7.29.7":
-  version "7.29.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.29.7.tgz#4d9d4004f645cdd304de958c725162784ecac700"
-  integrity sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==
+"@babel/helper-split-export-declaration@^7.24.7":
+  "integrity" "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz"
+  "version" "7.24.7"
   dependencies:
-    "@babel/code-frame" "^7.29.7"
-    "@babel/parser" "^7.29.7"
-    "@babel/types" "^7.29.7"
+    "@babel/types" "^7.24.7"
+
+"@babel/helper-string-parser@^7.24.7":
+  "integrity" "sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz"
+  "version" "7.24.7"
+
+"@babel/helper-validator-identifier@^7.24.7":
+  "integrity" "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz"
+  "version" "7.24.7"
+
+"@babel/highlight@^7.10.4", "@babel/highlight@^7.24.7":
+  "integrity" "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw=="
+  "resolved" "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz"
+  "version" "7.24.7"
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.24.7"
+    "chalk" "^2.4.2"
+    "js-tokens" "^4.0.0"
+    "picocolors" "^1.0.0"
+
+"@babel/parser@^7.24.7", "@babel/parser@^7.7.0":
+  "integrity" "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw=="
+  "resolved" "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz"
+  "version" "7.24.7"
+
+"@babel/template@^7.24.7":
+  "integrity" "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig=="
+  "resolved" "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz"
+  "version" "7.24.7"
+  dependencies:
+    "@babel/code-frame" "^7.24.7"
+    "@babel/parser" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
 "@babel/traverse@^7.7.0":
-  version "7.29.10"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.29.10.tgz#08ab387639b4a67304511259c7da6cf23a82e91c"
-  integrity sha512-B3lYAs2nkKskbgQ1nfy8Ma9ao9Q1rntTAQHrzzyDuj+TSO+X3le6PfWwqDvodsb+OumE10eMFfuMCTQSQ5iuIQ==
+  "integrity" "sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA=="
+  "resolved" "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz"
+  "version" "7.24.7"
   dependencies:
-    "@babel/code-frame" "^7.29.7"
-    "@babel/generator" "^7.29.8"
-    "@babel/helper-globals" "^7.29.7"
-    "@babel/parser" "^7.29.9"
-    "@babel/template" "^7.29.7"
-    "@babel/types" "^7.29.8"
-    debug "^4.3.1"
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.24.7"
+    "@babel/helper-environment-visitor" "^7.24.7"
+    "@babel/helper-function-name" "^7.24.7"
+    "@babel/helper-hoist-variables" "^7.24.7"
+    "@babel/helper-split-export-declaration" "^7.24.7"
+    "@babel/parser" "^7.24.7"
+    "@babel/types" "^7.24.7"
+    "debug" "^4.3.1"
+    "globals" "^11.1.0"
 
-"@babel/types@^7.29.7", "@babel/types@^7.29.8", "@babel/types@^7.7.0":
-  version "7.29.8"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.29.8.tgz#1229eef31d85156d70fa3f4cd859376d0eaf6863"
-  integrity sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==
+"@babel/types@^7.24.7", "@babel/types@^7.7.0":
+  "integrity" "sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q=="
+  "resolved" "https://registry.npmjs.org/@babel/types/-/types-7.24.7.tgz"
+  "version" "7.24.7"
   dependencies:
-    "@babel/helper-string-parser" "^7.29.7"
-    "@babel/helper-validator-identifier" "^7.29.7"
+    "@babel/helper-string-parser" "^7.24.7"
+    "@babel/helper-validator-identifier" "^7.24.7"
+    "to-fast-properties" "^2.0.0"
 
 "@eslint/eslintrc@^0.4.3":
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
-  integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
+  "integrity" "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="
+  "resolved" "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz"
+  "version" "0.4.3"
   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"
+    "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"
 
 "@gulpjs/messages@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@gulpjs/messages/-/messages-1.1.0.tgz#94e70978ff676ade541faab459c37ae0c7095e5a"
-  integrity sha512-Ys9sazDatyTgZVb4xPlDufLweJ/Os2uHWOv+Caxvy2O85JcnT4M3vc73bi8pdLWlv3fdWQz3pdI9tVwo8rQQSg==
+  "integrity" "sha512-Ys9sazDatyTgZVb4xPlDufLweJ/Os2uHWOv+Caxvy2O85JcnT4M3vc73bi8pdLWlv3fdWQz3pdI9tVwo8rQQSg=="
+  "resolved" "https://registry.npmjs.org/@gulpjs/messages/-/messages-1.1.0.tgz"
+  "version" "1.1.0"
 
 "@gulpjs/to-absolute-glob@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@gulpjs/to-absolute-glob/-/to-absolute-glob-4.0.0.tgz#1fc2460d3953e1d9b9f2dfdb4bcc99da4710c021"
-  integrity sha512-kjotm7XJrJ6v+7knhPaRgaT6q8F8K2jiafwYdNHLzmV0uGLuZY43FK6smNSHUPrhq5kX2slCUy+RGG/xGqmIKA==
+  "integrity" "sha512-kjotm7XJrJ6v+7knhPaRgaT6q8F8K2jiafwYdNHLzmV0uGLuZY43FK6smNSHUPrhq5kX2slCUy+RGG/xGqmIKA=="
+  "resolved" "https://registry.npmjs.org/@gulpjs/to-absolute-glob/-/to-absolute-glob-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
-    is-negated-glob "^1.0.0"
+    "is-negated-glob" "^1.0.0"
 
 "@humanwhocodes/config-array@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
-  integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
+  "integrity" "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg=="
+  "resolved" "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz"
+  "version" "0.5.0"
   dependencies:
     "@humanwhocodes/object-schema" "^1.2.0"
-    debug "^4.1.1"
-    minimatch "^3.0.4"
+    "debug" "^4.1.1"
+    "minimatch" "^3.0.4"
 
 "@humanwhocodes/object-schema@^1.2.0":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
-  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
+  "integrity" "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
+  "resolved" "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"
+  "version" "1.2.1"
 
-"@jridgewell/gen-mapping@^0.3.12", "@jridgewell/gen-mapping@^0.3.5":
-  version "0.3.13"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz#6342a19f44347518c93e43b1ac69deb3c4656a1f"
-  integrity sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==
+"@jridgewell/gen-mapping@^0.3.5":
+  "integrity" "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg=="
+  "resolved" "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz"
+  "version" "0.3.5"
   dependencies:
-    "@jridgewell/sourcemap-codec" "^1.5.0"
+    "@jridgewell/set-array" "^1.2.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.24"
 
 "@jridgewell/resolve-uri@^3.1.0":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
-  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
+  "integrity" "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw=="
+  "resolved" "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz"
+  "version" "3.1.2"
+
+"@jridgewell/set-array@^1.2.1":
+  "integrity" "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A=="
+  "resolved" "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz"
+  "version" "1.2.1"
 
 "@jridgewell/source-map@^0.3.3":
-  version "0.3.11"
-  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.11.tgz#b21835cbd36db656b857c2ad02ebd413cc13a9ba"
-  integrity sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==
+  "integrity" "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ=="
+  "resolved" "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz"
+  "version" "0.3.6"
   dependencies:
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.25"
 
-"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz#f4c663e862f06dc98ca4d453862c46902789a18d"
-  integrity sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
+  "integrity" "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+  "resolved" "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz"
+  "version" "1.4.15"
 
-"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.28":
-  version "0.3.31"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz#db15d6781c931f3a251a3dac39501c98a6082fd0"
-  integrity sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==
+"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
+  "integrity" "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ=="
+  "resolved" "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz"
+  "version" "0.3.25"
   dependencies:
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
 "@nodelib/fs.scandir@2.1.5":
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
-  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
+  "integrity" "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="
+  "resolved" "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"
+  "version" "2.1.5"
   dependencies:
     "@nodelib/fs.stat" "2.0.5"
-    run-parallel "^1.1.9"
+    "run-parallel" "^1.1.9"
 
-"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
-  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
+"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5":
+  "integrity" "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="
+  "resolved" "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"
+  "version" "2.0.5"
 
 "@nodelib/fs.walk@^1.2.3":
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
-  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
+  "integrity" "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="
+  "resolved" "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"
+  "version" "1.2.8"
   dependencies:
     "@nodelib/fs.scandir" "2.1.5"
-    fastq "^1.6.0"
+    "fastq" "^1.6.0"
 
 "@rollup/plugin-node-resolve@^13.1.3":
-  version "13.3.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.3.0.tgz#da1c5c5ce8316cef96a2f823d111c1e4e498801c"
-  integrity sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==
+  "integrity" "sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw=="
+  "resolved" "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.3.0.tgz"
+  "version" "13.3.0"
   dependencies:
     "@rollup/pluginutils" "^3.1.0"
     "@types/resolve" "1.17.1"
-    deepmerge "^4.2.2"
-    is-builtin-module "^3.1.0"
-    is-module "^1.0.0"
-    resolve "^1.19.0"
+    "deepmerge" "^4.2.2"
+    "is-builtin-module" "^3.1.0"
+    "is-module" "^1.0.0"
+    "resolve" "^1.19.0"
 
 "@rollup/plugin-replace@^3.0.1":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-3.1.0.tgz#d31e3a90c6b47064f3c9f2ce0ded5bcf0d3b82f6"
-  integrity sha512-pA3XRUrSKybVYqmH5TqWNZpGxF+VV+1GrYchKgCNIj2vsSOX7CVm2RCtx8p2nrC7xvkziYyK+lSi74T93MU3YA==
+  "integrity" "sha512-pA3XRUrSKybVYqmH5TqWNZpGxF+VV+1GrYchKgCNIj2vsSOX7CVm2RCtx8p2nrC7xvkziYyK+lSi74T93MU3YA=="
+  "resolved" "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
     "@rollup/pluginutils" "^3.1.0"
-    magic-string "^0.25.7"
-
-"@rollup/plugin-terser@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-terser/-/plugin-terser-1.0.2.tgz#3686f1685669819874956b4bdb965cf21d9eb2d5"
-  integrity sha512-+UihHnuLnQDQ/9wog7ym+7oawCXkjTIo0WwkK7s//0mkktTN0VhYk6fGVxH+NtGzW064w5RCGgreMDxRVhHCzw==
-  dependencies:
-    serialize-javascript "^7.0.3"
-    smob "^1.0.0"
-    terser "^5.49.2"
+    "magic-string" "^0.25.7"
 
 "@rollup/pluginutils@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b"
-  integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==
+  "integrity" "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg=="
+  "resolved" "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
     "@types/estree" "0.0.39"
-    estree-walker "^1.0.1"
-    picomatch "^2.2.2"
+    "estree-walker" "^1.0.1"
+    "picomatch" "^2.2.2"
 
 "@rollup/pluginutils@^4.0.0":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d"
-  integrity sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==
+  "integrity" "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ=="
+  "resolved" "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz"
+  "version" "4.2.1"
   dependencies:
-    estree-walker "^2.0.1"
-    picomatch "^2.2.2"
+    "estree-walker" "^2.0.1"
+    "picomatch" "^2.2.2"
 
-"@types/estree@*":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.9.tgz#cf3f0e876d7bee15a93ab925b82bf570a3904a24"
-  integrity sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==
-
-"@types/estree@0.0.39":
-  version "0.0.39"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
-  integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
+"@types/estree@*", "@types/estree@0.0.39":
+  "integrity" "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="
+  "resolved" "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz"
+  "version" "0.0.39"
 
 "@types/expect@^1.20.4":
-  version "1.20.4"
-  resolved "https://registry.yarnpkg.com/@types/expect/-/expect-1.20.4.tgz#8288e51737bf7e3ab5d7c77bfa695883745264e5"
-  integrity sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==
+  "integrity" "sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg=="
+  "resolved" "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz"
+  "version" "1.20.4"
 
 "@types/minimatch@^3.0.3":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
-  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
+  "integrity" "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="
+  "resolved" "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz"
+  "version" "3.0.5"
 
 "@types/node@*":
-  version "26.6.5"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-26.6.5.tgz#cb35209e7767c503551b5fa42a48231c7441d979"
-  integrity sha512-uMzsv9stDdofIZBx4UGh4Z9ZgXnGC9seRDscilBcTHAeOFk67MZg/k9bWVfO+bk4qZmG+l52hRnLwUiH2LnJTg==
+  "integrity" "sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ=="
+  "resolved" "https://registry.npmjs.org/@types/node/-/node-20.14.10.tgz"
+  "version" "20.14.10"
   dependencies:
-    undici-types "~8.9.0"
+    "undici-types" "~5.26.4"
 
 "@types/resolve@1.17.1":
-  version "1.17.1"
-  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"
-  integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==
+  "integrity" "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw=="
+  "resolved" "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz"
+  "version" "1.17.1"
   dependencies:
     "@types/node" "*"
 
 "@types/vinyl@^2.0.4":
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/@types/vinyl/-/vinyl-2.0.12.tgz#17642ca9a8ae10f3db018e9f885da4188db4c6e6"
-  integrity sha512-Sr2fYMBUVGYq8kj3UthXFAu5UN6ZW+rYr4NACjZQJvHvj+c8lYv0CahmZ2P/r7iUkN44gGUBwqxZkrKXYPb7cw==
+  "integrity" "sha512-Sr2fYMBUVGYq8kj3UthXFAu5UN6ZW+rYr4NACjZQJvHvj+c8lYv0CahmZ2P/r7iUkN44gGUBwqxZkrKXYPb7cw=="
+  "resolved" "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.12.tgz"
+  "version" "2.0.12"
   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.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
-  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
+"acorn-jsx@^5.2.0", "acorn-jsx@^5.3.1":
+  "integrity" "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="
+  "resolved" "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
+  "version" "5.3.2"
 
-acorn@^7.1.1, acorn@^7.4.0:
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
-  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
+"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", "acorn@^7.1.1", "acorn@^7.4.0":
+  "integrity" "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
+  "resolved" "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"
+  "version" "7.4.1"
 
-acorn@^8.15.0:
-  version "8.19.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.19.0.tgz#6b26fd97ce1cc9dc50bdf7ad305e9f1384d4f28a"
-  integrity sha512-oJlA3XiRm7Cyk6qFD2Jn8ak9B7jSy0qy00ADO3+8dpT0LSjFihQYv4C02LFCSYJV3Q37xYwwRy5m+IpIiUzqWw==
+"acorn@^8.8.2":
+  "integrity" "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg=="
+  "resolved" "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz"
+  "version" "8.12.1"
 
-aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
-  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
+"aggregate-error@^3.0.0":
+  "integrity" "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="
+  "resolved" "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^4.0.0"
+    "clean-stack" "^2.0.0"
+    "indent-string" "^4.0.0"
 
-ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4:
-  version "6.15.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.15.0.tgz#07e982c74626167aa7a2495c53817892d7139492"
-  integrity sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==
+"ajv@^6.10.0", "ajv@^6.10.2", "ajv@^6.12.4":
+  "integrity" "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="
+  "resolved" "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
+  "version" "6.12.6"
   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"
+    "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.20.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.20.0.tgz#304b3636add88ba7d936760dd50ece006dea95f9"
-  integrity sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==
+"ajv@^8.0.1":
+  "integrity" "sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw=="
+  "resolved" "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz"
+  "version" "8.16.0"
   dependencies:
-    fast-deep-equal "^3.1.3"
-    fast-uri "^3.0.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
+    "fast-deep-equal" "^3.1.3"
+    "json-schema-traverse" "^1.0.0"
+    "require-from-string" "^2.0.2"
+    "uri-js" "^4.4.1"
 
-ansi-colors@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
-  integrity sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==
+"ansi-colors@^1.0.1":
+  "integrity" "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA=="
+  "resolved" "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz"
+  "version" "1.1.0"
   dependencies:
-    ansi-wrap "^0.1.0"
+    "ansi-wrap" "^0.1.0"
 
-ansi-colors@^4.1.1:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
-  integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
+"ansi-colors@^4.1.1":
+  "integrity" "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw=="
+  "resolved" "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz"
+  "version" "4.1.3"
 
-ansi-cyan@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873"
-  integrity sha512-eCjan3AVo/SxZ0/MyIYRtkpxIu/H3xZN7URr1vXVrISxeyz8fUFz0FJziamK4sS8I+t35y4rHg1b2PklyBe/7A==
+"ansi-cyan@^0.1.1":
+  "integrity" "sha512-eCjan3AVo/SxZ0/MyIYRtkpxIu/H3xZN7URr1vXVrISxeyz8fUFz0FJziamK4sS8I+t35y4rHg1b2PklyBe/7A=="
+  "resolved" "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz"
+  "version" "0.1.1"
   dependencies:
-    ansi-wrap "0.1.0"
+    "ansi-wrap" "0.1.0"
 
-ansi-escapes@^4.2.1:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
-  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
+"ansi-escapes@^4.2.1":
+  "integrity" "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="
+  "resolved" "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz"
+  "version" "4.3.2"
   dependencies:
-    type-fest "^0.21.3"
+    "type-fest" "^0.21.3"
 
-ansi-gray@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
-  integrity sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==
+"ansi-gray@^0.1.1":
+  "integrity" "sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw=="
+  "resolved" "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz"
+  "version" "0.1.1"
   dependencies:
-    ansi-wrap "0.1.0"
+    "ansi-wrap" "0.1.0"
 
-ansi-red@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c"
-  integrity sha512-ewaIr5y+9CUTGFwZfpECUbFlGcC0GCw1oqR9RI6h1gQCd9Aj2GxSckCnPsVJnmfMZbwFYE+leZGASgkWl06Jow==
+"ansi-red@^0.1.1":
+  "integrity" "sha512-ewaIr5y+9CUTGFwZfpECUbFlGcC0GCw1oqR9RI6h1gQCd9Aj2GxSckCnPsVJnmfMZbwFYE+leZGASgkWl06Jow=="
+  "resolved" "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz"
+  "version" "0.1.1"
   dependencies:
-    ansi-wrap "0.1.0"
+    "ansi-wrap" "0.1.0"
 
-ansi-regex@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
-  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
+"ansi-regex@^4.1.0":
+  "integrity" "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="
+  "resolved" "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz"
+  "version" "4.1.1"
 
-ansi-regex@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
-  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+"ansi-regex@^5.0.1":
+  "integrity" "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+  "resolved" "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
+  "version" "5.0.1"
 
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+"ansi-styles@^3.2.0", "ansi-styles@^3.2.1":
+  "integrity" "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="
+  "resolved" "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"
+  "version" "3.2.1"
   dependencies:
-    color-convert "^1.9.0"
+    "color-convert" "^1.9.0"
 
-ansi-styles@^4.0.0, ansi-styles@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
-  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+"ansi-styles@^4.0.0":
+  "integrity" "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
+  "resolved" "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
+  "version" "4.3.0"
   dependencies:
-    color-convert "^2.0.1"
+    "color-convert" "^2.0.1"
 
-ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
-  integrity sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==
-
-anymatch@^3.1.3, anymatch@~3.1.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
-  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
+"ansi-styles@^4.1.0":
+  "integrity" "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
+  "resolved" "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
+  "version" "4.3.0"
   dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
+    "color-convert" "^2.0.1"
 
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+"ansi-wrap@^0.1.0", "ansi-wrap@0.1.0":
+  "integrity" "sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw=="
+  "resolved" "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz"
+  "version" "0.1.0"
+
+"anymatch@^3.1.3", "anymatch@~3.1.2":
+  "integrity" "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw=="
+  "resolved" "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz"
+  "version" "3.1.3"
   dependencies:
-    sprintf-js "~1.0.2"
+    "normalize-path" "^3.0.0"
+    "picomatch" "^2.0.4"
 
-arr-diff@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a"
-  integrity sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q==
+"argparse@^1.0.7":
+  "integrity" "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="
+  "resolved" "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"
+  "version" "1.0.10"
   dependencies:
-    arr-flatten "^1.0.1"
-    array-slice "^0.2.3"
+    "sprintf-js" "~1.0.2"
 
-arr-diff@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==
-
-arr-flatten@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
-
-arr-union@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d"
-  integrity sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA==
-
-arr-union@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==
-
-array-differ@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-3.0.0.tgz#3cbb3d0f316810eafcc47624734237d6aee4ae6b"
-  integrity sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==
-
-array-each@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
-  integrity sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==
-
-array-slice@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
-  integrity sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==
-
-array-slice@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
-  integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==
-
-array-union@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
-  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
-
-arrify@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
-  integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
-
-assign-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==
-
-astral-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
-  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
-
-astral-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
-  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
-
-async-done@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/async-done/-/async-done-2.0.0.tgz#f1ec5df738c6383a52b0a30d0902fd897329c15a"
-  integrity sha512-j0s3bzYq9yKIVLKGE/tWlCpa3PfFLcrDZLTSVdnnCTGagXuXBJO4SsY9Xdk/fQBirCkH4evW5xOeJXqlAQFdsw==
+"arr-diff@^1.0.1":
+  "integrity" "sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q=="
+  "resolved" "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz"
+  "version" "1.1.0"
   dependencies:
-    end-of-stream "^1.4.4"
-    once "^1.4.0"
-    stream-exhaust "^1.0.2"
+    "arr-flatten" "^1.0.1"
+    "array-slice" "^0.2.3"
 
-async-settle@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/async-settle/-/async-settle-2.0.0.tgz#c695ad14e070f6a755d019d32d6eb38029020287"
-  integrity sha512-Obu/KE8FurfQRN6ODdHN9LuXqwC+JFIM9NRyZqJJ4ZfLJmIYN9Rg0/kb+wF70VV5+fJusTMQlJ1t5rF7J/ETdg==
+"arr-diff@^4.0.0":
+  "integrity" "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA=="
+  "resolved" "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"
+  "version" "4.0.0"
+
+"arr-flatten@^1.0.1":
+  "integrity" "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
+  "resolved" "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"
+  "version" "1.1.0"
+
+"arr-union@^2.0.1":
+  "integrity" "sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA=="
+  "resolved" "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz"
+  "version" "2.1.0"
+
+"arr-union@^3.1.0":
+  "integrity" "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q=="
+  "resolved" "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"
+  "version" "3.1.0"
+
+"array-differ@^3.0.0":
+  "integrity" "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg=="
+  "resolved" "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz"
+  "version" "3.0.0"
+
+"array-each@^1.0.1":
+  "integrity" "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA=="
+  "resolved" "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz"
+  "version" "1.0.1"
+
+"array-slice@^0.2.3":
+  "integrity" "sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q=="
+  "resolved" "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz"
+  "version" "0.2.3"
+
+"array-slice@^1.0.0":
+  "integrity" "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w=="
+  "resolved" "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz"
+  "version" "1.1.0"
+
+"array-union@^2.1.0":
+  "integrity" "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
+  "resolved" "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"
+  "version" "2.1.0"
+
+"arrify@^2.0.1":
+  "integrity" "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug=="
+  "resolved" "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz"
+  "version" "2.0.1"
+
+"assign-symbols@^1.0.0":
+  "integrity" "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw=="
+  "resolved" "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"
+  "version" "1.0.0"
+
+"astral-regex@^1.0.0":
+  "integrity" "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="
+  "resolved" "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz"
+  "version" "1.0.0"
+
+"astral-regex@^2.0.0":
+  "integrity" "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="
+  "resolved" "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz"
+  "version" "2.0.0"
+
+"async-done@^2.0.0":
+  "integrity" "sha512-j0s3bzYq9yKIVLKGE/tWlCpa3PfFLcrDZLTSVdnnCTGagXuXBJO4SsY9Xdk/fQBirCkH4evW5xOeJXqlAQFdsw=="
+  "resolved" "https://registry.npmjs.org/async-done/-/async-done-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    async-done "^2.0.0"
+    "end-of-stream" "^1.4.4"
+    "once" "^1.4.0"
+    "stream-exhaust" "^1.0.2"
 
-async@^3.2.0:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
-  integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==
+"async-settle@^2.0.0":
+  "integrity" "sha512-Obu/KE8FurfQRN6ODdHN9LuXqwC+JFIM9NRyZqJJ4ZfLJmIYN9Rg0/kb+wF70VV5+fJusTMQlJ1t5rF7J/ETdg=="
+  "resolved" "https://registry.npmjs.org/async-settle/-/async-settle-2.0.0.tgz"
+  "version" "2.0.0"
+  dependencies:
+    "async-done" "^2.0.0"
 
-atob@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
-  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+"async@^3.2.0":
+  "integrity" "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg=="
+  "resolved" "https://registry.npmjs.org/async/-/async-3.2.5.tgz"
+  "version" "3.2.5"
 
-b4a@^1.6.4:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.9.0.tgz#6336313b6e76b299c397afa68676ec6ebc788845"
-  integrity sha512-dpfcF9fDNR6++cthXR67iyhgqWy9CBouAvIWhIntzBG6cvK/cnIPiZQjBwi/ZqjjBEDGfoNDtmB0kTjroOJ3pQ==
+"atob@^2.1.2":
+  "integrity" "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
+  "resolved" "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz"
+  "version" "2.1.2"
 
-babel-eslint@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
-  integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
+"b4a@^1.6.4":
+  "integrity" "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg=="
+  "resolved" "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz"
+  "version" "1.6.6"
+
+"babel-eslint@^10.1.0":
+  "integrity" "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg=="
+  "resolved" "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz"
+  "version" "10.1.0"
   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"
+    "eslint-visitor-keys" "^1.0.0"
+    "resolve" "^1.12.0"
 
-bach@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/bach/-/bach-2.0.1.tgz#45a3a3cbf7dbba3132087185c60357482b988972"
-  integrity sha512-A7bvGMGiTOxGMpNupYl9HQTf0FFDNF4VCmks4PJpFyN1AX2pdKuxuwdvUz2Hu388wcgp+OvGFNsumBfFNkR7eg==
+"bach@^2.0.1":
+  "integrity" "sha512-A7bvGMGiTOxGMpNupYl9HQTf0FFDNF4VCmks4PJpFyN1AX2pdKuxuwdvUz2Hu388wcgp+OvGFNsumBfFNkR7eg=="
+  "resolved" "https://registry.npmjs.org/bach/-/bach-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    async-done "^2.0.0"
-    async-settle "^2.0.0"
-    now-and-later "^3.0.0"
+    "async-done" "^2.0.0"
+    "async-settle" "^2.0.0"
+    "now-and-later" "^3.0.0"
 
-balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+"balanced-match@^1.0.0":
+  "integrity" "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+  "resolved" "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
+  "version" "1.0.2"
 
-bare-events@^2.7.0:
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.9.2.tgz#01d377b64c3c7167b28b52da7add3221aecf2d7f"
-  integrity sha512-AIPKioV7/Y/8KfZ3AAhjPJxLLbY49S64Ym5DakZlUg75qQiTgUq9hEJoEwa4eUezPUlXRy/i5NpsKvo9jgKmoA==
+"bare-events@^2.2.0":
+  "integrity" "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q=="
+  "resolved" "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz"
+  "version" "2.4.2"
 
-base64-js@^1.3.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
-  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+"base64-js@^1.3.1":
+  "integrity" "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
+  "resolved" "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"
+  "version" "1.5.1"
 
-binary-extensions@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
-  integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==
+"binary-extensions@^2.0.0":
+  "integrity" "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw=="
+  "resolved" "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz"
+  "version" "2.3.0"
 
-binaryextensions@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.3.0.tgz#1d269cbf7e6243ea886aa41453c3651ccbe13c22"
-  integrity sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==
+"binaryextensions@^2.2.0":
+  "integrity" "sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg=="
+  "resolved" "https://registry.npmjs.org/binaryextensions/-/binaryextensions-2.3.0.tgz"
+  "version" "2.3.0"
 
-bl@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-5.1.0.tgz#183715f678c7188ecef9fe475d90209400624273"
-  integrity sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==
+"bl@^5.0.0":
+  "integrity" "sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ=="
+  "resolved" "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz"
+  "version" "5.1.0"
   dependencies:
-    buffer "^6.0.3"
-    inherits "^2.0.4"
-    readable-stream "^3.4.0"
+    "buffer" "^6.0.3"
+    "inherits" "^2.0.4"
+    "readable-stream" "^3.4.0"
 
-brace-expansion@^1.1.7:
-  version "1.1.21"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.21.tgz#edf4fab5c64d051aea5a8def49aba1c7522279f3"
-  integrity sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==
+"brace-expansion@^1.1.7":
+  "integrity" "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="
+  "resolved" "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
+  "version" "1.1.11"
   dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
+    "balanced-match" "^1.0.0"
+    "concat-map" "0.0.1"
 
-braces@^3.0.3, braces@~3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
-  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
+"braces@^3.0.3", "braces@~3.0.2":
+  "integrity" "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA=="
+  "resolved" "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz"
+  "version" "3.0.3"
   dependencies:
-    fill-range "^7.1.1"
+    "fill-range" "^7.1.1"
 
-buffer-from@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
-  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
+"buffer-from@^1.0.0":
+  "integrity" "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
+  "resolved" "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"
+  "version" "1.1.2"
 
-buffer@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
-  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
+"buffer@^6.0.3":
+  "integrity" "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA=="
+  "resolved" "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz"
+  "version" "6.0.3"
   dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.2.1"
+    "base64-js" "^1.3.1"
+    "ieee754" "^1.2.1"
 
-builtin-modules@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
-  integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==
+"builtin-modules@^3.3.0":
+  "integrity" "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw=="
+  "resolved" "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz"
+  "version" "3.3.0"
 
-callsites@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
-  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+"callsites@^3.0.0":
+  "integrity" "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
+  "resolved" "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"
+  "version" "3.1.0"
 
-chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+"chalk@^2.1.0", "chalk@^2.3.0", "chalk@^2.4.2":
+  "integrity" "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="
+  "resolved" "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
+  "version" "2.4.2"
   dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
+    "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.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+"chalk@^4.0.0":
+  "integrity" "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="
+  "resolved" "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
+  "version" "4.1.2"
   dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
+    "ansi-styles" "^4.1.0"
+    "supports-color" "^7.1.0"
 
-chardet@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
-  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-
-chokidar@^3.5.3:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
-  integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
+"chalk@^4.1.0":
+  "integrity" "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="
+  "resolved" "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
+  "version" "4.1.2"
   dependencies:
-    anymatch "~3.1.2"
-    braces "~3.0.2"
-    glob-parent "~5.1.2"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.6.0"
+    "ansi-styles" "^4.1.0"
+    "supports-color" "^7.1.0"
+
+"chalk@^4.1.2":
+  "integrity" "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="
+  "resolved" "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
+  "version" "4.1.2"
+  dependencies:
+    "ansi-styles" "^4.1.0"
+    "supports-color" "^7.1.0"
+
+"chardet@^0.7.0":
+  "integrity" "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
+  "resolved" "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"
+  "version" "0.7.0"
+
+"chokidar@^3.5.3":
+  "integrity" "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw=="
+  "resolved" "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz"
+  "version" "3.6.0"
+  dependencies:
+    "anymatch" "~3.1.2"
+    "braces" "~3.0.2"
+    "glob-parent" "~5.1.2"
+    "is-binary-path" "~2.1.0"
+    "is-glob" "~4.0.1"
+    "normalize-path" "~3.0.0"
+    "readdirp" "~3.6.0"
   optionalDependencies:
-    fsevents "~2.3.2"
+    "fsevents" "~2.3.2"
 
-clean-css@4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
-  integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
+"clean-css@4.2.3":
+  "integrity" "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="
+  "resolved" "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz"
+  "version" "4.2.3"
   dependencies:
-    source-map "~0.6.0"
+    "source-map" "~0.6.0"
 
-clean-stack@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
-  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
+"clean-stack@^2.0.0":
+  "integrity" "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="
+  "resolved" "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"
+  "version" "2.2.0"
 
-cli-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
-  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+"cli-cursor@^3.1.0":
+  "integrity" "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="
+  "resolved" "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
-    restore-cursor "^3.1.0"
+    "restore-cursor" "^3.1.0"
 
-cli-width@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
-  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
+"cli-width@^3.0.0":
+  "integrity" "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw=="
+  "resolved" "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz"
+  "version" "3.0.0"
 
-cliui@^7.0.2:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
-  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+"cliui@^7.0.2":
+  "integrity" "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="
+  "resolved" "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"
+  "version" "7.0.4"
   dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^7.0.0"
+    "string-width" "^4.2.0"
+    "strip-ansi" "^6.0.0"
+    "wrap-ansi" "^7.0.0"
 
-clone-buffer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
-  integrity sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==
+"clone-buffer@^1.0.0":
+  "integrity" "sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g=="
+  "resolved" "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz"
+  "version" "1.0.0"
 
-clone-stats@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
-  integrity sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==
+"clone-stats@^1.0.0":
+  "integrity" "sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag=="
+  "resolved" "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz"
+  "version" "1.0.0"
 
-clone@^2.1.1, clone@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
-  integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==
+"clone@^2.1.1", "clone@^2.1.2":
+  "integrity" "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="
+  "resolved" "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"
+  "version" "2.1.2"
 
-cloneable-readable@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec"
-  integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==
+"cloneable-readable@^1.0.0":
+  "integrity" "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ=="
+  "resolved" "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz"
+  "version" "1.1.3"
   dependencies:
-    inherits "^2.0.1"
-    process-nextick-args "^2.0.0"
-    readable-stream "^2.3.5"
+    "inherits" "^2.0.1"
+    "process-nextick-args" "^2.0.0"
+    "readable-stream" "^2.3.5"
 
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+"color-convert@^1.9.0":
+  "integrity" "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="
+  "resolved" "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"
+  "version" "1.9.3"
   dependencies:
-    color-name "1.1.3"
+    "color-name" "1.1.3"
 
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+"color-convert@^2.0.1":
+  "integrity" "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="
+  "resolved" "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    color-name "~1.1.4"
+    "color-name" "~1.1.4"
 
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
+"color-name@~1.1.4":
+  "integrity" "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+  "resolved" "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
+  "version" "1.1.4"
 
-color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+"color-name@1.1.3":
+  "integrity" "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+  "resolved" "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
+  "version" "1.1.3"
 
-color-support@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
-  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
+"color-support@^1.1.3":
+  "integrity" "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="
+  "resolved" "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"
+  "version" "1.1.3"
 
-commander@^2.20.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+"commander@^2.20.0":
+  "integrity" "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+  "resolved" "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"
+  "version" "2.20.3"
 
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
+"concat-map@0.0.1":
+  "integrity" "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+  "resolved" "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+  "version" "0.0.1"
 
-concat-with-sourcemaps@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e"
-  integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==
+"concat-with-sourcemaps@^1.0.0":
+  "integrity" "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg=="
+  "resolved" "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz"
+  "version" "1.1.0"
   dependencies:
-    source-map "^0.6.1"
+    "source-map" "^0.6.1"
 
-convert-source-map@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
-  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
+"convert-source-map@^2.0.0":
+  "integrity" "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
+  "resolved" "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz"
+  "version" "2.0.0"
 
-copy-anything@^3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-3.0.5.tgz#2d92dce8c498f790fa7ad16b01a1ae5a45b020a0"
-  integrity sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==
+"copy-anything@^2.0.1":
+  "integrity" "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw=="
+  "resolved" "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz"
+  "version" "2.0.6"
   dependencies:
-    is-what "^4.1.8"
+    "is-what" "^3.14.1"
 
-copy-props@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/copy-props/-/copy-props-4.0.0.tgz#01d249198b8c2e4d8a5e87b90c9630f52c99a9c9"
-  integrity sha512-bVWtw1wQLzzKiYROtvNlbJgxgBYt2bMJpkCbKmXM3xyijvcjjWXEk5nyrrT3bgJ7ODb19ZohE2T0Y3FgNPyoTw==
+"copy-props@^4.0.0":
+  "integrity" "sha512-bVWtw1wQLzzKiYROtvNlbJgxgBYt2bMJpkCbKmXM3xyijvcjjWXEk5nyrrT3bgJ7ODb19ZohE2T0Y3FgNPyoTw=="
+  "resolved" "https://registry.npmjs.org/copy-props/-/copy-props-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
-    each-props "^3.0.0"
-    is-plain-object "^5.0.0"
+    "each-props" "^3.0.0"
+    "is-plain-object" "^5.0.0"
 
-core-util-is@~1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
-  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
+"core-util-is@~1.0.0":
+  "integrity" "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+  "resolved" "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"
+  "version" "1.0.3"
 
-cross-spawn@^6.0.5:
-  version "6.0.6"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.6.tgz#30d0efa0712ddb7eb5a76e1e8721bffafa6b5d57"
-  integrity sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==
+"cross-spawn@^6.0.5":
+  "integrity" "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="
+  "resolved" "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"
+  "version" "6.0.5"
   dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
+    "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.6"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
-  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
+"cross-spawn@^7.0.2":
+  "integrity" "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="
+  "resolved" "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
+  "version" "7.0.3"
   dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
+    "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.yarnpkg.com/css-parse/-/css-parse-2.0.0.tgz#a468ee667c16d81ccf05c58c38d2a97c780dbfd4"
-  integrity sha512-UNIFik2RgSbiTwIW1IsFwXWn6vs+bYdq83LKTSOsx7NJR7WII9dxewkHLltfTLVppoUApHV0118a4RZRI9FLwA==
+"css-parse@^2.0.0":
+  "integrity" "sha512-UNIFik2RgSbiTwIW1IsFwXWn6vs+bYdq83LKTSOsx7NJR7WII9dxewkHLltfTLVppoUApHV0118a4RZRI9FLwA=="
+  "resolved" "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    css "^2.0.0"
+    "css" "^2.0.0"
 
-css-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/css-stringify/-/css-stringify-2.0.0.tgz#2ef33dcf498c3d3ee82bd73d0a01ac28628cd0fa"
-  integrity sha512-ojAQfb3tnNEoNgZ3xhfJewI54h9n4QcTxAsaaaPGAnGe09PRrwU+D6aitH1NU6o0r94qiWBHHdoFpDVlRgDcew==
+"css-stringify@^2.0.0":
+  "integrity" "sha512-ojAQfb3tnNEoNgZ3xhfJewI54h9n4QcTxAsaaaPGAnGe09PRrwU+D6aitH1NU6o0r94qiWBHHdoFpDVlRgDcew=="
+  "resolved" "https://registry.npmjs.org/css-stringify/-/css-stringify-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    css "^2.0.0"
+    "css" "^2.0.0"
 
-css@^2.0.0:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
-  integrity sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==
+"css@^2.0.0":
+  "integrity" "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw=="
+  "resolved" "https://registry.npmjs.org/css/-/css-2.2.4.tgz"
+  "version" "2.2.4"
   dependencies:
-    inherits "^2.0.3"
-    source-map "^0.6.1"
-    source-map-resolve "^0.5.2"
-    urix "^0.1.0"
+    "inherits" "^2.0.3"
+    "source-map" "^0.6.1"
+    "source-map-resolve" "^0.5.2"
+    "urix" "^0.1.0"
 
-debug@2:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+"debug@^4.0.1", "debug@^4.1.1", "debug@^4.3.1":
+  "integrity" "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg=="
+  "resolved" "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz"
+  "version" "4.3.5"
   dependencies:
-    ms "2.0.0"
+    "ms" "2.1.2"
 
-debug@^3.2.6:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
-  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
+"decode-uri-component@^0.2.0":
+  "integrity" "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="
+  "resolved" "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz"
+  "version" "0.2.2"
+
+"deep-is@^0.1.3", "deep-is@~0.1.3":
+  "integrity" "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
+  "resolved" "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"
+  "version" "0.1.4"
+
+"deepmerge@^4.2.2":
+  "integrity" "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A=="
+  "resolved" "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz"
+  "version" "4.3.1"
+
+"del@^6.0.0":
+  "integrity" "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg=="
+  "resolved" "https://registry.npmjs.org/del/-/del-6.1.1.tgz"
+  "version" "6.1.1"
   dependencies:
-    ms "^2.1.1"
+    "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"
 
-debug@^4.0.1, debug@^4.1.1, debug@^4.3.1:
-  version "4.4.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
-  integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
+"detect-file@^1.0.0":
+  "integrity" "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q=="
+  "resolved" "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz"
+  "version" "1.0.0"
+
+"dir-glob@^3.0.1":
+  "integrity" "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="
+  "resolved" "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"
+  "version" "3.0.1"
   dependencies:
-    ms "^2.1.3"
+    "path-type" "^4.0.0"
 
-decode-uri-component@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
-  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
-
-deep-is@^0.1.3, deep-is@~0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
-  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
-
-deepmerge@^4.2.2:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
-  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
-
-del@^6.0.0:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/del/-/del-6.1.1.tgz#3b70314f1ec0aa325c6b14eb36b95786671edb7a"
-  integrity sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==
+"doctrine@^3.0.0":
+  "integrity" "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="
+  "resolved" "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"
+  "version" "3.0.0"
   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"
+    "esutils" "^2.0.2"
 
-detect-file@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
-  integrity sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==
+"duplexer@^0.1.1":
+  "integrity" "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
+  "resolved" "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"
+  "version" "0.1.2"
 
-dir-glob@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
-  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+"each-props@^3.0.0":
+  "integrity" "sha512-IYf1hpuWrdzse/s/YJOrFmU15lyhSzxelNVAHTEG3DtP4QsLTWZUzcUL3HMXmKQxXpa4EIrBPpwRgj0aehdvAw=="
+  "resolved" "https://registry.npmjs.org/each-props/-/each-props-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    path-type "^4.0.0"
+    "is-plain-object" "^5.0.0"
+    "object.defaults" "^1.1.0"
 
-doctrine@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
+"emoji-regex@^7.0.1":
+  "integrity" "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+  "resolved" "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"
+  "version" "7.0.3"
+
+"emoji-regex@^8.0.0":
+  "integrity" "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+  "resolved" "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
+  "version" "8.0.0"
+
+"end-of-stream@^1.4.4":
+  "integrity" "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="
+  "resolved" "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"
+  "version" "1.4.4"
   dependencies:
-    esutils "^2.0.2"
+    "once" "^1.4.0"
 
-duplexer@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
-  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
-
-each-props@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/each-props/-/each-props-3.0.0.tgz#a88fb17634a4828307610ec68269fba2f7280cd8"
-  integrity sha512-IYf1hpuWrdzse/s/YJOrFmU15lyhSzxelNVAHTEG3DtP4QsLTWZUzcUL3HMXmKQxXpa4EIrBPpwRgj0aehdvAw==
+"enquirer@^2.3.5":
+  "integrity" "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ=="
+  "resolved" "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz"
+  "version" "2.4.1"
   dependencies:
-    is-plain-object "^5.0.0"
-    object.defaults "^1.1.0"
+    "ansi-colors" "^4.1.1"
+    "strip-ansi" "^6.0.1"
 
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
-end-of-stream@^1.4.4:
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.5.tgz#7344d711dea40e0b74abc2ed49778743ccedb08c"
-  integrity sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==
+"errno@^0.1.1":
+  "integrity" "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A=="
+  "resolved" "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz"
+  "version" "0.1.8"
   dependencies:
-    once "^1.4.0"
+    "prr" "~1.0.1"
 
-enquirer@^2.3.5:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.4.1.tgz#93334b3fbd74fc7097b224ab4a8fb7e40bf4ae56"
-  integrity sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==
+"escalade@^3.1.1":
+  "integrity" "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA=="
+  "resolved" "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz"
+  "version" "3.1.2"
+
+"escape-string-regexp@^1.0.3", "escape-string-regexp@^1.0.5":
+  "integrity" "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
+  "resolved" "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
+  "version" "1.0.5"
+
+"escape-string-regexp@^4.0.0":
+  "integrity" "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
+  "resolved" "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"
+  "version" "4.0.0"
+
+"eslint-scope@^5.0.0", "eslint-scope@^5.1.1":
+  "integrity" "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="
+  "resolved" "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"
+  "version" "5.1.1"
   dependencies:
-    ansi-colors "^4.1.1"
-    strip-ansi "^6.0.1"
+    "esrecurse" "^4.3.0"
+    "estraverse" "^4.1.1"
 
-errno@^0.1.1:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
-  integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
+"eslint-utils@^1.4.3":
+  "integrity" "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q=="
+  "resolved" "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz"
+  "version" "1.4.3"
   dependencies:
-    prr "~1.0.1"
+    "eslint-visitor-keys" "^1.1.0"
 
-es-errors@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
-  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
-
-escalade@^3.1.1:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
-  integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
-
-escape-string-regexp@^1.0.3, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
-
-escape-string-regexp@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
-  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
-eslint-scope@^5.0.0, eslint-scope@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
-  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+"eslint-utils@^2.1.0":
+  "integrity" "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="
+  "resolved" "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^4.1.1"
+    "eslint-visitor-keys" "^1.1.0"
 
-eslint-utils@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
-  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
-  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":
+  "integrity" "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="
+  "resolved" "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"
+  "version" "1.3.0"
 
-eslint-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
-  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
-  dependencies:
-    eslint-visitor-keys "^1.1.0"
+"eslint-visitor-keys@^2.0.0":
+  "integrity" "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
+  "resolved" "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"
+  "version" "2.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.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
-  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
-
-eslint-visitor-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
-  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
-
-eslint@^6.0.0:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
-  integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
+"eslint@^6.0.0":
+  "integrity" "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig=="
+  "resolved" "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz"
+  "version" "6.8.0"
   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"
+    "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"
 
-eslint@^7.32.0:
-  version "7.32.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
-  integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
+"eslint@^7.32.0", "eslint@>= 4.12.1":
+  "integrity" "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="
+  "resolved" "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz"
+  "version" "7.32.0"
   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"
+    "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"
 
-espree@^6.1.2:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a"
-  integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==
+"espree@^6.1.2":
+  "integrity" "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw=="
+  "resolved" "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz"
+  "version" "6.2.1"
   dependencies:
-    acorn "^7.1.1"
-    acorn-jsx "^5.2.0"
-    eslint-visitor-keys "^1.1.0"
+    "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.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
-  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
+"espree@^7.3.0", "espree@^7.3.1":
+  "integrity" "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g=="
+  "resolved" "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz"
+  "version" "7.3.1"
   dependencies:
-    acorn "^7.4.0"
-    acorn-jsx "^5.3.1"
-    eslint-visitor-keys "^1.3.0"
+    "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.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+"esprima@^4.0.0":
+  "integrity" "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+  "resolved" "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"
+  "version" "4.0.1"
 
-esquery@^1.0.1, esquery@^1.4.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.7.0.tgz#08d048f261f0ddedb5bae95f46809463d9c9496d"
-  integrity sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==
+"esquery@^1.0.1", "esquery@^1.4.0":
+  "integrity" "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg=="
+  "resolved" "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz"
+  "version" "1.5.0"
   dependencies:
-    estraverse "^5.1.0"
+    "estraverse" "^5.1.0"
 
-esrecurse@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
-  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
+"esrecurse@^4.3.0":
+  "integrity" "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="
+  "resolved" "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"
+  "version" "4.3.0"
   dependencies:
-    estraverse "^5.2.0"
+    "estraverse" "^5.2.0"
 
-estraverse@^4.1.1:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
-  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+"estraverse@^4.1.1":
+  "integrity" "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
+  "resolved" "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"
+  "version" "4.3.0"
 
-estraverse@^5.1.0, estraverse@^5.2.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
-  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
+"estraverse@^5.1.0":
+  "integrity" "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
+  "resolved" "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
+  "version" "5.3.0"
 
-estree-walker@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
-  integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
+"estraverse@^5.2.0":
+  "integrity" "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
+  "resolved" "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
+  "version" "5.3.0"
 
-estree-walker@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
-  integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
+"estree-walker@^1.0.1":
+  "integrity" "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="
+  "resolved" "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz"
+  "version" "1.0.1"
 
-esutils@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
-  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+"estree-walker@^2.0.1":
+  "integrity" "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
+  "resolved" "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz"
+  "version" "2.0.2"
 
-events-universal@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/events-universal/-/events-universal-1.0.1.tgz#b56a84fd611b6610e0a2d0f09f80fdf931e2dfe6"
-  integrity sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==
+"esutils@^2.0.2":
+  "integrity" "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
+  "resolved" "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
+  "version" "2.0.3"
+
+"expand-tilde@^2.0.0", "expand-tilde@^2.0.2":
+  "integrity" "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw=="
+  "resolved" "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"
+  "version" "2.0.2"
   dependencies:
-    bare-events "^2.7.0"
+    "homedir-polyfill" "^1.0.1"
 
-expand-tilde@^2.0.0, expand-tilde@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
-  integrity sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==
+"extend-shallow@^1.1.2":
+  "integrity" "sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw=="
+  "resolved" "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz"
+  "version" "1.1.4"
   dependencies:
-    homedir-polyfill "^1.0.1"
+    "kind-of" "^1.1.0"
 
-extend-shallow@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071"
-  integrity sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw==
+"extend-shallow@^3.0.2":
+  "integrity" "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q=="
+  "resolved" "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"
+  "version" "3.0.2"
   dependencies:
-    kind-of "^1.1.0"
+    "assign-symbols" "^1.0.0"
+    "is-extendable" "^1.0.1"
 
-extend-shallow@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==
+"extend@^3.0.2":
+  "integrity" "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+  "resolved" "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"
+  "version" "3.0.2"
+
+"external-editor@^3.0.3":
+  "integrity" "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="
+  "resolved" "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
-    assign-symbols "^1.0.0"
-    is-extendable "^1.0.1"
+    "chardet" "^0.7.0"
+    "iconv-lite" "^0.4.24"
+    "tmp" "^0.0.33"
 
-extend@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-external-editor@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
-  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
+"fancy-log@^1.3.2", "fancy-log@^1.3.3":
+  "integrity" "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw=="
+  "resolved" "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz"
+  "version" "1.3.3"
   dependencies:
-    chardet "^0.7.0"
-    iconv-lite "^0.4.24"
-    tmp "^0.0.33"
+    "ansi-gray" "^0.1.1"
+    "color-support" "^1.1.3"
+    "parse-node-version" "^1.0.0"
+    "time-stamp" "^1.0.0"
 
-fancy-log@^1.3.2, fancy-log@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
-  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":
+  "integrity" "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+  "resolved" "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
+  "version" "3.1.3"
 
-fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+"fast-fifo@^1.3.2":
+  "integrity" "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ=="
+  "resolved" "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz"
+  "version" "1.3.2"
 
-fast-fifo@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c"
-  integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==
-
-fast-glob@^3.2.9:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.3.tgz#d06d585ce8dba90a16b0505c543c3ccfb3aeb818"
-  integrity sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==
+"fast-glob@^3.2.9":
+  "integrity" "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow=="
+  "resolved" "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz"
+  "version" "3.3.2"
   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.8"
+    "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.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+"fast-json-stable-stringify@^2.0.0":
+  "integrity" "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+  "resolved" "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
+  "version" "2.1.0"
 
-fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
+"fast-levenshtein@^2.0.6", "fast-levenshtein@~2.0.6":
+  "integrity" "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
+  "resolved" "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
+  "version" "2.0.6"
 
-fast-levenshtein@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-3.0.0.tgz#37b899ae47e1090e40e3fd2318e4d5f0142ca912"
-  integrity sha512-hKKNajm46uNmTlhHSyZkmToAc56uZJwYq7yrciZjqOxnlfQwERDQJmHPUp7m1m9wx8vgOe8IaCKZ5Kv2k1DdCQ==
+"fast-levenshtein@^3.0.0":
+  "integrity" "sha512-hKKNajm46uNmTlhHSyZkmToAc56uZJwYq7yrciZjqOxnlfQwERDQJmHPUp7m1m9wx8vgOe8IaCKZ5Kv2k1DdCQ=="
+  "resolved" "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    fastest-levenshtein "^1.0.7"
+    "fastest-levenshtein" "^1.0.7"
 
-fast-uri@^3.0.1:
-  version "3.1.9"
-  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.1.9.tgz#f1deba822b1d6ac79da2f860e872a63470cff203"
-  integrity sha512-hS/0Wt3Ya043oKXs0sIxrMpKQITXhMLIrVAKKXi4gozGC9v7YRWVnXIZzjNPTO02M9BdxLCWqK1yRXgNziVyJQ==
+"fastest-levenshtein@^1.0.7":
+  "integrity" "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg=="
+  "resolved" "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz"
+  "version" "1.0.16"
 
-fastest-levenshtein@^1.0.7:
-  version "1.0.16"
-  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
-  integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
-
-fastq@^1.13.0, fastq@^1.6.0:
-  version "1.20.3"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.20.3.tgz#7ab8731e647b56abcfeee997dae333ca3ee1d04d"
-  integrity sha512-XKv5nnLs6nLF71NgiKJLIZFLkPyIEuOselLG7ujZnGrRfQK8HpvY+WqKhAJUAdLomwVHErVS4LfxFlPq0/FTAw==
+"fastq@^1.13.0", "fastq@^1.6.0":
+  "integrity" "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w=="
+  "resolved" "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz"
+  "version" "1.17.1"
   dependencies:
-    reusify "^1.0.4"
+    "reusify" "^1.0.4"
 
-figures@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
-  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
+"figures@^3.0.0":
+  "integrity" "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg=="
+  "resolved" "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz"
+  "version" "3.2.0"
   dependencies:
-    escape-string-regexp "^1.0.5"
+    "escape-string-regexp" "^1.0.5"
 
-file-entry-cache@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
-  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
+"file-entry-cache@^5.0.1":
+  "integrity" "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g=="
+  "resolved" "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz"
+  "version" "5.0.1"
   dependencies:
-    flat-cache "^2.0.1"
+    "flat-cache" "^2.0.1"
 
-file-entry-cache@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
-  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
+"file-entry-cache@^6.0.1":
+  "integrity" "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="
+  "resolved" "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"
+  "version" "6.0.1"
   dependencies:
-    flat-cache "^3.0.4"
+    "flat-cache" "^3.0.4"
 
-fill-range@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
-  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
+"fill-range@^7.1.1":
+  "integrity" "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg=="
+  "resolved" "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz"
+  "version" "7.1.1"
   dependencies:
-    to-regex-range "^5.0.1"
+    "to-regex-range" "^5.0.1"
 
-findup-sync@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-5.0.0.tgz#54380ad965a7edca00cc8f63113559aadc541bd2"
-  integrity sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==
+"findup-sync@^5.0.0":
+  "integrity" "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ=="
+  "resolved" "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz"
+  "version" "5.0.0"
   dependencies:
-    detect-file "^1.0.0"
-    is-glob "^4.0.3"
-    micromatch "^4.0.4"
-    resolve-dir "^1.0.1"
+    "detect-file" "^1.0.0"
+    "is-glob" "^4.0.3"
+    "micromatch" "^4.0.4"
+    "resolve-dir" "^1.0.1"
 
-fined@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fined/-/fined-2.0.0.tgz#6846563ed96879ce6de6c85c715c42250f8d8089"
-  integrity sha512-OFRzsL6ZMHz5s0JrsEr+TpdGNCtrVtnuG3x1yzGNiQHT0yaDnXAj8V/lWcpJVrnoDpcwXcASxAZYbuXda2Y82A==
+"fined@^2.0.0":
+  "integrity" "sha512-OFRzsL6ZMHz5s0JrsEr+TpdGNCtrVtnuG3x1yzGNiQHT0yaDnXAj8V/lWcpJVrnoDpcwXcASxAZYbuXda2Y82A=="
+  "resolved" "https://registry.npmjs.org/fined/-/fined-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    expand-tilde "^2.0.2"
-    is-plain-object "^5.0.0"
-    object.defaults "^1.1.0"
-    object.pick "^1.3.0"
-    parse-filepath "^1.0.2"
+    "expand-tilde" "^2.0.2"
+    "is-plain-object" "^5.0.0"
+    "object.defaults" "^1.1.0"
+    "object.pick" "^1.3.0"
+    "parse-filepath" "^1.0.2"
 
-flagged-respawn@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-2.0.0.tgz#abf39719dcfe1ac06c86c9466081c541c682987b"
-  integrity sha512-Gq/a6YCi8zexmGHMuJwahTGzXlAZAOsbCVKduWXC6TlLCjjFRlExMJc4GC2NYPYZ0r/brw9P7CpRgQmlPVeOoA==
+"flagged-respawn@^2.0.0":
+  "integrity" "sha512-Gq/a6YCi8zexmGHMuJwahTGzXlAZAOsbCVKduWXC6TlLCjjFRlExMJc4GC2NYPYZ0r/brw9P7CpRgQmlPVeOoA=="
+  "resolved" "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-2.0.0.tgz"
+  "version" "2.0.0"
 
-flat-cache@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
-  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
+"flat-cache@^2.0.1":
+  "integrity" "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA=="
+  "resolved" "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    flatted "^2.0.0"
-    rimraf "2.6.3"
-    write "1.0.3"
+    "flatted" "^2.0.0"
+    "rimraf" "2.6.3"
+    "write" "1.0.3"
 
-flat-cache@^3.0.4:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
-  integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
+"flat-cache@^3.0.4":
+  "integrity" "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw=="
+  "resolved" "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz"
+  "version" "3.2.0"
   dependencies:
-    flatted "^3.2.9"
-    keyv "^4.5.3"
-    rimraf "^3.0.2"
+    "flatted" "^3.2.9"
+    "keyv" "^4.5.3"
+    "rimraf" "^3.0.2"
 
-flatted@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
-  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
+"flatted@^2.0.0":
+  "integrity" "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="
+  "resolved" "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz"
+  "version" "2.0.2"
 
-flatted@^3.2.9:
-  version "3.4.4"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.4.4.tgz#aeeca2a506303f0cee61c59e6c9f2a88d2f29fc6"
-  integrity sha512-5+ybhBZANEJxaH3X5evAFatUxLfEHSr7n6kYJ+1Qd0mUqr4eu9gIf6GDbWHf8RJijHrjjO8G+la14SlL2SeS1Q==
+"flatted@^3.2.9":
+  "integrity" "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw=="
+  "resolved" "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz"
+  "version" "3.3.1"
 
-for-in@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==
+"for-in@^1.0.1":
+  "integrity" "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ=="
+  "resolved" "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"
+  "version" "1.0.2"
 
-for-own@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
-  integrity sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==
+"for-own@^1.0.0":
+  "integrity" "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg=="
+  "resolved" "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz"
+  "version" "1.0.0"
   dependencies:
-    for-in "^1.0.1"
+    "for-in" "^1.0.1"
 
-fs-mkdirp-stream@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-2.0.1.tgz#1e82575c4023929ad35cf69269f84f1a8c973aa7"
-  integrity sha512-UTOY+59K6IA94tec8Wjqm0FSh5OVudGNB0NL/P6fB3HiE3bYOY3VYBGijsnOHNkQSwC1FKkU77pmq7xp9CskLw==
+"fs-mkdirp-stream@^2.0.1":
+  "integrity" "sha512-UTOY+59K6IA94tec8Wjqm0FSh5OVudGNB0NL/P6fB3HiE3bYOY3VYBGijsnOHNkQSwC1FKkU77pmq7xp9CskLw=="
+  "resolved" "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-2.0.1.tgz"
+  "version" "2.0.1"
   dependencies:
-    graceful-fs "^4.2.8"
-    streamx "^2.12.0"
+    "graceful-fs" "^4.2.8"
+    "streamx" "^2.12.0"
 
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
+"fs.realpath@^1.0.0":
+  "integrity" "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+  "resolved" "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
+  "version" "1.0.0"
 
-fsevents@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
-  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+"function-bind@^1.1.2":
+  "integrity" "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+  "resolved" "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz"
+  "version" "1.1.2"
 
-function-bind@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
-  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
+"functional-red-black-tree@^1.0.1":
+  "integrity" "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="
+  "resolved" "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"
+  "version" "1.0.1"
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
+"get-caller-file@^2.0.5":
+  "integrity" "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
+  "resolved" "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"
+  "version" "2.0.5"
 
-get-caller-file@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-
-glob-parent@^5.0.0, glob-parent@^5.1.2, glob-parent@~5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+"glob-parent@^5.0.0", "glob-parent@^5.1.2", "glob-parent@~5.1.2":
+  "integrity" "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="
+  "resolved" "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
+  "version" "5.1.2"
   dependencies:
-    is-glob "^4.0.1"
+    "is-glob" "^4.0.1"
 
-glob-parent@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
-  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+"glob-parent@^6.0.2":
+  "integrity" "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="
+  "resolved" "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz"
+  "version" "6.0.2"
   dependencies:
-    is-glob "^4.0.3"
+    "is-glob" "^4.0.3"
 
-glob-stream@^8.0.3:
-  version "8.0.4"
-  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-8.0.4.tgz#32f8c8c07903f755e4946c05cc3ca8e2a10f04b3"
-  integrity sha512-7uzFVQ1ZUBr0nYexxubOvocZXQ4HcHv6WO3TOiYUPaCda7BASuKgOw/NB4Pc9gHM3tK0Jrekq7el8pKhb8kx5w==
+"glob-stream@^8.0.0":
+  "integrity" "sha512-R8z6eTB55t3QeZMmU1C+Gv+t5UnNRkA55c5yo67fAVfxODxieTwsjNG7utxS/73NdP1NbDgCrhVEg2h00y4fFw=="
+  "resolved" "https://registry.npmjs.org/glob-stream/-/glob-stream-8.0.2.tgz"
+  "version" "8.0.2"
   dependencies:
     "@gulpjs/to-absolute-glob" "^4.0.0"
-    anymatch "^3.1.3"
-    fastq "^1.13.0"
-    glob-parent "^6.0.2"
-    is-glob "^4.0.3"
-    is-negated-glob "^1.0.0"
-    normalize-path "^3.0.0"
-    streamx "^2.12.5"
+    "anymatch" "^3.1.3"
+    "fastq" "^1.13.0"
+    "glob-parent" "^6.0.2"
+    "is-glob" "^4.0.3"
+    "is-negated-glob" "^1.0.0"
+    "normalize-path" "^3.0.0"
+    "streamx" "^2.12.5"
 
-glob-watcher@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-6.0.0.tgz#8565341978a92233fb3881b8857b4d1e9c6bf080"
-  integrity sha512-wGM28Ehmcnk2NqRORXFOTOR064L4imSw3EeOqU5bIwUf62eXGwg89WivH6VMahL8zlQHeodzvHpXplrqzrz3Nw==
+"glob-watcher@^6.0.0":
+  "integrity" "sha512-wGM28Ehmcnk2NqRORXFOTOR064L4imSw3EeOqU5bIwUf62eXGwg89WivH6VMahL8zlQHeodzvHpXplrqzrz3Nw=="
+  "resolved" "https://registry.npmjs.org/glob-watcher/-/glob-watcher-6.0.0.tgz"
+  "version" "6.0.0"
   dependencies:
-    async-done "^2.0.0"
-    chokidar "^3.5.3"
+    "async-done" "^2.0.0"
+    "chokidar" "^3.5.3"
 
-glob@^7.1.3:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+"glob@^7.1.3":
+  "integrity" "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="
+  "resolved" "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
+  "version" "7.2.3"
   dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
+    "fs.realpath" "^1.0.0"
+    "inflight" "^1.0.4"
+    "inherits" "2"
+    "minimatch" "^3.1.1"
+    "once" "^1.3.0"
+    "path-is-absolute" "^1.0.0"
 
-global-modules@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
-  integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
+"global-modules@^1.0.0":
+  "integrity" "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg=="
+  "resolved" "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"
+  "version" "1.0.0"
   dependencies:
-    global-prefix "^1.0.1"
-    is-windows "^1.0.1"
-    resolve-dir "^1.0.0"
+    "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.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
-  integrity sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==
+"global-prefix@^1.0.1":
+  "integrity" "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg=="
+  "resolved" "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    expand-tilde "^2.0.2"
-    homedir-polyfill "^1.0.1"
-    ini "^1.3.4"
-    is-windows "^1.0.1"
-    which "^1.2.14"
+    "expand-tilde" "^2.0.2"
+    "homedir-polyfill" "^1.0.1"
+    "ini" "^1.3.4"
+    "is-windows" "^1.0.1"
+    "which" "^1.2.14"
 
-globals@^12.1.0:
-  version "12.4.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
-  integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
+"globals@^11.1.0":
+  "integrity" "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
+  "resolved" "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
+  "version" "11.12.0"
+
+"globals@^12.1.0":
+  "integrity" "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="
+  "resolved" "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz"
+  "version" "12.4.0"
   dependencies:
-    type-fest "^0.8.1"
+    "type-fest" "^0.8.1"
 
-globals@^13.6.0, globals@^13.9.0:
-  version "13.24.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
-  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
+"globals@^13.6.0":
+  "integrity" "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ=="
+  "resolved" "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz"
+  "version" "13.24.0"
   dependencies:
-    type-fest "^0.20.2"
+    "type-fest" "^0.20.2"
 
-globby@^11.0.1:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
-  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
+"globals@^13.9.0":
+  "integrity" "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ=="
+  "resolved" "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz"
+  "version" "13.24.0"
   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"
+    "type-fest" "^0.20.2"
 
-glogg@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/glogg/-/glogg-2.2.0.tgz#956ceb855a05a2aa1fa668d748f2be8e7361c11c"
-  integrity sha512-eWv1ds/zAlz+M1ioHsyKJomfY7jbDDPpwSkv14KQj89bycx1nvK5/2Cj/T9g7kzJcX5Bc7Yv22FjfBZS/jl94A==
+"globby@^11.0.1":
+  "integrity" "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="
+  "resolved" "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"
+  "version" "11.1.0"
   dependencies:
-    sparkles "^2.1.0"
+    "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"
 
-graceful-fs@^4.1.2, graceful-fs@^4.2.10, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.8:
-  version "4.2.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
-  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
-
-group-css-media-queries@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/group-css-media-queries/-/group-css-media-queries-1.4.1.tgz#8e54cb31cc45a9c5e08eb838940b8a28038d7175"
-  integrity sha512-i7GUeETF5bLjrVZCrz1ZwtJdfi3XnPe6UWgTufKDuetBi4V1HDfvY1La5DAqeJzBqOz6DXipRqtK5UYeYzCNpA==
+"glogg@^2.2.0":
+  "integrity" "sha512-eWv1ds/zAlz+M1ioHsyKJomfY7jbDDPpwSkv14KQj89bycx1nvK5/2Cj/T9g7kzJcX5Bc7Yv22FjfBZS/jl94A=="
+  "resolved" "https://registry.npmjs.org/glogg/-/glogg-2.2.0.tgz"
+  "version" "2.2.0"
   dependencies:
-    css-parse "^2.0.0"
-    css-stringify "^2.0.0"
+    "sparkles" "^2.1.0"
 
-gulp-append-prepend@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/gulp-append-prepend/-/gulp-append-prepend-1.0.9.tgz#e2732a36b2019356718966013e681c8ba57d3675"
-  integrity sha512-IUHAd9NHNpQWj0dA8GTEkgUlrgEhTZVe5T6AuEAAMlMSIMdxDZlCQj7zSKDL69nMJpsvgtgosAG4+n6zlhv27Q==
+"graceful-fs@^4.1.2", "graceful-fs@^4.2.10", "graceful-fs@^4.2.11", "graceful-fs@^4.2.4", "graceful-fs@^4.2.8":
+  "integrity" "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+  "resolved" "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz"
+  "version" "4.2.11"
+
+"group-css-media-queries@^1.4.1":
+  "integrity" "sha512-i7GUeETF5bLjrVZCrz1ZwtJdfi3XnPe6UWgTufKDuetBi4V1HDfvY1La5DAqeJzBqOz6DXipRqtK5UYeYzCNpA=="
+  "resolved" "https://registry.npmjs.org/group-css-media-queries/-/group-css-media-queries-1.4.1.tgz"
+  "version" "1.4.1"
   dependencies:
-    plugin-error "^1.0.1"
-    read-file "^0.2.0"
-    through2 "^2.0.1"
+    "css-parse" "^2.0.0"
+    "css-stringify" "^2.0.0"
 
-gulp-cached@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/gulp-cached/-/gulp-cached-1.1.1.tgz#fe7cd4f87f37601e6073cfedee5c2bdaf8b6acce"
-  integrity sha512-OEGsICR6Vmx0VK3nhpy5MGPzAjeDYC3+NKxNtJAu4DW8L15oy8tCe2WuD6HDEj9BsbSopnOBiXPK95YHvO0DpA==
+"gulp-append-prepend@^1.0.9":
+  "integrity" "sha512-IUHAd9NHNpQWj0dA8GTEkgUlrgEhTZVe5T6AuEAAMlMSIMdxDZlCQj7zSKDL69nMJpsvgtgosAG4+n6zlhv27Q=="
+  "resolved" "https://registry.npmjs.org/gulp-append-prepend/-/gulp-append-prepend-1.0.9.tgz"
+  "version" "1.0.9"
   dependencies:
-    lodash.defaults "^4.2.0"
-    through2 "^2.0.1"
+    "plugin-error" "^1.0.1"
+    "read-file" "^0.2.0"
+    "through2" "^2.0.1"
 
-gulp-clean-css@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/gulp-clean-css/-/gulp-clean-css-4.3.0.tgz#5b1e73f2fca46703eb636014cdd4553cea65146d"
-  integrity sha512-mGyeT3qqFXTy61j0zOIciS4MkYziF2U594t2Vs9rUnpkEHqfu6aDITMp8xOvZcvdX61Uz3y1mVERRYmjzQF5fg==
+"gulp-cached@^1.1.1":
+  "integrity" "sha512-OEGsICR6Vmx0VK3nhpy5MGPzAjeDYC3+NKxNtJAu4DW8L15oy8tCe2WuD6HDEj9BsbSopnOBiXPK95YHvO0DpA=="
+  "resolved" "https://registry.npmjs.org/gulp-cached/-/gulp-cached-1.1.1.tgz"
+  "version" "1.1.1"
   dependencies:
-    clean-css "4.2.3"
-    plugin-error "1.0.1"
-    through2 "3.0.1"
-    vinyl-sourcemaps-apply "0.2.1"
+    "lodash.defaults" "^4.2.0"
+    "through2" "^2.0.1"
 
-gulp-cli@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-3.1.0.tgz#92590e9b209142b176c95ad5c7066d2592017268"
-  integrity sha512-zZzwlmEsTfXcxRKiCHsdyjZZnFvXWM4v1NqBJSYbuApkvVKivjcmOS2qruAJ+PkEHLFavcDKH40DPc1+t12a9Q==
+"gulp-clean-css@^4.3.0":
+  "integrity" "sha512-mGyeT3qqFXTy61j0zOIciS4MkYziF2U594t2Vs9rUnpkEHqfu6aDITMp8xOvZcvdX61Uz3y1mVERRYmjzQF5fg=="
+  "resolved" "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-4.3.0.tgz"
+  "version" "4.3.0"
+  dependencies:
+    "clean-css" "4.2.3"
+    "plugin-error" "1.0.1"
+    "through2" "3.0.1"
+    "vinyl-sourcemaps-apply" "0.2.1"
+
+"gulp-cli@^3.0.0":
+  "integrity" "sha512-RtMIitkT8DEMZZygHK2vEuLPqLPAFB4sntSxg4NoDta7ciwGZ18l7JuhCTiS5deOJi2IoK0btE+hs6R4sfj7AA=="
+  "resolved" "https://registry.npmjs.org/gulp-cli/-/gulp-cli-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
     "@gulpjs/messages" "^1.1.0"
-    chalk "^4.1.2"
-    copy-props "^4.0.0"
-    gulplog "^2.2.0"
-    interpret "^3.1.1"
-    liftoff "^5.0.1"
-    mute-stdout "^2.0.0"
-    replace-homedir "^2.0.0"
-    semver-greatest-satisfied-range "^2.0.0"
-    string-width "^4.2.3"
-    v8flags "^4.0.0"
-    yargs "^16.2.0"
+    "chalk" "^4.1.2"
+    "copy-props" "^4.0.0"
+    "gulplog" "^2.2.0"
+    "interpret" "^3.1.1"
+    "liftoff" "^5.0.0"
+    "mute-stdout" "^2.0.0"
+    "replace-homedir" "^2.0.0"
+    "semver-greatest-satisfied-range" "^2.0.0"
+    "string-width" "^4.2.3"
+    "v8flags" "^4.0.0"
+    "yargs" "^16.2.0"
 
-gulp-concat@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/gulp-concat/-/gulp-concat-2.6.1.tgz#633d16c95d88504628ad02665663cee5a4793353"
-  integrity sha512-a2scActrQrDBpBbR3WUZGyGS1JEPLg5PZJdIa7/Bi3GuKAmPYDK6SFhy/NZq5R8KsKKFvtfR0fakbUCcKGCCjg==
+"gulp-concat@^2.6.1":
+  "integrity" "sha512-a2scActrQrDBpBbR3WUZGyGS1JEPLg5PZJdIa7/Bi3GuKAmPYDK6SFhy/NZq5R8KsKKFvtfR0fakbUCcKGCCjg=="
+  "resolved" "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz"
+  "version" "2.6.1"
   dependencies:
-    concat-with-sourcemaps "^1.0.0"
-    through2 "^2.0.0"
-    vinyl "^2.0.0"
+    "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.yarnpkg.com/gulp-eol/-/gulp-eol-0.2.0.tgz#f0afe3bbffedbe9d191a76ac2dfbfa2167e9d33e"
-  integrity sha512-YaUQld+7A3h1iOHs7XTdEboYUg8GjA+3DmWtgvZ9sb1r0tDpB27cTtgaoD83oTm9Mp2Hmwge6AQMqPxwUjQ/xA==
+"gulp-eol@^0.2.0":
+  "integrity" "sha512-YaUQld+7A3h1iOHs7XTdEboYUg8GjA+3DmWtgvZ9sb1r0tDpB27cTtgaoD83oTm9Mp2Hmwge6AQMqPxwUjQ/xA=="
+  "resolved" "https://registry.npmjs.org/gulp-eol/-/gulp-eol-0.2.0.tgz"
+  "version" "0.2.0"
   dependencies:
-    plugin-error "~1.0"
-    through2 "~0.4"
+    "plugin-error" "~1.0"
+    "through2" "~0.4"
 
-gulp-eslint@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/gulp-eslint/-/gulp-eslint-6.0.0.tgz#7d402bb45f8a67652b868277011812057370a832"
-  integrity sha512-dCVPSh1sA+UVhn7JSQt7KEb4An2sQNbOdB3PA8UCfxsoPlAKjJHxYHGXdXC7eb+V1FAnilSFFqslPrq037l1ig==
+"gulp-eslint@^6.0.0":
+  "integrity" "sha512-dCVPSh1sA+UVhn7JSQt7KEb4An2sQNbOdB3PA8UCfxsoPlAKjJHxYHGXdXC7eb+V1FAnilSFFqslPrq037l1ig=="
+  "resolved" "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-6.0.0.tgz"
+  "version" "6.0.0"
   dependencies:
-    eslint "^6.0.0"
-    fancy-log "^1.3.2"
-    plugin-error "^1.0.1"
+    "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.yarnpkg.com/gulp-expect-file/-/gulp-expect-file-2.0.0.tgz#4715365d9e2ca12d40d06dda0b227251e3e055f2"
-  integrity sha512-VLBvmSoF85dQ71tQngx1GfAcJ0s9g50dcjrlX4eyZbF9sAEoGU8F04JtXXU6rBcGDAHXUs4+n1HUs0lgHKyW1Q==
+"gulp-expect-file@^2.0.0":
+  "integrity" "sha512-VLBvmSoF85dQ71tQngx1GfAcJ0s9g50dcjrlX4eyZbF9sAEoGU8F04JtXXU6rBcGDAHXUs4+n1HUs0lgHKyW1Q=="
+  "resolved" "https://registry.npmjs.org/gulp-expect-file/-/gulp-expect-file-2.0.0.tgz"
+  "version" "2.0.0"
   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"
+    "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@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/gulp-filter/-/gulp-filter-6.0.0.tgz#9d69a408f1a9f60534264fb14464841f1b1746c2"
-  integrity sha512-veQFW93kf6jBdWdF/RxMEIlDK2mkjHyPftM381DID2C9ImTVngwYpyyThxm4/EpgcNOT37BLefzMOjEKbyYg0Q==
+"gulp-filter@^6.0.0":
+  "integrity" "sha512-veQFW93kf6jBdWdF/RxMEIlDK2mkjHyPftM381DID2C9ImTVngwYpyyThxm4/EpgcNOT37BLefzMOjEKbyYg0Q=="
+  "resolved" "https://registry.npmjs.org/gulp-filter/-/gulp-filter-6.0.0.tgz"
+  "version" "6.0.0"
   dependencies:
-    multimatch "^4.0.0"
-    plugin-error "^1.0.1"
-    streamfilter "^3.0.0"
+    "multimatch" "^4.0.0"
+    "plugin-error" "^1.0.1"
+    "streamfilter" "^3.0.0"
 
-gulp-group-css-media-queries@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/gulp-group-css-media-queries/-/gulp-group-css-media-queries-1.2.2.tgz#c0436b9474086cbe1ab3eb5bc1a3afef4d6b37d6"
-  integrity sha512-uOs8aJ5TV12aRstfc6pn107edDT2XSY7KNAU721Dz+gKHu/AUIlAaOdFdo9n/eHWqfb9QWMArrM8fiPOCqZPGg==
+"gulp-group-css-media-queries@^1.2.2":
+  "integrity" "sha512-uOs8aJ5TV12aRstfc6pn107edDT2XSY7KNAU721Dz+gKHu/AUIlAaOdFdo9n/eHWqfb9QWMArrM8fiPOCqZPGg=="
+  "resolved" "https://registry.npmjs.org/gulp-group-css-media-queries/-/gulp-group-css-media-queries-1.2.2.tgz"
+  "version" "1.2.2"
   dependencies:
-    group-css-media-queries "^1.4.1"
-    plugin-error "^1.0.1"
-    through2 "^2.0.3"
+    "group-css-media-queries" "^1.4.1"
+    "plugin-error" "^1.0.1"
+    "through2" "^2.0.3"
 
-gulp-less@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/gulp-less/-/gulp-less-5.0.0.tgz#edafce75e9202fd62c9f653fb57b8d0d9fd731e5"
-  integrity sha512-W2I3TewO/By6UZsM/wJG3pyK5M6J0NYmJAAhwYXQHR+38S0iDtZasmUgFCH3CQj+pQYw/PAIzxvFvwtEXz1HhQ==
+"gulp-less@^5.0.0":
+  "integrity" "sha512-W2I3TewO/By6UZsM/wJG3pyK5M6J0NYmJAAhwYXQHR+38S0iDtZasmUgFCH3CQj+pQYw/PAIzxvFvwtEXz1HhQ=="
+  "resolved" "https://registry.npmjs.org/gulp-less/-/gulp-less-5.0.0.tgz"
+  "version" "5.0.0"
   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"
+    "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.1.0"
-  resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-2.1.0.tgz#3a9900f81f3a8338409ea5ea542affc25080d9f4"
-  integrity sha512-dGuzuH8jQGqCMqC544IEPhs5+O2l+IkdoSZsgd4kY97M1CxQeI3qrmweQBIrxLBbjbe/8uEWK8HHcNBc3OCy4g==
+"gulp-rename@^2.0.0":
+  "integrity" "sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ=="
+  "resolved" "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz"
+  "version" "2.0.0"
 
-gulp-replace@^1.1.3:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/gulp-replace/-/gulp-replace-1.1.4.tgz#06a0e9ee36f30e343c1e0a2dd760ec32c8a3d3b2"
-  integrity sha512-SVSF7ikuWKhpAW4l4wapAqPPSToJoiNKsbDoUnRrSgwZHH7lH8pbPeQj1aOVYQrbZKhfSVBxVW+Py7vtulRktw==
+"gulp-replace@^1.1.3":
+  "integrity" "sha512-SVSF7ikuWKhpAW4l4wapAqPPSToJoiNKsbDoUnRrSgwZHH7lH8pbPeQj1aOVYQrbZKhfSVBxVW+Py7vtulRktw=="
+  "resolved" "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.1.4.tgz"
+  "version" "1.1.4"
   dependencies:
     "@types/node" "*"
     "@types/vinyl" "^2.0.4"
-    istextorbinary "^3.0.0"
-    replacestream "^4.0.3"
-    yargs-parser ">=5.0.0-security.0"
+    "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.yarnpkg.com/gulp-rollup-2/-/gulp-rollup-2-1.3.1.tgz#bbe1a8725ccaa4fc270627b298d1072d960fbe0c"
-  integrity sha512-sKkHsbhmcFBorQ3AHUME8Kifj3Ud7d6BwUMntCigolJQxzbXH8Ja688WRc3dolSlcp31cIWTtJf9r+090gC+Ew==
+"gulp-rollup-2@^1.2.1":
+  "integrity" "sha512-sKkHsbhmcFBorQ3AHUME8Kifj3Ud7d6BwUMntCigolJQxzbXH8Ja688WRc3dolSlcp31cIWTtJf9r+090gC+Ew=="
+  "resolved" "https://registry.npmjs.org/gulp-rollup-2/-/gulp-rollup-2-1.3.1.tgz"
+  "version" "1.3.1"
   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"
+    "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@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/gulp-size/-/gulp-size-3.0.0.tgz#cb1ac8e6ba83dede52430c47fd039324f003ff82"
-  integrity sha512-FbTYVVjp0Fcx19M7s/e84Kp35rrbRZLAfLR6XUM9Z04/uxv089vbcN9CwaSmC2tI+awfVx2xfiRcIlnmsxyQBg==
+"gulp-size@^3.0.0":
+  "integrity" "sha512-FbTYVVjp0Fcx19M7s/e84Kp35rrbRZLAfLR6XUM9Z04/uxv089vbcN9CwaSmC2tI+awfVx2xfiRcIlnmsxyQBg=="
+  "resolved" "https://registry.npmjs.org/gulp-size/-/gulp-size-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    chalk "^2.3.0"
-    fancy-log "^1.3.2"
-    gzip-size "^4.1.0"
-    plugin-error "^0.1.2"
-    pretty-bytes "^4.0.2"
-    stream-counter "^1.0.0"
-    through2 "^2.0.0"
+    "chalk" "^2.3.0"
+    "fancy-log" "^1.3.2"
+    "gzip-size" "^4.1.0"
+    "plugin-error" "^0.1.2"
+    "pretty-bytes" "^4.0.2"
+    "stream-counter" "^1.0.0"
+    "through2" "^2.0.0"
 
-gulp-terser@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/gulp-terser/-/gulp-terser-2.1.0.tgz#149b693a1adbde922807b60b844bb7351dafbde1"
-  integrity sha512-lQ3+JUdHDVISAlUIUSZ/G9Dz/rBQHxOiYDQ70IVWFQeh4b33TC1MCIU+K18w07PS3rq/CVc34aQO4SUbdaNMPQ==
+"gulp-terser@^2.1.0":
+  "integrity" "sha512-lQ3+JUdHDVISAlUIUSZ/G9Dz/rBQHxOiYDQ70IVWFQeh4b33TC1MCIU+K18w07PS3rq/CVc34aQO4SUbdaNMPQ=="
+  "resolved" "https://registry.npmjs.org/gulp-terser/-/gulp-terser-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    plugin-error "^1.0.1"
-    terser "^5.9.0"
-    through2 "^4.0.2"
-    vinyl-sourcemaps-apply "^0.2.1"
+    "plugin-error" "^1.0.1"
+    "terser" "^5.9.0"
+    "through2" "^4.0.2"
+    "vinyl-sourcemaps-apply" "^0.2.1"
 
-gulp@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/gulp/-/gulp-5.0.1.tgz#c43f37aa34569e101fb6da4e0b464677305acd36"
-  integrity sha512-PErok3DZSA5WGMd6XXV3IRNO0mlB+wW3OzhFJLEec1jSERg2j1bxJ6e5Fh6N6fn3FH2T9AP4UYNb/pYlADB9sA==
+"gulp@^5.0.0":
+  "integrity" "sha512-S8Z8066SSileaYw1S2N1I64IUc/myI2bqe2ihOBzO6+nKpvNSg7ZcWJt/AwF8LC/NVN+/QZ560Cb/5OPsyhkhg=="
+  "resolved" "https://registry.npmjs.org/gulp/-/gulp-5.0.0.tgz"
+  "version" "5.0.0"
   dependencies:
-    glob-watcher "^6.0.0"
-    gulp-cli "^3.1.0"
-    undertaker "^2.0.0"
-    vinyl-fs "^4.0.2"
+    "glob-watcher" "^6.0.0"
+    "gulp-cli" "^3.0.0"
+    "undertaker" "^2.0.0"
+    "vinyl-fs" "^4.0.0"
 
-gulplog@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-2.2.0.tgz#71adf43ea5cd07c23ded0fb8af4a844b67c63be8"
-  integrity sha512-V2FaKiOhpR3DRXZuYdRLn/qiY0yI5XmqbTKrYbdemJ+xOh2d2MOweI/XFgMzd/9+1twdvMwllnZbWZNJ+BOm4A==
+"gulplog@^2.2.0":
+  "integrity" "sha512-V2FaKiOhpR3DRXZuYdRLn/qiY0yI5XmqbTKrYbdemJ+xOh2d2MOweI/XFgMzd/9+1twdvMwllnZbWZNJ+BOm4A=="
+  "resolved" "https://registry.npmjs.org/gulplog/-/gulplog-2.2.0.tgz"
+  "version" "2.2.0"
   dependencies:
-    glogg "^2.2.0"
+    "glogg" "^2.2.0"
 
-gzip-size@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-4.1.0.tgz#8ae096257eabe7d69c45be2b67c448124ffb517c"
-  integrity sha512-1g6EPVvIHuPmpAdBBpsIVYLgjzGV/QqcFRJXpMyrqEWG10JhOaTjQeCcjMDyX0Iqfm/Q5M9twR/mbDk5f5MqkA==
+"gzip-size@^4.1.0":
+  "integrity" "sha512-1g6EPVvIHuPmpAdBBpsIVYLgjzGV/QqcFRJXpMyrqEWG10JhOaTjQeCcjMDyX0Iqfm/Q5M9twR/mbDk5f5MqkA=="
+  "resolved" "https://registry.npmjs.org/gzip-size/-/gzip-size-4.1.0.tgz"
+  "version" "4.1.0"
   dependencies:
-    duplexer "^0.1.1"
-    pify "^3.0.0"
+    "duplexer" "^0.1.1"
+    "pify" "^3.0.0"
 
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
+"has-flag@^3.0.0":
+  "integrity" "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
+  "resolved" "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
+  "version" "3.0.0"
 
-has-flag@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
-  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+"has-flag@^4.0.0":
+  "integrity" "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+  "resolved" "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
+  "version" "4.0.0"
 
-hasown@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.4.tgz#8c62d8cb90beb2aad5d0a5b67581ad9854c3f003"
-  integrity sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==
+"hasown@^2.0.2":
+  "integrity" "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ=="
+  "resolved" "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz"
+  "version" "2.0.2"
   dependencies:
-    function-bind "^1.1.2"
+    "function-bind" "^1.1.2"
 
-homedir-polyfill@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
-  integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
+"homedir-polyfill@^1.0.1":
+  "integrity" "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="
+  "resolved" "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"
+  "version" "1.0.3"
   dependencies:
-    parse-passwd "^1.0.0"
+    "parse-passwd" "^1.0.0"
 
-iconv-lite@^0.4.24, iconv-lite@^0.4.4:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+"iconv-lite@^0.4.24":
+  "integrity" "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="
+  "resolved" "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"
+  "version" "0.4.24"
   dependencies:
-    safer-buffer ">= 2.1.2 < 3"
+    "safer-buffer" ">= 2.1.2 < 3"
 
-iconv-lite@^0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
-  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
+"iconv-lite@^0.6.3":
+  "integrity" "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="
+  "resolved" "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"
+  "version" "0.6.3"
   dependencies:
-    safer-buffer ">= 2.1.2 < 3.0.0"
+    "safer-buffer" ">= 2.1.2 < 3.0.0"
 
-ieee754@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
-  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+"ieee754@^1.2.1":
+  "integrity" "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
+  "resolved" "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"
+  "version" "1.2.1"
 
-ignore@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
+"ignore@^4.0.6":
+  "integrity" "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
+  "resolved" "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz"
+  "version" "4.0.6"
 
-ignore@^5.2.0:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
-  integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
+"ignore@^5.2.0":
+  "integrity" "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw=="
+  "resolved" "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz"
+  "version" "5.3.1"
 
-import-fresh@^3.0.0, import-fresh@^3.2.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.1.tgz#9cecb56503c0ada1f2741dbbd6546e4b13b57ccf"
-  integrity sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==
+"image-size@~0.5.0":
+  "integrity" "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ=="
+  "resolved" "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz"
+  "version" "0.5.5"
+
+"import-fresh@^3.0.0", "import-fresh@^3.2.1":
+  "integrity" "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="
+  "resolved" "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"
+  "version" "3.3.0"
   dependencies:
-    parent-module "^1.0.0"
-    resolve-from "^4.0.0"
+    "parent-module" "^1.0.0"
+    "resolve-from" "^4.0.0"
 
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
+"imurmurhash@^0.1.4":
+  "integrity" "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="
+  "resolved" "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
+  "version" "0.1.4"
 
-indent-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
-  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
+"indent-string@^4.0.0":
+  "integrity" "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="
+  "resolved" "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"
+  "version" "4.0.0"
 
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
+"inflight@^1.0.4":
+  "integrity" "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="
+  "resolved" "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
+  "version" "1.0.6"
   dependencies:
-    once "^1.3.0"
-    wrappy "1"
+    "once" "^1.3.0"
+    "wrappy" "1"
 
-inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+"inherits@^2.0.1", "inherits@^2.0.3", "inherits@^2.0.4", "inherits@~2.0.1", "inherits@~2.0.3", "inherits@2":
+  "integrity" "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+  "resolved" "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
+  "version" "2.0.4"
 
-ini@^1.3.4:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
-  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
+"ini@^1.3.4":
+  "integrity" "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+  "resolved" "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"
+  "version" "1.3.8"
 
-inquirer@^7.0.0:
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
-  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
+"inquirer@^7.0.0":
+  "integrity" "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="
+  "resolved" "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz"
+  "version" "7.3.3"
   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"
+    "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@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4"
-  integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==
+"interpret@^3.1.1":
+  "integrity" "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ=="
+  "resolved" "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz"
+  "version" "3.1.1"
 
-is-absolute@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
-  integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
+"is-absolute@^1.0.0":
+  "integrity" "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA=="
+  "resolved" "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz"
+  "version" "1.0.0"
   dependencies:
-    is-relative "^1.0.0"
-    is-windows "^1.0.1"
+    "is-relative" "^1.0.0"
+    "is-windows" "^1.0.1"
 
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+"is-binary-path@~2.1.0":
+  "integrity" "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="
+  "resolved" "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    binary-extensions "^2.0.0"
+    "binary-extensions" "^2.0.0"
 
-is-builtin-module@^3.1.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.1.tgz#f03271717d8654cfcaf07ab0463faa3571581169"
-  integrity sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==
+"is-builtin-module@^3.1.0":
+  "integrity" "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A=="
+  "resolved" "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz"
+  "version" "3.2.1"
   dependencies:
-    builtin-modules "^3.3.0"
+    "builtin-modules" "^3.3.0"
 
-is-core-module@^2.17.0:
-  version "2.17.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.17.0.tgz#75c1c76236c9f7e38ddbfff292e127dc13b21027"
-  integrity sha512-J/vG0zBCbIKOQFfufSwyXdMrsohyJIUNkrnmo6WZGzoM7tr/lsbfW5b2BvisL6zsyMzK9UxV9L6c7AoFbyXHOA==
+"is-core-module@^2.13.0":
+  "integrity" "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A=="
+  "resolved" "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz"
+  "version" "2.14.0"
   dependencies:
-    hasown "^2.0.4"
+    "hasown" "^2.0.2"
 
-is-extendable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
+"is-extendable@^1.0.1":
+  "integrity" "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="
+  "resolved" "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    is-plain-object "^2.0.4"
+    "is-plain-object" "^2.0.4"
 
-is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
+"is-extglob@^2.1.1":
+  "integrity" "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="
+  "resolved" "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
+  "version" "2.1.1"
 
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
+"is-fullwidth-code-point@^2.0.0":
+  "integrity" "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="
+  "resolved" "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"
+  "version" "2.0.0"
 
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+"is-fullwidth-code-point@^3.0.0":
+  "integrity" "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+  "resolved" "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
+  "version" "3.0.0"
 
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
-  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+"is-glob@^4.0.0", "is-glob@^4.0.1", "is-glob@^4.0.3", "is-glob@~4.0.1":
+  "integrity" "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="
+  "resolved" "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"
+  "version" "4.0.3"
   dependencies:
-    is-extglob "^2.1.1"
+    "is-extglob" "^2.1.1"
 
-is-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
-  integrity sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==
+"is-module@^1.0.0":
+  "integrity" "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g=="
+  "resolved" "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz"
+  "version" "1.0.0"
 
-is-negated-glob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
-  integrity sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==
+"is-negated-glob@^1.0.0":
+  "integrity" "sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug=="
+  "resolved" "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz"
+  "version" "1.0.0"
 
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+"is-number@^7.0.0":
+  "integrity" "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
+  "resolved" "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
+  "version" "7.0.0"
 
-is-path-cwd@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
-  integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
+"is-path-cwd@^2.2.0":
+  "integrity" "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="
+  "resolved" "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz"
+  "version" "2.2.0"
 
-is-path-inside@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
-  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+"is-path-inside@^3.0.2":
+  "integrity" "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="
+  "resolved" "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz"
+  "version" "3.0.3"
 
-is-plain-object@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
+"is-plain-object@^2.0.4":
+  "integrity" "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="
+  "resolved" "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"
+  "version" "2.0.4"
   dependencies:
-    isobject "^3.0.1"
+    "isobject" "^3.0.1"
 
-is-plain-object@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.1.0.tgz#22ed7b5e856bb57966348e5b9468dada42be87f4"
-  integrity sha512-bUi/yjmtKYcRVUtWRGr0UA6xEFh2I6zWUwMrUXB3s7bmYCaZ8a+0ZsTRkrawh/mzlSD1Y0Ph8bp/U+TvBpWDNw==
+"is-plain-object@^5.0.0":
+  "integrity" "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
+  "resolved" "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz"
+  "version" "5.0.0"
 
-is-reference@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7"
-  integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==
+"is-reference@^1.2.1":
+  "integrity" "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ=="
+  "resolved" "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz"
+  "version" "1.2.1"
   dependencies:
     "@types/estree" "*"
 
-is-relative@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
-  integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
+"is-relative@^1.0.0":
+  "integrity" "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA=="
+  "resolved" "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz"
+  "version" "1.0.0"
   dependencies:
-    is-unc-path "^1.0.0"
+    "is-unc-path" "^1.0.0"
 
-is-unc-path@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
-  integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
+"is-unc-path@^1.0.0":
+  "integrity" "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ=="
+  "resolved" "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz"
+  "version" "1.0.0"
   dependencies:
-    unc-path-regex "^0.1.2"
+    "unc-path-regex" "^0.1.2"
 
-is-valid-glob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa"
-  integrity sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==
+"is-valid-glob@^1.0.0":
+  "integrity" "sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA=="
+  "resolved" "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz"
+  "version" "1.0.0"
 
-is-what@^4.1.8:
-  version "4.1.16"
-  resolved "https://registry.yarnpkg.com/is-what/-/is-what-4.1.16.tgz#1ad860a19da8b4895ad5495da3182ce2acdd7a6f"
-  integrity sha512-ZhMwEosbFJkA0YhFnNDgTM4ZxDRsS6HqTo7qsZM08fehyRYIYa0yHu5R6mgo1n/8MgaPBXiPimPD77baVFYg+A==
+"is-what@^3.14.1":
+  "integrity" "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA=="
+  "resolved" "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz"
+  "version" "3.14.1"
 
-is-windows@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+"is-windows@^1.0.1":
+  "integrity" "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
+  "resolved" "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"
+  "version" "1.0.2"
 
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
+"isarray@~1.0.0":
+  "integrity" "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+  "resolved" "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+  "version" "1.0.0"
 
-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
+"isarray@0.0.1":
+  "integrity" "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
+  "resolved" "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+  "version" "0.0.1"
 
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
+"isexe@^2.0.0":
+  "integrity" "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+  "resolved" "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
+  "version" "2.0.0"
 
-isobject@^3.0.0, isobject@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
+"isobject@^3.0.0", "isobject@^3.0.1":
+  "integrity" "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
+  "resolved" "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"
+  "version" "3.0.1"
 
-istextorbinary@^3.0.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-3.3.0.tgz#06b1c57d948da11461bd237c00ce09e9902964f2"
-  integrity sha512-Tvq1W6NAcZeJ8op+Hq7tdZ434rqnMx4CCZ7H0ff83uEloDvVbqAwaMTZcafKGJT0VHkYzuXUiCY4hlXQg6WfoQ==
+"istextorbinary@^3.0.0":
+  "integrity" "sha512-Tvq1W6NAcZeJ8op+Hq7tdZ434rqnMx4CCZ7H0ff83uEloDvVbqAwaMTZcafKGJT0VHkYzuXUiCY4hlXQg6WfoQ=="
+  "resolved" "https://registry.npmjs.org/istextorbinary/-/istextorbinary-3.3.0.tgz"
+  "version" "3.3.0"
   dependencies:
-    binaryextensions "^2.2.0"
-    textextensions "^3.2.0"
+    "binaryextensions" "^2.2.0"
+    "textextensions" "^3.2.0"
 
-js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
-js-yaml@^3.13.1:
-  version "3.15.2"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.15.2.tgz#3f83823ac6be17f570f23b2ecdef3777ff5ea364"
-  integrity sha512-6EuL879VkRA+1Cz578mKMiKvjPNEuk6+r1JaFzoSWejZmtf7xWbIyw1e3KkxlkzTIt9Taw6JBhEppG7utc1P+w==
+"jest-worker@^26.2.1":
+  "integrity" "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="
+  "resolved" "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz"
+  "version" "26.6.2"
   dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
+    "@types/node" "*"
+    "merge-stream" "^2.0.0"
+    "supports-color" "^7.0.0"
 
-jsesc@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d"
-  integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==
+"js-tokens@^4.0.0":
+  "integrity" "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+  "resolved" "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"
+  "version" "4.0.0"
 
-json-buffer@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
-  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-schema-traverse@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
-  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
-
-json-stable-stringify-without-jsonify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
-
-keyv@^4.5.3:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
-  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
+"js-yaml@^3.13.1":
+  "integrity" "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="
+  "resolved" "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"
+  "version" "3.14.1"
   dependencies:
-    json-buffer "3.0.1"
+    "argparse" "^1.0.7"
+    "esprima" "^4.0.0"
 
-kind-of@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44"
-  integrity sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g==
+"jsesc@^2.5.1":
+  "integrity" "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
+  "resolved" "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
+  "version" "2.5.2"
 
-last-run@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/last-run/-/last-run-2.0.0.tgz#f82dcfbfce6e63d041bd83d64c82e34cdba6572e"
-  integrity sha512-j+y6WhTLN4Itnf9j5ZQos1BGPCS8DAwmgMroR3OzfxAsBxam0hMw7J8M3KqZl0pLQJ1jNnwIexg5DYpC/ctwEQ==
+"json-buffer@3.0.1":
+  "integrity" "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
+  "resolved" "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz"
+  "version" "3.0.1"
 
-lead@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/lead/-/lead-4.0.0.tgz#5317a49effb0e7ec3a0c8fb9c1b24fb716aab939"
-  integrity sha512-DpMa59o5uGUWWjruMp71e6knmwKU3jRBBn1kjuLWN9EeIOxNeSAwvHf03WIl8g/ZMR2oSQC9ej3yeLBwdDc/pg==
+"json-schema-traverse@^0.4.1":
+  "integrity" "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+  "resolved" "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"
+  "version" "0.4.1"
+
+"json-schema-traverse@^1.0.0":
+  "integrity" "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+  "resolved" "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"
+  "version" "1.0.0"
+
+"json-stable-stringify-without-jsonify@^1.0.1":
+  "integrity" "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
+  "resolved" "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
+  "version" "1.0.1"
+
+"keyv@^4.5.3":
+  "integrity" "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw=="
+  "resolved" "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz"
+  "version" "4.5.4"
+  dependencies:
+    "json-buffer" "3.0.1"
+
+"kind-of@^1.1.0":
+  "integrity" "sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g=="
+  "resolved" "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz"
+  "version" "1.1.0"
+
+"last-run@^2.0.0":
+  "integrity" "sha512-j+y6WhTLN4Itnf9j5ZQos1BGPCS8DAwmgMroR3OzfxAsBxam0hMw7J8M3KqZl0pLQJ1jNnwIexg5DYpC/ctwEQ=="
+  "resolved" "https://registry.npmjs.org/last-run/-/last-run-2.0.0.tgz"
+  "version" "2.0.0"
+
+"lead@^4.0.0":
+  "integrity" "sha512-DpMa59o5uGUWWjruMp71e6knmwKU3jRBBn1kjuLWN9EeIOxNeSAwvHf03WIl8g/ZMR2oSQC9ej3yeLBwdDc/pg=="
+  "resolved" "https://registry.npmjs.org/lead/-/lead-4.0.0.tgz"
+  "version" "4.0.0"
 
 "less@^3.7.1 || ^4.0.0":
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/less/-/less-4.9.1.tgz#5a873974b8e66dec7d4f04243bf1c8a5beef9de7"
-  integrity sha512-orp15PfJvvNDIqJdVWzMI9Sjpjp3VTiw3sfvbB+67LlISTEn8uVT2EdYSuyl02BLvaftv6sdk9Umnxmm5rckmg==
+  "integrity" "sha512-P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA=="
+  "resolved" "https://registry.npmjs.org/less/-/less-4.2.0.tgz"
+  "version" "4.2.0"
   dependencies:
-    copy-anything "^3.0.5"
-    parse-node-version "^1.0.1"
+    "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"
-    make-dir "^5.1.0"
-    mime "^1.4.1"
-    needle "^3.1.0"
-    probe-image-size "^7.2.3"
-    source-map "~0.6.0"
+    "errno" "^0.1.1"
+    "graceful-fs" "^4.1.2"
+    "image-size" "~0.5.0"
+    "make-dir" "^2.1.0"
+    "mime" "^1.4.1"
+    "needle" "^3.1.0"
+    "source-map" "~0.6.0"
 
-levn@^0.3.0, levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
+"levn@^0.3.0", "levn@~0.3.0":
+  "integrity" "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA=="
+  "resolved" "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"
+  "version" "0.3.0"
   dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
+    "prelude-ls" "~1.1.2"
+    "type-check" "~0.3.2"
 
-levn@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
-  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
+"levn@^0.4.1":
+  "integrity" "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="
+  "resolved" "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"
+  "version" "0.4.1"
   dependencies:
-    prelude-ls "^1.2.1"
-    type-check "~0.4.0"
+    "prelude-ls" "^1.2.1"
+    "type-check" "~0.4.0"
 
-liftoff@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-5.0.1.tgz#e2329e7f1e19e98c8dba71185f2078e6dbbc5c1f"
-  integrity sha512-wwLXMbuxSF8gMvubFcFRp56lkFV69twvbU5vDPbaw+Q+/rF8j0HKjGbIdlSi+LuJm9jf7k9PB+nTxnsLMPcv2Q==
+"liftoff@^5.0.0":
+  "integrity" "sha512-a5BQjbCHnB+cy+gsro8lXJ4kZluzOijzJ1UVVfyJYZC+IP2pLv1h4+aysQeKuTmyO8NAqfyQAk4HWaP/HjcKTg=="
+  "resolved" "https://registry.npmjs.org/liftoff/-/liftoff-5.0.0.tgz"
+  "version" "5.0.0"
   dependencies:
-    extend "^3.0.2"
-    findup-sync "^5.0.0"
-    fined "^2.0.0"
-    flagged-respawn "^2.0.0"
-    is-plain-object "^5.0.0"
-    rechoir "^0.8.0"
-    resolve "^1.20.0"
+    "extend" "^3.0.2"
+    "findup-sync" "^5.0.0"
+    "fined" "^2.0.0"
+    "flagged-respawn" "^2.0.0"
+    "is-plain-object" "^5.0.0"
+    "rechoir" "^0.8.0"
+    "resolve" "^1.20.0"
 
-lodash.defaults@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
-  integrity sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==
+"lodash.defaults@^4.2.0":
+  "integrity" "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ=="
+  "resolved" "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz"
+  "version" "4.2.0"
 
-lodash.merge@^4.6.2:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
-  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+"lodash.merge@^4.6.2":
+  "integrity" "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+  "resolved" "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"
+  "version" "4.6.2"
 
-lodash.truncate@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
-  integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==
+"lodash.truncate@^4.4.2":
+  "integrity" "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw=="
+  "resolved" "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz"
+  "version" "4.4.2"
 
-lodash@^4.17.14, lodash@^4.17.19:
-  version "4.18.1"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.18.1.tgz#ff2b66c1f6326d59513de2407bf881439812771c"
-  integrity sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==
+"lodash@^4.17.14", "lodash@^4.17.19":
+  "integrity" "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+  "resolved" "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
+  "version" "4.17.21"
 
-magic-string@^0.25.7:
-  version "0.25.9"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c"
-  integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==
+"magic-string@^0.25.7":
+  "integrity" "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ=="
+  "resolved" "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz"
+  "version" "0.25.9"
   dependencies:
-    sourcemap-codec "^1.4.8"
+    "sourcemap-codec" "^1.4.8"
 
-make-dir@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-5.1.0.tgz#59b2d9acf7ffa543d14238617a697458fa8dd5c9"
-  integrity sha512-IfpFq6UM39dUNiphpA6uDezNx/AvWyhwfICWPR3t1VspkgkMZrL+Rk1RbN1bx+aeNYwOrqGJgEgV3yotk+ZUVw==
-
-map-cache@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==
-
-merge2@^1.3.0, merge2@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
-  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
-
-micromatch@^4.0.4, micromatch@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
-  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
+"make-dir@^2.1.0":
+  "integrity" "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="
+  "resolved" "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    braces "^3.0.3"
-    picomatch "^2.3.1"
+    "pify" "^4.0.1"
+    "semver" "^5.6.0"
 
-mime@^1.4.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+"map-cache@^0.2.0":
+  "integrity" "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg=="
+  "resolved" "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"
+  "version" "0.2.2"
 
-mimic-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+"merge-stream@^2.0.0":
+  "integrity" "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
+  "resolved" "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"
+  "version" "2.0.0"
 
-minimatch@^3.0.4, minimatch@^3.1.1:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.5.tgz#580c88f8d5445f2bd6aa8f3cadefa0de79fbd69e"
-  integrity sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==
+"merge2@^1.3.0", "merge2@^1.4.1":
+  "integrity" "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
+  "resolved" "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"
+  "version" "1.4.1"
+
+"micromatch@^4.0.4":
+  "integrity" "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q=="
+  "resolved" "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz"
+  "version" "4.0.7"
   dependencies:
-    brace-expansion "^1.1.7"
+    "braces" "^3.0.3"
+    "picomatch" "^2.3.1"
 
-minimist@^1.2.6:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
-  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
+"mime@^1.4.1":
+  "integrity" "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+  "resolved" "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"
+  "version" "1.6.0"
 
-mkdirp@^0.5.1:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
-  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
+"mimic-fn@^2.1.0":
+  "integrity" "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
+  "resolved" "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"
+  "version" "2.1.0"
+
+"minimatch@^3.0.4", "minimatch@^3.1.1":
+  "integrity" "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="
+  "resolved" "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
+  "version" "3.1.2"
   dependencies:
-    minimist "^1.2.6"
+    "brace-expansion" "^1.1.7"
 
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
+"minimist@^1.2.6":
+  "integrity" "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="
+  "resolved" "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"
+  "version" "1.2.8"
 
-ms@^2.1.1, ms@^2.1.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+"mkdirp@^0.5.1":
+  "integrity" "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
+  "resolved" "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"
+  "version" "0.5.6"
+  dependencies:
+    "minimist" "^1.2.6"
 
-multimatch@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-4.0.0.tgz#8c3c0f6e3e8449ada0af3dd29efb491a375191b3"
-  integrity sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==
+"ms@2.1.2":
+  "integrity" "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+  "resolved" "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
+  "version" "2.1.2"
+
+"multimatch@^4.0.0":
+  "integrity" "sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ=="
+  "resolved" "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
     "@types/minimatch" "^3.0.3"
-    array-differ "^3.0.0"
-    array-union "^2.1.0"
-    arrify "^2.0.1"
-    minimatch "^3.0.4"
+    "array-differ" "^3.0.0"
+    "array-union" "^2.1.0"
+    "arrify" "^2.0.1"
+    "minimatch" "^3.0.4"
 
-mute-stdout@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mute-stdout/-/mute-stdout-2.0.0.tgz#c6a9b4b6185d3b7f70d3ffcb734cbfc8b0f38761"
-  integrity sha512-32GSKM3Wyc8dg/p39lWPKYu8zci9mJFzV1Np9Of0ZEpe6Fhssn/FbI7ywAMd40uX+p3ZKh3T5EeCFv81qS3HmQ==
+"mute-stdout@^2.0.0":
+  "integrity" "sha512-32GSKM3Wyc8dg/p39lWPKYu8zci9mJFzV1Np9Of0ZEpe6Fhssn/FbI7ywAMd40uX+p3ZKh3T5EeCFv81qS3HmQ=="
+  "resolved" "https://registry.npmjs.org/mute-stdout/-/mute-stdout-2.0.0.tgz"
+  "version" "2.0.0"
 
-mute-stream@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
-  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+"mute-stream@0.0.8":
+  "integrity" "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
+  "resolved" "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"
+  "version" "0.0.8"
 
-natural-compare@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
+"natural-compare@^1.4.0":
+  "integrity" "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
+  "resolved" "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
+  "version" "1.4.0"
 
-needle@^2.5.2:
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.9.1.tgz#22d1dffbe3490c2b83e301f7709b6736cd8f2684"
-  integrity sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==
+"needle@^3.1.0":
+  "integrity" "sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q=="
+  "resolved" "https://registry.npmjs.org/needle/-/needle-3.3.1.tgz"
+  "version" "3.3.1"
   dependencies:
-    debug "^3.2.6"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
+    "iconv-lite" "^0.6.3"
+    "sax" "^1.2.4"
 
-needle@^3.1.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-3.5.0.tgz#aa2023642cb41b11a11babb733fd8fa952919112"
-  integrity sha512-jaQyPKKk2YokHrEg+vFDYxXIHTCBgiZwSHOoVx/8V3GIBS8/VN6NdVRmg8q1ERtPkMvmOvebsgga4sAj5hls/w==
+"nice-try@^1.0.4":
+  "integrity" "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+  "resolved" "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"
+  "version" "1.0.5"
+
+"njfs@^1.2.5":
+  "integrity" "sha512-Vnl1VDjSo7fO3RHAO5N9QrsyWaIpSTxHSwVoQOcepYAx3Lt+2JD/tUwgEJHfh1QqBjyy/H9WS5L79+hL+l99ug=="
+  "resolved" "https://registry.npmjs.org/njfs/-/njfs-1.2.5.tgz"
+  "version" "1.2.5"
+
+"normalize-path@^3.0.0", "normalize-path@~3.0.0", "normalize-path@3.0.0":
+  "integrity" "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
+  "resolved" "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"
+  "version" "3.0.0"
+
+"now-and-later@^3.0.0":
+  "integrity" "sha512-pGO4pzSdaxhWTGkfSfHx3hVzJVslFPwBp2Myq9MYN/ChfJZF87ochMAXnvz6/58RJSf5ik2q9tXprBBrk2cpcg=="
+  "resolved" "https://registry.npmjs.org/now-and-later/-/now-and-later-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    iconv-lite "^0.6.3"
-    sax "^1.2.4"
+    "once" "^1.4.0"
 
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+"object-assign@^4.0.1":
+  "integrity" "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
+  "resolved" "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
+  "version" "4.1.1"
 
-njfs@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/njfs/-/njfs-1.2.5.tgz#082938e9fbf07044572e31c8624a81d9988b517a"
-  integrity sha512-Vnl1VDjSo7fO3RHAO5N9QrsyWaIpSTxHSwVoQOcepYAx3Lt+2JD/tUwgEJHfh1QqBjyy/H9WS5L79+hL+l99ug==
+"object-hash@^2.1.1":
+  "integrity" "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw=="
+  "resolved" "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz"
+  "version" "2.2.0"
 
-normalize-path@3.0.0, normalize-path@^3.0.0, normalize-path@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+"object-keys@~0.4.0":
+  "integrity" "sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw=="
+  "resolved" "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz"
+  "version" "0.4.0"
 
-now-and-later@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-3.0.0.tgz#cdc045dc5b894b35793cf276cc3206077bb7302d"
-  integrity sha512-pGO4pzSdaxhWTGkfSfHx3hVzJVslFPwBp2Myq9MYN/ChfJZF87ochMAXnvz6/58RJSf5ik2q9tXprBBrk2cpcg==
+"object.defaults@^1.1.0":
+  "integrity" "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA=="
+  "resolved" "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz"
+  "version" "1.1.0"
   dependencies:
-    once "^1.4.0"
+    "array-each" "^1.0.1"
+    "array-slice" "^1.0.0"
+    "for-own" "^1.0.0"
+    "isobject" "^3.0.0"
 
-object-assign@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
-
-object-hash@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5"
-  integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==
-
-object-keys@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336"
-  integrity sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw==
-
-object.defaults@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
-  integrity sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==
+"object.pick@^1.3.0":
+  "integrity" "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ=="
+  "resolved" "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"
+  "version" "1.3.0"
   dependencies:
-    array-each "^1.0.1"
-    array-slice "^1.0.0"
-    for-own "^1.0.0"
-    isobject "^3.0.0"
+    "isobject" "^3.0.1"
 
-object.pick@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==
+"once@^1.3.0", "once@^1.4.0":
+  "integrity" "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="
+  "resolved" "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
+  "version" "1.4.0"
   dependencies:
-    isobject "^3.0.1"
+    "wrappy" "1"
 
-once@^1.3.0, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
+"onetime@^5.1.0":
+  "integrity" "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="
+  "resolved" "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"
+  "version" "5.1.2"
   dependencies:
-    wrappy "1"
+    "mimic-fn" "^2.1.0"
 
-onetime@^5.1.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
-  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
+"optionator@^0.8.3":
+  "integrity" "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="
+  "resolved" "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz"
+  "version" "0.8.3"
   dependencies:
-    mimic-fn "^2.1.0"
+    "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.8.3:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
-  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+"optionator@^0.9.1":
+  "integrity" "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g=="
+  "resolved" "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz"
+  "version" "0.9.4"
   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"
+    "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.5"
 
-optionator@^0.9.1:
-  version "0.9.4"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"
-  integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==
+"os-tmpdir@~1.0.2":
+  "integrity" "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g=="
+  "resolved" "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
+  "version" "1.0.2"
+
+"p-map@^4.0.0":
+  "integrity" "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="
+  "resolved" "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz"
+  "version" "4.0.0"
   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.5"
+    "aggregate-error" "^3.0.0"
 
-os-tmpdir@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
-
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
-  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
+"parent-module@^1.0.0":
+  "integrity" "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="
+  "resolved" "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    aggregate-error "^3.0.0"
+    "callsites" "^3.0.0"
 
-parent-module@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
-  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+"parse-filepath@^1.0.2":
+  "integrity" "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q=="
+  "resolved" "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    callsites "^3.0.0"
+    "is-absolute" "^1.0.0"
+    "map-cache" "^0.2.0"
+    "path-root" "^0.1.1"
 
-parse-filepath@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
-  integrity sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==
+"parse-node-version@^1.0.0", "parse-node-version@^1.0.1":
+  "integrity" "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA=="
+  "resolved" "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz"
+  "version" "1.0.1"
+
+"parse-passwd@^1.0.0":
+  "integrity" "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q=="
+  "resolved" "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"
+  "version" "1.0.0"
+
+"path-is-absolute@^1.0.0":
+  "integrity" "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
+  "resolved" "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+  "version" "1.0.1"
+
+"path-key@^2.0.1":
+  "integrity" "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw=="
+  "resolved" "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"
+  "version" "2.0.1"
+
+"path-key@^3.1.0":
+  "integrity" "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
+  "resolved" "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"
+  "version" "3.1.1"
+
+"path-parse@^1.0.7":
+  "integrity" "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+  "resolved" "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"
+  "version" "1.0.7"
+
+"path-root-regex@^0.1.0":
+  "integrity" "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ=="
+  "resolved" "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz"
+  "version" "0.1.2"
+
+"path-root@^0.1.1":
+  "integrity" "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg=="
+  "resolved" "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz"
+  "version" "0.1.1"
   dependencies:
-    is-absolute "^1.0.0"
-    map-cache "^0.2.0"
-    path-root "^0.1.1"
+    "path-root-regex" "^0.1.0"
 
-parse-node-version@^1.0.0, parse-node-version@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
-  integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
+"path-type@^4.0.0":
+  "integrity" "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
+  "resolved" "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"
+  "version" "4.0.0"
 
-parse-passwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-  integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==
+"picocolors@^1.0.0":
+  "integrity" "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew=="
+  "resolved" "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz"
+  "version" "1.0.1"
 
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
+"picomatch@^2.0.4", "picomatch@^2.2.1", "picomatch@^2.2.2", "picomatch@^2.3.1":
+  "integrity" "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
+  "resolved" "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
+  "version" "2.3.1"
 
-path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
+"pify@^3.0.0":
+  "integrity" "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg=="
+  "resolved" "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"
+  "version" "3.0.0"
 
-path-key@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
-  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+"pify@^4.0.1":
+  "integrity" "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+  "resolved" "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz"
+  "version" "4.0.1"
 
-path-parse@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
-  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
-
-path-root-regex@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
-  integrity sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==
-
-path-root@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
-  integrity sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==
+"plugin-error@^0.1.2":
+  "integrity" "sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw=="
+  "resolved" "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz"
+  "version" "0.1.2"
   dependencies:
-    path-root-regex "^0.1.0"
+    "ansi-cyan" "^0.1.1"
+    "ansi-red" "^0.1.1"
+    "arr-diff" "^1.0.1"
+    "arr-union" "^2.0.1"
+    "extend-shallow" "^1.1.2"
 
-path-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
-  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-
-picocolors@^1.0.0, picocolors@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
-  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
-
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.2.tgz#5a942915e26b372dc0f0e6753149a16e6b1c5601"
-  integrity sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==
-
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
-
-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.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c"
-  integrity sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==
+"plugin-error@^1.0.0", "plugin-error@^1.0.1", "plugin-error@~1.0", "plugin-error@1.0.1":
+  "integrity" "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA=="
+  "resolved" "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    ansi-colors "^1.0.1"
-    arr-diff "^4.0.0"
-    arr-union "^3.1.0"
-    extend-shallow "^3.0.2"
+    "ansi-colors" "^1.0.1"
+    "arr-diff" "^4.0.0"
+    "arr-union" "^3.1.0"
+    "extend-shallow" "^3.0.2"
 
-plugin-error@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace"
-  integrity sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw==
+"prelude-ls@^1.2.1":
+  "integrity" "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
+  "resolved" "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
+  "version" "1.2.1"
+
+"prelude-ls@~1.1.2":
+  "integrity" "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="
+  "resolved" "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"
+  "version" "1.1.2"
+
+"pretty-bytes@^4.0.2":
+  "integrity" "sha512-yJAF+AjbHKlxQ8eezMd/34Mnj/YTQ3i6kLzvVsH4l/BfIFtp444n0wVbnsn66JimZ9uBofv815aRp1zCppxlWw=="
+  "resolved" "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-4.0.2.tgz"
+  "version" "4.0.2"
+
+"process-nextick-args@^2.0.0", "process-nextick-args@~2.0.0":
+  "integrity" "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+  "resolved" "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"
+  "version" "2.0.1"
+
+"progress@^2.0.0":
+  "integrity" "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
+  "resolved" "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"
+  "version" "2.0.3"
+
+"prr@~1.0.1":
+  "integrity" "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw=="
+  "resolved" "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz"
+  "version" "1.0.1"
+
+"punycode@^2.1.0":
+  "integrity" "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="
+  "resolved" "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz"
+  "version" "2.3.1"
+
+"queue-microtask@^1.2.2":
+  "integrity" "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
+  "resolved" "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"
+  "version" "1.2.3"
+
+"queue-tick@^1.0.1":
+  "integrity" "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag=="
+  "resolved" "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz"
+  "version" "1.0.1"
+
+"randombytes@^2.1.0":
+  "integrity" "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="
+  "resolved" "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    ansi-cyan "^0.1.1"
-    ansi-red "^0.1.1"
-    arr-diff "^1.0.1"
-    arr-union "^2.0.1"
-    extend-shallow "^1.1.2"
+    "safe-buffer" "^5.1.0"
 
-prelude-ls@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
-  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
+"read-file@^0.2.0":
+  "integrity" "sha512-na/zgd5KplGlR+io+ygXQMIoDfX/Y0bNS5+P2TOXOTk5plquOVd0snudCd30hZJAsnVK2rxuxUP2z0CN+Aw1lQ=="
+  "resolved" "https://registry.npmjs.org/read-file/-/read-file-0.2.0.tgz"
+  "version" "0.2.0"
 
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
-
-pretty-bytes@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"
-  integrity sha512-yJAF+AjbHKlxQ8eezMd/34Mnj/YTQ3i6kLzvVsH4l/BfIFtp444n0wVbnsn66JimZ9uBofv815aRp1zCppxlWw==
-
-probe-image-size@^7.2.3:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/probe-image-size/-/probe-image-size-7.4.0.tgz#c189ae04e9aad1e3fa3a0998a956a7e9aab7f66d"
-  integrity sha512-cdEprVtZxV+awMde9X+4jILBFYh4CARxVrQaMl4wY4YcPWbul9jntXrIW95NInBDyJwcVUP3U0T6yukN8rMBaQ==
+"readable-stream@^2.0.2", "readable-stream@^2.3.5", "readable-stream@~2.3.6", "readable-stream@2 || 3":
+  "integrity" "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="
+  "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"
+  "version" "2.3.8"
   dependencies:
-    lodash.merge "^4.6.2"
-    needle "^2.5.2"
-    stream-parser "~0.3.1"
+    "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"
 
-process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
-progress@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
-  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
-
-prr@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-  integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==
-
-punycode@^2.1.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
-  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
-
-queue-microtask@^1.2.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
-  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
-
-read-file@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/read-file/-/read-file-0.2.0.tgz#70c6baf8842ec7d1540f981fd0e6aed4c81bd545"
-  integrity sha512-na/zgd5KplGlR+io+ygXQMIoDfX/Y0bNS5+P2TOXOTk5plquOVd0snudCd30hZJAsnVK2rxuxUP2z0CN+Aw1lQ==
-
-"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.6, readable-stream@^3.4.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
-  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
+"readable-stream@^3.0.6":
+  "integrity" "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="
+  "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz"
+  "version" "3.6.2"
   dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
+    "inherits" "^2.0.3"
+    "string_decoder" "^1.1.1"
+    "util-deprecate" "^1.0.1"
 
-readable-stream@^2.0.2, readable-stream@^2.3.5, readable-stream@~2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
-  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
+"readable-stream@^3.4.0":
+  "integrity" "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="
+  "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz"
+  "version" "3.6.2"
   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"
+    "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.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  integrity sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==
+"readable-stream@~1.0.17":
+  "integrity" "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg=="
+  "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"
+  "version" "1.0.34"
   dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
+    "core-util-is" "~1.0.0"
+    "inherits" "~2.0.1"
+    "isarray" "0.0.1"
+    "string_decoder" "~0.10.x"
 
-readdirp@~3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
-  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
+"readable-stream@3":
+  "integrity" "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="
+  "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz"
+  "version" "3.6.2"
   dependencies:
-    picomatch "^2.2.1"
+    "inherits" "^2.0.3"
+    "string_decoder" "^1.1.1"
+    "util-deprecate" "^1.0.1"
 
-rechoir@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22"
-  integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==
+"readdirp@~3.6.0":
+  "integrity" "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="
+  "resolved" "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"
+  "version" "3.6.0"
   dependencies:
-    resolve "^1.20.0"
+    "picomatch" "^2.2.1"
 
-regexpp@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
-  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
-
-regexpp@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
-  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
-
-remove-trailing-separator@^1.0.1, remove-trailing-separator@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==
-
-replace-ext@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
-  integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
-
-replace-ext@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-2.0.0.tgz#9471c213d22e1bcc26717cd6e50881d88f812b06"
-  integrity sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==
-
-replace-homedir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/replace-homedir/-/replace-homedir-2.0.0.tgz#245bd9c909275e0beee75eae85bb40780cd61903"
-  integrity sha512-bgEuQQ/BHW0XkkJtawzrfzHFSN70f/3cNOiHa2QsYxqrjaC30X1k74FJ6xswVBP0sr0SpGIdVFuPwfrYziVeyw==
-
-replacestream@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/replacestream/-/replacestream-4.0.3.tgz#3ee5798092be364b1cdb1484308492cb3dff2f36"
-  integrity sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==
+"rechoir@^0.8.0":
+  "integrity" "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ=="
+  "resolved" "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz"
+  "version" "0.8.0"
   dependencies:
-    escape-string-regexp "^1.0.3"
-    object-assign "^4.0.1"
-    readable-stream "^2.0.2"
+    "resolve" "^1.20.0"
 
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
+"regexpp@^2.0.1":
+  "integrity" "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="
+  "resolved" "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz"
+  "version" "2.0.1"
 
-require-from-string@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
-  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
+"regexpp@^3.1.0":
+  "integrity" "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="
+  "resolved" "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz"
+  "version" "3.2.0"
 
-resolve-dir@^1.0.0, resolve-dir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
-  integrity sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==
+"remove-trailing-separator@^1.0.1", "remove-trailing-separator@^1.1.0":
+  "integrity" "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw=="
+  "resolved" "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"
+  "version" "1.1.0"
+
+"replace-ext@^1.0.0":
+  "integrity" "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw=="
+  "resolved" "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz"
+  "version" "1.0.1"
+
+"replace-ext@^2.0.0":
+  "integrity" "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug=="
+  "resolved" "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz"
+  "version" "2.0.0"
+
+"replace-homedir@^2.0.0":
+  "integrity" "sha512-bgEuQQ/BHW0XkkJtawzrfzHFSN70f/3cNOiHa2QsYxqrjaC30X1k74FJ6xswVBP0sr0SpGIdVFuPwfrYziVeyw=="
+  "resolved" "https://registry.npmjs.org/replace-homedir/-/replace-homedir-2.0.0.tgz"
+  "version" "2.0.0"
+
+"replacestream@^4.0.3":
+  "integrity" "sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA=="
+  "resolved" "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz"
+  "version" "4.0.3"
   dependencies:
-    expand-tilde "^2.0.0"
-    global-modules "^1.0.0"
+    "escape-string-regexp" "^1.0.3"
+    "object-assign" "^4.0.1"
+    "readable-stream" "^2.0.2"
 
-resolve-from@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+"require-directory@^2.1.1":
+  "integrity" "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
+  "resolved" "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
+  "version" "2.1.1"
 
-resolve-options@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-2.0.0.tgz#a1a57a9949db549dd075de3f5550675f02f1e4c5"
-  integrity sha512-/FopbmmFOQCfsCx77BRFdKOniglTiHumLgwvd6IDPihy1GKkadZbgQJBcTb2lMzSR1pndzd96b1nZrreZ7+9/A==
+"require-from-string@^2.0.2":
+  "integrity" "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="
+  "resolved" "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"
+  "version" "2.0.2"
+
+"resolve-dir@^1.0.0", "resolve-dir@^1.0.1":
+  "integrity" "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg=="
+  "resolved" "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    value-or-function "^4.0.0"
+    "expand-tilde" "^2.0.0"
+    "global-modules" "^1.0.0"
 
-resolve-url@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-  integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==
+"resolve-from@^4.0.0":
+  "integrity" "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
+  "resolved" "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"
+  "version" "4.0.0"
 
-resolve@^1.12.0, resolve@^1.19.0, resolve@^1.20.0:
-  version "1.22.13"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.13.tgz#d542f97758d768f36091251a6b07540b4343f7b5"
-  integrity sha512-Dj/cW9zBV2aRj6XzCxuGIs3ESZKv02jixne3q6jFZYZ3/Tg09gHHviSMDL4kObh9pqSahdRHEnDoaP2gn8YLhA==
+"resolve-options@^2.0.0":
+  "integrity" "sha512-/FopbmmFOQCfsCx77BRFdKOniglTiHumLgwvd6IDPihy1GKkadZbgQJBcTb2lMzSR1pndzd96b1nZrreZ7+9/A=="
+  "resolved" "https://registry.npmjs.org/resolve-options/-/resolve-options-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    es-errors "^1.3.0"
-    is-core-module "^2.17.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
+    "value-or-function" "^4.0.0"
 
-restore-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
-  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+"resolve-url@^0.2.1":
+  "integrity" "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="
+  "resolved" "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"
+  "version" "0.2.1"
+
+"resolve@^1.12.0", "resolve@^1.19.0", "resolve@^1.20.0":
+  "integrity" "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw=="
+  "resolved" "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz"
+  "version" "1.22.8"
   dependencies:
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
+    "is-core-module" "^2.13.0"
+    "path-parse" "^1.0.7"
+    "supports-preserve-symlinks-flag" "^1.0.0"
 
-reusify@^1.0.4:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.1.0.tgz#0fe13b9522e1473f51b558ee796e08f11f9b489f"
-  integrity sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==
-
-rimraf@2.6.3:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+"restore-cursor@^3.1.0":
+  "integrity" "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="
+  "resolved" "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"
+  "version" "3.1.0"
   dependencies:
-    glob "^7.1.3"
+    "onetime" "^5.1.0"
+    "signal-exit" "^3.0.2"
 
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+"reusify@^1.0.4":
+  "integrity" "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
+  "resolved" "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
+  "version" "1.0.4"
+
+"rimraf@^3.0.2":
+  "integrity" "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="
+  "resolved" "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
+  "version" "3.0.2"
   dependencies:
-    glob "^7.1.3"
+    "glob" "^7.1.3"
 
-rollup-plugin-external-globals@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-external-globals/-/rollup-plugin-external-globals-0.6.1.tgz#861c260b5727144e0fd1b424b103f9f0282fc365"
-  integrity sha512-mlp3KNa5sE4Sp9UUR2rjBrxjG79OyZAh/QC18RHIjM+iYkbBwNXSo8DHRMZWtzJTrH8GxQ+SJvCTN3i14uMXIA==
+"rimraf@2.6.3":
+  "integrity" "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="
+  "resolved" "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz"
+  "version" "2.6.3"
+  dependencies:
+    "glob" "^7.1.3"
+
+"rollup-plugin-external-globals@^0.6.1":
+  "integrity" "sha512-mlp3KNa5sE4Sp9UUR2rjBrxjG79OyZAh/QC18RHIjM+iYkbBwNXSo8DHRMZWtzJTrH8GxQ+SJvCTN3i14uMXIA=="
+  "resolved" "https://registry.npmjs.org/rollup-plugin-external-globals/-/rollup-plugin-external-globals-0.6.1.tgz"
+  "version" "0.6.1"
   dependencies:
     "@rollup/pluginutils" "^4.0.0"
-    estree-walker "^2.0.1"
-    is-reference "^1.2.1"
-    magic-string "^0.25.7"
+    "estree-walker" "^2.0.1"
+    "is-reference" "^1.2.1"
+    "magic-string" "^0.25.7"
 
-rollup-plugin-includepaths@^0.2.4:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-includepaths/-/rollup-plugin-includepaths-0.2.4.tgz#eb21d2d05ad410856a7c2f0612a85983fd11cc62"
-  integrity sha512-iZen+XKVExeCzk7jeSZPJKL7B67slZNr8GXSC5ROBXtDGXDBH8wdjMfdNW5hf9kPt+tHyIvWh3wlE9bPrZL24g==
+"rollup-plugin-includepaths@^0.2.4":
+  "integrity" "sha512-iZen+XKVExeCzk7jeSZPJKL7B67slZNr8GXSC5ROBXtDGXDBH8wdjMfdNW5hf9kPt+tHyIvWh3wlE9bPrZL24g=="
+  "resolved" "https://registry.npmjs.org/rollup-plugin-includepaths/-/rollup-plugin-includepaths-0.2.4.tgz"
+  "version" "0.2.4"
 
-rollup@^2.41.4, rollup@^2.56.3:
-  version "2.80.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.80.0.tgz#a82efc15b748e986a7c76f0f771221b1fa108a2c"
-  integrity sha512-cIFJOD1DESzpjOBl763Kp1AH7UE/0fcdHe6rZXUdQ9c50uvgigvW97u3IcSeBwOkgqL/PXPBktBCh0KEu5L8XQ==
+"rollup-plugin-terser@^7.0.2":
+  "integrity" "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ=="
+  "resolved" "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz"
+  "version" "7.0.2"
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "jest-worker" "^26.2.1"
+    "serialize-javascript" "^4.0.0"
+    "terser" "^5.0.0"
+
+"rollup@^1.20.0 || ^2.0.0", "rollup@^1.20.0||^2.0.0", "rollup@^2.0.0", "rollup@^2.25.0", "rollup@^2.41.4", "rollup@^2.42.0", "rollup@^2.56.3":
+  "integrity" "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw=="
+  "resolved" "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz"
+  "version" "2.79.1"
   optionalDependencies:
-    fsevents "~2.3.2"
+    "fsevents" "~2.3.2"
 
-run-async@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
-  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
+"run-async@^2.4.0":
+  "integrity" "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="
+  "resolved" "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz"
+  "version" "2.4.1"
 
-run-parallel@^1.1.9:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
-  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
+"run-parallel@^1.1.9":
+  "integrity" "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="
+  "resolved" "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"
+  "version" "1.2.0"
   dependencies:
-    queue-microtask "^1.2.2"
+    "queue-microtask" "^1.2.2"
 
-rxjs@^6.6.0:
-  version "6.6.7"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
-  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
+"rxjs@^6.6.0":
+  "integrity" "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="
+  "resolved" "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz"
+  "version" "6.6.7"
   dependencies:
-    tslib "^1.9.0"
+    "tslib" "^1.9.0"
 
-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+"safe-buffer@^5.1.0", "safe-buffer@~5.1.0", "safe-buffer@~5.1.1":
+  "integrity" "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+  "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
+  "version" "5.1.2"
 
 "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+  "integrity" "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+  "resolved" "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
+  "version" "2.1.2"
 
-sax@^1.2.4:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.6.1.tgz#4c23cf608c0b693ab54b4b5888e92cfe977b9843"
-  integrity sha512-42tBVwLWnaQvW5zc4HbZrTuWccECCZfBi92FDuwtqxasH+JbPB3/FOKb1m222K42R4WxuxzzMsTswfzgtSu64Q==
+"sax@^1.2.4":
+  "integrity" "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg=="
+  "resolved" "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz"
+  "version" "1.4.1"
 
-semver-greatest-satisfied-range@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-2.0.0.tgz#4b62942a7a1ccbdb252e5329677c003bac546fe7"
-  integrity sha512-lH3f6kMbwyANB7HuOWRMlLCa2itaCrZJ+SAqqkSZrZKO/cAsk2EOyaKHUtNkVLFyFW9pct22SFesFp3Z7zpA0g==
+"semver-greatest-satisfied-range@^2.0.0":
+  "integrity" "sha512-lH3f6kMbwyANB7HuOWRMlLCa2itaCrZJ+SAqqkSZrZKO/cAsk2EOyaKHUtNkVLFyFW9pct22SFesFp3Z7zpA0g=="
+  "resolved" "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    sver "^1.8.3"
+    "sver" "^1.8.3"
 
-semver@^5.5.0:
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
-  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
+"semver@^5.5.0":
+  "integrity" "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
+  "resolved" "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz"
+  "version" "5.7.2"
 
-semver@^6.1.2, semver@^6.3.0:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
-  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
+"semver@^5.6.0":
+  "integrity" "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
+  "resolved" "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz"
+  "version" "5.7.2"
 
-semver@^7.2.1:
-  version "7.8.5"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.8.5.tgz#39b646037dd50c14fb451e7e4cac58ed8b863f69"
-  integrity sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==
+"semver@^6.1.2":
+  "integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+  "resolved" "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"
+  "version" "6.3.1"
 
-serialize-javascript@^7.0.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-7.1.3.tgz#c8f3a5355d5c52d76f4d61389172747a71f22ef6"
-  integrity sha512-kYEnegpAxWFjUw3dSYdSM9zVlTrsxDbsSkq/qd3B7VanqyJ+JdDy6qVyuqVGBhSfuD/rLZQEKuXsO5KZFCrVYQ==
+"semver@^6.3.0":
+  "integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+  "resolved" "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"
+  "version" "6.3.1"
 
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==
+"semver@^7.2.1":
+  "integrity" "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w=="
+  "resolved" "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz"
+  "version" "7.6.2"
+
+"serialize-javascript@^4.0.0":
+  "integrity" "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw=="
+  "resolved" "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
-    shebang-regex "^1.0.0"
+    "randombytes" "^2.1.0"
 
-shebang-command@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
-  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+"shebang-command@^1.2.0":
+  "integrity" "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg=="
+  "resolved" "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"
+  "version" "1.2.0"
   dependencies:
-    shebang-regex "^3.0.0"
+    "shebang-regex" "^1.0.0"
 
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==
-
-shebang-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
-  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-
-signal-exit@^3.0.2:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
-  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
-
-slash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
-  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-
-slice-ansi@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
-  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
+"shebang-command@^2.0.0":
+  "integrity" "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="
+  "resolved" "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    ansi-styles "^3.2.0"
-    astral-regex "^1.0.0"
-    is-fullwidth-code-point "^2.0.0"
+    "shebang-regex" "^3.0.0"
 
-slice-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
-  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
+"shebang-regex@^1.0.0":
+  "integrity" "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ=="
+  "resolved" "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"
+  "version" "1.0.0"
+
+"shebang-regex@^3.0.0":
+  "integrity" "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
+  "resolved" "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"
+  "version" "3.0.0"
+
+"signal-exit@^3.0.2":
+  "integrity" "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+  "resolved" "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"
+  "version" "3.0.7"
+
+"slash@^3.0.0":
+  "integrity" "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
+  "resolved" "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"
+  "version" "3.0.0"
+
+"slice-ansi@^2.1.0":
+  "integrity" "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="
+  "resolved" "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz"
+  "version" "2.1.0"
   dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
+    "ansi-styles" "^3.2.0"
+    "astral-regex" "^1.0.0"
+    "is-fullwidth-code-point" "^2.0.0"
 
-smob@^1.0.0:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/smob/-/smob-1.6.2.tgz#190b94c25530c631a7ccc63de0d4c0087222d21d"
-  integrity sha512-RQsvleCbF8cVHEv+xuDGaA4pOizFqJ0GgjtMSRo6oP8pnN7WsigHgVGey6aILRBKv4W2YOMHLqbKdnB6hpB9fw==
-
-source-map-resolve@^0.5.2:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
-  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
+"slice-ansi@^4.0.0":
+  "integrity" "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ=="
+  "resolved" "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz"
+  "version" "4.0.0"
   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"
+    "ansi-styles" "^4.0.0"
+    "astral-regex" "^2.0.0"
+    "is-fullwidth-code-point" "^3.0.0"
 
-source-map-support@~0.5.20:
-  version "0.5.21"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
-  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
+"source-map-resolve@^0.5.2":
+  "integrity" "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="
+  "resolved" "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz"
+  "version" "0.5.3"
   dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
+    "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-url@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
-  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
-
-source-map@^0.5.1:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
-
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-sourcemap-codec@^1.4.8:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
-  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
-
-sparkles@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-2.1.0.tgz#8ad4e8cecba7e568bba660c39b6db46625ecf1ad"
-  integrity sha512-r7iW1bDw8R/cFifrD3JnQJX0K1jqT0kprL48BiBpLZLJPmAm34zsVBsK5lc7HirZYZqMW65dOXZgbAGt/I6frg==
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
-
-stream-composer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/stream-composer/-/stream-composer-1.0.2.tgz#7ee61ca1587bf5f31b2e29aa2093cbf11442d152"
-  integrity sha512-bnBselmwfX5K10AH6L4c8+S5lgZMWI7ZYrz2rvYjCPB2DIMC4Ig8OpxGpNJSxRZ58oti7y1IcNvjBAz9vW5m4w==
+"source-map-support@~0.5.20":
+  "integrity" "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="
+  "resolved" "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"
+  "version" "0.5.21"
   dependencies:
-    streamx "^2.13.2"
+    "buffer-from" "^1.0.0"
+    "source-map" "^0.6.0"
 
-stream-counter@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stream-counter/-/stream-counter-1.0.0.tgz#91cf2569ce4dc5061febcd7acb26394a5a114751"
-  integrity sha512-4nfHc1016AhNOs0CFDR3S0FNeqnYbT7xZ408coajcx2Msj8malNNjvFHzWYIfIAXNK5i0eaKIVfgBYPOkyOTIg==
+"source-map-url@^0.4.0":
+  "integrity" "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw=="
+  "resolved" "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz"
+  "version" "0.4.1"
 
-stream-exhaust@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/stream-exhaust/-/stream-exhaust-1.0.2.tgz#acdac8da59ef2bc1e17a2c0ccf6c320d120e555d"
-  integrity sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==
+"source-map@^0.5.1":
+  "integrity" "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
+  "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
+  "version" "0.5.7"
 
-stream-parser@~0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/stream-parser/-/stream-parser-0.3.1.tgz#1618548694420021a1182ff0af1911c129761773"
-  integrity sha512-bJ/HgKq41nlKvlhccD5kaCr/P+Hu0wPNKPJOH7en+YrJu/9EgqUF+88w5Jb6KNcjOFMhfX4B2asfeAtIGuHObQ==
+"source-map@^0.6.0", "source-map@^0.6.1", "source-map@~0.6.0":
+  "integrity" "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+  "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
+  "version" "0.6.1"
+
+"sourcemap-codec@^1.4.8":
+  "integrity" "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
+  "resolved" "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"
+  "version" "1.4.8"
+
+"sparkles@^2.1.0":
+  "integrity" "sha512-r7iW1bDw8R/cFifrD3JnQJX0K1jqT0kprL48BiBpLZLJPmAm34zsVBsK5lc7HirZYZqMW65dOXZgbAGt/I6frg=="
+  "resolved" "https://registry.npmjs.org/sparkles/-/sparkles-2.1.0.tgz"
+  "version" "2.1.0"
+
+"sprintf-js@~1.0.2":
+  "integrity" "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
+  "resolved" "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
+  "version" "1.0.3"
+
+"stream-composer@^1.0.2":
+  "integrity" "sha512-bnBselmwfX5K10AH6L4c8+S5lgZMWI7ZYrz2rvYjCPB2DIMC4Ig8OpxGpNJSxRZ58oti7y1IcNvjBAz9vW5m4w=="
+  "resolved" "https://registry.npmjs.org/stream-composer/-/stream-composer-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    debug "2"
+    "streamx" "^2.13.2"
 
-streamfilter@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/streamfilter/-/streamfilter-3.0.0.tgz#8c61b08179a6c336c6efccc5df30861b7a9675e7"
-  integrity sha512-kvKNfXCmUyC8lAXSSHCIXBUlo/lhsLcCU/OmzACZYpRUdtKIH68xYhm/+HI15jFJYtNJGYtCgn2wmIiExY1VwA==
+"stream-counter@^1.0.0":
+  "integrity" "sha512-4nfHc1016AhNOs0CFDR3S0FNeqnYbT7xZ408coajcx2Msj8malNNjvFHzWYIfIAXNK5i0eaKIVfgBYPOkyOTIg=="
+  "resolved" "https://registry.npmjs.org/stream-counter/-/stream-counter-1.0.0.tgz"
+  "version" "1.0.0"
+
+"stream-exhaust@^1.0.2":
+  "integrity" "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw=="
+  "resolved" "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz"
+  "version" "1.0.2"
+
+"streamfilter@^3.0.0":
+  "integrity" "sha512-kvKNfXCmUyC8lAXSSHCIXBUlo/lhsLcCU/OmzACZYpRUdtKIH68xYhm/+HI15jFJYtNJGYtCgn2wmIiExY1VwA=="
+  "resolved" "https://registry.npmjs.org/streamfilter/-/streamfilter-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    readable-stream "^3.0.6"
+    "readable-stream" "^3.0.6"
 
-streamx@^2.12.0, streamx@^2.12.5, streamx@^2.13.2, streamx@^2.14.0:
-  version "2.28.1"
-  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.28.1.tgz#376cd42a089505a69bec0efdb5189aa45586141f"
-  integrity sha512-zEzXb0s5Cds7tqMH6rhZ05lcJydCWiQPEwiNngVqzsxCc962vLY4Uw+mW7od8kDH258k2Uz/JrOkdIAAhSh9VA==
+"streamx@^2.12.0", "streamx@^2.12.5", "streamx@^2.13.2", "streamx@^2.14.0":
+  "integrity" "sha512-LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ=="
+  "resolved" "https://registry.npmjs.org/streamx/-/streamx-2.18.0.tgz"
+  "version" "2.18.0"
   dependencies:
-    events-universal "^1.0.0"
-    fast-fifo "^1.3.2"
-    text-decoder "^1.1.0"
-
-string-width@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  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.0, string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  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:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-strip-ansi@^5.1.0, strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  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.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-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.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
-  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
-
-supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
-  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.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
-  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
-
-sver@^1.8.3:
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/sver/-/sver-1.8.4.tgz#9bd6f6265263f01aab152df935dc7a554c15673f"
-  integrity sha512-71o1zfzyawLfIWBOmw8brleKyvnbn73oVHNCsu51uPMz/HWiKkkXsI31JjHW5zqXEqnPYkIiHd8ZmL7FCimLEA==
+    "fast-fifo" "^1.3.2"
+    "queue-tick" "^1.0.1"
+    "text-decoder" "^1.1.0"
   optionalDependencies:
-    semver "^6.3.0"
+    "bare-events" "^2.2.0"
 
-table@^5.2.3:
-  version "5.4.6"
-  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
-  integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
+"string_decoder@^1.1.1", "string_decoder@~1.1.1":
+  "integrity" "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="
+  "resolved" "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
+  "version" "1.1.1"
   dependencies:
-    ajv "^6.10.2"
-    lodash "^4.17.14"
-    slice-ansi "^2.1.0"
-    string-width "^3.0.0"
+    "safe-buffer" "~5.1.0"
 
-table@^6.0.9:
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.9.0.tgz#50040afa6264141c7566b3b81d4d82c47a8668f5"
-  integrity sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==
+"string_decoder@~0.10.x":
+  "integrity" "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="
+  "resolved" "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+  "version" "0.10.31"
+
+"string-width@^3.0.0":
+  "integrity" "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="
+  "resolved" "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"
+  "version" "3.1.0"
   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"
+    "emoji-regex" "^7.0.1"
+    "is-fullwidth-code-point" "^2.0.0"
+    "strip-ansi" "^5.1.0"
 
-teex@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/teex/-/teex-1.0.1.tgz#b8fa7245ef8e8effa8078281946c85ab780a0b12"
-  integrity sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==
+"string-width@^4.1.0", "string-width@^4.2.0", "string-width@^4.2.3":
+  "integrity" "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="
+  "resolved" "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
+  "version" "4.2.3"
   dependencies:
-    streamx "^2.12.5"
+    "emoji-regex" "^8.0.0"
+    "is-fullwidth-code-point" "^3.0.0"
+    "strip-ansi" "^6.0.1"
 
-terser@^5.49.2, terser@^5.9.0:
-  version "5.51.2"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.51.2.tgz#555912425a7f2ff7737425c3718fa76c7069f6ef"
-  integrity sha512-bWnjSNscmuI+GJze6ZupnHP8G/cTcsJF+bXCeQknk2SHQsgbNJnLrqiH9jZ2W4STPVXH2mDKKRX3iwPhc9Cn/Q==
+"strip-ansi@^5.1.0", "strip-ansi@^5.2.0":
+  "integrity" "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="
+  "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"
+  "version" "5.2.0"
+  dependencies:
+    "ansi-regex" "^4.1.0"
+
+"strip-ansi@^6.0.0", "strip-ansi@^6.0.1":
+  "integrity" "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="
+  "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
+  "version" "6.0.1"
+  dependencies:
+    "ansi-regex" "^5.0.1"
+
+"strip-json-comments@^3.0.1", "strip-json-comments@^3.1.0", "strip-json-comments@^3.1.1":
+  "integrity" "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
+  "resolved" "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
+  "version" "3.1.1"
+
+"supports-color@^5.3.0":
+  "integrity" "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="
+  "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
+  "version" "5.5.0"
+  dependencies:
+    "has-flag" "^3.0.0"
+
+"supports-color@^7.0.0":
+  "integrity" "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
+  "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
+  "version" "7.2.0"
+  dependencies:
+    "has-flag" "^4.0.0"
+
+"supports-color@^7.1.0":
+  "integrity" "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
+  "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
+  "version" "7.2.0"
+  dependencies:
+    "has-flag" "^4.0.0"
+
+"supports-preserve-symlinks-flag@^1.0.0":
+  "integrity" "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
+  "resolved" "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"
+  "version" "1.0.0"
+
+"sver@^1.8.3":
+  "integrity" "sha512-71o1zfzyawLfIWBOmw8brleKyvnbn73oVHNCsu51uPMz/HWiKkkXsI31JjHW5zqXEqnPYkIiHd8ZmL7FCimLEA=="
+  "resolved" "https://registry.npmjs.org/sver/-/sver-1.8.4.tgz"
+  "version" "1.8.4"
+  optionalDependencies:
+    "semver" "^6.3.0"
+
+"table@^5.2.3":
+  "integrity" "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="
+  "resolved" "https://registry.npmjs.org/table/-/table-5.4.6.tgz"
+  "version" "5.4.6"
+  dependencies:
+    "ajv" "^6.10.2"
+    "lodash" "^4.17.14"
+    "slice-ansi" "^2.1.0"
+    "string-width" "^3.0.0"
+
+"table@^6.0.9":
+  "integrity" "sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA=="
+  "resolved" "https://registry.npmjs.org/table/-/table-6.8.2.tgz"
+  "version" "6.8.2"
+  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"
+
+"teex@^1.0.1":
+  "integrity" "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg=="
+  "resolved" "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz"
+  "version" "1.0.1"
+  dependencies:
+    "streamx" "^2.12.5"
+
+"terser@^5.0.0", "terser@^5.9.0":
+  "integrity" "sha512-37upzU1+viGvuFtBo9NPufCb9dwM0+l9hMxYyWfBA+fbwrPqNJAhbZ6W47bBFnZHKHTUBnMvi87434qq+qnxOg=="
+  "resolved" "https://registry.npmjs.org/terser/-/terser-5.31.1.tgz"
+  "version" "5.31.1"
   dependencies:
     "@jridgewell/source-map" "^0.3.3"
-    acorn "^8.15.0"
-    commander "^2.20.0"
-    source-map-support "~0.5.20"
+    "acorn" "^8.8.2"
+    "commander" "^2.20.0"
+    "source-map-support" "~0.5.20"
 
-text-decoder@^1.1.0:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/text-decoder/-/text-decoder-1.2.7.tgz#5d073a9a74b9c0a9d28dfadcab96b604af57d8ba"
-  integrity sha512-vlLytXkeP4xvEq2otHeJfSQIRyWxo/oZGEbXrtEEF9Hnmrdly59sUbzZ/QgyWuLYHctCHxFF4tRQZNQ9k60ExQ==
+"text-decoder@^1.1.0":
+  "integrity" "sha512-TmLJNj6UgX8xcUZo4UDStGQtDiTzF7BzWlzn9g7UWrjkpHr5uJTK1ld16wZ3LXb2vb6jH8qU89dW5whuMdXYdw=="
+  "resolved" "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.0.tgz"
+  "version" "1.1.0"
   dependencies:
-    b4a "^1.6.4"
+    "b4a" "^1.6.4"
 
-text-table@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
+"text-table@^0.2.0":
+  "integrity" "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
+  "resolved" "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
+  "version" "0.2.0"
 
-textextensions@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-3.3.0.tgz#03530d5287b86773c08b77458589148870cc71d3"
-  integrity sha512-mk82dS8eRABNbeVJrEiN5/UMSCliINAuz8mkUwH4SwslkNP//gbEzlWNS5au0z5Dpx40SQxzqZevZkn+WYJ9Dw==
+"textextensions@^3.2.0":
+  "integrity" "sha512-mk82dS8eRABNbeVJrEiN5/UMSCliINAuz8mkUwH4SwslkNP//gbEzlWNS5au0z5Dpx40SQxzqZevZkn+WYJ9Dw=="
+  "resolved" "https://registry.npmjs.org/textextensions/-/textextensions-3.3.0.tgz"
+  "version" "3.3.0"
 
-through2@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
-  integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
+"through@^2.3.6":
+  "integrity" "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
+  "resolved" "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+  "version" "2.3.8"
+
+"through2@^2.0.0", "through2@^2.0.1", "through2@^2.0.3":
+  "integrity" "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="
+  "resolved" "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"
+  "version" "2.0.5"
   dependencies:
-    readable-stream "2 || 3"
+    "readable-stream" "~2.3.6"
+    "xtend" "~4.0.1"
 
-through2@^2.0.0, through2@^2.0.1, through2@^2.0.3:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
-  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+"through2@^4.0.0":
+  "integrity" "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw=="
+  "resolved" "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz"
+  "version" "4.0.2"
   dependencies:
-    readable-stream "~2.3.6"
-    xtend "~4.0.1"
+    "readable-stream" "3"
 
-through2@^4.0.0, through2@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764"
-  integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==
+"through2@^4.0.2":
+  "integrity" "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw=="
+  "resolved" "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz"
+  "version" "4.0.2"
   dependencies:
-    readable-stream "3"
+    "readable-stream" "3"
 
-through2@~0.4:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-0.4.2.tgz#dbf5866031151ec8352bb6c4db64a2292a840b9b"
-  integrity sha512-45Llu+EwHKtAZYTPPVn3XZHBgakWMN3rokhEv5hu596XP+cNgplMg+Gj+1nmAvj+L0K7+N49zBKx5rah5u0QIQ==
+"through2@~0.4":
+  "integrity" "sha512-45Llu+EwHKtAZYTPPVn3XZHBgakWMN3rokhEv5hu596XP+cNgplMg+Gj+1nmAvj+L0K7+N49zBKx5rah5u0QIQ=="
+  "resolved" "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz"
+  "version" "0.4.2"
   dependencies:
-    readable-stream "~1.0.17"
-    xtend "~2.1.1"
+    "readable-stream" "~1.0.17"
+    "xtend" "~2.1.1"
 
-through@^2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
-
-time-stamp@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
-  integrity sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==
-
-tmp@^0.0.33:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
+"through2@3.0.1":
+  "integrity" "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww=="
+  "resolved" "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz"
+  "version" "3.0.1"
   dependencies:
-    os-tmpdir "~1.0.2"
+    "readable-stream" "2 || 3"
 
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+"time-stamp@^1.0.0":
+  "integrity" "sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw=="
+  "resolved" "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz"
+  "version" "1.1.0"
+
+"tmp@^0.0.33":
+  "integrity" "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="
+  "resolved" "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"
+  "version" "0.0.33"
   dependencies:
-    is-number "^7.0.0"
+    "os-tmpdir" "~1.0.2"
 
-to-through@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/to-through/-/to-through-3.0.0.tgz#bf4956eaca5a0476474850a53672bed6906ace54"
-  integrity sha512-y8MN937s/HVhEoBU1SxfHC+wxCHkV1a9gW8eAdTadYh/bGyesZIVcbjI+mSpFbSVwQici/XjBjuUyri1dnXwBw==
+"to-fast-properties@^2.0.0":
+  "integrity" "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
+  "resolved" "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
+  "version" "2.0.0"
+
+"to-regex-range@^5.0.1":
+  "integrity" "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="
+  "resolved" "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"
+  "version" "5.0.1"
   dependencies:
-    streamx "^2.12.5"
+    "is-number" "^7.0.0"
 
-tslib@^1.9.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
-  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-
-type-check@^0.4.0, type-check@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
-  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
+"to-through@^3.0.0":
+  "integrity" "sha512-y8MN937s/HVhEoBU1SxfHC+wxCHkV1a9gW8eAdTadYh/bGyesZIVcbjI+mSpFbSVwQici/XjBjuUyri1dnXwBw=="
+  "resolved" "https://registry.npmjs.org/to-through/-/to-through-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    prelude-ls "^1.2.1"
+    "streamx" "^2.12.5"
 
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
+"tslib@^1.9.0":
+  "integrity" "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+  "resolved" "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
+  "version" "1.14.1"
+
+"tslib@^2.3.0":
+  "integrity" "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ=="
+  "resolved" "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz"
+  "version" "2.6.3"
+
+"type-check@^0.4.0", "type-check@~0.4.0":
+  "integrity" "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="
+  "resolved" "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"
+  "version" "0.4.0"
   dependencies:
-    prelude-ls "~1.1.2"
+    "prelude-ls" "^1.2.1"
 
-type-fest@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
-  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
-
-type-fest@^0.21.3:
-  version "0.21.3"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
-  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
-
-type-fest@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
-  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
-
-unc-path-regex@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
-  integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==
-
-undertaker-registry@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/undertaker-registry/-/undertaker-registry-2.0.0.tgz#d434246e398444740dd7fe4c9543e402ad99e4ca"
-  integrity sha512-+hhVICbnp+rlzZMgxXenpvTxpuvA67Bfgtt+O9WOE5jo7w/dyiF1VmoZVIHvP2EkUjsyKyTwYKlLhA+j47m1Ew==
-
-undertaker@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/undertaker/-/undertaker-2.0.0.tgz#fe4d40dc71823ce5a80f1ecc63ec8b88ad40b54a"
-  integrity sha512-tO/bf30wBbTsJ7go80j0RzA2rcwX6o7XPBpeFcb+jzoeb4pfMM2zUeSDIkY1AWqeZabWxaQZ/h8N9t35QKDLPQ==
+"type-check@~0.3.2":
+  "integrity" "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg=="
+  "resolved" "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"
+  "version" "0.3.2"
   dependencies:
-    bach "^2.0.1"
-    fast-levenshtein "^3.0.0"
-    last-run "^2.0.0"
-    undertaker-registry "^2.0.0"
+    "prelude-ls" "~1.1.2"
 
-undici-types@~8.9.0:
-  version "8.9.0"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-8.9.0.tgz#e240d97c8b5d85e5347ce73d25865c7906c1ec9f"
-  integrity sha512-KTDyRTYX8sWmKXAikPHHSyc63CRPETMctyjKFupcC6OBLXT3xsN0e9aF7m+mIXutFWpUXuedtowG7iLOzp0kQg==
+"type-fest@^0.20.2":
+  "integrity" "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
+  "resolved" "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"
+  "version" "0.20.2"
 
-uri-js@^4.2.2:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
-  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
+"type-fest@^0.21.3":
+  "integrity" "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="
+  "resolved" "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz"
+  "version" "0.21.3"
+
+"type-fest@^0.8.1":
+  "integrity" "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
+  "resolved" "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"
+  "version" "0.8.1"
+
+"unc-path-regex@^0.1.2":
+  "integrity" "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg=="
+  "resolved" "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz"
+  "version" "0.1.2"
+
+"undertaker-registry@^2.0.0":
+  "integrity" "sha512-+hhVICbnp+rlzZMgxXenpvTxpuvA67Bfgtt+O9WOE5jo7w/dyiF1VmoZVIHvP2EkUjsyKyTwYKlLhA+j47m1Ew=="
+  "resolved" "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-2.0.0.tgz"
+  "version" "2.0.0"
+
+"undertaker@^2.0.0":
+  "integrity" "sha512-tO/bf30wBbTsJ7go80j0RzA2rcwX6o7XPBpeFcb+jzoeb4pfMM2zUeSDIkY1AWqeZabWxaQZ/h8N9t35QKDLPQ=="
+  "resolved" "https://registry.npmjs.org/undertaker/-/undertaker-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    punycode "^2.1.0"
+    "bach" "^2.0.1"
+    "fast-levenshtein" "^3.0.0"
+    "last-run" "^2.0.0"
+    "undertaker-registry" "^2.0.0"
 
-urix@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-  integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==
+"undici-types@~5.26.4":
+  "integrity" "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
+  "resolved" "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz"
+  "version" "5.26.5"
 
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
-
-v8-compile-cache@^2.0.3:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz#cdada8bec61e15865f05d097c5f4fd30e94dc128"
-  integrity sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==
-
-v8flags@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-4.0.1.tgz#98fe6c4308317c5f394d85a435eb192490f7e132"
-  integrity sha512-fcRLaS4H/hrZk9hYwbdRM35D0U8IYMfEClhXxCivOojl+yTRAZH3Zy2sSy6qVCiGbV9YAtPssP6jaChqC9vPCg==
-
-value-or-function@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-4.0.0.tgz#70836b6a876a010dc3a2b884e7902e9db064378d"
-  integrity sha512-aeVK81SIuT6aMJfNo9Vte8Dw0/FZINGBV8BfCraGtqVxIeLAEhJyoWs8SmvRVmXfGss2PmmOwZCuBPbZR+IYWg==
-
-vinyl-contents@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/vinyl-contents/-/vinyl-contents-2.0.0.tgz#cc2ba4db3a36658d069249e9e36d9e2b41935d89"
-  integrity sha512-cHq6NnGyi2pZ7xwdHSW1v4Jfnho4TEGtxZHw01cmnc8+i7jgR6bRnED/LbrKan/Q7CvVLbnvA5OepnhbpjBZ5Q==
+"uri-js@^4.2.2", "uri-js@^4.4.1":
+  "integrity" "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="
+  "resolved" "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"
+  "version" "4.4.1"
   dependencies:
-    bl "^5.0.0"
-    vinyl "^3.0.0"
+    "punycode" "^2.1.0"
 
-vinyl-fs@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-4.0.2.tgz#d46557653e4a7109f29d626a9cf478680c7f8c70"
-  integrity sha512-XRFwBLLTl8lRAOYiBqxY279wY46tVxLaRhSwo3GzKEuLz1giffsOquWWboD/haGf5lx+JyTigCFfe7DWHoARIA==
+"urix@^0.1.0":
+  "integrity" "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg=="
+  "resolved" "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"
+  "version" "0.1.0"
+
+"util-deprecate@^1.0.1", "util-deprecate@~1.0.1":
+  "integrity" "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+  "resolved" "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+  "version" "1.0.2"
+
+"v8-compile-cache@^2.0.3":
+  "integrity" "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw=="
+  "resolved" "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz"
+  "version" "2.4.0"
+
+"v8flags@^4.0.0":
+  "integrity" "sha512-fcRLaS4H/hrZk9hYwbdRM35D0U8IYMfEClhXxCivOojl+yTRAZH3Zy2sSy6qVCiGbV9YAtPssP6jaChqC9vPCg=="
+  "resolved" "https://registry.npmjs.org/v8flags/-/v8flags-4.0.1.tgz"
+  "version" "4.0.1"
+
+"value-or-function@^4.0.0":
+  "integrity" "sha512-aeVK81SIuT6aMJfNo9Vte8Dw0/FZINGBV8BfCraGtqVxIeLAEhJyoWs8SmvRVmXfGss2PmmOwZCuBPbZR+IYWg=="
+  "resolved" "https://registry.npmjs.org/value-or-function/-/value-or-function-4.0.0.tgz"
+  "version" "4.0.0"
+
+"vinyl-contents@^2.0.0":
+  "integrity" "sha512-cHq6NnGyi2pZ7xwdHSW1v4Jfnho4TEGtxZHw01cmnc8+i7jgR6bRnED/LbrKan/Q7CvVLbnvA5OepnhbpjBZ5Q=="
+  "resolved" "https://registry.npmjs.org/vinyl-contents/-/vinyl-contents-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    fs-mkdirp-stream "^2.0.1"
-    glob-stream "^8.0.3"
-    graceful-fs "^4.2.11"
-    iconv-lite "^0.6.3"
-    is-valid-glob "^1.0.0"
-    lead "^4.0.0"
-    normalize-path "3.0.0"
-    resolve-options "^2.0.0"
-    stream-composer "^1.0.2"
-    streamx "^2.14.0"
-    to-through "^3.0.0"
-    value-or-function "^4.0.0"
-    vinyl "^3.0.1"
-    vinyl-sourcemap "^2.0.0"
+    "bl" "^5.0.0"
+    "vinyl" "^3.0.0"
 
-vinyl-sourcemap@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-2.0.0.tgz#422f410a0ea97cb54cebd698d56a06d7a22e0277"
-  integrity sha512-BAEvWxbBUXvlNoFQVFVHpybBbjW1r03WhohJzJDSfgrrK5xVYIDTan6xN14DlyImShgDRv2gl9qhM6irVMsV0Q==
+"vinyl-fs@^4.0.0":
+  "integrity" "sha512-7GbgBnYfaquMk3Qu9g22x000vbYkOex32930rBnc3qByw6HfMEAoELjCjoJv4HuEQxHAurT+nvMHm6MnJllFLw=="
+  "resolved" "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
-    convert-source-map "^2.0.0"
-    graceful-fs "^4.2.10"
-    now-and-later "^3.0.0"
-    streamx "^2.12.5"
-    vinyl "^3.0.0"
-    vinyl-contents "^2.0.0"
+    "fs-mkdirp-stream" "^2.0.1"
+    "glob-stream" "^8.0.0"
+    "graceful-fs" "^4.2.11"
+    "iconv-lite" "^0.6.3"
+    "is-valid-glob" "^1.0.0"
+    "lead" "^4.0.0"
+    "normalize-path" "3.0.0"
+    "resolve-options" "^2.0.0"
+    "stream-composer" "^1.0.2"
+    "streamx" "^2.14.0"
+    "to-through" "^3.0.0"
+    "value-or-function" "^4.0.0"
+    "vinyl" "^3.0.0"
+    "vinyl-sourcemap" "^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.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705"
-  integrity sha512-+oDh3KYZBoZC8hfocrbrxbLUeaYtQK7J5WU5Br9VqWqmCll3tFJqKp97GC9GmMsVIL0qnx2DgEDVxdo5EZ5sSw==
+"vinyl-sourcemap@^2.0.0":
+  "integrity" "sha512-BAEvWxbBUXvlNoFQVFVHpybBbjW1r03WhohJzJDSfgrrK5xVYIDTan6xN14DlyImShgDRv2gl9qhM6irVMsV0Q=="
+  "resolved" "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-2.0.0.tgz"
+  "version" "2.0.0"
   dependencies:
-    source-map "^0.5.1"
+    "convert-source-map" "^2.0.0"
+    "graceful-fs" "^4.2.10"
+    "now-and-later" "^3.0.0"
+    "streamx" "^2.12.5"
+    "vinyl" "^3.0.0"
+    "vinyl-contents" "^2.0.0"
 
-vinyl@^2.0.0, vinyl@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974"
-  integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==
+"vinyl-sourcemaps-apply@^0.2.0", "vinyl-sourcemaps-apply@^0.2.1", "vinyl-sourcemaps-apply@0.2.1":
+  "integrity" "sha512-+oDh3KYZBoZC8hfocrbrxbLUeaYtQK7J5WU5Br9VqWqmCll3tFJqKp97GC9GmMsVIL0qnx2DgEDVxdo5EZ5sSw=="
+  "resolved" "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz"
+  "version" "0.2.1"
   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"
+    "source-map" "^0.5.1"
 
-vinyl@^3.0.0, vinyl@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-3.0.1.tgz#5f5ff85255bda2b5da25e4b3bd80b3fc077fb5a9"
-  integrity sha512-0QwqXteBNXgnLCdWdvPQBX6FXRHtIH3VhJPTd5Lwn28tJXc34YqSCWUmkOvtJHBmB3gGoPtrOKk3Ts8/kEZ9aA==
+"vinyl@^2.0.0", "vinyl@^2.2.1":
+  "integrity" "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw=="
+  "resolved" "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz"
+  "version" "2.2.1"
   dependencies:
-    clone "^2.1.2"
-    remove-trailing-separator "^1.1.0"
-    replace-ext "^2.0.0"
-    teex "^1.0.1"
+    "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@^1.2.14, which@^1.2.9:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+"vinyl@^3.0.0":
+  "integrity" "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g=="
+  "resolved" "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    isexe "^2.0.0"
+    "clone" "^2.1.2"
+    "clone-stats" "^1.0.0"
+    "remove-trailing-separator" "^1.1.0"
+    "replace-ext" "^2.0.0"
+    "teex" "^1.0.1"
 
-which@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+"which@^1.2.14":
+  "integrity" "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="
+  "resolved" "https://registry.npmjs.org/which/-/which-1.3.1.tgz"
+  "version" "1.3.1"
   dependencies:
-    isexe "^2.0.0"
+    "isexe" "^2.0.0"
 
-word-wrap@^1.2.5, word-wrap@~1.2.3:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
-  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
-
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+"which@^1.2.9":
+  "integrity" "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="
+  "resolved" "https://registry.npmjs.org/which/-/which-1.3.1.tgz"
+  "version" "1.3.1"
   dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
+    "isexe" "^2.0.0"
 
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
-
-write@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
-  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
+"which@^2.0.1":
+  "integrity" "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="
+  "resolved" "https://registry.npmjs.org/which/-/which-2.0.2.tgz"
+  "version" "2.0.2"
   dependencies:
-    mkdirp "^0.5.1"
+    "isexe" "^2.0.0"
 
-xtend@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"
-  integrity sha512-vMNKzr2rHP9Dp/e1NQFnLQlwlhp9L/LfvnsVdHxN1f+uggyVI3i08uD14GPvCToPkdsRfyPqIyYGmIk58V98ZQ==
+"word-wrap@^1.2.5", "word-wrap@~1.2.3":
+  "integrity" "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA=="
+  "resolved" "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz"
+  "version" "1.2.5"
+
+"wrap-ansi@^7.0.0":
+  "integrity" "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="
+  "resolved" "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
+  "version" "7.0.0"
   dependencies:
-    object-keys "~0.4.0"
+    "ansi-styles" "^4.0.0"
+    "string-width" "^4.1.0"
+    "strip-ansi" "^6.0.0"
 
-xtend@~4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
-  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
+"wrappy@1":
+  "integrity" "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+  "resolved" "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+  "version" "1.0.2"
 
-y18n@^5.0.5:
-  version "5.0.8"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
-  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
-
-yargs-parser@>=5.0.0-security.0:
-  version "22.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-22.0.0.tgz#87b82094051b0567717346ecd00fd14804b357c8"
-  integrity sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==
-
-yargs-parser@^20.2.2:
-  version "20.2.9"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
-  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
-
-yargs@^16.2.0:
-  version "16.2.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.2.tgz#c56731dca0d2788ae0866dd3c83907d6bab85f7d"
-  integrity sha512-Nt9ZJjXTv5R8MHbqby/wXQ6Gi0Bb3TcYZkR1bzuL4yB2OxWPkXknz513gEF0GoA6tn00UpbPvERW8rzCuWCA6w==
+"write@1.0.3":
+  "integrity" "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig=="
+  "resolved" "https://registry.npmjs.org/write/-/write-1.0.3.tgz"
+  "version" "1.0.3"
   dependencies:
-    cliui "^7.0.2"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.0"
-    y18n "^5.0.5"
-    yargs-parser "^20.2.2"
+    "mkdirp" "^0.5.1"
+
+"xtend@~2.1.1":
+  "integrity" "sha512-vMNKzr2rHP9Dp/e1NQFnLQlwlhp9L/LfvnsVdHxN1f+uggyVI3i08uD14GPvCToPkdsRfyPqIyYGmIk58V98ZQ=="
+  "resolved" "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz"
+  "version" "2.1.2"
+  dependencies:
+    "object-keys" "~0.4.0"
+
+"xtend@~4.0.1":
+  "integrity" "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+  "resolved" "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"
+  "version" "4.0.2"
+
+"y18n@^5.0.5":
+  "integrity" "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
+  "resolved" "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"
+  "version" "5.0.8"
+
+"yargs-parser@^20.2.2":
+  "integrity" "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="
+  "resolved" "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"
+  "version" "20.2.9"
+
+"yargs-parser@>=5.0.0-security.0":
+  "integrity" "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
+  "resolved" "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz"
+  "version" "21.1.1"
+
+"yargs@^16.2.0":
+  "integrity" "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="
+  "resolved" "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"
+  "version" "16.2.0"
+  dependencies:
+    "cliui" "^7.0.2"
+    "escalade" "^3.1.1"
+    "get-caller-file" "^2.0.5"
+    "require-directory" "^2.1.1"
+    "string-width" "^4.2.0"
+    "y18n" "^5.0.5"
+    "yargs-parser" "^20.2.2"