diff --git a/.docker/release/files/etc/nginx/nginx.conf b/.docker/release/files/etc/nginx/nginx.conf
index ed87cb201..aff3829cf 100644
--- a/.docker/release/files/etc/nginx/nginx.conf
+++ b/.docker/release/files/etc/nginx/nginx.conf
@@ -52,6 +52,8 @@ http {
 
   server {
     listen 8888;
+    listen [::]:8888;
+    #listen [::]:8888 ipv6only=off;
     root /snappymail;
     index index.php;
     charset utf-8;
diff --git a/.gitignore b/.gitignore
index b4e8f72e4..5f49d65d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,8 @@
 /vendors/knockout/spec
 /vendors/openpgp-5
 !/vendors/openpgp-5/dist
+/vendors/squire2
+!/vendors/squire2/dist
 /vendors/vanillaqr.js/
 /integrations/nextcloud/rainloop
 /integrations/owncloud/rainloop
diff --git a/.gitmodules b/.gitmodules
index cfb771834..ccf1009a6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,7 @@
 [submodule "vendors/openpgp-5"]
 	path = vendors/openpgp-5
 	url = git@github.com:the-djmaze/openpgpjs.git
+[submodule "vendors/squire2"]
+	path = vendors/squire2
+	url = git@github.com:the-djmaze/Squire.git
+	branch = snappymail
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf59a52bb..e2c804345 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+## 2.38.0 – 2024-09-16
+
+### Added
+- Remove `tel:` links when converting HTML to plain
+  [#1724](https://github.com/the-djmaze/snappymail/issues/1724)
+- Convert HTML to Markdown instead of plain, by using [Turndown](https://github.com/mixmark-io/turndown)
+  [#1604](https://github.com/the-djmaze/snappymail/issues/1604)
+- Check HTMLInputElement.validity() for
+  [#1733](https://github.com/the-djmaze/snappymail/issues/1733)
+
+### Changed
+- Use a modified [Squire 2.3.2](https://github.com/the-djmaze/Squire/commits/snappymail/)
+- cleanHtml use allowedTags instead of disallowedTags and improved CSS handling
+- Update Portuguese by @ner00
+
+### Fixed
+- mXSS exploit found by SonarSource
+  [CVE-2024-45800](https://github.com/the-djmaze/snappymail/security/advisories/GHSA-2rq7-79vp-ffxm)
+- Call to a member function Email() on null
+  [#1706](https://github.com/the-djmaze/snappymail/issues/1706)
+- IMAP capabilities via IMAP Proxy
+  [#1725](https://github.com/the-djmaze/snappymail/issues/1725)
+- Messages on page setting is not validated against 999 max
+  [#1733](https://github.com/the-djmaze/snappymail/issues/1733)
+
+
 ## 2.37.3 – 2024-08-27
 
 ### Added
diff --git a/README.md b/README.md
index cf28becf0..04e17c287 100644
--- a/README.md
+++ b/README.md
@@ -141,27 +141,27 @@ RainLoop 1.17 vs SnappyMail
 |js/*           	|RainLoop 	|Snappy   	|
 |---------------	|--------:	|--------:	|
 |admin.js        	|2.170.153	|   84.203	|
-|app.js          	|4.207.787	|  445.359	|
+|app.js          	|4.207.787	|  446.887	|
 |boot.js         	|  868.735	|    4.343	|
-|libs.js         	|  658.812	|  193.716	|
+|libs.js         	|  658.812	|  236.059	|
 |sieve.js         	|        0	|   84.571	|
 |polyfills.js    	|  334.608	|        0	|
 |serviceworker.js	|        0	|      285	|
-|TOTAL           	|8.240.095	|  812.477	|
+|TOTAL           	|8.240.095	|  856.348	|
 
 |js/min/*       	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|------:	|--------:	|--------:	|
 |admin.min.js    	|  256.831	|   41.256	| 73.606	| 13.940	| 60.877  	| 12.493	|
-|app.min.js      	|  515.367	|  201.270	|139.456	| 68.096	|110.485  	| 58.078	|
+|app.min.js      	|  515.367	|  201.917	|139.456	| 68.450	|110.485  	| 58.321	|
 |boot.min.js     	|   84.659	|    2.231	| 26.998	|  1.271	| 23.643  	|  1.067	|
-|libs.min.js     	|  584.772	|   92.365	|180.901	| 34.487	|155.182  	| 30.830	|
+|libs.min.js     	|  584.772	|  111.742	|180.901	| 39.882	|155.182  	| 35.584	|
 |sieve.min.js     	|        0	|   41.288	|      0	| 10.327	|      0  	|  9.318	|
 |polyfills.min.js	|   32.837	|        0	| 11.406	|      0	| 10.175  	|      0	|
-|TOTAL user      	|1.217.635	|  295.866	|358.761	|103.854	|299.485  	| 89.975	|
-|TOTAL user+sieve	|1.217.635	|  337.154	|358.761	|114.181	|299.485  	| 99.293	|
-|TOTAL admin     	|  959.099	|  135.852	|292.911	| 49.698	|249.877  	| 44.390	|
+|TOTAL user      	|1.217.635	|  315.890	|358.761	|109.603	|299.485  	| 94.972	|
+|TOTAL user+sieve	|1.217.635	|  357.178	|358.761	|119.930	|299.485  	|104.290	|
+|TOTAL admin     	|  959.099	|  155.229	|292.911	| 55.093	|249.877  	| 49.144	|
 
-For a user it is around 68% smaller and faster than traditional RainLoop.
+For a user it is around 67% smaller and faster than traditional RainLoop.
 
 ### CSS changes
 
@@ -188,12 +188,12 @@ For a user it is around 68% smaller and faster than traditional RainLoop.
 
 |css/*       	|RainLoop	|Snappy   	|RL gzip	|SM gzip	|SM brotli	|
 |------------	|-------:	|------:	|------:	|------:	|--------:	|
-|app.css     	| 340.331	| 84.691	| 46.946	| 17.693	| 15.157	|
-|app.min.css 	| 274.947	| 68.052	| 39.647	| 15.589	| 13.610	|
+|app.css     	| 340.331	| 84.850	| 46.946	| 17.710	| 15.161	|
+|app.min.css 	| 274.947	| 68.192	| 39.647	| 15.602	| 13.626	|
 |boot.css    	|       	|  1.326	|       	|    664	|    545	|
 |boot.min.css	|       	|  1.071	|       	|    590	|    474	|
-|admin.css    	|       	| 30.602	|       	|  7.023	|  6.112	|
-|admin.min.css	|       	| 24.717	|       	|  6.346	|  5.586	|
+|admin.css    	|       	| 30.761	|       	|  7.038	|  6.118	|
+|admin.min.css	|       	| 24.857	|       	|  6.360	|  5.598	|
 
 ### PGP
 RainLoop uses the old OpenPGP.js v2
diff --git a/SECURITY.md b/SECURITY.md
index 1b43a988f..faaba8d68 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -6,8 +6,8 @@ Currently due to the fast development only the latest version receives security
 
 | Version  | Supported |
 | -------- | --------- |
-| 2.30.x   | ✔         |
-| < 2.30.0 | ❌         |
+| 2.34.x   | ✔         |
+| < 2.34.0 | ❌         |
 
 ## Reporting a Vulnerability
 
diff --git a/dev/Common/Html.js b/dev/Common/Html.js
index f3a9d82c7..23df1e025 100644
--- a/dev/Common/Html.js
+++ b/dev/Common/Html.js
@@ -4,6 +4,9 @@ import { SettingsUserStore } from 'Stores/User/Settings';
 
 const
 	tmpl = createElement('template'),
+
+	turndown = new TurndownService(),
+
 	htmlre = /[&<>"']/g,
 	httpre = /^(https?:)?\/\//i,
 	htmlmap = {
@@ -14,14 +17,34 @@ const
 		"'": '&#x27;'
 	},
 
-	disallowedTags = [
-		'svg','script','title','link','base','meta',
-		'input','output','select','button','textarea',
-		'bgsound','keygen','source','object','embed','applet','iframe','frame','frameset','video','audio','area','map'
-		// not supported by <template> element
-//		,'html','head','body'
+	keepTagContent = 'form,button,data', // font
+
+	allowedTags = [
+		// Structural Elements:
+		'blockquote','br','div','figcaption','figure','h1','h2','h3','h4','h5','h6','hgroup','hr','p','wbr',
+		'article','aside','header','footer','main','section',
+		'details','summary',
+		// List Elements
+		'dd','dl','dt','li','ol','ul',
+		// Text Formatting Elements
+		'a','abbr','address','b','bdi','bdo','cite','code','del','dfn',
+		'em','i','ins','kbd','mark','pre','q','rp','rt','ruby','s','samp','small',
+		'span','strong','sub','sup','time','u','var',
+		// Deprecated by HTML Standard
+		'acronym','big','center','dir','font','marquee',
+		'nobr','plaintext','rb','rtc','strike','tt',
+		// Media Elements
+		'img',//'picture','source',
+		// Table Elements
+		'caption','col','colgroup','table','tbody','td','tfoot','th','thead','tr',
+		// Disallowed but converted later
+		'style','xmp'
 	].join(','),
 
+	nonEmptyTags = [
+		'A','B','EM','I','SPAN','STRONG'
+	],
+
 	blockquoteSwitcher = () => {
 		SettingsUserStore.collapseBlockquotes() &&
 //		tmpl.content.querySelectorAll('blockquote').forEach(node => {
@@ -99,8 +122,10 @@ const
 	},
 
 	cleanCSS = source =>
-		source.trim().replace(/(^|;)\s*-(ms|webkit)-[^;]+(;|$)/g, '')
-			.replace(/white-space[^;]+(;|$)/g, '')
+		source.trim()
+			.replace(/;\s*-[^;]+/g, '')
+			.replace(/^\s*-[^;]+(;|$)/g, '')
+			.replace(/white-space[^;]+/g, '')
 			// Drop Microsoft Office style properties
 //			.replace(/mso-[^:;]+:[^;]+/gi, '')
 	,
@@ -142,14 +167,15 @@ const
 		if (source) {
 			source = source
 				// strip comments
-				.replace(/\/\*[\s\S]*?\*\/|<!--|-->/gi, '')
-				// strip import statements
-				.replace(/@import .*?;/gi , '')
-				// strip keyframe statements
-				.replace(/((@.*?keyframes [\s\S]*?){([\s\S]*?}\s*?)})/gi, '');
+				.replace(/\/\*[\s\S]*?\*\//gi, '')
+				// strip MS Word comments
+				.replace(/<!--[\s\S]*?-->/gi, '')
+				// strip HTML, as < is no CSS combinator anyway
+				.replace(/<[\s\S]*/gi, '');
+//				.replace(/<\/?[a-z][\s\S]*?>/gi, '');
 
 			// unified regex to match css & media queries together
-			let unified = /((\s*?(?:\/\*[\s\S]*?\*\/)?\s*?@media[\s\S]*?){([\s\S]*?)}\s*?})|(([\s\S]*?){([\s\S]*?)})/gi,
+			let unified = /(?:(\s*?@(?:media)[\s\S]*?){([\s\S]*?)}\s*?})|(?:([\s\S]*?){([\s\S]*?)})/gi,
 				arr;
 
 			while (true) {
@@ -158,7 +184,7 @@ const
 					break;
 				}
 
-				let selector = arr[arr[2] === undefined ? 5 : 2].split('\r\n').join('\n').trim()
+				let selector = arr[arr[2] === undefined ? 3 : 1].split('\r\n').join('\n').trim()
 					// Never have more than a single line break in a row
 					.replace(/\n+/, "\n")
 					// Remove :root and html
@@ -170,13 +196,14 @@ const
 					css.push({
 						selector: selector,
 						type: 'media',
-						subStyles: parseCSS(arr[3] + '\n}') //recursively parse media query inner css
+						subStyles: parseCSS(arr[2] + '\n}') //recursively parse media query inner css
 					});
 				} else if (selector && !selector.includes('@')) {
 					// we have standard css
+					// ignores @import, @keyframe, @font-face statements
 					css.push({
 						selector: selector,
-						rules: cleanCSS(arr[6])
+						rules: cleanCSS(arr[4])
 					});
 				}
 			}
@@ -255,9 +282,6 @@ export const
 				'abbr', 'scope',
 				// td
 				'colspan', 'rowspan', 'headers'
-			],
-			nonEmptyTags = [
-				'A','B','EM','I','SPAN','STRONG'
 			];
 
 		if (SettingsUserStore.allowStyles()) {
@@ -304,13 +328,21 @@ export const
 			}
 		});
 
+		// https://github.com/the-djmaze/snappymail/issues/1125
+		tmpl.content.querySelectorAll(keepTagContent).forEach(oElement => replaceWithChildren(oElement));
+
 		tmpl.content.querySelectorAll(
-			disallowedTags
+			':not('+allowedTags+')'
 			+ (0 < bqLevel ? ',' + (new Array(1 + bqLevel).fill('blockquote').join(' ')) : '')
 		).forEach(oElement => oElement.remove());
-
-		// https://github.com/the-djmaze/snappymail/issues/1125
-		tmpl.content.querySelectorAll('form,button').forEach(oElement => replaceWithChildren(oElement));
+/*		// Is this slower or faster?
+		).forEach(oElement => {
+			if (!node || !node.contains(oElement)) {
+				oElement.remove();
+				node = oElement;
+			}
+		});
+*/
 
 		// https://github.com/the-djmaze/snappymail/issues/1641
 		let body = tmpl.content.querySelector('.mail-body');
@@ -343,6 +375,13 @@ export const
 				return;
 			}
 
+			if ('XMP' === name) {
+				const pre = createElement('pre');
+				pre.innerHTML = encodeHtml(oElement.innerHTML);
+				oElement.replaceWith(pre);
+				return;
+			}
+
 			// \MailSo\Base\HtmlUtils::ClearTags()
 			if ('none' == oStyle.display
 			 || 'hidden' == oStyle.visibility
@@ -429,7 +468,7 @@ export const
 			}
 
 //			if (['CENTER','FORM'].includes(name)) {
-			if ('O:P' === name || (nonEmptyTags.includes(name) && ('' == oElement.textContent.trim()))) {
+			if (nonEmptyTags.includes(name) && ('' == oElement.textContent.trim())) {
 				('A' !== name || !oElement.querySelector('IMG')) && replaceWithChildren(oElement);
 				return;
 			}
@@ -604,6 +643,9 @@ export const
 	 * @returns {string}
 	 */
 	htmlToPlain = html => {
+		if (SettingsUserStore.markdown()) {
+			return htmlToMarkdown(html);
+		}
 		const
 			hr = '⎯'.repeat(64),
 			forEach = (selector, fn) => tmpl.content.querySelectorAll(selector).forEach(fn),
@@ -640,6 +682,8 @@ export const
 			.replace(/<t[dh](\s[\s\S]*?)?>/gi, '\t')
 			.replace(/<\/tr(\s[\s\S]*?)?>/gi, '\n');
 
+		forEach('style', node => node.remove());
+
 		// lines
 		forEach('hr', node => node.replaceWith(`\n\n${hr}\n\n`));
 
@@ -700,6 +744,11 @@ export const
 		return (tmpl.content.textContent || '').trim();
 	},
 
+	htmlToMarkdown = html => {
+		tmpl.innerHTML = html;
+		return turndown.turndown(tmpl.content);
+	},
+
 	/**
 	 * @param {string} plain
 	 * @param {boolean} findEmailAndLinksInText = false
@@ -771,5 +820,7 @@ export const
 
 rl.Utils = {
 	htmlToPlain: htmlToPlain,
-	plainToHtml: plainToHtml
+	plainToHtml: plainToHtml,
+	htmlToMarkdown: htmlToMarkdown
+//	markdownToHtml: md => marked.parse(md)
 };
diff --git a/dev/Common/Links.js b/dev/Common/Links.js
index d5a8f6416..c0923ed58 100644
--- a/dev/Common/Links.js
+++ b/dev/Common/Links.js
@@ -45,6 +45,7 @@ export const
 
 	proxy = url =>
 		BASE + '?/ProxyExternal/'
+//			+ btoa(JSON.stringify([token,url]).replace(/ /g, '%20')).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, ''),
 			+ btoa(url.replace(/ /g, '%20')).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, ''),
 //			+ b64EncodeJSONSafe(url.replace(/ /g, '%20')),
 
diff --git a/dev/External/SquireUI.js b/dev/External/SquireUI.js
index 563f8562f..af2bdff42 100644
--- a/dev/External/SquireUI.js
+++ b/dev/External/SquireUI.js
@@ -109,13 +109,13 @@ class SquireUI
 						cmd: s => squire.setStyle({ fontFamily: s.value })
 					},
 					fontSize: {
-						select: ['11px','13px','16px','20px','24px','30px'],
-						defaultValueIndex: 2,
+						select: [[i18n('GLOBAL/DEFAULT'),''],'11px','13px','16px','20px','24px','30px'],
+						defaultValueIndex: 0,
 						cmd: s => squire.setStyle({ fontSize: s.value })
 						// TODO: maybe consider using https://developer.mozilla.org/en-US/docs/Web/CSS/font-size#values
 						// example:
-						// select: ['xx-small', 'x-small',' small',' medium', 'large', 'x-large', 'xx-large', 'xxx-large'],
-						// defaultValueIndex: 3,
+						// select: ['','xx-small', 'x-small',' small',' medium', 'large', 'x-large', 'xx-large', 'xxx-large'],
+						// defaultValueIndex: 0,
 					},
 // 					dir: {
 // 						select: [
@@ -155,7 +155,7 @@ class SquireUI
 						html: 'B',
 						cmd: () => this.doAction('bold'),
 						key: 'B',
-						matches: 'B,STRONT'
+						matches: 'B,STRONG'
 					},
 					italic: {
 						html: 'I',
@@ -355,6 +355,7 @@ class SquireUI
 							input.append(option);
 						});
 					} else {
+						input.add(new Option(i18n('GLOBAL/DEFAULT'), ''));
 						Object.entries(cfg.select).forEach(([label, options]) => {
 							let group = createElement('optgroup');
 							group.label = label;
@@ -363,7 +364,7 @@ class SquireUI
 								option.style[action] = value;
 								group.append(option);
 							});
-							input.append(group);
+							input.add(group);
 						});
 					}
 					ev = 'input';
@@ -477,15 +478,22 @@ class SquireUI
 
 		// -----
 
-		squire.addEventListener('pathChange', e => {
+		squire.addEventListener('pathChange', () => {
 
 			const squireRoot = squire.getRoot();
-			let elm = e.detail.element;
-
+			let range = squire.getSelection(),
+				collapsed = range.collapsed,
+				elm = collapsed ? range.endContainer : range?.commonAncestorContainer;
+			if (elm && !(elm instanceof Element)) {
+				elm = elm.parentElement;
+			}
 			forEachObjectValue(actions, entries => {
 				forEachObjectValue(entries, cfg => {
-//					cfg.matches && cfg.input.classList.toggle('active', elm && elm.matches(cfg.matches));
-					cfg.matches && cfg.input.classList.toggle('active', elm && elm.closestWithin(cfg.matches, squireRoot));
+					// Check if selection has a matching parent or contains a matching element
+					cfg.matches && cfg.input.classList.toggle('active', !!(elm && (
+						(!collapsed && [...elm.querySelectorAll(cfg.matches)].some(node => range.intersectsNode(node)))
+						 || elm.closestWithin(cfg.matches, squireRoot)
+					)));
 				});
 			});
 
diff --git a/dev/Model/Contact.js b/dev/Model/Contact.js
index 5c254b9c7..3ff94dc35 100644
--- a/dev/Model/Contact.js
+++ b/dev/Model/Contact.js
@@ -245,7 +245,7 @@ export class ContactModel extends AbstractModel {
 			this.namePrefix(),
 			this.nameSuffix()
 		]/*, params, group*/);
-//		jCard.parseFullName({set:true});
+		jCard.parseFullName({set:true});
 
 		['nickname', 'note', 'title'].forEach(field =>
 			this[field]() ? jCard.set(field, this[field]()/*, params, group*/) : jCard.remove(field)
diff --git a/dev/Settings/Admin/Config.js b/dev/Settings/Admin/Config.js
index 9aa954e1f..5c33b13f2 100644
--- a/dev/Settings/Admin/Config.js
+++ b/dev/Settings/Admin/Config.js
@@ -10,7 +10,7 @@ export class AdminSettingsConfig /*extends AbstractViewSettings*/ {
 
 	constructor() {
 		this.config = ko.observableArray();
-		this.search = ko.observableArray();
+		this.search = ko.observable('');
 		this.saved = ko.observable(false).extend({ falseTimeout: 5000 });
 
 		this.search.subscribe(value => {
diff --git a/dev/Settings/Admin/Packages.js b/dev/Settings/Admin/Packages.js
index e0b202d6c..37fd18ee6 100644
--- a/dev/Settings/Admin/Packages.js
+++ b/dev/Settings/Admin/Packages.js
@@ -18,7 +18,8 @@ export class AdminSettingsPackages extends AbstractViewSettings {
 		this.addSettings(['pluginsEnable']);
 
 		addObservablesTo(this, {
-			packagesError: ''
+			packagesError: '',
+			search: ''
 		});
 
 		this.packages = PackageAdminStore;
@@ -30,6 +31,19 @@ export class AdminSettingsPackages extends AbstractViewSettings {
 
 			visibility: () => (PackageAdminStore.loading() ? 'visible' : 'hidden')
 		});
+
+		this.search.subscribe(value => {
+			const v = value.toLowerCase(),
+				qsa = (node, selector, fn) => node.querySelectorAll(selector).forEach(fn),
+				match = node => node.textContent.toLowerCase().includes(v);
+			if (v.length) {
+				qsa(this.viewModelDom, 'td:first-child', td => {
+					td.parentNode.hidden = !match(td);
+				});
+			} else {
+				qsa(this.viewModelDom, 'tr[hidden]', n => n.hidden = false);
+			}
+		});
 	}
 
 	onShow() {
diff --git a/dev/Settings/User/General.js b/dev/Settings/User/General.js
index edeb3e2de..a05a3227d 100644
--- a/dev/Settings/User/General.js
+++ b/dev/Settings/User/General.js
@@ -62,7 +62,7 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 		 'viewHTML', 'viewImages', 'viewImagesWhitelist', 'removeColors', 'allowStyles', 'allowDraftAutosave',
 		 'hideDeleted', 'listInlineAttachments', 'simpleAttachmentsList', 'collapseBlockquotes',
 		 'useCheckboxesInList', 'listGrouped', 'replySameFolder', 'allowSpellcheck',
-		 'messageReadAuto', 'showNextMessage', 'messageNewWindow'
+		 'messageReadAuto', 'showNextMessage', 'messageNewWindow', 'markdown'
 		].forEach(name => this[name] = SettingsUserStore[name]);
 
 		this.allowLanguagesOnSettings = !!SettingsGet('allowLanguagesOnSettings');
@@ -123,7 +123,7 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 			'ViewHTML', 'ViewImages', 'ViewImagesWhitelist', 'RemoveColors', 'AllowStyles', 'AllowDraftAutosave',
 			'HideDeleted', 'ListInlineAttachments', 'simpleAttachmentsList', 'CollapseBlockquotes',
 			'UseCheckboxesInList', 'listGrouped', 'ReplySameFolder', 'allowSpellcheck',
-			'messageReadAuto', 'showNextMessage', 'messageNewWindow',
+			'messageReadAuto', 'showNextMessage', 'messageNewWindow', 'markdown',
 			'DesktopNotifications', 'SoundNotification']);
 
 		const fReloadLanguageHelper = (saveSettingsStep) => () => {
diff --git a/dev/Sieve/Commands.js b/dev/Sieve/Commands.js
index 45c2199c2..e2c59e5fa 100644
--- a/dev/Sieve/Commands.js
+++ b/dev/Sieve/Commands.js
@@ -15,7 +15,6 @@ import {
 } from 'Sieve/Commands/Actions';
 
 import {
-	ConditionalCommand,
 	ElsIfCommand,
 	ElseCommand,
 	IfCommand,
@@ -49,6 +48,7 @@ import { NotifyCommand, ValidNotifyMethodTest, NotifyMethodCapabilityTest } from
 import { IHaveTest, ErrorCommand } from 'Sieve/Extensions/rfc5463';
 import { MailboxExistsTest, MetadataTest, MetadataExistsTest } from 'Sieve/Extensions/rfc5490';
 import { ForEveryPartCommand, BreakCommand, ReplaceCommand, EncloseCommand, ExtractTextCommand } from 'Sieve/Extensions/rfc5703';
+import { ValidExtListTest } from 'Sieve/Extensions/rfc6134';
 import { IncludeCommand, ReturnCommand, GlobalCommand } from 'Sieve/Extensions/rfc6609';
 
 export const
@@ -67,7 +67,6 @@ export const
 		IfCommand,
 		ElsIfCommand,
 		ElseCommand,
-		ConditionalCommand,
 		RequireCommand,
 		StopCommand,
 		// Action commands
@@ -129,6 +128,8 @@ export const
 		ReplaceCommand,
 		EncloseCommand,
 		ExtractTextCommand,
+		// rfc6134
+		ValidExtListTest,
 		// rfc6609
 		IncludeCommand,
 		ReturnCommand,
@@ -146,6 +147,17 @@ export const
 		return commands;
 	},
 
+	unavailableCommands = () => {
+		let commands = {};
+		AllCommands.forEach(cmd => {
+			const obj = new cmd, requires = obj.require;
+			if (requires && !(Array.isArray(requires) ? requires : [requires]).every(string => capa.includes(string))) {
+				commands[obj.identifier] = cmd;
+			}
+		});
+		return commands;
+	},
+
 	availableActions = () => {
 		let actions = {}, id;
 		AllCommands.forEach(cmd => {
diff --git a/dev/Sieve/Commands/Actions.js b/dev/Sieve/Commands/Actions.js
index 3d0665a7d..d38f5bcc3 100644
--- a/dev/Sieve/Commands/Actions.js
+++ b/dev/Sieve/Commands/Actions.js
@@ -21,6 +21,10 @@ export class FileIntoCommand extends ActionCommand
 		super();
 		// QuotedString / MultiLine
 		this._mailbox = new GrammarQuotedString();
+		// https://datatracker.ietf.org/doc/html/rfc3894
+		this.copy = false;
+		// https://datatracker.ietf.org/doc/html/rfc5490#section-3.2
+		this.create = false;
 	}
 
 	get require() { return 'fileinto'; }
@@ -28,9 +32,7 @@ export class FileIntoCommand extends ActionCommand
 	toString()
 	{
 		return 'fileinto'
-			// https://datatracker.ietf.org/doc/html/rfc3894
 			+ ((this.copy && capa.includes('copy')) ? ' :copy' : '')
-			// https://datatracker.ietf.org/doc/html/rfc5490#section-3.2
 			+ ((this.create && capa.includes('mailbox')) ? ' :create' : '')
 			+ ' ' + this._mailbox
 			+ ';';
@@ -64,15 +66,17 @@ export class RedirectCommand extends ActionCommand
 		super();
 		// QuotedString / MultiLine
 		this._address = new GrammarQuotedString();
+		// https://datatracker.ietf.org/doc/html/rfc3894
+		this.copy = false;
+		// https://datatracker.ietf.org/doc/html/rfc6134#section-2.3
+		this.list = null;
 	}
 
 	toString()
 	{
 
 		return 'redirect'
-			// https://datatracker.ietf.org/doc/html/rfc6134#section-2.3
 //			+ ((this.list && capa.includes('extlists')) ? ' :list ' + this.list : '')
-			// https://datatracker.ietf.org/doc/html/rfc3894
 			+ ((this.copy && capa.includes('copy')) ? ' :copy' : '')
 			+ ' ' + this._address
 			+ ';';
diff --git a/dev/Sieve/Commands/Controls.js b/dev/Sieve/Commands/Controls.js
index 20144d457..a82ed6f9a 100644
--- a/dev/Sieve/Commands/Controls.js
+++ b/dev/Sieve/Commands/Controls.js
@@ -5,6 +5,7 @@
 
 import {
 	ControlCommand,
+	GrammarCommands,
 	GrammarStringList,
 	GrammarQuotedString
 } from 'Sieve/Grammar';
@@ -16,37 +17,55 @@ import {
  *    elsif <test2: test> <block2: block>
  *    else <block3: block>
  */
-export class ConditionalCommand extends ControlCommand
+export /*abstract*/ class ConditionalCommand extends ControlCommand
 {
-	constructor(identifier)
+	constructor()
 	{
-		super(identifier);
-		this.test = null;
-	}
-
-	toString()
-	{
-		return this.identifier + ' ' + this.test + ' ' + this.commands;
-	}
 /*
-	public function pushArguments(array $args): void
-	{
-		args.forEach((arg, i) => {
-			if (i && ':' === args[i-1][0]) {
-				this[args[i-1].replace(':','_')].value = arg.value;
-			}
-		});
-		print_r($args);
-		exit;
-	}
+		if (this.constructor == ConditionalCommand) {
+			throw Error("Abstract class can't be instantiated.");
+		}
 */
+		super();
+		this.commands = new GrammarCommands;
+	}
 }
 
 export class IfCommand extends ConditionalCommand
 {
+	constructor()
+	{
+		super();
+		this._test = null; // must be descendent instanceof TestCommand
+	}
+
+	get test()
+	{
+		return this._test;
+	}
+
+	set test(value)
+	{
+/*
+		if (!value instanceof TestCommand) {
+			throw Error("test must be descendent instanceof TestCommand.");
+		}
+*/
+		this._test = value;
+	}
+
+	toString()
+	{
+/*
+		if (!this._test instanceof TestCommand) {
+			throw Error("test must be descendent instanceof TestCommand.");
+		}
+*/
+		return this.identifier + ' ' + this._test + ' ' + this.commands;
+	}
 }
 
-export class ElsIfCommand extends ConditionalCommand
+export class ElsIfCommand extends IfCommand
 {
 }
 
diff --git a/dev/Sieve/Commands/Tests.js b/dev/Sieve/Commands/Tests.js
index 15664220d..093b746a2 100644
--- a/dev/Sieve/Commands/Tests.js
+++ b/dev/Sieve/Commands/Tests.js
@@ -40,7 +40,7 @@ export class AddressTest extends TestCommand
 		this.header_list  = new GrammarStringList;
 		this.key_list     = new GrammarStringList;
 		// rfc5260#section-6
-		this.index        = new GrammarNumber;
+		this.index        = new GrammarNumber('');
 		this.last         = false;
 		// rfc5703#section-6
 //		this.mime
@@ -68,9 +68,10 @@ export class AddressTest extends TestCommand
 		}
 		return result
 			+ (this.last ? ' :last' : (this.index.value ? ' :index ' + this.index : ''))
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
 			+ ' ' + this.address_part
-			+ ' ' + this.match_type
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
 			+ ' ' + this.header_list
 			+ ' ' + this.key_list;
 	}
@@ -147,9 +148,10 @@ export class EnvelopeTest extends TestCommand
 	toString()
 	{
 		return 'envelope'
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
 			+ ' ' + this.address_part
-			+ ' ' + this.match_type
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
 			+ ' ' + this.envelope_part
 			+ ' ' + this.key_list;
 	}
@@ -234,7 +236,7 @@ export class HeaderTest extends TestCommand
 		this.header_names = new GrammarStringList;
 		this.key_list     = new GrammarStringList;
 		// rfc5260#section-6
-		this.index        = new GrammarNumber;
+		this.index        = new GrammarNumber('');
 		this.last         = false;
 		// rfc5703#section-6
 		this.mime         = false;
@@ -279,8 +281,9 @@ export class HeaderTest extends TestCommand
 		}
 		return result
 			+ (this.last ? ' :last' : (this.index.value ? ' :index ' + this.index : ''))
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
-			+ ' ' + this.match_type
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
 			+ ' ' + this.header_names
 			+ ' ' + this.key_list;
 	}
@@ -316,11 +319,6 @@ export class NotTest extends TestCommand
 	{
 		return 'not ' + this.test;
 	}
-
-	pushArguments()
-	{
-		throw 'No arguments';
-	}
 }
 
 /**
diff --git a/dev/Sieve/Extensions/rfc5173.js b/dev/Sieve/Extensions/rfc5173.js
index d538735a4..d72b97f89 100644
--- a/dev/Sieve/Extensions/rfc5173.js
+++ b/dev/Sieve/Extensions/rfc5173.js
@@ -22,8 +22,9 @@ export class BodyTest extends TestCommand
 	toString()
 	{
 		return 'body'
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
-			+ ' ' + this.match_type
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
 			+ ' ' + this.body_transform
 			+ ' ' + this.key_list;
 	}
diff --git a/dev/Sieve/Extensions/rfc5183.js b/dev/Sieve/Extensions/rfc5183.js
index 7e8ff1388..65e51961b 100644
--- a/dev/Sieve/Extensions/rfc5183.js
+++ b/dev/Sieve/Extensions/rfc5183.js
@@ -13,24 +13,28 @@ export class EnvironmentTest extends TestCommand
 	constructor()
 	{
 		super();
-		this.name     = new GrammarQuotedString;
+		this._name    = new GrammarQuotedString;
 		this.key_list = new GrammarStringList;
 	}
 
+	get name() { return this._name.value; }
+	set name(v) { this._name.value = v; }
+
 	get require() { return 'environment'; }
 
 	toString()
 	{
 		return 'environment'
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
-			+ ' ' + this.match_type
-			+ ' ' + this.name
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
+			+ ' ' + this._name
 			+ ' ' + this.key_list;
 	}
 
 	pushArguments(args)
 	{
 		this.key_list = args.pop();
-		this.name     = args.pop();
+		this._name    = args.pop();
 	}
 }
diff --git a/dev/Sieve/Extensions/rfc5229.js b/dev/Sieve/Extensions/rfc5229.js
index bb23ab983..794260185 100644
--- a/dev/Sieve/Extensions/rfc5229.js
+++ b/dev/Sieve/Extensions/rfc5229.js
@@ -21,6 +21,12 @@ export class SetCommand extends ActionCommand
 
 	get require() { return 'variables'; }
 
+	get name()     { return this._name.value; }
+	set name(str)  { this._name.value = str; }
+
+	get value()    { return this._value.value; }
+	set value(str) { this._value.value = str; }
+
 	toString()
 	{
 		return 'set'
@@ -29,12 +35,6 @@ export class SetCommand extends ActionCommand
 			+ ' ' + this._value;
 	}
 
-	get name()     { return this._name.value; }
-	set name(str)  { this._name.value = str; }
-
-	get value()    { return this._value.value; }
-	set value(str) { this._value.value = str; }
-
 	pushArguments(args)
 	{
 		[':lower', ':upper', ':lowerfirst', ':upperfirst', ':quotewildcard', ':length'].forEach(modifier => {
@@ -57,8 +57,9 @@ export class StringTest extends TestCommand
 	toString()
 	{
 		return 'string'
-			+ ' ' + this.match_type
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
 			+ ' ' + this.source
 			+ ' ' + this.key_list;
 	}
diff --git a/dev/Sieve/Extensions/rfc5230.js b/dev/Sieve/Extensions/rfc5230.js
index 1bc340236..a5937a3bd 100644
--- a/dev/Sieve/Extensions/rfc5230.js
+++ b/dev/Sieve/Extensions/rfc5230.js
@@ -30,33 +30,6 @@ export class VacationCommand extends ActionCommand
 //	get require() { return ['vacation','vacation-seconds']; }
 	get require() { return 'vacation'; }
 
-	toString()
-	{
-		let result = 'vacation';
-		if (0 < this._seconds.value && capa.includes('vacation-seconds')) {
-			result += ' :seconds ' + this._seconds;
-		} else if (0 < this._days.value) {
-			result += ' :days ' + this._days;
-		}
-		if (this._subject.length) {
-			result += ' :subject ' + this._subject;
-		}
-		if (this._from.length) {
-			result += ' :from ' + this._from;
-//			result += ' :from ' + this.arguments[':from'];
-		}
-		if (this.addresses.length) {
-			result += ' :addresses ' + this.addresses;
-		}
-		if (this.mime) {
-			result += ' :mime';
-		}
-		if (this._handle.length) {
-			result += ' :handle ' + this._handle;
-		}
-		return result + ' ' + this._reason;
-	}
-
 	get days()      { return this._days.value; }
 	get seconds()   { return this._seconds.value; }
 	get subject()   { return this._subject.value; }
@@ -71,6 +44,32 @@ export class VacationCommand extends ActionCommand
 	set handle(str)  { this._handle.value = str; }
 	set reason(str)  { this._reason.value = str; }
 
+	toString()
+	{
+		let result = 'vacation';
+		if (0 < this._seconds.value && capa.includes('vacation-seconds')) {
+			result += ' :seconds ' + this._seconds;
+		} else if (0 < this._days.value) {
+			result += ' :days ' + this._days;
+		}
+		if (this._subject.length) {
+			result += ' :subject ' + this._subject;
+		}
+		if (this._from.length) {
+			result += ' :from ' + this._from;
+		}
+		if (this.addresses.length) {
+			result += ' :addresses ' + this.addresses;
+		}
+		if (this.mime) {
+			result += ' :mime';
+		}
+		if (this._handle.length) {
+			result += ' :handle ' + this._handle;
+		}
+		return result + ' ' + this._reason;
+	}
+
 	pushArguments(args)
 	{
 		this._reason.value = args.pop().value; // GrammarQuotedString
@@ -81,7 +80,8 @@ export class VacationCommand extends ActionCommand
 				this.addresses = arg; // GrammarStringList
 			} else if (i && ':' === args[i-1][0]) {
 				// :days, :seconds, :subject, :from, :handle
-				this[args[i-1].replace(':','_')].value = arg.value;
+				let p = args[i-1].replace(':','_');
+				this[p] ? (this[p].value = arg.value) : console.log('Unknown VacationCommand :' + p);
 			}
 		});
 	}
diff --git a/dev/Sieve/Extensions/rfc5232.js b/dev/Sieve/Extensions/rfc5232.js
index 002ad0b7a..ea56261f5 100644
--- a/dev/Sieve/Extensions/rfc5232.js
+++ b/dev/Sieve/Extensions/rfc5232.js
@@ -43,11 +43,12 @@ class FlagCommand extends ActionCommand
 			if (args[0] instanceof GrammarQuotedString) {
 				this._variablename = args[0];
 			}
-			if (args[1] instanceof GrammarString) {
-				this.list_of_flags = args[1];
-			}
-		} else if (args[0] instanceof GrammarString) {
+			args[0] = args[1];
+		}
+		if (args[0] instanceof GrammarStringList) {
 			this.list_of_flags = args[0];
+		} else if (args[0]) {
+			this.list_of_flags.push(args[0]);
 		}
 	}
 }
@@ -78,8 +79,9 @@ export class HasFlagTest extends TestCommand
 	toString()
 	{
 		return 'hasflag'
-			+ ' ' + this.match_type
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
 			+ ' ' + this.variable_list
 			+ ' ' + this.list_of_flags;
 	}
diff --git a/dev/Sieve/Extensions/rfc5235.js b/dev/Sieve/Extensions/rfc5235.js
index 5561a1a5e..ac1e8406e 100644
--- a/dev/Sieve/Extensions/rfc5235.js
+++ b/dev/Sieve/Extensions/rfc5235.js
@@ -4,7 +4,6 @@
 
 import {
 	GrammarQuotedString,
-	GrammarString,
 	TestCommand
 } from 'Sieve/Grammar';
 
@@ -14,19 +13,23 @@ export class SpamTestTest extends TestCommand
 	{
 		super();
 		this.percent = false, // 0 - 100 else 0 - 10
-		this.value = new GrammarQuotedString;
+		this._value = new GrammarQuotedString;
 	}
 
 //	get require() { return this.percent ? 'spamtestplus' : 'spamtest'; }
-	get require() { return /:value|:count/.test(this.match_type) ? ['spamtestplus','relational'] : 'spamtestplus'; }
+	get require() { return /:value|:count/.test(this._match_type) ? ['spamtestplus','relational'] : 'spamtestplus'; }
+
+	get value() { return this._value.value; }
+	set value(v) { this._value.value = v; }
 
 	toString()
 	{
 		return 'spamtest'
 			+ (this.percent ? ' :percent' : '')
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
-			+ ' ' + this.match_type
-			+ ' ' + this.value;
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
+			+ ' ' + this._value;
 	}
 
 	pushArguments(args)
@@ -34,8 +37,8 @@ export class SpamTestTest extends TestCommand
 		args.forEach(arg => {
 			if (':percent' === arg) {
 				this.percent = true;
-			} else if (arg instanceof GrammarString) {
-				this.value = arg;
+			} else if (arg instanceof GrammarQuotedString) {
+				this._value = arg;
 			}
 		});
 	}
@@ -46,24 +49,28 @@ export class VirusTestTest extends TestCommand
 	constructor()
 	{
 		super();
-		this.value = new GrammarQuotedString; // 1 - 5
+		this._value = new GrammarQuotedString; // 1 - 5
 	}
 
-	get require() { return /:value|:count/.test(this.match_type) ? ['virustest','relational'] : 'virustest'; }
+	get require() { return ':value' == this._match_type ? ['virustest','relational'] : 'virustest'; }
+
+	get value() { return this._value.value; }
+	set value(v) { this._value.value = v; }
 
 	toString()
 	{
 		return 'virustest'
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
-			+ ' ' + this.match_type
-			+ ' ' + this.value;
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
+			+ ' ' + this._value;
 	}
 
 	pushArguments(args)
 	{
 		args.forEach(arg => {
-			if (arg instanceof GrammarString) {
-				this.value = arg;
+			if (arg instanceof GrammarQuotedString) {
+				this._value = arg;
 			}
 		});
 	}
diff --git a/dev/Sieve/Extensions/rfc5260.js b/dev/Sieve/Extensions/rfc5260.js
index df1653049..2745a2087 100644
--- a/dev/Sieve/Extensions/rfc5260.js
+++ b/dev/Sieve/Extensions/rfc5260.js
@@ -14,10 +14,10 @@ export class DateTest extends TestCommand
 	constructor()
 	{
 		super();
-		this.zone         = new GrammarQuotedString;
+		this._zone        = new GrammarQuotedString;
 		this.originalzone = false;
-		this.header_name  = new GrammarQuotedString;
-		this.date_part    = new GrammarQuotedString;
+		this._header_name = new GrammarQuotedString;
+		this._date_part   = new GrammarQuotedString;
 		this.key_list     = new GrammarStringList;
 		// rfc5260#section-6
 		this.index        = new GrammarNumber;
@@ -27,30 +27,40 @@ export class DateTest extends TestCommand
 //	get require() { return ['date','index']; }
 	get require() { return 'date'; }
 
+	get zone() { return this._zone.value; }
+	set zone(v) { this._zone.value = v; }
+
+	get header_name() { return this._header_name.value; }
+	set header_name(v) { this._header_name.value = v; }
+
+	get date_part() { return this._date_part.value; }
+	set date_part(v) { this._date_part.value = v; }
+
 	toString()
 	{
 		return 'date'
 			+ (this.last ? ' :last' : (this.index.value ? ' :index ' + this.index : ''))
-			+ (this.originalzone ? ' :originalzone' : (this.zone.length ? ' :zone ' + this.zone : ''))
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
-			+ ' ' + this.match_type
-			+ ' ' + this.header_name
-			+ ' ' + this.date_part
+			+ (this.originalzone ? ' :originalzone' : (this._zone.length ? ' :zone ' + this._zone : ''))
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
+			+ ' ' + this._header_name
+			+ ' ' + this._date_part
 			+ ' ' + this.key_list;
 	}
 
 	pushArguments(args)
 	{
 		this.key_list = args.pop();
-		this.date_part = args.pop();
-		this.header_name = args.pop();
+		this._date_part = args.pop();
+		this._header_name = args.pop();
 		args.forEach((arg, i) => {
 			if (':originalzone' === arg) {
 				this.originalzone = true;
 			} else if (':last' === arg) {
 				this.last = true;
 			} else if (i && ':zone' === args[i-1]) {
-				this.zone.value = arg.value;
+				this._zone.value = arg.value;
 			} else if (i && ':index' === args[i-1]) {
 				this.index.value = arg.value;
 			}
@@ -63,30 +73,37 @@ export class CurrentDateTest extends TestCommand
 	constructor()
 	{
 		super();
-		this.zone       = new GrammarQuotedString;
-		this.date_part  = new GrammarQuotedString;
+		this._zone      = new GrammarQuotedString;
+		this._date_part = new GrammarQuotedString;
 		this.key_list   = new GrammarStringList;
 	}
 
 	get require() { return 'date'; }
 
+	get zone() { return this._zone.value; }
+	set zone(v) { this._zone.value = v; }
+
+	get date_part() { return this._date_part.value; }
+	set date_part(v) { this._date_part.value = v; }
+
 	toString()
 	{
 		return 'currentdate'
-			+ (this.zone.length ? ' :zone ' + this.zone : '')
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
-			+ ' ' + this.match_type
-			+ ' ' + this.date_part
+			+ (this._zone.length ? ' :zone ' + this._zone : '')
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
+			+ ' ' + this._date_part
 			+ ' ' + this.key_list;
 	}
 
 	pushArguments(args)
 	{
 		this.key_list = args.pop();
-		this.date_part = args.pop();
+		this._date_part = args.pop();
 		args.forEach((arg, i) => {
 			if (i && ':zone' === args[i-1]) {
-				this.zone.value = arg.value;
+				this._zone.value = arg.value;
 			}
 		});
 	}
diff --git a/dev/Sieve/Extensions/rfc5293.js b/dev/Sieve/Extensions/rfc5293.js
index c3067d612..8b9a6a1b8 100644
--- a/dev/Sieve/Extensions/rfc5293.js
+++ b/dev/Sieve/Extensions/rfc5293.js
@@ -16,24 +16,30 @@ export class AddHeaderCommand extends ActionCommand
 	{
 		super();
 		this.last       = false;
-		this.field_name = new GrammarQuotedString;
-		this.value      = new GrammarQuotedString;
+		this._field_name = new GrammarQuotedString;
+		this._value      = new GrammarQuotedString;
 	}
 
 	get require() { return 'editheader'; }
 
+	get field_name() { return this._field_name.value; }
+	set field_name(v) { this._field_name.value = v; }
+
+	get value() { return this._value.value; }
+	set value(v) { this._value.value = v; }
+
 	toString()
 	{
 		return this.identifier
 			+ (this.last ? ' :last' : '')
-			+ ' ' + this.field_name
-			+ ' ' + this.value + ';';
+			+ ' ' + this._field_name
+			+ ' ' + this._value + ';';
 	}
 
 	pushArguments(args)
 	{
-		this.value = args.pop();
-		this.field_name = args.pop();
+		this._value = args.pop();
+		this._field_name = args.pop();
 		this.last = args.includes(':last');
 	}
 }
@@ -47,19 +53,22 @@ export class DeleteHeaderCommand extends ActionCommand
 		this.last           = false;
 		this.comparator     = '',
 		this.match_type     = ':is',
-		this.field_name     = new GrammarQuotedString;
+		this._field_name    = new GrammarQuotedString;
 		this.value_patterns = new GrammarStringList;
 	}
 
 	get require() { return 'editheader'; }
 
+	get field_name() { return this._field_name.value; }
+	set field_name(v) { this._field_name.value = v; }
+
 	toString()
 	{
 		return this.identifier
 			+ (this.last ? ' :last' : (this.index.value ? ' :index ' + this.index : ''))
 			+ (this.comparator ? ' :comparator ' + this.comparator : '')
 			+ ' ' + this.match_type
-			+ ' ' + this.field_name
+			+ ' ' + this._field_name
 			+ ' ' + this.value_patterns + ';';
 	}
 
@@ -76,10 +85,10 @@ export class DeleteHeaderCommand extends ActionCommand
 		});
 
 		if (l && args[l-1] instanceof GrammarString) {
-			this.field_name = args[l-1];
+			this._field_name = args[l-1];
 			this.value_patterns = args[l];
 		} else {
-			this.field_name = args[l];
+			this._field_name = args[l];
 		}
 	}
 }
diff --git a/dev/Sieve/Extensions/rfc5429.js b/dev/Sieve/Extensions/rfc5429.js
index 984fa2eb9..d33aead7c 100644
--- a/dev/Sieve/Extensions/rfc5429.js
+++ b/dev/Sieve/Extensions/rfc5429.js
@@ -8,11 +8,11 @@ import {
 	GrammarString
 } from 'Sieve/Grammar';
 
-class rfc5429Command extends ActionCommand
+class /*abstract*/ rfc5429Command extends ActionCommand
 {
-	constructor(identifier)
+	constructor()
 	{
-		super(identifier);
+		super();
 		this._reason = new GrammarQuotedString;
 	}
 
@@ -44,7 +44,6 @@ class rfc5429Command extends ActionCommand
  */
 export class ErejectCommand extends rfc5429Command
 {
-	constructor() { super('ereject'); }
 	get require() { return 'ereject'; }
 }
 
@@ -53,6 +52,5 @@ export class ErejectCommand extends rfc5429Command
  */
 export class RejectCommand extends rfc5429Command
 {
-	constructor() { super('reject'); }
 	get require() { return 'reject'; }
 }
diff --git a/dev/Sieve/Extensions/rfc5435.js b/dev/Sieve/Extensions/rfc5435.js
index a77560ca8..b6f040096 100644
--- a/dev/Sieve/Extensions/rfc5435.js
+++ b/dev/Sieve/Extensions/rfc5435.js
@@ -26,14 +26,16 @@ export class NotifyCommand extends ActionCommand
 	}
 
 	get method()     { return this._method.value; }
-	get from()       { return this._from.value; }
-	get importance() { return this._importance.value; }
-	get message()    { return this._message.value; }
+	set method(str)  { this._method.value = str; }
 
-	set method(str)     { this._method.value = str; }
-	set from(str)       { this._from.value = str; }
+	get from()       { return this._from.value; }
+	set from(str)    { this._from.value = str; }
+
+	get importance() { return this._importance.value; }
 	set importance(int) { this._importance.value = int; }
-	set message(str)    { this._message.value = str; }
+
+	get message()    { return this._message.value; }
+	set message(str) { this._message.value = str; }
 
 	get require() { return 'enotify'; }
 
@@ -63,7 +65,8 @@ export class NotifyCommand extends ActionCommand
 				this.options = arg; // GrammarStringList
 			} else if (i && ':' === args[i-1][0]) {
 				// :from, :importance, :message
-				this[args[i-1].replace(':','_')].value = arg.value;
+				let p = args[i-1].replace(':','_');
+				this[p] ? (this[p].value = arg.value) : console.log('Unknown VacationCommand :' + p);
 			}
 		});
 	}
@@ -99,25 +102,32 @@ export class NotifyMethodCapabilityTest extends TestCommand
 	constructor()
 	{
 		super();
-		this.notification_uri = new GrammarQuotedString;
-		this.notification_capability = new GrammarQuotedString;
+		this._notification_uri = new GrammarQuotedString;
+		this._notification_capability = new GrammarQuotedString;
 		this.key_list = new GrammarStringList;
 	}
 
+	get notification_uri() { return this._notification_uri.value; }
+	set notification_uri(v) { this._notification_uri.value = v; }
+
+	get notification_capability() { return this._notification_capability.value; }
+	set notification_capability(v) { this._notification_capability.value = v; }
+
 	toString()
 	{
 		return 'valid_notify_method '
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
-			+ (this.match_type ? ' ' + this.match_type : '')
-			+ this.notification_uri
-			+ this.notification_capability
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
+			+ this._notification_uri
+			+ this._notification_capability
 			+ this.key_list;
 	}
 
 	pushArguments(args)
 	{
 		this.key_list = args.pop();
-		this.notification_capability = args.pop();
-		this.notification_uri = args.pop();
+		this._notification_capability = args.pop();
+		this._notification_uri = args.pop();
 	}
 }
diff --git a/dev/Sieve/Extensions/rfc5463.js b/dev/Sieve/Extensions/rfc5463.js
index 68166f275..31d91f47a 100644
--- a/dev/Sieve/Extensions/rfc5463.js
+++ b/dev/Sieve/Extensions/rfc5463.js
@@ -41,18 +41,21 @@ export class ErrorCommand extends ControlCommand
 	constructor()
 	{
 		super();
-		this.message = new GrammarQuotedString;
+		this._message = new GrammarQuotedString;
 	}
 
 	get require() { return 'ihave'; }
 
+	get message() { return this._message.value; }
+	set message(v) { this._message.value = v; }
+
 	toString()
 	{
-		return 'error ' + this.message + ';';
+		return 'error ' + this._message + ';';
 	}
 
 	pushArguments(args)
 	{
-		this.message = args.pop();
+		this._message = args.pop();
 	}
 }
diff --git a/dev/Sieve/Extensions/rfc5490.js b/dev/Sieve/Extensions/rfc5490.js
index 14a087b1d..94f7605b7 100644
--- a/dev/Sieve/Extensions/rfc5490.js
+++ b/dev/Sieve/Extensions/rfc5490.js
@@ -42,28 +42,35 @@ export class MetadataTest extends TestCommand
 	constructor()
 	{
 		super();
-		this.mailbox = new GrammarQuotedString;
-		this.annotation_name = new GrammarQuotedString;
+		this._mailbox = new GrammarQuotedString;
+		this._annotation_name = new GrammarQuotedString;
 		this.key_list = new GrammarStringList;
 	}
 
 	get require() { return 'mboxmetadata'; }
 
+	get mailbox() { return this._mailbox.value; }
+	set mailbox(v) { this._mailbox.value = v; }
+
+	get annotation_name() { return this._annotation_name.value; }
+	set annotation_name(v) { this._annotation_name.value = v; }
+
 	toString()
 	{
 		return 'metadata '
-			+ ' ' + this.match_type
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
-			+ ' ' + this.mailbox
-			+ ' ' + this.annotation_name
+			+ ' ' + this._match_type
+			+ (this.relational_match ? ' ' + this.relational_match : '')
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
+			+ ' ' + this._mailbox
+			+ ' ' + this._annotation_name
 			+ ' ' + this.key_list;
 	}
 
 	pushArguments(args)
 	{
 		this.key_list = args.pop();
-		this.annotation_name = args.pop();
-		this.mailbox = args.pop();
+		this._annotation_name = args.pop();
+		this._mailbox = args.pop();
 	}
 }
 
@@ -75,23 +82,26 @@ export class MetadataExistsTest extends TestCommand
 	constructor()
 	{
 		super();
-		this.mailbox = new GrammarQuotedString;
+		this._mailbox = new GrammarQuotedString;
 		this.annotation_names = new GrammarStringList;
 	}
 
 	get require() { return 'mboxmetadata'; }
 
+	get mailbox() { return this._mailbox.value; }
+	set mailbox(v) { this._mailbox.value = v; }
+
 	toString()
 	{
 		return 'metadataexists '
-			+ ' ' + this.mailbox
+			+ ' ' + this._mailbox
 			+ ' ' + this.annotation_names;
 	}
 
 	pushArguments(args)
 	{
 		this.annotation_names = args.pop();
-		this.mailbox = args.pop();
+		this._mailbox = args.pop();
 	}
 }
 
@@ -103,25 +113,29 @@ export class ServerMetadataTest extends TestCommand
 	constructor()
 	{
 		super();
-		this.annotation_name = new GrammarQuotedString;
+		this._annotation_name = new GrammarQuotedString;
 		this.key_list = new GrammarStringList;
 	}
 
 	get require() { return 'servermetadata'; }
 
+	get annotation_name() { return this._annotation_name.value; }
+	set annotation_name(v) { this._annotation_name.value = v; }
+
 	toString()
 	{
 		return 'servermetadata '
-			+ ' ' + this.match_type
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
-			+ ' ' + this.annotation_name
+			+ ' ' + this._match_type
+			+ (this.relational_match ? ' ' + this.relational_match : '')
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
+			+ ' ' + this._annotation_name
 			+ ' ' + this.key_list;
 	}
 
 	pushArguments(args)
 	{
 		this.key_list = args.pop();
-		this.annotation_name = args.pop();
+		this._annotation_name = args.pop();
 	}
 }
 
diff --git a/dev/Sieve/Extensions/rfc5703.js b/dev/Sieve/Extensions/rfc5703.js
index c0b5322e8..552e04c2f 100644
--- a/dev/Sieve/Extensions/rfc5703.js
+++ b/dev/Sieve/Extensions/rfc5703.js
@@ -5,6 +5,7 @@
 import {
 	ActionCommand,
 	ControlCommand,
+	GrammarCommands,
 	GrammarNumber,
 	GrammarQuotedString,
 	GrammarString,
@@ -19,7 +20,8 @@ export class ForEveryPartCommand extends ControlCommand
 	constructor()
 	{
 		super();
-		this._name = new GrammarString;
+		this.name = new GrammarString;
+		this.commands = new GrammarCommands;
 	}
 
 	get require() { return 'foreverypart'; }
@@ -27,8 +29,8 @@ export class ForEveryPartCommand extends ControlCommand
 	toString()
 	{
 		let result = 'foreverypart';
-		if (this._subject.length) {
-			result += ' :name ' + this._name;
+		if (this.name.length) {
+			result += ' :name ' + this.name;
 		}
 		return result + ' ' + this.commands;
 	}
@@ -37,19 +39,22 @@ export class ForEveryPartCommand extends ControlCommand
 	{
 		args.forEach((arg, i) => {
 			if (':name' === arg) {
-				this._name.value = args[i+1].value;
+				this.name.value = args[i+1].value;
 			}
 		});
 	}
 }
 
+/**
+ * Must be inside foreverypart
+ */
 export class BreakCommand extends ForEveryPartCommand
 {
 	toString()
 	{
 		let result = 'break';
-		if (this._subject.length) {
-			result += ' :name ' + this._name;
+		if (this.name.length) {
+			result += ' :name ' + this.name;
 		}
 		return result + ';';
 	}
@@ -63,14 +68,23 @@ export class ReplaceCommand extends ActionCommand
 	constructor()
 	{
 		super();
-		this.mime        = false;
-		this._subject    = new GrammarQuotedString;
-		this._from       = new GrammarQuotedString;
-		this.replacement = new GrammarQuotedString;
+		this.mime         = false;
+		this._subject     = new GrammarQuotedString;
+		this._from        = new GrammarQuotedString;
+		this._replacement = new GrammarQuotedString;
 	}
 
 	get require() { return 'replace'; }
 
+	get subject()     { return this._subject.value; }
+	set subject(str)  { this._subject.value = str; }
+
+	get from()        { return this._from.value; }
+	set from(str)     { this._from.value = str; }
+
+	get replacement()    { return this._replacement.value; }
+	set replacement(str) { this._replacement.value = str; }
+
 	toString()
 	{
 		let result = 'replace';
@@ -82,20 +96,20 @@ export class ReplaceCommand extends ActionCommand
 		}
 		if (this._from.length) {
 			result += ' :from ' + this._from;
-//			result += ' :from ' + this.arguments[':from'];
 		}
-		return result + this.replacement + ';';
+		return result + this._replacement + ';';
 	}
 
 	pushArguments(args)
 	{
-		this.replacement = args.pop();
+		this._replacement = args.pop();
 		args.forEach((arg, i) => {
 			if (':mime' === arg) {
 				this.mime = true;
 			} else if (i && ':' === args[i-1][0]) {
 				// :subject, :from
-				this[args[i-1].replace(':','_')].value = arg.value;
+				let p = args[i-1].replace(':','_');
+				this[p] ? (this[p].value = arg.value) : console.log('Unknown VacationCommand :' + p);
 			}
 		});
 	}
@@ -115,6 +129,9 @@ export class EncloseCommand extends ActionCommand
 
 	get require() { return 'enclose'; }
 
+	get subject()  { return this._subject.value; }
+	set subject(v) { this._subject.value = v; }
+
 	toString()
 	{
 		let result = 'enclose';
@@ -132,7 +149,8 @@ export class EncloseCommand extends ActionCommand
 		args.forEach((arg, i) => {
 			if (i && ':' === args[i-1][0]) {
 				// :subject, :headers
-				this[args[i-1].replace(':','_')].value = arg.value;
+				let p = args[i-1].replace(':','_');
+				this[p] ? (this[p].value = arg.value) : console.log('Unknown VacationCommand :' + p);
 			}
 		});
 	}
@@ -140,6 +158,7 @@ export class EncloseCommand extends ActionCommand
 
 /**
  * https://datatracker.ietf.org/doc/html/rfc5703#section-7
+ * Should be inside foreverypart, else empty and flagged as a compilation error
  */
 export class ExtractTextCommand extends ActionCommand
 {
@@ -148,9 +167,12 @@ export class ExtractTextCommand extends ActionCommand
 		super();
 		this.modifiers = [];
 		this._first    = new GrammarNumber;
-		this.varname   = new GrammarQuotedString;
+		this._varname  = new GrammarQuotedString;
 	}
 
+	get varname()  { return this._varname.value; }
+	set varname(v) { this._varname.value = v; }
+
 	get require() { return 'extracttext'; }
 
 	toString()
@@ -160,12 +182,12 @@ export class ExtractTextCommand extends ActionCommand
 		if (0 < this._first.value) {
 			result += ' :first ' + this._first;
 		}
-		return result + ' ' + this.varname + ';';
+		return result + ' ' + this._varname + ';';
 	}
 
 	pushArguments(args)
 	{
-		this.varname = args.pop();
+		this._varname = args.pop();
 		[':lower', ':upper', ':lowerfirst', ':upperfirst', ':quotewildcard', ':length'].forEach(modifier => {
 			args.includes(modifier) && this.modifiers.push(modifier);
 		});
diff --git a/dev/Sieve/Extensions/rfc6134.js b/dev/Sieve/Extensions/rfc6134.js
index 872938eab..1bdb7c8b0 100644
--- a/dev/Sieve/Extensions/rfc6134.js
+++ b/dev/Sieve/Extensions/rfc6134.js
@@ -14,7 +14,7 @@ export class ValidExtListTest extends TestCommand
 {
 	constructor()
 	{
-		super();
+		super('valid_ext_list');
 		this.ext_list_names = new GrammarStringList;
 	}
 
diff --git a/dev/Sieve/Extensions/rfc6609.js b/dev/Sieve/Extensions/rfc6609.js
index 4cd5d19ec..8d7fd74ae 100644
--- a/dev/Sieve/Extensions/rfc6609.js
+++ b/dev/Sieve/Extensions/rfc6609.js
@@ -16,18 +16,21 @@ export class IncludeCommand extends ControlCommand
 		this.global = false; // ':personal' / ':global';
 		this.once = false;
 		this.optional = false;
-		this.value = new GrammarQuotedString;
+		this._value = new GrammarQuotedString;
 	}
 
 	get require() { return 'include'; }
 
+	get value() { return this._value.value; }
+	set value(v) { this._value.value = v; }
+
 	toString()
 	{
 		return 'include'
 			+ (this.global ? ' :global' : '')
 			+ (this.once ? ' :once' : '')
 			+ (this.optional ? ' :optional' : '')
-			+ ' ' + this.value + ';';
+			+ ' ' + this._value + ';';
 	}
 
 	pushArguments(args)
@@ -36,7 +39,7 @@ export class IncludeCommand extends ControlCommand
 			if (':global' === arg || ':once' === arg || ':optional' === arg) {
 				this[arg.slice(1)] = true;
 			} else if (arg instanceof GrammarQuotedString) {
-				this.value = arg;
+				this._value = arg;
 			}
 		});
 	}
diff --git a/dev/Sieve/Grammar.js b/dev/Sieve/Grammar.js
index 95a142c11..595a34bda 100644
--- a/dev/Sieve/Grammar.js
+++ b/dev/Sieve/Grammar.js
@@ -9,7 +9,7 @@ import {
 	MULTILINE_DOTSTART
 } from 'Sieve/RegEx';
 
-import { arrayToString, getMatchTypes } from 'Sieve/Utils';
+import { arrayToString, getMatchTypes, getComparators } from 'Sieve/Utils';
 
 /**
  * abstract
@@ -18,7 +18,7 @@ export class GrammarString /*extends String*/
 {
 	constructor(value = '')
 	{
-		this._value = value;
+		this._value = value.toString ? value.toString() : value;
 	}
 
 	toString()
@@ -45,41 +45,41 @@ export class GrammarString /*extends String*/
 /**
  * abstract
  */
-export class GrammarComment extends GrammarString
+export /*abstract*/ class GrammarComment extends GrammarString
 {
+/*
+	constructor()
+	{
+		if (this.constructor == GrammarComment) {
+			throw Error("Abstract class can't be instantiated.");
+		}
+	}
+*/
 }
 
 /**
  * https://tools.ietf.org/html/rfc5228#section-2.9
  */
-export class GrammarCommand
+const cmdNameSuffix = /(test|command|action)$/;
+export /*abstract*/ class GrammarCommand
 {
 	constructor(identifier)
 	{
-		this.identifier = identifier || this.constructor.name.toLowerCase().replace(/(test|command|action)$/, '');
-		this.arguments = [];
-		this.commands = new GrammarCommands;
+/*
+		if (this.constructor == GrammarCommand) {
+			throw Error("Abstract class can't be instantiated.");
+		}
+*/
+		this.identifier = identifier || this.constructor.name.toLowerCase().replace(cmdNameSuffix, '');
 	}
 
 	toString()
 	{
 		let result = this.identifier;
-		if (this.arguments.length) {
+		if (this.arguments?.length) {
 			result += ' ' + arrayToString(this.arguments, ' ');
 		}
-		return result + (
-			this.commands.length ? ' ' + this.commands : ';'
-		);
-	}
-
-	getComparators()
-	{
-		return ['i;ascii-casemap'];
-	}
-
-	getMatchTypes()
-	{
-		return [':is', ':contains', ':matches'];
+		return result + ';';
 	}
 
 	pushArguments(args)
@@ -108,78 +108,107 @@ export class GrammarCommands extends Array
 /**
  * https://tools.ietf.org/html/rfc5228#section-3
  */
-export class ControlCommand extends GrammarCommand
+export /*abstract*/ class ControlCommand extends GrammarCommand
 {
+/*
 	constructor(identifier)
 	{
-		super(identifier);
-		this.commands = new GrammarCommands;
-	}
-
-	toString()
-	{
-		let result = this.identifier;
-		if (this.arguments.length) {
-			result += ' ' + arrayToString(this.arguments, ' ');
+		if (this.constructor == ControlCommand) {
+			throw Error("Abstract class can't be instantiated.");
 		}
-		return result + (
-			this.commands.length ? ' ' + this.commands : ';'
-		);
-	}
-
-	getComparators()
-	{
-		return ['i;ascii-casemap'];
-	}
-
-	getMatchTypes()
-	{
-		return [':is', ':contains', ':matches'];
+		super(identifier);
 	}
+*/
 }
 
 /**
  * https://tools.ietf.org/html/rfc5228#section-4
  */
-export class ActionCommand extends GrammarCommand
+export /*abstract*/ class ActionCommand extends GrammarCommand
 {
+/*
 	constructor(identifier)
 	{
+		if (this.constructor == ActionCommand) {
+			throw Error("Abstract class can't be instantiated.");
+		}
 		super(identifier);
 	}
-
-	toString()
-	{
-		let result = this.identifier;
-		if (this.arguments.length) {
-			result += ' ' + arrayToString(this.arguments, ' ');
-		}
-		return result + ';'
-	}
+*/
 }
 
 /**
  * https://tools.ietf.org/html/rfc5228#section-5
  */
-export class TestCommand extends GrammarCommand
+export /*abstract*/ class TestCommand extends GrammarCommand
 {
 	constructor(identifier)
 	{
+/*
+		if (this.constructor == TestCommand) {
+			throw Error("Abstract class can't be instantiated.");
+		}
+*/
 		super(identifier);
 		// Almost every test has a comparator and match_type, so define them here
-		this.comparator = '';
-		this.match_type = ':is';
+		this._comparator = '';
+		this._match_type = '';
+		this.relational_match = ''; // GrammarQuotedString DQUOTE ( "gt" / "ge" / "lt" / "le" / "eq" / "ne" ) DQUOTE
+	}
+
+	get require() { return /:value|:count/.test(this._match_type) ? 'relational' : ''; }
+
+	get match_type()
+	{
+		return this._match_type;
+	}
+	set match_type(value)
+	{
+		// default?
+		if (':is' == value) {
+			value = '';
+		}
+		if (value.length && !getMatchTypes(0).includes(value)) {
+			throw 'Unsupported match-type ' + value;
+		}
+		if (':list' == value) {
+			this._comparator = '';
+		}
+		if (':count' != value && ':value' != value) {
+			this.relational_match = '';
+		}
+		this._match_type = value;
+	}
+
+	get comparator()
+	{
+		return this._comparator;
+	}
+	set comparator(value)
+	{
+		if (!(value instanceof GrammarQuotedString)) {
+			value = new GrammarQuotedString(value);
+		}
+		// default?
+		if (value.length && 'i;ascii-casemap' != value.value) {
+			if (':list' == this._match_type) {
+				throw 'Comparator not allowed when using :list';
+			}
+			if (!getComparators().includes(value.value)) {
+				throw 'Unsupported comparator ' + value;
+			}
+			this._comparator = value;
+		} else {
+			this._comparator = '';
+		}
 	}
 
 	toString()
 	{
-		// https://datatracker.ietf.org/doc/html/rfc6134#section-2.3
-		if (!getMatchTypes().includes(this.match_type)) {
-			throw 'Unsupported match-type ' + this.match_type;
-		}
 		return (this.identifier
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
-			+ (this.match_type ? ' ' + this.match_type : '')
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
 			+ ' ' + arrayToString(this.arguments, ' ')).trim();
 	}
 }
@@ -251,6 +280,7 @@ export class GrammarStringList extends Array
 {
 	toString()
 	{
+		// if there is only a single string, the brackets are optional
 		if (1 < this.length) {
 			return '[' + this.join(',') + ']';
 		}
@@ -259,7 +289,7 @@ export class GrammarStringList extends Array
 
 	push(value)
 	{
-		if (!(value instanceof GrammarString)) {
+		if (!(value instanceof GrammarQuotedString)) {
 			value = new GrammarQuotedString(value);
 		}
 		super.push(value);
@@ -286,10 +316,14 @@ GrammarStringList.fromString = list => {
 
 export class GrammarQuotedString extends GrammarString
 {
+	constructor(value = '')
+	{
+		super(value instanceof GrammarQuotedString ? value.value : value);
+	}
+
 	toString()
 	{
 		return '"' + this._value.replace(/[\\"]/g, '\\$&') + '"';
-//		return '"' + super.toString().replace(/[\\"]/g, '\\$&') + '"';
 	}
 }
 
@@ -324,3 +358,23 @@ GrammarMultiLine.fromString = string => {
 	}
 	return new GrammarMultiLine();
 }
+
+export class UnknownCommand extends GrammarCommand
+{
+	constructor(identifier)
+	{
+		super(identifier);
+		this.commands = new GrammarCommands;
+	}
+
+	toString()
+	{
+		let result = this.identifier;
+		if (this.arguments?.length) {
+			result += ' ' + arrayToString(this.arguments, ' ');
+		}
+		return result + (
+			this.commands?.length ? ' ' + this.commands : ';'
+		);
+	}
+}
diff --git a/dev/Sieve/Parser.js b/dev/Sieve/Parser.js
index ce929d24e..8515d28b6 100644
--- a/dev/Sieve/Parser.js
+++ b/dev/Sieve/Parser.js
@@ -18,6 +18,7 @@ import {
 import {
 	GrammarBracketComment,
 	GrammarCommand,
+	GrammarComment,
 	GrammarHashComment,
 	GrammarMultiLine,
 	GrammarNumber,
@@ -27,8 +28,8 @@ import {
 	GrammarTestList
 } from 'Sieve/Grammar';
 
-import { availableCommands } from 'Sieve/Commands';
-import { ConditionalCommand, RequireCommand } from 'Sieve/Commands/Controls';
+import { availableCommands, unavailableCommands } from 'Sieve/Commands';
+import { ConditionalCommand, IfCommand, RequireCommand } from 'Sieve/Commands/Controls';
 import { NotTest } from 'Sieve/Commands/Tests';
 
 const
@@ -92,6 +93,7 @@ export const parseScript = (script, name = 'script.sieve') => {
 
 	// Only activate available commands
 	const Commands = availableCommands();
+	const disabledCommands = unavailableCommands();
 
 	let match,
 		line = 1,
@@ -117,18 +119,20 @@ export const parseScript = (script, name = 'script.sieve') => {
 			let prev_arg = args[args.length-1];
 			if (getMatchTypes(0).includes(arg)) {
 				command.match_type = arg;
-			} else if (':value' === prev_arg || ':count' === prev_arg) {
-				// Sieve relational [RFC5231] match types
-				/^(gt|ge|lt|le|eq|ne)$/.test(arg.value) || error('Invalid relational match-type ' + arg);
-				command.match_type = prev_arg + ' ' + arg;
+			} else if (getMatchTypes(0).includes(prev_arg)) {
 				--args.length;
-//				requires.push('relational');
+				if (':value' === prev_arg || ':count' === prev_arg) {
+					// Sieve relational [RFC5231] match types
+					/^"(gt|ge|lt|le|eq|ne)"$/.test(arg) || error('Invalid relational match-type ' + arg);
+					command.relational_match = arg;
+//					requires.push('relational');
+					return;
+				}
 			} else if (':comparator' === prev_arg) {
 				command.comparator = arg;
 				--args.length;
-			} else {
-				args.push(arg);
 			}
+			args.push(arg);
 		},
 		pushArgs = () => {
 			if (args.length) {
@@ -154,27 +158,30 @@ export const parseScript = (script, name = 'script.sieve') => {
 			pushArgs();
 			value = value.toLowerCase();
 			let new_command;
-			if ('if' === value) {
-				new_command = new ConditionalCommand(value);
-			} else if ('elsif' === value || 'else' === value) {
-//				(prev_command instanceof ConditionalCommand) || error('Not after IF condition');
-				new_command = new ConditionalCommand(value);
-			} else if (Commands[value]) {
+			if (Commands[value]) {
+				if ('elsif' === value || 'else' === value) {
+					let valid = false, cmd = (command ? command?.commands : tree), i = cmd?.length;
+					while (i) {
+						cmd[--i];
+						if (cmd[i] instanceof IfCommand) {
+							valid = true;
+							break;
+						} else if (typeof cmd[i] !== 'string' && !(cmd[i] instanceof GrammarComment)) {
+							break;
+						}
+					}
+					valid || error('Not after IF/ELSIF condition');
+				}
 				if ('allof' === value || 'anyof' === value) {
 //					(command instanceof ConditionalCommand || command instanceof NotTest) || error('Test-list not in conditional');
 				}
 				new_command = new Commands[value]();
+			} else if (disabledCommands[value]) {
+				console.error('Unsupported command: ' + value);
+				new_command = new disabledCommands[value]();
 			} else {
-				if (command && (
-				    command instanceof ConditionalCommand
-				 || command instanceof NotTest
-				 || command.tests instanceof GrammarTestList)) {
-					console.error('Unknown test: ' + value);
-					new_command = new TestCommand(value);
-				} else {
-					console.error('Unknown command: ' + value);
-					new_command = new GrammarCommand(value);
-				}
+				console.error('Unknown command: ' + value);
+				new_command = new GrammarCommand(value);
 			}
 
 			if (new_command instanceof TestCommand) {
@@ -192,7 +199,7 @@ export const parseScript = (script, name = 'script.sieve') => {
 				if (command.commands) {
 					command.commands.push(new_command);
 				} else {
-					error('commands not allowed in "' + command.identifier + '" command');
+					error('command "' + new_command.identifier + '" not allowed in "' + command.identifier + '" command');
 				}
 			} else {
 				tree.push(new_command);
@@ -219,7 +226,8 @@ export const parseScript = (script, name = 'script.sieve') => {
 			pushArg(GrammarMultiLine.fromString(value));
 			break;
 		case T_QUOTED_STRING:
-			pushArg(new GrammarQuotedString(value.slice(1,-1)));
+			try { value = JSON.parse(value); } catch(e) { console.error(e, value); }
+			pushArg(new GrammarQuotedString(value));
 			break;
 		case T_NUMBER:
 			pushArg(new GrammarNumber(value));
@@ -268,7 +276,6 @@ export const parseScript = (script, name = 'script.sieve') => {
 			break;
 		case T_BLOCK_END:
 			(command instanceof ConditionalCommand) || error(TokenError[type]);
-//			prev_command = command;
 			command = levels.up();
 			break;
 
@@ -293,5 +300,6 @@ export const parseScript = (script, name = 'script.sieve') => {
 	}
 
 	tree.requires = requires;
+	tree.toString = () => tree.join('\r\n');
 	return tree;
 };
diff --git a/dev/Sieve/Utils.js b/dev/Sieve/Utils.js
index 14c58101a..5f5d13f07 100644
--- a/dev/Sieve/Utils.js
+++ b/dev/Sieve/Utils.js
@@ -22,7 +22,7 @@ export const
 	koComputable = fn => ko.computed(fn, {'pure':true}),
 
 	arrayToString = (arr, separator) =>
-		arr.map(item => item.toString?.() || item).join(separator),
+		(arr || []).map(item => item.toString?.() || item).join(separator),
 /*
 	getNotificationMessage = code => {
 		let key = getKeyByValue(Notifications, code);
@@ -58,11 +58,33 @@ export const
 		serverErrorDesc(text);
 	},
 
+	getComparators = (validOnly = 0) => {
+		let result = [
+			// Default
+			'i;ascii-casemap',
+		];
+		if (capa.includes('relational') || !validOnly) {
+			result.push('i;octet');
+		}
+		if (capa.includes('comparator-i;ascii-numeric') || !validOnly) {
+			result.push('i;ascii-numeric');
+		}
+		if (capa.includes('comparator-i;unicode-casemap') || !validOnly) {
+			result.push('i;unicode-casemap');
+		}
+		return result;
+	},
+
 	getMatchTypes = (validOnly = 1) => {
 		let result = [':is',':contains',':matches'];
 		// https://datatracker.ietf.org/doc/html/rfc6134#section-2.3
+		// Only available for tests with a key_list property
 		if (capa.includes('extlists') || !validOnly) {
 			result.push(':list');
 		}
+		if (capa.includes('relational') || !validOnly) {
+			result.push(':value');
+			result.push(':count');
+		}
 		return result;
 	};
diff --git a/dev/Stores/User/Settings.js b/dev/Stores/User/Settings.js
index 98d9620c6..382c74289 100644
--- a/dev/Stores/User/Settings.js
+++ b/dev/Stores/User/Settings.js
@@ -50,6 +50,7 @@ export const SettingsUserStore = new class {
 			layout: 1,
 			editorDefaultType: 'Html',
 			editorWysiwyg: 'Squire',
+			markdown: 0,
 			msgDefaultAction: 1
 		});
 
@@ -113,7 +114,8 @@ export const SettingsUserStore = new class {
 			'requireTLS',
 			'pgpSign',
 			'pgpEncrypt',
-			'allowSpellcheck'
+			'allowSpellcheck',
+			'markdown'
 /*
 			'MessagesPerPage',
 			'MessageReadDelay',
diff --git a/dev/Styles/Admin/Plugin.less b/dev/Styles/Admin/Plugin.less
index 9459a1c5a..c42d4f3c9 100644
--- a/dev/Styles/Admin/Plugin.less
+++ b/dev/Styles/Admin/Plugin.less
@@ -34,4 +34,9 @@
 		display: block;
 	}
 
+	.tab-content {
+		grid-column-end: 3;
+		border: 1px solid var(--border-color, #ddd);
+		padding: 10px;
+	}
 }
diff --git a/dev/View/Popup/Plugin.js b/dev/View/Popup/Plugin.js
index 4761cc72b..ff597b915 100644
--- a/dev/View/Popup/Plugin.js
+++ b/dev/View/Popup/Plugin.js
@@ -18,7 +18,11 @@ export class PluginPopupView extends AbstractViewPopup {
 			saveError: '',
 			id: '',
 			name: '',
-			readme: ''
+			readme: '',
+			author: '',
+			url: '',
+			version: '',
+			released: ''
 		});
 
 		this.config = ko.observableArray();
@@ -73,12 +77,20 @@ export class PluginPopupView extends AbstractViewPopup {
 		this.id('');
 		this.name('');
 		this.readme('');
+		this.author('');
+		this.url('');
+		this.version('');
+		this.released('');
 		this.config([]);
 
 		if (oPlugin) {
 			this.id(oPlugin.id);
 			this.name(oPlugin.name);
 			this.readme(oPlugin.readme);
+			this.author(oPlugin.author);
+			this.url(oPlugin.url);
+			this.version(oPlugin.version);
+			this.released(oPlugin.released);
 
 			const config = oPlugin.config;
 			if (arrayLength(config)) {
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index 5f4778d97..599a4c1cc 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.37.3</upstream>.
+This app packages SnappyMail <upstream>2.38.0</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index 7d0b64200..c95b06a13 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.37.3
+VERSION=2.38.0
 RUN wget https://github.com/the-djmaze/snappymail/releases/download/v${VERSION}/snappymail-${VERSION}.zip -O /tmp/snappymail.zip && \
     unzip /tmp/snappymail.zip -d /app/code && \
     rm /tmp/snappymail.zip && \
diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml
index de7367d97..dd1346e87 100644
--- a/integrations/nextcloud/snappymail/appinfo/info.xml
+++ b/integrations/nextcloud/snappymail/appinfo/info.xml
@@ -3,7 +3,7 @@
 	<id>snappymail</id>
 	<name>SnappyMail</name>
 	<summary>SnappyMail Webmail</summary>
-	<version>2.37.3</version>
+	<version>2.38.0</version>
 	<licence>agpl</licence>
 	<author>SnappyMail, RainLoop Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli</author>
 	<description><![CDATA[**Lightweight & fast email client.**
diff --git a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
index 5cf37e6e1..80a93d061 100644
--- a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
+++ b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
@@ -90,26 +90,23 @@ class SnappyMailHelper
 				}
 */
 				if ($doLogin && $aCredentials[1] && $aCredentials[2]) {
+					$isOIDC = \str_starts_with($aCredentials[2], 'oidc_login|');
 					try {
 						$ocSession = \OC::$server->getSession();
-						if ($ocSession->get('is_oidc')) {
-							$pwd = new \SnappyMail\SensitiveString($aCredentials[1]);
-							$oAccount = $oActions->LoginProcess($aCredentials[1], $pwd);
-							if ($oAccount) {
-								$oActions->SetSignMeToken($oAccount);
-							}
-						} else {
-							$oAccount = $oActions->LoginProcess($aCredentials[1], $aCredentials[2]);
-							if ($oAccount && $oConfig->Get('login', 'sign_me_auto', \RainLoop\Enumerations\SignMeType::DefaultOff) === \RainLoop\Enumerations\SignMeType::DefaultOn) {
-								$oActions->SetSignMeToken($oAccount);
-							}	
+						$oAccount = $oActions->LoginProcess($aCredentials[1], $aCredentials[2]);
+						if (!$isOIDC && $oAccount
+						 && $oConfig->Get('login', 'sign_me_auto', \RainLoop\Enumerations\SignMeType::DefaultOff) === \RainLoop\Enumerations\SignMeType::DefaultOn
+						) {
+							$oActions->SetSignMeToken($oAccount);
 						}
 					} catch (\Throwable $e) {
 						// Login failure, reset password to prevent more attempts
-						$sUID = \OC::$server->getUserSession()->getUser()->getUID();
-						\OC::$server->getSession()['snappymail-passphrase'] = '';
-						\OC::$server->getConfig()->setUserValue($sUID, 'snappymail', 'passphrase', '');
-						\SnappyMail\Log::error('Nextcloud', $e->getMessage());
+						if (!$isOIDC) {
+							$sUID = \OC::$server->getUserSession()->getUser()->getUID();
+							\OC::$server->getSession()['snappymail-passphrase'] = '';
+							\OC::$server->getConfig()->setUserValue($sUID, 'snappymail', 'passphrase', '');
+							\SnappyMail\Log::error('Nextcloud', $e->getMessage());
+						}
 					}
 				}
 			}
@@ -126,6 +123,32 @@ class SnappyMailHelper
 		}
 	}
 
+	// Check if OpenID Connect (OIDC) is enabled and used for login
+	// https://apps.nextcloud.com/apps/oidc_login
+	public static function isOIDCLogin() : bool
+	{
+		$config = \OC::$server->getConfig();
+		if ($config->getAppValue('snappymail', 'snappymail-autologin-oidc', false)) {
+			// Check if the OIDC Login app is enabled
+			if (\OC::$server->getAppManager()->isEnabledForUser('oidc_login')) {
+				// Check if session is an OIDC Login
+				$ocSession = \OC::$server->getSession();
+				if ($ocSession->get('is_oidc')) {
+					// IToken->getPassword() ???
+					if ($ocSession->get('oidc_access_token')) {
+						return true;
+					}
+					\SnappyMail\Log::debug('Nextcloud', 'OIDC access_token missing');
+				} else {
+					\SnappyMail\Log::debug('Nextcloud', 'No OIDC login');
+				}
+			} else {
+				\SnappyMail\Log::debug('Nextcloud', 'OIDC login disabled');
+			}
+		}
+		return false;
+	}
+
 	private static function getLoginCredentials() : array
 	{
 		$sUID = \OC::$server->getUserSession()->getUser()->getUID();
@@ -151,18 +174,9 @@ class SnappyMailHelper
 		if ($ocSession['snappymail-nc-uid'] == $sUID) {
 
 			// If OpenID Connect (OIDC) is enabled and used for login, use this.
-			// https://apps.nextcloud.com/apps/oidc_login
-			if ($config->getAppValue('snappymail', 'snappymail-autologin-oidc', false)) {
-				if ($ocSession->get('is_oidc')) {
-					// IToken->getPassword() ???
-					if ($sAccessToken = $ocSession->get('oidc_access_token')) {
-						$sEmail = $config->getUserValue($sUID, 'settings', 'email');
-						return [$sUID, $sEmail, $sAccessToken];
-					}
-					\SnappyMail\Log::debug('Nextcloud', 'OIDC access_token missing');
-				} else {
-					\SnappyMail\Log::debug('Nextcloud', 'No OIDC login');
-				}
+			if (static::isOIDCLogin()) {
+				$sEmail = $config->getUserValue($sUID, 'settings', 'email');
+				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 646185e81..15b9e39ab 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.37.3" );
+return ( "2.38.0" );
 }
 
 sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index 0ba9b480c..197882be5 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.37.3",
+  "version": "2.38.0",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",
diff --git a/plugins/README.md b/plugins/README.md
index dcd129e09..7e318c186 100644
--- a/plugins/README.md
+++ b/plugins/README.md
@@ -124,11 +124,20 @@ $Plugin->addHook('hook.name', 'functionName');
 	params:
 		string &$sEmail
 
+	Happens in resolveLoginCredentials($sEmail) BEFORE resolving domain name.
+	This is the pure text from the login screen (DoLogin) or the SSO feature (ServiceSso) received by LoginProcess().
+	- DoLogin() -> LoginProcess() -> resolveLoginCredentials($sEmail)
+	- ServiceSso() -> LoginProcess() -> resolveLoginCredentials($sEmail)
+	So $sEmail can just have the value `test` without a domain.
+
 ### login.credentials.step-2
 	params:
 		string &$sEmail
 		string &$sPassword
 
+	Happens in resolveLoginCredentials($sEmail) AFTER resolving domain name.
+	So $sEmail always has a domain (for example `test` is now `test@example.com`).
+
 ### login.credentials
 	params:
 		string &$sEmail
@@ -136,6 +145,10 @@ $Plugin->addHook('hook.name', 'functionName');
 		string &$sPassword
 		string &$sSmtpUser
 
+		$sEmail is the domain imap->fixUsername() without shortening.
+		$sImapUser is the domain imap->fixUsername() for login into IMAP.
+		$sSmtpUser is the domain smtp->fixUsername() for login into SMTP.
+
 ### login.success
 	params:
 		\RainLoop\Model\MainAccount $oAccount
diff --git a/plugins/cache-memcache/Memcache.php b/plugins/cache-memcache/Memcache.php
index f967ad687..30a2812c2 100644
--- a/plugins/cache-memcache/Memcache.php
+++ b/plugins/cache-memcache/Memcache.php
@@ -47,7 +47,10 @@ class Memcache implements \MailSo\Cache\DriverInterface
 
 	public function Set(string $sKey, string $sValue) : bool
 	{
-		return $this->oMem ? $this->oMem->set($this->generateCachedKey($sKey), $sValue, 0, $this->iExpire) : false;
+		if ($this->oMem instanceof \Memcache) {
+			return $this->oMem->set($this->generateCachedKey($sKey), $sValue, 0, $this->iExpire);
+		}
+		return $this->oMem ? $this->oMem->set($this->generateCachedKey($sKey), $sValue, $this->iExpire) : false;
 	}
 
 	public function Exists(string $sKey) : bool
diff --git a/plugins/cache-memcache/index.php b/plugins/cache-memcache/index.php
index 6a7354e13..7760ab398 100644
--- a/plugins/cache-memcache/index.php
+++ b/plugins/cache-memcache/index.php
@@ -4,8 +4,8 @@ class CacheMemcachePlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME = 'Cache Memcache',
-		VERSION = '2.36',
-		RELEASE = '2024-03-22',
+		VERSION = '2.37',
+		RELEASE = '2024-09-15',
 		REQUIRED = '2.36.0',
 		CATEGORY = 'Cache',
 		DESCRIPTION = 'Cache handler using PHP Memcache or PHP Memcached';
diff --git a/plugins/cache-redis/Predis/Client.php b/plugins/cache-redis/Predis/Client.php
index 0b4511a52..4257667bd 100644
--- a/plugins/cache-redis/Predis/Client.php
+++ b/plugins/cache-redis/Predis/Client.php
@@ -472,7 +472,7 @@ class Client implements ClientInterface, IteratorAggregate
      *
      * @return Pipeline|array
      */
-    protected function createPipeline(array $options = null, $callable = null)
+    protected function createPipeline(?array $options = null, $callable = null)
     {
         if (isset($options['atomic']) && $options['atomic']) {
             $class = Atomic::class;
@@ -525,7 +525,7 @@ class Client implements ClientInterface, IteratorAggregate
      *
      * @return MultiExecTransaction|array
      */
-    protected function createTransaction(array $options = null, $callable = null)
+    protected function createTransaction(?array $options = null, $callable = null)
     {
         $transaction = new MultiExecTransaction($this, $options);
 
@@ -557,7 +557,7 @@ class Client implements ClientInterface, IteratorAggregate
      *
      * @return PubSubConsumer|null
      */
-    protected function createPubSub(array $options = null, $callable = null)
+    protected function createPubSub(?array $options = null, $callable = null)
     {
         if ($this->connection instanceof RelayConnection) {
             $pubsub = new RelayPubSubConsumer($this, $options);
diff --git a/plugins/cache-redis/Predis/PubSub/Consumer.php b/plugins/cache-redis/Predis/PubSub/Consumer.php
index b52673232..51ac3cd78 100644
--- a/plugins/cache-redis/Predis/PubSub/Consumer.php
+++ b/plugins/cache-redis/Predis/PubSub/Consumer.php
@@ -30,7 +30,7 @@ class Consumer extends AbstractConsumer
      * @param ClientInterface $client  Client instance used by the consumer.
      * @param array           $options Options for the consumer initialization.
      */
-    public function __construct(ClientInterface $client, array $options = null)
+    public function __construct(ClientInterface $client, ?array $options = null)
     {
         $this->checkCapabilities($client);
 
diff --git a/plugins/cache-redis/Predis/Transaction/MultiExec.php b/plugins/cache-redis/Predis/Transaction/MultiExec.php
index 32ac1e123..e7cf26944 100644
--- a/plugins/cache-redis/Predis/Transaction/MultiExec.php
+++ b/plugins/cache-redis/Predis/Transaction/MultiExec.php
@@ -51,7 +51,7 @@ class MultiExec implements ClientContextInterface
      * @param ClientInterface $client  Client instance used by the transaction.
      * @param array           $options Initialization options.
      */
-    public function __construct(ClientInterface $client, array $options = null)
+    public function __construct(ClientInterface $client, ?array $options = null)
     {
         $this->assertClient($client);
 
diff --git a/plugins/custom-login-mapping/index.php b/plugins/custom-login-mapping/index.php
index c2cc48eca..f282b0f60 100644
--- a/plugins/custom-login-mapping/index.php
+++ b/plugins/custom-login-mapping/index.php
@@ -4,9 +4,9 @@ class CustomLoginMappingPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME = 'Custom Login Mapping',
-		VERSION = '2.1',
-		RELEASE = '2021-04-21',
-		REQUIRED = '2.5.0',
+		VERSION = '2.3',
+		RELEASE = '2024-09-21',
+		REQUIRED = '2.36.1',
 		CATEGORY = 'Login',
 		DESCRIPTION = 'Enables custom usernames by email address.';
 
@@ -17,23 +17,29 @@ class CustomLoginMappingPlugin extends \RainLoop\Plugins\AbstractPlugin
 
 	/**
 	 * @param string $sEmail
-	 * @param string $sLogin
+	 * @param string $sImapUser
 	 * @param string $sPassword
+	 * @param string $sSmtpUser
 	 *
 	 * @throws \RainLoop\Exceptions\ClientException
 	 */
-	public function FilterLoginCredentials(&$sEmail, &$sLogin, &$sPassword)
+	public function FilterLoginCredentials(string &$sEmail, string &$sImapUser, string &$sPassword, string &$sSmtpUser)
 	{
 		$sMapping = \trim($this->Config()->Get('plugin', 'mapping', ''));
 		if (!empty($sMapping)) {
 			$aLines = \explode("\n", \preg_replace('/[\r\n\t\s]+/', "\n", $sMapping));
 			foreach ($aLines as $sLine) {
 				if (false !== \strpos($sLine, ':')) {
-					$aData = \explode(':', $sLine, 2);
+					$aData = \explode(':', $sLine, 3);
 					if (\is_array($aData) && !empty($aData[0]) && isset($aData[1])) {
 						$aData = \array_map('trim', $aData);
-						if ($sEmail === $aData[0] && \strlen($aData[1])) {
-							$sLogin = $aData[1];
+						if ($sEmail === $aData[0]) {
+							if (\strlen($aData[1])) {
+								$sImapUser = $aData[1];
+							}
+							if (isset($aData[2]) && \strlen($aData[2])) {
+								$sSmtpUser = $aData[2];
+							}
 						}
 					}
 				}
@@ -46,8 +52,8 @@ class CustomLoginMappingPlugin extends \RainLoop\Plugins\AbstractPlugin
 		return array(
 			\RainLoop\Plugins\Property::NewInstance('mapping')->SetLabel('Mapping')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
-				->SetDescription('email:login mapping')
-				->SetDefaultValue("user@domain.com:user.bob\nadmin@domain.com:user.john")
+				->SetDescription('email:imap-login:smtp-login mapping')
+				->SetDefaultValue("user@domain.com:imapuser.bob:smtpuser.bob\nadmin@domain.com:imapuser.john")
 		);
 	}
 }
diff --git a/plugins/ics-viewer/LICENSE b/plugins/ics-viewer/LICENSE
new file mode 100644
index 000000000..9e5e56cdd
--- /dev/null
+++ b/plugins/ics-viewer/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2022 SnappyMail
+
+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/ics-viewer/ical.js b/plugins/ics-viewer/ical.js
new file mode 100644
index 000000000..97ec65305
--- /dev/null
+++ b/plugins/ics-viewer/ical.js
@@ -0,0 +1,9526 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+ICAL = (() => {
+
+/**
+ * Represents the BINARY value type, which contains extra methods for encoding and decoding.
+ *
+ * @memberof ICAL
+ */
+class Binary {
+  /**
+   * Creates a binary value from the given string.
+   *
+   * @param {String} aString        The binary value string
+   * @return {Binary}               The binary value instance
+   */
+  static fromString(aString) {
+    return new Binary(aString);
+  }
+
+  /**
+   * Creates a new ICAL.Binary instance
+   *
+   * @param {String} aValue     The binary data for this value
+   */
+  constructor(aValue) {
+    this.value = aValue;
+  }
+
+  /**
+   * The type name, to be used in the jCal object.
+   * @default "binary"
+   * @constant
+   */
+  icaltype = "binary";
+
+  /**
+   * Base64 decode the current value
+   *
+   * @return {String}         The base64-decoded value
+   */
+  decodeValue() {
+    return this._b64_decode(this.value);
+  }
+
+  /**
+   * Encodes the passed parameter with base64 and sets the internal
+   * value to the result.
+   *
+   * @param {String} aValue      The raw binary value to encode
+   */
+  setEncodedValue(aValue) {
+    this.value = this._b64_encode(aValue);
+  }
+
+  _b64_encode(data) {
+    // http://kevin.vanzonneveld.net
+    // +   original by: Tyler Akins (http://rumkin.com)
+    // +   improved by: Bayron Guevara
+    // +   improved by: Thunder.m
+    // +   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
+    // +   bugfixed by: Pellentesque Malesuada
+    // +   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
+    // +   improved by: Rafał Kukawski (http://kukawski.pl)
+    // *     example 1: base64_encode('Kevin van Zonneveld');
+    // *     returns 1: 'S2V2aW4gdmFuIFpvbm5ldmVsZA=='
+    // mozilla has this native
+    // - but breaks in 2.0.0.12!
+    //if (typeof this.window['atob'] == 'function') {
+    //    return atob(data);
+    //}
+    let b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +
+              "abcdefghijklmnopqrstuvwxyz0123456789+/=";
+    let o1, o2, o3, h1, h2, h3, h4, bits, i = 0,
+      ac = 0,
+      enc = "",
+      tmp_arr = [];
+
+    if (!data) {
+      return data;
+    }
+
+    do { // pack three octets into four hexets
+      o1 = data.charCodeAt(i++);
+      o2 = data.charCodeAt(i++);
+      o3 = data.charCodeAt(i++);
+
+      bits = o1 << 16 | o2 << 8 | o3;
+
+      h1 = bits >> 18 & 0x3f;
+      h2 = bits >> 12 & 0x3f;
+      h3 = bits >> 6 & 0x3f;
+      h4 = bits & 0x3f;
+
+      // use hexets to index into b64, and append result to encoded string
+      tmp_arr[ac++] = b64.charAt(h1) + b64.charAt(h2) + b64.charAt(h3) + b64.charAt(h4);
+    } while (i < data.length);
+
+    enc = tmp_arr.join('');
+
+    let r = data.length % 3;
+
+    return (r ? enc.slice(0, r - 3) : enc) + '==='.slice(r || 3);
+
+  }
+
+  _b64_decode(data) {
+    // http://kevin.vanzonneveld.net
+    // +   original by: Tyler Akins (http://rumkin.com)
+    // +   improved by: Thunder.m
+    // +      input by: Aman Gupta
+    // +   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
+    // +   bugfixed by: Onno Marsman
+    // +   bugfixed by: Pellentesque Malesuada
+    // +   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
+    // +      input by: Brett Zamir (http://brett-zamir.me)
+    // +   bugfixed by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
+    // *     example 1: base64_decode('S2V2aW4gdmFuIFpvbm5ldmVsZA==');
+    // *     returns 1: 'Kevin van Zonneveld'
+    // mozilla has this native
+    // - but breaks in 2.0.0.12!
+    //if (typeof this.window['btoa'] == 'function') {
+    //    return btoa(data);
+    //}
+    let b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +
+              "abcdefghijklmnopqrstuvwxyz0123456789+/=";
+    let o1, o2, o3, h1, h2, h3, h4, bits, i = 0,
+      ac = 0,
+      dec = "",
+      tmp_arr = [];
+
+    if (!data) {
+      return data;
+    }
+
+    data += '';
+
+    do { // unpack four hexets into three octets using index points in b64
+      h1 = b64.indexOf(data.charAt(i++));
+      h2 = b64.indexOf(data.charAt(i++));
+      h3 = b64.indexOf(data.charAt(i++));
+      h4 = b64.indexOf(data.charAt(i++));
+
+      bits = h1 << 18 | h2 << 12 | h3 << 6 | h4;
+
+      o1 = bits >> 16 & 0xff;
+      o2 = bits >> 8 & 0xff;
+      o3 = bits & 0xff;
+
+      if (h3 == 64) {
+        tmp_arr[ac++] = String.fromCharCode(o1);
+      } else if (h4 == 64) {
+        tmp_arr[ac++] = String.fromCharCode(o1, o2);
+      } else {
+        tmp_arr[ac++] = String.fromCharCode(o1, o2, o3);
+      }
+    } while (i < data.length);
+
+    dec = tmp_arr.join('');
+
+    return dec;
+  }
+
+  /**
+   * The string representation of this value
+   * @return {String}
+   */
+  toString() {
+    return this.value;
+  }
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+const DURATION_LETTERS = /([PDWHMTS]{1,1})/;
+const DATA_PROPS_TO_COPY = ["weeks", "days", "hours", "minutes", "seconds", "isNegative"];
+
+/**
+ * This class represents the "duration" value type, with various calculation
+ * and manipulation methods.
+ *
+ * @memberof ICAL
+ */
+class Duration {
+  /**
+   * Returns a new ICAL.Duration instance from the passed seconds value.
+   *
+   * @param {Number} aSeconds       The seconds to create the instance from
+   * @return {Duration}             The newly created duration instance
+   */
+  static fromSeconds(aSeconds) {
+    return (new Duration()).fromSeconds(aSeconds);
+  }
+
+  /**
+   * Checks if the given string is an iCalendar duration value.
+   *
+   * @param {String} value      The raw ical value
+   * @return {Boolean}          True, if the given value is of the
+   *                              duration ical type
+   */
+  static isValueString(string) {
+    return (string[0] === 'P' || string[1] === 'P');
+  }
+
+  /**
+   * Creates a new {@link ICAL.Duration} instance from the passed string.
+   *
+   * @param {String} aStr       The string to parse
+   * @return {Duration}         The created duration instance
+   */
+  static fromString(aStr) {
+    let pos = 0;
+    let dict = Object.create(null);
+    let chunks = 0;
+
+    while ((pos = aStr.search(DURATION_LETTERS)) !== -1) {
+      let type = aStr[pos];
+      let numeric = aStr.slice(0, Math.max(0, pos));
+      aStr = aStr.slice(pos + 1);
+
+      chunks += parseDurationChunk(type, numeric, dict);
+    }
+
+    if (chunks < 2) {
+      // There must be at least a chunk with "P" and some unit chunk
+      throw new Error(
+        'invalid duration value: Not enough duration components in "' + aStr + '"'
+      );
+    }
+
+    return new Duration(dict);
+  }
+
+  /**
+   * Creates a new ICAL.Duration instance from the given data object.
+   *
+   * @param {Object} aData                An object with members of the duration
+   * @param {Number=} aData.weeks         Duration in weeks
+   * @param {Number=} aData.days          Duration in days
+   * @param {Number=} aData.hours         Duration in hours
+   * @param {Number=} aData.minutes       Duration in minutes
+   * @param {Number=} aData.seconds       Duration in seconds
+   * @param {Boolean=} aData.isNegative   If true, the duration is negative
+   * @return {Duration}                   The createad duration instance
+   */
+  static fromData(aData) {
+    return new Duration(aData);
+  }
+
+  /**
+   * Creates a new ICAL.Duration instance.
+   *
+   * @param {Object} data                 An object with members of the duration
+   * @param {Number=} data.weeks          Duration in weeks
+   * @param {Number=} data.days           Duration in days
+   * @param {Number=} data.hours          Duration in hours
+   * @param {Number=} data.minutes        Duration in minutes
+   * @param {Number=} data.seconds        Duration in seconds
+   * @param {Boolean=} data.isNegative    If true, the duration is negative
+   */
+  constructor(data) {
+    this.wrappedJSObject = this;
+    this.fromData(data);
+  }
+
+  /**
+   * The weeks in this duration
+   * @type {Number}
+   * @default 0
+   */
+  weeks = 0;
+
+  /**
+   * The days in this duration
+   * @type {Number}
+   * @default 0
+   */
+  days = 0;
+
+  /**
+   * The days in this duration
+   * @type {Number}
+   * @default 0
+   */
+  hours = 0;
+
+  /**
+   * The minutes in this duration
+   * @type {Number}
+   * @default 0
+   */
+  minutes = 0;
+
+  /**
+   * The seconds in this duration
+   * @type {Number}
+   * @default 0
+   */
+  seconds = 0;
+
+  /**
+   * The seconds in this duration
+   * @type {Boolean}
+   * @default false
+   */
+  isNegative = false;
+
+  /**
+   * The class identifier.
+   * @constant
+   * @type {String}
+   * @default "icalduration"
+   */
+  icalclass = "icalduration";
+
+  /**
+   * The type name, to be used in the jCal object.
+   * @constant
+   * @type {String}
+   * @default "duration"
+   */
+  icaltype = "duration";
+
+  /**
+   * Returns a clone of the duration object.
+   *
+   * @return {Duration}      The cloned object
+   */
+  clone() {
+    return Duration.fromData(this);
+  }
+
+  /**
+   * The duration value expressed as a number of seconds.
+   *
+   * @return {Number}             The duration value in seconds
+   */
+  toSeconds() {
+    let seconds = this.seconds + 60 * this.minutes + 3600 * this.hours +
+                  86400 * this.days + 7 * 86400 * this.weeks;
+    return (this.isNegative ? -seconds : seconds);
+  }
+
+  /**
+   * Reads the passed seconds value into this duration object. Afterwards,
+   * members like {@link ICAL.Duration#days days} and {@link ICAL.Duration#weeks weeks} will be set up
+   * accordingly.
+   *
+   * @param {Number} aSeconds     The duration value in seconds
+   * @return {Duration}           Returns this instance
+   */
+  fromSeconds(aSeconds) {
+    let secs = Math.abs(aSeconds);
+
+    this.isNegative = (aSeconds < 0);
+    this.days = trunc(secs / 86400);
+
+    // If we have a flat number of weeks, use them.
+    if (this.days % 7 == 0) {
+      this.weeks = this.days / 7;
+      this.days = 0;
+    } else {
+      this.weeks = 0;
+    }
+
+    secs -= (this.days + 7 * this.weeks) * 86400;
+
+    this.hours = trunc(secs / 3600);
+    secs -= this.hours * 3600;
+
+    this.minutes = trunc(secs / 60);
+    secs -= this.minutes * 60;
+
+    this.seconds = secs;
+    return this;
+  }
+
+  /**
+   * Sets up the current instance using members from the passed data object.
+   *
+   * @param {Object} aData                An object with members of the duration
+   * @param {Number=} aData.weeks         Duration in weeks
+   * @param {Number=} aData.days          Duration in days
+   * @param {Number=} aData.hours         Duration in hours
+   * @param {Number=} aData.minutes       Duration in minutes
+   * @param {Number=} aData.seconds       Duration in seconds
+   * @param {Boolean=} aData.isNegative   If true, the duration is negative
+   */
+  fromData(aData) {
+    for (let prop of DATA_PROPS_TO_COPY) {
+      if (aData && prop in aData) {
+        this[prop] = aData[prop];
+      } else {
+        this[prop] = 0;
+      }
+    }
+  }
+
+  /**
+   * Resets the duration instance to the default values, i.e. PT0S
+   */
+  reset() {
+    this.isNegative = false;
+    this.weeks = 0;
+    this.days = 0;
+    this.hours = 0;
+    this.minutes = 0;
+    this.seconds = 0;
+  }
+
+  /**
+   * Compares the duration instance with another one.
+   *
+   * @param {Duration} aOther             The instance to compare with
+   * @return {Number}                     -1, 0 or 1 for less/equal/greater
+   */
+  compare(aOther) {
+    let thisSeconds = this.toSeconds();
+    let otherSeconds = aOther.toSeconds();
+    return (thisSeconds > otherSeconds) - (thisSeconds < otherSeconds);
+  }
+
+  /**
+   * Normalizes the duration instance. For example, a duration with a value
+   * of 61 seconds will be normalized to 1 minute and 1 second.
+   */
+  normalize() {
+    this.fromSeconds(this.toSeconds());
+  }
+
+  /**
+   * The string representation of this duration.
+   * @return {String}
+   */
+  toString() {
+    if (this.toSeconds() == 0) {
+      return "PT0S";
+    } else {
+      let str = "";
+      if (this.isNegative) str += "-";
+      str += "P";
+      if (this.weeks) str += this.weeks + "W";
+      if (this.days) str += this.days + "D";
+
+      if (this.hours || this.minutes || this.seconds) {
+        str += "T";
+        if (this.hours) str += this.hours + "H";
+        if (this.minutes) str += this.minutes + "M";
+        if (this.seconds) str += this.seconds + "S";
+      }
+      return str;
+    }
+  }
+
+  /**
+   * The iCalendar string representation of this duration.
+   * @return {String}
+   */
+  toICALString() {
+    return this.toString();
+  }
+}
+
+/**
+ * Internal helper function to handle a chunk of a duration.
+ *
+ * @private
+ * @param {String} letter type of duration chunk
+ * @param {String} number numeric value or -/+
+ * @param {Object} dict target to assign values to
+ */
+function parseDurationChunk(letter, number, object) {
+  let type;
+  switch (letter) {
+    case 'P':
+      if (number && number === '-') {
+        object.isNegative = true;
+      } else {
+        object.isNegative = false;
+      }
+      // period
+      break;
+    case 'D':
+      type = 'days';
+      break;
+    case 'W':
+      type = 'weeks';
+      break;
+    case 'H':
+      type = 'hours';
+      break;
+    case 'M':
+      type = 'minutes';
+      break;
+    case 'S':
+      type = 'seconds';
+      break;
+    default:
+      // Not a valid chunk
+      return 0;
+  }
+
+  if (type) {
+    if (!number && number !== 0) {
+      throw new Error(
+        'invalid duration value: Missing number before "' + letter + '"'
+      );
+    }
+    let num = parseInt(number, 10);
+    if (isStrictlyNaN(num)) {
+      throw new Error(
+        'invalid duration value: Invalid number "' + number + '" before "' + letter + '"'
+      );
+    }
+    object[type] = num;
+  }
+
+  return 1;
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * This lets typescript resolve our custom types in the
+ * generated d.ts files (jsdoc typedefs are converted to typescript types).
+ * Ignore prevents the typedefs from being documented more than once.
+ *
+ * @ignore
+ * @typedef {import("./types.js").weekDay} weekDay
+ * Imports the 'weekDay' type from the "types.js" module
+ */
+
+/**
+ * @classdesc
+ * iCalendar Time representation (similar to JS Date object).  Fully
+ * independent of system (OS) timezone / time.  Unlike JS Date, the month
+ * January is 1, not zero.
+ *
+ * @example
+ * var time = new ICAL.Time({
+ *   year: 2012,
+ *   month: 10,
+ *   day: 11
+ *   minute: 0,
+ *   second: 0,
+ *   isDate: false
+ * });
+ *
+ *
+ * @memberof ICAL
+*/
+class Time {
+  static _dowCache = {};
+  static _wnCache = {};
+
+  /**
+   * Returns the days in the given month
+   *
+   * @param {Number} month      The month to check
+   * @param {Number} year       The year to check
+   * @return {Number}           The number of days in the month
+   */
+  static daysInMonth(month, year) {
+    let _daysInMonth = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+    let days = 30;
+
+    if (month < 1 || month > 12) return days;
+
+    days = _daysInMonth[month];
+
+    if (month == 2) {
+      days += Time.isLeapYear(year);
+    }
+
+    return days;
+  }
+
+  /**
+   * Checks if the year is a leap year
+   *
+   * @param {Number} year       The year to check
+   * @return {Boolean}          True, if the year is a leap year
+   */
+  static isLeapYear(year) {
+    if (year <= 1752) {
+      return ((year % 4) == 0);
+    } else {
+      return (((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0));
+    }
+  }
+
+  /**
+   * Create a new ICAL.Time from the day of year and year. The date is returned
+   * in floating timezone.
+   *
+   * @param {Number} aDayOfYear     The day of year
+   * @param {Number} aYear          The year to create the instance in
+   * @return {Time}                 The created instance with the calculated date
+   */
+  static fromDayOfYear(aDayOfYear, aYear) {
+    let year = aYear;
+    let doy = aDayOfYear;
+    let tt = new Time();
+    tt.auto_normalize = false;
+    let is_leap = (Time.isLeapYear(year) ? 1 : 0);
+
+    if (doy < 1) {
+      year--;
+      is_leap = (Time.isLeapYear(year) ? 1 : 0);
+      doy += Time.daysInYearPassedMonth[is_leap][12];
+      return Time.fromDayOfYear(doy, year);
+    } else if (doy > Time.daysInYearPassedMonth[is_leap][12]) {
+      is_leap = (Time.isLeapYear(year) ? 1 : 0);
+      doy -= Time.daysInYearPassedMonth[is_leap][12];
+      year++;
+      return Time.fromDayOfYear(doy, year);
+    }
+
+    tt.year = year;
+    tt.isDate = true;
+
+    for (let month = 11; month >= 0; month--) {
+      if (doy > Time.daysInYearPassedMonth[is_leap][month]) {
+        tt.month = month + 1;
+        tt.day = doy - Time.daysInYearPassedMonth[is_leap][month];
+        break;
+      }
+    }
+
+    tt.auto_normalize = true;
+    return tt;
+  }
+
+  /**
+   * Returns a new ICAL.Time instance from a date string, e.g 2015-01-02.
+   *
+   * @deprecated                Use {@link ICAL.Time.fromDateString} instead
+   * @param {String} str        The string to create from
+   * @return {Time}             The date/time instance
+   */
+  static fromStringv2(str) {
+    return new Time({
+      year: parseInt(str.slice(0, 4), 10),
+      month: parseInt(str.slice(5, 7), 10),
+      day: parseInt(str.slice(8, 10), 10),
+      isDate: true
+    });
+  }
+
+  /**
+   * Returns a new ICAL.Time instance from a date string, e.g 2015-01-02.
+   *
+   * @param {String} aValue     The string to create from
+   * @return {Time}             The date/time instance
+   */
+  static fromDateString(aValue) {
+    // Dates should have no timezone.
+    // Google likes to sometimes specify Z on dates
+    // we specifically ignore that to avoid issues.
+
+    // YYYY-MM-DD
+    // 2012-10-10
+    return new Time({
+      year: strictParseInt(aValue.slice(0, 4)),
+      month: strictParseInt(aValue.slice(5, 7)),
+      day: strictParseInt(aValue.slice(8, 10)),
+      isDate: true
+    });
+  }
+
+  /**
+   * Returns a new ICAL.Time instance from a date-time string, e.g
+   * 2015-01-02T03:04:05. If a property is specified, the timezone is set up
+   * from the property's TZID parameter.
+   *
+   * @param {String} aValue         The string to create from
+   * @param {Property=} prop        The property the date belongs to
+   * @return {Time}                 The date/time instance
+   */
+  static fromDateTimeString(aValue, prop) {
+    if (aValue.length < 19) {
+      throw new Error(
+        'invalid date-time value: "' + aValue + '"'
+      );
+    }
+
+    let zone;
+    let zoneId;
+
+    if (aValue[19] && aValue[19] === 'Z') {
+      zone = Timezone.utcTimezone;
+    } else if (prop) {
+      zoneId = prop.getParameter('tzid');
+
+      if (prop.parent) {
+        if (prop.parent.name === 'standard' || prop.parent.name === 'daylight') {
+          // Per RFC 5545 3.8.2.4 and 3.8.2.2, start/end date-times within
+          // these components MUST be specified in local time.
+          zone = Timezone.localTimezone;
+        } else if (zoneId) {
+          // If the desired time zone is defined within the component tree,
+          // fetch its definition and prefer that.
+          zone = prop.parent.getTimeZoneByID(zoneId);
+        }
+      }
+    }
+
+    const timeData = {
+      year: strictParseInt(aValue.slice(0, 4)),
+      month: strictParseInt(aValue.slice(5, 7)),
+      day: strictParseInt(aValue.slice(8, 10)),
+      hour: strictParseInt(aValue.slice(11, 13)),
+      minute: strictParseInt(aValue.slice(14, 16)),
+      second: strictParseInt(aValue.slice(17, 19)),
+    };
+
+    // Although RFC 5545 requires that all TZIDs used within a file have a
+    // corresponding time zone definition, we may not be parsing the full file
+    // or we may be dealing with a non-compliant file; in either case, we can
+    // check our own time zone service for the TZID in a last-ditch effort.
+    if (zoneId && !zone) {
+      timeData.timezone = zoneId;
+    }
+
+    // 2012-10-10T10:10:10(Z)?
+    return new Time(timeData, zone);
+  }
+
+  /**
+   * Returns a new ICAL.Time instance from a date or date-time string,
+   *
+   * @param {String} aValue         The string to create from
+   * @param {Property=} prop        The property the date belongs to
+   * @return {Time}                 The date/time instance
+   */
+  static fromString(aValue, aProperty) {
+    if (aValue.length > 10) {
+      return Time.fromDateTimeString(aValue, aProperty);
+    } else {
+      return Time.fromDateString(aValue);
+    }
+  }
+
+  /**
+   * Creates a new ICAL.Time instance from the given Javascript Date.
+   *
+   * @param {?Date} aDate             The Javascript Date to read, or null to reset
+   * @param {Boolean} [useUTC=false]  If true, the UTC values of the date will be used
+   */
+  static fromJSDate(aDate, useUTC) {
+    let tt = new Time();
+    return tt.fromJSDate(aDate, useUTC);
+  }
+
+  /**
+   * Creates a new ICAL.Time instance from the the passed data object.
+   *
+   * @param {Object} aData            Time initialization
+   * @param {Number=} aData.year      The year for this date
+   * @param {Number=} aData.month     The month for this date
+   * @param {Number=} aData.day       The day for this date
+   * @param {Number=} aData.hour      The hour for this date
+   * @param {Number=} aData.minute    The minute for this date
+   * @param {Number=} aData.second    The second for this date
+   * @param {Boolean=} aData.isDate   If true, the instance represents a date
+   *                                    (as opposed to a date-time)
+   * @param {Timezone=} aZone         Timezone this position occurs in
+   */
+  static fromData = function fromData(aData, aZone) {
+    let t = new Time();
+    return t.fromData(aData, aZone);
+  };
+
+  /**
+   * Creates a new ICAL.Time instance from the current moment.
+   * The instance is “floating” - has no timezone relation.
+   * To create an instance considering the time zone, call
+   * ICAL.Time.fromJSDate(new Date(), true)
+   * @return {Time}
+   */
+  static now() {
+    return Time.fromJSDate(new Date(), false);
+  }
+
+  /**
+   * Returns the date on which ISO week number 1 starts.
+   *
+   * @see Time#weekNumber
+   * @param {Number} aYear                  The year to search in
+   * @param {weekDay=} aWeekStart           The week start weekday, used for calculation.
+   * @return {Time}                         The date on which week number 1 starts
+   */
+  static weekOneStarts(aYear, aWeekStart) {
+    let t = Time.fromData({
+      year: aYear,
+      month: 1,
+      day: 1,
+      isDate: true
+    });
+
+    let dow = t.dayOfWeek();
+    let wkst = aWeekStart || Time.DEFAULT_WEEK_START;
+    if (dow > Time.THURSDAY) {
+      t.day += 7;
+    }
+    if (wkst > Time.THURSDAY) {
+      t.day -= 7;
+    }
+
+    t.day -= dow - wkst;
+
+    return t;
+  }
+
+  /**
+   * Get the dominical letter for the given year. Letters range from A - G for
+   * common years, and AG to GF for leap years.
+   *
+   * @param {Number} yr           The year to retrieve the letter for
+   * @return {String}             The dominical letter.
+   */
+  static getDominicalLetter(yr) {
+    let LTRS = "GFEDCBA";
+    let dom = (yr + (yr / 4 | 0) + (yr / 400 | 0) - (yr / 100 | 0) - 1) % 7;
+    let isLeap = Time.isLeapYear(yr);
+    if (isLeap) {
+      return LTRS[(dom + 6) % 7] + LTRS[dom];
+    } else {
+      return LTRS[dom];
+    }
+  }
+
+  static #epochTime = null;
+  /**
+   * January 1st, 1970 as an ICAL.Time.
+   * @type {Time}
+   * @constant
+   * @instance
+   */
+  static get epochTime() {
+    if (!this.#epochTime) {
+      this.#epochTime = Time.fromData({
+        year: 1970,
+        month: 1,
+        day: 1,
+        hour: 0,
+        minute: 0,
+        second: 0,
+        isDate: false,
+        timezone: "Z"
+      });
+    }
+    return this.#epochTime;
+  }
+
+  static _cmp_attr(a, b, attr) {
+    if (a[attr] > b[attr]) return 1;
+    if (a[attr] < b[attr]) return -1;
+    return 0;
+  }
+
+  /**
+   * The days that have passed in the year after a given month. The array has
+   * two members, one being an array of passed days for non-leap years, the
+   * other analog for leap years.
+   * @example
+   * var isLeapYear = ICAL.Time.isLeapYear(year);
+   * var passedDays = ICAL.Time.daysInYearPassedMonth[isLeapYear][month];
+   * @type {Array.<Array.<Number>>}
+   */
+  static daysInYearPassedMonth = [
+    [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365],
+    [0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366]
+  ];
+
+  static SUNDAY = 1;
+  static MONDAY = 2;
+  static TUESDAY = 3;
+  static WEDNESDAY = 4;
+  static THURSDAY = 5;
+  static FRIDAY = 6;
+  static SATURDAY = 7;
+
+  /**
+   * The default weekday for the WKST part.
+   * @constant
+   * @default ICAL.Time.MONDAY
+   */
+  static DEFAULT_WEEK_START = 2; // MONDAY
+
+  /**
+   * Creates a new ICAL.Time instance.
+   *
+   * @param {Object} data           Time initialization
+   * @param {Number=} data.year     The year for this date
+   * @param {Number=} data.month    The month for this date
+   * @param {Number=} data.day      The day for this date
+   * @param {Number=} data.hour     The hour for this date
+   * @param {Number=} data.minute   The minute for this date
+   * @param {Number=} data.second   The second for this date
+   * @param {Boolean=} data.isDate  If true, the instance represents a date (as
+   *                                  opposed to a date-time)
+   * @param {Timezone} zone         timezone this position occurs in
+   */
+  constructor(data, zone) {
+    this.wrappedJSObject = this;
+    let time = this._time = Object.create(null);
+
+    /* time defaults */
+    time.year = 0;
+    time.month = 1;
+    time.day = 1;
+    time.hour = 0;
+    time.minute = 0;
+    time.second = 0;
+    time.isDate = false;
+
+    this.fromData(data, zone);
+  }
+
+  /**
+   * The class identifier.
+   * @constant
+   * @type {String}
+   * @default "icaltime"
+   */
+  icalclass = "icaltime";
+  _cachedUnixTime = null;
+
+  /**
+   * The type name, to be used in the jCal object. This value may change and
+   * is strictly defined by the {@link ICAL.Time#isDate isDate} member.
+   * @type {String}
+   * @default "date-time"
+   */
+  get icaltype() {
+    return this.isDate ? 'date' : 'date-time';
+  }
+
+  /**
+   * The timezone for this time.
+   * @type {Timezone}
+   */
+  zone = null;
+
+  /**
+   * Internal uses to indicate that a change has been made and the next read
+   * operation must attempt to normalize the value (for example changing the
+   * day to 33).
+   *
+   * @type {Boolean}
+   * @private
+   */
+  _pendingNormalization = false;
+
+  /**
+   * Returns a clone of the time object.
+   *
+   * @return {Time}              The cloned object
+   */
+  clone() {
+    return new Time(this._time, this.zone);
+  }
+
+  /**
+   * Reset the time instance to epoch time
+   */
+  reset() {
+    this.fromData(Time.epochTime);
+    this.zone = Timezone.utcTimezone;
+  }
+
+  /**
+   * Reset the time instance to the given date/time values.
+   *
+   * @param {Number} year             The year to set
+   * @param {Number} month            The month to set
+   * @param {Number} day              The day to set
+   * @param {Number} hour             The hour to set
+   * @param {Number} minute           The minute to set
+   * @param {Number} second           The second to set
+   * @param {Timezone} timezone       The timezone to set
+   */
+  resetTo(year, month, day, hour, minute, second, timezone) {
+    this.fromData({
+      year: year,
+      month: month,
+      day: day,
+      hour: hour,
+      minute: minute,
+      second: second,
+      zone: timezone
+    });
+  }
+
+  /**
+   * Set up the current instance from the Javascript date value.
+   *
+   * @param {?Date} aDate             The Javascript Date to read, or null to reset
+   * @param {Boolean} [useUTC=false]  If true, the UTC values of the date will be used
+   */
+  fromJSDate(aDate, useUTC) {
+    if (!aDate) {
+      this.reset();
+    } else {
+      if (useUTC) {
+        this.zone = Timezone.utcTimezone;
+        this.year = aDate.getUTCFullYear();
+        this.month = aDate.getUTCMonth() + 1;
+        this.day = aDate.getUTCDate();
+        this.hour = aDate.getUTCHours();
+        this.minute = aDate.getUTCMinutes();
+        this.second = aDate.getUTCSeconds();
+      } else {
+        this.zone = Timezone.localTimezone;
+        this.year = aDate.getFullYear();
+        this.month = aDate.getMonth() + 1;
+        this.day = aDate.getDate();
+        this.hour = aDate.getHours();
+        this.minute = aDate.getMinutes();
+        this.second = aDate.getSeconds();
+      }
+    }
+    this._cachedUnixTime = null;
+    return this;
+  }
+
+  /**
+   * Sets up the current instance using members from the passed data object.
+   *
+   * @param {Object} aData            Time initialization
+   * @param {Number=} aData.year      The year for this date
+   * @param {Number=} aData.month     The month for this date
+   * @param {Number=} aData.day       The day for this date
+   * @param {Number=} aData.hour      The hour for this date
+   * @param {Number=} aData.minute    The minute for this date
+   * @param {Number=} aData.second    The second for this date
+   * @param {Boolean=} aData.isDate   If true, the instance represents a date
+   *                                    (as opposed to a date-time)
+   * @param {Timezone=} aZone         Timezone this position occurs in
+   */
+  fromData(aData, aZone) {
+    if (aData) {
+      for (let [key, value] of Object.entries(aData)) {
+          // ical type cannot be set
+          if (key === 'icaltype') continue;
+        this[key] = value;
+      }
+    }
+
+    if (aZone) {
+      this.zone = aZone;
+    }
+
+    if (aData && !("isDate" in aData)) {
+      this.isDate = !("hour" in aData);
+    } else if (aData && ("isDate" in aData)) {
+      this.isDate = aData.isDate;
+    }
+
+    if (aData && "timezone" in aData) {
+      let zone = TimezoneService.get(
+        aData.timezone
+      );
+
+      this.zone = zone || Timezone.localTimezone;
+    }
+
+    if (aData && "zone" in aData) {
+      this.zone = aData.zone;
+    }
+
+    if (!this.zone) {
+      this.zone = Timezone.localTimezone;
+    }
+
+    this._cachedUnixTime = null;
+    return this;
+  }
+
+  /**
+   * Calculate the day of week.
+   * @param {weekDay=} aWeekStart
+   *        The week start weekday, defaults to SUNDAY
+   * @return {weekDay}
+   */
+  dayOfWeek(aWeekStart) {
+    let firstDow = aWeekStart || Time.SUNDAY;
+    let dowCacheKey = (this.year << 12) + (this.month << 8) + (this.day << 3) + firstDow;
+    if (dowCacheKey in Time._dowCache) {
+      return Time._dowCache[dowCacheKey];
+    }
+
+    // Using Zeller's algorithm
+    let q = this.day;
+    let m = this.month + (this.month < 3 ? 12 : 0);
+    let Y = this.year - (this.month < 3 ? 1 : 0);
+
+    let h = (q + Y + trunc(((m + 1) * 26) / 10) + trunc(Y / 4));
+    { // eslint-disable-line no-constant-condition
+      h += trunc(Y / 100) * 6 + trunc(Y / 400);
+    }
+
+    // Normalize to 1 = wkst
+    h = ((h + 7 - firstDow) % 7) + 1;
+    Time._dowCache[dowCacheKey] = h;
+    return h;
+  }
+
+  /**
+   * Calculate the day of year.
+   * @return {Number}
+   */
+  dayOfYear() {
+    let is_leap = (Time.isLeapYear(this.year) ? 1 : 0);
+    let diypm = Time.daysInYearPassedMonth;
+    return diypm[is_leap][this.month - 1] + this.day;
+  }
+
+  /**
+   * Returns a copy of the current date/time, rewound to the start of the
+   * week. The resulting ICAL.Time instance is of icaltype date, even if this
+   * is a date-time.
+   *
+   * @param {weekDay=} aWeekStart
+   *        The week start weekday, defaults to SUNDAY
+   * @return {Time}      The start of the week (cloned)
+   */
+  startOfWeek(aWeekStart) {
+    let firstDow = aWeekStart || Time.SUNDAY;
+    let result = this.clone();
+    result.day -= ((this.dayOfWeek() + 7 - firstDow) % 7);
+    result.isDate = true;
+    result.hour = 0;
+    result.minute = 0;
+    result.second = 0;
+    return result;
+  }
+
+  /**
+   * Returns a copy of the current date/time, shifted to the end of the week.
+   * The resulting ICAL.Time instance is of icaltype date, even if this is a
+   * date-time.
+   *
+   * @param {weekDay=} aWeekStart
+   *        The week start weekday, defaults to SUNDAY
+   * @return {Time}      The end of the week (cloned)
+   */
+  endOfWeek(aWeekStart) {
+    let firstDow = aWeekStart || Time.SUNDAY;
+    let result = this.clone();
+    result.day += (7 - this.dayOfWeek() + firstDow - Time.SUNDAY) % 7;
+    result.isDate = true;
+    result.hour = 0;
+    result.minute = 0;
+    result.second = 0;
+    return result;
+  }
+
+  /**
+   * Returns a copy of the current date/time, rewound to the start of the
+   * month. The resulting ICAL.Time instance is of icaltype date, even if
+   * this is a date-time.
+   *
+   * @return {Time}      The start of the month (cloned)
+   */
+  startOfMonth() {
+    let result = this.clone();
+    result.day = 1;
+    result.isDate = true;
+    result.hour = 0;
+    result.minute = 0;
+    result.second = 0;
+    return result;
+  }
+
+  /**
+   * Returns a copy of the current date/time, shifted to the end of the
+   * month.  The resulting ICAL.Time instance is of icaltype date, even if
+   * this is a date-time.
+   *
+   * @return {Time}      The end of the month (cloned)
+   */
+  endOfMonth() {
+    let result = this.clone();
+    result.day = Time.daysInMonth(result.month, result.year);
+    result.isDate = true;
+    result.hour = 0;
+    result.minute = 0;
+    result.second = 0;
+    return result;
+  }
+
+  /**
+   * Returns a copy of the current date/time, rewound to the start of the
+   * year. The resulting ICAL.Time instance is of icaltype date, even if
+   * this is a date-time.
+   *
+   * @return {Time}      The start of the year (cloned)
+   */
+  startOfYear() {
+    let result = this.clone();
+    result.day = 1;
+    result.month = 1;
+    result.isDate = true;
+    result.hour = 0;
+    result.minute = 0;
+    result.second = 0;
+    return result;
+  }
+
+  /**
+   * Returns a copy of the current date/time, shifted to the end of the
+   * year.  The resulting ICAL.Time instance is of icaltype date, even if
+   * this is a date-time.
+   *
+   * @return {Time}      The end of the year (cloned)
+   */
+  endOfYear() {
+    let result = this.clone();
+    result.day = 31;
+    result.month = 12;
+    result.isDate = true;
+    result.hour = 0;
+    result.minute = 0;
+    result.second = 0;
+    return result;
+  }
+
+  /**
+   * First calculates the start of the week, then returns the day of year for
+   * this date. If the day falls into the previous year, the day is zero or negative.
+   *
+   * @param {weekDay=} aFirstDayOfWeek
+   *        The week start weekday, defaults to SUNDAY
+   * @return {Number}     The calculated day of year
+   */
+  startDoyWeek(aFirstDayOfWeek) {
+    let firstDow = aFirstDayOfWeek || Time.SUNDAY;
+    let delta = this.dayOfWeek() - firstDow;
+    if (delta < 0) delta += 7;
+    return this.dayOfYear() - delta;
+  }
+
+  /**
+   * Get the dominical letter for the current year. Letters range from A - G
+   * for common years, and AG to GF for leap years.
+   *
+   * @param {Number} yr           The year to retrieve the letter for
+   * @return {String}             The dominical letter.
+   */
+  getDominicalLetter() {
+    return Time.getDominicalLetter(this.year);
+  }
+
+  /**
+   * Finds the nthWeekDay relative to the current month (not day).  The
+   * returned value is a day relative the month that this month belongs to so
+   * 1 would indicate the first of the month and 40 would indicate a day in
+   * the following month.
+   *
+   * @param {Number} aDayOfWeek   Day of the week see the day name constants
+   * @param {Number} aPos         Nth occurrence of a given week day values
+   *        of 1 and 0 both indicate the first weekday of that type. aPos may
+   *        be either positive or negative
+   *
+   * @return {Number} numeric value indicating a day relative
+   *                   to the current month of this time object
+   */
+  nthWeekDay(aDayOfWeek, aPos) {
+    let daysInMonth = Time.daysInMonth(this.month, this.year);
+    let weekday;
+    let pos = aPos;
+
+    let start = 0;
+
+    let otherDay = this.clone();
+
+    if (pos >= 0) {
+      otherDay.day = 1;
+
+      // because 0 means no position has been given
+      // 1 and 0 indicate the same day.
+      if (pos != 0) {
+        // remove the extra numeric value
+        pos--;
+      }
+
+      // set current start offset to current day.
+      start = otherDay.day;
+
+      // find the current day of week
+      let startDow = otherDay.dayOfWeek();
+
+      // calculate the difference between current
+      // day of the week and desired day of the week
+      let offset = aDayOfWeek - startDow;
+
+
+      // if the offset goes into the past
+      // week we add 7 so it goes into the next
+      // week. We only want to go forward in time here.
+      if (offset < 0)
+        // this is really important otherwise we would
+        // end up with dates from in the past.
+        offset += 7;
+
+      // add offset to start so start is the same
+      // day of the week as the desired day of week.
+      start += offset;
+
+      // because we are going to add (and multiply)
+      // the numeric value of the day we subtract it
+      // from the start position so not to add it twice.
+      start -= aDayOfWeek;
+
+      // set week day
+      weekday = aDayOfWeek;
+    } else {
+
+      // then we set it to the last day in the current month
+      otherDay.day = daysInMonth;
+
+      // find the ends weekday
+      let endDow = otherDay.dayOfWeek();
+
+      pos++;
+
+      weekday = (endDow - aDayOfWeek);
+
+      if (weekday < 0) {
+        weekday += 7;
+      }
+
+      weekday = daysInMonth - weekday;
+    }
+
+    weekday += pos * 7;
+
+    return start + weekday;
+  }
+
+  /**
+   * Checks if current time is the nth weekday, relative to the current
+   * month.  Will always return false when rule resolves outside of current
+   * month.
+   *
+   * @param {weekDay} aDayOfWeek                 Day of week to check
+   * @param {Number} aPos                        Relative position
+   * @return {Boolean}                           True, if it is the nth weekday
+   */
+  isNthWeekDay(aDayOfWeek, aPos) {
+    let dow = this.dayOfWeek();
+
+    if (aPos === 0 && dow === aDayOfWeek) {
+      return true;
+    }
+
+    // get pos
+    let day = this.nthWeekDay(aDayOfWeek, aPos);
+
+    if (day === this.day) {
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * Calculates the ISO 8601 week number. The first week of a year is the
+   * week that contains the first Thursday. The year can have 53 weeks, if
+   * January 1st is a Friday.
+   *
+   * Note there are regions where the first week of the year is the one that
+   * starts on January 1st, which may offset the week number. Also, if a
+   * different week start is specified, this will also affect the week
+   * number.
+   *
+   * @see Time.weekOneStarts
+   * @param {weekDay} aWeekStart                  The weekday the week starts with
+   * @return {Number}                             The ISO week number
+   */
+  weekNumber(aWeekStart) {
+    let wnCacheKey = (this.year << 12) + (this.month << 8) + (this.day << 3) + aWeekStart;
+    if (wnCacheKey in Time._wnCache) {
+      return Time._wnCache[wnCacheKey];
+    }
+    // This function courtesty of Julian Bucknall, published under the MIT license
+    // http://www.boyet.com/articles/publishedarticles/calculatingtheisoweeknumb.html
+    // plus some fixes to be able to use different week starts.
+    let week1;
+
+    let dt = this.clone();
+    dt.isDate = true;
+    let isoyear = this.year;
+
+    if (dt.month == 12 && dt.day > 25) {
+      week1 = Time.weekOneStarts(isoyear + 1, aWeekStart);
+      if (dt.compare(week1) < 0) {
+        week1 = Time.weekOneStarts(isoyear, aWeekStart);
+      } else {
+        isoyear++;
+      }
+    } else {
+      week1 = Time.weekOneStarts(isoyear, aWeekStart);
+      if (dt.compare(week1) < 0) {
+        week1 = Time.weekOneStarts(--isoyear, aWeekStart);
+      }
+    }
+
+    let daysBetween = (dt.subtractDate(week1).toSeconds() / 86400);
+    let answer = trunc(daysBetween / 7) + 1;
+    Time._wnCache[wnCacheKey] = answer;
+    return answer;
+  }
+
+  /**
+   * Adds the duration to the current time. The instance is modified in
+   * place.
+   *
+   * @param {Duration} aDuration         The duration to add
+   */
+  addDuration(aDuration) {
+    let mult = (aDuration.isNegative ? -1 : 1);
+
+    // because of the duration optimizations it is much
+    // more efficient to grab all the values up front
+    // then set them directly (which will avoid a normalization call).
+    // So we don't actually normalize until we need it.
+    let second = this.second;
+    let minute = this.minute;
+    let hour = this.hour;
+    let day = this.day;
+
+    second += mult * aDuration.seconds;
+    minute += mult * aDuration.minutes;
+    hour += mult * aDuration.hours;
+    day += mult * aDuration.days;
+    day += mult * 7 * aDuration.weeks;
+
+    this.second = second;
+    this.minute = minute;
+    this.hour = hour;
+    this.day = day;
+
+    this._cachedUnixTime = null;
+  }
+
+  /**
+   * Subtract the date details (_excluding_ timezone).  Useful for finding
+   * the relative difference between two time objects excluding their
+   * timezone differences.
+   *
+   * @param {Time} aDate     The date to subtract
+   * @return {Duration}      The difference as a duration
+   */
+  subtractDate(aDate) {
+    let unixTime = this.toUnixTime() + this.utcOffset();
+    let other = aDate.toUnixTime() + aDate.utcOffset();
+    return Duration.fromSeconds(unixTime - other);
+  }
+
+  /**
+   * Subtract the date details, taking timezones into account.
+   *
+   * @param {Time} aDate  The date to subtract
+   * @return {Duration}   The difference in duration
+   */
+  subtractDateTz(aDate) {
+    let unixTime = this.toUnixTime();
+    let other = aDate.toUnixTime();
+    return Duration.fromSeconds(unixTime - other);
+  }
+
+  /**
+   * Compares the ICAL.Time instance with another one.
+   *
+   * @param {Duration} aOther        The instance to compare with
+   * @return {Number}                     -1, 0 or 1 for less/equal/greater
+   */
+  compare(other) {
+    let a = this.toUnixTime();
+    let b = other.toUnixTime();
+
+    if (a > b) return 1;
+    if (b > a) return -1;
+    return 0;
+  }
+
+  /**
+   * Compares only the date part of this instance with another one.
+   *
+   * @param {Duration} other              The instance to compare with
+   * @param {Timezone} tz                 The timezone to compare in
+   * @return {Number}                     -1, 0 or 1 for less/equal/greater
+   */
+  compareDateOnlyTz(other, tz) {
+    let a = this.convertToZone(tz);
+    let b = other.convertToZone(tz);
+    let rc = 0;
+
+    if ((rc = Time._cmp_attr(a, b, "year")) != 0) return rc;
+    if ((rc = Time._cmp_attr(a, b, "month")) != 0) return rc;
+    if ((rc = Time._cmp_attr(a, b, "day")) != 0) return rc;
+
+    return rc;
+  }
+
+  /**
+   * Convert the instance into another timezone. The returned ICAL.Time
+   * instance is always a copy.
+   *
+   * @param {Timezone} zone      The zone to convert to
+   * @return {Time}              The copy, converted to the zone
+   */
+  convertToZone(zone) {
+    let copy = this.clone();
+    let zone_equals = (this.zone.tzid == zone.tzid);
+
+    if (!this.isDate && !zone_equals) {
+      Timezone.convert_time(copy, this.zone, zone);
+    }
+
+    copy.zone = zone;
+    return copy;
+  }
+
+  /**
+   * Calculates the UTC offset of the current date/time in the timezone it is
+   * in.
+   *
+   * @return {Number}     UTC offset in seconds
+   */
+  utcOffset() {
+    if (this.zone == Timezone.localTimezone ||
+        this.zone == Timezone.utcTimezone) {
+      return 0;
+    } else {
+      return this.zone.utcOffset(this);
+    }
+  }
+
+  /**
+   * Returns an RFC 5545 compliant ical representation of this object.
+   *
+   * @return {String} ical date/date-time
+   */
+  toICALString() {
+    let string = this.toString();
+
+    if (string.length > 10) {
+      return design$1.icalendar.value['date-time'].toICAL(string);
+    } else {
+      return design$1.icalendar.value.date.toICAL(string);
+    }
+  }
+
+  /**
+   * The string representation of this date/time, in jCal form
+   * (including : and - separators).
+   * @return {String}
+   */
+  toString() {
+    let result = this.year + '-' +
+                 pad2(this.month) + '-' +
+                 pad2(this.day);
+
+    if (!this.isDate) {
+        result += 'T' + pad2(this.hour) + ':' +
+                  pad2(this.minute) + ':' +
+                  pad2(this.second);
+
+      if (this.zone === Timezone.utcTimezone) {
+        result += 'Z';
+      }
+    }
+
+    return result;
+  }
+
+  /**
+   * Converts the current instance to a Javascript date
+   * @return {Date}
+   */
+  toJSDate() {
+    if (this.zone == Timezone.localTimezone) {
+      if (this.isDate) {
+        return new Date(this.year, this.month - 1, this.day);
+      } else {
+        return new Date(this.year, this.month - 1, this.day,
+                        this.hour, this.minute, this.second, 0);
+      }
+    } else {
+      return new Date(this.toUnixTime() * 1000);
+    }
+  }
+
+  _normalize() {
+    if (this._time.isDate) {
+      this._time.hour = 0;
+      this._time.minute = 0;
+      this._time.second = 0;
+    }
+    this.adjust(0, 0, 0, 0);
+
+    return this;
+  }
+
+  /**
+   * Adjust the date/time by the given offset
+   *
+   * @param {Number} aExtraDays       The extra amount of days
+   * @param {Number} aExtraHours      The extra amount of hours
+   * @param {Number} aExtraMinutes    The extra amount of minutes
+   * @param {Number} aExtraSeconds    The extra amount of seconds
+   * @param {Number=} aTime           The time to adjust, defaults to the
+   *                                    current instance.
+   */
+  adjust(aExtraDays, aExtraHours, aExtraMinutes, aExtraSeconds, aTime) {
+
+    let minutesOverflow, hoursOverflow,
+        daysOverflow = 0, yearsOverflow = 0;
+
+    let second, minute, hour, day;
+    let daysInMonth;
+
+    let time = aTime || this._time;
+
+    if (!time.isDate) {
+      second = time.second + aExtraSeconds;
+      time.second = second % 60;
+      minutesOverflow = trunc(second / 60);
+      if (time.second < 0) {
+        time.second += 60;
+        minutesOverflow--;
+      }
+
+      minute = time.minute + aExtraMinutes + minutesOverflow;
+      time.minute = minute % 60;
+      hoursOverflow = trunc(minute / 60);
+      if (time.minute < 0) {
+        time.minute += 60;
+        hoursOverflow--;
+      }
+
+      hour = time.hour + aExtraHours + hoursOverflow;
+
+      time.hour = hour % 24;
+      daysOverflow = trunc(hour / 24);
+      if (time.hour < 0) {
+        time.hour += 24;
+        daysOverflow--;
+      }
+    }
+
+
+    // Adjust month and year first, because we need to know what month the day
+    // is in before adjusting it.
+    if (time.month > 12) {
+      yearsOverflow = trunc((time.month - 1) / 12);
+    } else if (time.month < 1) {
+      yearsOverflow = trunc(time.month / 12) - 1;
+    }
+
+    time.year += yearsOverflow;
+    time.month -= 12 * yearsOverflow;
+
+    // Now take care of the days (and adjust month if needed)
+    day = time.day + aExtraDays + daysOverflow;
+
+    if (day > 0) {
+      for (;;) {
+        daysInMonth = Time.daysInMonth(time.month, time.year);
+        if (day <= daysInMonth) {
+          break;
+        }
+
+        time.month++;
+        if (time.month > 12) {
+          time.year++;
+          time.month = 1;
+        }
+
+        day -= daysInMonth;
+      }
+    } else {
+      while (day <= 0) {
+        if (time.month == 1) {
+          time.year--;
+          time.month = 12;
+        } else {
+          time.month--;
+        }
+
+        day += Time.daysInMonth(time.month, time.year);
+      }
+    }
+
+    time.day = day;
+
+    this._cachedUnixTime = null;
+    return this;
+  }
+
+  /**
+   * Sets up the current instance from unix time, the number of seconds since
+   * January 1st, 1970.
+   *
+   * @param {Number} seconds      The seconds to set up with
+   */
+  fromUnixTime(seconds) {
+    this.zone = Timezone.utcTimezone;
+    // We could use `fromJSDate` here, but this is about twice as fast.
+    // We could also clone `epochTime` and use `adjust` for a more
+    // ical.js-centric approach, but this is about 100 times as fast.
+    let date = new Date(seconds * 1000);
+    this.year = date.getUTCFullYear();
+    this.month = date.getUTCMonth() + 1;
+    this.day = date.getUTCDate();
+    if (this._time.isDate) {
+      this.hour = 0;
+      this.minute = 0;
+      this.second = 0;
+    } else {
+      this.hour = date.getUTCHours();
+      this.minute = date.getUTCMinutes();
+      this.second = date.getUTCSeconds();
+    }
+
+    this._cachedUnixTime = null;
+  }
+
+  /**
+   * Converts the current instance to seconds since January 1st 1970.
+   *
+   * @return {Number}         Seconds since 1970
+   */
+  toUnixTime() {
+    if (this._cachedUnixTime !== null) {
+      return this._cachedUnixTime;
+    }
+    let offset = this.utcOffset();
+
+    // we use the offset trick to ensure
+    // that we are getting the actual UTC time
+    let ms = Date.UTC(
+      this.year,
+      this.month - 1,
+      this.day,
+      this.hour,
+      this.minute,
+      this.second - offset
+    );
+
+    // seconds
+    this._cachedUnixTime = ms / 1000;
+    return this._cachedUnixTime;
+  }
+
+  /**
+   * Converts time to into Object which can be serialized then re-created
+   * using the constructor.
+   *
+   * @example
+   * // toJSON will automatically be called
+   * var json = JSON.stringify(mytime);
+   *
+   * var deserialized = JSON.parse(json);
+   *
+   * var time = new ICAL.Time(deserialized);
+   *
+   * @return {Object}
+   */
+  toJSON() {
+    let copy = [
+      'year',
+      'month',
+      'day',
+      'hour',
+      'minute',
+      'second',
+      'isDate'
+    ];
+
+    let result = Object.create(null);
+
+    let i = 0;
+    let len = copy.length;
+    let prop;
+
+    for (; i < len; i++) {
+      prop = copy[i];
+      result[prop] = this[prop];
+    }
+
+    if (this.zone) {
+      result.timezone = this.zone.tzid;
+    }
+
+    return result;
+  }
+}
+
+(function setupNormalizeAttributes() {
+  // This needs to run before any instances are created!
+  function defineAttr(attr) {
+    Object.defineProperty(Time.prototype, attr, {
+      get: function getTimeAttr() {
+        if (this._pendingNormalization) {
+          this._normalize();
+          this._pendingNormalization = false;
+        }
+
+        return this._time[attr];
+      },
+      set: function setTimeAttr(val) {
+        // Check if isDate will be set and if was not set to normalize date.
+        // This avoids losing days when seconds, minutes and hours are zeroed
+        // what normalize will do when time is a date.
+        if (attr === "isDate" && val && !this._time.isDate) {
+          this.adjust(0, 0, 0, 0);
+        }
+        this._cachedUnixTime = null;
+        this._pendingNormalization = true;
+        this._time[attr] = val;
+      }
+    });
+
+  }
+
+    defineAttr("year");
+    defineAttr("month");
+    defineAttr("day");
+    defineAttr("hour");
+    defineAttr("minute");
+    defineAttr("second");
+    defineAttr("isDate");
+})();
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * This lets typescript resolve our custom types in the
+ * generated d.ts files (jsdoc typedefs are converted to typescript types).
+ * Ignore prevents the typedefs from being documented more than once.
+ *
+ * @ignore
+ * @typedef {import("./types.js").parserState} parserState
+ * Imports the 'parserState' type from the "types.js" module
+ * @typedef {import("./types.js").designSet} designSet
+ * Imports the 'designSet' type from the "types.js" module
+ */
+
+const CHAR = /[^ \t]/;
+const VALUE_DELIMITER = ':';
+const PARAM_DELIMITER = ';';
+const PARAM_NAME_DELIMITER = '=';
+const DEFAULT_VALUE_TYPE$1 = 'unknown';
+const DEFAULT_PARAM_TYPE = 'text';
+const RFC6868_REPLACE_MAP$1 = { "^'": '"', "^n": "\n", "^^": "^" };
+
+/**
+ * Parses iCalendar or vCard data into a raw jCal object. Consult
+ * documentation on the {@tutorial layers|layers of parsing} for more
+ * details.
+ *
+ * @function ICAL.parse
+ * @memberof ICAL
+ * @variation function
+ * @todo Fix the API to be more clear on the return type
+ * @param {String} input      The string data to parse
+ * @return {Object|Object[]}  A single jCal object, or an array thereof
+ */
+function parse(input) {
+  let state = {};
+  let root = state.component = [];
+
+  state.stack = [root];
+
+  parse._eachLine(input, function(err, line) {
+    parse._handleContentLine(line, state);
+  });
+
+
+  // when there are still items on the stack
+  // throw a fatal error, a component was not closed
+  // correctly in that case.
+  if (state.stack.length > 1) {
+    throw new ParserError(
+      'invalid ical body. component began but did not end'
+    );
+  }
+
+  state = null;
+
+  return (root.length == 1 ? root[0] : root);
+}
+
+/**
+ * Parse an iCalendar property value into the jCal for a single property
+ *
+ * @function ICAL.parse.property
+ * @param {String} str
+ *   The iCalendar property string to parse
+ * @param {designSet=} designSet
+ *   The design data to use for this property
+ * @return {Object}
+ *   The jCal Object containing the property
+ */
+parse.property = function(str, designSet) {
+  let state = {
+    component: [[], []],
+    designSet: designSet || design$1.defaultSet
+  };
+  parse._handleContentLine(str, state);
+  return state.component[1][0];
+};
+
+/**
+ * Convenience method to parse a component. You can use ICAL.parse() directly
+ * instead.
+ *
+ * @function ICAL.parse.component
+ * @see ICAL.parse(function)
+ * @param {String} str    The iCalendar component string to parse
+ * @return {Object}       The jCal Object containing the component
+ */
+parse.component = function(str) {
+  return parse(str);
+};
+
+
+/**
+ * An error that occurred during parsing.
+ *
+ * @param {String} message        The error message
+ * @memberof ICAL.parse
+ * @extends {Error}
+ */
+class ParserError extends Error {
+  name = this.constructor.name;
+}
+
+// classes & constants
+parse.ParserError = ParserError;
+
+
+/**
+ * Handles a single line of iCalendar/vCard, updating the state.
+ *
+ * @private
+ * @function ICAL.parse._handleContentLine
+ * @param {String} line          The content line to process
+ * @param {parserState} state    The current state of the line parsing
+ */
+parse._handleContentLine = function(line, state) {
+  // break up the parts of the line
+  let valuePos = line.indexOf(VALUE_DELIMITER);
+  let paramPos = line.indexOf(PARAM_DELIMITER);
+
+  let lastParamIndex;
+  let lastValuePos;
+
+  // name of property or begin/end
+  let name;
+  let value;
+  // params is only overridden if paramPos !== -1.
+  // we can't do params = params || {} later on
+  // because it sacrifices ops.
+  let params = {};
+
+  /**
+   * Different property cases
+   *
+   *
+   * 1. RRULE:FREQ=foo
+   *    // FREQ= is not a param but the value
+   *
+   * 2. ATTENDEE;ROLE=REQ-PARTICIPANT;
+   *    // ROLE= is a param because : has not happened yet
+   */
+    // when the parameter delimiter is after the
+    // value delimiter then it is not a parameter.
+
+  if ((paramPos !== -1 && valuePos !== -1)) {
+    // when the parameter delimiter is after the
+    // value delimiter then it is not a parameter.
+    if (paramPos > valuePos) {
+      paramPos = -1;
+    }
+  }
+
+  let parsedParams;
+  if (paramPos !== -1) {
+    name = line.slice(0, Math.max(0, paramPos)).toLowerCase();
+    parsedParams = parse._parseParameters(line.slice(Math.max(0, paramPos)), 0, state.designSet);
+    if (parsedParams[2] == -1) {
+      throw new ParserError("Invalid parameters in '" + line + "'");
+    }
+    params = parsedParams[0];
+    lastParamIndex = parsedParams[1].length + parsedParams[2] + paramPos;
+    if ((lastValuePos =
+      line.slice(Math.max(0, lastParamIndex)).indexOf(VALUE_DELIMITER)) !== -1) {
+      value = line.slice(Math.max(0, lastParamIndex + lastValuePos + 1));
+    } else {
+      throw new ParserError("Missing parameter value in '" + line + "'");
+    }
+  } else if (valuePos !== -1) {
+    // without parmeters (BEGIN:VCAENDAR, CLASS:PUBLIC)
+    name = line.slice(0, Math.max(0, valuePos)).toLowerCase();
+    value = line.slice(Math.max(0, valuePos + 1));
+
+    if (name === 'begin') {
+      let newComponent = [value.toLowerCase(), [], []];
+      if (state.stack.length === 1) {
+        state.component.push(newComponent);
+      } else {
+        state.component[2].push(newComponent);
+      }
+      state.stack.push(state.component);
+      state.component = newComponent;
+      if (!state.designSet) {
+        state.designSet = design$1.getDesignSet(state.component[0]);
+      }
+      return;
+    } else if (name === 'end') {
+      state.component = state.stack.pop();
+      return;
+    }
+    // If it is not begin/end, then this is a property with an empty value,
+    // which should be considered valid.
+  } else {
+    /**
+     * Invalid line.
+     * The rational to throw an error is we will
+     * never be certain that the rest of the file
+     * is sane and it is unlikely that we can serialize
+     * the result correctly either.
+     */
+    throw new ParserError(
+      'invalid line (no token ";" or ":") "' + line + '"'
+    );
+  }
+
+  let valueType;
+  let multiValue = false;
+  let structuredValue = false;
+  let propertyDetails;
+  let splitName;
+  let ungroupedName;
+
+  // fetch the ungrouped part of the name
+  if (state.designSet.propertyGroups && name.indexOf('.') !== -1) {
+    splitName = name.split('.');
+    params.group = splitName[0];
+    ungroupedName = splitName[1];
+  } else {
+    ungroupedName = name;
+  }
+
+  if (ungroupedName in state.designSet.property) {
+    propertyDetails = state.designSet.property[ungroupedName];
+
+    if ('multiValue' in propertyDetails) {
+      multiValue = propertyDetails.multiValue;
+    }
+
+    if ('structuredValue' in propertyDetails) {
+      structuredValue = propertyDetails.structuredValue;
+    }
+
+    if (value && 'detectType' in propertyDetails) {
+      valueType = propertyDetails.detectType(value);
+    }
+  }
+
+  // attempt to determine value
+  if (!valueType) {
+    if (!('value' in params)) {
+      if (propertyDetails) {
+        valueType = propertyDetails.defaultType;
+      } else {
+        valueType = DEFAULT_VALUE_TYPE$1;
+      }
+    } else {
+      // possible to avoid this?
+      valueType = params.value.toLowerCase();
+    }
+  }
+
+  delete params.value;
+
+  /**
+   * Note on `var result` juggling:
+   *
+   * I observed that building the array in pieces has adverse
+   * effects on performance, so where possible we inline the creation.
+   * It is a little ugly but resulted in ~2000 additional ops/sec.
+   */
+
+  let result;
+  if (multiValue && structuredValue) {
+    value = parse._parseMultiValue(value, structuredValue, valueType, [], multiValue, state.designSet, structuredValue);
+    result = [ungroupedName, params, valueType, value];
+  } else if (multiValue) {
+    result = [ungroupedName, params, valueType];
+    parse._parseMultiValue(value, multiValue, valueType, result, null, state.designSet, false);
+  } else if (structuredValue) {
+    value = parse._parseMultiValue(value, structuredValue, valueType, [], null, state.designSet, structuredValue);
+    result = [ungroupedName, params, valueType, value];
+  } else {
+    value = parse._parseValue(value, valueType, state.designSet, false);
+    result = [ungroupedName, params, valueType, value];
+  }
+  // rfc6350 requires that in vCard 4.0 the first component is the VERSION
+  // component with as value 4.0, note that 3.0 does not have this requirement.
+  if (state.component[0] === 'vcard' && state.component[1].length === 0 &&
+          !(name === 'version' && value === '4.0')) {
+    state.designSet = design$1.getDesignSet("vcard3");
+  }
+  state.component[1].push(result);
+};
+
+/**
+ * Parse a value from the raw value into the jCard/jCal value.
+ *
+ * @private
+ * @function ICAL.parse._parseValue
+ * @param {String} value          Original value
+ * @param {String} type           Type of value
+ * @param {Object} designSet      The design data to use for this value
+ * @return {Object} varies on type
+ */
+parse._parseValue = function(value, type, designSet, structuredValue) {
+  if (type in designSet.value && 'fromICAL' in designSet.value[type]) {
+    return designSet.value[type].fromICAL(value, structuredValue);
+  }
+  return value;
+};
+
+/**
+ * Parse parameters from a string to object.
+ *
+ * @function ICAL.parse._parseParameters
+ * @private
+ * @param {String} line           A single unfolded line
+ * @param {Number} start         Position to start looking for properties
+ * @param {Object} designSet      The design data to use for this property
+ * @return {Object} key/value pairs
+ */
+parse._parseParameters = function(line, start, designSet) {
+  let lastParam = start;
+  let pos = 0;
+  let delim = PARAM_NAME_DELIMITER;
+  let result = {};
+  let name, lcname;
+  let value, valuePos = -1;
+  let type, multiValue, mvdelim;
+
+  // find the next '=' sign
+  // use lastParam and pos to find name
+  // check if " is used if so get value from "->"
+  // then increment pos to find next ;
+
+  while ((pos !== false) &&
+         (pos = line.indexOf(delim, pos + 1)) !== -1) {
+
+    name = line.slice(lastParam + 1, pos);
+    if (name.length == 0) {
+      throw new ParserError("Empty parameter name in '" + line + "'");
+    }
+    lcname = name.toLowerCase();
+    mvdelim = false;
+    multiValue = false;
+
+    if (lcname in designSet.param && designSet.param[lcname].valueType) {
+      type = designSet.param[lcname].valueType;
+    } else {
+      type = DEFAULT_PARAM_TYPE;
+    }
+
+    if (lcname in designSet.param) {
+      multiValue = designSet.param[lcname].multiValue;
+      if (designSet.param[lcname].multiValueSeparateDQuote) {
+        mvdelim = parse._rfc6868Escape('"' + multiValue + '"');
+      }
+    }
+
+    let nextChar = line[pos + 1];
+    if (nextChar === '"') {
+      valuePos = pos + 2;
+      pos = line.indexOf('"', valuePos);
+      if (multiValue && pos != -1) {
+          let extendedValue = true;
+          while (extendedValue) {
+            if (line[pos + 1] == multiValue && line[pos + 2] == '"') {
+              pos = line.indexOf('"', pos + 3);
+            } else {
+              extendedValue = false;
+            }
+          }
+        }
+      if (pos === -1) {
+        throw new ParserError(
+          'invalid line (no matching double quote) "' + line + '"'
+        );
+      }
+      value = line.slice(valuePos, pos);
+      lastParam = line.indexOf(PARAM_DELIMITER, pos);
+      let propValuePos = line.indexOf(VALUE_DELIMITER, pos);
+      // if either no next parameter or delimeter in property value, let's stop here
+      if (lastParam === -1 || (propValuePos !== -1 && lastParam > propValuePos)) {
+        pos = false;
+      }
+    } else {
+      valuePos = pos + 1;
+
+      // move to next ";"
+      let nextPos = line.indexOf(PARAM_DELIMITER, valuePos);
+      let propValuePos = line.indexOf(VALUE_DELIMITER, valuePos);
+      if (propValuePos !== -1 && nextPos > propValuePos) {
+        // this is a delimiter in the property value, let's stop here
+        nextPos = propValuePos;
+        pos = false;
+      } else if (nextPos === -1) {
+        // no ";"
+        if (propValuePos === -1) {
+          nextPos = line.length;
+        } else {
+          nextPos = propValuePos;
+        }
+        pos = false;
+      } else {
+        lastParam = nextPos;
+        pos = nextPos;
+      }
+
+      value = line.slice(valuePos, nextPos);
+    }
+
+    const length_before = value.length;
+    value = parse._rfc6868Escape(value);
+    valuePos += length_before - value.length;
+    if (multiValue) {
+      let delimiter = mvdelim || multiValue;
+      value = parse._parseMultiValue(value, delimiter, type, [], null, designSet);
+    } else {
+      value = parse._parseValue(value, type, designSet);
+    }
+
+    if (multiValue && (lcname in result)) {
+      if (Array.isArray(result[lcname])) {
+        result[lcname].push(value);
+      } else {
+        result[lcname] = [
+          result[lcname],
+          value
+        ];
+      }
+    } else {
+      result[lcname] = value;
+    }
+  }
+  return [result, value, valuePos];
+};
+
+/**
+ * Internal helper for rfc6868. Exposing this on ICAL.parse so that
+ * hackers can disable the rfc6868 parsing if the really need to.
+ *
+ * @function ICAL.parse._rfc6868Escape
+ * @param {String} val        The value to escape
+ * @return {String}           The escaped value
+ */
+parse._rfc6868Escape = function(val) {
+  return val.replace(/\^['n^]/g, function(x) {
+    return RFC6868_REPLACE_MAP$1[x];
+  });
+};
+
+/**
+ * Parse a multi value string. This function is used either for parsing
+ * actual multi-value property's values, or for handling parameter values. It
+ * can be used for both multi-value properties and structured value properties.
+ *
+ * @private
+ * @function ICAL.parse._parseMultiValue
+ * @param {String} buffer           The buffer containing the full value
+ * @param {String} delim            The multi-value delimiter
+ * @param {String} type             The value type to be parsed
+ * @param {Array.<?>} result        The array to append results to, varies on value type
+ * @param {String} innerMulti       The inner delimiter to split each value with
+ * @param {designSet} designSet     The design data for this value
+ * @return {?|Array.<?>}            Either an array of results, or the first result
+ */
+parse._parseMultiValue = function(buffer, delim, type, result, innerMulti, designSet, structuredValue) {
+  let pos = 0;
+  let lastPos = 0;
+  let value;
+  if (delim.length === 0) {
+    return buffer;
+  }
+
+  // split each piece
+  while ((pos = unescapedIndexOf(buffer, delim, lastPos)) !== -1) {
+    value = buffer.slice(lastPos, pos);
+    if (innerMulti) {
+      value = parse._parseMultiValue(value, innerMulti, type, [], null, designSet, structuredValue);
+    } else {
+      value = parse._parseValue(value, type, designSet, structuredValue);
+    }
+    result.push(value);
+    lastPos = pos + delim.length;
+  }
+
+  // on the last piece take the rest of string
+  value = buffer.slice(lastPos);
+  if (innerMulti) {
+    value = parse._parseMultiValue(value, innerMulti, type, [], null, designSet, structuredValue);
+  } else {
+    value = parse._parseValue(value, type, designSet, structuredValue);
+  }
+  result.push(value);
+
+  return result.length == 1 ? result[0] : result;
+};
+
+/**
+ * Process a complete buffer of iCalendar/vCard data line by line, correctly
+ * unfolding content. Each line will be processed with the given callback
+ *
+ * @private
+ * @function ICAL.parse._eachLine
+ * @param {String} buffer                         The buffer to process
+ * @param {function(?String, String)} callback    The callback for each line
+ */
+parse._eachLine = function(buffer, callback) {
+  let len = buffer.length;
+  let lastPos = buffer.search(CHAR);
+  let pos = lastPos;
+  let line;
+  let firstChar;
+
+  let newlineOffset;
+
+  do {
+    pos = buffer.indexOf('\n', lastPos) + 1;
+
+    if (pos > 1 && buffer[pos - 2] === '\r') {
+      newlineOffset = 2;
+    } else {
+      newlineOffset = 1;
+    }
+
+    if (pos === 0) {
+      pos = len;
+      newlineOffset = 0;
+    }
+
+    firstChar = buffer[lastPos];
+
+    if (firstChar === ' ' || firstChar === '\t') {
+      // add to line
+      line += buffer.slice(lastPos + 1, pos - newlineOffset);
+    } else {
+      if (line)
+        callback(null, line);
+      // push line
+      line = buffer.slice(lastPos, pos - newlineOffset);
+    }
+
+    lastPos = pos;
+  } while (pos !== len);
+
+  // extra ending line
+  line = line.trim();
+
+  if (line.length)
+    callback(null, line);
+};
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+const OPTIONS = ["tzid", "location", "tznames", "latitude", "longitude"];
+
+/**
+ * Timezone representation.
+ *
+ * @example
+ * var vcalendar;
+ * var timezoneComp = vcalendar.getFirstSubcomponent('vtimezone');
+ * var tzid = timezoneComp.getFirstPropertyValue('tzid');
+ *
+ * var timezone = new ICAL.Timezone({
+ *   component: timezoneComp,
+ *   tzid
+ * });
+ *
+ * @memberof ICAL
+ */
+class Timezone {
+  static _compare_change_fn(a, b) {
+    if (a.year < b.year) return -1;
+    else if (a.year > b.year) return 1;
+
+    if (a.month < b.month) return -1;
+    else if (a.month > b.month) return 1;
+
+    if (a.day < b.day) return -1;
+    else if (a.day > b.day) return 1;
+
+    if (a.hour < b.hour) return -1;
+    else if (a.hour > b.hour) return 1;
+
+    if (a.minute < b.minute) return -1;
+    else if (a.minute > b.minute) return 1;
+
+    if (a.second < b.second) return -1;
+    else if (a.second > b.second) return 1;
+
+    return 0;
+  }
+
+  /**
+   * Convert the date/time from one zone to the next.
+   *
+   * @param {Time} tt                  The time to convert
+   * @param {Timezone} from_zone       The source zone to convert from
+   * @param {Timezone} to_zone         The target zone to convert to
+   * @return {Time}                    The converted date/time object
+   */
+  static convert_time(tt, from_zone, to_zone) {
+    if (tt.isDate ||
+        from_zone.tzid == to_zone.tzid ||
+        from_zone == Timezone.localTimezone ||
+        to_zone == Timezone.localTimezone) {
+      tt.zone = to_zone;
+      return tt;
+    }
+
+    let utcOffset = from_zone.utcOffset(tt);
+    tt.adjust(0, 0, 0, - utcOffset);
+
+    utcOffset = to_zone.utcOffset(tt);
+    tt.adjust(0, 0, 0, utcOffset);
+
+    return null;
+  }
+
+  /**
+   * Creates a new ICAL.Timezone instance from the passed data object.
+   *
+   * @param {Component|Object} aData options for class
+   * @param {String|Component} aData.component
+   *        If aData is a simple object, then this member can be set to either a
+   *        string containing the component data, or an already parsed
+   *        ICAL.Component
+   * @param {String} aData.tzid      The timezone identifier
+   * @param {String} aData.location  The timezone locationw
+   * @param {String} aData.tznames   An alternative string representation of the
+   *                                  timezone
+   * @param {Number} aData.latitude  The latitude of the timezone
+   * @param {Number} aData.longitude The longitude of the timezone
+   */
+  static fromData(aData) {
+    let tt = new Timezone();
+    return tt.fromData(aData);
+  }
+
+  /**
+   * The instance describing the UTC timezone
+   * @type {Timezone}
+   * @constant
+   * @instance
+   */
+  static #utcTimezone = null;
+  static get utcTimezone() {
+    if (!this.#utcTimezone) {
+      this.#utcTimezone = Timezone.fromData({
+        tzid: "UTC"
+      });
+    }
+    return this.#utcTimezone;
+  }
+
+  /**
+   * The instance describing the local timezone
+   * @type {Timezone}
+   * @constant
+   * @instance
+   */
+  static #localTimezone = null;
+  static get localTimezone() {
+    if (!this.#localTimezone) {
+      this.#localTimezone = Timezone.fromData({
+        tzid: "floating"
+      });
+    }
+    return this.#localTimezone;
+  }
+
+  /**
+   * Adjust a timezone change object.
+   * @private
+   * @param {Object} change     The timezone change object
+   * @param {Number} days       The extra amount of days
+   * @param {Number} hours      The extra amount of hours
+   * @param {Number} minutes    The extra amount of minutes
+   * @param {Number} seconds    The extra amount of seconds
+   */
+  static adjust_change(change, days, hours, minutes, seconds) {
+    return Time.prototype.adjust.call(
+      change,
+      days,
+      hours,
+      minutes,
+      seconds,
+      change
+    );
+  }
+
+  static _minimumExpansionYear = -1;
+  static EXTRA_COVERAGE = 5;
+
+  /**
+   * Creates a new ICAL.Timezone instance, by passing in a tzid and component.
+   *
+   * @param {Component|Object} data options for class
+   * @param {String|Component} data.component
+   *        If data is a simple object, then this member can be set to either a
+   *        string containing the component data, or an already parsed
+   *        ICAL.Component
+   * @param {String} data.tzid      The timezone identifier
+   * @param {String} data.location  The timezone locationw
+   * @param {String} data.tznames   An alternative string representation of the
+   *                                  timezone
+   * @param {Number} data.latitude  The latitude of the timezone
+   * @param {Number} data.longitude The longitude of the timezone
+   */
+  constructor(data) {
+    this.wrappedJSObject = this;
+    this.fromData(data);
+  }
+
+
+  /**
+   * Timezone identifier
+   * @type {String}
+   */
+  tzid = "";
+
+  /**
+   * Timezone location
+   * @type {String}
+   */
+  location = "";
+
+  /**
+   * Alternative timezone name, for the string representation
+   * @type {String}
+   */
+  tznames = "";
+
+  /**
+   * The primary latitude for the timezone.
+   * @type {Number}
+   */
+  latitude = 0.0;
+
+  /**
+   * The primary longitude for the timezone.
+   * @type {Number}
+   */
+  longitude = 0.0;
+
+  /**
+   * The vtimezone component for this timezone.
+   * @type {Component}
+   */
+  component = null;
+
+  /**
+   * The year this timezone has been expanded to. All timezone transition
+   * dates until this year are known and can be used for calculation
+   *
+   * @private
+   * @type {Number}
+   */
+  expandedUntilYear = 0;
+
+  /**
+   * The class identifier.
+   * @constant
+   * @type {String}
+   * @default "icaltimezone"
+   */
+  icalclass = "icaltimezone";
+
+  /**
+   * Sets up the current instance using members from the passed data object.
+   *
+   * @param {Component|Object} aData options for class
+   * @param {String|Component} aData.component
+   *        If aData is a simple object, then this member can be set to either a
+   *        string containing the component data, or an already parsed
+   *        ICAL.Component
+   * @param {String} aData.tzid      The timezone identifier
+   * @param {String} aData.location  The timezone locationw
+   * @param {String} aData.tznames   An alternative string representation of the
+   *                                  timezone
+   * @param {Number} aData.latitude  The latitude of the timezone
+   * @param {Number} aData.longitude The longitude of the timezone
+   */
+  fromData(aData) {
+    this.expandedUntilYear = 0;
+    this.changes = [];
+
+    if (aData instanceof Component) {
+      // Either a component is passed directly
+      this.component = aData;
+    } else {
+      // Otherwise the component may be in the data object
+      if (aData && "component" in aData) {
+        if (typeof aData.component == "string") {
+          // If a string was passed, parse it as a component
+          let jCal = parse(aData.component);
+          this.component = new Component(jCal);
+        } else if (aData.component instanceof Component) {
+          // If it was a component already, then just set it
+          this.component = aData.component;
+        } else {
+          // Otherwise just null out the component
+          this.component = null;
+        }
+      }
+
+      // Copy remaining passed properties
+      for (let prop of OPTIONS) {
+        if (aData && prop in aData) {
+          this[prop] = aData[prop];
+        }
+      }
+    }
+
+    // If we have a component but no TZID, attempt to get it from the
+    // component's properties.
+    if (this.component instanceof Component && !this.tzid) {
+      this.tzid = this.component.getFirstPropertyValue('tzid');
+    }
+
+    return this;
+  }
+
+  /**
+   * Finds the utcOffset the given time would occur in this timezone.
+   *
+   * @param {Time} tt         The time to check for
+   * @return {Number}         utc offset in seconds
+   */
+  utcOffset(tt) {
+    if (this == Timezone.utcTimezone || this == Timezone.localTimezone) {
+      return 0;
+    }
+
+    this._ensureCoverage(tt.year);
+
+    if (!this.changes.length) {
+      return 0;
+    }
+
+    let tt_change = {
+      year: tt.year,
+      month: tt.month,
+      day: tt.day,
+      hour: tt.hour,
+      minute: tt.minute,
+      second: tt.second
+    };
+
+    let change_num = this._findNearbyChange(tt_change);
+    let change_num_to_use = -1;
+    let step = 1;
+
+    // TODO: replace with bin search?
+    for (;;) {
+      let change = clone(this.changes[change_num], true);
+      if (change.utcOffset < change.prevUtcOffset) {
+        Timezone.adjust_change(change, 0, 0, 0, change.utcOffset);
+      } else {
+        Timezone.adjust_change(change, 0, 0, 0,
+                                        change.prevUtcOffset);
+      }
+
+      let cmp = Timezone._compare_change_fn(tt_change, change);
+
+      if (cmp >= 0) {
+        change_num_to_use = change_num;
+      } else {
+        step = -1;
+      }
+
+      if (step == -1 && change_num_to_use != -1) {
+        break;
+      }
+
+      change_num += step;
+
+      if (change_num < 0) {
+        return 0;
+      }
+
+      if (change_num >= this.changes.length) {
+        break;
+      }
+    }
+
+    let zone_change = this.changes[change_num_to_use];
+    let utcOffset_change = zone_change.utcOffset - zone_change.prevUtcOffset;
+
+    if (utcOffset_change < 0 && change_num_to_use > 0) {
+      let tmp_change = clone(zone_change, true);
+      Timezone.adjust_change(tmp_change, 0, 0, 0, tmp_change.prevUtcOffset);
+
+      if (Timezone._compare_change_fn(tt_change, tmp_change) < 0) {
+        let prev_zone_change = this.changes[change_num_to_use - 1];
+
+        let want_daylight = false; // TODO
+
+        if (zone_change.is_daylight != want_daylight &&
+            prev_zone_change.is_daylight == want_daylight) {
+          zone_change = prev_zone_change;
+        }
+      }
+    }
+
+    // TODO return is_daylight?
+    return zone_change.utcOffset;
+  }
+
+  _findNearbyChange(change) {
+    // find the closest match
+    let idx = binsearchInsert(
+      this.changes,
+      change,
+      Timezone._compare_change_fn
+    );
+
+    if (idx >= this.changes.length) {
+      return this.changes.length - 1;
+    }
+
+    return idx;
+  }
+
+  _ensureCoverage(aYear) {
+    if (Timezone._minimumExpansionYear == -1) {
+      let today = Time.now();
+      Timezone._minimumExpansionYear = today.year;
+    }
+
+    let changesEndYear = aYear;
+    if (changesEndYear < Timezone._minimumExpansionYear) {
+      changesEndYear = Timezone._minimumExpansionYear;
+    }
+
+    changesEndYear += Timezone.EXTRA_COVERAGE;
+
+    if (!this.changes.length || this.expandedUntilYear < aYear) {
+      let subcomps = this.component.getAllSubcomponents();
+      let compLen = subcomps.length;
+      let compIdx = 0;
+
+      for (; compIdx < compLen; compIdx++) {
+        this._expandComponent(
+          subcomps[compIdx], changesEndYear, this.changes
+        );
+      }
+
+      this.changes.sort(Timezone._compare_change_fn);
+      this.expandedUntilYear = changesEndYear;
+    }
+  }
+
+  _expandComponent(aComponent, aYear, changes) {
+    if (!aComponent.hasProperty("dtstart") ||
+        !aComponent.hasProperty("tzoffsetto") ||
+        !aComponent.hasProperty("tzoffsetfrom")) {
+      return null;
+    }
+
+    let dtstart = aComponent.getFirstProperty("dtstart").getFirstValue();
+    let change;
+
+    function convert_tzoffset(offset) {
+      return offset.factor * (offset.hours * 3600 + offset.minutes * 60);
+    }
+
+    function init_changes() {
+      let changebase = {};
+      changebase.is_daylight = (aComponent.name == "daylight");
+      changebase.utcOffset = convert_tzoffset(
+        aComponent.getFirstProperty("tzoffsetto").getFirstValue()
+      );
+
+      changebase.prevUtcOffset = convert_tzoffset(
+        aComponent.getFirstProperty("tzoffsetfrom").getFirstValue()
+      );
+
+      return changebase;
+    }
+
+    if (!aComponent.hasProperty("rrule") && !aComponent.hasProperty("rdate")) {
+      change = init_changes();
+      change.year = dtstart.year;
+      change.month = dtstart.month;
+      change.day = dtstart.day;
+      change.hour = dtstart.hour;
+      change.minute = dtstart.minute;
+      change.second = dtstart.second;
+
+      Timezone.adjust_change(change, 0, 0, 0, -change.prevUtcOffset);
+      changes.push(change);
+    } else {
+      let props = aComponent.getAllProperties("rdate");
+      for (let rdate of props) {
+        let time = rdate.getFirstValue();
+        change = init_changes();
+
+        change.year = time.year;
+        change.month = time.month;
+        change.day = time.day;
+
+        if (time.isDate) {
+          change.hour = dtstart.hour;
+          change.minute = dtstart.minute;
+          change.second = dtstart.second;
+
+          if (dtstart.zone != Timezone.utcTimezone) {
+            Timezone.adjust_change(change, 0, 0, 0, -change.prevUtcOffset);
+          }
+        } else {
+          change.hour = time.hour;
+          change.minute = time.minute;
+          change.second = time.second;
+
+          if (time.zone != Timezone.utcTimezone) {
+            Timezone.adjust_change(change, 0, 0, 0, -change.prevUtcOffset);
+          }
+        }
+
+        changes.push(change);
+      }
+
+      let rrule = aComponent.getFirstProperty("rrule");
+
+      if (rrule) {
+        rrule = rrule.getFirstValue();
+        change = init_changes();
+
+        if (rrule.until && rrule.until.zone == Timezone.utcTimezone) {
+          rrule.until.adjust(0, 0, 0, change.prevUtcOffset);
+          rrule.until.zone = Timezone.localTimezone;
+        }
+
+        let iterator = rrule.iterator(dtstart);
+
+        let occ;
+        while ((occ = iterator.next())) {
+          change = init_changes();
+          if (occ.year > aYear || !occ) {
+            break;
+          }
+
+          change.year = occ.year;
+          change.month = occ.month;
+          change.day = occ.day;
+          change.hour = occ.hour;
+          change.minute = occ.minute;
+          change.second = occ.second;
+          change.isDate = occ.isDate;
+
+          Timezone.adjust_change(change, 0, 0, 0, -change.prevUtcOffset);
+          changes.push(change);
+        }
+      }
+    }
+
+    return changes;
+  }
+
+  /**
+   * The string representation of this timezone.
+   * @return {String}
+   */
+  toString() {
+    return (this.tznames ? this.tznames : this.tzid);
+  }
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+let zones = null;
+
+/**
+ * @classdesc
+ * Singleton class to contain timezones.  Right now it is all manual registry in
+ * the future we may use this class to download timezone information or handle
+ * loading pre-expanded timezones.
+ *
+ * @exports module:ICAL.TimezoneService
+ * @memberof ICAL
+ */
+const TimezoneService = {
+  get count() {
+    if (zones === null) {
+      return 0;
+    }
+
+    return Object.keys(zones).length;
+  },
+
+  reset: function() {
+    zones = Object.create(null);
+    let utc = Timezone.utcTimezone;
+
+    zones.Z = utc;
+    zones.UTC = utc;
+    zones.GMT = utc;
+  },
+  _hard_reset: function() {
+    zones = null;
+  },
+
+  /**
+   * Checks if timezone id has been registered.
+   *
+   * @param {String} tzid     Timezone identifier (e.g. America/Los_Angeles)
+   * @return {Boolean}        False, when not present
+   */
+  has: function(tzid) {
+    if (zones === null) {
+      return false;
+    }
+
+    return !!zones[tzid];
+  },
+
+  /**
+   * Returns a timezone by its tzid if present.
+   *
+   * @param {String} tzid               Timezone identifier (e.g. America/Los_Angeles)
+   * @return {Timezone | undefined}     The timezone, or undefined if not found
+   */
+  get: function(tzid) {
+    if (zones === null) {
+      this.reset();
+    }
+
+    return zones[tzid];
+  },
+
+  /**
+   * Registers a timezone object or component.
+   *
+   * @param {Component|Timezone} timezone
+   *        The initialized zone or vtimezone.
+   *
+   * @param {String=} name
+   *        The name of the timezone. Defaults to the component's TZID if not
+   *        passed.
+   */
+  register: function(timezone, name) {
+    if (zones === null) {
+      this.reset();
+    }
+
+    // This avoids a breaking change by the change of argument order
+    // TODO remove in v3
+    if (typeof timezone === "string" && name instanceof Timezone) {
+      [timezone, name] = [name, timezone];
+    }
+
+    if (!name) {
+      if (timezone instanceof Timezone) {
+        name = timezone.tzid;
+      } else {
+        if (timezone.name === 'vtimezone') {
+          timezone = new Timezone(timezone);
+          name = timezone.tzid;
+        }
+      }
+    }
+
+    if (!name) {
+      throw new TypeError("Neither a timezone nor a name was passed");
+    }
+
+    if (timezone instanceof Timezone) {
+      zones[name] = timezone;
+    } else {
+      throw new TypeError('timezone must be ICAL.Timezone or ICAL.Component');
+    }
+  },
+
+  /**
+   * Removes a timezone by its tzid from the list.
+   *
+   * @param {String} tzid     Timezone identifier (e.g. America/Los_Angeles)
+   * @return {?Timezone}      The removed timezone, or null if not registered
+   */
+  remove: function(tzid) {
+    if (zones === null) {
+      return null;
+    }
+
+    return (delete zones[tzid]);
+  }
+};
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * Helper functions used in various places within ical.js
+ * @module ICAL.helpers
+ */
+
+/**
+ * Compiles a list of all referenced TZIDs in all subcomponents and
+ * removes any extra VTIMEZONE subcomponents. In addition, if any TZIDs
+ * are referenced by a component, but a VTIMEZONE does not exist,
+ * an attempt will be made to generate a VTIMEZONE using ICAL.TimezoneService.
+ *
+ * @param {Component} vcal     The top-level VCALENDAR component.
+ * @return {Component}         The ICAL.Component that was passed in.
+ */
+function updateTimezones(vcal) {
+  let allsubs, properties, vtimezones, reqTzid, i;
+
+  if (!vcal || vcal.name !== "vcalendar") {
+    //not a top-level vcalendar component
+    return vcal;
+  }
+
+  //Store vtimezone subcomponents in an object reference by tzid.
+  //Store properties from everything else in another array
+  allsubs = vcal.getAllSubcomponents();
+  properties = [];
+  vtimezones = {};
+  for (i = 0; i < allsubs.length; i++) {
+    if (allsubs[i].name === "vtimezone") {
+      let tzid = allsubs[i].getFirstProperty("tzid").getFirstValue();
+      vtimezones[tzid] = allsubs[i];
+    } else {
+      properties = properties.concat(allsubs[i].getAllProperties());
+    }
+  }
+
+  //create an object with one entry for each required tz
+  reqTzid = {};
+  for (i = 0; i < properties.length; i++) {
+    let tzid = properties[i].getParameter("tzid");
+    if (tzid) {
+      reqTzid[tzid] = true;
+    }
+  }
+
+  //delete any vtimezones that are not on the reqTzid list.
+  for (let [tzid, comp] of Object.entries(vtimezones)) {
+    if (!reqTzid[tzid]) {
+      vcal.removeSubcomponent(comp);
+    }
+  }
+
+  //create any missing, but registered timezones
+  for (let tzid of Object.keys(reqTzid)) {
+    if (!vtimezones[tzid] && TimezoneService.has(tzid)) {
+      vcal.addSubcomponent(TimezoneService.get(tzid).component);
+    }
+  }
+
+  return vcal;
+}
+
+/**
+ * Checks if the given type is of the number type and also NaN.
+ *
+ * @param {Number} number     The number to check
+ * @return {Boolean}          True, if the number is strictly NaN
+ */
+function isStrictlyNaN(number) {
+  return typeof(number) === 'number' && isNaN(number);
+}
+
+/**
+ * Parses a string value that is expected to be an integer, when the valid is
+ * not an integer throws a decoration error.
+ *
+ * @param {String} string     Raw string input
+ * @return {Number}           Parsed integer
+ */
+function strictParseInt(string) {
+  let result = parseInt(string, 10);
+
+  if (isStrictlyNaN(result)) {
+    throw new Error(
+      'Could not extract integer from "' + string + '"'
+    );
+  }
+
+  return result;
+}
+
+/**
+ * Creates or returns a class instance of a given type with the initialization
+ * data if the data is not already an instance of the given type.
+ *
+ * @example
+ * var time = new ICAL.Time(...);
+ * var result = ICAL.helpers.formatClassType(time, ICAL.Time);
+ *
+ * (result instanceof ICAL.Time)
+ * // => true
+ *
+ * result = ICAL.helpers.formatClassType({}, ICAL.Time);
+ * (result isntanceof ICAL.Time)
+ * // => true
+ *
+ *
+ * @param {Object} data       object initialization data
+ * @param {Object} type       object type (like ICAL.Time)
+ * @return {?}                An instance of the found type.
+ */
+function formatClassType(data, type) {
+  if (typeof(data) === 'undefined') {
+    return undefined;
+  }
+
+  if (data instanceof type) {
+    return data;
+  }
+  return new type(data);
+}
+
+/**
+ * Identical to indexOf but will only match values when they are not preceded
+ * by a backslash character.
+ *
+ * @param {String} buffer         String to search
+ * @param {String} search         Value to look for
+ * @param {Number} pos            Start position
+ * @return {Number}               The position, or -1 if not found
+ */
+function unescapedIndexOf(buffer, search, pos) {
+  while ((pos = buffer.indexOf(search, pos)) !== -1) {
+    if (pos > 0 && buffer[pos - 1] === '\\') {
+      pos += 1;
+    } else {
+      return pos;
+    }
+  }
+  return -1;
+}
+
+/**
+ * Find the index for insertion using binary search.
+ *
+ * @param {Array} list            The list to search
+ * @param {?} seekVal             The value to insert
+ * @param {function(?,?)} cmpfunc The comparison func, that can
+ *                                  compare two seekVals
+ * @return {Number}               The insert position
+ */
+function binsearchInsert(list, seekVal, cmpfunc) {
+  if (!list.length)
+    return 0;
+
+  let low = 0, high = list.length - 1,
+      mid, cmpval;
+
+  while (low <= high) {
+    mid = low + Math.floor((high - low) / 2);
+    cmpval = cmpfunc(seekVal, list[mid]);
+
+    if (cmpval < 0)
+      high = mid - 1;
+    else if (cmpval > 0)
+      low = mid + 1;
+    else
+      break;
+  }
+
+  if (cmpval < 0)
+    return mid; // insertion is displacing, so use mid outright.
+  else if (cmpval > 0)
+    return mid + 1;
+  else
+    return mid;
+}
+
+/**
+ * Clone the passed object or primitive. By default a shallow clone will be
+ * executed.
+ *
+ * @param {*} aSrc            The thing to clone
+ * @param {Boolean=} aDeep    If true, a deep clone will be performed
+ * @return {*}                The copy of the thing
+ */
+function clone(aSrc, aDeep) {
+  if (!aSrc || typeof aSrc != "object") {
+    return aSrc;
+  } else if (aSrc instanceof Date) {
+    return new Date(aSrc.getTime());
+  } else if ("clone" in aSrc) {
+    return aSrc.clone();
+  } else if (Array.isArray(aSrc)) {
+    let arr = [];
+    for (let i = 0; i < aSrc.length; i++) {
+      arr.push(aDeep ? clone(aSrc[i], true) : aSrc[i]);
+    }
+    return arr;
+  } else {
+    let obj = {};
+    for (let [name, value] of Object.entries(aSrc)) {
+      if (aDeep) {
+        obj[name] = clone(value, true);
+      } else {
+        obj[name] = value;
+      }
+    }
+    return obj;
+  }
+}
+
+/**
+ * Performs iCalendar line folding. A line ending character is inserted and
+ * the next line begins with a whitespace.
+ *
+ * @example
+ * SUMMARY:This line will be fold
+ *  ed right in the middle of a word.
+ *
+ * @param {String} aLine      The line to fold
+ * @return {String}           The folded line
+ */
+function foldline(aLine) {
+  let result = "";
+  let line = aLine || "", pos = 0, line_length = 0;
+  //pos counts position in line for the UTF-16 presentation
+  //line_length counts the bytes for the UTF-8 presentation
+  while (line.length) {
+    let cp = line.codePointAt(pos);
+    if (cp < 128) ++line_length;
+    else if (cp < 2048) line_length += 2;//needs 2 UTF-8 bytes
+    else if (cp < 65536) line_length += 3;
+    else line_length += 4; //cp is less than 1114112
+    if (line_length < ICALmodule.foldLength + 1)
+      pos += cp > 65535 ? 2 : 1;
+    else {
+      result += ICALmodule.newLineChar + " " + line.slice(0, Math.max(0, pos));
+      line = line.slice(Math.max(0, pos));
+      pos = line_length = 0;
+    }
+  }
+  return result.slice(ICALmodule.newLineChar.length + 1);
+}
+
+/**
+ * Pads the given string or number with zeros so it will have at least two
+ * characters.
+ *
+ * @param {String|Number} data    The string or number to pad
+ * @return {String}               The number padded as a string
+ */
+function pad2(data) {
+  if (typeof(data) !== 'string') {
+    // handle fractions.
+    if (typeof(data) === 'number') {
+      data = parseInt(data);
+    }
+    data = String(data);
+  }
+
+  let len = data.length;
+
+  switch (len) {
+    case 0:
+      return '00';
+    case 1:
+      return '0' + data;
+    default:
+      return data;
+  }
+}
+
+/**
+ * Truncates the given number, correctly handling negative numbers.
+ *
+ * @param {Number} number     The number to truncate
+ * @return {Number}           The truncated number
+ */
+function trunc(number) {
+  return (number < 0 ? Math.ceil(number) : Math.floor(number));
+}
+
+/**
+ * Poor-man's cross-browser object extension. Doesn't support all the
+ * features, but enough for our usage. Note that the target's properties are
+ * not overwritten with the source properties.
+ *
+ * @example
+ * var child = ICAL.helpers.extend(parent, {
+ *   "bar": 123
+ * });
+ *
+ * @param {Object} source     The object to extend
+ * @param {Object} target     The object to extend with
+ * @return {Object}           Returns the target.
+ */
+function extend(source, target) {
+  for (let key in source) {
+    let descr = Object.getOwnPropertyDescriptor(source, key);
+    if (descr && !Object.getOwnPropertyDescriptor(target, key)) {
+      Object.defineProperty(target, key, descr);
+    }
+  }
+  return target;
+}
+
+var helpers = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  updateTimezones: updateTimezones,
+  isStrictlyNaN: isStrictlyNaN,
+  strictParseInt: strictParseInt,
+  formatClassType: formatClassType,
+  unescapedIndexOf: unescapedIndexOf,
+  binsearchInsert: binsearchInsert,
+  clone: clone,
+  foldline: foldline,
+  pad2: pad2,
+  trunc: trunc,
+  extend: extend
+});
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * This class represents the "utc-offset" value type, with various calculation and manipulation
+ * methods.
+ *
+ * @memberof ICAL
+ */
+class UtcOffset {
+  /**
+   * Creates a new {@link ICAL.UtcOffset} instance from the passed string.
+   *
+   * @param {String} aString    The string to parse
+   * @return {Duration}         The created utc-offset instance
+   */
+  static fromString(aString) {
+    // -05:00
+    let options = {};
+    //TODO: support seconds per rfc5545 ?
+    options.factor = (aString[0] === '+') ? 1 : -1;
+    options.hours = strictParseInt(aString.slice(1, 3));
+    options.minutes = strictParseInt(aString.slice(4, 6));
+
+    return new UtcOffset(options);
+  }
+
+  /**
+   * Creates a new {@link ICAL.UtcOffset} instance from the passed seconds
+   * value.
+   *
+   * @param {Number} aSeconds       The number of seconds to convert
+   */
+  static fromSeconds(aSeconds) {
+    let instance = new UtcOffset();
+    instance.fromSeconds(aSeconds);
+    return instance;
+  }
+
+  /**
+   * Creates a new ICAL.UtcOffset instance.
+   *
+   * @param {Object} aData          An object with members of the utc offset
+   * @param {Number=} aData.hours   The hours for the utc offset
+   * @param {Number=} aData.minutes The minutes in the utc offset
+   * @param {Number=} aData.factor  The factor for the utc-offset, either -1 or 1
+   */
+  constructor(aData) {
+    this.fromData(aData);
+  }
+
+  /**
+   * The hours in the utc-offset
+   * @type {Number}
+   */
+  hours = 0;
+
+  /**
+   * The minutes in the utc-offset
+   * @type {Number}
+   */
+  minutes = 0;
+
+  /**
+   * The sign of the utc offset, 1 for positive offset, -1 for negative
+   * offsets.
+   * @type {Number}
+   */
+  factor = 1;
+
+  /**
+   * The type name, to be used in the jCal object.
+   * @constant
+   * @type {String}
+   * @default "utc-offset"
+   */
+  icaltype = "utc-offset";
+
+  /**
+   * Returns a clone of the utc offset object.
+   *
+   * @return {UtcOffset}     The cloned object
+   */
+  clone() {
+    return UtcOffset.fromSeconds(this.toSeconds());
+  }
+
+  /**
+   * Sets up the current instance using members from the passed data object.
+   *
+   * @param {Object} aData          An object with members of the utc offset
+   * @param {Number=} aData.hours   The hours for the utc offset
+   * @param {Number=} aData.minutes The minutes in the utc offset
+   * @param {Number=} aData.factor  The factor for the utc-offset, either -1 or 1
+   */
+  fromData(aData) {
+    if (aData) {
+      for (let [key, value] of Object.entries(aData)) {
+        this[key] = value;
+      }
+    }
+    this._normalize();
+  }
+
+  /**
+   * Sets up the current instance from the given seconds value. The seconds
+   * value is truncated to the minute. Offsets are wrapped when the world
+   * ends, the hour after UTC+14:00 is UTC-12:00.
+   *
+   * @param {Number} aSeconds         The seconds to convert into an offset
+   */
+  fromSeconds(aSeconds) {
+    let secs = Math.abs(aSeconds);
+
+    this.factor = aSeconds < 0 ? -1 : 1;
+    this.hours = trunc(secs / 3600);
+
+    secs -= (this.hours * 3600);
+    this.minutes = trunc(secs / 60);
+    return this;
+  }
+
+  /**
+   * Convert the current offset to a value in seconds
+   *
+   * @return {Number}                 The offset in seconds
+   */
+  toSeconds() {
+    return this.factor * (60 * this.minutes + 3600 * this.hours);
+  }
+
+  /**
+   * Compare this utc offset with another one.
+   *
+   * @param {UtcOffset} other             The other offset to compare with
+   * @return {Number}                     -1, 0 or 1 for less/equal/greater
+   */
+  compare(other) {
+    let a = this.toSeconds();
+    let b = other.toSeconds();
+    return (a > b) - (b > a);
+  }
+
+  _normalize() {
+    // Range: 97200 seconds (with 1 hour inbetween)
+    let secs = this.toSeconds();
+    let factor = this.factor;
+    while (secs < -43200) { // = UTC-12:00
+      secs += 97200;
+    }
+    while (secs > 50400) { // = UTC+14:00
+      secs -= 97200;
+    }
+
+    this.fromSeconds(secs);
+
+    // Avoid changing the factor when on zero seconds
+    if (secs == 0) {
+      this.factor = factor;
+    }
+  }
+
+  /**
+   * The iCalendar string representation of this utc-offset.
+   * @return {String}
+   */
+  toICALString() {
+    return design$1.icalendar.value['utc-offset'].toICAL(this.toString());
+  }
+
+  /**
+   * The string representation of this utc-offset.
+   * @return {String}
+   */
+  toString() {
+    return (this.factor == 1 ? "+" : "-") + pad2(this.hours) + ':' + pad2(this.minutes);
+  }
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * Describes a vCard time, which has slight differences to the ICAL.Time.
+ * Properties can be null if not specified, for example for dates with
+ * reduced accuracy or truncation.
+ *
+ * Note that currently not all methods are correctly re-implemented for
+ * VCardTime. For example, comparison will have undefined results when some
+ * members are null.
+ *
+ * Also, normalization is not yet implemented for this class!
+ *
+ * @memberof ICAL
+ * @extends {ICAL.Time}
+ */
+class VCardTime extends Time {
+  /**
+   * Returns a new ICAL.VCardTime instance from a date and/or time string.
+   *
+   * @param {String} aValue     The string to create from
+   * @param {String} aIcalType  The type for this instance, e.g. date-and-or-time
+   * @return {VCardTime}        The date/time instance
+   */
+  static fromDateAndOrTimeString(aValue, aIcalType) {
+    function part(v, s, e) {
+      return v ? strictParseInt(v.slice(s, s + e)) : null;
+    }
+    let parts = aValue.split('T');
+    let dt = parts[0], tmz = parts[1];
+    let splitzone = tmz ? design$1.vcard.value.time._splitZone(tmz) : [];
+    let zone = splitzone[0], tm = splitzone[1];
+
+    let dtlen = dt ? dt.length : 0;
+    let tmlen = tm ? tm.length : 0;
+
+    let hasDashDate = dt && dt[0] == '-' && dt[1] == '-';
+    let hasDashTime = tm && tm[0] == '-';
+
+    let o = {
+      year: hasDashDate ? null : part(dt, 0, 4),
+      month: hasDashDate && (dtlen == 4 || dtlen == 7) ? part(dt, 2, 2) : dtlen == 7 ? part(dt, 5, 2) : dtlen == 10 ? part(dt, 5, 2) : null,
+      day: dtlen == 5 ? part(dt, 3, 2) : dtlen == 7 && hasDashDate ? part(dt, 5, 2) : dtlen == 10 ? part(dt, 8, 2) : null,
+
+      hour: hasDashTime ? null : part(tm, 0, 2),
+      minute: hasDashTime && tmlen == 3 ? part(tm, 1, 2) : tmlen > 4 ? hasDashTime ? part(tm, 1, 2) : part(tm, 3, 2) : null,
+      second: tmlen == 4 ? part(tm, 2, 2) : tmlen == 6 ? part(tm, 4, 2) : tmlen == 8 ? part(tm, 6, 2) : null
+    };
+
+    if (zone == 'Z') {
+      zone = Timezone.utcTimezone;
+    } else if (zone && zone[3] == ':') {
+      zone = UtcOffset.fromString(zone);
+    } else {
+      zone = null;
+    }
+
+    return new VCardTime(o, zone, aIcalType);
+  }
+
+
+  /**
+   * Creates a new ICAL.VCardTime instance.
+   *
+   * @param {Object} data                           The data for the time instance
+   * @param {Number=} data.year                     The year for this date
+   * @param {Number=} data.month                    The month for this date
+   * @param {Number=} data.day                      The day for this date
+   * @param {Number=} data.hour                     The hour for this date
+   * @param {Number=} data.minute                   The minute for this date
+   * @param {Number=} data.second                   The second for this date
+   * @param {Timezone|UtcOffset} zone               The timezone to use
+   * @param {String} icaltype                       The type for this date/time object
+   */
+  constructor(data, zone, icaltype) {
+    super(data, zone);
+    this.icaltype = icaltype || "date-and-or-time";
+  }
+
+  /**
+   * The class identifier.
+   * @constant
+   * @type {String}
+   * @default "vcardtime"
+   */
+  icalclass = "vcardtime";
+
+  /**
+   * The type name, to be used in the jCal object.
+   * @type {String}
+   * @default "date-and-or-time"
+   */
+  icaltype = "date-and-or-time";
+
+  /**
+   * Returns a clone of the vcard date/time object.
+   *
+   * @return {VCardTime}     The cloned object
+   */
+  clone() {
+    return new VCardTime(this._time, this.zone, this.icaltype);
+  }
+
+  _normalize() {
+    return this;
+  }
+
+  /**
+   * @inheritdoc
+   */
+  utcOffset() {
+    if (this.zone instanceof UtcOffset) {
+      return this.zone.toSeconds();
+    } else {
+      return Time.prototype.utcOffset.apply(this, arguments);
+    }
+  }
+
+  /**
+   * Returns an RFC 6350 compliant representation of this object.
+   *
+   * @return {String}         vcard date/time string
+   */
+  toICALString() {
+    return design$1.vcard.value[this.icaltype].toICAL(this.toString());
+  }
+
+  /**
+   * The string representation of this date/time, in jCard form
+   * (including : and - separators).
+   * @return {String}
+   */
+  toString() {
+    let y = this.year, m = this.month, d = this.day;
+    let h = this.hour, mm = this.minute, s = this.second;
+
+    let hasYear = y !== null, hasMonth = m !== null, hasDay = d !== null;
+    let hasHour = h !== null, hasMinute = mm !== null, hasSecond = s !== null;
+
+    let datepart = (hasYear ? pad2(y) + (hasMonth || hasDay ? '-' : '') : (hasMonth || hasDay ? '--' : '')) +
+                   (hasMonth ? pad2(m) : '') +
+                   (hasDay ? '-' + pad2(d) : '');
+    let timepart = (hasHour ? pad2(h) : '-') + (hasHour && hasMinute ? ':' : '') +
+                   (hasMinute ? pad2(mm) : '') + (!hasHour && !hasMinute ? '-' : '') +
+                   (hasMinute && hasSecond ? ':' : '') +
+                   (hasSecond ? pad2(s) : '');
+
+    let zone;
+    if (this.zone === Timezone.utcTimezone) {
+      zone = 'Z';
+    } else if (this.zone instanceof UtcOffset) {
+      zone = this.zone.toString();
+    } else if (this.zone === Timezone.localTimezone) {
+      zone = '';
+    } else if (this.zone instanceof Timezone) {
+      let offset = UtcOffset.fromSeconds(this.zone.utcOffset(this));
+      zone = offset.toString();
+    } else {
+      zone = '';
+    }
+
+    switch (this.icaltype) {
+      case "time":
+        return timepart + zone;
+      case "date-and-or-time":
+      case "date-time":
+        return datepart + (timepart == '--' ? '' : 'T' + timepart + zone);
+      case "date":
+        return datepart;
+    }
+    return null;
+  }
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * This lets typescript resolve our custom types in the
+ * generated d.ts files (jsdoc typedefs are converted to typescript types).
+ * Ignore prevents the typedefs from being documented more than once.
+ *
+ * @ignore
+ * @typedef {import("./types.js").weekDay} weekDay
+ * Imports the 'weekDay' type from the "types.js" module
+ */
+
+/**
+ * An iterator for a single recurrence rule. This class usually doesn't have to be instanciated
+ * directly, the convenience method {@link ICAL.Recur#iterator} can be used.
+ *
+ * @memberof ICAL
+ */
+class RecurIterator {
+  static _indexMap = {
+    "BYSECOND": 0,
+    "BYMINUTE": 1,
+    "BYHOUR": 2,
+    "BYDAY": 3,
+    "BYMONTHDAY": 4,
+    "BYYEARDAY": 5,
+    "BYWEEKNO": 6,
+    "BYMONTH": 7,
+    "BYSETPOS": 8
+  };
+
+  static _expandMap = {
+    "SECONDLY": [1, 1, 1, 1, 1, 1, 1, 1],
+    "MINUTELY": [2, 1, 1, 1, 1, 1, 1, 1],
+    "HOURLY": [2, 2, 1, 1, 1, 1, 1, 1],
+    "DAILY": [2, 2, 2, 1, 1, 1, 1, 1],
+    "WEEKLY": [2, 2, 2, 2, 3, 3, 1, 1],
+    "MONTHLY": [2, 2, 2, 2, 2, 3, 3, 1],
+    "YEARLY": [2, 2, 2, 2, 2, 2, 2, 2]
+  };
+
+  static UNKNOWN = 0;
+  static CONTRACT = 1;
+  static EXPAND = 2;
+  static ILLEGAL = 3;
+
+  /**
+   * Creates a new ICAL.RecurIterator instance. The options object may contain additional members
+   * when resuming iteration from a previous run.
+   *
+   * @param {Object} options                The iterator options
+   * @param {Recur} options.rule            The rule to iterate.
+   * @param {Time} options.dtstart          The start date of the event.
+   * @param {Boolean=} options.initialized  When true, assume that options are
+   *        from a previously constructed iterator. Initialization will not be
+   *        repeated.
+   */
+  constructor(options) {
+    this.fromData(options);
+  }
+
+  /**
+   * True when iteration is finished.
+   * @type {Boolean}
+   */
+  completed = false;
+
+  /**
+   * The rule that is being iterated
+   * @type {Recur}
+   */
+  rule = null;
+
+  /**
+   * The start date of the event being iterated.
+   * @type {Time}
+   */
+  dtstart = null;
+
+  /**
+   * The last occurrence that was returned from the
+   * {@link RecurIterator#next} method.
+   * @type {Time}
+   */
+  last = null;
+
+  /**
+   * The sequence number from the occurrence
+   * @type {Number}
+   */
+  occurrence_number = 0;
+
+  /**
+   * The indices used for the {@link ICAL.RecurIterator#by_data} object.
+   * @type {Object}
+   * @private
+   */
+  by_indices = null;
+
+  /**
+   * If true, the iterator has already been initialized
+   * @type {Boolean}
+   * @private
+   */
+  initialized = false;
+
+  /**
+   * The initializd by-data.
+   * @type {Object}
+   * @private
+   */
+  by_data = null;
+
+  /**
+   * The expanded yeardays
+   * @type {Array}
+   * @private
+   */
+  days = null;
+
+  /**
+   * The index in the {@link ICAL.RecurIterator#days} array.
+   * @type {Number}
+   * @private
+   */
+  days_index = 0;
+
+  /**
+   * Initialize the recurrence iterator from the passed data object. This
+   * method is usually not called directly, you can initialize the iterator
+   * through the constructor.
+   *
+   * @param {Object} options                The iterator options
+   * @param {Recur} options.rule            The rule to iterate.
+   * @param {Time} options.dtstart          The start date of the event.
+   * @param {Boolean=} options.initialized  When true, assume that options are
+   *        from a previously constructed iterator. Initialization will not be
+   *        repeated.
+   */
+  fromData(options) {
+    this.rule = formatClassType(options.rule, Recur);
+
+    if (!this.rule) {
+      throw new Error('iterator requires a (ICAL.Recur) rule');
+    }
+
+    this.dtstart = formatClassType(options.dtstart, Time);
+
+    if (!this.dtstart) {
+      throw new Error('iterator requires a (ICAL.Time) dtstart');
+    }
+
+    if (options.by_data) {
+      this.by_data = options.by_data;
+    } else {
+      this.by_data = clone(this.rule.parts, true);
+    }
+
+    if (options.occurrence_number)
+      this.occurrence_number = options.occurrence_number;
+
+    this.days = options.days || [];
+    if (options.last) {
+      this.last = formatClassType(options.last, Time);
+    }
+
+    this.by_indices = options.by_indices;
+
+    if (!this.by_indices) {
+      this.by_indices = {
+        "BYSECOND": 0,
+        "BYMINUTE": 0,
+        "BYHOUR": 0,
+        "BYDAY": 0,
+        "BYMONTH": 0,
+        "BYWEEKNO": 0,
+        "BYMONTHDAY": 0
+      };
+    }
+
+    this.initialized = options.initialized || false;
+
+    if (!this.initialized) {
+      try {
+        this.init();
+      } catch (e) {
+        if (e instanceof InvalidRecurrenceRuleError) {
+          // Init may error if there are no possible recurrence instances from
+          // the rule, but we don't want to bubble this error up. Instead, we
+          // create an empty iterator.
+          this.completed = true;
+        } else {
+          // Propagate other errors to consumers.
+          throw e;
+        }
+      }
+    }
+  }
+
+  /**
+   * Initialize the iterator
+   * @private
+   */
+  init() {
+    this.initialized = true;
+    this.last = this.dtstart.clone();
+    let parts = this.by_data;
+
+    if ("BYDAY" in parts) {
+      // libical does this earlier when the rule is loaded, but we postpone to
+      // now so we can preserve the original order.
+      this.sort_byday_rules(parts.BYDAY);
+    }
+
+    // If the BYYEARDAY appares, no other date rule part may appear
+    if ("BYYEARDAY" in parts) {
+      if ("BYMONTH" in parts || "BYWEEKNO" in parts ||
+          "BYMONTHDAY" in parts || "BYDAY" in parts) {
+        throw new Error("Invalid BYYEARDAY rule");
+      }
+    }
+
+    // BYWEEKNO and BYMONTHDAY rule parts may not both appear
+    if ("BYWEEKNO" in parts && "BYMONTHDAY" in parts) {
+      throw new Error("BYWEEKNO does not fit to BYMONTHDAY");
+    }
+
+    // For MONTHLY recurrences (FREQ=MONTHLY) neither BYYEARDAY nor
+    // BYWEEKNO may appear.
+    if (this.rule.freq == "MONTHLY" &&
+        ("BYYEARDAY" in parts || "BYWEEKNO" in parts)) {
+      throw new Error("For MONTHLY recurrences neither BYYEARDAY nor BYWEEKNO may appear");
+    }
+
+    // For WEEKLY recurrences (FREQ=WEEKLY) neither BYMONTHDAY nor
+    // BYYEARDAY may appear.
+    if (this.rule.freq == "WEEKLY" &&
+        ("BYYEARDAY" in parts || "BYMONTHDAY" in parts)) {
+      throw new Error("For WEEKLY recurrences neither BYMONTHDAY nor BYYEARDAY may appear");
+    }
+
+    // BYYEARDAY may only appear in YEARLY rules
+    if (this.rule.freq != "YEARLY" && "BYYEARDAY" in parts) {
+      throw new Error("BYYEARDAY may only appear in YEARLY rules");
+    }
+
+    this.last.second = this.setup_defaults("BYSECOND", "SECONDLY", this.dtstart.second);
+    this.last.minute = this.setup_defaults("BYMINUTE", "MINUTELY", this.dtstart.minute);
+    this.last.hour = this.setup_defaults("BYHOUR", "HOURLY", this.dtstart.hour);
+    this.last.day = this.setup_defaults("BYMONTHDAY", "DAILY", this.dtstart.day);
+    this.last.month = this.setup_defaults("BYMONTH", "MONTHLY", this.dtstart.month);
+
+    if (this.rule.freq == "WEEKLY") {
+      if ("BYDAY" in parts) {
+        let [, dow] = this.ruleDayOfWeek(parts.BYDAY[0], this.rule.wkst);
+        let wkdy = dow - this.last.dayOfWeek(this.rule.wkst);
+        if ((this.last.dayOfWeek(this.rule.wkst) < dow && wkdy >= 0) || wkdy < 0) {
+          // Initial time is after first day of BYDAY data
+          this.last.day += wkdy;
+        }
+      } else {
+        let dayName = Recur.numericDayToIcalDay(this.dtstart.dayOfWeek());
+        parts.BYDAY = [dayName];
+      }
+    }
+
+    if (this.rule.freq == "YEARLY") {
+      // Some yearly recurrence rules may be specific enough to not actually
+      // occur on a yearly basis, e.g. the 29th day of February or the fifth
+      // Monday of a given month. The standard isn't clear on the intended
+      // behavior in these cases, but `libical` at least will iterate until it
+      // finds a matching year.
+      // CAREFUL: Some rules may specify an occurrence that can never happen,
+      // e.g. the first Monday of April so long as it falls on the 15th
+      // through the 21st. Detecting these is non-trivial, so ensure that we
+      // stop iterating at some point.
+      const untilYear = this.rule.until ? this.rule.until.year : 20000;
+      while (this.last.year <= untilYear) {
+        this.expand_year_days(this.last.year);
+        if (this.days.length > 0) {
+          break;
+        }
+        this.increment_year(this.rule.interval);
+      }
+
+      if (this.days.length == 0) {
+        throw new InvalidRecurrenceRuleError();
+      }
+
+      this._nextByYearDay();
+    }
+
+    if (this.rule.freq == "MONTHLY") {
+      if (this.has_by_data("BYDAY")) {
+        let tempLast = null;
+        let initLast = this.last.clone();
+        let daysInMonth = Time.daysInMonth(this.last.month, this.last.year);
+
+        // Check every weekday in BYDAY with relative dow and pos.
+        for (let bydow of this.by_data.BYDAY) {
+          this.last = initLast.clone();
+          let [pos, dow] = this.ruleDayOfWeek(bydow);
+          let dayOfMonth = this.last.nthWeekDay(dow, pos);
+
+          // If |pos| >= 6, the byday is invalid for a monthly rule.
+          if (pos >= 6 || pos <= -6) {
+            throw new Error("Malformed values in BYDAY part");
+          }
+
+          // If a Byday with pos=+/-5 is not in the current month it
+          // must be searched in the next months.
+          if (dayOfMonth > daysInMonth || dayOfMonth <= 0) {
+            // Skip if we have already found a "last" in this month.
+            if (tempLast && tempLast.month == initLast.month) {
+              continue;
+            }
+            while (dayOfMonth > daysInMonth || dayOfMonth <= 0) {
+              this.increment_month();
+              daysInMonth = Time.daysInMonth(this.last.month, this.last.year);
+              dayOfMonth = this.last.nthWeekDay(dow, pos);
+            }
+          }
+
+          this.last.day = dayOfMonth;
+          if (!tempLast || this.last.compare(tempLast) < 0) {
+            tempLast = this.last.clone();
+          }
+        }
+        this.last = tempLast.clone();
+
+        //XXX: This feels like a hack, but we need to initialize
+        //     the BYMONTHDAY case correctly and byDayAndMonthDay handles
+        //     this case. It accepts a special flag which will avoid incrementing
+        //     the initial value without the flag days that match the start time
+        //     would be missed.
+        if (this.has_by_data('BYMONTHDAY')) {
+          this._byDayAndMonthDay(true);
+        }
+
+        if (this.last.day > daysInMonth || this.last.day == 0) {
+          throw new Error("Malformed values in BYDAY part");
+        }
+      } else if (this.has_by_data("BYMONTHDAY")) {
+        // Change the day value so that normalisation won't change the month.
+        this.last.day = 1;
+
+        // Get a sorted list of days in the starting month that match the rule.
+        let normalized = this.normalizeByMonthDayRules(
+          this.last.year,
+          this.last.month,
+          this.rule.parts.BYMONTHDAY
+        ).filter(d => d >= this.last.day);
+
+        if (normalized.length) {
+          // There's at least one valid day, use it.
+          this.last.day = normalized[0];
+          this.by_data.BYMONTHDAY = normalized;
+        } else {
+          // There's no occurrence in this month, find the next valid month.
+          // The longest possible sequence of skipped months is February-April-June,
+          // so we might need to call next_month up to three times.
+          if (!this.next_month() && !this.next_month() && !this.next_month()) {
+            throw new Error("No possible occurrences");
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Retrieve the next occurrence from the iterator.
+   * @return {Time}
+   */
+  next(again = false) {
+    let before = (this.last ? this.last.clone() : null);
+
+    if ((this.rule.count && this.occurrence_number >= this.rule.count) ||
+        (this.rule.until && this.last.compare(this.rule.until) > 0)) {
+      this.completed = true;
+    }
+
+    if (this.completed) {
+      return null;
+    }
+
+    if (this.occurrence_number == 0 && this.last.compare(this.dtstart) >= 0) {
+      // First of all, give the instance that was initialized
+      this.occurrence_number++;
+      return this.last;
+    }
+
+    let valid;
+    do {
+      valid = 1;
+
+      switch (this.rule.freq) {
+      case "SECONDLY":
+        this.next_second();
+        break;
+      case "MINUTELY":
+        this.next_minute();
+        break;
+      case "HOURLY":
+        this.next_hour();
+        break;
+      case "DAILY":
+        this.next_day();
+        break;
+      case "WEEKLY":
+        this.next_week();
+        break;
+      case "MONTHLY":
+        valid = this.next_month();
+        break;
+      case "YEARLY":
+        this.next_year();
+        break;
+
+      default:
+        return null;
+      }
+    } while (!this.check_contracting_rules() ||
+             this.last.compare(this.dtstart) < 0 ||
+             !valid);
+
+    if (this.last.compare(before) == 0) {
+      if (again) {
+        throw new Error("Same occurrence found twice, protecting you from death by recursion");
+      }
+      this.next(true);
+    }
+
+    if (this.rule.until && this.last.compare(this.rule.until) > 0) {
+      this.completed = true;
+      return null;
+    } else {
+      this.occurrence_number++;
+      return this.last;
+    }
+  }
+
+  next_second() {
+    return this.next_generic("BYSECOND", "SECONDLY", "second", "minute");
+  }
+
+  increment_second(inc) {
+    return this.increment_generic(inc, "second", 60, "minute");
+  }
+
+  next_minute() {
+    return this.next_generic("BYMINUTE", "MINUTELY",
+                             "minute", "hour", "next_second");
+  }
+
+  increment_minute(inc) {
+    return this.increment_generic(inc, "minute", 60, "hour");
+  }
+
+  next_hour() {
+    return this.next_generic("BYHOUR", "HOURLY", "hour",
+                             "monthday", "next_minute");
+  }
+
+  increment_hour(inc) {
+    this.increment_generic(inc, "hour", 24, "monthday");
+  }
+
+  next_day() {
+    let this_freq = (this.rule.freq == "DAILY");
+
+    if (this.next_hour() == 0) {
+      return 0;
+    }
+
+    if (this_freq) {
+      this.increment_monthday(this.rule.interval);
+    } else {
+      this.increment_monthday(1);
+    }
+
+    return 0;
+  }
+
+  next_week() {
+    let end_of_data = 0;
+
+    if (this.next_weekday_by_week() == 0) {
+      return end_of_data;
+    }
+
+    if (this.has_by_data("BYWEEKNO")) {
+      this.by_indices.BYWEEKNO++;
+
+      if (this.by_indices.BYWEEKNO == this.by_data.BYWEEKNO.length) {
+        this.by_indices.BYWEEKNO = 0;
+        end_of_data = 1;
+      }
+
+      // HACK should be first month of the year
+      this.last.month = 1;
+      this.last.day = 1;
+
+      let week_no = this.by_data.BYWEEKNO[this.by_indices.BYWEEKNO];
+
+      this.last.day += 7 * week_no;
+
+      if (end_of_data) {
+        this.increment_year(1);
+      }
+    } else {
+      // Jump to the next week
+      this.increment_monthday(7 * this.rule.interval);
+    }
+
+    return end_of_data;
+  }
+
+  /**
+   * Normalize each by day rule for a given year/month.
+   * Takes into account ordering and negative rules
+   *
+   * @private
+   * @param {Number} year         Current year.
+   * @param {Number} month        Current month.
+   * @param {Array}  rules        Array of rules.
+   *
+   * @return {Array} sorted and normalized rules.
+   *                 Negative rules will be expanded to their
+   *                 correct positive values for easier processing.
+   */
+  normalizeByMonthDayRules(year, month, rules) {
+    let daysInMonth = Time.daysInMonth(month, year);
+
+    // XXX: This is probably bad for performance to allocate
+    //      a new array for each month we scan, if possible
+    //      we should try to optimize this...
+    let newRules = [];
+
+    let ruleIdx = 0;
+    let len = rules.length;
+    let rule;
+
+    for (; ruleIdx < len; ruleIdx++) {
+      rule = parseInt(rules[ruleIdx], 10);
+      if (isNaN(rule)) {
+        throw new Error('Invalid BYMONTHDAY value');
+      }
+
+      // if this rule falls outside of given
+      // month discard it.
+      if (Math.abs(rule) > daysInMonth) {
+        continue;
+      }
+
+      // negative case
+      if (rule < 0) {
+        // we add (not subtract it is a negative number)
+        // one from the rule because 1 === last day of month
+        rule = daysInMonth + (rule + 1);
+      } else if (rule === 0) {
+        // skip zero: it is invalid.
+        continue;
+      }
+
+      // only add unique items...
+      if (newRules.indexOf(rule) === -1) {
+        newRules.push(rule);
+      }
+
+    }
+
+    // unique and sort
+    return newRules.sort(function(a, b) { return a - b; });
+  }
+
+  /**
+   * NOTES:
+   * We are given a list of dates in the month (BYMONTHDAY) (23, etc..)
+   * Also we are given a list of days (BYDAY) (MO, 2SU, etc..) when
+   * both conditions match a given date (this.last.day) iteration stops.
+   *
+   * @private
+   * @param {Boolean=} isInit     When given true will not increment the
+   *                                current day (this.last).
+   */
+  _byDayAndMonthDay(isInit) {
+    let byMonthDay; // setup in initMonth
+    let byDay = this.by_data.BYDAY;
+
+    let date;
+    let dateIdx = 0;
+    let dateLen; // setup in initMonth
+    let dayLen = byDay.length;
+
+    // we are not valid by default
+    let dataIsValid = 0;
+
+    let daysInMonth;
+    let self = this;
+    // we need a copy of this, because a DateTime gets normalized
+    // automatically if the day is out of range. At some points we
+    // set the last day to 0 to start counting.
+    let lastDay = this.last.day;
+
+    function initMonth() {
+      daysInMonth = Time.daysInMonth(
+        self.last.month, self.last.year
+      );
+
+      byMonthDay = self.normalizeByMonthDayRules(
+        self.last.year,
+        self.last.month,
+        self.by_data.BYMONTHDAY
+      );
+
+      dateLen = byMonthDay.length;
+
+      // For the case of more than one occurrence in one month
+      // we have to be sure to start searching after the last
+      // found date or at the last BYMONTHDAY, unless we are
+      // initializing the iterator because in this case we have
+      // to consider the last found date too.
+      while (byMonthDay[dateIdx] <= lastDay &&
+             !(isInit && byMonthDay[dateIdx] == lastDay) &&
+             dateIdx < dateLen - 1) {
+        dateIdx++;
+      }
+    }
+
+    function nextMonth() {
+      // since the day is incremented at the start
+      // of the loop below, we need to start at 0
+      lastDay = 0;
+      self.increment_month();
+      dateIdx = 0;
+      initMonth();
+    }
+
+    initMonth();
+
+    // should come after initMonth
+    if (isInit) {
+      lastDay -= 1;
+    }
+
+    // Use a counter to avoid an infinite loop with malformed rules.
+    // Stop checking after 4 years so we consider also a leap year.
+    let monthsCounter = 48;
+
+    while (!dataIsValid && monthsCounter) {
+      monthsCounter--;
+      // increment the current date. This is really
+      // important otherwise we may fall into the infinite
+      // loop trap. The initial date takes care of the case
+      // where the current date is the date we are looking
+      // for.
+      date = lastDay + 1;
+
+      if (date > daysInMonth) {
+        nextMonth();
+        continue;
+      }
+
+      // find next date
+      let next = byMonthDay[dateIdx++];
+
+      // this logic is dependent on the BYMONTHDAYS
+      // being in order (which is done by #normalizeByMonthDayRules)
+      if (next >= date) {
+        // if the next month day is in the future jump to it.
+        lastDay = next;
+      } else {
+        // in this case the 'next' monthday has past
+        // we must move to the month.
+        nextMonth();
+        continue;
+      }
+
+      // Now we can loop through the day rules to see
+      // if one matches the current month date.
+      for (let dayIdx = 0; dayIdx < dayLen; dayIdx++) {
+        let parts = this.ruleDayOfWeek(byDay[dayIdx]);
+        let pos = parts[0];
+        let dow = parts[1];
+
+        this.last.day = lastDay;
+        if (this.last.isNthWeekDay(dow, pos)) {
+          // when we find the valid one we can mark
+          // the conditions as met and break the loop.
+          // (Because we have this condition above
+          //  it will also break the parent loop).
+          dataIsValid = 1;
+          break;
+        }
+      }
+
+      // It is completely possible that the combination
+      // cannot be matched in the current month.
+      // When we reach the end of possible combinations
+      // in the current month we iterate to the next one.
+      // since dateIdx is incremented right after getting
+      // "next", we don't need dateLen -1 here.
+      if (!dataIsValid && dateIdx === dateLen) {
+        nextMonth();
+        continue;
+      }
+    }
+
+    if (monthsCounter <= 0) {
+      // Checked 4 years without finding a Byday that matches
+      // a Bymonthday. Maybe the rule is not correct.
+      throw new Error("Malformed values in BYDAY combined with BYMONTHDAY parts");
+    }
+
+
+    return dataIsValid;
+  }
+
+  next_month() {
+    let data_valid = 1;
+
+    if (this.next_hour() == 0) {
+      return data_valid;
+    }
+
+    if (this.has_by_data("BYDAY") && this.has_by_data("BYMONTHDAY")) {
+      data_valid = this._byDayAndMonthDay();
+    } else if (this.has_by_data("BYDAY")) {
+      let daysInMonth = Time.daysInMonth(this.last.month, this.last.year);
+      let setpos = 0;
+      let setpos_total = 0;
+
+      if (this.has_by_data("BYSETPOS")) {
+        let last_day = this.last.day;
+        for (let day = 1; day <= daysInMonth; day++) {
+          this.last.day = day;
+          if (this.is_day_in_byday(this.last)) {
+            setpos_total++;
+            if (day <= last_day) {
+              setpos++;
+            }
+          }
+        }
+        this.last.day = last_day;
+      }
+
+      data_valid = 0;
+      let day;
+      for (day = this.last.day + 1; day <= daysInMonth; day++) {
+        this.last.day = day;
+
+        if (this.is_day_in_byday(this.last)) {
+          if (!this.has_by_data("BYSETPOS") ||
+              this.check_set_position(++setpos) ||
+              this.check_set_position(setpos - setpos_total - 1)) {
+
+            data_valid = 1;
+            break;
+          }
+        }
+      }
+
+      if (day > daysInMonth) {
+        this.last.day = 1;
+        this.increment_month();
+
+        if (this.is_day_in_byday(this.last)) {
+          if (!this.has_by_data("BYSETPOS") || this.check_set_position(1)) {
+            data_valid = 1;
+          }
+        } else {
+          data_valid = 0;
+        }
+      }
+    } else if (this.has_by_data("BYMONTHDAY")) {
+      this.by_indices.BYMONTHDAY++;
+
+      if (this.by_indices.BYMONTHDAY >= this.by_data.BYMONTHDAY.length) {
+        this.by_indices.BYMONTHDAY = 0;
+        this.increment_month();
+        if (this.by_indices.BYMONTHDAY >= this.by_data.BYMONTHDAY.length) {
+          return 0;
+        }
+      }
+
+      let daysInMonth = Time.daysInMonth(this.last.month, this.last.year);
+      let day = this.by_data.BYMONTHDAY[this.by_indices.BYMONTHDAY];
+
+      if (day < 0) {
+        day = daysInMonth + day + 1;
+      }
+
+      if (day > daysInMonth) {
+        this.last.day = 1;
+        data_valid = this.is_day_in_byday(this.last);
+      } else {
+        this.last.day = day;
+      }
+    } else {
+      this.increment_month();
+      let daysInMonth = Time.daysInMonth(this.last.month, this.last.year);
+      if (this.by_data.BYMONTHDAY[0] > daysInMonth) {
+        data_valid = 0;
+      } else {
+        this.last.day = this.by_data.BYMONTHDAY[0];
+      }
+    }
+
+    return data_valid;
+  }
+
+  next_weekday_by_week() {
+    let end_of_data = 0;
+
+    if (this.next_hour() == 0) {
+      return end_of_data;
+    }
+
+    if (!this.has_by_data("BYDAY")) {
+      return 1;
+    }
+
+    for (;;) {
+      let tt = new Time();
+      this.by_indices.BYDAY++;
+
+      if (this.by_indices.BYDAY == Object.keys(this.by_data.BYDAY).length) {
+        this.by_indices.BYDAY = 0;
+        end_of_data = 1;
+      }
+
+      let coded_day = this.by_data.BYDAY[this.by_indices.BYDAY];
+      let parts = this.ruleDayOfWeek(coded_day);
+      let dow = parts[1];
+
+      dow -= this.rule.wkst;
+
+      if (dow < 0) {
+        dow += 7;
+      }
+
+      tt.year = this.last.year;
+      tt.month = this.last.month;
+      tt.day = this.last.day;
+
+      let startOfWeek = tt.startDoyWeek(this.rule.wkst);
+
+      if (dow + startOfWeek < 1) {
+        // The selected date is in the previous year
+        if (!end_of_data) {
+          continue;
+        }
+      }
+
+      let next = Time.fromDayOfYear(startOfWeek + dow, this.last.year);
+
+      /**
+       * The normalization horrors below are due to
+       * the fact that when the year/month/day changes
+       * it can effect the other operations that come after.
+       */
+      this.last.year = next.year;
+      this.last.month = next.month;
+      this.last.day = next.day;
+
+      return end_of_data;
+    }
+  }
+
+  next_year() {
+    if (this.next_hour() == 0) {
+      return 0;
+    }
+
+    if (++this.days_index == this.days.length) {
+      this.days_index = 0;
+      do {
+        this.increment_year(this.rule.interval);
+        if (this.has_by_data("BYMONTHDAY")) {
+          this.by_data.BYMONTHDAY = this.normalizeByMonthDayRules(
+            this.last.year,
+            this.last.month,
+            this.rule.parts.BYMONTHDAY
+          );
+        }
+        this.expand_year_days(this.last.year);
+      } while (this.days.length == 0);
+    }
+
+    this._nextByYearDay();
+
+    return 1;
+  }
+
+  _nextByYearDay() {
+    let doy = this.days[this.days_index];
+    let year = this.last.year;
+    if (doy < 1) {
+        // Time.fromDayOfYear(doy, year) indexes relative to the
+        // start of the given year. That is different from the
+        // semantics of BYYEARDAY where negative indexes are an
+        // offset from the end of the given year.
+        doy += 1;
+        year += 1;
+    }
+    let next = Time.fromDayOfYear(doy, year);
+    this.last.day = next.day;
+    this.last.month = next.month;
+  }
+
+  /**
+   * @param dow (eg: '1TU', '-1MO')
+   * @param {weekDay=} aWeekStart The week start weekday
+   * @return [pos, numericDow] (eg: [1, 3]) numericDow is relative to aWeekStart
+   */
+  ruleDayOfWeek(dow, aWeekStart) {
+    let matches = dow.match(/([+-]?[0-9])?(MO|TU|WE|TH|FR|SA|SU)/);
+    if (matches) {
+      let pos = parseInt(matches[1] || 0, 10);
+      dow = Recur.icalDayToNumericDay(matches[2], aWeekStart);
+      return [pos, dow];
+    } else {
+      return [0, 0];
+    }
+  }
+
+  next_generic(aRuleType, aInterval, aDateAttr, aFollowingAttr, aPreviousIncr) {
+    let has_by_rule = (aRuleType in this.by_data);
+    let this_freq = (this.rule.freq == aInterval);
+    let end_of_data = 0;
+
+    if (aPreviousIncr && this[aPreviousIncr]() == 0) {
+      return end_of_data;
+    }
+
+    if (has_by_rule) {
+      this.by_indices[aRuleType]++;
+      let dta = this.by_data[aRuleType];
+
+      if (this.by_indices[aRuleType] == dta.length) {
+        this.by_indices[aRuleType] = 0;
+        end_of_data = 1;
+      }
+      this.last[aDateAttr] = dta[this.by_indices[aRuleType]];
+    } else if (this_freq) {
+      this["increment_" + aDateAttr](this.rule.interval);
+    }
+
+    if (has_by_rule && end_of_data && this_freq) {
+      this["increment_" + aFollowingAttr](1);
+    }
+
+    return end_of_data;
+  }
+
+  increment_monthday(inc) {
+    for (let i = 0; i < inc; i++) {
+      let daysInMonth = Time.daysInMonth(this.last.month, this.last.year);
+      this.last.day++;
+
+      if (this.last.day > daysInMonth) {
+        this.last.day -= daysInMonth;
+        this.increment_month();
+      }
+    }
+  }
+
+  increment_month() {
+    this.last.day = 1;
+    if (this.has_by_data("BYMONTH")) {
+      this.by_indices.BYMONTH++;
+
+      if (this.by_indices.BYMONTH == this.by_data.BYMONTH.length) {
+        this.by_indices.BYMONTH = 0;
+        this.increment_year(1);
+      }
+
+      this.last.month = this.by_data.BYMONTH[this.by_indices.BYMONTH];
+    } else {
+      if (this.rule.freq == "MONTHLY") {
+        this.last.month += this.rule.interval;
+      } else {
+        this.last.month++;
+      }
+
+      this.last.month--;
+      let years = trunc(this.last.month / 12);
+      this.last.month %= 12;
+      this.last.month++;
+
+      if (years != 0) {
+        this.increment_year(years);
+      }
+    }
+
+    if (this.has_by_data("BYMONTHDAY")) {
+      this.by_data.BYMONTHDAY = this.normalizeByMonthDayRules(
+        this.last.year,
+        this.last.month,
+        this.rule.parts.BYMONTHDAY
+      );
+    }
+  }
+
+  increment_year(inc) {
+    // Don't jump into the next month if this.last is Feb 29.
+    this.last.day = 1;
+    this.last.year += inc;
+  }
+
+  increment_generic(inc, aDateAttr, aFactor, aNextIncrement) {
+    this.last[aDateAttr] += inc;
+    let nextunit = trunc(this.last[aDateAttr] / aFactor);
+    this.last[aDateAttr] %= aFactor;
+    if (nextunit != 0) {
+      this["increment_" + aNextIncrement](nextunit);
+    }
+  }
+
+  has_by_data(aRuleType) {
+    return (aRuleType in this.rule.parts);
+  }
+
+  expand_year_days(aYear) {
+    let t = new Time();
+    this.days = [];
+
+    // We need our own copy with a few keys set
+    let parts = {};
+    let rules = ["BYDAY", "BYWEEKNO", "BYMONTHDAY", "BYMONTH", "BYYEARDAY"];
+    for (let part of rules) {
+      if (part in this.rule.parts) {
+        parts[part] = this.rule.parts[part];
+      }
+    }
+
+    if ("BYMONTH" in parts && "BYWEEKNO" in parts) {
+      let valid = 1;
+      let validWeeks = {};
+      t.year = aYear;
+      t.isDate = true;
+
+      for (let monthIdx = 0; monthIdx < this.by_data.BYMONTH.length; monthIdx++) {
+        let month = this.by_data.BYMONTH[monthIdx];
+        t.month = month;
+        t.day = 1;
+        let first_week = t.weekNumber(this.rule.wkst);
+        t.day = Time.daysInMonth(month, aYear);
+        let last_week = t.weekNumber(this.rule.wkst);
+        for (monthIdx = first_week; monthIdx < last_week; monthIdx++) {
+          validWeeks[monthIdx] = 1;
+        }
+      }
+
+      for (let weekIdx = 0; weekIdx < this.by_data.BYWEEKNO.length && valid; weekIdx++) {
+        let weekno = this.by_data.BYWEEKNO[weekIdx];
+        if (weekno < 52) {
+          valid &= validWeeks[weekIdx];
+        } else {
+          valid = 0;
+        }
+      }
+
+      if (valid) {
+        delete parts.BYMONTH;
+      } else {
+        delete parts.BYWEEKNO;
+      }
+    }
+
+    let partCount = Object.keys(parts).length;
+
+    if (partCount == 0) {
+      let t1 = this.dtstart.clone();
+      t1.year = this.last.year;
+      this.days.push(t1.dayOfYear());
+    } else if (partCount == 1 && "BYMONTH" in parts) {
+      for (let month of this.by_data.BYMONTH) {
+        let t2 = this.dtstart.clone();
+        t2.year = aYear;
+        t2.month = month;
+        t2.isDate = true;
+        this.days.push(t2.dayOfYear());
+      }
+    } else if (partCount == 1 && "BYMONTHDAY" in parts) {
+      for (let monthday of this.by_data.BYMONTHDAY) {
+        let t3 = this.dtstart.clone();
+        if (monthday < 0) {
+          let daysInMonth = Time.daysInMonth(t3.month, aYear);
+          monthday = monthday + daysInMonth + 1;
+        }
+        t3.day = monthday;
+        t3.year = aYear;
+        t3.isDate = true;
+        this.days.push(t3.dayOfYear());
+      }
+    } else if (partCount == 2 &&
+               "BYMONTHDAY" in parts &&
+               "BYMONTH" in parts) {
+      for (let month of this.by_data.BYMONTH) {
+        let daysInMonth = Time.daysInMonth(month, aYear);
+        for (let monthday of this.by_data.BYMONTHDAY) {
+          if (monthday < 0) {
+            monthday = monthday + daysInMonth + 1;
+          }
+          t.day = monthday;
+          t.month = month;
+          t.year = aYear;
+          t.isDate = true;
+
+          this.days.push(t.dayOfYear());
+        }
+      }
+    } else if (partCount == 1 && "BYWEEKNO" in parts) ; else if (partCount == 2 &&
+               "BYWEEKNO" in parts &&
+               "BYMONTHDAY" in parts) ; else if (partCount == 1 && "BYDAY" in parts) {
+      this.days = this.days.concat(this.expand_by_day(aYear));
+    } else if (partCount == 2 && "BYDAY" in parts && "BYMONTH" in parts) {
+      for (let month of this.by_data.BYMONTH) {
+        let daysInMonth = Time.daysInMonth(month, aYear);
+
+        t.year = aYear;
+        t.month = month;
+        t.day = 1;
+        t.isDate = true;
+
+        let first_dow = t.dayOfWeek();
+        let doy_offset = t.dayOfYear() - 1;
+
+        t.day = daysInMonth;
+        let last_dow = t.dayOfWeek();
+
+        if (this.has_by_data("BYSETPOS")) {
+          let by_month_day = [];
+          for (let day = 1; day <= daysInMonth; day++) {
+            t.day = day;
+            if (this.is_day_in_byday(t)) {
+              by_month_day.push(day);
+            }
+          }
+
+          for (let spIndex = 0; spIndex < by_month_day.length; spIndex++) {
+            if (this.check_set_position(spIndex + 1) ||
+                this.check_set_position(spIndex - by_month_day.length)) {
+              this.days.push(doy_offset + by_month_day[spIndex]);
+            }
+          }
+        } else {
+          for (let coded_day of this.by_data.BYDAY) {
+            let bydayParts = this.ruleDayOfWeek(coded_day);
+            let pos = bydayParts[0];
+            let dow = bydayParts[1];
+            let month_day;
+
+            let first_matching_day = ((dow + 7 - first_dow) % 7) + 1;
+            let last_matching_day = daysInMonth - ((last_dow + 7 - dow) % 7);
+
+            if (pos == 0) {
+              for (let day = first_matching_day; day <= daysInMonth; day += 7) {
+                this.days.push(doy_offset + day);
+              }
+            } else if (pos > 0) {
+              month_day = first_matching_day + (pos - 1) * 7;
+
+              if (month_day <= daysInMonth) {
+                this.days.push(doy_offset + month_day);
+              }
+            } else {
+              month_day = last_matching_day + (pos + 1) * 7;
+
+              if (month_day > 0) {
+                this.days.push(doy_offset + month_day);
+              }
+            }
+          }
+        }
+      }
+      // Return dates in order of occurrence (1,2,3,...) instead
+      // of by groups of weekdays (1,8,15,...,2,9,16,...).
+      this.days.sort(function(a, b) { return a - b; }); // Comparator function allows to sort numbers.
+    } else if (partCount == 2 && "BYDAY" in parts && "BYMONTHDAY" in parts) {
+      let expandedDays = this.expand_by_day(aYear);
+
+      for (let day of expandedDays) {
+        let tt = Time.fromDayOfYear(day, aYear);
+        if (this.by_data.BYMONTHDAY.indexOf(tt.day) >= 0) {
+          this.days.push(day);
+        }
+      }
+    } else if (partCount == 3 &&
+               "BYDAY" in parts &&
+               "BYMONTHDAY" in parts &&
+               "BYMONTH" in parts) {
+      let expandedDays = this.expand_by_day(aYear);
+
+      for (let day of expandedDays) {
+        let tt = Time.fromDayOfYear(day, aYear);
+
+        if (this.by_data.BYMONTH.indexOf(tt.month) >= 0 &&
+            this.by_data.BYMONTHDAY.indexOf(tt.day) >= 0) {
+          this.days.push(day);
+        }
+      }
+    } else if (partCount == 2 && "BYDAY" in parts && "BYWEEKNO" in parts) {
+      let expandedDays = this.expand_by_day(aYear);
+
+      for (let day of expandedDays) {
+        let tt = Time.fromDayOfYear(day, aYear);
+        let weekno = tt.weekNumber(this.rule.wkst);
+
+        if (this.by_data.BYWEEKNO.indexOf(weekno)) {
+          this.days.push(day);
+        }
+      }
+    } else if (partCount == 3 &&
+               "BYDAY" in parts &&
+               "BYWEEKNO" in parts &&
+               "BYMONTHDAY" in parts) ; else if (partCount == 1 && "BYYEARDAY" in parts) {
+      this.days = this.days.concat(this.by_data.BYYEARDAY);
+    } else {
+      this.days = [];
+    }
+
+    let daysInYear = Time.isLeapYear(aYear) ? 366 : 365;
+    this.days.sort((a, b) => {
+      if (a < 0) a += daysInYear + 1;
+      if (b < 0) b += daysInYear + 1;
+      return a - b;
+    });
+
+    return 0;
+  }
+
+  expand_by_day(aYear) {
+
+    let days_list = [];
+    let tmp = this.last.clone();
+
+    tmp.year = aYear;
+    tmp.month = 1;
+    tmp.day = 1;
+    tmp.isDate = true;
+
+    let start_dow = tmp.dayOfWeek();
+
+    tmp.month = 12;
+    tmp.day = 31;
+    tmp.isDate = true;
+
+    let end_dow = tmp.dayOfWeek();
+    let end_year_day = tmp.dayOfYear();
+
+    for (let day of this.by_data.BYDAY) {
+      let parts = this.ruleDayOfWeek(day);
+      let pos = parts[0];
+      let dow = parts[1];
+
+      if (pos == 0) {
+        let tmp_start_doy = ((dow + 7 - start_dow) % 7) + 1;
+
+        for (let doy = tmp_start_doy; doy <= end_year_day; doy += 7) {
+          days_list.push(doy);
+        }
+
+      } else if (pos > 0) {
+        let first;
+        if (dow >= start_dow) {
+          first = dow - start_dow + 1;
+        } else {
+          first = dow - start_dow + 8;
+        }
+
+        days_list.push(first + (pos - 1) * 7);
+      } else {
+        let last;
+        pos = -pos;
+
+        if (dow <= end_dow) {
+          last = end_year_day - end_dow + dow;
+        } else {
+          last = end_year_day - end_dow + dow - 7;
+        }
+
+        days_list.push(last - (pos - 1) * 7);
+      }
+    }
+    return days_list;
+  }
+
+  is_day_in_byday(tt) {
+    if (this.by_data.BYDAY) {
+      for (let day of this.by_data.BYDAY) {
+        let parts = this.ruleDayOfWeek(day);
+        let pos = parts[0];
+        let dow = parts[1];
+        let this_dow = tt.dayOfWeek();
+
+        if ((pos == 0 && dow == this_dow) ||
+            (tt.nthWeekDay(dow, pos) == tt.day)) {
+          return 1;
+        }
+      }
+    }
+
+    return 0;
+  }
+
+  /**
+   * Checks if given value is in BYSETPOS.
+   *
+   * @private
+   * @param {Numeric} aPos position to check for.
+   * @return {Boolean} false unless BYSETPOS rules exist
+   *                   and the given value is present in rules.
+   */
+  check_set_position(aPos) {
+    if (this.has_by_data('BYSETPOS')) {
+      let idx = this.by_data.BYSETPOS.indexOf(aPos);
+      // negative numbers are not false-y
+      return idx !== -1;
+    }
+    return false;
+  }
+
+  sort_byday_rules(aRules) {
+    for (let i = 0; i < aRules.length; i++) {
+      for (let j = 0; j < i; j++) {
+        let one = this.ruleDayOfWeek(aRules[j], this.rule.wkst)[1];
+        let two = this.ruleDayOfWeek(aRules[i], this.rule.wkst)[1];
+
+        if (one > two) {
+          let tmp = aRules[i];
+          aRules[i] = aRules[j];
+          aRules[j] = tmp;
+        }
+      }
+    }
+  }
+
+  check_contract_restriction(aRuleType, v) {
+    let indexMapValue = RecurIterator._indexMap[aRuleType];
+    let ruleMapValue = RecurIterator._expandMap[this.rule.freq][indexMapValue];
+    let pass = false;
+
+    if (aRuleType in this.by_data &&
+        ruleMapValue == RecurIterator.CONTRACT) {
+
+      let ruleType = this.by_data[aRuleType];
+
+      for (let bydata of ruleType) {
+        if (bydata == v) {
+          pass = true;
+          break;
+        }
+      }
+    } else {
+      // Not a contracting byrule or has no data, test passes
+      pass = true;
+    }
+    return pass;
+  }
+
+  check_contracting_rules() {
+    let dow = this.last.dayOfWeek();
+    let weekNo = this.last.weekNumber(this.rule.wkst);
+    let doy = this.last.dayOfYear();
+
+    return (this.check_contract_restriction("BYSECOND", this.last.second) &&
+            this.check_contract_restriction("BYMINUTE", this.last.minute) &&
+            this.check_contract_restriction("BYHOUR", this.last.hour) &&
+            this.check_contract_restriction("BYDAY", Recur.numericDayToIcalDay(dow)) &&
+            this.check_contract_restriction("BYWEEKNO", weekNo) &&
+            this.check_contract_restriction("BYMONTHDAY", this.last.day) &&
+            this.check_contract_restriction("BYMONTH", this.last.month) &&
+            this.check_contract_restriction("BYYEARDAY", doy));
+  }
+
+  setup_defaults(aRuleType, req, deftime) {
+    let indexMapValue = RecurIterator._indexMap[aRuleType];
+    let ruleMapValue = RecurIterator._expandMap[this.rule.freq][indexMapValue];
+
+    if (ruleMapValue != RecurIterator.CONTRACT) {
+      if (!(aRuleType in this.by_data)) {
+        this.by_data[aRuleType] = [deftime];
+      }
+      if (this.rule.freq != req) {
+        return this.by_data[aRuleType][0];
+      }
+    }
+    return deftime;
+  }
+
+  /**
+   * Convert iterator into a serialize-able object.  Will preserve current
+   * iteration sequence to ensure the seamless continuation of the recurrence
+   * rule.
+   * @return {Object}
+   */
+  toJSON() {
+    let result = Object.create(null);
+
+    result.initialized = this.initialized;
+    result.rule = this.rule.toJSON();
+    result.dtstart = this.dtstart.toJSON();
+    result.by_data = this.by_data;
+    result.days = this.days;
+    result.last = this.last.toJSON();
+    result.by_indices = this.by_indices;
+    result.occurrence_number = this.occurrence_number;
+
+    return result;
+  }
+}
+
+/**
+ * An error indicating that a recurrence rule is invalid and produces no
+ * occurrences.
+ *
+ * @extends {Error}
+ * @class
+ */
+class InvalidRecurrenceRuleError extends Error {
+  constructor() {
+    super("Recurrence rule has no valid occurrences");
+  }
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * This lets typescript resolve our custom types in the
+ * generated d.ts files (jsdoc typedefs are converted to typescript types).
+ * Ignore prevents the typedefs from being documented more than once.
+ *
+ * @ignore
+ * @typedef {import("./types.js").weekDay} weekDay
+ * Imports the 'weekDay' type from the "types.js" module
+ * @typedef {import("./types.js").frequencyValues} frequencyValues
+ * Imports the 'frequencyValues' type from the "types.js" module
+ */
+
+const VALID_DAY_NAMES = /^(SU|MO|TU|WE|TH|FR|SA)$/;
+const VALID_BYDAY_PART = /^([+-])?(5[0-3]|[1-4][0-9]|[1-9])?(SU|MO|TU|WE|TH|FR|SA)$/;
+const DOW_MAP = {
+  SU: Time.SUNDAY,
+  MO: Time.MONDAY,
+  TU: Time.TUESDAY,
+  WE: Time.WEDNESDAY,
+  TH: Time.THURSDAY,
+  FR: Time.FRIDAY,
+  SA: Time.SATURDAY
+};
+
+const REVERSE_DOW_MAP = Object.fromEntries(Object.entries(DOW_MAP).map(entry => entry.reverse()));
+
+const ALLOWED_FREQ = ['SECONDLY', 'MINUTELY', 'HOURLY',
+                      'DAILY', 'WEEKLY', 'MONTHLY', 'YEARLY'];
+
+/**
+ * This class represents the "recur" value type, used for example by RRULE. It provides methods to
+ * calculate occurrences among others.
+ *
+ * @memberof ICAL
+ */
+class Recur {
+  /**
+   * Creates a new {@link ICAL.Recur} instance from the passed string.
+   *
+   * @param {String} string         The string to parse
+   * @return {Recur}                The created recurrence instance
+   */
+  static fromString(string) {
+    let data = this._stringToData(string, false);
+    return new Recur(data);
+  }
+
+  /**
+   * Creates a new {@link ICAL.Recur} instance using members from the passed
+   * data object.
+   *
+   * @param {Object} aData                              An object with members of the recurrence
+   * @param {frequencyValues=} aData.freq               The frequency value
+   * @param {Number=} aData.interval                    The INTERVAL value
+   * @param {weekDay=} aData.wkst                       The week start value
+   * @param {Time=} aData.until                         The end of the recurrence set
+   * @param {Number=} aData.count                       The number of occurrences
+   * @param {Array.<Number>=} aData.bysecond            The seconds for the BYSECOND part
+   * @param {Array.<Number>=} aData.byminute            The minutes for the BYMINUTE part
+   * @param {Array.<Number>=} aData.byhour              The hours for the BYHOUR part
+   * @param {Array.<String>=} aData.byday               The BYDAY values
+   * @param {Array.<Number>=} aData.bymonthday          The days for the BYMONTHDAY part
+   * @param {Array.<Number>=} aData.byyearday           The days for the BYYEARDAY part
+   * @param {Array.<Number>=} aData.byweekno            The weeks for the BYWEEKNO part
+   * @param {Array.<Number>=} aData.bymonth             The month for the BYMONTH part
+   * @param {Array.<Number>=} aData.bysetpos            The positionals for the BYSETPOS part
+   */
+  static fromData(aData) {
+    return new Recur(aData);
+  }
+
+  /**
+   * Converts a recurrence string to a data object, suitable for the fromData
+   * method.
+   *
+   * @private
+   * @param {String} string     The string to parse
+   * @param {Boolean} fmtIcal   If true, the string is considered to be an
+   *                              iCalendar string
+   * @return {Recur}            The recurrence instance
+   */
+  static _stringToData(string, fmtIcal) {
+    let dict = Object.create(null);
+
+    // split is slower in FF but fast enough.
+    // v8 however this is faster then manual split?
+    let values = string.split(';');
+    let len = values.length;
+
+    for (let i = 0; i < len; i++) {
+      let parts = values[i].split('=');
+      let ucname = parts[0].toUpperCase();
+      let lcname = parts[0].toLowerCase();
+      let name = (fmtIcal ? lcname : ucname);
+      let value = parts[1];
+
+      if (ucname in partDesign) {
+        let partArr = value.split(',');
+        let partSet = new Set();
+
+        for (let part of partArr) {
+          partSet.add(partDesign[ucname](part));
+        }
+        partArr = [...partSet];
+
+        dict[name] = (partArr.length == 1 ? partArr[0] : partArr);
+      } else if (ucname in optionDesign) {
+        optionDesign[ucname](value, dict, fmtIcal);
+      } else {
+        // Don't swallow unknown values. Just set them as they are.
+        dict[lcname] = value;
+      }
+    }
+
+    return dict;
+  }
+
+  /**
+   * Convert an ical representation of a day (SU, MO, etc..)
+   * into a numeric value of that day.
+   *
+   * @param {String} string     The iCalendar day name
+   * @param {weekDay=} aWeekStart
+   *        The week start weekday, defaults to SUNDAY
+   * @return {Number}           Numeric value of given day
+   */
+  static icalDayToNumericDay(string, aWeekStart) {
+    //XXX: this is here so we can deal
+    //     with possibly invalid string values.
+    let firstDow = aWeekStart || Time.SUNDAY;
+    return ((DOW_MAP[string] - firstDow + 7) % 7) + 1;
+  }
+
+  /**
+   * Convert a numeric day value into its ical representation (SU, MO, etc..)
+   *
+   * @param {Number} num        Numeric value of given day
+   * @param {weekDay=} aWeekStart
+   *        The week start weekday, defaults to SUNDAY
+   * @return {String}           The ICAL day value, e.g SU,MO,...
+   */
+  static numericDayToIcalDay(num, aWeekStart) {
+    //XXX: this is here so we can deal with possibly invalid number values.
+    //     Also, this allows consistent mapping between day numbers and day
+    //     names for external users.
+    let firstDow = aWeekStart || Time.SUNDAY;
+    let dow = (num + firstDow - Time.SUNDAY);
+    if (dow > 7) {
+      dow -= 7;
+    }
+    return REVERSE_DOW_MAP[dow];
+  }
+
+  /**
+   * Create a new instance of the Recur class.
+   *
+   * @param {Object} data                               An object with members of the recurrence
+   * @param {frequencyValues=} data.freq                The frequency value
+   * @param {Number=} data.interval                     The INTERVAL value
+   * @param {weekDay=} data.wkst                        The week start value
+   * @param {Time=} data.until                          The end of the recurrence set
+   * @param {Number=} data.count                        The number of occurrences
+   * @param {Array.<Number>=} data.bysecond             The seconds for the BYSECOND part
+   * @param {Array.<Number>=} data.byminute             The minutes for the BYMINUTE part
+   * @param {Array.<Number>=} data.byhour               The hours for the BYHOUR part
+   * @param {Array.<String>=} data.byday                The BYDAY values
+   * @param {Array.<Number>=} data.bymonthday           The days for the BYMONTHDAY part
+   * @param {Array.<Number>=} data.byyearday            The days for the BYYEARDAY part
+   * @param {Array.<Number>=} data.byweekno             The weeks for the BYWEEKNO part
+   * @param {Array.<Number>=} data.bymonth              The month for the BYMONTH part
+   * @param {Array.<Number>=} data.bysetpos             The positionals for the BYSETPOS part
+   */
+  constructor(data) {
+    this.wrappedJSObject = this;
+    this.parts = {};
+
+    if (data && typeof(data) === 'object') {
+      this.fromData(data);
+    }
+  }
+
+  /**
+   * An object holding the BY-parts of the recurrence rule
+   * @memberof ICAL.Recur
+   * @typedef {Object} byParts
+   * @property {Array.<Number>=} BYSECOND            The seconds for the BYSECOND part
+   * @property {Array.<Number>=} BYMINUTE            The minutes for the BYMINUTE part
+   * @property {Array.<Number>=} BYHOUR              The hours for the BYHOUR part
+   * @property {Array.<String>=} BYDAY               The BYDAY values
+   * @property {Array.<Number>=} BYMONTHDAY          The days for the BYMONTHDAY part
+   * @property {Array.<Number>=} BYYEARDAY           The days for the BYYEARDAY part
+   * @property {Array.<Number>=} BYWEEKNO            The weeks for the BYWEEKNO part
+   * @property {Array.<Number>=} BYMONTH             The month for the BYMONTH part
+   * @property {Array.<Number>=} BYSETPOS            The positionals for the BYSETPOS part
+   */
+
+  /**
+   * An object holding the BY-parts of the recurrence rule
+   * @type {byParts}
+   */
+  parts = null;
+
+  /**
+   * The interval value for the recurrence rule.
+   * @type {Number}
+   */
+  interval = 1;
+
+  /**
+   * The week start day
+   *
+   * @type {weekDay}
+   * @default ICAL.Time.MONDAY
+   */
+  wkst = Time.MONDAY;
+
+  /**
+   * The end of the recurrence
+   * @type {?Time}
+   */
+  until = null;
+
+  /**
+   * The maximum number of occurrences
+   * @type {?Number}
+   */
+  count = null;
+
+  /**
+   * The frequency value.
+   * @type {frequencyValues}
+   */
+  freq = null;
+
+  /**
+   * The class identifier.
+   * @constant
+   * @type {String}
+   * @default "icalrecur"
+   */
+  icalclass = "icalrecur";
+
+  /**
+   * The type name, to be used in the jCal object.
+   * @constant
+   * @type {String}
+   * @default "recur"
+   */
+  icaltype = "recur";
+
+  /**
+   * Create a new iterator for this recurrence rule. The passed start date
+   * must be the start date of the event, not the start of the range to
+   * search in.
+   *
+   * @example
+   * let recur = comp.getFirstPropertyValue('rrule');
+   * let dtstart = comp.getFirstPropertyValue('dtstart');
+   * let iter = recur.iterator(dtstart);
+   * for (let next = iter.next(); next; next = iter.next()) {
+   *   if (next.compare(rangeStart) < 0) {
+   *     continue;
+   *   }
+   *   console.log(next.toString());
+   * }
+   *
+   * @param {Time} aStart        The item's start date
+   * @return {RecurIterator}     The recurrence iterator
+   */
+  iterator(aStart) {
+    return new RecurIterator({
+      rule: this,
+      dtstart: aStart
+    });
+  }
+
+  /**
+   * Returns a clone of the recurrence object.
+   *
+   * @return {Recur}      The cloned object
+   */
+  clone() {
+    return new Recur(this.toJSON());
+  }
+
+  /**
+   * Checks if the current rule is finite, i.e. has a count or until part.
+   *
+   * @return {Boolean}        True, if the rule is finite
+   */
+  isFinite() {
+    return !!(this.count || this.until);
+  }
+
+  /**
+   * Checks if the current rule has a count part, and not limited by an until
+   * part.
+   *
+   * @return {Boolean}        True, if the rule is by count
+   */
+  isByCount() {
+    return !!(this.count && !this.until);
+  }
+
+  /**
+   * Adds a component (part) to the recurrence rule. This is not a component
+   * in the sense of {@link ICAL.Component}, but a part of the recurrence
+   * rule, i.e. BYMONTH.
+   *
+   * @param {String} aType            The name of the component part
+   * @param {Array|String} aValue     The component value
+   */
+  addComponent(aType, aValue) {
+    let ucname = aType.toUpperCase();
+    if (ucname in this.parts) {
+      this.parts[ucname].push(aValue);
+    } else {
+      this.parts[ucname] = [aValue];
+    }
+  }
+
+  /**
+   * Sets the component value for the given by-part.
+   *
+   * @param {String} aType        The component part name
+   * @param {Array} aValues       The component values
+   */
+  setComponent(aType, aValues) {
+    this.parts[aType.toUpperCase()] = aValues.slice();
+  }
+
+  /**
+   * Gets (a copy) of the requested component value.
+   *
+   * @param {String} aType        The component part name
+   * @return {Array}              The component part value
+   */
+  getComponent(aType) {
+    let ucname = aType.toUpperCase();
+    return (ucname in this.parts ? this.parts[ucname].slice() : []);
+  }
+
+  /**
+   * Retrieves the next occurrence after the given recurrence id. See the
+   * guide on {@tutorial terminology} for more details.
+   *
+   * NOTE: Currently, this method iterates all occurrences from the start
+   * date. It should not be called in a loop for performance reasons. If you
+   * would like to get more than one occurrence, you can iterate the
+   * occurrences manually, see the example on the
+   * {@link ICAL.Recur#iterator iterator} method.
+   *
+   * @param {Time} aStartTime        The start of the event series
+   * @param {Time} aRecurrenceId     The date of the last occurrence
+   * @return {Time}                  The next occurrence after
+   */
+  getNextOccurrence(aStartTime, aRecurrenceId) {
+    let iter = this.iterator(aStartTime);
+    let next;
+
+    do {
+      next = iter.next();
+    } while (next && next.compare(aRecurrenceId) <= 0);
+
+    if (next && aRecurrenceId.zone) {
+      next.zone = aRecurrenceId.zone;
+    }
+
+    return next;
+  }
+
+  /**
+   * Sets up the current instance using members from the passed data object.
+   *
+   * @param {Object} data                               An object with members of the recurrence
+   * @param {frequencyValues=} data.freq                The frequency value
+   * @param {Number=} data.interval                     The INTERVAL value
+   * @param {weekDay=} data.wkst                        The week start value
+   * @param {Time=} data.until                          The end of the recurrence set
+   * @param {Number=} data.count                        The number of occurrences
+   * @param {Array.<Number>=} data.bysecond             The seconds for the BYSECOND part
+   * @param {Array.<Number>=} data.byminute             The minutes for the BYMINUTE part
+   * @param {Array.<Number>=} data.byhour               The hours for the BYHOUR part
+   * @param {Array.<String>=} data.byday                The BYDAY values
+   * @param {Array.<Number>=} data.bymonthday           The days for the BYMONTHDAY part
+   * @param {Array.<Number>=} data.byyearday            The days for the BYYEARDAY part
+   * @param {Array.<Number>=} data.byweekno             The weeks for the BYWEEKNO part
+   * @param {Array.<Number>=} data.bymonth              The month for the BYMONTH part
+   * @param {Array.<Number>=} data.bysetpos             The positionals for the BYSETPOS part
+   */
+  fromData(data) {
+    for (let key in data) {
+      let uckey = key.toUpperCase();
+
+      if (uckey in partDesign) {
+        if (Array.isArray(data[key])) {
+          this.parts[uckey] = data[key];
+        } else {
+          this.parts[uckey] = [data[key]];
+        }
+      } else {
+        this[key] = data[key];
+      }
+    }
+
+    if (this.interval && typeof this.interval != "number") {
+      optionDesign.INTERVAL(this.interval, this);
+    }
+
+    if (this.wkst && typeof this.wkst != "number") {
+      this.wkst = Recur.icalDayToNumericDay(this.wkst);
+    }
+
+    if (this.until && !(this.until instanceof Time)) {
+      this.until = Time.fromString(this.until);
+    }
+  }
+
+  /**
+   * The jCal representation of this recurrence type.
+   * @return {Object}
+   */
+  toJSON() {
+    let res = Object.create(null);
+    res.freq = this.freq;
+
+    if (this.count) {
+      res.count = this.count;
+    }
+
+    if (this.interval > 1) {
+      res.interval = this.interval;
+    }
+
+    for (let [k, kparts] of Object.entries(this.parts)) {
+      if (Array.isArray(kparts) && kparts.length == 1) {
+        res[k.toLowerCase()] = kparts[0];
+      } else {
+        res[k.toLowerCase()] = clone(kparts);
+      }
+    }
+
+    if (this.until) {
+      res.until = this.until.toString();
+    }
+    if ('wkst' in this && this.wkst !== Time.DEFAULT_WEEK_START) {
+      res.wkst = Recur.numericDayToIcalDay(this.wkst);
+    }
+    return res;
+  }
+
+  /**
+   * The string representation of this recurrence rule.
+   * @return {String}
+   */
+  toString() {
+    // TODO retain order
+    let str = "FREQ=" + this.freq;
+    if (this.count) {
+      str += ";COUNT=" + this.count;
+    }
+    if (this.interval > 1) {
+      str += ";INTERVAL=" + this.interval;
+    }
+    for (let [k, v] of Object.entries(this.parts)) {
+      str += ";" + k + "=" + v;
+    }
+    if (this.until) {
+      str += ';UNTIL=' + this.until.toICALString();
+    }
+    if ('wkst' in this && this.wkst !== Time.DEFAULT_WEEK_START) {
+      str += ';WKST=' + Recur.numericDayToIcalDay(this.wkst);
+    }
+    return str;
+  }
+}
+
+function parseNumericValue(type, min, max, value) {
+  let result = value;
+
+  if (value[0] === '+') {
+    result = value.slice(1);
+  }
+
+  result = strictParseInt(result);
+
+  if (min !== undefined && value < min) {
+    throw new Error(
+      type + ': invalid value "' + value + '" must be > ' + min
+    );
+  }
+
+  if (max !== undefined && value > max) {
+    throw new Error(
+      type + ': invalid value "' + value + '" must be < ' + min
+    );
+  }
+
+  return result;
+}
+
+const optionDesign = {
+  FREQ: function(value, dict, fmtIcal) {
+    // yes this is actually equal or faster then regex.
+    // upside here is we can enumerate the valid values.
+    if (ALLOWED_FREQ.indexOf(value) !== -1) {
+      dict.freq = value;
+    } else {
+      throw new Error(
+        'invalid frequency "' + value + '" expected: "' +
+        ALLOWED_FREQ.join(', ') + '"'
+      );
+    }
+  },
+
+  COUNT: function(value, dict, fmtIcal) {
+    dict.count = strictParseInt(value);
+  },
+
+  INTERVAL: function(value, dict, fmtIcal) {
+    dict.interval = strictParseInt(value);
+    if (dict.interval < 1) {
+      // 0 or negative values are not allowed, some engines seem to generate
+      // it though. Assume 1 instead.
+      dict.interval = 1;
+    }
+  },
+
+  UNTIL: function(value, dict, fmtIcal) {
+    if (value.length > 10) {
+      dict.until = design$1.icalendar.value['date-time'].fromICAL(value);
+    } else {
+      dict.until = design$1.icalendar.value.date.fromICAL(value);
+    }
+    if (!fmtIcal) {
+      dict.until = Time.fromString(dict.until);
+    }
+  },
+
+  WKST: function(value, dict, fmtIcal) {
+    if (VALID_DAY_NAMES.test(value)) {
+      dict.wkst = Recur.icalDayToNumericDay(value);
+    } else {
+      throw new Error('invalid WKST value "' + value + '"');
+    }
+  }
+};
+
+const partDesign = {
+  BYSECOND: parseNumericValue.bind(undefined, 'BYSECOND', 0, 60),
+  BYMINUTE: parseNumericValue.bind(undefined, 'BYMINUTE', 0, 59),
+  BYHOUR: parseNumericValue.bind(undefined, 'BYHOUR', 0, 23),
+  BYDAY: function(value) {
+    if (VALID_BYDAY_PART.test(value)) {
+      return value;
+    } else {
+      throw new Error('invalid BYDAY value "' + value + '"');
+    }
+  },
+  BYMONTHDAY: parseNumericValue.bind(undefined, 'BYMONTHDAY', -31, 31),
+  BYYEARDAY: parseNumericValue.bind(undefined, 'BYYEARDAY', -366, 366),
+  BYWEEKNO: parseNumericValue.bind(undefined, 'BYWEEKNO', -53, 53),
+  BYMONTH: parseNumericValue.bind(undefined, 'BYMONTH', 1, 12),
+  BYSETPOS: parseNumericValue.bind(undefined, 'BYSETPOS', -366, 366)
+};
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * This lets typescript resolve our custom types in the
+ * generated d.ts files (jsdoc typedefs are converted to typescript types).
+ * Ignore prevents the typedefs from being documented more than once.
+ * @ignore
+ * @typedef {import("./types.js").jCalComponent} jCalComponent
+ * Imports the 'occurrenceDetails' type from the "types.js" module
+ */
+
+/**
+ * This class represents the "period" value type, with various calculation and manipulation methods.
+ *
+ * @memberof ICAL
+ */
+class Period {
+  /**
+   * Creates a new {@link ICAL.Period} instance from the passed string.
+   *
+   * @param {String} str            The string to parse
+   * @param {Property} prop         The property this period will be on
+   * @return {Period}               The created period instance
+   */
+  static fromString(str, prop) {
+    let parts = str.split('/');
+
+    if (parts.length !== 2) {
+      throw new Error(
+        'Invalid string value: "' + str + '" must contain a "/" char.'
+      );
+    }
+
+    let options = {
+      start: Time.fromDateTimeString(parts[0], prop)
+    };
+
+    let end = parts[1];
+
+    if (Duration.isValueString(end)) {
+      options.duration = Duration.fromString(end);
+    } else {
+      options.end = Time.fromDateTimeString(end, prop);
+    }
+
+    return new Period(options);
+  }
+
+  /**
+   * Creates a new {@link ICAL.Period} instance from the given data object.
+   * The passed data object cannot contain both and end date and a duration.
+   *
+   * @param {Object} aData                  An object with members of the period
+   * @param {Time=} aData.start             The start of the period
+   * @param {Time=} aData.end               The end of the period
+   * @param {Duration=} aData.duration      The duration of the period
+   * @return {Period}                       The period instance
+   */
+  static fromData(aData) {
+    return new Period(aData);
+  }
+
+  /**
+   * Returns a new period instance from the given jCal data array. The first
+   * member is always the start date string, the second member is either a
+   * duration or end date string.
+   *
+   * @param {jCalComponent} aData           The jCal data array
+   * @param {Property} aProp                The property this jCal data is on
+   * @param {Boolean} aLenient              If true, data value can be both date and date-time
+   * @return {Period}                       The period instance
+   */
+  static fromJSON(aData, aProp, aLenient) {
+    function fromDateOrDateTimeString(aValue, dateProp) {
+      if (aLenient) {
+        return Time.fromString(aValue, dateProp);
+      } else {
+        return Time.fromDateTimeString(aValue, dateProp);
+      }
+    }
+
+    if (Duration.isValueString(aData[1])) {
+      return Period.fromData({
+        start: fromDateOrDateTimeString(aData[0], aProp),
+        duration: Duration.fromString(aData[1])
+      });
+    } else {
+      return Period.fromData({
+        start: fromDateOrDateTimeString(aData[0], aProp),
+        end: fromDateOrDateTimeString(aData[1], aProp)
+      });
+    }
+  }
+
+  /**
+   * Creates a new ICAL.Period instance. The passed data object cannot contain both and end date and
+   * a duration.
+   *
+   * @param {Object} aData                  An object with members of the period
+   * @param {Time=} aData.start             The start of the period
+   * @param {Time=} aData.end               The end of the period
+   * @param {Duration=} aData.duration      The duration of the period
+   */
+  constructor(aData) {
+    this.wrappedJSObject = this;
+
+    if (aData && 'start' in aData) {
+      if (aData.start && !(aData.start instanceof Time)) {
+        throw new TypeError('.start must be an instance of ICAL.Time');
+      }
+      this.start = aData.start;
+    }
+
+    if (aData && aData.end && aData.duration) {
+      throw new Error('cannot accept both end and duration');
+    }
+
+    if (aData && 'end' in aData) {
+      if (aData.end && !(aData.end instanceof Time)) {
+        throw new TypeError('.end must be an instance of ICAL.Time');
+      }
+      this.end = aData.end;
+    }
+
+    if (aData && 'duration' in aData) {
+      if (aData.duration && !(aData.duration instanceof Duration)) {
+        throw new TypeError('.duration must be an instance of ICAL.Duration');
+      }
+      this.duration = aData.duration;
+    }
+  }
+
+
+  /**
+   * The start of the period
+   * @type {Time}
+   */
+  start = null;
+
+  /**
+   * The end of the period
+   * @type {Time}
+   */
+  end = null;
+
+  /**
+   * The duration of the period
+   * @type {Duration}
+   */
+  duration = null;
+
+  /**
+   * The class identifier.
+   * @constant
+   * @type {String}
+   * @default "icalperiod"
+   */
+  icalclass = "icalperiod";
+
+  /**
+   * The type name, to be used in the jCal object.
+   * @constant
+   * @type {String}
+   * @default "period"
+   */
+  icaltype = "period";
+
+  /**
+   * Returns a clone of the duration object.
+   *
+   * @return {Period}      The cloned object
+   */
+  clone() {
+    return Period.fromData({
+      start: this.start ? this.start.clone() : null,
+      end: this.end ? this.end.clone() : null,
+      duration: this.duration ? this.duration.clone() : null
+    });
+  }
+
+  /**
+   * Calculates the duration of the period, either directly or by subtracting
+   * start from end date.
+   *
+   * @return {Duration}      The calculated duration
+   */
+  getDuration() {
+    if (this.duration) {
+      return this.duration;
+    } else {
+      return this.end.subtractDate(this.start);
+    }
+  }
+
+  /**
+   * Calculates the end date of the period, either directly or by adding
+   * duration to start date.
+   *
+   * @return {Time}          The calculated end date
+   */
+  getEnd() {
+    if (this.end) {
+      return this.end;
+    } else {
+      let end = this.start.clone();
+      end.addDuration(this.duration);
+      return end;
+    }
+  }
+
+  /**
+   * The string representation of this period.
+   * @return {String}
+   */
+  toString() {
+    return this.start + "/" + (this.end || this.duration);
+  }
+
+  /**
+   * The jCal representation of this period type.
+   * @return {Object}
+   */
+  toJSON() {
+    return [this.start.toString(), (this.end || this.duration).toString()];
+  }
+
+  /**
+   * The iCalendar string representation of this period.
+   * @return {String}
+   */
+  toICALString() {
+    return this.start.toICALString() + "/" +
+           (this.end || this.duration).toICALString();
+  }
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * This lets typescript resolve our custom types in the
+ * generated d.ts files (jsdoc typedefs are converted to typescript types).
+ * Ignore prevents the typedefs from being documented more than once.
+ * @ignore
+ * @typedef {import("./types.js").designSet} designSet
+ * Imports the 'designSet' type from the "types.js" module
+ */
+
+/** @module ICAL.design */
+
+const FROM_ICAL_NEWLINE = /\\\\|\\;|\\,|\\[Nn]/g;
+const TO_ICAL_NEWLINE = /\\|;|,|\n/g;
+const FROM_VCARD_NEWLINE = /\\\\|\\,|\\[Nn]/g;
+const TO_VCARD_NEWLINE = /\\|,|\n/g;
+
+function createTextType(fromNewline, toNewline) {
+  let result = {
+    matches: /.*/,
+
+    fromICAL: function(aValue, structuredEscape) {
+      return replaceNewline(aValue, fromNewline, structuredEscape);
+    },
+
+    toICAL: function(aValue, structuredEscape) {
+      let regEx = toNewline;
+      if (structuredEscape)
+         regEx = new RegExp(regEx.source + '|' + structuredEscape, regEx.flags);
+      return aValue.replace(regEx, function(str) {
+        switch (str) {
+        case "\\":
+          return "\\\\";
+        case ";":
+          return "\\;";
+        case ",":
+          return "\\,";
+        case "\n":
+          return "\\n";
+        /* c8 ignore next 2 */
+        default:
+          return str;
+        }
+      });
+    }
+  };
+  return result;
+}
+
+// default types used multiple times
+const DEFAULT_TYPE_TEXT = { defaultType: "text" };
+const DEFAULT_TYPE_TEXT_MULTI = { defaultType: "text", multiValue: "," };
+const DEFAULT_TYPE_TEXT_STRUCTURED = { defaultType: "text", structuredValue: ";" };
+const DEFAULT_TYPE_INTEGER = { defaultType: "integer" };
+const DEFAULT_TYPE_DATETIME_DATE = { defaultType: "date-time", allowedTypes: ["date-time", "date"] };
+const DEFAULT_TYPE_DATETIME = { defaultType: "date-time" };
+const DEFAULT_TYPE_URI = { defaultType: "uri" };
+const DEFAULT_TYPE_UTCOFFSET = { defaultType: "utc-offset" };
+const DEFAULT_TYPE_RECUR = { defaultType: "recur" };
+const DEFAULT_TYPE_DATE_ANDOR_TIME = { defaultType: "date-and-or-time", allowedTypes: ["date-time", "date", "text"] };
+
+function replaceNewlineReplace(string) {
+  switch (string) {
+    case "\\\\":
+      return "\\";
+    case "\\;":
+      return ";";
+    case "\\,":
+      return ",";
+    case "\\n":
+    case "\\N":
+      return "\n";
+    /* c8 ignore next 2 */
+    default:
+      return string;
+  }
+}
+
+function replaceNewline(value, newline, structuredEscape) {
+  // avoid regex when possible.
+  if (value.indexOf('\\') === -1) {
+    return value;
+  }
+  if (structuredEscape)
+     newline = new RegExp(newline.source + '|\\\\' + structuredEscape, newline.flags);
+  return value.replace(newline, replaceNewlineReplace);
+}
+
+let commonProperties = {
+  "categories": DEFAULT_TYPE_TEXT_MULTI,
+  "url": DEFAULT_TYPE_URI,
+  "version": DEFAULT_TYPE_TEXT,
+  "uid": DEFAULT_TYPE_TEXT
+};
+
+let commonValues = {
+  "boolean": {
+    values: ["TRUE", "FALSE"],
+
+    fromICAL: function(aValue) {
+      switch (aValue) {
+        case 'TRUE':
+          return true;
+        case 'FALSE':
+          return false;
+        default:
+          //TODO: parser warning
+          return false;
+      }
+    },
+
+    toICAL: function(aValue) {
+      if (aValue) {
+        return 'TRUE';
+      }
+      return 'FALSE';
+    }
+
+  },
+  float: {
+    matches: /^[+-]?\d+\.\d+$/,
+
+    fromICAL: function(aValue) {
+      let parsed = parseFloat(aValue);
+      if (isStrictlyNaN(parsed)) {
+        // TODO: parser warning
+        return 0.0;
+      }
+      return parsed;
+    },
+
+    toICAL: function(aValue) {
+      return String(aValue);
+    }
+  },
+  integer: {
+    fromICAL: function(aValue) {
+      let parsed = parseInt(aValue);
+      if (isStrictlyNaN(parsed)) {
+        return 0;
+      }
+      return parsed;
+    },
+
+    toICAL: function(aValue) {
+      return String(aValue);
+    }
+  },
+  "utc-offset": {
+    toICAL: function(aValue) {
+      if (aValue.length < 7) {
+        // no seconds
+        // -0500
+        return aValue.slice(0, 3) +
+               aValue.slice(4, 6);
+      } else {
+        // seconds
+        // -050000
+        return aValue.slice(0, 3) +
+               aValue.slice(4, 6) +
+               aValue.slice(7, 9);
+      }
+    },
+
+    fromICAL: function(aValue) {
+      if (aValue.length < 6) {
+        // no seconds
+        // -05:00
+        return aValue.slice(0, 3) + ':' +
+               aValue.slice(3, 5);
+      } else {
+        // seconds
+        // -05:00:00
+        return aValue.slice(0, 3) + ':' +
+               aValue.slice(3, 5) + ':' +
+               aValue.slice(5, 7);
+      }
+    },
+
+    decorate: function(aValue) {
+      return UtcOffset.fromString(aValue);
+    },
+
+    undecorate: function(aValue) {
+      return aValue.toString();
+    }
+  }
+};
+
+let icalParams = {
+  // Although the syntax is DQUOTE uri DQUOTE, I don't think we should
+  // enforce anything aside from it being a valid content line.
+  //
+  // At least some params require - if multi values are used - DQUOTEs
+  // for each of its values - e.g. delegated-from="uri1","uri2"
+  // To indicate this, I introduced the new k/v pair
+  // multiValueSeparateDQuote: true
+  //
+  // "ALTREP": { ... },
+
+  // CN just wants a param-value
+  // "CN": { ... }
+
+  "cutype": {
+    values: ["INDIVIDUAL", "GROUP", "RESOURCE", "ROOM", "UNKNOWN"],
+    allowXName: true,
+    allowIanaToken: true
+  },
+
+  "delegated-from": {
+    valueType: "cal-address",
+    multiValue: ",",
+    multiValueSeparateDQuote: true
+  },
+  "delegated-to": {
+    valueType: "cal-address",
+    multiValue: ",",
+    multiValueSeparateDQuote: true
+  },
+  // "DIR": { ... }, // See ALTREP
+  "encoding": {
+    values: ["8BIT", "BASE64"]
+  },
+  // "FMTTYPE": { ... }, // See ALTREP
+  "fbtype": {
+    values: ["FREE", "BUSY", "BUSY-UNAVAILABLE", "BUSY-TENTATIVE"],
+    allowXName: true,
+    allowIanaToken: true
+  },
+  // "LANGUAGE": { ... }, // See ALTREP
+  "member": {
+    valueType: "cal-address",
+    multiValue: ",",
+    multiValueSeparateDQuote: true
+  },
+  "partstat": {
+    // TODO These values are actually different per-component
+    values: ["NEEDS-ACTION", "ACCEPTED", "DECLINED", "TENTATIVE",
+             "DELEGATED", "COMPLETED", "IN-PROCESS"],
+    allowXName: true,
+    allowIanaToken: true
+  },
+  "range": {
+    values: ["THISANDFUTURE"]
+  },
+  "related": {
+    values: ["START", "END"]
+  },
+  "reltype": {
+    values: ["PARENT", "CHILD", "SIBLING"],
+    allowXName: true,
+    allowIanaToken: true
+  },
+  "role": {
+    values: ["REQ-PARTICIPANT", "CHAIR",
+             "OPT-PARTICIPANT", "NON-PARTICIPANT"],
+    allowXName: true,
+    allowIanaToken: true
+  },
+  "rsvp": {
+    values: ["TRUE", "FALSE"]
+  },
+  "sent-by": {
+    valueType: "cal-address"
+  },
+  "tzid": {
+    matches: /^\//
+  },
+  "value": {
+    // since the value here is a 'type' lowercase is used.
+    values: ["binary", "boolean", "cal-address", "date", "date-time",
+             "duration", "float", "integer", "period", "recur", "text",
+             "time", "uri", "utc-offset"],
+    allowXName: true,
+    allowIanaToken: true
+  }
+};
+
+// When adding a value here, be sure to add it to the parameter types!
+const icalValues = extend(commonValues, {
+  text: createTextType(FROM_ICAL_NEWLINE, TO_ICAL_NEWLINE),
+
+  uri: {
+    // TODO
+    /* ... */
+  },
+
+  "binary": {
+    decorate: function(aString) {
+      return Binary.fromString(aString);
+    },
+
+    undecorate: function(aBinary) {
+      return aBinary.toString();
+    }
+  },
+  "cal-address": {
+    // needs to be an uri
+  },
+  "date": {
+    decorate: function(aValue, aProp) {
+      if (design.strict) {
+        return Time.fromDateString(aValue, aProp);
+      } else {
+        return Time.fromString(aValue, aProp);
+      }
+    },
+
+    /**
+     * undecorates a time object.
+     */
+    undecorate: function(aValue) {
+      return aValue.toString();
+    },
+
+    fromICAL: function(aValue) {
+      // from: 20120901
+      // to: 2012-09-01
+      if (!design.strict && aValue.length >= 15) {
+        // This is probably a date-time, e.g. 20120901T130000Z
+        return icalValues["date-time"].fromICAL(aValue);
+      } else {
+        return aValue.slice(0, 4) + '-' +
+               aValue.slice(4, 6) + '-' +
+               aValue.slice(6, 8);
+      }
+    },
+
+    toICAL: function(aValue) {
+      // from: 2012-09-01
+      // to: 20120901
+      let len = aValue.length;
+
+      if (len == 10) {
+        return aValue.slice(0, 4) +
+               aValue.slice(5, 7) +
+               aValue.slice(8, 10);
+      } else if (len >= 19) {
+        return icalValues["date-time"].toICAL(aValue);
+      } else {
+        //TODO: serialize warning?
+        return aValue;
+      }
+
+    }
+  },
+  "date-time": {
+    fromICAL: function(aValue) {
+      // from: 20120901T130000
+      // to: 2012-09-01T13:00:00
+      if (!design.strict && aValue.length == 8) {
+        // This is probably a date, e.g. 20120901
+        return icalValues.date.fromICAL(aValue);
+      } else {
+        let result = aValue.slice(0, 4) + '-' +
+                     aValue.slice(4, 6) + '-' +
+                     aValue.slice(6, 8) + 'T' +
+                     aValue.slice(9, 11) + ':' +
+                     aValue.slice(11, 13) + ':' +
+                     aValue.slice(13, 15);
+
+        if (aValue[15] && aValue[15] === 'Z') {
+          result += 'Z';
+        }
+
+        return result;
+      }
+    },
+
+    toICAL: function(aValue) {
+      // from: 2012-09-01T13:00:00
+      // to: 20120901T130000
+      let len = aValue.length;
+
+      if (len == 10 && !design.strict) {
+        return icalValues.date.toICAL(aValue);
+      } else if (len >= 19) {
+        let result = aValue.slice(0, 4) +
+                     aValue.slice(5, 7) +
+                     // grab the (DDTHH) segment
+                     aValue.slice(8, 13) +
+                     // MM
+                     aValue.slice(14, 16) +
+                     // SS
+                     aValue.slice(17, 19);
+
+        if (aValue[19] && aValue[19] === 'Z') {
+          result += 'Z';
+        }
+        return result;
+      } else {
+        // TODO: error
+        return aValue;
+      }
+    },
+
+    decorate: function(aValue, aProp) {
+      if (design.strict) {
+        return Time.fromDateTimeString(aValue, aProp);
+      } else {
+        return Time.fromString(aValue, aProp);
+      }
+    },
+
+    undecorate: function(aValue) {
+      return aValue.toString();
+    }
+  },
+  duration: {
+    decorate: function(aValue) {
+      return Duration.fromString(aValue);
+    },
+    undecorate: function(aValue) {
+      return aValue.toString();
+    }
+  },
+  period: {
+    fromICAL: function(string) {
+      let parts = string.split('/');
+      parts[0] = icalValues['date-time'].fromICAL(parts[0]);
+
+      if (!Duration.isValueString(parts[1])) {
+        parts[1] = icalValues['date-time'].fromICAL(parts[1]);
+      }
+
+      return parts;
+    },
+
+    toICAL: function(parts) {
+      parts = parts.slice();
+      if (!design.strict && parts[0].length == 10) {
+        parts[0] = icalValues.date.toICAL(parts[0]);
+      } else {
+        parts[0] = icalValues['date-time'].toICAL(parts[0]);
+      }
+
+      if (!Duration.isValueString(parts[1])) {
+        if (!design.strict && parts[1].length == 10) {
+          parts[1] = icalValues.date.toICAL(parts[1]);
+        } else {
+          parts[1] = icalValues['date-time'].toICAL(parts[1]);
+        }
+      }
+
+      return parts.join("/");
+    },
+
+    decorate: function(aValue, aProp) {
+      return Period.fromJSON(aValue, aProp, !design.strict);
+    },
+
+    undecorate: function(aValue) {
+      return aValue.toJSON();
+    }
+  },
+  recur: {
+    fromICAL: function(string) {
+      return Recur._stringToData(string, true);
+    },
+
+    toICAL: function(data) {
+      let str = "";
+      for (let [k, val] of Object.entries(data)) {
+        if (k == "until") {
+          if (val.length > 10) {
+            val = icalValues['date-time'].toICAL(val);
+          } else {
+            val = icalValues.date.toICAL(val);
+          }
+        } else if (k == "wkst") {
+          if (typeof val === 'number') {
+            val = Recur.numericDayToIcalDay(val);
+          }
+        } else if (Array.isArray(val)) {
+          val = val.join(",");
+        }
+        str += k.toUpperCase() + "=" + val + ";";
+      }
+      return str.slice(0, Math.max(0, str.length - 1));
+    },
+
+    decorate: function decorate(aValue) {
+      return Recur.fromData(aValue);
+    },
+
+    undecorate: function(aRecur) {
+      return aRecur.toJSON();
+    }
+  },
+
+  time: {
+    fromICAL: function(aValue) {
+      // from: MMHHSS(Z)?
+      // to: HH:MM:SS(Z)?
+      if (aValue.length < 6) {
+        // TODO: parser exception?
+        return aValue;
+      }
+
+      // HH::MM::SSZ?
+      let result = aValue.slice(0, 2) + ':' +
+                   aValue.slice(2, 4) + ':' +
+                   aValue.slice(4, 6);
+
+      if (aValue[6] === 'Z') {
+        result += 'Z';
+      }
+
+      return result;
+    },
+
+    toICAL: function(aValue) {
+      // from: HH:MM:SS(Z)?
+      // to: MMHHSS(Z)?
+      if (aValue.length < 8) {
+        //TODO: error
+        return aValue;
+      }
+
+      let result = aValue.slice(0, 2) +
+                   aValue.slice(3, 5) +
+                   aValue.slice(6, 8);
+
+      if (aValue[8] === 'Z') {
+        result += 'Z';
+      }
+
+      return result;
+    }
+  }
+});
+
+let icalProperties = extend(commonProperties, {
+
+  "action": DEFAULT_TYPE_TEXT,
+  "attach": { defaultType: "uri" },
+  "attendee": { defaultType: "cal-address" },
+  "calscale": DEFAULT_TYPE_TEXT,
+  "class": DEFAULT_TYPE_TEXT,
+  "comment": DEFAULT_TYPE_TEXT,
+  "completed": DEFAULT_TYPE_DATETIME,
+  "contact": DEFAULT_TYPE_TEXT,
+  "created": DEFAULT_TYPE_DATETIME,
+  "description": DEFAULT_TYPE_TEXT,
+  "dtend": DEFAULT_TYPE_DATETIME_DATE,
+  "dtstamp": DEFAULT_TYPE_DATETIME,
+  "dtstart": DEFAULT_TYPE_DATETIME_DATE,
+  "due": DEFAULT_TYPE_DATETIME_DATE,
+  "duration": { defaultType: "duration" },
+  "exdate": {
+    defaultType: "date-time",
+    allowedTypes: ["date-time", "date"],
+    multiValue: ','
+  },
+  "exrule": DEFAULT_TYPE_RECUR,
+  "freebusy": { defaultType: "period", multiValue: "," },
+  "geo": { defaultType: "float", structuredValue: ";" },
+  "last-modified": DEFAULT_TYPE_DATETIME,
+  "location": DEFAULT_TYPE_TEXT,
+  "method": DEFAULT_TYPE_TEXT,
+  "organizer": { defaultType: "cal-address" },
+  "percent-complete": DEFAULT_TYPE_INTEGER,
+  "priority": DEFAULT_TYPE_INTEGER,
+  "prodid": DEFAULT_TYPE_TEXT,
+  "related-to": DEFAULT_TYPE_TEXT,
+  "repeat": DEFAULT_TYPE_INTEGER,
+  "rdate": {
+    defaultType: "date-time",
+    allowedTypes: ["date-time", "date", "period"],
+    multiValue: ',',
+    detectType: function(string) {
+      if (string.indexOf('/') !== -1) {
+        return 'period';
+      }
+      return (string.indexOf('T') === -1) ? 'date' : 'date-time';
+    }
+  },
+  "recurrence-id": DEFAULT_TYPE_DATETIME_DATE,
+  "resources": DEFAULT_TYPE_TEXT_MULTI,
+  "request-status": DEFAULT_TYPE_TEXT_STRUCTURED,
+  "rrule": DEFAULT_TYPE_RECUR,
+  "sequence": DEFAULT_TYPE_INTEGER,
+  "status": DEFAULT_TYPE_TEXT,
+  "summary": DEFAULT_TYPE_TEXT,
+  "transp": DEFAULT_TYPE_TEXT,
+  "trigger": { defaultType: "duration", allowedTypes: ["duration", "date-time"] },
+  "tzoffsetfrom": DEFAULT_TYPE_UTCOFFSET,
+  "tzoffsetto": DEFAULT_TYPE_UTCOFFSET,
+  "tzurl": DEFAULT_TYPE_URI,
+  "tzid": DEFAULT_TYPE_TEXT,
+  "tzname": DEFAULT_TYPE_TEXT
+});
+
+// When adding a value here, be sure to add it to the parameter types!
+const vcardValues = extend(commonValues, {
+  text: createTextType(FROM_VCARD_NEWLINE, TO_VCARD_NEWLINE),
+  uri: createTextType(FROM_VCARD_NEWLINE, TO_VCARD_NEWLINE),
+
+  date: {
+    decorate: function(aValue) {
+      return VCardTime.fromDateAndOrTimeString(aValue, "date");
+    },
+    undecorate: function(aValue) {
+      return aValue.toString();
+    },
+    fromICAL: function(aValue) {
+      if (aValue.length == 8) {
+        return icalValues.date.fromICAL(aValue);
+      } else if (aValue[0] == '-' && aValue.length == 6) {
+        return aValue.slice(0, 4) + '-' + aValue.slice(4);
+      } else {
+        return aValue;
+      }
+    },
+    toICAL: function(aValue) {
+      if (aValue.length == 10) {
+        return icalValues.date.toICAL(aValue);
+      } else if (aValue[0] == '-' && aValue.length == 7) {
+        return aValue.slice(0, 4) + aValue.slice(5);
+      } else {
+        return aValue;
+      }
+    }
+  },
+
+  time: {
+    decorate: function(aValue) {
+      return VCardTime.fromDateAndOrTimeString("T" + aValue, "time");
+    },
+    undecorate: function(aValue) {
+      return aValue.toString();
+    },
+    fromICAL: function(aValue) {
+      let splitzone = vcardValues.time._splitZone(aValue, true);
+      let zone = splitzone[0], value = splitzone[1];
+
+      //console.log("SPLIT: ",splitzone);
+
+      if (value.length == 6) {
+        value = value.slice(0, 2) + ':' +
+                value.slice(2, 4) + ':' +
+                value.slice(4, 6);
+      } else if (value.length == 4 && value[0] != '-') {
+        value = value.slice(0, 2) + ':' + value.slice(2, 4);
+      } else if (value.length == 5) {
+        value = value.slice(0, 3) + ':' + value.slice(3, 5);
+      }
+
+      if (zone.length == 5 && (zone[0] == '-' || zone[0] == '+')) {
+        zone = zone.slice(0, 3) + ':' + zone.slice(3);
+      }
+
+      return value + zone;
+    },
+
+    toICAL: function(aValue) {
+      let splitzone = vcardValues.time._splitZone(aValue);
+      let zone = splitzone[0], value = splitzone[1];
+
+      if (value.length == 8) {
+        value = value.slice(0, 2) +
+                value.slice(3, 5) +
+                value.slice(6, 8);
+      } else if (value.length == 5 && value[0] != '-') {
+        value = value.slice(0, 2) + value.slice(3, 5);
+      } else if (value.length == 6) {
+        value = value.slice(0, 3) + value.slice(4, 6);
+      }
+
+      if (zone.length == 6 && (zone[0] == '-' || zone[0] == '+')) {
+        zone = zone.slice(0, 3) + zone.slice(4);
+      }
+
+      return value + zone;
+    },
+
+    _splitZone: function(aValue, isFromIcal) {
+      let lastChar = aValue.length - 1;
+      let signChar = aValue.length - (isFromIcal ? 5 : 6);
+      let sign = aValue[signChar];
+      let zone, value;
+
+      if (aValue[lastChar] == 'Z') {
+        zone = aValue[lastChar];
+        value = aValue.slice(0, Math.max(0, lastChar));
+      } else if (aValue.length > 6 && (sign == '-' || sign == '+')) {
+        zone = aValue.slice(signChar);
+        value = aValue.slice(0, Math.max(0, signChar));
+      } else {
+        zone = "";
+        value = aValue;
+      }
+
+      return [zone, value];
+    }
+  },
+
+  "date-time": {
+    decorate: function(aValue) {
+      return VCardTime.fromDateAndOrTimeString(aValue, "date-time");
+    },
+
+    undecorate: function(aValue) {
+      return aValue.toString();
+    },
+
+    fromICAL: function(aValue) {
+      return vcardValues['date-and-or-time'].fromICAL(aValue);
+    },
+
+    toICAL: function(aValue) {
+      return vcardValues['date-and-or-time'].toICAL(aValue);
+    }
+  },
+
+  "date-and-or-time": {
+    decorate: function(aValue) {
+      return VCardTime.fromDateAndOrTimeString(aValue, "date-and-or-time");
+    },
+
+    undecorate: function(aValue) {
+      return aValue.toString();
+    },
+
+    fromICAL: function(aValue) {
+      let parts = aValue.split('T');
+      return (parts[0] ? vcardValues.date.fromICAL(parts[0]) : '') +
+             (parts[1] ? 'T' + vcardValues.time.fromICAL(parts[1]) : '');
+    },
+
+    toICAL: function(aValue) {
+      let parts = aValue.split('T');
+      return vcardValues.date.toICAL(parts[0]) +
+             (parts[1] ? 'T' + vcardValues.time.toICAL(parts[1]) : '');
+
+    }
+  },
+  timestamp: icalValues['date-time'],
+  "language-tag": {
+    matches: /^[a-zA-Z0-9-]+$/ // Could go with a more strict regex here
+  },
+  "phone-number": {
+    fromICAL: function(aValue) {
+      return Array.from(aValue).filter(function(c) {
+          return c === '\\' ? undefined : c;
+        }).join('');
+    },
+    toICAL: function(aValue) {
+      return Array.from(aValue).map(function(c) {
+        return c === ',' || c === ";" ? '\\' + c : c;
+      }).join('');
+    }
+  }
+});
+
+let vcardParams = {
+  "type": {
+    valueType: "text",
+    multiValue: ","
+  },
+  "value": {
+    // since the value here is a 'type' lowercase is used.
+    values: ["text", "uri", "date", "time", "date-time", "date-and-or-time",
+             "timestamp", "boolean", "integer", "float", "utc-offset",
+             "language-tag"],
+    allowXName: true,
+    allowIanaToken: true
+  }
+};
+
+let vcardProperties = extend(commonProperties, {
+  "adr": { defaultType: "text", structuredValue: ";", multiValue: "," },
+  "anniversary": DEFAULT_TYPE_DATE_ANDOR_TIME,
+  "bday": DEFAULT_TYPE_DATE_ANDOR_TIME,
+  "caladruri": DEFAULT_TYPE_URI,
+  "caluri": DEFAULT_TYPE_URI,
+  "clientpidmap": DEFAULT_TYPE_TEXT_STRUCTURED,
+  "email": DEFAULT_TYPE_TEXT,
+  "fburl": DEFAULT_TYPE_URI,
+  "fn": DEFAULT_TYPE_TEXT,
+  "gender": DEFAULT_TYPE_TEXT_STRUCTURED,
+  "geo": DEFAULT_TYPE_URI,
+  "impp": DEFAULT_TYPE_URI,
+  "key": DEFAULT_TYPE_URI,
+  "kind": DEFAULT_TYPE_TEXT,
+  "lang": { defaultType: "language-tag" },
+  "logo": DEFAULT_TYPE_URI,
+  "member": DEFAULT_TYPE_URI,
+  "n": { defaultType: "text", structuredValue: ";", multiValue: "," },
+  "nickname": DEFAULT_TYPE_TEXT_MULTI,
+  "note": DEFAULT_TYPE_TEXT,
+  "org": { defaultType: "text", structuredValue: ";" },
+  "photo": DEFAULT_TYPE_URI,
+  "related": DEFAULT_TYPE_URI,
+  "rev": { defaultType: "timestamp" },
+  "role": DEFAULT_TYPE_TEXT,
+  "sound": DEFAULT_TYPE_URI,
+  "source": DEFAULT_TYPE_URI,
+  "tel": { defaultType: "uri", allowedTypes: ["uri", "text"] },
+  "title": DEFAULT_TYPE_TEXT,
+  "tz": { defaultType: "text", allowedTypes: ["text", "utc-offset", "uri"] },
+  "xml": DEFAULT_TYPE_TEXT
+});
+
+let vcard3Values = extend(commonValues, {
+  binary: icalValues.binary,
+  date: vcardValues.date,
+  "date-time": vcardValues["date-time"],
+  "phone-number": vcardValues["phone-number"],
+  uri: icalValues.uri,
+  text: icalValues.text,
+  time: icalValues.time,
+  vcard: icalValues.text,
+  "utc-offset": {
+    toICAL: function(aValue) {
+      return aValue.slice(0, 7);
+    },
+
+    fromICAL: function(aValue) {
+      return aValue.slice(0, 7);
+    },
+
+    decorate: function(aValue) {
+      return UtcOffset.fromString(aValue);
+    },
+
+    undecorate: function(aValue) {
+      return aValue.toString();
+    }
+  }
+});
+
+let vcard3Params = {
+  "type": {
+    valueType: "text",
+    multiValue: ","
+  },
+  "value": {
+    // since the value here is a 'type' lowercase is used.
+    values: ["text", "uri", "date", "date-time", "phone-number", "time",
+             "boolean", "integer", "float", "utc-offset", "vcard", "binary"],
+    allowXName: true,
+    allowIanaToken: true
+  }
+};
+
+let vcard3Properties = extend(commonProperties, {
+  fn: DEFAULT_TYPE_TEXT,
+  n: { defaultType: "text", structuredValue: ";", multiValue: "," },
+  nickname: DEFAULT_TYPE_TEXT_MULTI,
+  photo: { defaultType: "binary", allowedTypes: ["binary", "uri"] },
+  bday: {
+    defaultType: "date-time",
+    allowedTypes: ["date-time", "date"],
+    detectType: function(string) {
+      return (string.indexOf('T') === -1) ? 'date' : 'date-time';
+    }
+  },
+
+  adr: { defaultType: "text", structuredValue: ";", multiValue: "," },
+  label: DEFAULT_TYPE_TEXT,
+
+  tel: { defaultType: "phone-number" },
+  email: DEFAULT_TYPE_TEXT,
+  mailer: DEFAULT_TYPE_TEXT,
+
+  tz: { defaultType: "utc-offset", allowedTypes: ["utc-offset", "text"] },
+  geo: { defaultType: "float", structuredValue: ";" },
+
+  title: DEFAULT_TYPE_TEXT,
+  role: DEFAULT_TYPE_TEXT,
+  logo: { defaultType: "binary", allowedTypes: ["binary", "uri"] },
+  agent: { defaultType: "vcard", allowedTypes: ["vcard", "text", "uri"] },
+  org: DEFAULT_TYPE_TEXT_STRUCTURED,
+
+  note: DEFAULT_TYPE_TEXT_MULTI,
+  prodid: DEFAULT_TYPE_TEXT,
+  rev: {
+    defaultType: "date-time",
+    allowedTypes: ["date-time", "date"],
+    detectType: function(string) {
+      return (string.indexOf('T') === -1) ? 'date' : 'date-time';
+    }
+  },
+  "sort-string": DEFAULT_TYPE_TEXT,
+  sound: { defaultType: "binary", allowedTypes: ["binary", "uri"] },
+
+  class: DEFAULT_TYPE_TEXT,
+  key: { defaultType: "binary", allowedTypes: ["binary", "text"] }
+});
+
+/**
+ * iCalendar design set
+ * @type {designSet}
+ */
+let icalSet = {
+  value: icalValues,
+  param: icalParams,
+  property: icalProperties,
+  propertyGroups: false
+};
+
+/**
+ * vCard 4.0 design set
+ * @type {designSet}
+ */
+let vcardSet = {
+  value: vcardValues,
+  param: vcardParams,
+  property: vcardProperties,
+  propertyGroups: true
+};
+
+/**
+ * vCard 3.0 design set
+ * @type {designSet}
+ */
+let vcard3Set = {
+  value: vcard3Values,
+  param: vcard3Params,
+  property: vcard3Properties,
+  propertyGroups: true
+};
+
+/**
+ * The design data, used by the parser to determine types for properties and
+ * other metadata needed to produce correct jCard/jCal data.
+ *
+ * @alias ICAL.design
+ * @exports module:ICAL.design
+ */
+const design = {
+  /**
+   * Can be set to false to make the parser more lenient.
+   */
+  strict: true,
+
+  /**
+   * The default set for new properties and components if none is specified.
+   * @type {designSet}
+   */
+  defaultSet: icalSet,
+
+  /**
+   * The default type for unknown properties
+   * @type {String}
+   */
+  defaultType: 'unknown',
+
+  /**
+   * Holds the design set for known top-level components
+   *
+   * @type {Object}
+   * @property {designSet} vcard       vCard VCARD
+   * @property {designSet} vevent      iCalendar VEVENT
+   * @property {designSet} vtodo       iCalendar VTODO
+   * @property {designSet} vjournal    iCalendar VJOURNAL
+   * @property {designSet} valarm      iCalendar VALARM
+   * @property {designSet} vtimezone   iCalendar VTIMEZONE
+   * @property {designSet} daylight    iCalendar DAYLIGHT
+   * @property {designSet} standard    iCalendar STANDARD
+   *
+   * @example
+   * let propertyName = 'fn';
+   * let componentDesign = ICAL.design.components.vcard;
+   * let propertyDetails = componentDesign.property[propertyName];
+   * if (propertyDetails.defaultType == 'text') {
+   *   // Yep, sure is...
+   * }
+   */
+  components: {
+    vcard: vcardSet,
+    vcard3: vcard3Set,
+    vevent: icalSet,
+    vtodo: icalSet,
+    vjournal: icalSet,
+    valarm: icalSet,
+    vtimezone: icalSet,
+    daylight: icalSet,
+    standard: icalSet
+  },
+
+
+  /**
+   * The design set for iCalendar (rfc5545/rfc7265) components.
+   * @type {designSet}
+   */
+  icalendar: icalSet,
+
+  /**
+   * The design set for vCard (rfc6350/rfc7095) components.
+   * @type {designSet}
+   */
+  vcard: vcardSet,
+
+  /**
+   * The design set for vCard (rfc2425/rfc2426/rfc7095) components.
+   * @type {designSet}
+   */
+  vcard3: vcard3Set,
+
+  /**
+   * Gets the design set for the given component name.
+   *
+   * @param {String} componentName        The name of the component
+   * @return {designSet}      The design set for the component
+   */
+  getDesignSet: function(componentName) {
+    let isInDesign = componentName && componentName in design.components;
+    return isInDesign ? design.components[componentName] : design.defaultSet;
+  }
+};
+var design$1 = design;
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * This lets typescript resolve our custom types in the
+ * generated d.ts files (jsdoc typedefs are converted to typescript types).
+ * Ignore prevents the typedefs from being documented more than once.
+ *
+ * @ignore
+ * @typedef {import("./types.js").designSet} designSet
+ * Imports the 'designSet' type from the "types.js" module
+ */
+
+const LINE_ENDING = '\r\n';
+const DEFAULT_VALUE_TYPE = 'unknown';
+const RFC6868_REPLACE_MAP = { '"': "^'", "\n": "^n", "^": "^^" };
+
+/**
+ * Convert a full jCal/jCard array into a iCalendar/vCard string.
+ *
+ * @function ICAL.stringify
+ * @variation function
+ * @param {Array} jCal    The jCal/jCard document
+ * @return {String}       The stringified iCalendar/vCard document
+ */
+function stringify(jCal) {
+  if (typeof jCal[0] == "string") {
+    // This is a single component
+    jCal = [jCal];
+  }
+
+  let i = 0;
+  let len = jCal.length;
+  let result = '';
+
+  for (; i < len; i++) {
+    result += stringify.component(jCal[i]) + LINE_ENDING;
+  }
+
+  return result;
+}
+
+/**
+ * Converts an jCal component array into a ICAL string.
+ * Recursive will resolve sub-components.
+ *
+ * Exact component/property order is not saved all
+ * properties will come before subcomponents.
+ *
+ * @function ICAL.stringify.component
+ * @param {Array} component
+ *        jCal/jCard fragment of a component
+ * @param {designSet} designSet
+ *        The design data to use for this component
+ * @return {String}       The iCalendar/vCard string
+ */
+stringify.component = function(component, designSet) {
+  let name = component[0].toUpperCase();
+  let result = 'BEGIN:' + name + LINE_ENDING;
+
+  let props = component[1];
+  let propIdx = 0;
+  let propLen = props.length;
+
+  let designSetName = component[0];
+  // rfc6350 requires that in vCard 4.0 the first component is the VERSION
+  // component with as value 4.0, note that 3.0 does not have this requirement.
+  if (designSetName === 'vcard' && component[1].length > 0 &&
+          !(component[1][0][0] === "version" && component[1][0][3] === "4.0")) {
+    designSetName = "vcard3";
+  }
+  designSet = designSet || design$1.getDesignSet(designSetName);
+
+  for (; propIdx < propLen; propIdx++) {
+    result += stringify.property(props[propIdx], designSet) + LINE_ENDING;
+  }
+
+  // Ignore subcomponents if none exist, e.g. in vCard.
+  let comps = component[2] || [];
+  let compIdx = 0;
+  let compLen = comps.length;
+
+  for (; compIdx < compLen; compIdx++) {
+    result += stringify.component(comps[compIdx], designSet) + LINE_ENDING;
+  }
+
+  result += 'END:' + name;
+  return result;
+};
+
+/**
+ * Converts a single jCal/jCard property to a iCalendar/vCard string.
+ *
+ * @function ICAL.stringify.property
+ * @param {Array} property
+ *        jCal/jCard property array
+ * @param {designSet} designSet
+ *        The design data to use for this property
+ * @param {Boolean} noFold
+ *        If true, the line is not folded
+ * @return {String}       The iCalendar/vCard string
+ */
+stringify.property = function(property, designSet, noFold) {
+  let name = property[0].toUpperCase();
+  let jsName = property[0];
+  let params = property[1];
+
+  if (!designSet) {
+    designSet = design$1.defaultSet;
+  }
+
+  let groupName = params.group;
+  let line;
+  if (designSet.propertyGroups && groupName) {
+    line = groupName.toUpperCase() + "." + name;
+  } else {
+    line = name;
+  }
+
+  for (let [paramName, value] of Object.entries(params)) {
+    if (designSet.propertyGroups && paramName == 'group') {
+      continue;
+    }
+
+    let paramDesign = designSet.param[paramName];
+    let multiValue = paramDesign && paramDesign.multiValue;
+    if (multiValue && Array.isArray(value)) {
+      value = value.map(function(val) {
+        val = stringify._rfc6868Unescape(val);
+        val = stringify.paramPropertyValue(val, paramDesign.multiValueSeparateDQuote);
+        return val;
+      });
+      value = stringify.multiValue(value, multiValue, "unknown", null, designSet);
+    } else {
+      value = stringify._rfc6868Unescape(value);
+      value = stringify.paramPropertyValue(value);
+    }
+
+    line += ';' + paramName.toUpperCase() + '=' + value;
+  }
+
+  if (property.length === 3) {
+    // If there are no values, we must assume a blank value
+    return line + ':';
+  }
+
+  let valueType = property[2];
+
+  let propDetails;
+  let multiValue = false;
+  let structuredValue = false;
+  let isDefault = false;
+
+  if (jsName in designSet.property) {
+    propDetails = designSet.property[jsName];
+
+    if ('multiValue' in propDetails) {
+      multiValue = propDetails.multiValue;
+    }
+
+    if (('structuredValue' in propDetails) && Array.isArray(property[3])) {
+      structuredValue = propDetails.structuredValue;
+    }
+
+    if ('defaultType' in propDetails) {
+      if (valueType === propDetails.defaultType) {
+        isDefault = true;
+      }
+    } else {
+      if (valueType === DEFAULT_VALUE_TYPE) {
+        isDefault = true;
+      }
+    }
+  } else {
+    if (valueType === DEFAULT_VALUE_TYPE) {
+      isDefault = true;
+    }
+  }
+
+  // push the VALUE property if type is not the default
+  // for the current property.
+  if (!isDefault) {
+    // value will never contain ;/:/, so we don't escape it here.
+    line += ';VALUE=' + valueType.toUpperCase();
+  }
+
+  line += ':';
+
+  if (multiValue && structuredValue) {
+    line += stringify.multiValue(
+      property[3], structuredValue, valueType, multiValue, designSet, structuredValue
+    );
+  } else if (multiValue) {
+    line += stringify.multiValue(
+      property.slice(3), multiValue, valueType, null, designSet, false
+    );
+  } else if (structuredValue) {
+    line += stringify.multiValue(
+      property[3], structuredValue, valueType, null, designSet, structuredValue
+    );
+  } else {
+    line += stringify.value(property[3], valueType, designSet, false);
+  }
+
+  return noFold ? line : foldline(line);
+};
+
+/**
+ * Handles escaping of property values that may contain:
+ *
+ *    COLON (:), SEMICOLON (;), or COMMA (,)
+ *
+ * If any of the above are present the result is wrapped
+ * in double quotes.
+ *
+ * @function ICAL.stringify.paramPropertyValue
+ * @param {String} value      Raw property value
+ * @param {boolean} force     If value should be escaped even when unnecessary
+ * @return {String}           Given or escaped value when needed
+ */
+stringify.paramPropertyValue = function(value, force) {
+  if (!force &&
+      (value.indexOf(',') === -1) &&
+      (value.indexOf(':') === -1) &&
+      (value.indexOf(';') === -1)) {
+
+    return value;
+  }
+
+  return '"' + value + '"';
+};
+
+/**
+ * Converts an array of ical values into a single
+ * string based on a type and a delimiter value (like ",").
+ *
+ * @function ICAL.stringify.multiValue
+ * @param {Array} values      List of values to convert
+ * @param {String} delim      Used to join the values (",", ";", ":")
+ * @param {String} type       Lowecase ical value type
+ *        (like boolean, date-time, etc..)
+ * @param {?String} innerMulti If set, each value will again be processed
+ *        Used for structured values
+ * @param {designSet} designSet
+ *        The design data to use for this property
+ *
+ * @return {String}           iCalendar/vCard string for value
+ */
+stringify.multiValue = function(values, delim, type, innerMulti, designSet, structuredValue) {
+  let result = '';
+  let len = values.length;
+  let i = 0;
+
+  for (; i < len; i++) {
+    if (innerMulti && Array.isArray(values[i])) {
+      result += stringify.multiValue(values[i], innerMulti, type, null, designSet, structuredValue);
+    } else {
+      result += stringify.value(values[i], type, designSet, structuredValue);
+    }
+
+    if (i !== (len - 1)) {
+      result += delim;
+    }
+  }
+
+  return result;
+};
+
+/**
+ * Processes a single ical value runs the associated "toICAL" method from the
+ * design value type if available to convert the value.
+ *
+ * @function ICAL.stringify.value
+ * @param {String|Number} value       A formatted value
+ * @param {String} type               Lowercase iCalendar/vCard value type
+ *  (like boolean, date-time, etc..)
+ * @return {String}                   iCalendar/vCard value for single value
+ */
+stringify.value = function(value, type, designSet, structuredValue) {
+  if (type in designSet.value && 'toICAL' in designSet.value[type]) {
+    return designSet.value[type].toICAL(value, structuredValue);
+  }
+  return value;
+};
+
+/**
+ * Internal helper for rfc6868. Exposing this on ICAL.stringify so that
+ * hackers can disable the rfc6868 parsing if the really need to.
+ *
+ * @param {String} val        The value to unescape
+ * @return {String}           The escaped value
+ */
+stringify._rfc6868Unescape = function(val) {
+  return val.replace(/[\n^"]/g, function(x) {
+    return RFC6868_REPLACE_MAP[x];
+  });
+};
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+const NAME_INDEX$1 = 0;
+const PROP_INDEX = 1;
+const TYPE_INDEX = 2;
+const VALUE_INDEX = 3;
+
+/**
+ * This lets typescript resolve our custom types in the
+ * generated d.ts files (jsdoc typedefs are converted to typescript types).
+ * Ignore prevents the typedefs from being documented more than once.
+ * @ignore
+ * @typedef {import("./types.js").designSet} designSet
+ * Imports the 'designSet' type from the "types.js" module
+ * @typedef {import("./types.js").Geo} Geo
+ * Imports the 'Geo' type from the "types.js" module
+ */
+
+/**
+ * Provides a layer on top of the raw jCal object for manipulating a single property, with its
+ * parameters and value.
+ *
+ * @memberof ICAL
+ */
+class Property {
+  /**
+   * Create an {@link ICAL.Property} by parsing the passed iCalendar string.
+   *
+   * @param {String} str            The iCalendar string to parse
+   * @param {designSet=} designSet  The design data to use for this property
+   * @return {Property}             The created iCalendar property
+   */
+  static fromString(str, designSet) {
+    return new Property(parse.property(str, designSet));
+  }
+
+  /**
+   * Creates a new ICAL.Property instance.
+   *
+   * It is important to note that mutations done in the wrapper directly mutate the jCal object used
+   * to initialize.
+   *
+   * Can also be used to create new properties by passing the name of the property (as a String).
+   *
+   * @param {Array|String} jCal         Raw jCal representation OR the new name of the property
+   * @param {Component=} parent         Parent component
+   */
+  constructor(jCal, parent) {
+    this._parent = parent || null;
+
+    if (typeof(jCal) === 'string') {
+      // We are creating the property by name and need to detect the type
+      this.jCal = [jCal, {}, design$1.defaultType];
+      this.jCal[TYPE_INDEX] = this.getDefaultType();
+    } else {
+      this.jCal = jCal;
+    }
+    this._updateType();
+  }
+
+  /**
+   * The value type for this property
+   * @type {String}
+   */
+  get type() {
+    return this.jCal[TYPE_INDEX];
+  }
+
+  /**
+   * The name of this property, in lowercase.
+   * @type {String}
+   */
+  get name() {
+    return this.jCal[NAME_INDEX$1];
+  }
+
+  /**
+   * The parent component for this property.
+   * @type {Component}
+   */
+  get parent() {
+    return this._parent;
+  }
+
+  set parent(p) {
+    // Before setting the parent, check if the design set has changed. If it
+    // has, we later need to update the type if it was unknown before.
+    let designSetChanged = !this._parent || (p && p._designSet != this._parent._designSet);
+
+    this._parent = p;
+
+    if (this.type == design$1.defaultType && designSetChanged) {
+      this.jCal[TYPE_INDEX] = this.getDefaultType();
+      this._updateType();
+    }
+  }
+
+  /**
+   * The design set for this property, e.g. icalendar vs vcard
+   *
+   * @type {designSet}
+   * @private
+   */
+  get _designSet() {
+    return this.parent ? this.parent._designSet : design$1.defaultSet;
+  }
+
+  /**
+   * Updates the type metadata from the current jCal type and design set.
+   *
+   * @private
+   */
+  _updateType() {
+    let designSet = this._designSet;
+
+    if (this.type in designSet.value) {
+      if ('decorate' in designSet.value[this.type]) {
+        this.isDecorated = true;
+      } else {
+        this.isDecorated = false;
+      }
+
+      if (this.name in designSet.property) {
+        this.isMultiValue = ('multiValue' in designSet.property[this.name]);
+        this.isStructuredValue = ('structuredValue' in designSet.property[this.name]);
+      }
+    }
+  }
+
+  /**
+   * Hydrate a single value. The act of hydrating means turning the raw jCal
+   * value into a potentially wrapped object, for example {@link ICAL.Time}.
+   *
+   * @private
+   * @param {Number} index        The index of the value to hydrate
+   * @return {?Object}             The decorated value.
+   */
+  _hydrateValue(index) {
+    if (this._values && this._values[index]) {
+      return this._values[index];
+    }
+
+    // for the case where there is no value.
+    if (this.jCal.length <= (VALUE_INDEX + index)) {
+      return null;
+    }
+
+    if (this.isDecorated) {
+      if (!this._values) {
+        this._values = [];
+      }
+      return (this._values[index] = this._decorate(
+        this.jCal[VALUE_INDEX + index]
+      ));
+    } else {
+      return this.jCal[VALUE_INDEX + index];
+    }
+  }
+
+  /**
+   * Decorate a single value, returning its wrapped object. This is used by
+   * the hydrate function to actually wrap the value.
+   *
+   * @private
+   * @param {?} value         The value to decorate
+   * @return {Object}         The decorated value
+   */
+  _decorate(value) {
+    return this._designSet.value[this.type].decorate(value, this);
+  }
+
+  /**
+   * Undecorate a single value, returning its raw jCal data.
+   *
+   * @private
+   * @param {Object} value         The value to undecorate
+   * @return {?}                   The undecorated value
+   */
+  _undecorate(value) {
+    return this._designSet.value[this.type].undecorate(value, this);
+  }
+
+  /**
+   * Sets the value at the given index while also hydrating it. The passed
+   * value can either be a decorated or undecorated value.
+   *
+   * @private
+   * @param {?} value             The value to set
+   * @param {Number} index        The index to set it at
+   */
+  _setDecoratedValue(value, index) {
+    if (!this._values) {
+      this._values = [];
+    }
+
+    if (typeof(value) === 'object' && 'icaltype' in value) {
+      // decorated value
+      this.jCal[VALUE_INDEX + index] = this._undecorate(value);
+      this._values[index] = value;
+    } else {
+      // undecorated value
+      this.jCal[VALUE_INDEX + index] = value;
+      this._values[index] = this._decorate(value);
+    }
+  }
+
+  /**
+   * Gets a parameter on the property.
+   *
+   * @param {String}        name   Parameter name (lowercase)
+   * @return {Array|String}        Parameter value
+   */
+  getParameter(name) {
+    if (name in this.jCal[PROP_INDEX]) {
+      return this.jCal[PROP_INDEX][name];
+    } else {
+      return undefined;
+    }
+  }
+
+  /**
+   * Gets first parameter on the property.
+   *
+   * @param {String}        name   Parameter name (lowercase)
+   * @return {String}        Parameter value
+   */
+  getFirstParameter(name) {
+    let parameters = this.getParameter(name);
+
+    if (Array.isArray(parameters)) {
+      return parameters[0];
+    }
+
+    return parameters;
+  }
+
+  /**
+   * Sets a parameter on the property.
+   *
+   * @param {String}       name     The parameter name
+   * @param {Array|String} value    The parameter value
+   */
+  setParameter(name, value) {
+    let lcname = name.toLowerCase();
+    if (typeof value === "string" &&
+        lcname in this._designSet.param &&
+        'multiValue' in this._designSet.param[lcname]) {
+        value = [value];
+    }
+    this.jCal[PROP_INDEX][name] = value;
+  }
+
+  /**
+   * Removes a parameter
+   *
+   * @param {String} name     The parameter name
+   */
+  removeParameter(name) {
+    delete this.jCal[PROP_INDEX][name];
+  }
+
+  /**
+   * Get the default type based on this property's name.
+   *
+   * @return {String}     The default type for this property
+   */
+  getDefaultType() {
+    let name = this.jCal[NAME_INDEX$1];
+    let designSet = this._designSet;
+
+    if (name in designSet.property) {
+      let details = designSet.property[name];
+      if ('defaultType' in details) {
+        return details.defaultType;
+      }
+    }
+    return design$1.defaultType;
+  }
+
+  /**
+   * Sets type of property and clears out any existing values of the current
+   * type.
+   *
+   * @param {String} type     New iCAL type (see design.*.values)
+   */
+  resetType(type) {
+    this.removeAllValues();
+    this.jCal[TYPE_INDEX] = type;
+    this._updateType();
+  }
+
+  /**
+   * Finds the first property value.
+   *
+   * @return {Binary | Duration | Period |
+   * Recur | Time | UtcOffset | Geo | string | null}         First property value
+   */
+  getFirstValue() {
+    return this._hydrateValue(0);
+  }
+
+  /**
+   * Gets all values on the property.
+   *
+   * NOTE: this creates an array during each call.
+   *
+   * @return {Array}          List of values
+   */
+  getValues() {
+    let len = this.jCal.length - VALUE_INDEX;
+
+    if (len < 1) {
+      // it is possible for a property to have no value.
+      return [];
+    }
+
+    let i = 0;
+    let result = [];
+
+    for (; i < len; i++) {
+      result[i] = this._hydrateValue(i);
+    }
+
+    return result;
+  }
+
+  /**
+   * Removes all values from this property
+   */
+  removeAllValues() {
+    if (this._values) {
+      this._values.length = 0;
+    }
+    this.jCal.length = 3;
+  }
+
+  /**
+   * Sets the values of the property.  Will overwrite the existing values.
+   * This can only be used for multi-value properties.
+   *
+   * @param {Array} values    An array of values
+   */
+  setValues(values) {
+    if (!this.isMultiValue) {
+      throw new Error(
+        this.name + ': does not not support mulitValue.\n' +
+        'override isMultiValue'
+      );
+    }
+
+    let len = values.length;
+    let i = 0;
+    this.removeAllValues();
+
+    if (len > 0 &&
+        typeof(values[0]) === 'object' &&
+        'icaltype' in values[0]) {
+      this.resetType(values[0].icaltype);
+    }
+
+    if (this.isDecorated) {
+      for (; i < len; i++) {
+        this._setDecoratedValue(values[i], i);
+      }
+    } else {
+      for (; i < len; i++) {
+        this.jCal[VALUE_INDEX + i] = values[i];
+      }
+    }
+  }
+
+  /**
+   * Sets the current value of the property. If this is a multi-value
+   * property, all other values will be removed.
+   *
+   * @param {String|Object} value     New property value.
+   */
+  setValue(value) {
+    this.removeAllValues();
+    if (typeof(value) === 'object' && 'icaltype' in value) {
+      this.resetType(value.icaltype);
+    }
+
+    if (this.isDecorated) {
+      this._setDecoratedValue(value, 0);
+    } else {
+      this.jCal[VALUE_INDEX] = value;
+    }
+  }
+
+  /**
+   * Returns the Object representation of this component. The returned object
+   * is a live jCal object and should be cloned if modified.
+   * @return {Object}
+   */
+  toJSON() {
+    return this.jCal;
+  }
+
+  /**
+   * The string representation of this component.
+   * @return {String}
+   */
+  toICALString() {
+    return stringify.property(
+      this.jCal, this._designSet, true
+    );
+  }
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * This lets typescript resolve our custom types in the
+ * generated d.ts files (jsdoc typedefs are converted to typescript types).
+ * Ignore prevents the typedefs from being documented more than once.
+ * @ignore
+ * @typedef {import("./types.js").designSet} designSet
+ * Imports the 'designSet' type from the "types.js" module
+ * @typedef {import("./types.js").Geo} Geo
+ * Imports the 'Geo' type from the "types.js" module
+ */
+
+const NAME_INDEX = 0;
+const PROPERTY_INDEX = 1;
+const COMPONENT_INDEX = 2;
+
+/**
+ * Wraps a jCal component, adding convenience methods to add, remove and update subcomponents and
+ * properties.
+ *
+ * @memberof ICAL
+ */
+class Component {
+  /**
+   * Create an {@link ICAL.Component} by parsing the passed iCalendar string.
+   *
+   * @param {String} str        The iCalendar string to parse
+   */
+  static fromString(str) {
+    return new Component(parse.component(str));
+  }
+
+  /**
+   * Creates a new Component instance.
+   *
+   * @param {Array|String} jCal         Raw jCal component data OR name of new
+   *                                      component
+   * @param {Component=} parent     Parent component to associate
+   */
+  constructor(jCal, parent) {
+    if (typeof(jCal) === 'string') {
+      // jCal spec (name, properties, components)
+      jCal = [jCal, [], []];
+    }
+
+    // mostly for legacy reasons.
+    this.jCal = jCal;
+
+    this.parent = parent || null;
+
+    if (!this.parent && this.name === 'vcalendar') {
+      this._timezoneCache = new Map();
+    }
+  }
+
+  /**
+   * Hydrated properties are inserted into the _properties array at the same
+   * position as in the jCal array, so it is possible that the array contains
+   * undefined values for unhydrdated properties. To avoid iterating the
+   * array when checking if all properties have been hydrated, we save the
+   * count here.
+   *
+   * @type {Number}
+   * @private
+   */
+  _hydratedPropertyCount = 0;
+
+  /**
+   * The same count as for _hydratedPropertyCount, but for subcomponents
+   *
+   * @type {Number}
+   * @private
+   */
+  _hydratedComponentCount = 0;
+
+  /**
+   * A cache of hydrated time zone objects which may be used by consumers, keyed
+   * by time zone ID.
+   *
+   * @type {Map}
+   * @private
+   */
+  _timezoneCache = null;
+
+  /**
+   * @private
+   */
+  _components = null;
+
+  /**
+   * @private
+   */
+  _properties = null;
+
+  /**
+   * The name of this component
+   *
+   * @type {String}
+   */
+  get name() {
+    return this.jCal[NAME_INDEX];
+  }
+
+  /**
+   * The design set for this component, e.g. icalendar vs vcard
+   *
+   * @type {designSet}
+   * @private
+   */
+  get _designSet() {
+    let parentDesign = this.parent && this.parent._designSet;
+    return parentDesign || design$1.getDesignSet(this.name);
+  }
+
+  /**
+   * @private
+   */
+  _hydrateComponent(index) {
+    if (!this._components) {
+      this._components = [];
+      this._hydratedComponentCount = 0;
+    }
+
+    if (this._components[index]) {
+      return this._components[index];
+    }
+
+    let comp = new Component(
+      this.jCal[COMPONENT_INDEX][index],
+      this
+    );
+
+    this._hydratedComponentCount++;
+    return (this._components[index] = comp);
+  }
+
+  /**
+   * @private
+   */
+  _hydrateProperty(index) {
+    if (!this._properties) {
+      this._properties = [];
+      this._hydratedPropertyCount = 0;
+    }
+
+    if (this._properties[index]) {
+      return this._properties[index];
+    }
+
+    let prop = new Property(
+      this.jCal[PROPERTY_INDEX][index],
+      this
+    );
+
+    this._hydratedPropertyCount++;
+    return (this._properties[index] = prop);
+  }
+
+  /**
+   * Finds first sub component, optionally filtered by name.
+   *
+   * @param {String=} name        Optional name to filter by
+   * @return {?Component}     The found subcomponent
+   */
+  getFirstSubcomponent(name) {
+    if (name) {
+      let i = 0;
+      let comps = this.jCal[COMPONENT_INDEX];
+      let len = comps.length;
+
+      for (; i < len; i++) {
+        if (comps[i][NAME_INDEX] === name) {
+          let result = this._hydrateComponent(i);
+          return result;
+        }
+      }
+    } else {
+      if (this.jCal[COMPONENT_INDEX].length) {
+        return this._hydrateComponent(0);
+      }
+    }
+
+    // ensure we return a value (strict mode)
+    return null;
+  }
+
+  /**
+   * Finds all sub components, optionally filtering by name.
+   *
+   * @param {String=} name            Optional name to filter by
+   * @return {Component[]}       The found sub components
+   */
+  getAllSubcomponents(name) {
+    let jCalLen = this.jCal[COMPONENT_INDEX].length;
+    let i = 0;
+
+    if (name) {
+      let comps = this.jCal[COMPONENT_INDEX];
+      let result = [];
+
+      for (; i < jCalLen; i++) {
+        if (name === comps[i][NAME_INDEX]) {
+          result.push(
+            this._hydrateComponent(i)
+          );
+        }
+      }
+      return result;
+    } else {
+      if (!this._components ||
+          (this._hydratedComponentCount !== jCalLen)) {
+        for (; i < jCalLen; i++) {
+          this._hydrateComponent(i);
+        }
+      }
+
+      return this._components || [];
+    }
+  }
+
+  /**
+   * Returns true when a named property exists.
+   *
+   * @param {String} name     The property name
+   * @return {Boolean}        True, when property is found
+   */
+  hasProperty(name) {
+    let props = this.jCal[PROPERTY_INDEX];
+    let len = props.length;
+
+    let i = 0;
+    for (; i < len; i++) {
+      // 0 is property name
+      if (props[i][NAME_INDEX] === name) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  /**
+   * Finds the first property, optionally with the given name.
+   *
+   * @param {String=} name        Lowercase property name
+   * @return {?Property}     The found property
+   */
+  getFirstProperty(name) {
+    if (name) {
+      let i = 0;
+      let props = this.jCal[PROPERTY_INDEX];
+      let len = props.length;
+
+      for (; i < len; i++) {
+        if (props[i][NAME_INDEX] === name) {
+          let result = this._hydrateProperty(i);
+          return result;
+        }
+      }
+    } else {
+      if (this.jCal[PROPERTY_INDEX].length) {
+        return this._hydrateProperty(0);
+      }
+    }
+
+    return null;
+  }
+
+  /**
+   * Returns first property's value, if available.
+   *
+   * @param {String=} name                    Lowercase property name
+   * @return {Binary | Duration | Period |
+   * Recur | Time | UtcOffset | Geo | string | null}         The found property value.
+   */
+  getFirstPropertyValue(name) {
+    let prop = this.getFirstProperty(name);
+    if (prop) {
+      return prop.getFirstValue();
+    }
+
+    return null;
+  }
+
+  /**
+   * Get all properties in the component, optionally filtered by name.
+   *
+   * @param {String=} name        Lowercase property name
+   * @return {Property[]}    List of properties
+   */
+  getAllProperties(name) {
+    let jCalLen = this.jCal[PROPERTY_INDEX].length;
+    let i = 0;
+
+    if (name) {
+      let props = this.jCal[PROPERTY_INDEX];
+      let result = [];
+
+      for (; i < jCalLen; i++) {
+        if (name === props[i][NAME_INDEX]) {
+          result.push(
+            this._hydrateProperty(i)
+          );
+        }
+      }
+      return result;
+    } else {
+      if (!this._properties ||
+          (this._hydratedPropertyCount !== jCalLen)) {
+        for (; i < jCalLen; i++) {
+          this._hydrateProperty(i);
+        }
+      }
+
+      return this._properties || [];
+    }
+  }
+
+  /**
+   * @private
+   */
+  _removeObjectByIndex(jCalIndex, cache, index) {
+    cache = cache || [];
+    // remove cached version
+    if (cache[index]) {
+      let obj = cache[index];
+      if ("parent" in obj) {
+          obj.parent = null;
+      }
+    }
+
+    cache.splice(index, 1);
+
+    // remove it from the jCal
+    this.jCal[jCalIndex].splice(index, 1);
+  }
+
+  /**
+   * @private
+   */
+  _removeObject(jCalIndex, cache, nameOrObject) {
+    let i = 0;
+    let objects = this.jCal[jCalIndex];
+    let len = objects.length;
+    let cached = this[cache];
+
+    if (typeof(nameOrObject) === 'string') {
+      for (; i < len; i++) {
+        if (objects[i][NAME_INDEX] === nameOrObject) {
+          this._removeObjectByIndex(jCalIndex, cached, i);
+          return true;
+        }
+      }
+    } else if (cached) {
+      for (; i < len; i++) {
+        if (cached[i] && cached[i] === nameOrObject) {
+          this._removeObjectByIndex(jCalIndex, cached, i);
+          return true;
+        }
+      }
+    }
+
+    return false;
+  }
+
+  /**
+   * @private
+   */
+  _removeAllObjects(jCalIndex, cache, name) {
+    let cached = this[cache];
+
+    // Unfortunately we have to run through all children to reset their
+    // parent property.
+    let objects = this.jCal[jCalIndex];
+    let i = objects.length - 1;
+
+    // descending search required because splice
+    // is used and will effect the indices.
+    for (; i >= 0; i--) {
+      if (!name || objects[i][NAME_INDEX] === name) {
+        this._removeObjectByIndex(jCalIndex, cached, i);
+      }
+    }
+  }
+
+  /**
+   * Adds a single sub component.
+   *
+   * @param {Component} component        The component to add
+   * @return {Component}                 The passed in component
+   */
+  addSubcomponent(component) {
+    if (!this._components) {
+      this._components = [];
+      this._hydratedComponentCount = 0;
+    }
+
+    if (component.parent) {
+      component.parent.removeSubcomponent(component);
+    }
+
+    let idx = this.jCal[COMPONENT_INDEX].push(component.jCal);
+    this._components[idx - 1] = component;
+    this._hydratedComponentCount++;
+    component.parent = this;
+    return component;
+  }
+
+  /**
+   * Removes a single component by name or the instance of a specific
+   * component.
+   *
+   * @param {Component|String} nameOrComp    Name of component, or component
+   * @return {Boolean}                            True when comp is removed
+   */
+  removeSubcomponent(nameOrComp) {
+    let removed = this._removeObject(COMPONENT_INDEX, '_components', nameOrComp);
+    if (removed) {
+      this._hydratedComponentCount--;
+    }
+    return removed;
+  }
+
+  /**
+   * Removes all components or (if given) all components by a particular
+   * name.
+   *
+   * @param {String=} name            Lowercase component name
+   */
+  removeAllSubcomponents(name) {
+    let removed = this._removeAllObjects(COMPONENT_INDEX, '_components', name);
+    this._hydratedComponentCount = 0;
+    return removed;
+  }
+
+  /**
+   * Adds an {@link ICAL.Property} to the component.
+   *
+   * @param {Property} property      The property to add
+   * @return {Property}              The passed in property
+   */
+  addProperty(property) {
+    if (!(property instanceof Property)) {
+      throw new TypeError('must be instance of ICAL.Property');
+    }
+
+    if (!this._properties) {
+      this._properties = [];
+      this._hydratedPropertyCount = 0;
+    }
+
+    if (property.parent) {
+      property.parent.removeProperty(property);
+    }
+
+    let idx = this.jCal[PROPERTY_INDEX].push(property.jCal);
+    this._properties[idx - 1] = property;
+    this._hydratedPropertyCount++;
+    property.parent = this;
+    return property;
+  }
+
+  /**
+   * Helper method to add a property with a value to the component.
+   *
+   * @param {String}               name         Property name to add
+   * @param {String|Number|Object} value        Property value
+   * @return {Property}                    The created property
+   */
+  addPropertyWithValue(name, value) {
+    let prop = new Property(name);
+    prop.setValue(value);
+
+    this.addProperty(prop);
+
+    return prop;
+  }
+
+  /**
+   * Helper method that will update or create a property of the given name
+   * and sets its value. If multiple properties with the given name exist,
+   * only the first is updated.
+   *
+   * @param {String}               name         Property name to update
+   * @param {String|Number|Object} value        Property value
+   * @return {Property}                    The created property
+   */
+  updatePropertyWithValue(name, value) {
+    let prop = this.getFirstProperty(name);
+
+    if (prop) {
+      prop.setValue(value);
+    } else {
+      prop = this.addPropertyWithValue(name, value);
+    }
+
+    return prop;
+  }
+
+  /**
+   * Removes a single property by name or the instance of the specific
+   * property.
+   *
+   * @param {String|Property} nameOrProp     Property name or instance to remove
+   * @return {Boolean}                            True, when deleted
+   */
+  removeProperty(nameOrProp) {
+    let removed = this._removeObject(PROPERTY_INDEX, '_properties', nameOrProp);
+    if (removed) {
+      this._hydratedPropertyCount--;
+    }
+    return removed;
+  }
+
+  /**
+   * Removes all properties associated with this component, optionally
+   * filtered by name.
+   *
+   * @param {String=} name        Lowercase property name
+   * @return {Boolean}            True, when deleted
+   */
+  removeAllProperties(name) {
+    let removed = this._removeAllObjects(PROPERTY_INDEX, '_properties', name);
+    this._hydratedPropertyCount = 0;
+    return removed;
+  }
+
+  /**
+   * Returns the Object representation of this component. The returned object
+   * is a live jCal object and should be cloned if modified.
+   * @return {Object}
+   */
+  toJSON() {
+    return this.jCal;
+  }
+
+  /**
+   * The string representation of this component.
+   * @return {String}
+   */
+  toString() {
+    return stringify.component(
+      this.jCal, this._designSet
+    );
+  }
+
+  /**
+   * Retrieve a time zone definition from the component tree, if any is present.
+   * If the tree contains no time zone definitions or the TZID cannot be
+   * matched, returns null.
+   *
+   * @param {String} tzid     The ID of the time zone to retrieve
+   * @return {Timezone}  The time zone corresponding to the ID, or null
+   */
+  getTimeZoneByID(tzid) {
+    // VTIMEZONE components can only appear as a child of the VCALENDAR
+    // component; walk the tree if we're not the root.
+    if (this.parent) {
+      return this.parent.getTimeZoneByID(tzid);
+    }
+
+    // If there is no time zone cache, we are probably parsing an incomplete
+    // file and will have no time zone definitions.
+    if (!this._timezoneCache) {
+      return null;
+    }
+
+    if (this._timezoneCache.has(tzid)) {
+      return this._timezoneCache.get(tzid);
+    }
+
+    // If the time zone is not already cached, hydrate it from the
+    // subcomponents.
+    const zones = this.getAllSubcomponents('vtimezone');
+    for (const zone of zones) {
+      if (zone.getFirstProperty('tzid').getFirstValue() === tzid) {
+        const hydratedZone = new Timezone({
+          component: zone,
+          tzid: tzid,
+        });
+
+        this._timezoneCache.set(tzid, hydratedZone);
+
+        return hydratedZone;
+      }
+    }
+
+    // Per the standard, we should always have a time zone defined in a file
+    // for any referenced TZID, but don't blow up if the file is invalid.
+    return null;
+  }
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * Primary class for expanding recurring rules.  Can take multiple rrules, rdates, exdate(s) and
+ * iterate (in order) over each next occurrence.
+ *
+ * Once initialized this class can also be serialized saved and continue iteration from the last
+ * point.
+ *
+ * NOTE: it is intended that this class is to be used with {@link ICAL.Event} which handles recurrence
+ * exceptions.
+ *
+ * @example
+ * // assuming event is a parsed ical component
+ * var event;
+ *
+ * var expand = new ICAL.RecurExpansion({
+ *   component: event,
+ *   dtstart: event.getFirstPropertyValue('dtstart')
+ * });
+ *
+ * // remember there are infinite rules so it is a good idea to limit the scope of the iterations
+ * // then resume later on.
+ *
+ * // next is always an ICAL.Time or null
+ * var next;
+ *
+ * while (someCondition && (next = expand.next())) {
+ *   // do something with next
+ * }
+ *
+ * // save instance for later
+ * var json = JSON.stringify(expand);
+ *
+ * //...
+ *
+ * // NOTE: if the component's properties have changed you will need to rebuild the class and start
+ * // over. This only works when the component's recurrence info is the same.
+ * var expand = new ICAL.RecurExpansion(JSON.parse(json));
+ *
+ * @memberof ICAL
+ */
+class RecurExpansion {
+  /**
+   * Creates a new ICAL.RecurExpansion instance.
+   *
+   * The options object can be filled with the specified initial values. It can also contain
+   * additional members, as a result of serializing a previous expansion state, as shown in the
+   * example.
+   *
+   * @param {Object} options
+   *        Recurrence expansion options
+   * @param {Time} options.dtstart
+   *        Start time of the event
+   * @param {Component=} options.component
+   *        Component for expansion, required if not resuming.
+   */
+  constructor(options) {
+    this.ruleDates = [];
+    this.exDates = [];
+    this.fromData(options);
+  }
+
+  /**
+   * True when iteration is fully completed.
+   * @type {Boolean}
+   */
+  complete = false;
+
+  /**
+   * Array of rrule iterators.
+   *
+   * @type {RecurIterator[]}
+   * @private
+   */
+  ruleIterators = null;
+
+  /**
+   * Array of rdate instances.
+   *
+   * @type {Time[]}
+   * @private
+   */
+  ruleDates = null;
+
+  /**
+   * Array of exdate instances.
+   *
+   * @type {Time[]}
+   * @private
+   */
+  exDates = null;
+
+  /**
+   * Current position in ruleDates array.
+   * @type {Number}
+   * @private
+   */
+  ruleDateInc = 0;
+
+  /**
+   * Current position in exDates array
+   * @type {Number}
+   * @private
+   */
+  exDateInc = 0;
+
+  /**
+   * Current negative date.
+   *
+   * @type {Time}
+   * @private
+   */
+  exDate = null;
+
+  /**
+   * Current additional date.
+   *
+   * @type {Time}
+   * @private
+   */
+  ruleDate = null;
+
+  /**
+   * Start date of recurring rules.
+   *
+   * @type {Time}
+   */
+  dtstart = null;
+
+  /**
+   * Last expanded time
+   *
+   * @type {Time}
+   */
+  last = null;
+
+  /**
+   * Initialize the recurrence expansion from the data object. The options
+   * object may also contain additional members, see the
+   * {@link ICAL.RecurExpansion constructor} for more details.
+   *
+   * @param {Object} options
+   *        Recurrence expansion options
+   * @param {Time} options.dtstart
+   *        Start time of the event
+   * @param {Component=} options.component
+   *        Component for expansion, required if not resuming.
+   */
+  fromData(options) {
+    let start = formatClassType(options.dtstart, Time);
+
+    if (!start) {
+      throw new Error('.dtstart (ICAL.Time) must be given');
+    } else {
+      this.dtstart = start;
+    }
+
+    if (options.component) {
+      this._init(options.component);
+    } else {
+      this.last = formatClassType(options.last, Time) || start.clone();
+
+      if (!options.ruleIterators) {
+        throw new Error('.ruleIterators or .component must be given');
+      }
+
+      this.ruleIterators = options.ruleIterators.map(function(item) {
+        return formatClassType(item, RecurIterator);
+      });
+
+      this.ruleDateInc = options.ruleDateInc;
+      this.exDateInc = options.exDateInc;
+
+      if (options.ruleDates) {
+        this.ruleDates = options.ruleDates.map(item => formatClassType(item, Time));
+        this.ruleDate = this.ruleDates[this.ruleDateInc];
+      }
+
+      if (options.exDates) {
+        this.exDates = options.exDates.map(item => formatClassType(item, Time));
+        this.exDate = this.exDates[this.exDateInc];
+      }
+
+      if (typeof(options.complete) !== 'undefined') {
+        this.complete = options.complete;
+      }
+    }
+  }
+
+  /**
+   * Retrieve the next occurrence in the series.
+   * @return {Time}
+   */
+  next() {
+    let iter;
+    let next;
+    let compare;
+
+    let maxTries = 500;
+    let currentTry = 0;
+
+    while (true) {
+      if (currentTry++ > maxTries) {
+        throw new Error(
+          'max tries have occurred, rule may be impossible to fulfill.'
+        );
+      }
+
+      next = this.ruleDate;
+      iter = this._nextRecurrenceIter(this.last);
+
+      // no more matches
+      // because we increment the rule day or rule
+      // _after_ we choose a value this should be
+      // the only spot where we need to worry about the
+      // end of events.
+      if (!next && !iter) {
+        // there are no more iterators or rdates
+        this.complete = true;
+        break;
+      }
+
+      // no next rule day or recurrence rule is first.
+      if (!next || (iter && next.compare(iter.last) > 0)) {
+        // must be cloned, recur will reuse the time element.
+        next = iter.last.clone();
+        // move to next so we can continue
+        iter.next();
+      }
+
+      // if the ruleDate is still next increment it.
+      if (this.ruleDate === next) {
+        this._nextRuleDay();
+      }
+
+      this.last = next;
+
+      // check the negative rules
+      if (this.exDate) {
+        compare = this.exDate.compare(this.last);
+
+        if (compare < 0) {
+          this._nextExDay();
+        }
+
+        // if the current rule is excluded skip it.
+        if (compare === 0) {
+          this._nextExDay();
+          continue;
+        }
+      }
+
+      //XXX: The spec states that after we resolve the final
+      //     list of dates we execute exdate this seems somewhat counter
+      //     intuitive to what I have seen most servers do so for now
+      //     I exclude based on the original date not the one that may
+      //     have been modified by the exception.
+      return this.last;
+    }
+  }
+
+  /**
+   * Converts object into a serialize-able format. This format can be passed
+   * back into the expansion to resume iteration.
+   * @return {Object}
+   */
+  toJSON() {
+    function toJSON(item) {
+      return item.toJSON();
+    }
+
+    let result = Object.create(null);
+    result.ruleIterators = this.ruleIterators.map(toJSON);
+
+    if (this.ruleDates) {
+      result.ruleDates = this.ruleDates.map(toJSON);
+    }
+
+    if (this.exDates) {
+      result.exDates = this.exDates.map(toJSON);
+    }
+
+    result.ruleDateInc = this.ruleDateInc;
+    result.exDateInc = this.exDateInc;
+    result.last = this.last.toJSON();
+    result.dtstart = this.dtstart.toJSON();
+    result.complete = this.complete;
+
+    return result;
+  }
+
+  /**
+   * Extract all dates from the properties in the given component. The
+   * properties will be filtered by the property name.
+   *
+   * @private
+   * @param {Component} component             The component to search in
+   * @param {String} propertyName             The property name to search for
+   * @return {Time[]}                         The extracted dates.
+   */
+  _extractDates(component, propertyName) {
+    let result = [];
+    let props = component.getAllProperties(propertyName);
+
+    for (let i = 0, len = props.length; i < len; i++) {
+      for (let prop of props[i].getValues()) {
+        let idx = binsearchInsert(
+          result,
+          prop,
+          (a, b) => a.compare(b)
+        );
+
+        // ordered insert
+        result.splice(idx, 0, prop);
+      }
+    }
+
+    return result;
+  }
+
+  /**
+   * Initialize the recurrence expansion.
+   *
+   * @private
+   * @param {Component} component    The component to initialize from.
+   */
+  _init(component) {
+    this.ruleIterators = [];
+
+    this.last = this.dtstart.clone();
+
+    // to provide api consistency non-recurring
+    // events can also use the iterator though it will
+    // only return a single time.
+    if (!component.hasProperty('rdate') &&
+        !component.hasProperty('rrule') &&
+        !component.hasProperty('recurrence-id')) {
+      this.ruleDate = this.last.clone();
+      this.complete = true;
+      return;
+    }
+
+    if (component.hasProperty('rdate')) {
+      this.ruleDates = this._extractDates(component, 'rdate');
+
+      // special hack for cases where first rdate is prior
+      // to the start date. We only check for the first rdate.
+      // This is mostly for google's crazy recurring date logic
+      // (contacts birthdays).
+      if ((this.ruleDates[0]) &&
+          (this.ruleDates[0].compare(this.dtstart) < 0)) {
+
+        this.ruleDateInc = 0;
+        this.last = this.ruleDates[0].clone();
+      } else {
+        this.ruleDateInc = binsearchInsert(
+          this.ruleDates,
+          this.last,
+          (a, b) => a.compare(b)
+        );
+      }
+
+      this.ruleDate = this.ruleDates[this.ruleDateInc];
+    }
+
+    if (component.hasProperty('rrule')) {
+      let rules = component.getAllProperties('rrule');
+      let i = 0;
+      let len = rules.length;
+
+      let rule;
+      let iter;
+
+      for (; i < len; i++) {
+        rule = rules[i].getFirstValue();
+        iter = rule.iterator(this.dtstart);
+        this.ruleIterators.push(iter);
+
+        // increment to the next occurrence so future
+        // calls to next return times beyond the initial iteration.
+        // XXX: I find this suspicious might be a bug?
+        iter.next();
+      }
+    }
+
+    if (component.hasProperty('exdate')) {
+      this.exDates = this._extractDates(component, 'exdate');
+      // if we have a .last day we increment the index to beyond it.
+      this.exDateInc = binsearchInsert(
+        this.exDates,
+        this.last,
+        (a, b) => a.compare(b)
+      );
+
+      this.exDate = this.exDates[this.exDateInc];
+    }
+  }
+
+  /**
+   * Advance to the next exdate
+   * @private
+   */
+  _nextExDay() {
+    this.exDate = this.exDates[++this.exDateInc];
+  }
+
+  /**
+   * Advance to the next rule date
+   * @private
+   */
+  _nextRuleDay() {
+    this.ruleDate = this.ruleDates[++this.ruleDateInc];
+  }
+
+  /**
+   * Find and return the recurrence rule with the most recent event and
+   * return it.
+   *
+   * @private
+   * @return {?RecurIterator}    Found iterator.
+   */
+  _nextRecurrenceIter() {
+    let iters = this.ruleIterators;
+
+    if (iters.length === 0) {
+      return null;
+    }
+
+    let len = iters.length;
+    let iter;
+    let iterTime;
+    let iterIdx = 0;
+    let chosenIter;
+
+    // loop through each iterator
+    for (; iterIdx < len; iterIdx++) {
+      iter = iters[iterIdx];
+      iterTime = iter.last;
+
+      // if iteration is complete
+      // then we must exclude it from
+      // the search and remove it.
+      if (iter.completed) {
+        len--;
+        if (iterIdx !== 0) {
+          iterIdx--;
+        }
+        iters.splice(iterIdx, 1);
+        continue;
+      }
+
+      // find the most recent possible choice
+      if (!chosenIter || chosenIter.last.compare(iterTime) > 0) {
+        // that iterator is saved
+        chosenIter = iter;
+      }
+    }
+
+    // the chosen iterator is returned but not mutated
+    // this iterator contains the most recent event.
+    return chosenIter;
+  }
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * This lets typescript resolve our custom types in the
+ * generated d.ts files (jsdoc typedefs are converted to typescript types).
+ * Ignore prevents the typedefs from being documented more than once.
+ * @ignore
+ * @typedef {import("./types.js").frequencyValues} frequencyValues
+ * Imports the 'frequencyValues' type from the "types.js" module
+ * @typedef {import("./types.js").occurrenceDetails} occurrenceDetails
+ * Imports the 'occurrenceDetails' type from the "types.js" module
+ */
+
+/**
+ * ICAL.js is organized into multiple layers. The bottom layer is a raw jCal
+ * object, followed by the component/property layer. The highest level is the
+ * event representation, which this class is part of. See the
+ * {@tutorial layers} guide for more details.
+ *
+ * @memberof ICAL
+ */
+class Event {
+  /**
+   * Creates a new ICAL.Event instance.
+   *
+   * @param {Component=} component              The ICAL.Component to base this event on
+   * @param {Object} [options]                  Options for this event
+   * @param {Boolean=} options.strictExceptions  When true, will verify exceptions are related by
+   *                                              their UUID
+   * @param {Array<Component|Event>=} options.exceptions
+   *          Exceptions to this event, either as components or events. If not
+   *            specified exceptions will automatically be set in relation of
+   *            component's parent
+   */
+  constructor(component, options) {
+    if (!(component instanceof Component)) {
+      options = component;
+      component = null;
+    }
+
+    if (component) {
+      this.component = component;
+    } else {
+      this.component = new Component('vevent');
+    }
+
+    this._rangeExceptionCache = Object.create(null);
+    this.exceptions = Object.create(null);
+    this.rangeExceptions = [];
+
+    if (options && options.strictExceptions) {
+      this.strictExceptions = options.strictExceptions;
+    }
+
+    if (options && options.exceptions) {
+      options.exceptions.forEach(this.relateException, this);
+    } else if (this.component.parent && !this.isRecurrenceException()) {
+      this.component.parent.getAllSubcomponents('vevent').forEach(function(event) {
+        if (event.hasProperty('recurrence-id')) {
+          this.relateException(event);
+        }
+      }, this);
+    }
+  }
+
+
+  static THISANDFUTURE = 'THISANDFUTURE';
+
+  /**
+   * List of related event exceptions.
+   *
+   * @type {Event[]}
+   */
+  exceptions = null;
+
+  /**
+   * When true, will verify exceptions are related by their UUID.
+   *
+   * @type {Boolean}
+   */
+  strictExceptions = false;
+
+  /**
+   * Relates a given event exception to this object.  If the given component
+   * does not share the UID of this event it cannot be related and will throw
+   * an exception.
+   *
+   * If this component is an exception it cannot have other exceptions
+   * related to it.
+   *
+   * @param {Component|Event} obj       Component or event
+   */
+  relateException(obj) {
+    if (this.isRecurrenceException()) {
+      throw new Error('cannot relate exception to exceptions');
+    }
+
+    if (obj instanceof Component) {
+      obj = new Event(obj);
+    }
+
+    if (this.strictExceptions && obj.uid !== this.uid) {
+      throw new Error('attempted to relate unrelated exception');
+    }
+
+    let id = obj.recurrenceId.toString();
+
+    // we don't sort or manage exceptions directly
+    // here the recurrence expander handles that.
+    this.exceptions[id] = obj;
+
+    // index RANGE=THISANDFUTURE exceptions so we can
+    // look them up later in getOccurrenceDetails.
+    if (obj.modifiesFuture()) {
+      let item = [
+        obj.recurrenceId.toUnixTime(), id
+      ];
+
+      // we keep them sorted so we can find the nearest
+      // value later on...
+      let idx = binsearchInsert(
+        this.rangeExceptions,
+        item,
+        compareRangeException
+      );
+
+      this.rangeExceptions.splice(idx, 0, item);
+    }
+  }
+
+  /**
+   * Checks if this record is an exception and has the RANGE=THISANDFUTURE
+   * value.
+   *
+   * @return {Boolean}        True, when exception is within range
+   */
+  modifiesFuture() {
+    if (!this.component.hasProperty('recurrence-id')) {
+      return false;
+    }
+
+    let range = this.component.getFirstProperty('recurrence-id').getParameter('range');
+    return range === Event.THISANDFUTURE;
+  }
+
+  /**
+   * Finds the range exception nearest to the given date.
+   *
+   * @param {Time} time   usually an occurrence time of an event
+   * @return {?Event}     the related event/exception or null
+   */
+  findRangeException(time) {
+    if (!this.rangeExceptions.length) {
+      return null;
+    }
+
+    let utc = time.toUnixTime();
+    let idx = binsearchInsert(
+      this.rangeExceptions,
+      [utc],
+      compareRangeException
+    );
+
+    idx -= 1;
+
+    // occurs before
+    if (idx < 0) {
+      return null;
+    }
+
+    let rangeItem = this.rangeExceptions[idx];
+
+    /* c8 ignore next 4 */
+    if (utc < rangeItem[0]) {
+      // sanity check only
+      return null;
+    }
+
+    return rangeItem[1];
+  }
+
+  /**
+   * Returns the occurrence details based on its start time.  If the
+   * occurrence has an exception will return the details for that exception.
+   *
+   * NOTE: this method is intend to be used in conjunction
+   *       with the {@link ICAL.Event#iterator iterator} method.
+   *
+   * @param {Time} occurrence               time occurrence
+   * @return {occurrenceDetails}            Information about the occurrence
+   */
+  getOccurrenceDetails(occurrence) {
+    let id = occurrence.toString();
+    let utcId = occurrence.convertToZone(Timezone.utcTimezone).toString();
+    let item;
+    let result = {
+      //XXX: Clone?
+      recurrenceId: occurrence
+    };
+
+    if (id in this.exceptions) {
+      item = result.item = this.exceptions[id];
+      result.startDate = item.startDate;
+      result.endDate = item.endDate;
+      result.item = item;
+    } else if (utcId in this.exceptions) {
+      item = this.exceptions[utcId];
+      result.startDate = item.startDate;
+      result.endDate = item.endDate;
+      result.item = item;
+    } else {
+      // range exceptions (RANGE=THISANDFUTURE) have a
+      // lower priority then direct exceptions but
+      // must be accounted for first. Their item is
+      // always the first exception with the range prop.
+      let rangeExceptionId = this.findRangeException(
+        occurrence
+      );
+      let end;
+
+      if (rangeExceptionId) {
+        let exception = this.exceptions[rangeExceptionId];
+
+        // range exception must modify standard time
+        // by the difference (if any) in start/end times.
+        result.item = exception;
+
+        let startDiff = this._rangeExceptionCache[rangeExceptionId];
+
+        if (!startDiff) {
+          let original = exception.recurrenceId.clone();
+          let newStart = exception.startDate.clone();
+
+          // zones must be same otherwise subtract may be incorrect.
+          original.zone = newStart.zone;
+          startDiff = newStart.subtractDate(original);
+
+          this._rangeExceptionCache[rangeExceptionId] = startDiff;
+        }
+
+        let start = occurrence.clone();
+        start.zone = exception.startDate.zone;
+        start.addDuration(startDiff);
+
+        end = start.clone();
+        end.addDuration(exception.duration);
+
+        result.startDate = start;
+        result.endDate = end;
+      } else {
+        // no range exception standard expansion
+        end = occurrence.clone();
+        end.addDuration(this.duration);
+
+        result.endDate = end;
+        result.startDate = occurrence;
+        result.item = this;
+      }
+    }
+
+    return result;
+  }
+
+  /**
+   * Builds a recur expansion instance for a specific point in time (defaults
+   * to startDate).
+   *
+   * @param {Time=} startTime     Starting point for expansion
+   * @return {RecurExpansion}    Expansion object
+   */
+  iterator(startTime) {
+    return new RecurExpansion({
+      component: this.component,
+      dtstart: startTime || this.startDate
+    });
+  }
+
+  /**
+   * Checks if the event is recurring
+   *
+   * @return {Boolean}        True, if event is recurring
+   */
+  isRecurring() {
+    let comp = this.component;
+    return comp.hasProperty('rrule') || comp.hasProperty('rdate');
+  }
+
+  /**
+   * Checks if the event describes a recurrence exception. See
+   * {@tutorial terminology} for details.
+   *
+   * @return {Boolean}    True, if the event describes a recurrence exception
+   */
+  isRecurrenceException() {
+    return this.component.hasProperty('recurrence-id');
+  }
+
+  /**
+   * Returns the types of recurrences this event may have.
+   *
+   * Returned as an object with the following possible keys:
+   *
+   *    - YEARLY
+   *    - MONTHLY
+   *    - WEEKLY
+   *    - DAILY
+   *    - MINUTELY
+   *    - SECONDLY
+   *
+   * @return {Object.<frequencyValues, Boolean>}
+   *          Object of recurrence flags
+   */
+  getRecurrenceTypes() {
+    let rules = this.component.getAllProperties('rrule');
+    let i = 0;
+    let len = rules.length;
+    let result = Object.create(null);
+
+    for (; i < len; i++) {
+      let value = rules[i].getFirstValue();
+      result[value.freq] = true;
+    }
+
+    return result;
+  }
+
+  /**
+   * The uid of this event
+   * @type {String}
+   */
+  get uid() {
+    return this._firstProp('uid');
+  }
+
+  set uid(value) {
+    this._setProp('uid', value);
+  }
+
+  /**
+   * The start date
+   * @type {Time}
+   */
+  get startDate() {
+    return this._firstProp('dtstart');
+  }
+
+  set startDate(value) {
+    this._setTime('dtstart', value);
+  }
+
+  /**
+   * The end date. This can be the result directly from the property, or the
+   * end date calculated from start date and duration. Setting the property
+   * will remove any duration properties.
+   * @type {Time}
+   */
+  get endDate() {
+    let endDate = this._firstProp('dtend');
+    if (!endDate) {
+        let duration = this._firstProp('duration');
+        endDate = this.startDate.clone();
+        if (duration) {
+            endDate.addDuration(duration);
+        } else if (endDate.isDate) {
+            endDate.day += 1;
+        }
+    }
+    return endDate;
+  }
+
+  set endDate(value) {
+    if (this.component.hasProperty('duration')) {
+      this.component.removeProperty('duration');
+    }
+    this._setTime('dtend', value);
+  }
+
+  /**
+   * The duration. This can be the result directly from the property, or the
+   * duration calculated from start date and end date. Setting the property
+   * will remove any `dtend` properties.
+   * @type {Duration}
+   */
+  get duration() {
+    let duration = this._firstProp('duration');
+    if (!duration) {
+      return this.endDate.subtractDateTz(this.startDate);
+    }
+    return duration;
+  }
+
+  set duration(value) {
+    if (this.component.hasProperty('dtend')) {
+      this.component.removeProperty('dtend');
+    }
+
+    this._setProp('duration', value);
+  }
+
+  /**
+   * The location of the event.
+   * @type {String}
+   */
+  get location() {
+    return this._firstProp('location');
+  }
+
+  set location(value) {
+    this._setProp('location', value);
+  }
+
+  /**
+   * The attendees in the event
+   * @type {Property[]}
+   */
+  get attendees() {
+    //XXX: This is way lame we should have a better
+    //     data structure for this later.
+    return this.component.getAllProperties('attendee');
+  }
+
+  /**
+   * The event summary
+   * @type {String}
+   */
+  get summary() {
+    return this._firstProp('summary');
+  }
+
+  set summary(value) {
+    this._setProp('summary', value);
+  }
+
+  /**
+   * The event description.
+   * @type {String}
+   */
+  get description() {
+    return this._firstProp('description');
+  }
+
+  set description(value) {
+    this._setProp('description', value);
+  }
+
+  /**
+   * The event color from [rfc7986](https://datatracker.ietf.org/doc/html/rfc7986)
+   * @type {String}
+   */
+  get color() {
+    return this._firstProp('color');
+  }
+
+  set color(value) {
+    this._setProp('color', value);
+  }
+
+  /**
+   * The organizer value as an uri. In most cases this is a mailto: uri, but
+   * it can also be something else, like urn:uuid:...
+   * @type {String}
+   */
+  get organizer() {
+    return this._firstProp('organizer');
+  }
+
+  set organizer(value) {
+    this._setProp('organizer', value);
+  }
+
+  /**
+   * The sequence value for this event. Used for scheduling
+   * see {@tutorial terminology}.
+   * @type {Number}
+   */
+  get sequence() {
+    return this._firstProp('sequence');
+  }
+
+  set sequence(value) {
+    this._setProp('sequence', value);
+  }
+
+  /**
+   * The recurrence id for this event. See {@tutorial terminology} for details.
+   * @type {Time}
+   */
+  get recurrenceId() {
+    return this._firstProp('recurrence-id');
+  }
+
+  set recurrenceId(value) {
+    this._setTime('recurrence-id', value);
+  }
+
+  /**
+   * Set/update a time property's value.
+   * This will also update the TZID of the property.
+   *
+   * TODO: this method handles the case where we are switching
+   * from a known timezone to an implied timezone (one without TZID).
+   * This does _not_ handle the case of moving between a known
+   *  (by TimezoneService) timezone to an unknown timezone...
+   *
+   * We will not add/remove/update the VTIMEZONE subcomponents
+   *  leading to invalid ICAL data...
+   * @private
+   * @param {String} propName     The property name
+   * @param {Time} time           The time to set
+   */
+  _setTime(propName, time) {
+    let prop = this.component.getFirstProperty(propName);
+
+    if (!prop) {
+      prop = new Property(propName);
+      this.component.addProperty(prop);
+    }
+
+    // utc and local don't get a tzid
+    if (
+      time.zone === Timezone.localTimezone ||
+      time.zone === Timezone.utcTimezone
+    ) {
+      // remove the tzid
+      prop.removeParameter('tzid');
+    } else {
+      prop.setParameter('tzid', time.zone.tzid);
+    }
+
+    prop.setValue(time);
+  }
+
+  _setProp(name, value) {
+    this.component.updatePropertyWithValue(name, value);
+  }
+
+  _firstProp(name) {
+    return this.component.getFirstPropertyValue(name);
+  }
+
+  /**
+   * The string representation of this event.
+   * @return {String}
+   */
+  toString() {
+    return this.component.toString();
+  }
+}
+
+function compareRangeException(a, b) {
+  if (a[0] > b[0]) return 1;
+  if (b[0] > a[0]) return -1;
+  return 0;
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * The ComponentParser is used to process a String or jCal Object,
+ * firing callbacks for various found components, as well as completion.
+ *
+ * @example
+ * var options = {
+ *   // when false no events will be emitted for type
+ *   parseEvent: true,
+ *   parseTimezone: true
+ * };
+ *
+ * var parser = new ICAL.ComponentParser(options);
+ *
+ * parser.onevent(eventComponent) {
+ *   //...
+ * }
+ *
+ * // ontimezone, etc...
+ *
+ * parser.oncomplete = function() {
+ *
+ * };
+ *
+ * parser.process(stringOrComponent);
+ *
+ * @memberof ICAL
+ */
+class ComponentParser {
+  /**
+   * Creates a new ICAL.ComponentParser instance.
+   *
+   * @param {Object=} options                   Component parser options
+   * @param {Boolean} options.parseEvent        Whether events should be parsed
+   * @param {Boolean} options.parseTimezeone    Whether timezones should be parsed
+   */
+  constructor(options) {
+    if (typeof(options) === 'undefined') {
+      options = {};
+    }
+
+    for (let [key, value] of Object.entries(options)) {
+      this[key] = value;
+    }
+  }
+
+  /**
+   * When true, parse events
+   *
+   * @type {Boolean}
+   */
+  parseEvent = true;
+
+  /**
+   * When true, parse timezones
+   *
+   * @type {Boolean}
+   */
+  parseTimezone = true;
+
+
+  /* SAX like events here for reference */
+
+  /**
+   * Fired when parsing is complete
+   * @callback
+   */
+  oncomplete = /* c8 ignore next */ function() {};
+
+  /**
+   * Fired if an error occurs during parsing.
+   *
+   * @callback
+   * @param {Error} err details of error
+   */
+  onerror = /* c8 ignore next */ function(err) {};
+
+  /**
+   * Fired when a top level component (VTIMEZONE) is found
+   *
+   * @callback
+   * @param {Timezone} component     Timezone object
+   */
+  ontimezone = /* c8 ignore next */ function(component) {};
+
+  /**
+   * Fired when a top level component (VEVENT) is found.
+   *
+   * @callback
+   * @param {Event} component    Top level component
+   */
+  onevent = /* c8 ignore next */ function(component) {};
+
+  /**
+   * Process a string or parse ical object.  This function itself will return
+   * nothing but will start the parsing process.
+   *
+   * Events must be registered prior to calling this method.
+   *
+   * @param {Component|String|Object} ical      The component to process,
+   *        either in its final form, as a jCal Object, or string representation
+   */
+  process(ical) {
+    //TODO: this is sync now in the future we will have a incremental parser.
+    if (typeof(ical) === 'string') {
+      ical = parse(ical);
+    }
+
+    if (!(ical instanceof Component)) {
+      ical = new Component(ical);
+    }
+
+    let components = ical.getAllSubcomponents();
+    let i = 0;
+    let len = components.length;
+    let component;
+
+    for (; i < len; i++) {
+      component = components[i];
+
+      switch (component.name) {
+        case 'vtimezone':
+          if (this.parseTimezone) {
+            let tzid = component.getFirstPropertyValue('tzid');
+            if (tzid) {
+              this.ontimezone(new Timezone({
+                tzid: tzid,
+                component: component
+              }));
+            }
+          }
+          break;
+        case 'vevent':
+          if (this.parseEvent) {
+            this.onevent(new Event(component));
+          }
+          break;
+        default:
+          continue;
+      }
+    }
+
+    //XXX: ideally we should do a "nextTick" here
+    //     so in all cases this is actually async.
+    this.oncomplete();
+  }
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * The main ICAL module. Provides access to everything else.
+ *
+ * @alias ICAL
+ * @namespace ICAL
+ * @property {ICAL.design} design
+ * @property {ICAL.helpers} helpers
+ */
+var ICALmodule = {
+  /**
+   * The number of characters before iCalendar line folding should occur
+   * @type {Number}
+   * @default 75
+   */
+  foldLength: 75,
+
+  debug: false,
+
+  /**
+   * The character(s) to be used for a newline. The default value is provided by
+   * rfc5545.
+   * @type {String}
+   * @default "\r\n"
+   */
+  newLineChar: '\r\n',
+
+  Binary,
+  Component,
+  ComponentParser,
+  Duration,
+  Event,
+  Period,
+  Property,
+  Recur,
+  RecurExpansion,
+  RecurIterator,
+  Time,
+  Timezone,
+  TimezoneService,
+  UtcOffset,
+  VCardTime,
+
+  parse,
+  stringify,
+
+  design: design$1,
+  helpers
+};
+
+return ICALmodule;
+
+})();
diff --git a/plugins/ics-viewer/index.php b/plugins/ics-viewer/index.php
new file mode 100644
index 000000000..591288392
--- /dev/null
+++ b/plugins/ics-viewer/index.php
@@ -0,0 +1,22 @@
+<?php
+
+class ICSViewerPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME = 'ICS Viewer',
+		AUTHOR = 'PhieF',
+		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';
+
+	public function Init() : void
+	{
+//		$this->UseLangs(true);
+		$this->addJs('message.js');
+		$this->addJs('windowsZones.js');
+		// Load https://github.com/kewisch/ical.js/releases
+		$this->addJs('ical.js');
+	}
+}
diff --git a/plugins/ics-viewer/message.js b/plugins/ics-viewer/message.js
new file mode 100644
index 000000000..380b732bb
--- /dev/null
+++ b/plugins/ics-viewer/message.js
@@ -0,0 +1,136 @@
+(rl => {
+	const templateId = 'MailMessageView';
+
+	addEventListener('rl-view-model.create', e => {
+		if (templateId === e.detail.viewModelTemplateID) {
+
+			const
+				template = document.getElementById(templateId),
+				view = e.detail,
+				attachmentsPlace = template.content.querySelector('.attachmentsPlace'),
+				dateRegEx = /(TZID=(?<tz>[^:]+):)?(?<year>[0-9]{4})(?<month>[0-9]{2})(?<day>[0-9]{2})T(?<hour>[0-9]{2})(?<minute>[0-9]{2})(?<second>[0-9]{2})(?<utc>Z?)/,
+				parseDate = str => {
+					let parts = dateRegEx.exec(str)?.groups,
+						options = {dateStyle: 'long', timeStyle: 'short'},
+						date = (parts ? new Date(
+							parseInt(parts.year, 10),
+							parseInt(parts.month, 10) - 1,
+							parseInt(parts.day, 10),
+							parseInt(parts.hour, 10),
+							parseInt(parts.minute, 10),
+							parseInt(parts.second, 10)
+						) : new Date(str));
+					parts?.tz && (options.timeZone = windowsVTIMEZONEs[parts.tz] || parts.tz);
+					try {
+						return date.format(options);
+					} catch (e) {
+						console.error(e);
+						if (options.timeZone) {
+							options.timeZone = undefined;
+							return date.format(options);
+						}
+					}
+				};
+
+			attachmentsPlace.after(Element.fromHTML(`
+			<details data-bind="if: ICSViewer, visible: ICSViewer">
+				<summary data-icon="📅" data-bind="text: ICSViewer().SUMMARY"></summary>
+				<table><tbody style="white-space:pre">
+					<tr data-bind="visible: ICSViewer().ORGANIZER_TXT"><td>Organizer: </td><td><a data-bind="text: ICSViewer().ORGANIZER_TXT, attr: { href: ICSViewer().ORGANIZER_MAIL }"></a></td></tr>
+					<tr><td>Start: </td><td data-bind="text: ICSViewer().DTSTART"></td></tr>
+					<tr><td>End: </td><td data-bind="text: ICSViewer().DTEND"></td></tr>
+					<tr data-bind="visible: ICSViewer().LOCATION"><td>Location: </td><td data-bind="text: ICSViewer().LOCATION"></td></tr>
+<!--				<tr><td>Transparency</td><td data-bind="text: ICSViewer().TRANSP"></td></tr>-->
+					<tr><td>Attendees: </td><td data-bind="foreach: ICSViewer().ATTENDEE"><span data-bind="text: $data.replace(/;/g,';\\n')"></span> </td>
+
+				</tbody></table>
+			</details>`));
+
+			view.ICSViewer = ko.observable(null);
+
+			view.saveICS = () => {
+				let VEVENT = view.VEVENT();
+				if (VEVENT) {
+					if (rl.nextcloud && VEVENT.rawText) {
+						rl.nextcloud.selectCalendar()
+							.then(href => href && rl.nextcloud.calendarPut(href, VEVENT));
+					} else {
+						// TODO
+					}
+				}
+			}
+
+			/**
+			 * TODO
+			 */
+			view.message.subscribe(msg => {
+				view.ICSViewer(null);
+				if (msg) {
+					// JSON-LD after parsing HTML
+					// See http://schema.org/
+					msg.linkedData.subscribe(data => {
+						if (!view.ICSViewer()) {
+							data.forEach(item => {
+								if (item["ical:summary"]) {
+									let VEVENT = {
+										SUMMARY: item["ical:summary"],
+										DTSTART: parseDate(item["ical:dtstart"]),
+//										DTEND: parseDate(item["ical:dtend"]),
+//										TRANSP: item["ical:transp"],
+//										LOCATION: item["ical:location"],
+										ATTENDEE: []
+									}
+									view.ICSViewer(VEVENT);
+									return;
+								}
+							});
+						}
+					});
+					// 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
+						rl.fetch(ics.linkDownload())
+						.then(response => (response.status < 400) ? response.text() : Promise.reject(new Error({ response })))
+						.then(text => {
+							let jcalData = ICAL.parse(text)
+							var comp = new ICAL.Component(jcalData);
+							var vevent = comp.getFirstSubcomponent("vevent");
+							var event = new ICAL.Event(vevent);
+							let VEVENT = {};
+							if (event.organizer && event.organizer.startsWith("mailto:")) {
+								VEVENT.ORGANIZER_TXT = event.organizer.substr(7)
+								VEVENT.ORGANIZER_MAIL = event.organizer
+							} else
+								VEVENT.ORGANIZER_TXT = event.organizer
+							VEVENT.SUMMARY = event.summary;
+							VEVENT.DTSTART = parseDate(vevent.getFirstPropertyValue("dtstart"));
+							VEVENT.DTEND = parseDate(vevent.getFirstPropertyValue("dtend"));
+							VEVENT.LOCATION = event.location;
+							VEVENT.ATTENDEE = []
+							for (let attendee of event.attendees) {
+								VEVENT.ATTENDEE.push(attendee.getFirstParameter("cn"));
+							}
+
+							if (VEVENT) {
+								VEVENT.rawText = text;
+								VEVENT.isCancelled = () => VEVENT.STATUS?.includes('CANCELLED');
+								VEVENT.isConfirmed = () => VEVENT.STATUS?.includes('CONFIRMED');
+								VEVENT.shouldReply = () => VEVENT.METHOD?.includes('REPLY');
+								console.dir({
+									isCancelled: VEVENT.isCancelled(),
+									shouldReply: VEVENT.shouldReply()
+								});
+								view.ICSViewer(VEVENT);
+							}
+						});
+					}
+				}
+			});
+		}
+	});
+
+})(window.rl);
diff --git a/plugins/ics-viewer/style.css b/plugins/ics-viewer/style.css
new file mode 100644
index 000000000..b3a4e5c8c
--- /dev/null
+++ b/plugins/ics-viewer/style.css
@@ -0,0 +1,44 @@
+
+/**
+ * .SML-@type where @type is the value of the JSON-LD "@type":
+ * See http://schema.org/
+ */
+
+.SML-FlightReservation {
+}
+
+	.SML-Airline {
+	}
+
+	.SML-Airport {
+	}
+
+	.SML-Flight {
+	}
+
+.SML-FoodEstablishmentReservation {
+}
+
+	.SML-FoodEstablishment {
+	}
+
+.SML-ParcelDelivery {
+}
+
+	.SML-Order {
+	}
+
+	.SML-Organization {
+	}
+
+	.SML-Product {
+	}
+
+	.SML-PostalAddress {
+	}
+
+.SML-Person {
+}
+
+.SML-PromotionCard {
+}
diff --git a/plugins/view-ics/windowsZones.js b/plugins/ics-viewer/windowsZones.js
similarity index 100%
rename from plugins/view-ics/windowsZones.js
rename to plugins/ics-viewer/windowsZones.js
diff --git a/plugins/ldap-login-mapping/index.php b/plugins/ldap-login-mapping/index.php
index c15347cab..73d8fae9c 100644
--- a/plugins/ldap-login-mapping/index.php
+++ b/plugins/ldap-login-mapping/index.php
@@ -8,10 +8,10 @@ class LDAPLoginMappingPlugin extends AbstractPlugin
 {
 	const
 		NAME     = 'LDAP login mapping',
-		VERSION  = '2.2',
+		VERSION  = '2.3',
 		AUTHOR   = 'RainLoop Team, Ludovic Pouzenc<ludovic@pouzenc.fr>, ZephOne<zephone@protonmail.com>',
-		RELEASE  = '2024-03-12',
-		REQUIRED = '2.35.3',
+		RELEASE  = '2024-09-20',
+		REQUIRED = '2.36.1',
 		CATEGORY = 'Login',
 		DESCRIPTION = 'Enable custom mapping using ldap field';
 	/**
@@ -79,12 +79,13 @@ class LDAPLoginMappingPlugin extends AbstractPlugin
 
 	/**
 	 * @param string $sEmail
-	 * @param string $sLogin
+	 * @param string $sImapUser
 	 * @param string $sPassword
+	 * @param string $sSmtpUser
 	 *
 	 * @throws \RainLoop\Exceptions\ClientException
 	 */
-	public function FilterLoginСredentials(&$sEmail, &$sLogin, &$sPassword)
+	public function FilterLoginСredentials(string &$sEmail, string &$sImapUser, string &$sPassword, string &$sSmtpUser)
 	{
 		$this->oLogger = \RainLoop\Api::Logger();
 
@@ -102,10 +103,10 @@ class LDAPLoginMappingPlugin extends AbstractPlugin
 			$sIP = $_SERVER['REMOTE_ADDR'];
 			$sResult = $this->ldapSearch($sEmail);
 			if ( is_array($sResult) ) {
-				$sLogin = $sResult['login'];
+				$sImapUser = $sResult['login'];
 				$sEmail = $sResult['email'];
 			}
-			syslog(LOG_WARNING, "plugins/ldap-login-mapping/index.php:FilterLoginСredentials() auth try: $sIP/$sEmail, resolved as $sLogin/$sEmail");
+			syslog(LOG_WARNING, "plugins/ldap-login-mapping/index.php:FilterLoginСredentials() auth try: $sIP/$sEmail, resolved as $sImapUser/$sEmail");
 		}
 	}
 
diff --git a/plugins/ldap-mail-accounts/index.php b/plugins/ldap-mail-accounts/index.php
index 68d802503..bc53ad4f4 100644
--- a/plugins/ldap-mail-accounts/index.php
+++ b/plugins/ldap-mail-accounts/index.php
@@ -12,10 +12,10 @@ class LdapMailAccountsPlugin extends AbstractPlugin
 {
 	const
 		NAME     = 'LDAP Mail Accounts',
-		VERSION  = '2.2.0',
+		VERSION  = '2.2.1',
 		AUTHOR   = 'cm-schl',
 		URL      = 'https://github.com/cm-sch',
-		RELEASE  = '2024-05-28',
+		RELEASE  = '2024-09-20',
 		REQUIRED = '2.36.1',
 		CATEGORY = 'Accounts',
 		DESCRIPTION = 'Add additional mail accounts the SnappyMail user has access to by a LDAP query. Basing on the work of FWest98 (https://github.com/FWest98).';
@@ -44,7 +44,7 @@ class LdapMailAccountsPlugin extends AbstractPlugin
 	 * @param string &$sPassword
 	 * @param string &$sSmtpUser
 	 */
-	public function overwriteMainAccountEmail(&$sEmail, &$sImapUser, &$sPassword, &$sSmtpUser)
+	public function overwriteMainAccountEmail(string &$sEmail, string &$sImapUser, string &$sPassword, string &$sSmtpUser)
 	{
 		$this->Manager()->Actions()->Logger()->Write("Login DATA: login: $sImapUser email: $sEmail", \LOG_WARNING, "LDAP MAIL ACCOUNTS PLUGIN");
 
@@ -100,7 +100,7 @@ class LdapMailAccountsPlugin extends AbstractPlugin
 			->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
 			->SetDescription("SnappyMail saves the passwords of the additional accounts by encrypting them using a cryptkey that is saved in the file \".cryptkey\". When the password of the main account changes, SnappyMail asks the user for the old password to reencrypt the keys with the new userpassword.
 				\nOn a password change using ldap (or when the password has been forgotten by the user) this makes problems and asks the user to insert the old password. Therefore activating this option overwrites the .cryptkey file on login in order to always accept the actual ldap password of the user.
-				\nATTENTION: This has side effects on pgp keys because these are also secured by the cryptkey and could therefore not be accessible anymore! 
+				\nATTENTION: This has side effects on pgp keys because these are also secured by the cryptkey and could therefore not be accessible anymore!
 				\nSee https://github.com/the-djmaze/snappymail/issues/1570#issuecomment-2085528061")
 			->SetDefaultValue(false),
 		]);
diff --git a/plugins/login-oauth2/OAuth2/Client.php b/plugins/login-oauth2/OAuth2/Client.php
index 46f34c42f..176240d5b 100644
--- a/plugins/login-oauth2/OAuth2/Client.php
+++ b/plugins/login-oauth2/OAuth2/Client.php
@@ -401,7 +401,7 @@ class Client
      * @param int    $form_content_type HTTP form content type to use
      * @return array
      */
-    private function executeRequest($url, $parameters = array(), $http_method = self::HTTP_METHOD_GET, array $http_headers = null, $form_content_type = self::HTTP_FORM_CONTENT_TYPE_MULTIPART)
+    private function executeRequest($url, $parameters = array(), $http_method = self::HTTP_METHOD_GET, ?array $http_headers = null, $form_content_type = self::HTTP_FORM_CONTENT_TYPE_MULTIPART)
     {
         $curl_options = array(
             CURLOPT_RETURNTRANSFER => true,
diff --git a/plugins/login-override/index.php b/plugins/login-override/index.php
index 26f95d01a..cef399dd9 100644
--- a/plugins/login-override/index.php
+++ b/plugins/login-override/index.php
@@ -4,9 +4,9 @@ class LoginOverridePlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME = 'Login Override',
-		VERSION = '2.3',
-		RELEASE = '2024-03-12',
-		REQUIRED = '2.35.3',
+		VERSION = '2.4',
+		RELEASE = '2024-09-20',
+		REQUIRED = '2.36.1',
 		CATEGORY = 'Filters',
 		DESCRIPTION = 'Override IMAP/SMTP login credentials for specific users.';
 
@@ -17,7 +17,7 @@ class LoginOverridePlugin extends \RainLoop\Plugins\AbstractPlugin
 		$this->addHook('smtp.before-login', 'MapSmtpCredentials');
 	}
 
-	public function MapEmailAddress(string &$sEmail, string &$sLogin, string &$sPassword)
+	public function MapEmailAddress(string &$sEmail, string &$sImapUser, string &$sPassword, string &$sSmtpUser)
 	{
 		$sMapping = \trim($this->Config()->Get('plugin', 'email_mapping', ''));
 		if (!empty($sMapping)) {
diff --git a/plugins/login-remote/index.php b/plugins/login-remote/index.php
index 13452d4f0..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.4',
-		RELEASE  = '2024-03-27',
+		VERSION  = '1.5',
+		RELEASE  = '2024-09-20',
 		REQUIRED = '2.36.1',
 		CATEGORY = 'Login',
 		LICENSE  = 'MIT',
@@ -56,7 +56,7 @@ class LoginRemotePlugin extends \RainLoop\Plugins\AbstractPlugin
 		return true;
 	}
 
-	public function FilterLoginCredentials(&$sEmail, &$sImapUser, &$sPassword, &$sSmtpUser)
+	public function FilterLoginCredentials(string &$sEmail, string &$sImapUser, string &$sPassword, string &$sSmtpUser)
 	{
 		// cPanel https://github.com/the-djmaze/snappymail/issues/697
 //		 && !empty($_ENV['CPANEL'])
diff --git a/plugins/login-virtuser/index.php b/plugins/login-virtuser/index.php
index c2f6b2cfd..88207baec 100644
--- a/plugins/login-virtuser/index.php
+++ b/plugins/login-virtuser/index.php
@@ -6,9 +6,9 @@ class LoginVirtuserPlugin extends \RainLoop\Plugins\AbstractPlugin
 		NAME = 'Virtuser Login',
 		AUTHOR = 'v20z',
 		URL     = 'https://github.com/the-djmaze/snappymail/issues/1691',
-		VERSION = '0.1',
-		RELEASE = '2024-06-01',
-		REQUIRED = '2.5.0',
+		VERSION = '0.2',
+		RELEASE = '2024-09-20',
+		REQUIRED = '2.36.1',
 		CATEGORY = 'Login',
 		DESCRIPTION = 'File based Email-to-User lookup.';
 
@@ -19,12 +19,13 @@ class LoginVirtuserPlugin extends \RainLoop\Plugins\AbstractPlugin
 
 	/**
 	 * @param string $sEmail
-	 * @param string $sLogin
+	 * @param string $sImapUser
 	 * @param string $sPassword
+	 * @param string $sSmtpUser
 	 *
 	 * @throws \RainLoop\Exceptions\ClientException
 	 */
-	public function ParseVirtuserFiles(&$sEmail, &$sLogin, &$sPassword)
+	public function ParseVirtuserFiles(string &$sEmail, string &$sImapUser, string &$sPassword, string &$sSmtpUser)
 	{
 		$sFiles = \trim($this->Config()->Get('plugin', 'virtuser_files', ''));
 		if (!empty($sFiles))
@@ -46,7 +47,7 @@ class LoginVirtuserPlugin extends \RainLoop\Plugins\AbstractPlugin
 					$aData = preg_split( '/[[:blank:]]+/', $sLine, 3, PREG_SPLIT_NO_EMPTY);
 					if (is_array($aData) && !empty($aData[0]) && isset($aData[1])) {
 						if ($sEmail === $aData[0] && 0 < strlen($aData[1])) {
-							$sLogin = $aData[1];
+							$sImapUser = $aData[1];
 							return;
 						}
 					}
diff --git a/plugins/nextcloud/index.php b/plugins/nextcloud/index.php
index 578604345..734d86825 100644
--- a/plugins/nextcloud/index.php
+++ b/plugins/nextcloud/index.php
@@ -4,11 +4,11 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME = 'Nextcloud',
-		VERSION = '2.37.0',
-		RELEASE  = '2024-08-11',
+		VERSION = '2.38.0',
+		RELEASE  = '2024-09-16',
 		CATEGORY = 'Integrations',
 		DESCRIPTION = 'Integrate with Nextcloud v20+',
-		REQUIRED = '2.36.2';
+		REQUIRED = '2.38.0';
 
 	private const IGNORE_SYSTEM_ADDRESSBOOK_KEY = 'ignoreSystemAddressbook';
 	private const IGNORE_SYSTEM_ADDRESSBOOK_DEFAULT_VALUE = true;
@@ -55,6 +55,7 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
 
 			$this->addTemplate('templates/PopupsNextcloudFiles.html');
 			$this->addTemplate('templates/PopupsNextcloudCalendars.html');
+			$this->addTemplate('templates/PopupsNextcloudInvites.html');
 
 //			$this->addHook('login.credentials.step-2', 'loginCredentials2');
 //			$this->addHook('login.credentials', 'loginCredentials');
@@ -163,32 +164,17 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
 
 	public function beforeLogin(\RainLoop\Model\Account $oAccount, \MailSo\Net\NetClient $oClient, \MailSo\Net\ConnectSettings $oSettings) : void
 	{
-		// https://apps.nextcloud.com/apps/oidc_login
-		$config = \OC::$server->getConfig();
-		$oUser = \OC::$server->getUserSession()->getUser();
-		$sUID = $oUser->getUID();
-
-		$sEmail = $config->getUserValue($sUID, 'snappymail', 'snappymail-email');
-		$sPassword = $config->getUserValue($sUID, 'snappymail', 'passphrase')
-			?: $config->getUserValue($sUID, 'snappymail', 'snappymail-password');
-		$bAccountDefinedExplicitly = ($sEmail && $sPassword) && $sEmail === $oSettings->username;
-
-		$sNcEmail = $oUser->getEMailAddress() ?: $oUser->getPrimaryEMailAddress();
-
 		// Only login with OIDC access token if
 		// it is enabled in config, the user is currently logged in with OIDC,
 		// the current snappymail account is the OIDC account and no account defined explicitly
-		if (\OC::$server->getConfig()->getAppValue('snappymail', 'snappymail-autologin-oidc', false)
-		 && \OC::$server->getSession()->get('is_oidc')
-		 && $sNcEmail === $oSettings->username
-		 && !$bAccountDefinedExplicitly
+		if ($oAccount instanceof \RainLoop\Model\MainAccount
+		 && \OCA\SnappyMail\Util\SnappyMailHelper::isOIDCLogin()
 //		 && $oClient->supportsAuthType('OAUTHBEARER') // v2.28
+		 && \str_starts_with($oSettings->passphrase, 'oidc_login|')
 		) {
-			$sAccessToken = \OC::$server->getSession()->get('oidc_access_token');
-			if ($sAccessToken) {
-				$oSettings->passphrase = $sAccessToken;
-				\array_unshift($oSettings->SASLMechanisms, 'OAUTHBEARER');
-			}
+//			$oSettings->passphrase = \OC::$server->getSession()->get('snappymail-passphrase');
+			$oSettings->passphrase = \OC::$server->getSession()->get('oidc_access_token');
+			\array_unshift($oSettings->SASLMechanisms, 'OAUTHBEARER');
 		}
 	}
 
diff --git a/plugins/nextcloud/js/message.js b/plugins/nextcloud/js/message.js
index f5154b745..bab6793a4 100644
--- a/plugins/nextcloud/js/message.js
+++ b/plugins/nextcloud/js/message.js
@@ -21,9 +21,18 @@
 
 				// https://github.com/nextcloud/calendar/issues/4684
 				if (cfg.CalDAV) {
-					attachmentsControls.append(Element.fromHTML(`<span data-bind="visible: nextcloudICS" data-icon="📅">
+					attachmentsControls.append(Element.fromHTML(`<span data-bind="visible: nextcloudICSShow" data-icon="📅">
 						<span class="g-ui-link" data-bind="click: nextcloudSaveICS" data-i18n="NEXTCLOUD/SAVE_ICS"></span>
 					</span>`));
+					attachmentsControls.append(Element.fromHTML(`<span data-bind="visible: nextcloudICSOldInvitation" data-icon="📅">
+						<span data-i18n="NEXTCLOUD/OLD_INVITATION"></span>
+					</span>`))
+					attachmentsControls.append(Element.fromHTML(`<span data-bind="visible: nextcloudICSNewInvitation" data-icon="📅">
+						<span class="g-ui-link" data-bind="click: nextcloudSaveICS" data-i18n="NEXTCLOUD/UPDATE_ON_MY_CALENDAR"></span>
+					</span>`))
+					attachmentsControls.append(Element.fromHTML(`<span data-bind="visible: nextcloudICSLastInvitation" data-icon="📅">
+						<span data-i18n="NEXTCLOUD/LAST_INVITATION"></span>
+					</span>`))
 				}
 			}
 /*
@@ -107,18 +116,169 @@
 			};
 
 			view.nextcloudICS = ko.observable(null);
+			view.nextcloudICSOldInvitation = ko.observable(null);
+			view.nextcloudICSNewInvitation = ko.observable(null);
+			view.nextcloudICSLastInvitation = ko.observable(null);
 
-			view.nextcloudSaveICS = () => {
+			view.nextcloudICSShow = ko.observable(null);
+
+			view.nextcloudICSCalendar = ko.observable(null);
+			view.filteredEventsUrls = ko.observable([]);
+
+			view.nextcloudSaveICS = async () => {
 				let VEVENT = view.nextcloudICS();
-				VEVENT && rl.nextcloud.selectCalendar()
-				.then(href => href && rl.nextcloud.calendarPut(href, VEVENT));
+				VEVENT = await view.handleUpdatedRecurrentEvents(VEVENT)
+				VEVENT && rl.nextcloud.selectCalendar(VEVENT)
 			}
 
+
+			view.handleUpdatedRecurrentEvents = async (VEVENT) => {
+
+				const uid = VEVENT.UID
+
+				let makePUTRequest = false
+
+				const filteredEventUrls = view.filteredEventUrls
+
+				if (filteredEventUrls.length > 1) {
+					// console.warn('filteredEventUrls.length > 1')
+				}
+				else if (filteredEventUrls.length == 1) {
+					const eventUrl = filteredEventUrls[0]
+					const eventText = await fetchEvent(eventUrl)
+
+					// don't do anything for equal cards
+					if (VEVENT.rawText == eventText) {
+						return VEVENT
+					}
+
+					const newVeventsText = extractVEVENTs(VEVENT.rawText)
+					const oldVeventsText = extractVEVENTs(eventText)
+
+					// if there's only one event in the old card, it can't be an edit of the exception card
+					if (oldVeventsText.length == 1) {
+						const newRecurrenceId = extractProperties('RECURRENCE-ID', newVeventsText[0])
+
+						// if there's a property RECURRENCE-ID in the new card, it's an recurrence exception event
+						if (newRecurrenceId.length > 0) {
+							const updatedVEVENT = {
+								'SUMMARY' : VEVENT.SUMMARY,
+								'UID' : VEVENT.UID,
+								'rawText' : mergeEventTexts(eventText, newVeventsText[0])
+							}
+							VEVENT = updatedVEVENT
+							makePUTRequest = true
+						}
+						else {
+							return VEVENT
+						}
+					}
+					// if there's more than one event in the old card, it's possible to be an inclusion of a new exception card
+					// or update of old exception card
+					else {
+						let recurrenceIdMatch = false
+
+						let isUpdate = false
+						const updateData = {
+							'oldEventIndex': null,
+							'newEventIndex': null,
+						}
+
+						// check if it's an update
+						for (let i = 0; i < oldVeventsText.length; i++) {
+							let oldVeventText = oldVeventsText[i]
+
+							for (let j = 0; j < newVeventsText.length; j++) {
+								let newVeventText = newVeventsText[j]
+
+								let oldRecurrenceId = extractProperties('RECURRENCE-ID', oldVeventText)
+								let newRecurrenceId = extractProperties('RECURRENCE-ID', newVeventText)
+								let oldSequence = extractProperties('SEQUENCE', oldVeventText)
+								let newSequence = extractProperties('SEQUENCE', newVeventText)
+
+								if (oldRecurrenceId.length == 0 || newRecurrenceId.length == 0 || oldSequence.length == 0 || newSequence.length == 0) {
+									continue
+								}
+
+								if (oldRecurrenceId[0] == newRecurrenceId[0]) {
+									if (newSequence[0] > oldSequence[0]) {
+										isUpdate = true
+
+										updateData.oldEventIndex = i
+										updateData.newEventIndex = j
+
+										i = oldVeventsText.length
+										j = newVeventsText.length
+									}
+								}
+							}
+						}
+
+						// if it's an update...
+						if (isUpdate) {
+							// substitute old event text for new event text
+							const oldEventStart = eventText.indexOf(oldVeventsText[updateData.oldEventIndex])
+							const oldEventEnd = oldEventStart + oldVeventsText[updateData.oldEventIndex].length
+
+							const newEvent = eventText.substring(0, oldEventStart) + newVeventsText[updateData.newEventIndex] + eventText.substring(oldEventEnd)
+
+							const updatedVEVENT = {
+								'SUMMARY' : VEVENT.SUMMARY,
+								'UID': VEVENT.UID,
+								'rawText' : newEvent
+							}
+							VEVENT = updatedVEVENT
+							makePUTRequest = true
+						}
+						// if it's not an update, it's an inclusion, as there's no match of RECURRENCE-ID
+						else {
+							const updatedVEVENT = {
+											'SUMMARY' : VEVENT.SUMMARY,
+								'UID' : VEVENT.UID,
+								'rawText' : mergeEventTexts(eventText, newVeventsText[0])
+							}
+							VEVENT = updatedVEVENT
+							makePUTRequest = true
+						}
+					}
+				}
+
+				if (makePUTRequest) {
+					let href = "/" + (filteredEventUrls[0].split('/').slice(5, -1)[0])
+
+					rl.nextcloud.calendarPut(href, VEVENT, (response) => {
+						if (response.status != 201 && response.status != 204) {
+							InvitesPopupView.showModal([
+								rl.i18n('NEXTCLOUD/EVENT_UPDATE_FAILURE_TITLE'),
+								rl.i18n('NEXTCLOUD/EVENT_UPDATE_FAILURE_BODY', {eventName: VEVENT.SUMMARY})
+							])
+							return
+						}
+						InvitesPopupView.showModal([
+							rl.i18n('NEXTCLOUD/EVENT_UPDATED_TITLE'),
+							rl.i18n('NEXTCLOUD/EVENT_UPDATED_BODY', {eventName: VEVENT.SUMMARY})
+						])
+					})
+
+					return null
+				}
+
+				return VEVENT
+			}
+
+
+
 			/**
 			 * TODO
 			 */
 			view.message.subscribe(msg => {
 				view.nextcloudICS(null);
+				view.nextcloudICSOldInvitation(null);
+				view.nextcloudICSNewInvitation(null);
+				view.nextcloudICSLastInvitation(null);
+				view.nextcloudICSShow(view.nextcloudICS())
+
+
 				if (msg && cfg.CalDAV) {
 //					let ics = msg.attachments.find(attachment => 'application/ics' == attachment.mimeType);
 					let ics = msg.attachments.find(attachment => 'text/calendar' == attachment.mimeType);
@@ -126,7 +286,7 @@
 						// fetch it and parse the VEVENT
 						rl.fetch(ics.linkDownload())
 						.then(response => (response.status < 400) ? response.text() : Promise.reject(new Error({ response })))
-						.then(text => {
+						.then(async (text) => {
 							let VEVENT,
 								VALARM,
 								multiple = ['ATTACH','ATTENDEE','CATEGORIES','COMMENT','CONTACT','EXDATE',
@@ -177,6 +337,158 @@
 									shouldReply: VEVENT.shouldReply()
 								});
 								view.nextcloudICS(VEVENT);
+								view.nextcloudICSShow(true);
+
+
+								// try to get calendars, save
+								const calendarUrls = await fetchCalendarUrls()
+
+								const filteredEventUrls = []
+								for (let i = 0; i < calendarUrls.length; i++) {
+									let calendarUrl = calendarUrls[i]
+
+									const skipCalendars = ['/inbox/', '/outbox/', '/trashbin/']
+									let skip = false
+									for (let j = 0; j < skipCalendars.length; j++) {
+										if (calendarUrl.includes(skipCalendars[j])) {
+											skip = true
+											break
+										}
+									}
+									if (skip) {
+										continue
+									}
+
+									// try to get event
+									const eventUrls = await fetchEventUrl(calendarUrl, VEVENT.UID)
+
+									if (eventUrls.length == 0) {
+										continue
+									}
+
+									eventUrls.forEach((url) => {
+										filteredEventUrls.push(url)
+									})
+								}
+								view.filteredEventUrls = filteredEventUrls
+
+								// if there's none, save in view.nextcloudICS
+								if (filteredEventUrls.length == 0) {
+									view.nextcloudICS(VEVENT);
+									view.nextcloudICSShow(true)
+								}
+								// if there's some...
+								else {
+									const savedEvent = await fetchEvent(filteredEventUrls[0])
+
+									const newVeventsText = extractVEVENTs(VEVENT.rawText)
+									const oldVeventsText = extractVEVENTs(savedEvent)
+
+									// if there's more than one event in the old card, it's possible to be inclusion of new exception card
+									// or updated of old exception card
+									if (oldVeventsText.length > 1) {
+										let recurrenceIdMatch = false
+
+										let oldNewestCreated = null
+										let newNewestCreated = null
+
+										// check if it's an update
+										for (let i = 0; i < oldVeventsText.length; i++) {
+											let oldVeventText = oldVeventsText[i]
+
+											for (let j = 0; j < newVeventsText.length; j++) {
+												let newVeventText = newVeventsText[j]
+
+												let oldRecurrenceId = extractProperties('RECURRENCE-ID', oldVeventText)
+												let newRecurrenceId = extractProperties('RECURRENCE-ID', newVeventText)
+												let oldSequence = extractProperties('SEQUENCE', oldVeventText)
+												let newSequence = extractProperties('SEQUENCE', newVeventText)
+
+												if (newRecurrenceId.length == 0 && oldRecurrenceId.length == 1) {
+													view.nextcloudICSShow(false)
+													view.nextcloudICSOldInvitation(true)
+												}
+
+												if (oldRecurrenceId.length > 0 && newRecurrenceId.length > 0 && oldSequence.length > 0 && newSequence.length > 0) {
+													if (oldRecurrenceId[0] == newRecurrenceId[0]) {
+														if (newSequence[0] < oldSequence[0]) {
+															view.nextcloudICSOldInvitation(true)
+															view.nextcloudICSShow(false)
+														}
+														else if (newSequence[0] == oldSequence[0]) {
+															view.nextcloudICSLastInvitation(true)
+															view.nextcloudICSShow(false)
+														}
+														else if (newSequence[0] > oldSequence[0]) {
+															view.nextcloudICSNewInvitation(true)
+															view.nextcloudICSShow(false)
+														}
+
+														// exit for loops
+														j = newVeventsText.length
+														i = oldVeventsText.length
+													}
+												}
+
+												let oldCreated = extractProperties('CREATED', oldVeventText)
+												let newCreated = extractProperties('CREATED', newVeventText)
+
+												if (oldCreated.length == 0 || newCreated.length == 0) {
+													continue
+												}
+
+												const formattedOldDate = oldCreated[0].replace(/(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2})Z/, '$1-$2-$3T$4:$5:$6Z');
+												const formattedNewDate = newCreated[0].replace(/(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2})Z/, '$1-$2-$3T$4:$5:$6Z');
+
+												const oldDate = new Date(formattedOldDate)
+												const newDate = new Date(formattedNewDate)
+
+												if (oldNewestCreated == null || oldDate > oldNewestCreated) {
+													oldNewestCreated = oldDate
+												}
+												if (newNewestCreated == null || newDate > newNewestCreated) {
+													newNewestCreated = newDate
+												}
+											}
+										}
+
+										if (newNewestCreated != null && oldNewestCreated != null) {
+											if (newNewestCreated < oldNewestCreated) {
+												view.nextcloudICSOldInvitation(true)
+												view.nextcloudICSShow(false)
+											}
+											else if (newNewestCreated == oldNewestCreated) {
+												view.nextcloudICSLastInvitation(true)
+												view.nextcloudICSShow(false)
+											}
+										}
+									}
+									else {
+										const oldLastModified = extractProperties('LAST-MODIFIED', oldVeventsText[0])
+										const newLastModified = extractProperties('LAST-MODIFIED', newVeventsText[0])
+
+										if (oldLastModified.length == 1 && newLastModified.length == 1) {
+											const formattedOldDate = oldLastModified[0].replace(/(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2})Z/, '$1-$2-$3T$4:$5:$6Z');
+											const formattedNewDate = newLastModified[0].replace(/(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2})Z/, '$1-$2-$3T$4:$5:$6Z');
+
+											const oldDate = new Date(formattedOldDate)
+											const newDate = new Date(formattedNewDate)
+
+											if (newDate > oldDate) {
+												view.nextcloudICSNewInvitation(true)
+												view.nextcloudICSShow(false)
+											}
+											else if (newDate < oldDate) {
+												view.nextcloudICSOldInvitation(true)
+												view.nextcloudICSShow(false)
+											}
+											else {
+												view.nextcloudICSLastInvitation(true)
+												view.nextcloudICSShow(false)
+											}
+										}
+									}
+								}
 							}
 						});
 					}
@@ -186,3 +498,148 @@
 	});
 
 })(window.rl);
+
+
+async function fetchCalendarUrls () {
+	const username = OC.currentUser
+	const requestToken = OC.requestToken
+
+	const url = '/remote.php/dav/calendars/' + username
+	const response = await fetch(url, {
+		'method': 'PROPFIND',
+		'headers': {
+			'Depth': '1',
+			'Content-Type': 'application/xml',
+			'requesttoken' : requestToken
+		}
+	})
+
+	if (!response.ok) {
+		throw new Error('Error fetching calendars', response)
+	}
+
+	const responseText = await response.text()
+
+	const parser = new DOMParser()
+	const xmlDoc = parser.parseFromString(responseText, 'application/xml')
+
+	const calendarUrls = []
+
+	const hrefElements = xmlDoc.getElementsByTagName('d:href')
+	for (let i = 1; i < hrefElements.length; i++) {
+		let calendarUrl = hrefElements[i].textContent.trim()
+		calendarUrls.push(calendarUrl)
+	}
+
+	return calendarUrls
+}
+
+
+async function fetchEventUrl (calendarUrl, uid) {
+	const requestToken = OC.requestToken
+
+	const xmlRequestBody = `<?xml version="1.0" encoding="UTF-8" ?>
+<C:calendar-query xmlns:C="urn:ietf:params:xml:ns:caldav">
+  <C:prop>
+    <C:calendar-data/>
+  </C:prop>
+  <C:filter>
+    <C:comp-filter name="VCALENDAR">
+      <C:comp-filter name="VEVENT">
+        <C:prop-filter name="UID">
+          <C:text-match collation="i;unicode-casemap" match-type="equals">${uid}</C:text-match>
+        </C:prop-filter>
+      </C:comp-filter>
+    </C:comp-filter>
+  </C:filter>
+</C:calendar-query>`
+
+	const response = await fetch(calendarUrl, {
+		'method': 'REPORT',
+		'headers': {
+			'Content-Type': 'application/xml',
+			'Depth': 1,
+			'requesttoken': requestToken
+		},
+		'body': xmlRequestBody
+	})
+
+	const responseText = await response.text()
+
+	const parser = new DOMParser()
+	const xmlDoc = parser.parseFromString(responseText, 'application/xml')
+
+	const hrefElements = xmlDoc.getElementsByTagName('d:href')
+	const hrefValues = Array.from(hrefElements).map(element => element.textContent)
+
+	return hrefValues
+}
+
+
+async function fetchEvent (eventUrl) {
+	const requestToken = OC.requestToken
+	const response = await fetch(eventUrl, {
+		'method': 'GET',
+		'headers': {
+			'requesttoken': requestToken
+		}
+	})
+	const responseText = await response.text()
+
+	return responseText
+}
+
+
+function extractVEVENTs(text) {
+	let lastEndIndex = 0
+	const vEvents = []
+
+	let textToSearch = ""
+	let beginIndex = 0
+	let endIndex = 0
+	let foundVevent = false
+
+	while (true) {
+		textToSearch = text.substring(lastEndIndex)
+
+		beginIndex = textToSearch.indexOf('BEGIN:VEVENT')
+		if (beginIndex == -1) {
+			break
+		}
+		endIndex = textToSearch.substring(beginIndex).indexOf('END:VEVENT')
+		if (endIndex == -1) {
+			break
+		}
+		endIndex += beginIndex
+
+		lastEndIndex = lastEndIndex + endIndex + 'END:VEVENT'.length
+
+		foundVevent = textToSearch.substring(beginIndex + 'BEGIN:VEVENT'.length, endIndex)
+
+		vEvents.push(foundVevent)
+	}
+
+	return vEvents
+}
+
+
+function extractProperties (property, text) {
+	const matches = text.match(`${property}.*`)
+
+	if (matches == null) {
+		return []
+	}
+
+	const separatedMatches = matches.map((match) => {
+		return match.substring(property.length + 1)
+	})
+
+	return separatedMatches
+}
+
+
+function mergeEventTexts (oldEventText, newEventText) {
+	const appendIndex = oldEventText.indexOf('END:VEVENT') + 'END:VEVENT'.length
+	const updatedEventText = oldEventText.substring(0, appendIndex) + "\nBEGIN:VEVENT" + newEventText + "END:VEVENT" + oldEventText.substring(appendIndex)
+	return updatedEventText
+}
diff --git a/plugins/nextcloud/js/webdav.js b/plugins/nextcloud/js/webdav.js
index 24aa1f226..4f2e2cafd 100644
--- a/plugins/nextcloud/js/webdav.js
+++ b/plugins/nextcloud/js/webdav.js
@@ -320,12 +320,28 @@ class NextcloudCalendarsPopupView extends rl.pluginPopupView {
 	}
 
 	onBuild(dom) {
+		let modalObj = this
 		this.tree = dom.querySelector('#sm-nc-calendars');
 		this.tree.addEventListener('click', event => {
 			let el = event.target;
 			if (el.matches('button')) {
 				this.select = el.href;
-				this.close();
+				let VEVENT = this.VEVENT
+
+				rl.nextcloud.calendarPut(this.select, this.VEVENT, (response) => {
+					if (response.status != 201 && response.status != 204) {
+						InvitesPopupView.showModal([
+							rl.i18n('MESSAGE/EVENT_ADDITION_FAILURE_TITLE'),
+							rl.i18n('MESSAGE/EVENT_ADDITION_FAILURE_BODY', {eventName: VEVENT.SUMMARY}),
+							() => {modalObj.close()}
+						])
+					}
+					InvitesPopupView.showModal([
+						rl.i18n('MESSAGE/EVENT_ADDED_TITLE'),
+						rl.i18n('MESSAGE/EVENT_ADDED_BODY', {eventName: VEVENT.SUMMARY}),
+						() => {modalObj.close()}
+					])
+				})
 			}
 		});
 	}
@@ -375,9 +391,10 @@ class NextcloudCalendarsPopupView extends rl.pluginPopupView {
 		treeElement.appendChild(li);
 	}
 	// Happens after showModal()
-	beforeShow(fResolve) {
+	beforeShow(fResolve, VEVENT) {
 		this.select = '';
 		this.fResolve = fResolve;
+		this.VEVENT = VEVENT
 		this.tree.innerHTML = '';
 		davFetch('calendars', '/', {
 			method: 'PROPFIND',
@@ -432,14 +449,15 @@ close() {}
 }
 
 rl.nextcloud = {
-	selectCalendar: () =>
+	selectCalendar: (VEVENT) =>
 		new Promise(resolve => {
 			NextcloudCalendarsPopupView.showModal([
 				href => resolve(href),
+				VEVENT
 			]);
 		}),
 
-	calendarPut: (path, event) => {
+	calendarPut: (path, event, callback) => {
 		davFetch('calendars', path + '/' + event.UID + '.ics', {
 			method: 'PUT',
 			headers: {
@@ -463,6 +481,8 @@ rl.nextcloud = {
 //				response.text().then(text => console.error({status:response.status, body:text}));
 				Promise.reject(new Error({ response }));
 			}
+
+			callback && callback(response)
 		});
 	},
 
@@ -500,3 +520,27 @@ function getElementsInNamespaces(xmlDocument, tagName) {
 	}
 	return results;
 }
+
+
+class InvitesPopupView extends rl.pluginPopupView {
+	constructor() {
+		super('NextcloudInvites')
+	}
+
+	onBuild(dom) {
+		this.title = dom.querySelector('#sm-invites-popup-title')
+		this.body = dom.querySelector('#sm-invites-popup-body')
+	}
+
+	beforeShow(title, body, onHide_) {
+		this.title.innerHTML = title
+		this.body.innerHTML = body
+		this.onHide_ = onHide_
+	}
+
+	onHide() {
+		if (this.onHide_) {
+			this.onHide_()
+		}
+	}
+}
diff --git a/plugins/nextcloud/langs/en.json b/plugins/nextcloud/langs/en.json
index b4fb55a97..845bf98c0 100644
--- a/plugins/nextcloud/langs/en.json
+++ b/plugins/nextcloud/langs/en.json
@@ -2,14 +2,21 @@
 	"NEXTCLOUD": {
 		"SAVE_ATTACHMENTS": "Save in Nextcloud",
 		"SAVE_EML": "Save as .eml in Nextcloud",
-		"SAVE_ICS": "Add to calendar",
 		"SELECT_FOLDER": "Select folder",
 		"SELECT_FILES": "Select file(s)",
 		"ATTACH_FILES": "Attach Nextcloud files",
-		"SELECT_CALENDAR": "Select calendar",
 		"FILE_ATTACH": "attach",
 		"FILE_INTERNAL": "internal",
 		"FILE_PUBLIC": "public",
-		"ADDRESS_BOOK": "Address Book"
+		"ADDRESS_BOOK": "Address Book",
+		"SELECT_CALENDAR": "Select calendar",
+		"SAVE_ICS": "Add to calendar",
+		"OLD_INVITATION": "Old invitation",
+		"UPDATE_ON_MY_CALENDAR": "Update invitation",
+		"LAST_INVITATION": "Last invitation",
+		"EVENT_UPDATE_FAILURE_TITLE": "Update failed",
+		"EVENT_UPDATE_FAILURE_BODY": "Why, i have no clue",
+		"EVENT_UPDATED_TITLE": "Updated",
+		"EVENT_UPDATED_BODY": "Why, i have no clue"
 	}
 }
diff --git a/plugins/nextcloud/templates/PopupsNextcloudInvites.html b/plugins/nextcloud/templates/PopupsNextcloudInvites.html
new file mode 100644
index 000000000..6056fb2ed
--- /dev/null
+++ b/plugins/nextcloud/templates/PopupsNextcloudInvites.html
@@ -0,0 +1,8 @@
+<header>
+	<a class="close" href="#" data-bind="click: close">×</a>
+	<h3 id="sm-invites-popup-title"></h3>
+</header>
+<div class="modal-body form-horizontal" id="sm-invites-popup-body">
+</div>
+<footer>
+</footer>
diff --git a/plugins/proxy-auth/index.php b/plugins/proxy-auth/index.php
index e071af527..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.4',
-		RELEASE  = '2024-05-26',
+		VERSION  = '0.5',
+		RELEASE  = '2024-09-20',
 		REQUIRED = '2.36.1',
 		CATEGORY = 'Login',
 		LICENSE  = 'MIT',
@@ -41,7 +41,7 @@ class ProxyAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 		return ( ( $ip_decimal & $netmask_decimal ) == ( $range_decimal & $netmask_decimal ) );
 	}
 
-	public function MapEmailAddress(string &$sEmail, string &$sLogin, string &$sPassword)
+	public function MapEmailAddress(string &$sEmail, string &$sImapUser, string &$sPassword, string &$sSmtpUser)
 	{
 		$oActions = \RainLoop\Api::Actions();
 		$oLogger = $oActions->Logger();
diff --git a/plugins/view-ics/ical.js b/plugins/view-ics/ical.js
new file mode 100644
index 000000000..9813ebe7c
--- /dev/null
+++ b/plugins/view-ics/ical.js
@@ -0,0 +1,869 @@
+// https://www.rfc-editor.org/rfc/rfc5545
+
+(rl => {
+
+	const
+		paramRegEx = /;([a-zA-Z0-9-]+)=([^";:,]*|"[^"]*")/g,
+		// eslint-disable-next-line max-len
+		dateRegEx = /(?<year>[0-9]{4})(?<month>[0-9]{2})(?<day>[0-9]{2})T(?<hour>[0-9]{2})(?<minute>[0-9]{2})(?<second>[0-9]{2})(?<utc>Z?)/,
+		parseDate = (str, tz) => {
+			let parts = dateRegEx.exec(str)?.groups,
+				options = {dateStyle: 'long', timeStyle: 'short'},
+				date = (parts ? new Date(
+					parseInt(parts.year, 10),
+					parseInt(parts.month, 10) - 1,
+					parseInt(parts.day, 10),
+					parseInt(parts.hour, 10),
+					parseInt(parts.minute, 10),
+					parseInt(parts.second, 10)
+				) : new Date(str));
+			tz && (options.timeZone = windowsVTIMEZONEs[tz] || tz);
+			try {
+				return date.format(options);
+			} catch (e) {
+				console.error(e);
+				if (options.timeZone) {
+					options.timeZone = undefined;
+					return date.format(options);
+				}
+			}
+		};
+
+	class Property extends String
+	{
+		constructor(name, value, params) {
+			super(value);
+			this.name = name;
+//			this.value = value;
+			this.params = {};
+			if (params) {
+				for (const param of params.matchAll(paramRegEx)) {
+					if (param[2]) {
+						this.params[param[1]] = param[2].replace(/^"|"$/);
+					}
+				}
+			}
+		}
+/*
+		includes(...params) {
+			return this.value.includes(...params);
+		}
+		replace(...params) {
+			return this.value.replace(...params);
+		}
+		toString() {
+			return this.value;
+		}
+*/
+		static fromString(data) {
+			// Parse component property 'name *(";" param ) ":" value'
+			const match = data.match(/^([a-zA-Z0-9-]+)((?:;[a-zA-Z0-9-]+=(?:[^";:,]*|"[^"]*"))*):(.+)$/);
+			return match && new Property(match[1], match[3], match[2]);
+		}
+	}
+
+	rl.ICS = {
+
+		parseDate: parseDate,
+
+		parseEvent(text) {
+			let VEVENT,
+				VALARM,
+				multiple = ['ATTACH','ATTENDEE','CATEGORIES','COMMENT','CONTACT','EXDATE',
+					'EXRULE','RSTATUS','RELATED','RESOURCES','RDATE','RRULE'],
+				lines = text.split(/\r?\n/),
+				i = lines.length;
+			while (i--) {
+				let line = lines[i], prop;
+				if (VEVENT) {
+					while (line.startsWith(' ') && i--) {
+						line = lines[i] + line.slice(1);
+					}
+					if (line.startsWith('END:VALARM')) {
+						// Start parsing Alarm Component
+						VALARM = {};
+						continue;
+					} else if (line.startsWith('BEGIN:VALARM')) {
+						// End parsing Alarm Component
+						VEVENT.VALARM || (VEVENT.VALARM = []);
+						VEVENT.VALARM.push(VALARM);
+						VALARM = null;
+						continue;
+					} else if (line.startsWith('BEGIN:VEVENT')) {
+						// End parsing
+						break;
+					}
+					prop = Property.fromString(line);
+					if (prop) {
+						if (VALARM) {
+							VALARM[prop.name] = prop;
+						} else if (multiple.includes(prop.name) || 'X-' == prop.name.slice(0,2)) {
+							VEVENT[prop.name] || (VEVENT[prop.name] = []);
+							VEVENT[prop.name].push(prop);
+						} else {
+							if ('DTSTART' === prop.name || 'DTEND' === prop.name) {
+								prop = parseDate(prop, prop.params.TZID);
+							}
+							VEVENT[prop.name] = prop;
+						}
+					}
+				} else if (line.startsWith('END:VEVENT')) {
+					// Start parsing Event Component
+					VEVENT = {};
+				}
+			}
+//			METHOD:REPLY || METHOD:REQUEST
+			if (VEVENT) {
+				VEVENT.rawText = text;
+				VEVENT.isCancelled = () => VEVENT.STATUS?.includes('CANCELLED');
+				VEVENT.isConfirmed = () => VEVENT.STATUS?.includes('CONFIRMED');
+				VEVENT.shouldReply = () => VEVENT.METHOD?.includes('REPLY');
+				console.dir({
+					VEVENT,
+					isCancelled: VEVENT.isCancelled(),
+					shouldReply: VEVENT.shouldReply()
+				});
+			}
+
+			return VEVENT;
+		}
+	};
+
+	// Microsoft Windows timezones
+	// Subset from https://github.com/unicode-cldr/cldr-core/blob/master/supplemental/windowsZones.json
+	const windowsVTIMEZONEs = {
+		// Windows : [IANA...]
+		"Afghanistan Standard Time": [
+			"Asia/Kabul"
+		],
+		"Alaskan Standard Time": [
+			"America/Anchorage"/*,
+			"America/Juneau",
+			"America/Metlakatla",
+			"America/Nome",
+			"America/Sitka",
+			"America/Yakutat"*/
+		],
+		"Aleutian Standard Time": [
+			"America/Adak"
+		],
+		"Altai Standard Time": [
+			"Asia/Barnaul"
+		],
+		"Arab Standard Time": [
+			"Asia/Aden"/*,
+			"Asia/Bahrain",
+			"Asia/Kuwait",
+			"Asia/Qatar",
+			"Asia/Riyadh"
+		*/],
+		"Arabian Standard Time": [
+			"Asia/Dubai"/*,
+			"Asia/Muscat",
+			"Etc/GMT-4"
+		*/],
+		"Arabic Standard Time": [
+			"Asia/Baghdad"
+		],
+		"Argentina Standard Time": [
+			"America/Argentina/La_Rioja"/*,
+			"America/Argentina/Rio_Gallegos",
+			"America/Argentina/Salta",
+			"America/Argentina/San_Juan",
+			"America/Argentina/San_Luis",
+			"America/Argentina/Tucuman",
+			"America/Argentina/Ushuaia",
+			"America/Buenos_Aires",
+			"America/Catamarca",
+			"America/Cordoba",
+			"America/Jujuy",
+			"America/Mendoza"
+		*/],
+		"Astrakhan Standard Time": [
+			"Europe/Astrakhan"/*,
+			"Europe/Ulyanovsk"
+		*/],
+		"Atlantic Standard Time": [
+			"America/Glace_Bay"/*,
+			"America/Goose_Bay",
+			"America/Halifax",
+			"America/Moncton",
+			"America/Thule",
+			"Atlantic/Bermuda"
+		*/],
+		"AUS Central Standard Time": [
+			"Australia/Darwin"
+		],
+		"Aus Central W. Standard Time": [
+			"Australia/Eucla"
+		],
+		"AUS Eastern Standard Time": [
+			"Australia/Melbourne"/*,
+			"Australia/Sydney"
+		*/],
+		"Azerbaijan Standard Time": [
+			"Asia/Baku"
+		],
+		"Azores Standard Time": [
+			"America/Scoresbysund"/*,
+			"Atlantic/Azores"
+		*/],
+		"Bahia Standard Time": [
+			"America/Bahia"
+		],
+		"Bangladesh Standard Time": [
+			"Asia/Dhaka"/*,
+			"Asia/Thimphu"
+		*/],
+		"Belarus Standard Time": [
+			"Europe/Minsk"
+		],
+		"Bougainville Standard Time": [
+			"Pacific/Bougainville"
+		],
+		"Canada Central Standard Time": [
+			"America/Regina"/*,
+			"America/Swift_Current"
+		*/],
+		"Cape Verde Standard Time": [
+			"Atlantic/Cape_Verde"/*,
+			"Etc/GMT+1"
+		*/],
+		"Caucasus Standard Time": [
+			"Asia/Yerevan"
+		],
+		"Cen. Australia Standard Time": [
+			"Australia/Adelaide"/*,
+			"Australia/Broken_Hill"
+		*/],
+		"Central America Standard Time": [
+			"America/Belize"/*,
+			"America/Costa_Rica",
+			"America/El_Salvador",
+			"America/Guatemala",
+			"America/Managua",
+			"America/Tegucigalpa",
+			"Pacific/Galapagos",
+			"Etc/GMT+6"
+		*/],
+		"Central Asia Standard Time": [
+			"Asia/Almaty"/*,
+			"Asia/Bishkek",
+			"Asia/Qostanay",
+			"Asia/Urumqi",
+			"Indian/Chagos",
+			"Antarctica/Vostok",
+			"Etc/GMT-6"
+		*/],
+		"Central Brazilian Standard Time": [
+			"America/Campo_Grande"/*,
+			"America/Cuiaba"
+		*/],
+		"Central Europe Standard Time": [
+			"Europe/Belgrade"/*,
+			"Europe/Bratislava",
+			"Europe/Budapest",
+			"Europe/Ljubljana",
+			"Europe/Podgorica",
+			"Europe/Prague",
+			"Europe/Tirane"
+		*/],
+		"Central European Standard Time": [
+			"Europe/Sarajevo"/*,
+			"Europe/Skopje",
+			"Europe/Warsaw",
+			"Europe/Zagreb"
+		*/],
+		"Central Pacific Standard Time": [
+			"Pacific/Efate"/*,
+			"Pacific/Guadalcanal",
+			"Pacific/Noumea",
+			"Pacific/Ponape Pacific/Kosrae",
+			"Antarctica/Macquarie",
+			"Etc/GMT-11"
+		*/],
+		"Central Standard Time": [
+			"America/Chicago"/*,
+			"America/Indiana/Knox",
+			"America/Indiana/Tell_City",
+			"America/Matamoros",
+			"America/Menominee",
+			"America/North_Dakota/Beulah",
+			"America/North_Dakota/Center",
+			"America/North_Dakota/New_Salem",
+			"America/Rainy_River",
+			"America/Rankin_Inlet",
+			"America/Resolute",
+			"America/Winnipeg",
+			"CST6CDT"
+		*/],
+		"Central Standard Time (Mexico)": [
+			"America/Bahia_Banderas"/*,
+			"America/Merida",
+			"America/Mexico_City",
+			"America/Monterrey"
+		*/],
+		"Chatham Islands Standard Time": [
+			"Pacific/Chatham"
+		],
+		"China Standard Time": [
+			"Asia/Hong_Kong"/*,
+			"Asia/Macau",
+			"Asia/Shanghai"
+		*/],
+		"Cuba Standard Time": [
+			"America/Havana"
+		],
+		"Dateline Standard Time": [
+			"Etc/GMT+12"
+		],
+		"E. Africa Standard Time": [
+			"Africa/Addis_Ababa"/*,
+			"Africa/Asmera",
+			"Africa/Dar_es_Salaam",
+			"Africa/Djibouti",
+			"Africa/Juba",
+			"Africa/Kampala",
+			"Africa/Mogadishu",
+			"Africa/Nairobi",
+			"Indian/Antananarivo",
+			"Indian/Comoro",
+			"Indian/Mayotte",
+			"Antarctica/Syowa",
+			"Etc/GMT-3"
+		*/],
+		"E. Australia Standard Time": [
+			"Australia/Brisbane"/*,
+			"Australia/Lindeman"
+		*/],
+		"E. Europe Standard Time": [
+			"Europe/Chisinau"
+		],
+		"E. South America Standard Time": [
+			"America/Sao_Paulo"
+		],
+		"Easter Island Standard Time": [
+			"Pacific/Easter"
+		],
+		"Eastern Standard Time": [
+			"America/Detroit"/*,
+			"America/Indiana/Petersburg",
+			"America/Indiana/Vincennes",
+			"America/Indiana/Winamac",
+			"America/Iqaluit",
+			"America/Kentucky/Monticello",
+			"America/Louisville",
+			"America/Montreal",
+			"America/Nassau",
+			"America/New_York",
+			"America/Nipigon",
+			"America/Pangnirtung",
+			"America/Thunder_Bay",
+			"America/Toronto",
+			"EST5EDT"
+		*/],
+		"Eastern Standard Time (Mexico)": [
+			"America/Cancun"
+		],
+		"Egypt Standard Time": [
+			"Africa/Cairo"
+		],
+		"Ekaterinburg Standard Time": [
+			"Asia/Yekaterinburg"
+		],
+		"Fiji Standard Time": [
+			"Pacific/Fiji"
+		],
+		"FLE Standard Time": [
+			"Europe/Helsinki"/*,
+			"Europe/Kiev",
+			"Europe/Mariehamn",
+			"Europe/Riga",
+			"Europe/Sofia",
+			"Europe/Tallinn",
+			"Europe/Uzhgorod",
+			"Europe/Vilnius",
+			"Europe/Zaporozhye"
+		*/],
+		"Georgian Standard Time": [
+			"Asia/Tbilisi"
+		],
+		"GMT Standard Time": [
+			"Atlantic/Canary"/*,
+			"Atlantic/Faeroe",
+			"Atlantic/Madeira",
+			"Europe/Dublin",
+			"Europe/Guernsey",
+			"Europe/Isle_of_Man",
+			"Europe/Jersey",
+			"Europe/Lisbon",
+			"Europe/London"
+		*/],
+		"Greenland Standard Time": [
+			"America/Godthab"
+		],
+		"Greenwich Standard Time": [
+			"Africa/Abidjan"/*,
+			"Africa/Accra",
+			"Africa/Bamako",
+			"Africa/Banjul",
+			"Africa/Bissau",
+			"Africa/Conakry",
+			"Africa/Dakar",
+			"Africa/Freetown",
+			"Africa/Lome",
+			"Africa/Monrovia",
+			"Africa/Nouakchott",
+			"Africa/Ouagadougou",
+			"Atlantic/Reykjavik",
+			"Atlantic/St_Helena"
+		*/],
+		"GTB Standard Time": [
+			"Asia/Nicosia"/*,
+			"Asia/Famagusta",
+			"Europe/Athens",
+			"Europe/Bucharest"
+		*/],
+		"Haiti Standard Time": [
+			"America/Port-au-Prince"
+		],
+		"Hawaiian Standard Time": [
+			"Pacific/Honolulu"/*,
+			"Pacific/Johnston",
+			"Pacific/Rarotonga",
+			"Pacific/Tahiti",
+			"Etc/GMT+10"
+		*/],
+		"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"/*,
+			"Etc/GMT-14"
+		*/],
+		"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"/*,
+			"Indian/Mahe",
+			"Indian/Reunion"
+		*/],
+		"Middle East Standard Time": [
+			"Asia/Beirut"
+		],
+		"Montevideo Standard Time": [
+			"America/Montevideo"
+		],
+		"Morocco Standard Time": [
+			"Africa/Casablanca"/*,
+			"Africa/El_Aaiun"
+		*/],
+		"Mountain Standard Time": [
+			"America/Boise"/*,
+			"America/Cambridge_Bay",
+			"America/Denver",
+			"America/Edmonton",
+			"America/Inuvik",
+			"America/Ojinaga",
+			"America/Yellowknife",
+			"MST7MDT"
+		*/],
+		"Mountain Standard Time (Mexico)": [
+			"America/Chihuahua"/*,
+			"America/Mazatlan"
+		*/],
+		"Myanmar Standard Time": [
+			"Asia/Rangoon"/*,
+			"Indian/Cocos"
+		*/],
+		"N. Central Asia Standard Time": [
+			"Asia/Novosibirsk"
+		],
+		"Namibia Standard Time": [
+			"Africa/Windhoek"
+		],
+		"Nepal Standard Time": [
+			"Asia/Katmandu"
+		],
+		"New Zealand Standard Time": [
+			"Pacific/Auckland"/*,
+			"Antarctica/McMurdo"
+		*/],
+		"Newfoundland Standard Time": [
+			"America/St_Johns"
+		],
+		"Norfolk Standard Time": [
+			"Pacific/Norfolk"
+		],
+		"North Asia East Standard Time": [
+			"Asia/Irkutsk"
+		],
+		"North Asia Standard Time": [
+			"Asia/Krasnoyarsk"/*,
+			"Asia/Novokuznetsk"
+		*/],
+		"North Korea Standard Time": [
+			"Asia/Pyongyang"
+		],
+		"Omsk Standard Time": [
+			"Asia/Omsk"
+		],
+		"Pacific SA Standard Time": [
+			"America/Santiago"
+		],
+		"Pacific Standard Time": [
+			"America/Los_Angeles"/*,
+			"America/Dawson",
+			"America/Vancouver",
+			"America/Whitehorse",
+			"PST8PDT"
+		*/],
+		"Pacific Standard Time (Mexico)": [
+			"America/Tijuana"/*,
+			"America/Santa_Isabel"
+		*/],
+		"Pakistan Standard Time": [
+			"Asia/Karachi"
+		],
+		"Paraguay Standard Time": [
+			"America/Asuncion"
+		],
+		"Qyzylorda Standard Time": [
+			"Asia/Qyzylorda"
+		],
+		"Romance Standard Time": [
+			"Europe/Paris"/*,
+			"Europe/Brussels",
+			"Europe/Copenhagen",
+			"Europe/Madrid",
+			"Africa/Ceuta"
+		*/],
+		"Russia Time Zone 3": [
+			"Europe/Samara"
+		],
+		"Russia Time Zone 10": [
+			"Asia/Srednekolymsk"
+		],
+		"Russia Time Zone 11": [
+			"Asia/Kamchatka"/*,
+			"Asia/Anadyr"
+		*/],
+		"Russian Standard Time": [
+			"Europe/Moscow"/*,
+			"Europe/Kirov",
+			"Europe/Simferopol"
+		*/],
+		"SA Eastern Standard Time": [
+			"America/Belem"/*,
+			"America/Cayenne",
+			"America/Fortaleza",
+			"America/Maceio",
+			"America/Paramaribo",
+			"America/Recife",
+			"America/Santarem",
+			"Atlantic/Stanley",
+			"Antarctica/Palmer",
+			"Antarctica/Rothera",
+			"Etc/GMT+3"
+		*/],
+		"SA Pacific Standard Time": [
+			"America/Bogota"/*,
+			"America/Cayman",
+			"America/Coral_Harbour",
+			"America/Eirunepe",
+			"America/Guayaquil",
+			"America/Jamaica",
+			"America/Lima",
+			"America/Panama",
+			"America/Rio_Branco",
+			"Etc/GMT+5"
+		*/],
+		"SA Western Standard Time": [
+			"America/Anguilla"/*,
+			"America/Antigua",
+			"America/Aruba",
+			"America/Barbados",
+			"America/Blanc-Sablon",
+			"America/Boa_Vista",
+			"America/Curacao",
+			"America/Dominica",
+			"America/Grenada",
+			"America/Guadeloupe",
+			"America/Guyana",
+			"America/Kralendijk",
+			"America/La_Paz",
+			"America/Lower_Princes",
+			"America/Manaus",
+			"America/Marigot",
+			"America/Martinique",
+			"America/Montserrat",
+			"America/Port_of_Spain",
+			"America/Porto_Velho",
+			"America/Puerto_Rico",
+			"America/Santo_Domingo",
+			"America/St_Barthelemy",
+			"America/St_Kitts",
+			"America/St_Lucia",
+			"America/St_Thomas",
+			"America/St_Vincent",
+			"America/Tortola",
+			"Etc/GMT+4"
+		*/],
+		"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"
+		],
+		"SE Asia Standard Time": [
+			"Asia/Bangkok"/*,
+			"Asia/Jakarta",
+			"Asia/Phnom_Penh",
+			"Asia/Pontianak",
+			"Asia/Saigon",
+			"Asia/Vientiane",
+			"Indian/Christmas",
+			"Antarctica/Davis",
+			"Etc/GMT-7"
+		*/],
+		"Singapore Standard Time": [
+			"Asia/Singapore"/*,
+			"Asia/Brunei",
+			"Asia/Kuala_Lumpur",
+			"Asia/Kuching",
+			"Asia/Makassar",
+			"Asia/Manila",
+			"Antarctica/Casey",
+			"Etc/GMT-8"
+		*/],
+		"South Africa Standard Time": [
+			"Africa/Johannesburg"/*,
+			"Africa/Blantyre",
+			"Africa/Bujumbura",
+			"Africa/Gaborone",
+			"Africa/Harare",
+			"Africa/Kigali",
+			"Africa/Lubumbashi",
+			"Africa/Lusaka",
+			"Africa/Maputo",
+			"Africa/Maseru",
+			"Africa/Mbabane",
+			"Etc/GMT-2"
+		*/],
+		"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/Currie"/*,
+			"Australia/Hobart"
+		*/],
+		"Tocantins Standard Time": [
+			"America/Araguaina"
+		],
+		"Tokyo Standard Time": [
+			"Asia/Tokyo"/*,
+			"Asia/Dili",
+			"Asia/Jayapura",
+			"Pacific/Palau",
+			"Etc/GMT-9"
+		*/],
+		"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"
+		],
+		"Ulaanbaatar Standard Time": [
+			"Asia/Ulaanbaatar"/*,
+			"Asia/Choibalsan"
+		*/],
+		"US Eastern Standard Time": [
+			"America/Indianapolis"/*,
+			"America/Indiana/Marengo",
+			"America/Indiana/Vevay"
+		*/],
+		"US Mountain Standard Time": [
+			"America/Phoenix"/*,
+			"America/Creston",
+			"America/Dawson_Creek",
+			"America/Fort_Nelson",
+			"America/Hermosillo",
+			"Etc/GMT+7"
+		*/],
+		"UTC": [
+			"Etc/GMT"/*,
+			"America/Danmarkshavn",
+			"Etc/UTC"
+		*/],
+		"UTC-02": [
+			"Etc/GMT+2"/*,
+			"America/Noronha",
+			"Atlantic/South_Georgia"
+		*/],
+		"UTC-08": [
+			"Etc/GMT+8"/*,
+			"Pacific/Pitcairn"
+		*/],
+		"UTC-09": [
+			"Etc/GMT+9"/*,
+			"Pacific/Gambier"
+		*/],
+		"UTC-11": [
+			"Etc/GMT+11"/*,
+			"Pacific/Midway",
+			"Pacific/Niue",
+			"Pacific/Pago_Pago"
+		*/],
+		"UTC+12": [
+			"Etc/GMT-12"/*,
+			"Pacific/Funafuti",
+			"Pacific/Kwajalein",
+			"Pacific/Majuro",
+			"Pacific/Nauru",
+			"Pacific/Tarawa",
+			"Pacific/Wake",
+			"Pacific/Wallis"
+		*/],
+		"UTC+13": [
+			"Etc/GMT-13"/*,
+			"Pacific/Enderbury",
+			"Pacific/Fakaofo"
+		*/],
+		"Venezuela Standard Time": [
+			"America/Caracas"
+		],
+		"Vladivostok Standard Time": [
+			"Asia/Vladivostok"/*,
+			"Asia/Ust-Nera"
+		*/],
+		"Volgograd Standard Time": [
+			"Europe/Volgograd"
+		],
+		"W. Australia Standard Time": [
+			"Australia/Perth"
+		],
+		"W. Central Africa Standard Time": [
+			"Africa/Algiers"/*,
+			"Africa/Bangui",
+			"Africa/Brazzaville",
+			"Africa/Douala",
+			"Africa/Kinshasa",
+			"Africa/Lagos",
+			"Africa/Libreville",
+			"Africa/Luanda",
+			"Africa/Malabo",
+			"Africa/Ndjamena",
+			"Africa/Niamey",
+			"Africa/Porto-Novo",
+			"Africa/Tunis",
+			"Etc/GMT-1"
+		*/],
+		"W. Europe Standard Time": [
+			"Europe/Amsterdam"/*,
+			"Europe/Andorra",
+			"Europe/Berlin",
+			"Europe/Busingen",
+			"Europe/Gibraltar",
+			"Europe/Luxembourg",
+			"Europe/Malta",
+			"Europe/Monaco",
+			"Europe/Oslo",
+			"Europe/Rome",
+			"Europe/San_Marino",
+			"Europe/Stockholm",
+			"Europe/Vaduz",
+			"Europe/Vatican",
+			"Europe/Vienna",
+			"Europe/Zurich",
+			"Arctic/Longyearbyen"
+		*/],
+		"W. Mongolia Standard Time": [
+			"Asia/Hovd"
+		],
+		"West Asia Standard Time": [
+			"Asia/Aqtau"/*,
+			"Asia/Aqtobe",
+			"Asia/Ashgabat",
+			"Asia/Atyrau",
+			"Asia/Dushanbe",
+			"Asia/Oral",
+			"Asia/Samarkand",
+			"Asia/Tashkent",
+			"Indian/Kerguelen",
+			"Indian/Maldives",
+			"Antarctica/Mawson",
+			"Etc/GMT-5"
+		*/],
+		"West Bank Standard Time": [
+			"Asia/Gaza"/*,
+			"Asia/Hebron"
+		*/],
+		"West Pacific Standard Time": [
+			"Pacific/Guam"/*,
+			"Pacific/Port_Moresby",
+			"Pacific/Saipan",
+			"Pacific/Truk",
+			"Antarctica/DumontDUrville",
+			"Etc/GMT-10"
+		*/],
+		"Yakutsk Standard Time": [
+			"Asia/Khandyga"/*,
+			"Asia/Yakutsk"
+		*/],
+	};
+})(window.rl);
diff --git a/plugins/view-ics/index.php b/plugins/view-ics/index.php
index ca95c0876..f12253bc7 100644
--- a/plugins/view-ics/index.php
+++ b/plugins/view-ics/index.php
@@ -13,7 +13,7 @@ class ViewICSPlugin extends \RainLoop\Plugins\AbstractPlugin
 	public function Init() : void
 	{
 //		$this->UseLangs(true);
+		$this->addJs('ical.js');
 		$this->addJs('message.js');
-		$this->addJs('windowsZones.js');
 	}
 }
diff --git a/plugins/view-ics/message.js b/plugins/view-ics/message.js
index 38153361f..551cccff9 100644
--- a/plugins/view-ics/message.js
+++ b/plugins/view-ics/message.js
@@ -7,30 +7,7 @@
 			const
 				template = document.getElementById(templateId),
 				view = e.detail,
-				attachmentsPlace = template.content.querySelector('.attachmentsPlace'),
-				dateRegEx = /(TZID=(?<tz>[^:]+):)?(?<year>[0-9]{4})(?<month>[0-9]{2})(?<day>[0-9]{2})T(?<hour>[0-9]{2})(?<minute>[0-9]{2})(?<second>[0-9]{2})(?<utc>Z?)/,
-				parseDate = str => {
-					let parts = dateRegEx.exec(str)?.groups,
-						options = {dateStyle: 'long', timeStyle: 'short'},
-						date = (parts ? new Date(
-							parseInt(parts.year, 10),
-							parseInt(parts.month, 10) - 1,
-							parseInt(parts.day, 10),
-							parseInt(parts.hour, 10),
-							parseInt(parts.minute, 10),
-							parseInt(parts.second, 10)
-						) : new Date(str));
-					parts?.tz && (options.timeZone = windowsVTIMEZONEs[parts.tz] || parts.tz);
-					try {
-						return date.format(options);
-					} catch (e) {
-						console.error(e);
-						if (options.timeZone) {
-							options.timeZone = undefined;
-							return date.format(options);
-						}
-					}
-				};
+				attachmentsPlace = template.content.querySelector('.attachmentsPlace');
 
 			attachmentsPlace.after(Element.fromHTML(`
 			<details data-bind="if: viewICS, visible: viewICS">
@@ -74,8 +51,8 @@
 								if (item["ical:summary"]) {
 									let VEVENT = {
 										SUMMARY: item["ical:summary"],
-										DTSTART: parseDate(item["ical:dtstart"]),
-//										DTEND: parseDate(item["ical:dtend"]),
+										DTSTART: rl.ICS.parseDate(item["ical:dtstart"]),
+//										DTEND: rl.ICS.parseDate(item["ical:dtend"]),
 //										TRANSP: item["ical:transp"],
 //										LOCATION: item["ical:location"],
 										ATTENDEE: []
@@ -94,58 +71,8 @@
 						rl.fetch(ics.linkDownload())
 						.then(response => (response.status < 400) ? response.text() : Promise.reject(new Error({ response })))
 						.then(text => {
-							let VEVENT,
-								VALARM,
-								multiple = ['ATTACH','ATTENDEE','CATEGORIES','COMMENT','CONTACT','EXDATE',
-									'EXRULE','RSTATUS','RELATED','RESOURCES','RDATE','RRULE'],
-								lines = text.split(/\r?\n/),
-								i = lines.length;
-							while (i--) {
-								let line = lines[i];
-								if (VEVENT) {
-									while (line.startsWith(' ') && i--) {
-										line = lines[i] + line.slice(1);
-									}
-									if (line.startsWith('END:VALARM')) {
-										VALARM = {};
-										continue;
-									} else if (line.startsWith('BEGIN:VALARM')) {
-										VEVENT.VALARM || (VEVENT.VALARM = []);
-										VEVENT.VALARM.push(VALARM);
-										VALARM = null;
-										continue;
-									} else if (line.startsWith('BEGIN:VEVENT')) {
-										break;
-									}
-									line = line.match(/^([^:;]+)[:;](.+)$/);
-									if (line) {
-										if (VALARM) {
-											VALARM[line[1]] = line[2];
-										} else if (multiple.includes(line[1]) || 'X-' == line[1].slice(0,2)) {
-											VEVENT[line[1]] || (VEVENT[line[1]] = []);
-											VEVENT[line[1]].push(line[2]);
-										} else {
-											if ('DTSTART' === line[1] || 'DTEND' === line[1]) {
-												line[2] = parseDate(line[2]);
-											}
-											VEVENT[line[1]] = line[2];
-										}
-									}
-								} else if (line.startsWith('END:VEVENT')) {
-									VEVENT = {};
-								}
-							}
-//							METHOD:REPLY || METHOD:REQUEST
-//							console.dir({VEVENT:VEVENT});
+							let VEVENT = rl.ICS.parseEvent(text);
 							if (VEVENT) {
-								VEVENT.rawText = text;
-								VEVENT.isCancelled = () => VEVENT.STATUS?.includes('CANCELLED');
-								VEVENT.isConfirmed = () => VEVENT.STATUS?.includes('CONFIRMED');
-								VEVENT.shouldReply = () => VEVENT.METHOD?.includes('REPLY');
-								console.dir({
-									isCancelled: VEVENT.isCancelled(),
-									shouldReply: VEVENT.shouldReply()
-								});
 								view.viewICS(VEVENT);
 							}
 						});
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 634c5a3c7..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
@@ -64,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)
+	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)
+	public function Crop(?int $length = null, int $offset = 0, bool $preserve_keys = false)
 	{
 		$this->exchangeArray(
 			\array_slice($this->getArrayCopy(), $offset, $length, $preserve_keys)
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/Binary.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/Binary.php
index a1101f594..7302e953a 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/Binary.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/Binary.php
@@ -109,7 +109,7 @@ class Binary
 	 * @return resource|bool
 	 */
 	public static function CreateStream($rStream,
-		string $sUtilsDecodeOrEncodeFunctionName = null, string $sFromEncoding = null, string $sToEncoding = null)
+		?string $sUtilsDecodeOrEncodeFunctionName = null, ?string $sFromEncoding = null, ?string $sToEncoding = null)
 	{
 		if (null === $sUtilsDecodeOrEncodeFunctionName || !\strlen($sUtilsDecodeOrEncodeFunctionName)) {
 			$sUtilsDecodeOrEncodeFunctionName = 'InlineNullDecode';
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php
index c8403b0ff..7210e6add 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php
@@ -285,7 +285,7 @@ trait Folders
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function FolderExpunge(SequenceSet $oUidRange = null) : void
+	public function FolderExpunge(?SequenceSet $oUidRange = null) : void
 	{
 		$sCmd = 'EXPUNGE';
 		$aArguments = array();
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Messages.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Messages.php
index 07684ee5d..10003e83a 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Messages.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Messages.php
@@ -163,7 +163,7 @@ trait Messages
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function MessageAppendStream(string $sFolderName, $rMessageStream, int $iStreamSize, array $aFlagsList = null, int $iDateTime = 0) : ?int
+	public function MessageAppendStream(string $sFolderName, $rMessageStream, int $iStreamSize, ?array $aFlagsList = null, int $iDateTime = 0) : ?int
 	{
 		if (!\is_resource($rMessageStream)) {
 			throw new \InvalidArgumentException('$rMessageStream must be a resource');
@@ -225,7 +225,7 @@ trait Messages
 
 	/**
 	 * RFC 3502 MULTIAPPEND
-	public function MessageAppendStreams(string $sFolderName, $rMessageAppendStream, int $iStreamSize, array $aFlagsList = null, int &$iUid = null, int $iDateTime = 0) : ?int
+	public function MessageAppendStreams(string $sFolderName, $rMessageAppendStream, int $iStreamSize, ?array $aFlagsList = null, ?int &$iUid = null, int $iDateTime = 0) : ?int
 	*/
 
 	/**
@@ -311,7 +311,7 @@ trait Messages
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function MessageReplaceStream(string $sFolderName, int $iUid, $rMessageStream, int $iStreamSize, array $aFlagsList = null, int $iDateTime = 0) : ?int
+	public function MessageReplaceStream(string $sFolderName, int $iUid, $rMessageStream, int $iStreamSize, ?array $aFlagsList = null, int $iDateTime = 0) : ?int
 	{
 		if (1 > $iUid || !$this->hasCapability('REPLACE')) {
 			$this->FolderSelect($sFolderName);
@@ -412,7 +412,7 @@ trait Messages
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function MessageESearch(string $sSearchCriterias, array $aSearchReturn = null, bool $bReturnUid = true, string $sLimit = '') : array
+	public function MessageESearch(string $sSearchCriterias, ?array $aSearchReturn = null, bool $bReturnUid = true, string $sLimit = '') : array
 	{
 		$oESearch = new \MailSo\Imap\Requests\ESEARCH($this);
 		$oESearch->sCriterias = $sSearchCriterias ?: 'ALL';
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 4a9b2dd21..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
@@ -36,7 +36,7 @@ class Folder implements \JsonSerializable
 	/**
 	 * @throws \ValueError
 	 */
-	function __construct(string $sFullName, string $sDelimiter = null, array $aAttributes = array())
+	function __construct(string $sFullName, ?string $sDelimiter = null, array $aAttributes = array())
 	{
 		if (!\strlen($sFullName)) {
 			throw new \ValueError;
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 7ed53df14..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
@@ -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;
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 a34dfdf0d..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
@@ -279,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;
@@ -349,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();
@@ -553,11 +553,13 @@ class MailClient
 			$aSortUids = \array_reduce($aAllThreads, 'array_merge', []);
 			$oParams->oSequenceSet = new \MailSo\Imap\SequenceSet($aSortUids);
 			$aSortUids = $this->GetUids($oParams, $oFolderInfo);
-			foreach ($aAllThreads as $aThreadUIDs) {
-				$aThreadUIDs = \array_intersect($aSortUids, $aThreadUIDs);
-				// Remove the most recent UID
-				\array_pop($aThreadUIDs);
-				$aUids = \array_merge($aUids, $aThreadUIDs);
+			if ($aSortUids) {
+				foreach ($aAllThreads as $aThreadUIDs) {
+					$aThreadUIDs = \array_intersect($aSortUids, $aThreadUIDs);
+					// Remove the most recent UID
+					\array_pop($aThreadUIDs);
+					$aUids = \array_merge($aUids, $aThreadUIDs);
+				}
 			}
 */
 		} else {
@@ -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;
@@ -691,7 +693,7 @@ class MailClient
 			}
 		}
 		if ($onlyCache) {
-			return [];
+			return null;
 		}
 
 		$this->oImapClient->FolderExamine($sFolderName);
@@ -749,9 +751,14 @@ class MailClient
 	 */
 	public function MessageList(MessageListParams $oParams) : MessageCollection
 	{
-		if (0 > $oParams->iOffset || 0 > $oParams->iLimit || 999 < $oParams->iLimit) {
+		if (0 > $oParams->iOffset || 0 > $oParams->iLimit) {
 			throw new \ValueError;
 		}
+		if (10 > $oParams->iLimit) {
+			$oParams->iLimit = 10;
+		} else if (999 < $oParams->iLimit) {
+			$oParams->iLimit = 50;
+		}
 
 		$sSearch = \trim($oParams->sSearch);
 
@@ -789,7 +796,7 @@ class MailClient
 
 		$aAllThreads = [];
 		$aUnseenUIDs = [];
-		$aUids = [];
+		$aUids = null;
 
 		$message_list_limit = $this->oImapClient->Settings->message_list_limit;
 		if (100 > $message_list_limit || $message_list_limit > $oInfo->MESSAGES) {
@@ -802,7 +809,7 @@ class MailClient
 		$oAllParams->oSequenceSet = null;
 		if ($message_list_limit && !$oParams->iThreadUid && $oParams->oCacher && $oParams->oCacher->IsInited()) {
 			$aUids = $this->GetUids($oAllParams, $oInfo, true);
-			if ($aUids) {
+			if (null !== $aUids) {
 				$message_list_limit = 0;
 				$oMessageCollection->Sort = $oAllParams->sSort;
 			} else {
@@ -893,10 +900,12 @@ class MailClient
 			}
 		}
 
-		$oMessageCollection->totalEmails = \count($aUids);
-		if ($oMessageCollection->totalEmails) {
-			$aUids = \array_slice($aUids, $oParams->iOffset, $oParams->iLimit);
-			$this->MessageListByRequestIndexOrUids($oMessageCollection, new SequenceSet($aUids), $aAllThreads, $aUnseenUIDs);
+		if (\is_array($aUids)) {
+			$oMessageCollection->totalEmails = \count($aUids);
+			if ($oMessageCollection->totalEmails) {
+				$aUids = \array_slice($aUids, $oParams->iOffset, $oParams->iLimit);
+				$this->MessageListByRequestIndexOrUids($oMessageCollection, new SequenceSet($aUids), $aAllThreads, $aUnseenUIDs);
+			}
 		}
 
 		return $oMessageCollection;
diff --git a/snappymail/v/0.0.0/app/libraries/OAuth2/Client.php b/snappymail/v/0.0.0/app/libraries/OAuth2/Client.php
index c09fa5a4d..5d001130c 100644
--- a/snappymail/v/0.0.0/app/libraries/OAuth2/Client.php
+++ b/snappymail/v/0.0.0/app/libraries/OAuth2/Client.php
@@ -401,7 +401,7 @@ class Client
      * @param int    $form_content_type HTTP form content type to use
      * @return array
      */
-    private function executeRequest($url, $parameters = array(), $http_method = self::HTTP_METHOD_GET, array $http_headers = null, $form_content_type = self::HTTP_FORM_CONTENT_TYPE_MULTIPART)
+    private function executeRequest($url, $parameters = array(), $http_method = self::HTTP_METHOD_GET, ?array $http_headers = null, $form_content_type = self::HTTP_FORM_CONTENT_TYPE_MULTIPART)
     {
         $curl_options = array(
             CURLOPT_RETURNTRANSFER => true,
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 bed876eb2..e1f93e00b 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -595,6 +595,7 @@ class Actions
 						'listGrouped' => $oConfig->Get('defaults', 'mail_list_grouped', false),
 						'MessagesPerPage' => \max(10, \intval($oConfig->Get('webmail', 'messages_per_page', 25)) ?: 25),
 						'messageNewWindow' => false,
+						'markdown' => false,
 						'messageReadAuto' => true, // (bool) $oConfig->Get('webmail', 'message_read_auto', true),
 						'MessageReadDelay' => (int) $oConfig->Get('webmail', 'message_read_delay', 5),
 						'MsgDefaultAction' => (int) $oConfig->Get('defaults', 'msg_default_action', 1),
@@ -690,7 +691,8 @@ class Actions
 					$aResult['listGrouped'] = (bool)$oSettings->GetConf('listGrouped', $aResult['listGrouped']);
 					$aResult['ContactsAutosave'] = (bool)$oSettings->GetConf('ContactsAutosave', $aResult['ContactsAutosave']);
 					$aResult['MessagesPerPage'] = \max(10, \intval($oSettings->GetConf('MessagesPerPage', $aResult['MessagesPerPage']) ?: $aResult['MessagesPerPage']));
-					$aResult['messageNewWindow'] = (int)$oSettings->GetConf('messageNewWindow', $aResult['messageNewWindow']);
+					$aResult['messageNewWindow'] = (bool)$oSettings->GetConf('messageNewWindow', $aResult['messageNewWindow']);
+					$aResult['markdown'] = (bool)$oSettings->GetConf('markdown', $aResult['markdown']);
 					$aResult['messageReadAuto'] = (int)$oSettings->GetConf('messageReadAuto', $aResult['messageReadAuto']);
 					$aResult['MessageReadDelay'] = (int)$oSettings->GetConf('MessageReadDelay', $aResult['MessageReadDelay']);
 					$aResult['MsgDefaultAction'] = (int)$oSettings->GetConf('MsgDefaultAction', $aResult['MsgDefaultAction']);
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/AdminExtensions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/AdminExtensions.php
index c8070b0ac..3caea3168 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/AdminExtensions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/AdminExtensions.php
@@ -69,7 +69,20 @@ trait AdminExtensions
 					'id' => $sId,
 					'name' => $oPlugin->Name(),
 					'readme' => $oPlugin->Description(),
-					'config' => array()
+					'config' => array(),
+
+					'author' => $oPlugin::AUTHOR,
+					'url' => $oPlugin::URL,
+					'version' => $oPlugin::VERSION,
+					'released' => $oPlugin::RELEASE
+/*
+					$oPlugin::NAME
+					$oPlugin::REQUIRED
+					$oPlugin::DEPRECATED
+					$oPlugin::CATEGORY
+					$oPlugin::LICENSE
+					$oPlugin::DESCRIPTION
+*/
 				);
 
 				$aMap = $oPlugin->ConfigMap();
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 6367cd79e..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
@@ -198,6 +198,7 @@ trait User
 		$this->setSettingsFromParams($oSettings, 'MessageReadDelay', 'int');
 		$this->setSettingsFromParams($oSettings, 'MsgDefaultAction', 'int');
 		$this->setSettingsFromParams($oSettings, 'showNextMessage', 'bool');
+		$this->setSettingsFromParams($oSettings, 'markdown', 'bool');
 
 		$this->setSettingsFromParams($oSettings, 'Resizer4Width', 'int');
 		$this->setSettingsFromParams($oSettings, 'Resizer5Width', 'int');
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
index 4074a3d3b..f61af74db 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
@@ -439,7 +439,7 @@ trait UserAuth
 	/**
 	 * @throws \RainLoop\Exceptions\ClientException
 	 */
-	protected function imapConnect(Account $oAccount, bool $bAuthLog = false, \MailSo\Imap\ImapClient $oImapClient = null): void
+	protected function imapConnect(Account $oAccount, bool $bAuthLog = false, ?\MailSo\Imap\ImapClient $oImapClient = null): void
 	{
 		try {
 			if (!$oImapClient) {
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 69c5264ff..f73d0017e 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
@@ -35,7 +35,7 @@ abstract class Api
 		return $oConfig;
 	}
 
-	public static function getCSP(string $sScriptNonce = null) : \SnappyMail\HTTP\CSP
+	public static function getCSP(?string $sScriptNonce = null) : \SnappyMail\HTTP\CSP
 	{
 		$oConfig = static::Config();
 		$CSP = new \SnappyMail\HTTP\CSP(\trim($oConfig->Get('security', 'content_security_policy', '')));
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 0ce4052aa..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
@@ -235,6 +235,7 @@ Warning: only enable when server does not do this, else double compression error
 				'admin_login'             => array('admin', 'Login and password for web admin panel'),
 				'admin_password'          => array(''),
 				'admin_totp'              => array(''),
+				'insecure_cryptkey'       => array(false, 'Use email address instead of login password for encrypting sensitive data (like account passwords)'),
 
 				'force_https'             => array(false),
 				'hide_x_mailer_header'    => array(true),
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 958eb356a..00a0651f9 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
@@ -144,28 +144,34 @@ abstract class Account implements \JsonSerializable
 	{
 		$oAccount = null;
 		$aAccountHash = static::convertArray($aAccountHash);
-		if (!empty($aAccountHash['email']) && !empty($aAccountHash['login']) && !empty($aAccountHash['pass'])) {
-			try {
-				$oDomain = $oActions->DomainProvider()->getByEmailAddress($aAccountHash['email']);
-				if ($oDomain) {
-//					$aAccountHash['email'] = $oDomain->ImapSettings()->fixUsername($aAccountHash['email'], false);
-//					$aAccountHash['login'] = $oDomain->ImapSettings()->fixUsername($aAccountHash['login']);
-					$oAccount = new static;
-					$oAccount->sEmail = \SnappyMail\IDN::emailToAscii($aAccountHash['email']);
-					$oAccount->sImapUser = \SnappyMail\IDN::emailToAscii($aAccountHash['login']);
-					$oAccount->setImapPass(new SensitiveString($aAccountHash['pass']));
-					$oAccount->oDomain = $oDomain;
-					$oActions->Plugins()->RunHook('filter.account', array($oAccount));
-					if ($bThrowExceptionOnFalse && !$oAccount) {
-						throw new ClientException(Notifications::AccountFilterError);
-					}
-				}
-			} catch (\Throwable $e) {
-				if ($bThrowExceptionOnFalse) {
-					throw $e;
-				}
+		try {
+/*
+			if (empty($aAccountHash['email'])) {
+				throw new ClientException(Notifications::InvalidToken, null, 'TokenArray missing email');
 			}
-			if ($oAccount) {
+			if (empty($aAccountHash['login'])) {
+				throw new ClientException(Notifications::InvalidToken, null, 'TokenArray missing login');
+			}
+			if (empty($aAccountHash['pass'])) {
+				throw new ClientException(Notifications::InvalidToken, null, 'TokenArray missing pass');
+			}
+*/
+			if (empty($aAccountHash['email']) || empty($aAccountHash['login']) || empty($aAccountHash['pass'])) {
+				throw new \RuntimeException("Invalid TokenArray");
+			}
+			$oDomain = $oActions->DomainProvider()->getByEmailAddress($aAccountHash['email']);
+			if ($oDomain) {
+//				$aAccountHash['email'] = $oDomain->ImapSettings()->fixUsername($aAccountHash['email'], false);
+//				$aAccountHash['login'] = $oDomain->ImapSettings()->fixUsername($aAccountHash['login']);
+				$oAccount = new static;
+				$oAccount->sEmail = \SnappyMail\IDN::emailToAscii($aAccountHash['email']);
+				$oAccount->sImapUser = \SnappyMail\IDN::emailToAscii($aAccountHash['login']);
+				$oAccount->setImapPass(new SensitiveString($aAccountHash['pass']));
+				$oAccount->oDomain = $oDomain;
+				$oActions->Plugins()->RunHook('filter.account', array($oAccount));
+				if (!$oAccount) {
+					throw new ClientException(Notifications::AccountFilterError);
+				}
 				if (isset($aAccountHash['name'])) {
 					$oAccount->sName = $aAccountHash['name'];
 				}
@@ -177,6 +183,11 @@ abstract class Account implements \JsonSerializable
 					$oAccount->setSmtpPass(new SensitiveString($aAccountHash['smtp']['pass']));
 				}
 			}
+		} catch (\Throwable $e) {
+			\SnappyMail\Log::debug('ACCOUNT', $e->getMessage());
+			if ($bThrowExceptionOnFalse) {
+				throw $e;
+			}
 		}
 		return $oAccount;
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/MainAccount.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/MainAccount.php
index 5a3427bd6..a44ca19fe 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/MainAccount.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/MainAccount.php
@@ -21,7 +21,10 @@ class MainAccount extends Account
 			if (!$sKey) {
 				throw new ClientException(Notifications::CryptKeyError);
 			}
-			$sKey = \SnappyMail\Crypt::EncryptToJSON($sKey, $this->IncPassword());
+			$sPass = \RainLoop\Api::Config()->Get('security', 'insecure_cryptkey', false)
+				? $this->Email()
+				: $this->ImapPass();
+			$sKey = \SnappyMail\Crypt::EncryptToJSON($sKey, $sPass);
 			if ($sKey) {
 				$this->sCryptKey = null;
 				if (\RainLoop\Api::Actions()->StorageProvider()->Put($this, StorageType::ROOT, '.cryptkey', $sKey)) {
@@ -39,14 +42,17 @@ class MainAccount extends Account
 			// can use the old password to re-seal the cryptkey
 			$oStorage = \RainLoop\Api::Actions()->StorageProvider();
 			$sKey = $oStorage->Get($this, StorageType::ROOT, '.cryptkey');
+			$sPass = \RainLoop\Api::Config()->Get('security', 'insecure_cryptkey', false)
+				? $this->Email()
+				: $this->ImapPass();
 			if (!$sKey) {
 				$sKey = \SnappyMail\Crypt::EncryptToJSON(
-					\sha1($this->IncPassword() . APP_SALT),
-					$this->IncPassword()
+					\sha1($this->ImapPass() . APP_SALT),
+					$sPass
 				);
 				$oStorage->Put($this, StorageType::ROOT, '.cryptkey', $sKey);
 			}
-			$sKey = \SnappyMail\Crypt::DecryptFromJSON($sKey, $this->IncPassword());
+			$sKey = \SnappyMail\Crypt::DecryptFromJSON($sKey, $sPass);
 			if (!$sKey) {
 				throw new ClientException(Notifications::CryptKeyError);
 			}
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 6b43a65e9..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
@@ -11,6 +11,7 @@ abstract class AbstractPlugin
 		VERSION  = '0.0',
 		RELEASE  = '2020-11-01',
 		REQUIRED = '2.0.0',
+//		DEPRECATED = '',
 		CATEGORY = 'General',
 		LICENSE  = 'AGPL v3',
 		DESCRIPTION = '';
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 c16379b1a..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
@@ -300,6 +300,30 @@ class Manager
 		return $this;
 	}
 
+/*
+	private static function getCallableName(callable $callable) {
+		if (\is_string($callable)) {
+			if (\str_contains($callable, '::')) {
+				return '[static] ' . $callable;
+			}
+			return '[function] ' . $callable;
+		}
+		if (\is_array($callable)) {
+			if (\is_object($callable[0])) {
+				return '[method] ' . \get_class($callable[0])  . '->' . $callable[1];
+			}
+			return '[static] ' . $callable[0]  . '::' . $callable[1];
+		}
+		if ($callable instanceof \Closure) {
+			return '[closure]';
+		}
+		if (\is_object($callable)) {
+			return '[invokable] ' . \get_class($callable);
+		}
+		return '[unknown]';
+	}
+*/
+
 	public function RunHook(string $sHookName, array $aArg = array(), bool $bLogHook = true) : self
 	{
 		if ($this->bIsEnabled) {
@@ -307,9 +331,13 @@ class Manager
 			if (isset($this->aHooks[$sHookName])) {
 				if ($bLogHook) {
 					$this->WriteLog('Hook: '.$sHookName, \LOG_INFO);
+//					$this->WriteLog('Hooks: '.\implode(',', \array_map('self::getCallableName', $this->aHooks[$sHookName])), \LOG_DEBUG);
 				}
-				foreach ($this->aHooks[$sHookName] as $mCallback) {
+				foreach ($this->aHooks[$sHookName] as $mCallback) try {
 					$mCallback(...$aArg);
+				} catch (\Throwable $e) {
+//					$this->WriteLog("Hook {$sHookName} {$e->getMessage()}\n".static::getCallableName($mCallback), \LOG_ERR);
+					throw $e;
 				}
 			}
 		}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain.php
index 6e2377238..c465c19cb 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain.php
@@ -2,6 +2,8 @@
 
 namespace RainLoop\Providers;
 
+use RainLoop\Exceptions\ClientException;
+
 class Domain extends AbstractProvider
 {
 	/**
@@ -35,7 +37,7 @@ class Domain extends AbstractProvider
 	public function SaveAlias(string $sName, string $sAlias) : bool
 	{
 		if ($this->Load($sName, false, false)) {
-			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::DomainAlreadyExists);
+			throw new ClientException(\RainLoop\Notifications::DomainAlreadyExists);
 		}
 		return $this->oDriver->SaveAlias($sName, $sAlias);
 	}
@@ -55,7 +57,7 @@ class Domain extends AbstractProvider
 		return $this->oDriver->GetList($bIncludeAliases);
 	}
 
-	public function LoadOrCreateNewFromAction(\RainLoop\Actions $oActions, string $sNameForTest = null) : ?\RainLoop\Model\Domain
+	public function LoadOrCreateNewFromAction(\RainLoop\Actions $oActions, ?string $sNameForTest = null) : ?\RainLoop\Model\Domain
 	{
 		$sName = \mb_strtolower((string) $oActions->GetActionParam('name', ''));
 		if (\strlen($sName) && $sNameForTest && !\str_contains($sName, '*')) {
@@ -63,7 +65,7 @@ class Domain extends AbstractProvider
 		}
 		if (\strlen($sName) || $sNameForTest) {
 			if (!$sNameForTest && !empty($oActions->GetActionParam('create', 0)) && $this->Load($sName)) {
-				throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::DomainAlreadyExists);
+				throw new ClientException(\RainLoop\Notifications::DomainAlreadyExists);
 			}
 			return \RainLoop\Model\Domain::fromArray($sNameForTest ?: $sName, [
 				'IMAP' => $oActions->GetActionParam('IMAP'),
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
index e46e2541c..52104cf80 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
@@ -251,7 +251,7 @@ abstract class Service
 		return true;
 	}
 
-	private static function setCSP(string $sScriptNonce = null) : void
+	private static function setCSP(?string $sScriptNonce = null) : void
 	{
 		Api::getCSP($sScriptNonce)->setHeaders();
 	}
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 8510bb3bd..9b0ee7e23 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
@@ -100,14 +100,14 @@ class ServiceActions
 					if ($_SERVER['HTTP_X_SM_TOKEN'] !== $token) {
 						$oAccount = $this->oActions->getAccountFromToken(false);
 						$sEmail = $oAccount ? $oAccount->Email() : 'guest';
-						$this->oActions->logWrite("{$_SERVER['HTTP_X_SM_TOKEN']} !== {$token} for {$sEmail}", \LOG_ERROR, 'Token');
+						$this->oActions->logWrite("{$_SERVER['HTTP_X_SM_TOKEN']} !== {$token} for {$sEmail}", \LOG_ERR, 'Token');
 						throw new Exceptions\ClientException(Notifications::InvalidToken, null, 'HTTP Token mismatch');
 					}
 				} else if ($this->oHttp->IsPost()) {
 					if (empty($_POST['XToken']) || $_POST['XToken'] !== $token) {
 						$oAccount = $this->oActions->getAccountFromToken(false);
 						$sEmail = $oAccount ? $oAccount->Email() : 'guest';
-						$this->oActions->logWrite("{$_POST['XToken']} !== {$token} for {$sEmail}", \LOG_ERROR, 'XToken');
+						$this->oActions->logWrite("{$_POST['XToken']} !== {$token} for {$sEmail}", \LOG_ERR, 'XToken');
 						throw new Exceptions\ClientException(Notifications::InvalidToken, null, 'XToken mismatch');
 					}
 				}
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 a2542efb5..c72d127f0 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
@@ -102,7 +102,7 @@ class Utils
 	public static function ClearHtmlOutput(string $sHtml) : string
 	{
 //		return $sHtml;
-		return \preg_replace('/>\\s+</', '><', \preg_replace(
+		return \preg_replace('/>\\s+</', '> <', \preg_replace(
 			['@\\s*/>@', '/\\s*&nbsp;/i', '/&nbsp;\\s*/i', '/[\\r\\n\\t]+/'],
 			['>', "\xC2\xA0", "\xC2\xA0", ' '],
 			\trim($sHtml)
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 4c7706498..77ea6f29a 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php
@@ -60,7 +60,7 @@ abstract class Crypt
 
 	public static function Decrypt(array $data,
 		#[\SensitiveParameter]
-		string $key = null
+		?string $key = null
 	) /* : mixed */
 	{
 		if (3 === \count($data) && isset($data[0], $data[1], $data[2]) && \strlen($data[0])) {
@@ -85,7 +85,7 @@ abstract class Crypt
 
 	public static function DecryptFromJSON(string $data,
 		#[\SensitiveParameter]
-		string $key = null
+		?string $key = null
 	) /* : mixed */
 	{
 		$data = static::jsonDecode($data);
@@ -98,7 +98,7 @@ abstract class Crypt
 
 	public static function DecryptUrlSafe(string $data,
 		#[\SensitiveParameter]
-		string $key = null
+		?string $key = null
 	) /* : mixed */
 	{
 		$data = \explode('.', $data);
@@ -113,7 +113,7 @@ abstract class Crypt
 		#[\SensitiveParameter]
 		$data,
 		#[\SensitiveParameter]
-		string $key = null
+		?string $key = null
 	) : array
 	{
 		$data = \json_encode($data);
@@ -151,7 +151,7 @@ abstract class Crypt
 		#[\SensitiveParameter]
 		$data,
 		#[\SensitiveParameter]
-		string $key = null
+		?string $key = null
 	) : string
 	{
 		return \json_encode(\array_map('base64_encode', static::Encrypt($data, $key)));
@@ -161,7 +161,7 @@ abstract class Crypt
 		#[\SensitiveParameter]
 		$data,
 		#[\SensitiveParameter]
-		string $key = null
+		?string $key = null
 	) : string
 	{
 		return \implode('.', \array_map('MailSo\\Base\\Utils::UrlSafeBase64Encode', static::Encrypt($data, $key)));
@@ -169,7 +169,7 @@ abstract class Crypt
 
 	public static function SodiumDecrypt(string $data, string $nonce,
 		#[\SensitiveParameter]
-		string $key = null
+		?string $key = null
 	) /* : string|false */
 	{
 		if (!\is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_decrypt')) {
@@ -188,7 +188,7 @@ abstract class Crypt
 		string $data,
 		string $nonce,
 		#[\SensitiveParameter]
-		string $key = null
+		?string $key = null
 	) : string
 	{
 		if (!\is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_encrypt')) {
@@ -208,7 +208,7 @@ abstract class Crypt
 
 	public static function OpenSSLDecrypt(string $data, string $iv,
 		#[\SensitiveParameter]
-		string $key = null
+		?string $key = null
 	) /* : string|false */
 	{
 		if (!$data || !$iv) {
@@ -235,7 +235,7 @@ abstract class Crypt
 		string $data,
 		string $iv,
 		#[\SensitiveParameter]
-		string $key = null
+		?string $key = null
 	) : string
 	{
 		if (!$data || !$iv) {
@@ -263,7 +263,7 @@ abstract class Crypt
 
 	public static function XxteaDecrypt(string $data, string $salt,
 		#[\SensitiveParameter]
-		string $key = null
+		?string $key = null
 	) /* : mixed */
 	{
 		if (!$data || !$salt) {
@@ -280,7 +280,7 @@ abstract class Crypt
 		string $data,
 		string $salt,
 		#[\SensitiveParameter]
-		string $key = null
+		?string $key = null
 	) : string
 	{
 		if (!$data || !$salt) {
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/dav/client.php b/snappymail/v/0.0.0/app/libraries/snappymail/dav/client.php
index 98eaa4c8b..8bc717c15 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/dav/client.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/dav/client.php
@@ -63,7 +63,7 @@ class Client
 	 *
 	 * If the specified url is relative, it will be expanded based on the base url.
 	 */
-	public function request(string $method, string $url = '', string $body = null, array $headers = array()) : \SnappyMail\HTTP\Response
+	public function request(string $method, string $url = '', ?string $body = null, array $headers = array()) : \SnappyMail\HTTP\Response
 	{
 		if (!\preg_match('@^(https?:)?//@', $url)) {
 			// If the url starts with a slash, we must calculate the url based off
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/http/exception.php b/snappymail/v/0.0.0/app/libraries/snappymail/http/exception.php
index 9778e2028..ceed8b772 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/http/exception.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/http/exception.php
@@ -66,7 +66,7 @@ class Exception extends \Exception
 		511 => 'Network Authentication Required',
 	);
 
-	function __construct(string $message = "", int $code = 0, Response $response = null)
+	function __construct(string $message = "", int $code = 0, ?Response $response = null)
 	{
 		if ($response) {
 			if (\in_array($code, array(301, 302, 303, 307))) {
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 126af9564..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, $body = null)
+	function __construct(string $request_uri, int $status = 0, ?array $headers = null, $body = null)
 	{
 		if ($headers) {
 			$name = null;
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/image/exif.php b/snappymail/v/0.0.0/app/libraries/snappymail/image/exif.php
index dc08aabd3..d587ba4ff 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/image/exif.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/image/exif.php
@@ -16,7 +16,7 @@ class Exif
 		ORIENTATION_RIGHTBOTTOM = 7,
 		ORIENTATION_LEFTBOTTOM  = 8;
 */
-	public static function getImageOrientation(string &$data, array $image_info = null) : int
+	public static function getImageOrientation(string &$data, ?array $image_info = null) : int
 	{
 		$image_info = empty($image_info['mime']) ? \getimagesizefromstring($data) : $image_info;
 		if (!empty($image_info['mime']) && \IMG_JPG == $image_info[2] && \is_callable('exif_read_data')) {
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 3983709dc..e919455d2 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/jwt.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/jwt.php
@@ -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, $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();
 
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/oauthbearer.php b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/oauthbearer.php
index 8f71485e6..8f2bd297f 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/oauthbearer.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/oauthbearer.php
@@ -14,6 +14,8 @@ class OAuthBearer extends \SnappyMail\SASL
 		?string $authzid = null
 	) : string
 	{
+		// add host and port?
+		//return $this->encode("n,a={$username},\x01host={$host}\x01port={$port}\x01auth=Bearer {$accessToken}\x01\x01");
 		return $this->encode("n,a={$username},\x01auth=Bearer {$accessToken}\x01\x01");
 	}
 
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 7e59e6c95..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
@@ -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);
@@ -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, '\\', '/'), '/') . '/',
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/stream/zip.php b/snappymail/v/0.0.0/app/libraries/snappymail/stream/zip.php
index 77ac66381..135e4fdbc 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/stream/zip.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/stream/zip.php
@@ -102,7 +102,7 @@ class ZIP
 		}
 	}
 
-	public function addFile($file, string $name = null) : bool
+	public function addFile($file, ?string $name = null) : bool
 	{
 		if (\is_file($file) && $fp = new \SplFileObject($file, 'rb')) {
 			return $this->addFromStream($fp, $name ?: \basename($file));
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 e6ecc4ad6..676857698 100644
--- a/snappymail/v/0.0.0/app/localization/ar/user.json
+++ b/snappymail/v/0.0.0/app/localization/ar/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "إزالة البحث",
 		"CONTACT_VIEW_DESC": "حدد جهة إتصال من القائمة لكي يتم عرضها هنا",
 		"LABEL_BIRTHDAY": "تاريخ الميلاد",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "ادخل الاسم المعروض",
-		"PLACEHOLDER_ENTER_LAST_NAME": "ادخل اسم العائلة",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "ادخل الاسم",
-		"PLACEHOLDER_ENTER_NICK_NAME": "ادخل اللقب",
+		"DISPLAY_NAME": "ادخل الاسم المعروض",
+		"LAST_NAME": "ادخل اسم العائلة",
+		"FIRST_NAME": "ادخل الاسم",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "ادخل اللقب",
 		"LABEL_READ_ONLY": "قراءة فقط",
 		"ADD_MENU_LABEL": "اضافة",
 		"ADD_MENU_NICKNAME": "اللقب",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "قم باضافة المستلمين تلقائيا الى دفتر العناوين",
diff --git a/snappymail/v/0.0.0/app/localization/be/admin.json b/snappymail/v/0.0.0/app/localization/be/admin.json
index 589e19399..d27d7b708 100644
--- a/snappymail/v/0.0.0/app/localization/be/admin.json
+++ b/snappymail/v/0.0.0/app/localization/be/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "Імя карыстальніка",
 		"PASSWORD": "Пароль",
 		"CANCEL": "Адмяніць",
-		"SEARCH": "Пошук"
+		"SEARCH": "Пошук",
+		"YES": "Так",
+		"NO": "Не"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Логін",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Без налад"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Так",
-		"BUTTON_NO": "Не",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Вы ўпэнены, што жадаеце закрыць гэтае вакно?"
 	},
 	"POPUPS_LANGUAGES": {
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 7ad8e2544..6e2fa9f5d 100644
--- a/snappymail/v/0.0.0/app/localization/be/user.json
+++ b/snappymail/v/0.0.0/app/localization/be/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Ачысціць пошук",
 		"CONTACT_VIEW_DESC": "Абярыце кантакт для прагляду.",
 		"LABEL_BIRTHDAY": "Дзень нараджэння",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Увядзіце поўнае імя",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Увядзіце імя",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Увядзіце прозвішча",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Увядзіце мянушку",
+		"DISPLAY_NAME": "Поўнае імя",
+		"LAST_NAME": "Імя",
+		"FIRST_NAME": "Прозвішча",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Мянушку",
 		"LABEL_READ_ONLY": "Толькі чытанне",
 		"ADD_MENU_LABEL": "Дадаць",
 		"ADD_MENU_NICKNAME": "Мянушка",
@@ -499,7 +502,8 @@
 		"IMAGES_OPTION_ALWAYS": "Показваць заўсёды",
 		"IMAGES_WHITELIST": "Фарматы з белага спісу",
 		"MESSAGE_POPUP_WINDOW": "Усплываючае вакно ў новым вакне замест карткі",
-		"MAILTO": "Register as 'mailto:' links handler"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Аўтаматычна дадаваць атрымальнікаў лістоў у адрасную кнігу",
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 55c1035e6..dbecf23d7 100644
--- a/snappymail/v/0.0.0/app/localization/bg/user.json
+++ b/snappymail/v/0.0.0/app/localization/bg/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Изчистване на търсенето",
 		"CONTACT_VIEW_DESC": "Изберете контакт от списъка, за да го видите тук.",
 		"LABEL_BIRTHDAY": "Рожден ден",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Въвеждете името, което ще се показва",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Въведете фамилия",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Въведете име",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Въведете прякор",
+		"DISPLAY_NAME": "Въвеждете името, което ще се показва",
+		"LAST_NAME": "Фамилия",
+		"FIRST_NAME": "Име",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Прякор",
 		"LABEL_READ_ONLY": "Само за четене",
 		"ADD_MENU_LABEL": "Добави",
 		"ADD_MENU_NICKNAME": "Прякор",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Автоматично добавяне на получателите към адресната ви книга",
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 984339417..bbaa149ee 100644
--- a/snappymail/v/0.0.0/app/localization/cs/admin.json
+++ b/snappymail/v/0.0.0/app/localization/cs/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "Uživatelské jméno",
 		"PASSWORD": "Heslo",
 		"CANCEL": "Zrušit",
-		"SEARCH": "Nebyly nalezeny žádné kontakty"
+		"SEARCH": "Nebyly nalezeny žádné kontakty",
+		"YES": "Yes",
+		"NO": "No"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Není zde nic ke konfiguraci"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Jste si jistí, že opravdu chcete zavřít toto okno?"
 	},
 	"POPUPS_LANGUAGES": {
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 faac7fc0c..724217cc7 100644
--- a/snappymail/v/0.0.0/app/localization/cs/user.json
+++ b/snappymail/v/0.0.0/app/localization/cs/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Smazat vyhledávání",
 		"CONTACT_VIEW_DESC": "Vyberte kontakt ze seznamu pro zobrazení zde.",
 		"LABEL_BIRTHDAY": "Narozeniny",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Zadejte zobrazované jméno",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Zadejte příjmení",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Zadejte jméno",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Zadejte přezdívku",
+		"DISPLAY_NAME": "Zobrazované jméno",
+		"LAST_NAME": "Příjmení",
+		"FIRST_NAME": "Jméno",
+		"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",
 		"ADD_MENU_NICKNAME": "Přezdívka",
@@ -499,7 +502,8 @@
 		"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"
+		"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",
diff --git a/snappymail/v/0.0.0/app/localization/da/admin.json b/snappymail/v/0.0.0/app/localization/da/admin.json
index 78cd70786..5c040e5c0 100644
--- a/snappymail/v/0.0.0/app/localization/da/admin.json
+++ b/snappymail/v/0.0.0/app/localization/da/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "Brugernavn",
 		"PASSWORD": "Adgangskode",
 		"CANCEL": "Annuller",
-		"SEARCH": "Ingen kontakter fundet"
+		"SEARCH": "Ingen kontakter fundet",
+		"YES": "Yes",
+		"NO": "No"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Log ind",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Intet at opsætte"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Vil du lukke vinduet?"
 	},
 	"POPUPS_LANGUAGES": {
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 03ffa43e2..bc246b57b 100644
--- a/snappymail/v/0.0.0/app/localization/da/user.json
+++ b/snappymail/v/0.0.0/app/localization/da/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Fjern søgning",
 		"CONTACT_VIEW_DESC": "Vælg kontakt i oversigten for visning.",
 		"LABEL_BIRTHDAY": "Fødselsdag",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Indtast kaldenavn",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Indtast efternavn",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Indtast fornavn(e)",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Indtast kaldenavn",
+		"DISPLAY_NAME": "Kaldenavn",
+		"LAST_NAME": "Efternavn",
+		"FIRST_NAME": "Fornavn(e)",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Kaldenavn",
 		"LABEL_READ_ONLY": "Skrivebeskyttet",
 		"ADD_MENU_LABEL": "Tilføj",
 		"ADD_MENU_NICKNAME": "Kaldenavn",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Tilføj automatisk modtager til adressebog",
diff --git a/snappymail/v/0.0.0/app/localization/de/admin.json b/snappymail/v/0.0.0/app/localization/de/admin.json
index c500a59ed..e7377d9ac 100644
--- a/snappymail/v/0.0.0/app/localization/de/admin.json
+++ b/snappymail/v/0.0.0/app/localization/de/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "Nutzername",
 		"PASSWORD": "Passwort",
 		"CANCEL": "Abbrechen",
-		"SEARCH": "Suchen"
+		"SEARCH": "Suchen",
+		"YES": "Ja",
+		"NO": "Nein"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Benutzer",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Nichts zu konfigurieren"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Ja",
-		"BUTTON_NO": "Nein",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Sind Sie sicher, dass Sie dieses Fenster schließen möchten?"
 	},
 	"POPUPS_LANGUAGES": {
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 952536106..3869a6065 100644
--- a/snappymail/v/0.0.0/app/localization/de/user.json
+++ b/snappymail/v/0.0.0/app/localization/de/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Suche leeren",
 		"CONTACT_VIEW_DESC": "Kontakt aus der Liste wählen, um ihn anzuzeigen.",
 		"LABEL_BIRTHDAY": "Geburtstag",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Anzeigename eingeben",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Nachnamen eingeben",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Vornamen eingeben",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Spitzname eingeben",
+		"DISPLAY_NAME": "Anzeigename",
+		"LAST_NAME": "Nachnamen",
+		"FIRST_NAME": "Vornamen",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Spitzname",
 		"LABEL_READ_ONLY": "Schreibgeschützt",
 		"ADD_MENU_LABEL": "Hinzufügen",
 		"ADD_MENU_NICKNAME": "Spitzname",
@@ -499,7 +502,8 @@
 		"IMAGES_OPTION_ALWAYS": "Immer anzeigen",
 		"IMAGES_WHITELIST": "Ausnahmeliste für Bilder",
 		"MESSAGE_POPUP_WINDOW": "In neuem Fenster statt Tab anzeigen",
-		"MAILTO": "Register as 'mailto:' links handler"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Empfänger automatisch zu Ihrem Adressbuch hinzuzufügen",
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 02bdecfe3..0223b0029 100644
--- a/snappymail/v/0.0.0/app/localization/el/user.json
+++ b/snappymail/v/0.0.0/app/localization/el/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Καθαρισμός αναζήτησης",
 		"CONTACT_VIEW_DESC": "Επιλέξτε μια επαφή από τη λίστα για να εμφανιστεί εδώ.",
 		"LABEL_BIRTHDAY": "Γενέθλια",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Εισαγωγή ονόματος εμφάνισης",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Εισαγωγή επωνύμου",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Εισαγωγή ονόματος",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Εισαγωγή πρόσθετου ονόματος",
+		"DISPLAY_NAME": "Ονόματος εμφάνισης",
+		"LAST_NAME": "Επωνύμου",
+		"FIRST_NAME": "Ονόματος",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Πρόσθετου ονόματος",
 		"LABEL_READ_ONLY": "Μόνο για ανάγνωση",
 		"ADD_MENU_LABEL": "Προσθήκη",
 		"ADD_MENU_NICKNAME": "Πρόσθετο όνομα",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Αυτόματη προσθήκη επαφών στον κατάλογο διευθύνσεων",
diff --git a/snappymail/v/0.0.0/app/localization/en/admin.json b/snappymail/v/0.0.0/app/localization/en/admin.json
index 5d3ac86be..2006cab01 100644
--- a/snappymail/v/0.0.0/app/localization/en/admin.json
+++ b/snappymail/v/0.0.0/app/localization/en/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "Username",
 		"PASSWORD": "Passphrase",
 		"CANCEL": "Cancel",
-		"SEARCH": "Search"
+		"SEARCH": "Search",
+		"YES": "Yes",
+		"NO": "No"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Nothing to configure"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Are you sure you want to close this window?"
 	},
 	"POPUPS_LANGUAGES": {
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 44bf9b67c..2439964e3 100644
--- a/snappymail/v/0.0.0/app/localization/en/user.json
+++ b/snappymail/v/0.0.0/app/localization/en/user.json
@@ -122,7 +122,7 @@
 		"EMPTY_LIST": "Empty list.",
 		"EMPTY_SEARCH_LIST": "No messages matched your search.",
 		"SEARCH_RESULT_FOR": "Search results for \"%SEARCH%\"",
-		"BACK_TO_MESSAGE_LIST": "back to message list",
+		"BACK_TO_MESSAGE_LIST": "Back to message list",
 		"PUT_MESSAGE_HERE": "Drop message here to view it in the list",
 		"TODAY_AT": "today at %TIME%",
 		"YESTERDAY_AT": "yesterday at %TIME%",
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Clear search",
 		"CONTACT_VIEW_DESC": "Select contact in the list to view it here.",
 		"LABEL_BIRTHDAY": "Birthday",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Enter display name",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Enter last name",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Enter first name",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Enter nickname",
+		"DISPLAY_NAME": "Display name",
+		"LAST_NAME": "Last name",
+		"FIRST_NAME": "First name",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Nickname",
 		"LABEL_READ_ONLY": "Read only",
 		"ADD_MENU_LABEL": "Add",
 		"ADD_MENU_NICKNAME": "Nickname",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatically add recipients to your address book",
diff --git a/snappymail/v/0.0.0/app/localization/es/admin.json b/snappymail/v/0.0.0/app/localization/es/admin.json
index c5c0bbff9..a31d1940d 100644
--- a/snappymail/v/0.0.0/app/localization/es/admin.json
+++ b/snappymail/v/0.0.0/app/localization/es/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "Nombre de usuario",
 		"PASSWORD": "Contraseña",
 		"CANCEL": "Cancelar",
-		"SEARCH": "Buscar"
+		"SEARCH": "Buscar",
+		"YES": "Sí",
+		"NO": "No"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Ingresar",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Nada para configurar"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Sí",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "¿Estás seguro de que deseas cerrar esta ventana?"
 	},
 	"POPUPS_LANGUAGES": {
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 08e327d27..ef00f08a2 100644
--- a/snappymail/v/0.0.0/app/localization/es/user.json
+++ b/snappymail/v/0.0.0/app/localization/es/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Limpiar búsqueda",
 		"CONTACT_VIEW_DESC": "Seleccionar un contacto de la lista para verlo aquí.",
 		"LABEL_BIRTHDAY": "Cumpleaños",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Introduzca el nombre a visualizar",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Introduzca los apellidos",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Introduzca el nombre",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Introduzca un alias",
+		"DISPLAY_NAME": "Nombre a visualizar",
+		"LAST_NAME": "Apellidos",
+		"FIRST_NAME": "Nombre",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Alias",
 		"LABEL_READ_ONLY": "Solo lectura",
 		"ADD_MENU_LABEL": "Añadir",
 		"ADD_MENU_NICKNAME": "Alias",
@@ -499,7 +502,8 @@
 		"IMAGES_OPTION_ALWAYS": "Mostrar siempre",
 		"IMAGES_WHITELIST": "Lista blanca de imágenes",
 		"MESSAGE_POPUP_WINDOW": "Popup en nueva ventana en lugar de pestaña",
-		"MAILTO": "Register as 'mailto:' links handler"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Agregar automáticamente destinatarios a la libreta de direcciones",
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 e6d17f204..c66d9cbbc 100644
--- a/snappymail/v/0.0.0/app/localization/et/user.json
+++ b/snappymail/v/0.0.0/app/localization/et/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Puhasta otsinguväli",
 		"CONTACT_VIEW_DESC": "Vali nimekirjast kontakt, mida siin näidata",
 		"LABEL_BIRTHDAY": "Sünnipäev",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Sisesta kuvatav nimi",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Sisesta perenimi",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Sisesta eesnimi",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Sisesta hüüdnimi",
+		"DISPLAY_NAME": "Kuvatav nimi",
+		"LAST_NAME": "Perenimi",
+		"FIRST_NAME": "Eesnimi",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Hüüdnimi",
 		"LABEL_READ_ONLY": "Ainult lugemisõigus",
 		"ADD_MENU_LABEL": "Lisa",
 		"ADD_MENU_NICKNAME": "Hüüdnimi",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Lisa saajad automaatselt aadressiraamatusse",
diff --git a/snappymail/v/0.0.0/app/localization/eu/admin.json b/snappymail/v/0.0.0/app/localization/eu/admin.json
index d003508db..db2aefb85 100644
--- a/snappymail/v/0.0.0/app/localization/eu/admin.json
+++ b/snappymail/v/0.0.0/app/localization/eu/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "Erabiltzailea",
 		"PASSWORD": "Pasahitza",
 		"CANCEL": "Ezeztatu",
-		"SEARCH": "Bilatu"
+		"SEARCH": "Bilatu",
+		"YES": "Bai",
+		"NO": "Ez"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Ez dago kongiguratzeko ezer"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Bai",
-		"BUTTON_NO": "Ez",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Ziur zaude leiho hau itxi nahi duzula?"
 	},
 	"POPUPS_LANGUAGES": {
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 008449b37..dca831e9f 100644
--- a/snappymail/v/0.0.0/app/localization/eu/user.json
+++ b/snappymail/v/0.0.0/app/localization/eu/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Garbitu bilaketa",
 		"CONTACT_VIEW_DESC": "Aukeratu kontaktua zerrendan hemen ikusteko.",
 		"LABEL_BIRTHDAY": "Urtebetetzea",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Sartu erakusteko izena",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Sartu abizenak",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Sartu izena",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Sartu ezizena",
+		"DISPLAY_NAME": "Erakusteko izena",
+		"LAST_NAME": "Abizenak",
+		"FIRST_NAME": "Izena",
+		"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",
@@ -499,7 +502,8 @@
 		"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"
+		"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",
diff --git a/snappymail/v/0.0.0/app/localization/fa/admin.json b/snappymail/v/0.0.0/app/localization/fa/admin.json
index bba0ba690..71bdcf7e0 100644
--- a/snappymail/v/0.0.0/app/localization/fa/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fa/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "نام کاربری",
 		"PASSWORD": "گذرواژه",
 		"CANCEL": "انصراف",
-		"SEARCH": "هیچ تماسی پیدا نشد"
+		"SEARCH": "هیچ تماسی پیدا نشد",
+		"YES": "Yes",
+		"NO": "No"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "ورود",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "چیزی برای پیکربندی نیست"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "آیا شما از بستن این پنجره اطمینان دارید؟"
 	},
 	"POPUPS_LANGUAGES": {
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 e11831efc..75592f471 100644
--- a/snappymail/v/0.0.0/app/localization/fa/user.json
+++ b/snappymail/v/0.0.0/app/localization/fa/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "پاک‌کردن جستجو",
 		"CONTACT_VIEW_DESC": "تماس مورد نظر در لیست را جهت مشاهده، انتخاب کنید.",
 		"LABEL_BIRTHDAY": "تاریخ تولد",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "ورود نام",
-		"PLACEHOLDER_ENTER_LAST_NAME": "ورود نام خانوادگی",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "ورود نام",
-		"PLACEHOLDER_ENTER_NICK_NAME": "ورود نام مستعار",
+		"DISPLAY_NAME": "نام",
+		"LAST_NAME": "نام خانوادگی",
+		"FIRST_NAME": "نام",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "نام مستعار",
 		"LABEL_READ_ONLY": "فقط خواندنی",
 		"ADD_MENU_LABEL": "اضافه‌کردن",
 		"ADD_MENU_NICKNAME": "نام مستعار",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "اطلاعات تماس گیرندگان را بصورت خودکار در آدرس‌بوک ذخیره کن",
diff --git a/snappymail/v/0.0.0/app/localization/fi/admin.json b/snappymail/v/0.0.0/app/localization/fi/admin.json
index 58960660b..118f28c18 100644
--- a/snappymail/v/0.0.0/app/localization/fi/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fi/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "Käyttäjätunnus",
 		"PASSWORD": "Salasana",
 		"CANCEL": "Peruuta",
-		"SEARCH": "Yhtään yhteystietoa ei löytynyt"
+		"SEARCH": "Yhtään yhteystietoa ei löytynyt",
+		"YES": "Yes",
+		"NO": "No"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Tunnus",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Ei mitään asetettavaa"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Haluatko varmasti sulkea tämän ikkunan?"
 	},
 	"POPUPS_LANGUAGES": {
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 94606bf84..f14ed8416 100644
--- a/snappymail/v/0.0.0/app/localization/fi/user.json
+++ b/snappymail/v/0.0.0/app/localization/fi/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Poista haku",
 		"CONTACT_VIEW_DESC": "Valitse yhteystieto nähdäksesi sen tässä.",
 		"LABEL_BIRTHDAY": "Syntymäpäivä",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Lisää näytettävä nimi",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Lisää sukunimi",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Lisää etunimi",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Lisää lempinimi",
+		"DISPLAY_NAME": "Näytettävä nimi",
+		"LAST_NAME": "Sukunimi",
+		"FIRST_NAME": "Etunimi",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Lempinimi",
 		"LABEL_READ_ONLY": "Vain luku",
 		"ADD_MENU_LABEL": "Lisää",
 		"ADD_MENU_NICKNAME": "Lempinimi",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Lisää yhetystieto automaattisesti osoitekirjaan",
diff --git a/snappymail/v/0.0.0/app/localization/fr/admin.json b/snappymail/v/0.0.0/app/localization/fr/admin.json
index 77fe65b57..b1ac8385b 100644
--- a/snappymail/v/0.0.0/app/localization/fr/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fr/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "Nom d'utilisateur",
 		"PASSWORD": "Mot de passe",
 		"CANCEL": "Annuler",
-		"SEARCH": "Rechercher"
+		"SEARCH": "Rechercher",
+		"YES": "Oui",
+		"NO": "Non"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Identifiant",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Rien à configurer"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Oui",
-		"BUTTON_NO": "Non",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Êtes-vous sûr de vouloir fermer cette fenêtre ?"
 	},
 	"POPUPS_LANGUAGES": {
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 0f594a582..1df10a859 100644
--- a/snappymail/v/0.0.0/app/localization/fr/user.json
+++ b/snappymail/v/0.0.0/app/localization/fr/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Effacer la recherche",
 		"CONTACT_VIEW_DESC": "Sélectionner un contact dans la liste pour l'afficher ici.",
 		"LABEL_BIRTHDAY": "Anniversaire",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Entrez le nom à afficher",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Entrez votre Nom",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Entrez votre Prénom",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Entrez le pseudonyme",
+		"DISPLAY_NAME": "Nom à afficher",
+		"LAST_NAME": "Nom",
+		"FIRST_NAME": "Prénom",
+		"MIDDLE_NAME": "Deuxième Prénom",
+		"NAME_PREFIX": "Civilité",
+		"NAME_SUFFIX": "Suffix",
+		"NICK_NAME": "Pseudonyme",
 		"LABEL_READ_ONLY": "Lecture seule",
 		"ADD_MENU_LABEL": "Ajouter",
 		"ADD_MENU_NICKNAME": "Pseudonyme",
@@ -499,7 +502,8 @@
 		"IMAGES_OPTION_ALWAYS": "Toujours afficher",
 		"IMAGES_WHITELIST": "Liste blanche Images",
 		"MESSAGE_POPUP_WINDOW": "Popup dans une nouvelle fenêtre au lieu d'un onglet",
-		"MAILTO": "Inscrivez-vous en tant que gestionnaire de liens 'mailto:'"
+		"MAILTO": "Inscrivez-vous en tant que gestionnaire de liens 'mailto:'",
+		"HTML_TO_MD": "Convertir HTML en Markdown au lieu du texte brut"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Ajouter automatiquement les destinataires à votre carnet d'adresses",
diff --git a/snappymail/v/0.0.0/app/localization/hu/admin.json b/snappymail/v/0.0.0/app/localization/hu/admin.json
index c667dae72..b5775e6a0 100644
--- a/snappymail/v/0.0.0/app/localization/hu/admin.json
+++ b/snappymail/v/0.0.0/app/localization/hu/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "Felhasználónév",
 		"PASSWORD": "Jelszó",
 		"CANCEL": "Mégse",
-		"SEARCH": "Nem találtam névjegyeket"
+		"SEARCH": "Nem találtam névjegyeket",
+		"YES": "Igen",
+		"NO": "Nem"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Belépés",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Nincs mit beállítani"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Igen",
-		"BUTTON_NO": "Nem",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Biztos, hogy be akarod zárni ezt az ablakot?"
 	},
 	"POPUPS_LANGUAGES": {
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 de51b1f8b..94e4bf9f6 100644
--- a/snappymail/v/0.0.0/app/localization/hu/user.json
+++ b/snappymail/v/0.0.0/app/localization/hu/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Keresés törlése",
 		"CONTACT_VIEW_DESC": "Válassz egy névjegyet a listából, hogy itt megjelenjen.",
 		"LABEL_BIRTHDAY": "Születésnap",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Add meg a megjelenítendő nevet",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Add meg a vezetéknevet",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Add meg a keresztnevet",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Add meg a felhasználónevet",
+		"DISPLAY_NAME": "Megjelenítendő nevet",
+		"LAST_NAME": "Vezetéknevet",
+		"FIRST_NAME": "Keresztnevet",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Felhasználónevet",
 		"LABEL_READ_ONLY": "Csak olvasás",
 		"ADD_MENU_LABEL": "Hozzáadás",
 		"ADD_MENU_NICKNAME": "Felhasználónév",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Címzettek automatikus hozzáadása a címtárhoz",
diff --git a/snappymail/v/0.0.0/app/localization/id/admin.json b/snappymail/v/0.0.0/app/localization/id/admin.json
index d1d6eaa71..557ffb3b5 100644
--- a/snappymail/v/0.0.0/app/localization/id/admin.json
+++ b/snappymail/v/0.0.0/app/localization/id/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "Nama belakang",
 		"PASSWORD": "Sandi",
 		"CANCEL": "Batal",
-		"SEARCH": "Tidak ditemukan kontak"
+		"SEARCH": "Tidak ditemukan kontak",
+		"YES": "Yes",
+		"NO": "No"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Tidak ada yang dikonfigurasi"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Anda yakin menutup jendela ini?"
 	},
 	"POPUPS_LANGUAGES": {
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 b08590901..4c02611c6 100644
--- a/snappymail/v/0.0.0/app/localization/id/user.json
+++ b/snappymail/v/0.0.0/app/localization/id/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Bersihkan pencarian",
 		"CONTACT_VIEW_DESC": "Pilih kontak pada daftar untuk ditampilkan di sini.",
 		"LABEL_BIRTHDAY": "Tanggal lahir",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Isi nama tampilan",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Isi nama belakang ",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Isi nama depan",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Isi nama panggilan",
+		"DISPLAY_NAME": "Tampilan",
+		"LAST_NAME": "Belakang ",
+		"FIRST_NAME": "Depan",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Panggilan",
 		"LABEL_READ_ONLY": "Hanya bisa dibaca",
 		"ADD_MENU_LABEL": "Tambah",
 		"ADD_MENU_NICKNAME": "Nama panggilan",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Tambah penerima ke daftar alamat secara otomatis",
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 4eb403353..bbf9b8da0 100644
--- a/snappymail/v/0.0.0/app/localization/is/user.json
+++ b/snappymail/v/0.0.0/app/localization/is/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Hreinsa leit",
 		"CONTACT_VIEW_DESC": "Veldu tengilið í listanum til að skoða hér.",
 		"LABEL_BIRTHDAY": "Afmælisdagur",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Settu inn birtingarnafn",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Settu inn kenninafn",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Settu inn eiginnafn",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Enter nickname",
+		"DISPLAY_NAME": "Birtingarnafn",
+		"LAST_NAME": "Kenninafn",
+		"FIRST_NAME": "Eiginnafn",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Nickname",
 		"LABEL_READ_ONLY": "Aðeins lesanlegt",
 		"ADD_MENU_LABEL": "Bæta við",
 		"ADD_MENU_NICKNAME": "Stuttnefni",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Bæta viðtakendum sjálfkrafa í nafnaskrá",
diff --git a/snappymail/v/0.0.0/app/localization/it/admin.json b/snappymail/v/0.0.0/app/localization/it/admin.json
index c56ae1723..0fae97c31 100644
--- a/snappymail/v/0.0.0/app/localization/it/admin.json
+++ b/snappymail/v/0.0.0/app/localization/it/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "Nome utente",
 		"PASSWORD": "Passphrase",
 		"CANCEL": "Annulla",
-		"SEARCH": "Cerca"
+		"SEARCH": "Cerca",
+		"YES": "Si",
+		"NO": "No"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Niente da configurare"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Si",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Sei sicuro di voler chiudere questa finestra?"
 	},
 	"POPUPS_LANGUAGES": {
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 d365bbacd..3829b1444 100644
--- a/snappymail/v/0.0.0/app/localization/it/user.json
+++ b/snappymail/v/0.0.0/app/localization/it/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Pulisci ricerca",
 		"CONTACT_VIEW_DESC": "Seleziona un contatto dalla lista per visualizzarlo qui",
 		"LABEL_BIRTHDAY": "Compleanno",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Inserisci il nome visualizzato",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Inserisci il cognome",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Inserisci il nome",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Inserisci il nickname",
+		"DISPLAY_NAME": "Nome visualizzato",
+		"LAST_NAME": "Cognome",
+		"FIRST_NAME": "Nome",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Nickname",
 		"LABEL_READ_ONLY": "Sola lettura",
 		"ADD_MENU_LABEL": "Aggiungi",
 		"ADD_MENU_NICKNAME": "Soprannome",
@@ -499,7 +502,8 @@
 		"IMAGES_OPTION_ALWAYS": "Visualizza sempre",
 		"IMAGES_WHITELIST": "Whitelist per immagini",
 		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
-		"MAILTO": "Register as 'mailto:' links handler"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Aggiungi automaticamente le persone che ti inviano mail alla rubrica",
diff --git a/snappymail/v/0.0.0/app/localization/ja/admin.json b/snappymail/v/0.0.0/app/localization/ja/admin.json
index c3da22528..5255b00e1 100644
--- a/snappymail/v/0.0.0/app/localization/ja/admin.json
+++ b/snappymail/v/0.0.0/app/localization/ja/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "ユーザー名",
 		"PASSWORD": "パスワード",
 		"CANCEL": "キャンセル",
-		"SEARCH": "検索"
+		"SEARCH": "検索",
+		"YES": "はい",
+		"NO": "いいえ"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "ログイン",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "何も設定されていません"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "はい",
-		"BUTTON_NO": "いいえ",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "このウィンドウを閉じてもよろしいですか？"
 	},
 	"POPUPS_LANGUAGES": {
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 4421a531d..1bcab0ebc 100644
--- a/snappymail/v/0.0.0/app/localization/ja/user.json
+++ b/snappymail/v/0.0.0/app/localization/ja/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "検索をクリア",
 		"CONTACT_VIEW_DESC": "選択した連絡先がここに表示されます。",
 		"LABEL_BIRTHDAY": "誕生日",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "表示名を入力してください",
-		"PLACEHOLDER_ENTER_LAST_NAME": "姓を入力してください",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "名を入力してください",
-		"PLACEHOLDER_ENTER_NICK_NAME": "ニックネームを入力してください",
+		"DISPLAY_NAME": "表示名を入力してください",
+		"LAST_NAME": "姓を入力してください",
+		"FIRST_NAME": "名を入力してください",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "ニックネームを入力してください",
 		"LABEL_READ_ONLY": "読み取り専用",
 		"ADD_MENU_LABEL": "追加",
 		"ADD_MENU_NICKNAME": "ニックネーム",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "返信したアドレスをアドレス帳へ自動的に追加する",
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 39fbcafa3..02b0bb0d5 100644
--- a/snappymail/v/0.0.0/app/localization/ko/user.json
+++ b/snappymail/v/0.0.0/app/localization/ko/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "검색 초기화",
 		"CONTACT_VIEW_DESC": "목록에서 연락처를 선택하여 이 곳에 표시하세요.",
 		"LABEL_BIRTHDAY": "생일",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "표시명을 입력하세요",
-		"PLACEHOLDER_ENTER_LAST_NAME": "성을 입력하세요",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "이름을 입력하세요",
-		"PLACEHOLDER_ENTER_NICK_NAME": "별칭을 입력하세요",
+		"DISPLAY_NAME": "표시명을 입력하세요",
+		"LAST_NAME": "성을 입력하세요",
+		"FIRST_NAME": "이름을 입력하세요",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "별칭을 입력하세요",
 		"LABEL_READ_ONLY": "읽기 전용",
 		"ADD_MENU_LABEL": "추가",
 		"ADD_MENU_NICKNAME": "별칭",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "수신인을 주소록에 자동으로 추가",
diff --git a/snappymail/v/0.0.0/app/localization/lt/admin.json b/snappymail/v/0.0.0/app/localization/lt/admin.json
index b9644027d..b6958d1c4 100644
--- a/snappymail/v/0.0.0/app/localization/lt/admin.json
+++ b/snappymail/v/0.0.0/app/localization/lt/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "Vartotojo vardas",
 		"PASSWORD": "Slaptažodis",
 		"CANCEL": "Atšaukti",
-		"SEARCH": "Kontaktų nerasta"
+		"SEARCH": "Kontaktų nerasta",
+		"YES": "Yes",
+		"NO": "No"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Prisijungimo vardas",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Nėra ką konfiguruoti"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Ar tikrai norite uždaryti šį langą?"
 	},
 	"POPUPS_LANGUAGES": {
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 24fce3bc6..483b0a2b6 100644
--- a/snappymail/v/0.0.0/app/localization/lt/user.json
+++ b/snappymail/v/0.0.0/app/localization/lt/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Išvalyti paiešką",
 		"CONTACT_VIEW_DESC": "Pasirinkite kontaktą sąraše, kad matytumėte informaciją čia.",
 		"LABEL_BIRTHDAY": "Gimtadienis",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Įveskite rodomą vardą",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Įveskite pavardę",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Įveskite vardą",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Įveskite slapyvardį",
+		"DISPLAY_NAME": "Rodomą vardą",
+		"LAST_NAME": "Pavardę",
+		"FIRST_NAME": "Vardą",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Slapyvardį",
 		"LABEL_READ_ONLY": "Tik skaitymui",
 		"ADD_MENU_LABEL": "Pridėti",
 		"ADD_MENU_NICKNAME": "Slapyvardis",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatiškai pridėti gavėjus į adresų knygą",
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 4fddba713..20ed39cc2 100644
--- a/snappymail/v/0.0.0/app/localization/lv/user.json
+++ b/snappymail/v/0.0.0/app/localization/lv/user.json
@@ -122,7 +122,7 @@
 		"EMPTY_LIST": "Tukšs saraksts.",
 		"EMPTY_SEARCH_LIST": "Neviens ziņojums neatbilda jūsu meklētajiem kritērijiem.",
 		"SEARCH_RESULT_FOR": "Meklēšanas rezultāti: \"%SEARCH%\"",
-		"BACK_TO_MESSAGE_LIST": "back to message list",
+		"BACK_TO_MESSAGE_LIST": "Back to message list",
 		"PUT_MESSAGE_HERE": "Ievelciet ziņojumus šeit lai tos apskatītu.",
 		"TODAY_AT": "šodien %TIME%",
 		"YESTERDAY_AT": "vakardien %TIME%",
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Nodzēt meklēšanu",
 		"CONTACT_VIEW_DESC": "Izvēlaties kontaktu no saraksta lai to apskatītu.",
 		"LABEL_BIRTHDAY": "Birthday",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Enter display name",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Enter last name",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Enter first name",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Enter nickname",
+		"DISPLAY_NAME": "Display name",
+		"LAST_NAME": "Last name",
+		"FIRST_NAME": "First name",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Nickname",
 		"LABEL_READ_ONLY": "Read only",
 		"ADD_MENU_LABEL": "Add",
 		"ADD_MENU_NICKNAME": "Nickname",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatically add recipients to your address book",
diff --git a/snappymail/v/0.0.0/app/localization/nb/admin.json b/snappymail/v/0.0.0/app/localization/nb/admin.json
index 02796cfdc..3f0047cb5 100644
--- a/snappymail/v/0.0.0/app/localization/nb/admin.json
+++ b/snappymail/v/0.0.0/app/localization/nb/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "Brukernavn",
 		"PASSWORD": "Passord",
 		"CANCEL": "Avbryt",
-		"SEARCH": "Fant ingen kontakter"
+		"SEARCH": "Fant ingen kontakter",
+		"YES": "Ja",
+		"NO": "Nei"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Brukernavn",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Ingenting å sette opp"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Ja",
-		"BUTTON_NO": "Nei",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Er du sikker på at du vil lukke dette vinduet?"
 	},
 	"POPUPS_LANGUAGES": {
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 1b65e91fd..fa14ab14b 100644
--- a/snappymail/v/0.0.0/app/localization/nb/user.json
+++ b/snappymail/v/0.0.0/app/localization/nb/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Tøm søk",
 		"CONTACT_VIEW_DESC": "Velg en kontakt i lista",
 		"LABEL_BIRTHDAY": "Bursdag",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Visningsnavn",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Etternavn",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Fornavn",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Kallenavn",
+		"DISPLAY_NAME": "Visningsnavn",
+		"LAST_NAME": "Etternavn",
+		"FIRST_NAME": "Fornavn",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Kallenavn",
 		"LABEL_READ_ONLY": "Skrivebeskyttet",
 		"ADD_MENU_LABEL": "Legg til",
 		"ADD_MENU_NICKNAME": "Kallenavn",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Legg til mottakere i adresseboka automatisk",
diff --git a/snappymail/v/0.0.0/app/localization/nl/admin.json b/snappymail/v/0.0.0/app/localization/nl/admin.json
index 5dbc3e7de..3570bb04a 100644
--- a/snappymail/v/0.0.0/app/localization/nl/admin.json
+++ b/snappymail/v/0.0.0/app/localization/nl/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "Gebruikersnaam",
 		"PASSWORD": "Wachtwoord",
 		"CANCEL": "Annuleer",
-		"SEARCH": "Zoeken"
+		"SEARCH": "Zoeken",
+		"YES": "Ja",
+		"NO": "Nee"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Inlognaam",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Niets om te configureren"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Ja",
-		"BUTTON_NO": "Nee",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Weet u zeker dat u dit venster wilt stuiten?"
 	},
 	"POPUPS_LANGUAGES": {
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 bc4e95b09..5c898ef85 100644
--- a/snappymail/v/0.0.0/app/localization/nl/user.json
+++ b/snappymail/v/0.0.0/app/localization/nl/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Wis zoekopdracht",
 		"CONTACT_VIEW_DESC": "Selecteer een contactpersoon in de lijst om hier te bekijken",
 		"LABEL_BIRTHDAY": "Geboortedatum",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Weergeven als",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Achternaam",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Voornaam",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Bijnaam",
+		"DISPLAY_NAME": "Weergeven als",
+		"LAST_NAME": "Achternaam",
+		"FIRST_NAME": "Voornaam",
+		"MIDDLE_NAME": "Middelste naam",
+		"NAME_PREFIX": "Voorvoegsel",
+		"NAME_SUFFIX": "Achtervoegsel",
+		"NICK_NAME": "Bijnaam",
 		"LABEL_READ_ONLY": "Alleen lezen",
 		"ADD_MENU_LABEL": "Toevoegen",
 		"ADD_MENU_NICKNAME": "Bijnaam",
@@ -499,7 +502,8 @@
 		"IMAGES_OPTION_ALWAYS": "Altijd tonen",
 		"IMAGES_WHITELIST": "Afbeeldingen whitelist",
 		"MESSAGE_POPUP_WINDOW": "Openen in een nieuw venster i.p.v. tab",
-		"MAILTO": "Registreer als 'mailto:'-linkhandler"
+		"MAILTO": "Registreer als 'mailto:'-linkhandler",
+		"HTML_TO_MD": "Converteer HTML naar Markdown i.p.v. platte tekst"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatisch ontvangers toevoegen aan uw adresboek",
diff --git a/snappymail/v/0.0.0/app/localization/pl/admin.json b/snappymail/v/0.0.0/app/localization/pl/admin.json
index afdde6ce1..6066b3575 100644
--- a/snappymail/v/0.0.0/app/localization/pl/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pl/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "Nazwa użytkownika",
 		"PASSWORD": "Hasło",
 		"CANCEL": "Anuluj",
-		"SEARCH": "Szukaj"
+		"SEARCH": "Szukaj",
+		"YES": "Tak",
+		"NO": "Nie"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Brak opcji do skonfigurowania"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Tak",
-		"BUTTON_NO": "Nie",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Czy na pewno chcesz zamknąć to okno?"
 	},
 	"POPUPS_LANGUAGES": {
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 e60028201..24ea42e1e 100644
--- a/snappymail/v/0.0.0/app/localization/pl/user.json
+++ b/snappymail/v/0.0.0/app/localization/pl/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Wyczyść wyniki",
 		"CONTACT_VIEW_DESC": "Wybierz kontakt do wyświetlenia",
 		"LABEL_BIRTHDAY": "Urodziny",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Nazwa wyświetlana",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Nazwisko",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Imię",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Pseudonim",
+		"DISPLAY_NAME": "Nazwa wyświetlana",
+		"LAST_NAME": "Nazwisko",
+		"FIRST_NAME": "Imię",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Pseudonim",
 		"LABEL_READ_ONLY": "Tylko do odczytu",
 		"ADD_MENU_LABEL": "Dodaj",
 		"ADD_MENU_NICKNAME": "Pseudonim",
@@ -499,7 +502,8 @@
 		"IMAGES_OPTION_ALWAYS": "Zawsze pokazuj",
 		"IMAGES_WHITELIST": "Biała lista obrazów",
 		"MESSAGE_POPUP_WINDOW": "Pokaż w nowym oknie zamiast w nowej karcie",
-		"MAILTO": "Register as 'mailto:' links handler"
+		"MAILTO": "Zarejestruj obsługę linków 'mailto:' jako domyślnego klienta poczty",
+		"HTML_TO_MD": "Konwertuj HTML na Markdown zamiast zwykłego tekstu"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatycznie dodawaj odbiorców do książki adresowej",
diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
index 2425c3dd8..d0916e72a 100644
--- a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "Nome de usuário",
 		"PASSWORD": "Senha",
 		"CANCEL": "Cancelar",
-		"SEARCH": "Nenhum contato encontrado"
+		"SEARCH": "Nenhum contato encontrado",
+		"YES": "Yes",
+		"NO": "No"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Usuário",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Nada para configurar"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Você tem certeza que deseja fechar esta janela?"
 	},
 	"POPUPS_LANGUAGES": {
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 bad9a4578..57843d841 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
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Limpar pesquisa",
 		"CONTACT_VIEW_DESC": "Selecione um contato na lista para visualizá-lo.",
 		"LABEL_BIRTHDAY": "Aniversário",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Digite o nome de exibição",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Digite o sobrenome",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Digite o primeiro nome",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Digite o apelido",
+		"DISPLAY_NAME": "Nome de exibição",
+		"LAST_NAME": "Sobrenome",
+		"FIRST_NAME": "Primeiro nome",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Apelido",
 		"LABEL_READ_ONLY": "Somente Leitura",
 		"ADD_MENU_LABEL": "Adicionar",
 		"ADD_MENU_NICKNAME": "Apelido",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Adicionar automaticamente os destinatários na lista de endereços",
diff --git a/snappymail/v/0.0.0/app/localization/pt/admin.json b/snappymail/v/0.0.0/app/localization/pt/admin.json
index 358d17379..cfda26771 100644
--- a/snappymail/v/0.0.0/app/localization/pt/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "Nome de utilizador",
 		"PASSWORD": "Palavra-passe",
 		"CANCEL": "Cancelar",
-		"SEARCH": "Pesquisar"
+		"SEARCH": "Pesquisar",
+		"YES": "Sim",
+		"NO": "Não"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Utilizador",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Nada para configurar"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Sim",
-		"BUTTON_NO": "Não",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Quer mesmo fechar esta janela?"
 	},
 	"POPUPS_LANGUAGES": {
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 e93ca5d08..da1ed6de6 100644
--- a/snappymail/v/0.0.0/app/localization/pt/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Limpar pesquisa",
 		"CONTACT_VIEW_DESC": "Escolha o contacto na lista para visualizá-lo.",
 		"LABEL_BIRTHDAY": "Aniversário",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Introduza o nome a apresentar",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Introduza o último nome",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Introduza o primeiro nome",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Introduza uma alcunha",
+		"DISPLAY_NAME": "Nome a apresentar",
+		"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",
 		"ADD_MENU_NICKNAME": "Alcunha",
@@ -499,7 +502,8 @@
 		"IMAGES_OPTION_ALWAYS": "Mostrar sempre",
 		"IMAGES_WHITELIST": "Lista Branca de imagens",
 		"MESSAGE_POPUP_WINDOW": "Abrir em nova janela em vez de um separador",
-		"MAILTO": "Registar como manipulador de ligações 'mailto:'"
+		"MAILTO": "Registar como manipulador de ligações 'mailto:'",
+		"HTML_TO_MD": "Converter HTML para Markdown em vez de texto simples"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Adicionar destinatários automaticamente à sua lista de endereços",
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 665c1ce51..e82b3080a 100644
--- a/snappymail/v/0.0.0/app/localization/ro/user.json
+++ b/snappymail/v/0.0.0/app/localization/ro/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Golește căutarea",
 		"CONTACT_VIEW_DESC": "Selectați un contact pentru a-l vizualiza",
 		"LABEL_BIRTHDAY": "Birthday",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Introduceți numele complet",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Prenume",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Nume",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Enter nickname",
+		"DISPLAY_NAME": "Numele complet",
+		"LAST_NAME": "Prenume",
+		"FIRST_NAME": "Nume",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Nickname",
 		"LABEL_READ_ONLY": "Doar pentru citire",
 		"ADD_MENU_LABEL": "Add",
 		"ADD_MENU_NICKNAME": "Nickname",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Adaugă automat destinatarii la agenda de scrisori",
diff --git a/snappymail/v/0.0.0/app/localization/ru/admin.json b/snappymail/v/0.0.0/app/localization/ru/admin.json
index b4684cf7a..79507ecf5 100644
--- a/snappymail/v/0.0.0/app/localization/ru/admin.json
+++ b/snappymail/v/0.0.0/app/localization/ru/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "Имя пользователя",
 		"PASSWORD": "Пароль",
 		"CANCEL": "Отменить",
-		"SEARCH": "Поиск"
+		"SEARCH": "Поиск",
+		"YES": "Да",
+		"NO": "Нет"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Логин",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Без настроек"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Да",
-		"BUTTON_NO": "Нет",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Вы уверены, что хотите закрыть это окно?"
 	},
 	"POPUPS_LANGUAGES": {
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 37bcd5f51..e3bd2dfad 100644
--- a/snappymail/v/0.0.0/app/localization/ru/user.json
+++ b/snappymail/v/0.0.0/app/localization/ru/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Очистить поиск",
 		"CONTACT_VIEW_DESC": "Выберите контакт для просмотра.",
 		"LABEL_BIRTHDAY": "День рождения",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Введите полное имя",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Введите имя",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Введите фамилию",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Введите ник",
+		"DISPLAY_NAME": "Полное имя",
+		"LAST_NAME": "Имя",
+		"FIRST_NAME": "Фамилию",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Ник",
 		"LABEL_READ_ONLY": "Только чтение",
 		"ADD_MENU_LABEL": "Добавить",
 		"ADD_MENU_NICKNAME": "Ник",
@@ -499,7 +502,8 @@
 		"IMAGES_OPTION_ALWAYS": "Показать всегда",
 		"IMAGES_WHITELIST": "Форматы из белого списка",
 		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
-		"MAILTO": "Register as 'mailto:' links handler"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Автоматически добавлять получателей писем в адресную книгу",
diff --git a/snappymail/v/0.0.0/app/localization/sk/admin.json b/snappymail/v/0.0.0/app/localization/sk/admin.json
index e28c57489..a05ef0891 100644
--- a/snappymail/v/0.0.0/app/localization/sk/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sk/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "Používateľské men",
 		"PASSWORD": "Heslo",
 		"CANCEL": "Zrušiť",
-		"SEARCH": "Nenašli sa žiadne kontakty"
+		"SEARCH": "Nenašli sa žiadne kontakty",
+		"YES": "Yes",
+		"NO": "No"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Prihlasovanie",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Nothing to configure"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Are you sure you want to close this window?"
 	},
 	"POPUPS_LANGUAGES": {
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 7e3a39d15..520cfe073 100644
--- a/snappymail/v/0.0.0/app/localization/sk/user.json
+++ b/snappymail/v/0.0.0/app/localization/sk/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Zrušiť vyhľadávanie",
 		"CONTACT_VIEW_DESC": "Zvoľte kontakt zo zoznamu pre jeho zobrazenie tu.",
 		"LABEL_BIRTHDAY": "Dátum narodenia",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Zadajte Zobrazované meno",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Zadajte priezvisko",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Zadajte meno",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Zadajte prezývku",
+		"DISPLAY_NAME": "Zobrazované meno",
+		"LAST_NAME": "Priezvisko",
+		"FIRST_NAME": "Meno",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Prezývku",
 		"LABEL_READ_ONLY": "Len pre čítanie",
 		"ADD_MENU_LABEL": "Pridať",
 		"ADD_MENU_NICKNAME": "Prezývka",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automaticky pridávať príjemcov správ do Adresára",
diff --git a/snappymail/v/0.0.0/app/localization/sl/admin.json b/snappymail/v/0.0.0/app/localization/sl/admin.json
index 0016e0aba..65a6c2ea3 100644
--- a/snappymail/v/0.0.0/app/localization/sl/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sl/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "Uporabniško ime",
 		"PASSWORD": "Geslo",
 		"CANCEL": "Prekliči",
-		"SEARCH": "Ni ujemajočih stikov"
+		"SEARCH": "Ni ujemajočih stikov",
+		"YES": "Yes",
+		"NO": "No"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Prijava",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Ni nastavitev za spreminjati"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Želite zapreti to okno?"
 	},
 	"POPUPS_LANGUAGES": {
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 f0c49e6fa..e1c9116f5 100644
--- a/snappymail/v/0.0.0/app/localization/sl/user.json
+++ b/snappymail/v/0.0.0/app/localization/sl/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Počisti iskalne kriterije",
 		"CONTACT_VIEW_DESC": "Izberite stik s seznama za ogled.",
 		"LABEL_BIRTHDAY": "Rojstni dan",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Vnos prikaznega imena",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Vnos priimka",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Vnos imena",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Vnos vzdevka",
+		"DISPLAY_NAME": "Prikaznega imena",
+		"LAST_NAME": "Priimka",
+		"FIRST_NAME": "Imena",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Vzdevka",
 		"LABEL_READ_ONLY": "Samo za branje",
 		"ADD_MENU_LABEL": "Dodajanje",
 		"ADD_MENU_NICKNAME": "Vzdevek",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Samodejno dodaj prejemnike v imenik",
diff --git a/snappymail/v/0.0.0/app/localization/sv/admin.json b/snappymail/v/0.0.0/app/localization/sv/admin.json
index 177edd24d..3b084df1e 100644
--- a/snappymail/v/0.0.0/app/localization/sv/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sv/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "Användarnamn",
 		"PASSWORD": "Lösenord",
 		"CANCEL": "Avbryt",
-		"SEARCH": "Inga kontakter funna"
+		"SEARCH": "Inga kontakter funna",
+		"YES": "Ja",
+		"NO": "Nej"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Logga in",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Inget att konfigurera"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Ja",
-		"BUTTON_NO": "Nej",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Är du säker på att du vill stänga sidan?"
 	},
 	"POPUPS_LANGUAGES": {
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 b6ae83b90..07e071708 100644
--- a/snappymail/v/0.0.0/app/localization/sv/user.json
+++ b/snappymail/v/0.0.0/app/localization/sv/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Nollställ sök",
 		"CONTACT_VIEW_DESC": "Välj kontakt i listan för att visa här.",
 		"LABEL_BIRTHDAY": "Födelsedag",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Ange visningsnamn",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Ange efternamn",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Ange förnamn",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Ange smeknamn",
+		"DISPLAY_NAME": "Visningsnamn",
+		"LAST_NAME": "Efternamn",
+		"FIRST_NAME": "Förnamn",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Smeknamn",
 		"LABEL_READ_ONLY": "Endast läs",
 		"ADD_MENU_LABEL": "Lägg till...",
 		"ADD_MENU_NICKNAME": "Smeknamn",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Lägg till mottagare automatiskt i din adressbok",
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 ba422f154..dfa6a222e 100644
--- a/snappymail/v/0.0.0/app/localization/tr/user.json
+++ b/snappymail/v/0.0.0/app/localization/tr/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Aramayı temizle",
 		"CONTACT_VIEW_DESC": "Görüntülemek istediğiniz kişiyi listeden seçin.",
 		"LABEL_BIRTHDAY": "Doğum Günü",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Görüntülenecek Ad",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Soyadını yazın",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Adı yazın",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Nickname yazın",
+		"DISPLAY_NAME": "Görüntülenecek Ad",
+		"LAST_NAME": "Soyadını",
+		"FIRST_NAME": "Adı",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Nickname",
 		"LABEL_READ_ONLY": "Sadece Okunabilir",
 		"ADD_MENU_LABEL": "Ekle",
 		"ADD_MENU_NICKNAME": "Nickname",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Otomatik olarak adres defterinize alıcıyı ekle",
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 2258a8cbf..2e5105f5b 100644
--- a/snappymail/v/0.0.0/app/localization/uk/user.json
+++ b/snappymail/v/0.0.0/app/localization/uk/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Очистити пошук",
 		"CONTACT_VIEW_DESC": "Виберіть контакт для перегляду.",
 		"LABEL_BIRTHDAY": "День нарождення",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Введіть повне ім'я",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Введіть ім'я",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Введіть прізвище",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Введіть нік",
+		"DISPLAY_NAME": "Повне ім'я",
+		"LAST_NAME": "Ім'я",
+		"FIRST_NAME": "Прізвище",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Нік",
 		"LABEL_READ_ONLY": "Тільки читання",
 		"ADD_MENU_LABEL": "Додати",
 		"ADD_MENU_NICKNAME": "Нік",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Автоматично додавати отримувачів у адресну книгу",
diff --git a/snappymail/v/0.0.0/app/localization/vi/admin.json b/snappymail/v/0.0.0/app/localization/vi/admin.json
index 7a0586ff4..d5bdeb839 100644
--- a/snappymail/v/0.0.0/app/localization/vi/admin.json
+++ b/snappymail/v/0.0.0/app/localization/vi/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "Tên tài khoản",
 		"PASSWORD": "Mật khẩu",
 		"CANCEL": "Hủy",
-		"SEARCH": "Tìm kiếm"
+		"SEARCH": "Tìm kiếm",
+		"YES": "Ok",
+		"NO": "Không"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Đăng nhập",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "Không có gì để thiết lập"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Ok",
-		"BUTTON_NO": "Không",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Bạn có chắc chắn muốn đóng cửa sổ này?"
 	},
 	"POPUPS_LANGUAGES": {
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 1761aa08f..7ccc2f891 100644
--- a/snappymail/v/0.0.0/app/localization/vi/user.json
+++ b/snappymail/v/0.0.0/app/localization/vi/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "Xóa bỏ tìm kiếm",
 		"CONTACT_VIEW_DESC": "Chọn một tên liên hệ trong danh sách để hiển thị chi tiết ở đây.",
 		"LABEL_BIRTHDAY": "Ngày sinh",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Nhập tên hiển thị",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Nhập họ",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Nhập tên",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Nhập nickname",
+		"DISPLAY_NAME": "Tên hiển thị",
+		"LAST_NAME": "Họ",
+		"FIRST_NAME": "Tên",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Nickname",
 		"LABEL_READ_ONLY": "Chỉ cho phép đọc",
 		"ADD_MENU_LABEL": "Thêm vào",
 		"ADD_MENU_NICKNAME": "Nickname",
@@ -499,7 +502,8 @@
 		"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"
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Tự động thêm người nhận thư vào sổ địa chỉ của bạn",
diff --git a/snappymail/v/0.0.0/app/localization/zh-TW/admin.json b/snappymail/v/0.0.0/app/localization/zh-TW/admin.json
index 135c091d6..2f3ef94e6 100644
--- a/snappymail/v/0.0.0/app/localization/zh-TW/admin.json
+++ b/snappymail/v/0.0.0/app/localization/zh-TW/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "使用者名稱",
 		"PASSWORD": "密碼",
 		"CANCEL": "取消",
-		"SEARCH": "搜尋"
+		"SEARCH": "搜尋",
+		"YES": "是",
+		"NO": "否"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "登入",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "無可用配置"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "是",
-		"BUTTON_NO": "否",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "您確定要關閉此視窗嗎？"
 	},
 	"POPUPS_LANGUAGES": {
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 a014582dc..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
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "清除搜尋",
 		"CONTACT_VIEW_DESC": "選取聯絡人以在清單中檢視。",
 		"LABEL_BIRTHDAY": "生日",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "顯示名稱",
-		"PLACEHOLDER_ENTER_LAST_NAME": "姓",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "名",
-		"PLACEHOLDER_ENTER_NICK_NAME": "暱稱",
+		"DISPLAY_NAME": "顯示名稱",
+		"LAST_NAME": "姓",
+		"FIRST_NAME": "名",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "暱稱",
 		"LABEL_READ_ONLY": "唯讀",
 		"ADD_MENU_LABEL": "新增",
 		"ADD_MENU_NICKNAME": "暱稱",
@@ -499,7 +502,8 @@
 		"IMAGES_OPTION_ALWAYS": "永遠顯示",
 		"IMAGES_WHITELIST": "圖片白名單",
 		"MESSAGE_POPUP_WINDOW": "在新彈出窗口而非分頁中打開",
-		"MAILTO": "注冊成 mailto: 連結處理器"
+		"MAILTO": "注冊成 mailto: 連結處理器",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "自動新增收件者至通訊錄",
diff --git a/snappymail/v/0.0.0/app/localization/zh/admin.json b/snappymail/v/0.0.0/app/localization/zh/admin.json
index 33f3fda3f..36d58430f 100644
--- a/snappymail/v/0.0.0/app/localization/zh/admin.json
+++ b/snappymail/v/0.0.0/app/localization/zh/admin.json
@@ -8,7 +8,9 @@
 		"USERNAME": "用户名",
 		"PASSWORD": "密码",
 		"CANCEL": "取消",
-		"SEARCH": "搜索"
+		"SEARCH": "搜索",
+		"YES": "是",
+		"NO": "否"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "登录",
@@ -150,8 +152,6 @@
 		"DESC_NOTHING_TO_CONFIGURE": "无可用配置"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "是",
-		"BUTTON_NO": "否",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "您确定要关闭此窗口吗？"
 	},
 	"POPUPS_LANGUAGES": {
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 753092ec6..cb81edb72 100644
--- a/snappymail/v/0.0.0/app/localization/zh/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh/user.json
@@ -216,10 +216,13 @@
 		"CLEAR_SEARCH": "清除搜索",
 		"CONTACT_VIEW_DESC": "在此查看在列表中选中的联系人。",
 		"LABEL_BIRTHDAY": "生日",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "显示名称",
-		"PLACEHOLDER_ENTER_LAST_NAME": "姓",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "名",
-		"PLACEHOLDER_ENTER_NICK_NAME": "昵称",
+		"DISPLAY_NAME": "显示名称",
+		"LAST_NAME": "姓",
+		"FIRST_NAME": "名",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "昵称",
 		"LABEL_READ_ONLY": "只读",
 		"ADD_MENU_LABEL": "添加",
 		"ADD_MENU_NICKNAME": "昵称",
@@ -499,7 +502,8 @@
 		"IMAGES_OPTION_ALWAYS": "总是显示",
 		"IMAGES_WHITELIST": "图片白名单",
 		"MESSAGE_POPUP_WINDOW": "弹出页面使用新窗口代替新选项卡",
-		"MAILTO": "注册成 mailto: 链接处理器"
+		"MAILTO": "注册成 mailto: 链接处理器",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "自动添加到您的地址簿",
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html
index b9bc9e544..b52152d44 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html
@@ -20,6 +20,9 @@
 
 <br>
 
+<input type="search" data-bind="textInput: search" data-i18n="[placeholder]GLOBAL/SEARCH">
+<br>
+
 <div data-bind="visible: packagesUpdate().length">
 	<div class="legend">
 		<span data-i18n="TAB_PACKAGES/LEGEND_AVAILABLE_FOR_UPDATE"></span>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsPlugin.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsPlugin.html
index 9004276c6..6d9a1090d 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsPlugin.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsPlugin.html
@@ -7,26 +7,44 @@
 	<span data-bind="visible: hasReadme, text: readme"></span>
 </header>
 <div class="modal-body">
-	<form class="form-horizontal plugin-form" action="#/" spellcheck="false" onsubmit="return false;">
-		<div class="alert alert-info" data-bind="visible: !hasConfiguration()" data-i18n="POPUPS_PLUGIN/DESC_NOTHING_TO_CONFIGURE"></div>
-		<div class="alert" data-bind="visible: '' !== saveError()">
-			<a href="#" class="close" data-bind="click: hideError">×</a>
-			<span data-bind="text: saveError"></span>
-		</div>
-		<div data-bind="foreach: config, visible: hasConfiguration">
-			<!-- ko if: 7 == type -->
-			<details open="">
-				<summary class="legend" data-bind="text: label"></summary>
-				<div data-bind="foreach: config">
-					<div class="control-group" data-bind="template: { name: 'AdminSettingsPluginProperty' }"></div>
+	<div class="tabs">
+		<input type="radio" name="tabs" id="tab-extension-config" checked>
+		<label for="tab-extension-config" role="tab" tabindex="0">Config</label>
+		<div class="tab-content" role="tabpanel" aria-hidden="false">
+			<form class="form-horizontal plugin-form" action="#/" spellcheck="false" onsubmit="return false;">
+				<div class="alert alert-info" data-bind="visible: !hasConfiguration()" data-i18n="POPUPS_PLUGIN/DESC_NOTHING_TO_CONFIGURE"></div>
+				<div class="alert" data-bind="visible: '' !== saveError()">
+					<a href="#" class="close" data-bind="click: hideError">×</a>
+					<span data-bind="text: saveError"></span>
 				</div>
-			</details>
-			<!-- /ko -->
-			<!-- ko if: 7 != type -->
-			<div class="control-group" data-bind="template: { name: 'AdminSettingsPluginProperty' }"></div>
-			<!-- /ko -->
+				<div data-bind="foreach: config, visible: hasConfiguration">
+					<!-- ko if: 7 == type -->
+					<details open="">
+						<summary class="legend" data-bind="text: label"></summary>
+						<div data-bind="foreach: config">
+							<div class="control-group" data-bind="template: { name: 'AdminSettingsPluginProperty' }"></div>
+						</div>
+					</details>
+					<!-- /ko -->
+					<!-- ko if: 7 != type -->
+					<div class="control-group" data-bind="template: { name: 'AdminSettingsPluginProperty' }"></div>
+					<!-- /ko -->
+				</div>
+			</form>
 		</div>
-	</form>
+
+		<input type="radio" name="tabs" id="tab-extension-info">
+		<label for="tab-extension-info" role="tab" tabindex="0">Info</label>
+		<div class="tab-content" role="tabpanel" aria-hidden="true"><tbody>
+			<table><tbody>
+				<tr><td>Author</td><td data-bind="text: author"></td></tr>
+				<tr><td>Website</td><td><a data-bind="attr:{href: url}, text: url"></a></td></tr>
+				<tr><td>Version</td><td data-bind="text: version"></td></tr>
+				<tr><td>Date</td><td data-bind="text: released"></td></tr>
+			</tbody>
+			</table>
+		</div>
+	</div>
 </div>
 <footer>
 	<a class="btn buttonClose" data-bind="click: close" data-icon="✖" data-i18n="GLOBAL/CLOSE"></a>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
index 689530966..1b5742244 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
@@ -330,7 +330,7 @@
 						</div>
 					</div>
 
-					<div class="bodyText"></div>
+					<div class="bodyText" dir="auto"></div>
 				</div>
 			</div>
 		</div>
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 0a81f0c90..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
@@ -91,43 +91,41 @@
 					<div class="control-group">
 						<label class="fontastic iconsize24">👤</label>
 						<div>
-							<div class="property-line" data-i18n="[title]CONTACTS/PLACEHOLDER_ENTER_FIRST_NAME">
+							<div class="property-line" data-i18n="[title]CONTACTS/FIRST_NAME">
 								<span data-bind="text: givenName"></span>
 								<input type="text"
 									autocomplete="off" autocorrect="off" autocapitalize="off"
-									data-bind="textInput: givenName" data-i18n="[placeholder]CONTACTS/PLACEHOLDER_ENTER_FIRST_NAME">
+									data-bind="textInput: givenName" data-i18n="[placeholder]CONTACTS/FIRST_NAME">
 							</div>
-							<div class="property-line" data-i18n="[title]CONTACTS/PLACEHOLDER_ENTER_LAST_NAME">
+							<div class="property-line" data-i18n="[title]CONTACTS/LAST_NAME">
 								<span data-bind="text: surName"></span>
 								<input type="text"
 									autocomplete="off" autocorrect="off" autocapitalize="off"
-									data-bind="textInput: surName" data-i18n="[placeholder]CONTACTS/PLACEHOLDER_ENTER_LAST_NAME">
+									data-bind="textInput: surName" data-i18n="[placeholder]CONTACTS/LAST_NAME">
 							</div>
-<!--
-							<div class="property-line" data-i18n="[title]CONTACTS/PLACEHOLDER_ENTER_MIDDLE_NAME">
+							<div class="property-line" data-i18n="[title]CONTACTS/MIDDLE_NAME">
 								<span data-bind="text: middleName"></span>
 								<input type="text"
 									autocomplete="off" autocorrect="off" autocapitalize="off"
-									data-bind="textInput: middleName" data-i18n="[placeholder]CONTACTS/PLACEHOLDER_ENTER_MIDDLE_NAME">
+									data-bind="textInput: middleName" data-i18n="[placeholder]CONTACTS/MIDDLE_NAME">
 							</div>
-							<div class="property-line" data-i18n="[title]CONTACTS/PLACEHOLDER_ENTER_NAME_PREFIX">
+							<div class="property-line" data-i18n="[title]CONTACTS/NAME_PREFIX">
 								<span data-bind="text: namePrefix"></span>
 								<input type="text"
 									autocomplete="off" autocorrect="off" autocapitalize="off"
-									data-bind="textInput: namePrefix" data-i18n="[placeholder]CONTACTS/PLACEHOLDER_ENTER_NAME_PREFIX">
+									data-bind="textInput: namePrefix" data-i18n="[placeholder]CONTACTS/NAME_PREFIX">
 							</div>
-							<div class="property-line" data-i18n="[title]CONTACTS/PLACEHOLDER_ENTER_NAME_SUFFIX">
+							<div class="property-line" data-i18n="[title]CONTACTS/NAME_SUFFIX">
 								<span data-bind="text: nameSuffix"></span>
 								<input type="text"
 									autocomplete="off" autocorrect="off" autocapitalize="off"
-									data-bind="textInput: nameSuffix" data-i18n="[placeholder]CONTACTS/PLACEHOLDER_ENTER_NAME_SUFFIX">
+									data-bind="textInput: nameSuffix" data-i18n="[placeholder]CONTACTS/NAME_SUFFIX">
 							</div>
--->
 							<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"
 									autocomplete="off" autocorrect="off" autocapitalize="off"
-									data-bind="textInput: nickname" data-i18n="[placeholder]CONTACTS/PLACEHOLDER_ENTER_NICK_NAME">
+									data-bind="textInput: nickname" data-i18n="[placeholder]CONTACTS/NICK_NAME">
 							</div>
 						</div>
 					</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
index 2ebd054d1..3c0e2ff12 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
@@ -11,7 +11,7 @@
 
 	<div class="control-group" data-bind="css: {'error': nameError}, hidden: exists">
 		<input type="text" class="span5"
-			data-bind="value: name, hasfocus: !exists()"
+			data-bind="value: name"
 			autocorrect="off" autocapitalize="off"
 			data-i18n="[placeholder]GLOBAL/NAME">
 	</div>
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 425219a7c..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
@@ -49,15 +49,8 @@
 			<div data-bind="component: {
 				name: 'Checkbox',
 				params: {
-					label: 'SETTINGS_GENERAL/REPLY_SAME_FOLDER',
-					value: replySameFolder
-				}
-			}"></div>
-			<div data-bind="component: {
-				name: 'Checkbox',
-				params: {
-					label: 'SETTINGS_GENERAL/SHOW_NEXT_MESSAGE',
-					value: showNextMessage
+					label: 'SETTINGS_GENERAL/HTML_TO_MD',
+					value: markdown
 				}
 			}"></div>
 		</div>
@@ -109,90 +102,6 @@
 		<select data-bind="options: threadAlgorithms, value: threadAlgorithm"></select>
 	</div>
 
-	<div class="legend" data-i18n="SHORTCUTS_HELP/TAB_COMPOSE"></div>
-	<div class="control-group">
-		<label data-i18n="SETTINGS_GENERAL/EDITOR"></label>
-		<div data-bind="component: {
-			name: 'Select',
-			params: {
-				options: editorDefaultTypes,
-				value: editorDefaultType,
-				trigger: editorDefaultTypeTrigger,
-				optionsText: 'name',
-				optionsValue: 'id'
-			}
-		}"></div>
-	</div>
-	<div class="control-group" data-bind="visible: hasWysiwygs">
-		<label>WYSIWYG</label>
-		<div data-bind="component: {
-			name: 'Select',
-			params: {
-				options: wysiwygs,
-				value: editorWysiwyg,
-				trigger: editorWysiwygTrigger,
-				optionsText: 'name',
-				optionsValue: 'name'
-			}
-		}"></div>
-	</div>
-
-	<div class="control-group">
-		<div>
-			<div data-bind="component: {
-				name: 'Checkbox',
-				params: {
-					label: 'COMPOSE/ALLOW_DRAFT_AUTOSAVE',
-					value: allowDraftAutosave
-				}
-			}"></div>
-			<div data-bind="component: {
-				name: 'Checkbox',
-				params: {
-					label: 'COMPOSE/BUTTON_REQUEST_READ_RECEIPT',
-					value: requestReadReceipt
-				}
-			}"></div>
-			<div data-bind="component: {
-				name: 'Checkbox',
-				params: {
-					label: 'COMPOSE/BUTTON_REQUEST_DSN',
-					value: requestDsn
-				}
-			}"></div>
-			<div data-bind="component: {
-				name: 'Checkbox',
-				params: {
-					label: 'COMPOSE/BUTTON_REQUIRE_TLS',
-					value: requireTLS
-				}
-			}"></div>
-			<div data-bind="component: {
-				name: 'Checkbox',
-				params: {
-					label: 'CRYPTO/SIGN',
-					value: pgpSign
-				}
-			}"></div>
-			<div data-bind="component: {
-				name: 'Checkbox',
-				params: {
-					label: 'CRYPTO/ENCRYPT',
-					value: pgpEncrypt
-				}
-			}"></div>
-			<div data-bind="component: {
-				name: 'Checkbox',
-				params: {
-					label: 'COMPOSE/ALLOW_SPELLCHECK',
-					value: allowSpellcheck
-				}
-			}"></div>
-		</div>
-	</div>
-
-	<button type="button" data-bind="visible: mailto, click: registerMailto" class="btn" data-i18n="SETTINGS_GENERAL/MAILTO"></button>
-
 	<div class="legend" data-i18n="SHORTCUTS_HELP/TAB_MESSAGE_VIEW"></div>
 	<div class="control-group">
 		<div data-bind="component: {
@@ -267,6 +176,13 @@
 				}
 			}"></div>
 			<em style="margin: 0 0 1em 2em;display: block;" data-i18n="SETTINGS_GENERAL/PREFER_HTML_INFO"></em>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/SHOW_NEXT_MESSAGE',
+					value: showNextMessage
+				}
+			}"></div>
 			<div data-bind="component: {
 				name: 'Checkbox',
 				params: {
@@ -302,6 +218,97 @@
 		</div>
 	</div>
 
+	<div class="legend" data-i18n="SHORTCUTS_HELP/TAB_COMPOSE"></div>
+	<div class="control-group">
+		<label data-i18n="SETTINGS_GENERAL/EDITOR"></label>
+		<div data-bind="component: {
+			name: 'Select',
+			params: {
+				options: editorDefaultTypes,
+				value: editorDefaultType,
+				trigger: editorDefaultTypeTrigger,
+				optionsText: 'name',
+				optionsValue: 'id'
+			}
+		}"></div>
+	</div>
+	<div class="control-group" data-bind="visible: hasWysiwygs">
+		<label>WYSIWYG</label>
+		<div data-bind="component: {
+			name: 'Select',
+			params: {
+				options: wysiwygs,
+				value: editorWysiwyg,
+				trigger: editorWysiwygTrigger,
+				optionsText: 'name',
+				optionsValue: 'name'
+			}
+		}"></div>
+	</div>
+
+	<div class="control-group">
+		<div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/REPLY_SAME_FOLDER',
+					value: replySameFolder
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'COMPOSE/ALLOW_DRAFT_AUTOSAVE',
+					value: allowDraftAutosave
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'COMPOSE/BUTTON_REQUEST_READ_RECEIPT',
+					value: requestReadReceipt
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'COMPOSE/BUTTON_REQUEST_DSN',
+					value: requestDsn
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'COMPOSE/BUTTON_REQUIRE_TLS',
+					value: requireTLS
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'CRYPTO/SIGN',
+					value: pgpSign
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'CRYPTO/ENCRYPT',
+					value: pgpEncrypt
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'COMPOSE/ALLOW_SPELLCHECK',
+					value: allowSpellcheck
+				}
+			}"></div>
+		</div>
+	</div>
+
+	<button type="button" data-bind="visible: mailto, click: registerMailto" class="btn" data-i18n="SETTINGS_GENERAL/MAILTO"></button>
+
 	<div class="legend" data-i18n="SETTINGS_GENERAL/NOTIFICATIONS"></div>
 	<div class="control-group">
 		<div>
diff --git a/tasks/config.js b/tasks/config.js
index 01bd89b2a..02aa050a6 100644
--- a/tasks/config.js
+++ b/tasks/config.js
@@ -63,8 +63,9 @@ config.paths.js = {
 			'vendors/bootstrap/js/bootstrap.native.js',
 			'vendors/knockout/build/output/knockout-latest.js',
 //			'vendors/knockout/build/output/knockout-latest.debug.js',
-			'vendors/squire/build/squire-raw.js',
+			'vendors/squire2/dist/squire-raw.js',
 			'vendors/mathiasbynens/punycode.js',
+			'vendors/turndown/turndown.js',
 			'dev/External/SquireUI.js'
 		]
 	},
diff --git a/vendors/bootstrap/less/forms.less b/vendors/bootstrap/less/forms.less
index 448ae63c1..f9da001c0 100644
--- a/vendors/bootstrap/less/forms.less
+++ b/vendors/bootstrap/less/forms.less
@@ -62,6 +62,12 @@ input {
   }
 }
 
+//input:invalid,
+input:user-invalid {
+  background-color: var(--error-bg-clr, #f2dede);
+  border-color: var(--error-border-clr, #eed3d7);
+  color: var(--error-clr, #b94a48);
+}
 
 // Position radios and checkboxes better
 input[type="radio"],
diff --git a/vendors/knockout/build/output/knockout-latest.debug.js b/vendors/knockout/build/output/knockout-latest.debug.js
index 28307b49b..973c91677 100644
--- a/vendors/knockout/build/output/knockout-latest.debug.js
+++ b/vendors/knockout/build/output/knockout-latest.debug.js
@@ -51,6 +51,7 @@ ko.utils = {
             : node => node.cloneNode(true)),
 
     setDomNodeChildren: (domNode, childNodes) => {
+//        domNode.replaceChildren(...childNodes);
         ko.utils.emptyDomNode(domNode);
         childNodes && domNode.append(...childNodes);
     },
@@ -1361,9 +1362,9 @@ ko.expressionRewriting = (() => {
         divisionLookBehind = /[\])"'A-Za-z0-9_$]+$/,
         keywordRegexLookBehind = {'in':1,'return':1,'typeof':1},
 
-        parseObjectLiteral = objectLiteralString => {
+        preProcessBindings = bindingsStringOrKeyValueArray => {
             // Trim leading and trailing spaces from the string
-            var str = ko.utils.stringTrim(objectLiteralString);
+            var str = ko.utils.stringTrim(bindingsStringOrKeyValueArray);
 
             // Trim braces '{' surrounding the whole object literal
             if (str.charCodeAt(0) === 123) str = str.slice(1, -1);
@@ -1382,9 +1383,10 @@ ko.expressionRewriting = (() => {
                     // A comma signals the end of a key/value pair if depth is zero
                     if (c === 44) { // ","
                         if (depth <= 0) {
-                            result.push((key && values.length)
-                                ? {key: key, value: values.join('')}
-                                : {'unknown': key || values.join('')});
+                            if (key && values.length) {
+                                // Values are wrapped in a function so that each value can be accessed independently
+                                result.push("'" + key + "':()=>(" + values.join('') + ")");
+                            }
                             key = depth = 0;
                             values = [];
                             continue;
@@ -1425,40 +1427,20 @@ ko.expressionRewriting = (() => {
                     throw Error("Unbalanced parentheses, braces, or brackets");
                 }
             }
-            return result;
-        },
 
-        preProcessBindings = (bindingsStringOrKeyValueArray) => {
+            result.push("'$data':()=>$data");
 
-            var resultStrings = [],
-//                propertyAccessorResultStrings = [],
-                keyValueArray = parseObjectLiteral(bindingsStringOrKeyValueArray),
-
-                processKeyValue = (key, val) => {
-                    // Values are wrapped in a function so that each value can be accessed independently
-                    val = 'function(){return ' + val + ' }';
-                    resultStrings.push("'" + key + "':" + val);
-                };
-
-            keyValueArray.forEach(keyValue =>
-                processKeyValue(keyValue.key || keyValue['unknown'], keyValue.value)
-            );
-/*
-            if (propertyAccessorResultStrings.length)
-                processKeyValue('_ko_property_writers', "{" + propertyAccessorResultStrings.join(",") + " }");
-*/
-            return resultStrings.join(",");
+            return result.join(",");
         };
 
     return {
-        parseObjectLiteral: parseObjectLiteral,
-
         preProcessBindings: preProcessBindings,
 
         keyValueArrayContainsKey: (keyValueArray, key) =>
             -1 < keyValueArray.findIndex(v => v['key'] == key),
 
         // Internal, private KO utility for updating model properties from within bindings
+        // element:             the HTML element it belongs to
         // property:            If the property being updated is (or might be) an observable, pass it here
         //                      If it turns out to be a writable observable, it will be written to directly
         // allBindings:         An object with a get method to retrieve bindings in the current execution context.
@@ -1467,10 +1449,11 @@ ko.expressionRewriting = (() => {
         // value:               The value to be written
         // checkIfDifferent:    If true, and if the property being written is a writable observable, the value will only be written if
         //                      it is !== existing value on that writable observable
-        writeValueToProperty: (property, allBindings, key, value, checkIfDifferent) => {
+        writeValueToProperty: (element, property, allBindings, key, value, checkIfDifferent) => {
             if (!property || !ko.isObservable(property)) {
-                throw Error(`${key} , must be observable`);
-//                allBindings.get('_ko_property_writers')?.[key]?.(value);
+                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)) {
                 property(value);
             }
@@ -1639,12 +1622,13 @@ ko.bindingProvider = new class
                     // 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
                     var rewrittenBindings = ko.expressionRewriting.preProcessBindings(bindingsString),
-                        functionBody = "with($context){with($data||{}){return{" + rewrittenBindings + "}}}";
-                    bindingFunction = new Function("$context", "$element", functionBody);
+                        functionBody = "with($data){return{" + rewrittenBindings + "}}";
+                    bindingFunction = new Function("$root", "$parent", "$data", "$element", functionBody);
                     bindingCache.set(cacheKey, bindingFunction);
                 }
-                return bindingFunction(bindingContext, node);
+                return bindingFunction(bindingContext["$root"], bindingContext["$parent"], bindingContext["$data"] || {}, node);
             } catch (ex) {
                 ex.message = "Unable to parse bindings.\nBindings value: " + bindingsString
                     + "\nMessage: " + ex.message;
@@ -1699,11 +1683,6 @@ ko.bindingContext = class {
                 }
             } else {
                 self['$root'] = dataItem;
-
-                // Export 'ko' in the binding context so it will be available in bindings and templates
-                // even if 'ko' isn't exported as a global, such as when using an AMD loader.
-                // See https://github.com/SteveSanderson/knockout/issues/490
-                self['ko'] = ko;
             }
 
             self[contextSubscribable] = subscribable;
@@ -2352,7 +2331,7 @@ ko.bindingHandlers['checked'] = {
                             elemValue = undefined;
                         }
                     }
-                    ko.expressionRewriting.writeValueToProperty(modelValue, allBindings, 'checked', elemValue, true);
+                    ko.expressionRewriting.writeValueToProperty(element, modelValue, allBindings, 'checked', elemValue, true);
                 }
             }
 
@@ -2513,7 +2492,7 @@ ko.bindingHandlers['hasfocus'] = {
             // Discussion at https://github.com/SteveSanderson/knockout/pull/352
             element[hasfocusUpdatingProperty] = true;
             isFocused = (element.ownerDocument.activeElement === element);
-            ko.expressionRewriting.writeValueToProperty(valueAccessor(), allBindings, 'hasfocus', isFocused, true);
+            ko.expressionRewriting.writeValueToProperty(element, valueAccessor(), allBindings, 'hasfocus', isFocused, true);
 
             //cache the latest value, so we can avoid unnecessarily calling focus/blur in the update function
             element[hasfocusLastValue] = isFocused;
@@ -2821,10 +2800,10 @@ ko.bindingHandlers['textInput'] = {
             elementValueBeforeEvent = timeoutHandle = undefined;
 
             var elementValue = element.value;
-            if (previousElementValue !== elementValue) {
+            if (element.checkValidity() && previousElementValue !== elementValue) {
                 // Provide a way for tests to know exactly which event was processed
                 previousElementValue = elementValue;
-                ko.expressionRewriting.writeValueToProperty(valueAccessor(), allBindings, 'textInput', elementValue);
+                ko.expressionRewriting.writeValueToProperty(element, valueAccessor(), allBindings, 'textInput', elementValue);
             }
         };
 
@@ -2877,7 +2856,7 @@ ko.bindingHandlers['value'] = {
                 elementValueBeforeEvent = null;
                 var modelValue = valueAccessor();
                 var elementValue = ko.selectExtensions.readValue(element);
-                ko.expressionRewriting.writeValueToProperty(modelValue, allBindings, 'value', elementValue);
+                ko.expressionRewriting.writeValueToProperty(element, modelValue, allBindings, 'value', elementValue);
             };
 
         if (requestedEventsToCatch) {
diff --git a/vendors/knockout/build/output/knockout-latest.js b/vendors/knockout/build/output/knockout-latest.js
index 74ae8a38e..645811e44 100644
--- a/vendors/knockout/build/output/knockout-latest.js
+++ b/vendors/knockout/build/output/knockout-latest.js
@@ -8,61 +8,60 @@
 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=[],n,p=0;p<f.length;p++)if(!h||8===f[p].nodeType)if(g(k[k.length]=n=f[p]),f[p]!==n)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)}}})();
+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=(n,p)=>{p&&"change"!==p?"beforeChange"===p?b.gb(n):b.ra(n,p):b.hb(n)});var k=a(()=>{b.ea=!1;d&&f===b&&(f=b.fb?b.fb():b());var n=g||h&&b.Ba(l,f);h=g=e=!1;n&&b.ra(l=f)});b.hb=(n,p)=>{p&&b.ea||(h=!p);b.Eb=new Set(b.R.get("change"));b.ea=e=!0;f=n;k()};b.gb=n=>{e||(l=n,b.ra(n,"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]",
+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(n,q,a.Ka);
-var r=l}n=q;l=null;k=0;r?.length&&a.B(r,"arrayChange")}}function e(){g?d():(g=!0,h=a.subscribe(()=>++k,null,"spectate"),n=[].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,n,p=a.Ja,m=a.Ia;a.Ja=q=>{p?.call(a,q);"arrayChange"===q&&e()};a.Ia=q=>{m?.call(a,q);"arrayChange"!==q||a.na("arrayChange")||(f?.dispose(),h?.dispose(),h=f=null,g=!1,n=void 0)};a.pb=(q,r,u)=>{if(g&&!k){var t=[],z=q.length,w=u.length,y=0,B=
+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},fc(){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&&
+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},e=g=>{g=c.g.Bb(g);123===g.charCodeAt(0)&&(g=g.slice(1,-1));g+="\n,";var l=[],f=g.match(a),h=[],k=0;if(1<f.length){for(var n=0,p;p=f[n++];){var m=p.charCodeAt(0);if(44===m){if(0>=k){l.push(q&&h.length?{key:q,value:h.join("")}:{unknown:q||h.join("")});var q=k=0;h=[];continue}}else if(58===m){if(!k&&!q&&1===h.length){q=h.pop();continue}}else if(47===m&&1<p.length&&(47===p.charCodeAt(1)||42===p.charCodeAt(1)))continue;else 47===m&&n&&1<p.length?
-(m=f[n-1].match(b))&&!d[m[0]]&&(g=g.slice(g.indexOf(p)+1),f=g.match(a),n=-1,p="/"):40===m||123===m||91===m?++k:41===m||125===m||93===m?--k:q||h.length||34!==m&&39!==m||(p=p.slice(1,-1));h.push(p)}if(0<k)throw Error("Unbalanced parentheses, braces, or brackets");}return l};return{ec:e,Yb:g=>{var l=[];e(g).forEach(f=>{l.push("'"+(f.key||f.unknown)+"':function(){return "+(f.value+" }"))});return l.join(",")},cc:(g,l)=>-1<g.findIndex(f=>f.key==l),Ga:(g,l,f,h,k)=>{if(g&&c.W(g))!c.vb(g)||k&&g.L()===h||
-g(h);else throw Error(`${f} , must be observable`);}}})();(()=>{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,n=1,p=[];k=k.nextSibling;){if(b(k)&&(c.g.l.set(k,l,!0),!--n))return p;p.push(k);a(k)&&++n}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($context){with($data||{}){return{"+
-c.la.Yb(d)+"}}}";g=new Function("$context","$element",e);T.set(d,g)}return g(b,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.ko=c);g[G]=n;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 n=c.xb(a);n.L();n.isActive()?n.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 n=f?m=>()=>f()[m]():m=>l[m],p={get:m=>l[m]&&n(m)(),has:m=>m in l};c.j.F in l&&c.j.subscribe(a,c.j.F,()=>{var m=l[c.j.F]();if(m){var q=c.m.childNodes(a);q.length&&m(q,c.dataFor(q[0]))}});c.j.ca in l&&(h=c.j.$a(a,d),c.j.subscribe(a,c.j.ca,()=>{var m=l[c.j.ca]();m&&c.m.firstChild(a)&&m(a)}));na(l).forEach(m=>{var q=m.ub.init,r=m.ub.update,u=m.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,n(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,n(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]||{},n=k.template;k=k.viewModel;if(n){n.element||e(l,"Unknown template value: "+n);n=n.element;var p=J.getElementById(n);p||e(l,"Cannot find element with ID "+n);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,n=()=>{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,n);c.o(()=>{var p=c.g.h(d());if("string"!==typeof p){var m=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){n();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(m,{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 m=c.xb(()=>{if(d.has("checkedValue"))return c.g.h(d.get("checkedValue"));if(n)return d.has("value")?c.g.h(d.get("value")):a.value});var l=()=>{if(!c.u.Ca()){var q=a.checked,r=m();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(u,d,"checked",r,!0)}}},f=b(),h=e&&c.g.h(f)instanceof Array,k=!(h&&f.push&&f.splice),n=g||h,p=h?m():void 0;c.o(l,null,{s:a});a.addEventListener("click",l);c.o(()=>{var q=c.g.h(b()),r=m();h?(a.checked=q.includes(r),p=r):a.checked=e&&void 0===r?!!q:m()===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(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 n,p={};d&&(p={exportDependencies:!0});var m=f.has(c.j.ca);c.o(()=>{var q=c.g.h(l()),r=!e!==!q,u=!n;m&&(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()&&(n=c.g.ua(c.m.childNodes(g),!0));r?(u||c.m.pa(g,c.g.ua(n)),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(m=>m.selected);var h=(m,q,r)=>{var u=typeof q;return"function"==u?q(m):"string"==u?m[q]:r},k=(m,q)=>{f.length&&(m=f.includes(c.C.M(q[0])),q[0].selected=m,p&&!m&&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 n=l.filter(m=>m??1)}var p=!1;l=k;d.has("optionsAfterRender")&&"function"==typeof d.get("optionsAfterRender")&&(l=(m,q)=>{k(m,q);c.u.I(d.get("optionsAfterRender"),null,[q[0],m!==ba?m:void 0])});c.g.Ab(a,n,(m,q,r)=>{r.length&&(f=r[0].selected?[c.C.M(r[0])]:[],p=!0);q=a.ownerDocument.createElement("option");m===ba?(c.g.Za(q),c.C.Fa(q,void 0)):(r=h(m,d.get("optionsValue"),m),c.C.Fa(q,c.g.h(r)),
-m=h(m,d.get("optionsText"),r),c.g.Za(q,m));return[q]},{},l);n=f.length;(e?n&&b().length<n:n&&0<=a.selectedIndex?c.C.M(a.options[a.selectedIndex])!==f[0]:n||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;e!==k&&(e=k,c.la.Ga(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 m=b(),q=c.C.M(a);c.la.Ga(m,d,"value",
-q)};f&&("string"==typeof f?l.add(f):f.forEach(m=>l.add(m)),l.delete("change"));l.forEach(m=>{var q=k;(m||"").startsWith("after")&&(q=()=>{h=c.C.M(a);setTimeout(k,0)},m=m.slice(5));a.addEventListener(m,q)});var n=g&&"file"==a.type?()=>{var m=c.g.h(b());null==m||""===m?a.value="":c.u.I(k)}:()=>{var m=c.g.h(b()),q=c.C.M(a);if(null!==h&&m===h)setTimeout(n,0);else if(m!==q||void 0===q)e?(c.C.Fa(a,m),m!==c.C.M(a)&&c.u.I(k)):c.C.Fa(a,m)};if(e){var p;c.j.subscribe(a,c.j.F,()=>{p?d.get("valueAllowUnset")?
-n():k():(a.addEventListener("change",k),p=c.o(n,{s:a}))},null,{notifyImmediately:!0})}else a.addEventListener("change",k),c.o(n,{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,n)=>{var p;for(k=c.m.nextSibling(k);h&&(p=h)!==k;)h=c.m.nextSibling(p),n(p,h)},b=(h,k)=>{if(h.length){var n=h[0],p=n.parentNode;a(n,h[h.length-1],m=>(1===m.nodeType||8===m.nodeType)&&
-c.Ib(k,m));c.g.xa(h,p)}},d=(h,k,n,p)=>{var m=(h&&(h.nodeType?h:0<h.length?h[0]:null)||n||{}).ownerDocument;if("string"==typeof n){m=m||J;m=m.getElementById(n);if(!m)throw Error("Cannot find template with ID "+n);n=new c.bb.Na(m)}else if([1,8].includes(n.nodeType))n=new c.bb.lb(n);else throw Error("Unknown template type: "+n);n=(n=n.Ua?n.Ua():null)?[...n.cloneNode(!0).childNodes]:null;if(!Array.isArray(n)||0<n.length&&"number"!=typeof n[0].nodeType)throw Error("Template engine must return an array of DOM nodes");
-k&&(c.m.pa(h,n),b(n,p),c.j.notify(h,c.j.F));return n},e=(h,k,n)=>c.W(h)?h():"function"===typeof h?h(k,n):h,g=(h,k,n,p)=>{n=n||{};if(p){var m=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,n)},{ia:()=>!m||!c.g.Pa(m),s:m})}console.log("no targetNodeOrNodeArray")},l=(h,k,n,p,m)=>{var q,r=(w,y)=>{q=m.createChildContext(w,{extend:B=>B.$index=y});w=e(h,w,q);return d(p,!1,w,q,n)},u=(w,y)=>{b(y,q);q=null},
-t=(w,y)=>{c.u.I(c.g.Ab,null,[p,w,r,n,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,n,p,m)=>{p=k();k=c.g.h(p);n=null;"string"==typeof k?k={}:p="name"in k?k.name:h;var q=!!p;"foreach"in k?n=l(p,q&&k.foreach||[],k,h,m):q?(n=m,"data"in k&&(n=m.createChildContext(k.data,{exportDependencies:!0})),n=g(p,n,k,h)):c.m.ja(h);m=n;c.g.l.get(h,f)?.dispose?.();c.g.l.set(h,f,!m||m.isActive&&!m.isActive()?void 0:m)}};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=[],n=-1,p=b.length,m,q=d.length,r=q-p||1,u=p+q+1,t,z,w;++n<=p;)for(z=t,k.push(t=[]),w=f(q,n+r),m=h(0,n-1);m<=w;m++)t[m]=m?n?b[n-1]===d[m-1]?z[m-1]:f(z[m]||u,t[m-1]||u)+1:m+1:n+1;f=[];h=[];r=[];n=p;for(m=q;n||m;)q=k[n][m]-1,m&&q===k[n][m-1]?h.push(f[f.length]={status:e,value:d[--m],index:m}):n&&q===k[n-1][m]?r.push(f[f.length]={status:g,value:b[--n],index:n}):(--m,--n,l.sparse||f.push({status:"retained",
-value:d[m]}));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=[],n=c.o(()=>{var p=g(l,h,c.g.xa(k,e))||[];if(0<k.length){var m=k.nodeType?[k]:k;if(0<m.length){var q=m[0],r=q.parentNode;p.forEach(u=>r.insertBefore(u,q));m.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:n.isActive()?n: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 n=c.g.l.get(e,b),p=[],m=0,q=0,r=[],u=[],t,z=v=>{t={sa:v,Ta:c.$(q++)};p.push(t)},w=v=>{t=n[v];t.Ta(q++);c.g.xa(t.O,e);p.push(t)};if(n){if(!k||n&&n._countWaitingForRemove)k=c.g.qb(Array.prototype.map.call(n,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(;m<F;)w(m++);void 0===v&&(t=n[m],t.La&&(t.La.dispose(),t.La=void 0),c.g.xa(t.O,e).length&&t&&r.push.apply(r,
-t.O));m++;break;case "added":for(;q<F;)w(m++);void 0!==v?(u.push(p.length),w(v)):z(C.value)}});q<g.length;)w(m++);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);
+"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("$root","$parent","$data","$element",e);T.set(d,g)}return g(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 90a6aa4fd..c15da0dba 100644
--- a/vendors/knockout/src/binding/bindingAttributeSyntax.js
+++ b/vendors/knockout/src/binding/bindingAttributeSyntax.js
@@ -43,11 +43,6 @@ ko.bindingContext = class {
                 }
             } else {
                 self['$root'] = dataItem;
-
-                // Export 'ko' in the binding context so it will be available in bindings and templates
-                // even if 'ko' isn't exported as a global, such as when using an AMD loader.
-                // See https://github.com/SteveSanderson/knockout/issues/490
-                self['ko'] = ko;
             }
 
             self[contextSubscribable] = subscribable;
diff --git a/vendors/knockout/src/binding/bindingProvider.js b/vendors/knockout/src/binding/bindingProvider.js
index 86e7b7d76..e87b34905 100644
--- a/vendors/knockout/src/binding/bindingProvider.js
+++ b/vendors/knockout/src/binding/bindingProvider.js
@@ -35,12 +35,13 @@ ko.bindingProvider = new class
                     // 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
                     var rewrittenBindings = ko.expressionRewriting.preProcessBindings(bindingsString),
-                        functionBody = "with($context){with($data||{}){return{" + rewrittenBindings + "}}}";
-                    bindingFunction = new Function("$context", "$element", functionBody);
+                        functionBody = "with($data){return{" + rewrittenBindings + "}}";
+                    bindingFunction = new Function("$root", "$parent", "$data", "$element", functionBody);
                     bindingCache.set(cacheKey, bindingFunction);
                 }
-                return bindingFunction(bindingContext, node);
+                return bindingFunction(bindingContext["$root"], bindingContext["$parent"], bindingContext["$data"] || {}, node);
             } catch (ex) {
                 ex.message = "Unable to parse bindings.\nBindings value: " + bindingsString
                     + "\nMessage: " + ex.message;
diff --git a/vendors/knockout/src/binding/defaultBindings/checked.js b/vendors/knockout/src/binding/defaultBindings/checked.js
index 2209838f6..864dc3fd8 100644
--- a/vendors/knockout/src/binding/defaultBindings/checked.js
+++ b/vendors/knockout/src/binding/defaultBindings/checked.js
@@ -69,7 +69,7 @@ ko.bindingHandlers['checked'] = {
                             elemValue = undefined;
                         }
                     }
-                    ko.expressionRewriting.writeValueToProperty(modelValue, allBindings, 'checked', elemValue, true);
+                    ko.expressionRewriting.writeValueToProperty(element, modelValue, allBindings, 'checked', elemValue, true);
                 }
             }
 
diff --git a/vendors/knockout/src/binding/defaultBindings/hasfocus.js b/vendors/knockout/src/binding/defaultBindings/hasfocus.js
index b9ab712e5..6805d894d 100644
--- a/vendors/knockout/src/binding/defaultBindings/hasfocus.js
+++ b/vendors/knockout/src/binding/defaultBindings/hasfocus.js
@@ -11,7 +11,7 @@ ko.bindingHandlers['hasfocus'] = {
             // Discussion at https://github.com/SteveSanderson/knockout/pull/352
             element[hasfocusUpdatingProperty] = true;
             isFocused = (element.ownerDocument.activeElement === element);
-            ko.expressionRewriting.writeValueToProperty(valueAccessor(), allBindings, 'hasfocus', isFocused, true);
+            ko.expressionRewriting.writeValueToProperty(element, valueAccessor(), allBindings, 'hasfocus', isFocused, true);
 
             //cache the latest value, so we can avoid unnecessarily calling focus/blur in the update function
             element[hasfocusLastValue] = isFocused;
diff --git a/vendors/knockout/src/binding/defaultBindings/textInput.js b/vendors/knockout/src/binding/defaultBindings/textInput.js
index b0560250a..0199080f2 100644
--- a/vendors/knockout/src/binding/defaultBindings/textInput.js
+++ b/vendors/knockout/src/binding/defaultBindings/textInput.js
@@ -10,10 +10,10 @@ ko.bindingHandlers['textInput'] = {
             elementValueBeforeEvent = timeoutHandle = undefined;
 
             var elementValue = element.value;
-            if (previousElementValue !== elementValue) {
+            if (element.checkValidity() && previousElementValue !== elementValue) {
                 // Provide a way for tests to know exactly which event was processed
                 previousElementValue = elementValue;
-                ko.expressionRewriting.writeValueToProperty(valueAccessor(), allBindings, 'textInput', elementValue);
+                ko.expressionRewriting.writeValueToProperty(element, valueAccessor(), allBindings, 'textInput', elementValue);
             }
         };
 
diff --git a/vendors/knockout/src/binding/defaultBindings/value.js b/vendors/knockout/src/binding/defaultBindings/value.js
index 0ad8e6083..136ae90f6 100644
--- a/vendors/knockout/src/binding/defaultBindings/value.js
+++ b/vendors/knockout/src/binding/defaultBindings/value.js
@@ -20,7 +20,7 @@ ko.bindingHandlers['value'] = {
                 elementValueBeforeEvent = null;
                 var modelValue = valueAccessor();
                 var elementValue = ko.selectExtensions.readValue(element);
-                ko.expressionRewriting.writeValueToProperty(modelValue, allBindings, 'value', elementValue);
+                ko.expressionRewriting.writeValueToProperty(element, modelValue, allBindings, 'value', elementValue);
             };
 
         if (requestedEventsToCatch) {
diff --git a/vendors/knockout/src/binding/expressionRewriting.js b/vendors/knockout/src/binding/expressionRewriting.js
index 257b863dc..8c4761983 100644
--- a/vendors/knockout/src/binding/expressionRewriting.js
+++ b/vendors/knockout/src/binding/expressionRewriting.js
@@ -45,9 +45,9 @@ ko.expressionRewriting = (() => {
         divisionLookBehind = /[\])"'A-Za-z0-9_$]+$/,
         keywordRegexLookBehind = {'in':1,'return':1,'typeof':1},
 
-        parseObjectLiteral = objectLiteralString => {
+        preProcessBindings = bindingsStringOrKeyValueArray => {
             // Trim leading and trailing spaces from the string
-            var str = ko.utils.stringTrim(objectLiteralString);
+            var str = ko.utils.stringTrim(bindingsStringOrKeyValueArray);
 
             // Trim braces '{' surrounding the whole object literal
             if (str.charCodeAt(0) === 123) str = str.slice(1, -1);
@@ -66,9 +66,10 @@ ko.expressionRewriting = (() => {
                     // A comma signals the end of a key/value pair if depth is zero
                     if (c === 44) { // ","
                         if (depth <= 0) {
-                            result.push((key && values.length)
-                                ? {key: key, value: values.join('')}
-                                : {'unknown': key || values.join('')});
+                            if (key && values.length) {
+                                // Values are wrapped in a function so that each value can be accessed independently
+                                result.push("'" + key + "':()=>(" + values.join('') + ")");
+                            }
                             key = depth = 0;
                             values = [];
                             continue;
@@ -109,40 +110,20 @@ ko.expressionRewriting = (() => {
                     throw Error("Unbalanced parentheses, braces, or brackets");
                 }
             }
-            return result;
-        },
 
-        preProcessBindings = (bindingsStringOrKeyValueArray) => {
+            result.push("'$data':()=>$data");
 
-            var resultStrings = [],
-//                propertyAccessorResultStrings = [],
-                keyValueArray = parseObjectLiteral(bindingsStringOrKeyValueArray),
-
-                processKeyValue = (key, val) => {
-                    // Values are wrapped in a function so that each value can be accessed independently
-                    val = 'function(){return ' + val + ' }';
-                    resultStrings.push("'" + key + "':" + val);
-                };
-
-            keyValueArray.forEach(keyValue =>
-                processKeyValue(keyValue.key || keyValue['unknown'], keyValue.value)
-            );
-/*
-            if (propertyAccessorResultStrings.length)
-                processKeyValue('_ko_property_writers', "{" + propertyAccessorResultStrings.join(",") + " }");
-*/
-            return resultStrings.join(",");
+            return result.join(",");
         };
 
     return {
-        parseObjectLiteral: parseObjectLiteral,
-
         preProcessBindings: preProcessBindings,
 
         keyValueArrayContainsKey: (keyValueArray, key) =>
             -1 < keyValueArray.findIndex(v => v['key'] == key),
 
         // Internal, private KO utility for updating model properties from within bindings
+        // element:             the HTML element it belongs to
         // property:            If the property being updated is (or might be) an observable, pass it here
         //                      If it turns out to be a writable observable, it will be written to directly
         // allBindings:         An object with a get method to retrieve bindings in the current execution context.
@@ -151,10 +132,11 @@ ko.expressionRewriting = (() => {
         // value:               The value to be written
         // checkIfDifferent:    If true, and if the property being written is a writable observable, the value will only be written if
         //                      it is !== existing value on that writable observable
-        writeValueToProperty: (property, allBindings, key, value, checkIfDifferent) => {
+        writeValueToProperty: (element, property, allBindings, key, value, checkIfDifferent) => {
             if (!property || !ko.isObservable(property)) {
-                throw Error(`${key} , must be observable`);
-//                allBindings.get('_ko_property_writers')?.[key]?.(value);
+                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)) {
                 property(value);
             }
diff --git a/vendors/squire/LICENSE b/vendors/squire/LICENSE
deleted file mode 100644
index 06cfb7473..000000000
--- a/vendors/squire/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright © 2011–2014 by Neil Jenkins
-
-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/vendors/squire/README.md b/vendors/squire/README.md
deleted file mode 100644
index 437cff617..000000000
--- a/vendors/squire/README.md
+++ /dev/null
@@ -1,501 +0,0 @@
-Squire
-======
-
-Squire is an HTML5 rich text editor, which provides powerful cross-browser normalisation in a flexible lightweight package (only 16.5KB of JS after minification and gzip, with no dependencies!).
-
-It was designed to handle email composition for the [Fastmail](https://www.fastmail.com) web app. The most important consequence of this (and where Squire differs from most other modern rich text editors) is that it must handle arbitrary HTML, because it may be used to forward or quote emails from third-parties and must be able to preserve their HTML without breaking the formatting. This means that it can't use a more structured (but limited) internal data model (as most other modern HTML editors do) and the HTML remains the source-of-truth. The other consequence is excellent handling of multiple levels of blockquotes.
-
-Squire was designed to be integrated with your own UI framework, and so does not provide its own UI toolbar, widgets or overlays. Instead, you get a component you can insert in place of a `<textarea>` and manipulate programatically, allowing you to integrate seamlessly with the rest of your application and lose the bloat of having two UI toolkits loaded.
-
-Squire supports all reasonably recent, and even moderately old, browsers (even IE11, although this is not tested much these days).
-
-In addition to its use at [Fastmail](https://www.fastmail.com), it is also currently used in production at [ProtonMail](https://protonmail.com/), [SnappyMail](https://github.com/the-djmaze/snappymail), [StartMail](https://startmail.com/), [Tutanota](https://tutanota.com), [Zoho Mail](https://www.zoho.com/mail/) and [Superhuman](https://superhuman.com/), as well as other non-mail apps including [Google Earth](https://www.google.com/earth/) (drop me a line if you're using Squire elsewhere, I'm always interested to hear about it!).
-
-An example UI integration can be tried at http://neilj.github.io/Squire/. Please note though, this is an out-of-date version of Squire and a slightly buggy implementation written by an intern many years ago. For a demo of the latest version with a production-level UI integration, [sign up for a free Fastmail trial](https://www.fastmail.com/signup/) :). There's also a very bare-bones integration in the repo; just clone it and open `Demo.html`. If you are reporting a bug, please report the steps to reproduce using `Demo.html`, to make sure it's not a bug in your integration.
-
-Installation and usage
-----------------------
-
-1. Copy the contents of the `build/` directory onto your server.
-2. Edit the `<style>` block in document.html to add the default styles you
-   would like the editor to use (or link to an external stylesheet).
-3. In your application, instead of a `<textarea>`, use an
-   `<iframe src="path/to/document.html">`.
-4. In your JS, attach an event listener to the [`load` event](https://developer.mozilla.org/en-US/docs/Web/Events/load) of the iframe. When
-   this fires you can grab a reference to the editor object through
-   `iframe.contentWindow.editor`.
-5. Use the API below with the `editor` object to set and get data and integrate
-   with your application or framework.
-
-### Using Squire without an iframe.
-
-Squire can also be used without an iframe for the document. To use it this way:
-
-1. Add a `<script>` tag to load in `build/squire.js` (or `squire-raw.js` for the debuggable unminified version).
-2. Get a reference to the DOM node in the document that you want to make into the rich textarea, e.g. `node = document.getElementById( 'editor-div' )`.
-3. Call `editor = new Squire( node )`. This will instantiate a new Squire instance. Please note, this will remove any current children of the node; you must use the `setHTML` command after initialising to set any content.
-
-You can have multiple squire instances in a single page without issue. If you are using the editor as part of a long lived single-page app, be sure to call `editor.destroy()` once you have finished using an instance to ensure it doesn't leak resources.
-
-### Security
-
-Malicious HTML can be a source of XSS and other security issues. I highly recommended you use [DOMPurify](https://github.com/cure53/DOMPurify) with Squire to prevent these security issues. If DOMPurify is included in the page (with the standard global variable), Squire will automatically sanitise any HTML passed in via `setHTML` or `insertHTML` (which includes HTML the user pastes from the clipboard).
-
-You can override this by setting properties on the config object (the second argument passed to the constructor, see below). The properties are:
-
-* **isSetHTMLSanitized**: `Boolean`
-  Should the HTML passed via calls to `setHTML` be passed to the sanitizer? If your app always sanitizes the HTML in some other way before calling this, you may wish to set this to `false` to avoid the overhead.
-* **isInsertedHTMLSanitized**: `Boolean` (defaults to `true`) – Should the HTML passed via calls to `insertHTML` be passed to the sanitizer? This includes when the user pastes from the clipboard. Since you cannot control what other apps put on the clipboard, it is highly recommended you do not set this to `false`.
-* **sanitizeToDOMFragment**: `(html: String, isPaste: Boolean, self: Squire) -> DOMFragment`
-  A custom sanitization function. This will be called instead of the default call to DOMPurify to sanitize the potentially dangerous HTML. It is passed three arguments: the first is the string of HTML, the second is a boolean indicating if this content has come from the clipboard, rather than an explicit call by your own code, the third is the squire instance. It must return a DOM Fragment node belonging to the same document as the editor's root node, with the contents being clean DOM nodes to set/insert.
-
-Advanced usage
---------------
-
-Squire provides an engine that handles the heavy work for you, making it easy to add extra features. With the `changeFormat` method you can easily add or remove any inline formatting you wish. And the `modifyBlocks` method can be used to make complicated block-level changes in a relatively easy manner.
-
-If you load the library into a top-level document (rather than an iframe), or load it in an iframe without the `data-squireinit="true"` attribute on its `<html>` element, it will not turn the page into an editable document, but will instead add a constructor named `Squire` to the global scope.
-
-You can also require the NPM package [squire-rte](https://www.npmjs.com/package/squire-rte) to import `Squire` in a modular program without adding names to the global namespace.
-
-Call `new Squire( document )`, with the `document` from an iframe to instantiate multiple rich text areas on the same page efficiently. Note, for compatibility with all browsers (particularly Firefox), you MUST wait for the iframe's `onload` event to fire before instantiating Squire.
-
-If you need more commands than in the simple API, I suggest you check out the source code (it's not very long), and see how a lot of the other API methods are implemented in terms of these two methods.
-
-The general philosophy of Squire is to allow the browser to do as much as it can (which unfortunately is not very much), but take control anywhere it deviates from what is required, or there are significant cross-browser differences. As such, the [`document.execCommand`](https://developer.mozilla.org/en-US/docs/Web/API/Document/execCommand) method is not used at all; instead all formatting is done via custom functions, and certain keys, such as 'enter' and 'backspace' are handled by the editor.
-
-### Setting the default block style
-
-By default, the editor will use a `<div>` for blank lines, as most users have been conditioned by Microsoft Word to expect <kbd>Enter</kbd> to act like pressing <kbd>return</kbd> on a typewriter. If you would like to use `<p>` tags (or anything else) for the default block type instead, you can pass a config object as the second parameter to the squire constructor. You can also
-pass a set of attributes to apply to each default block:
-
-    var editor = new Squire( document, {
-        blockTag: 'P',
-        blockAttributes: { style: 'font-size: 16px;' }
-    })
-
-If using the simple setup, call `editor.setConfig(…);` with your
-config object instead. Be sure to do this *before* calling `editor.setHTML()`.
-
-### Determining button state
-
-If you are adding a UI to Squire, you'll probably want to show a button in different states depending on whether a particular style is active in the current selection or not. For example, a "Bold" button would be in a depressed state if the text under the cursor is already bold.
-
-The efficient way to determine the state for most buttons is to monitor the "pathChange" event in the editor, and determine the state from the new path. If the selection goes across nodes, you will need to call the `hasFormat` method for each of your buttons to determine whether the styles are active. See the `getPath` and `hasFormat` documentation for more information.
-
-License
--------
-
-Squire is released under the MIT license. See LICENSE for full license.
-
-API
----
-
-### addEventListener
-
-Attach an event listener to the editor. The handler can be either a function or an object with a `handleEvent` method. This function or method will be called whenever the event fires, with an event object as the sole argument. The following events may be observed:
-
-* **focus**: The editor gained focus.
-* **blur**: The editor lost focus
-* **keydown**: Standard [DOM keydown event](https://developer.mozilla.org/en-US/docs/Web/Events/keydown).
-* **keypress**: Standard [DOM keypress event](https://developer.mozilla.org/en-US/docs/Web/Events/keypress).
-* **keyup**: Standard [DOM keyup event](https://developer.mozilla.org/en-US/docs/Web/Events/keyup).
-* **input**: The user inserted, deleted or changed the style of some text; in other words, the result for `editor.getHTML()` will have changed.
-* **pathChange**: The path (see getPath documentation) to the cursor has changed. The new path is available as the `path` property on the event object.
-* **select**: The user selected some text.
-* **cursor**: The user cleared their selection or moved the cursor to a
-  different position.
-* **undoStateChange**: The availability of undo and/or redo has changed. The event object has two boolean properties, `canUndo` and `canRedo` to let you know the new state.
-* **willPaste**: The user is pasting content into the document. The content that will be inserted is available as either the `fragment` property on the event object, or the `text` property for plain text being inserted into a `<pre>`. You can modify this text/fragment in your event handler to change what will be pasted. You can also call the `preventDefault` on the event object to cancel the paste operation.
-
-The method takes two arguments:
-
-* **type**: The event to listen for. e.g. 'focus'.
-* **handler**: The callback function to invoke
-
-Returns self (the Squire instance).
-
-### removeEventListener
-
-Remove an event listener attached via the addEventListener method.
-
-The method takes two arguments:
-
-* **type**: The event type the handler was registered for.
-* **handler**: The handler to remove.
-
-Returns self (the Squire instance).
-
-### setKeyHandler
-
-Adds or removes a keyboard shortcut. You can use this to override the default keyboard shortcuts (e.g. Ctrl-B for bold – see the bottom of KeyHandlers.js for the list).
-
-This method takes two arguments:
-
-* **key**: The key to handle, including any modifiers in alphabetical order. e.g. `"alt-ctrl-meta-shift-enter"`
-* **fn**: The function to be called when this key is pressed, or `null` if removing a key handler. The function will be passed three arguments when called:
-  * **self**: A reference to the Squire instance.
-  * **event**: The key event object.
-  * **range**: A Range object representing the current selection.
-
-Returns self (the Squire instance).
-
-### focus
-
-Focuses the editor.
-
-The method takes no arguments.
-
-Returns self (the Squire instance).
-
-### blur
-
-Removes focus from the editor.
-
-The method takes no arguments.
-
-Returns self (the Squire instance).
-
-### getDocument
-
-Returns the `document` object of the editable area. May be useful to do transformations outside the realm of the API.
-
-### getHTML
-
-Returns the HTML value of the editor in its current state. This value is equivalent to the contents of the `<body>` tag and does not include any surrounding boilerplate.
-
-### setHTML
-
-Sets the HTML value for the editor. The value supplied should not contain `<body>` tags or anything outside of that.
-
-The method takes one argument:
-
-* **html**: The html to set.
-
-Returns self (the Squire instance).
-
-### getSelectedText
-
-Returns the text currently selected in the editor.
-
-### insertImage
-
-Inserts an image at the current cursor location.
-
-The method takes two arguments:
-
-* **src**: The source path for the image.
-* **attributes**: (optional) An object containing other attributes to set on the `<img>` node. e.g. `{ class: 'class-name' }`. Any `src` attribute will be overwritten by the url given as the first argument.
-
-Returns a reference to the newly inserted image element.
-
-### insertHTML
-
-Inserts an HTML fragment at the current cursor location, or replaces the selection if selected. The value supplied should not contain `<body>` tags or anything outside of that.
-
-The method takes one argument:
-
-* **html**: The html to insert.
-
-Returns self (the Squire instance).
-
-### getPath
-
-Returns the path through the DOM tree from the `<body>` element to the current current cursor position. This is a string consisting of the tag, id, class, font, and color names in CSS format. For example `BODY>BLOCKQUOTE>DIV#id>STRONG>SPAN.font[fontFamily=Arial,sans-serif]>EM`. If a selection has been made, so different parts of the selection may have different paths, the value will be `(selection)`. The path is useful for efficiently determining the current formatting for bold, italic, underline etc, and thus determining button state. If a selection has been made, you can has the `hasFormat` method instead to get the current state for the properties you care about.
-
-### getFontInfo
-
-Returns an object containing the active font family, size, color and background color for the the current cursor position, if any are set. The property names are respectively `family`, `size`, `color` and `backgroundColor`. It looks at style attributes to detect this, so will not detect `<FONT>` tags or non-inline styles. If a selection across multiple elements has been made, it will return an empty object.
-
-### createRange
-
-Creates a range in the document belonging to the editor. Takes 4 arguments, matching the [W3C Range properties](https://developer.mozilla.org/en-US/docs/Web/API/Range) they set:
-
-* **startContainer**
-* **startOffset**
-* **endContainer** (optional; if not collapsed)
-* **endOffset** (optional; if not collapsed)
-
-### getCursorPosition
-
-Returns a bounding client rect (top/left/right/bottom properties relative to
-the viewport) for the current selection/cursor.
-
-### getSelection
-
-Returns a [W3C Range object](https://developer.mozilla.org/en-US/docs/Web/API/Range) representing the current selection/cursor position.
-
-### setSelection
-
-Changes the current selection/cursor position.
-
-The method takes one argument:
-
-* **range**: The [W3C Range object](https://developer.mozilla.org/en-US/docs/Web/API/Range) representing the desired selection.
-
-Returns self (the Squire instance).
-
-### moveCursorToStart
-
-Removes any current selection and moves the cursor to the very beginning of the
-document.
-
-Returns self (the Squire instance).
-
-### moveCursorToEnd
-
-Removes any current selection and moves the cursor to the very end of the
-document.
-
-Returns self (the Squire instance).
-
-### saveUndoState
-
-Saves an undo checkpoint with the current editor state. Methods that modify the
-state (e.g. bold/setHighlightColor/modifyBlocks) will automatically save undo
-checkpoints; you only need this method if you want to modify the DOM outside of
-one of these methods, and you want to save an undo checkpoint first.
-
-Returns self (the Squire instance).
-
-### undo
-
-Undoes the most recent change.
-
-Returns self (the Squire instance).
-
-### redo
-
-If the user has just undone a change, this will reapply that change.
-
-Returns self (the Squire instance).
-
-### hasFormat
-
-Queries the editor for whether a particular format is applied anywhere in the current selection.
-
-The method takes two arguments:
-
-* **tag**: The tag of the format
-* **attributes**: (optional) Any attributes the format.
-
-Returns `true` if the entire selection is contained within an element with the specified tag and attributes, otherwise returns `false`.
-
-### bold
-
-Makes any non-bold currently selected text bold (by wrapping it in a `<b>` tag).
-
-Returns self (the Squire instance).
-
-### italic
-
-Makes any non-italic currently selected text italic (by wrapping it in an `<i>` tag).
-
-Returns self (the Squire instance).
-
-### underline
-
-Makes any non-underlined currently selected text underlined (by wrapping it in a `<u>` tag).
-
-Returns self (the Squire instance).
-
-### removeBold
-
-Removes any bold formatting from the selected text.
-
-Returns self (the Squire instance).
-
-### removeItalic
-
-Removes any italic formatting from the selected text.
-
-Returns self (the Squire instance).
-
-### removeUnderline
-
-Removes any underline formatting from the selected text.
-
-Returns self (the Squire instance).
-
-### makeLink
-
-Makes the currently selected text a link. If no text is selected, the URL or email will be inserted as text at the current cursor point and made into a link.
-
-This method takes two arguments:
-
-* **url**: The url or email to link to.
-* **attributes**: (optional) An object containing other attributes to set on the `<a>` node. e.g. `{ target: '_blank' }`. Any `href` attribute will be overwritten by the url given as the first argument.
-
-Returns self (the Squire instance).
-
-### removeLink
-
-Removes any link that is currently at least partially selected.
-
-Returns self (the Squire instance).
-
-### setFontFace
-
-Sets the font face for the selected text.
-
-This method takes one argument:
-
-* **font**: A comma-separated list of fonts (in order of preference) to set.
-
-Returns self (the Squire instance).
-
-### setFontSize
-
-Sets the font size for the selected text.
-
-This method takes one argument:
-
-* **size**: A size to set. Any CSS [length value](https://developer.mozilla.org/en-US/docs/Web/CSS/length) or [absolute-size value](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_values_syntax#syntax-absolute-size) is accepted, e.g. '13px', or 'small'.
-
-Returns self (the Squire instance).
-
-### setTextColor
-
-Sets the color of the selected text.
-
-This method takes one argument:
-
-* **color**: The color to set. Any [CSS color value](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value) is accepted, e.g. '#f00', or 'hsl(0,0,0)'.
-
-Returns self (the Squire instance).
-
-### setHighlightColor
-
-Sets the color of the background of the selected text.
-
-This method takes one argument:
-
-* **color**: The color to set. Any [CSS color value](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value) is accepted, e.g. '#f00', or 'hsl(0,0,0)'.
-
-Returns self (the Squire instance).
-
-### setTextAlignment
-
-Sets the text alignment in all blocks at least partially contained by the selection.
-
-This method takes one argument:
-
-* **alignment**: The direction to align to. Can be 'left', 'right', 'center' or 'justify'.
-
-Returns self (the Squire instance).
-
-### setTextDirection
-
-Sets the text direction in all blocks at least partially contained by the selection.
-
-This method takes one argument:
-
-* **direction**: The text direction. Can be 'ltr' or 'rtl'.
-
-Returns self (the Squire instance).
-
-### forEachBlock
-
-Executes a function on each block in the current selection, or until the function returns a truthy value.
-
-This method takes two arguments:
-
-* **fn** The function to execute on each block node at least partially contained in the current selection. The function will be called with the block node as the only argument.
-* **mutates** A boolean indicating whether your function may modify anything in the document in any way.
-
-Returns self (the Squire instance).
-
-### modifyBlocks
-
-Extracts a portion of the DOM tree (up to the block boundaries of the current selection), modifies it and then reinserts it and merges the edges. See the code for examples if you're interested in using this function.
-
-This method takes one argument:
-
-* **modify** The function to apply to the extracted DOM tree; gets a document fragment as a sole argument. `this` is bound to the Squire instance. Should return the node or fragment to be reinserted in the DOM.
-
-Returns self (the Squire instance).
-
-### increaseQuoteLevel
-
-Increases by 1 the quote level (number of `<blockquote>` tags wrapping) all blocks at least partially selected.
-
-Returns self (the Squire instance).
-
-### decreaseQuoteLevel
-
-Decreases by 1 the quote level (number of `<blockquote>` tags wrapping) all blocks at least partially selected.
-
-Returns self (the Squire instance).
-
-### makeUnorderedList
-
-Changes all at-least-partially selected blocks to be part of an unordered list.
-
-Returns self (the Squire instance).
-
-### makeOrderedList
-
-Changes all at-least-partially selected blocks to be part of an ordered list.
-
-Returns self (the Squire instance).
-
-### removeList
-
-Changes any at-least-partially selected blocks which are part of a list to no longer be part of a list.
-
-Returns self (the Squire instance).
-
-### increaseListLevel
-
-Increases by 1 the nesting level of any at-least-partially selected blocks which are part of a list.
-
-Returns self (the Squire instance).
-
-### decreaseListLevel
-
-Decreases by 1 the nesting level of any at-least-partially selected blocks which are part of a list.
-
-Returns self (the Squire instance).
-
-### code
-
-If no selection, or selection across blocks, converts the block to a `<pre>` to format the text as fixed-width. If a selection within a single block is present, wraps that in `<code>` tags for inline formatting instead.
-
-Returns self (the Squire instance).
-
-### removeCode
-
-If inside a `<pre>`, converts that to the default block type instead. Otherwise, removes any `<code>` tags.
-
-Returns self (the Squire instance).
-
-### toggleCode
-
-If inside a `<pre>` or `<code>`, calls `removeCode()`, otherwise callse `code()`.
-
-Returns self (the Squire instance).
-
-### removeAllFormatting
-
-Removes all formatting from the selection. Block elements (list items, table cells, etc.) are kept as separate blocks.
-
-Returns self (the Squire instance).
-
-### changeFormat
-
-Change the **inline** formatting of the current selection. This is a high-level method which is used to implement the bold, italic etc. helper methods. THIS METHOD IS ONLY FOR USE WITH INLINE TAGS, NOT BLOCK TAGS. It takes 4 arguments:
-
-1. An object describing the formatting to add, or `null` if you only wish to remove formatting. If supplied, this object should have a `tag` property with the string name of the tag to wrap around the selected text (e.g. `"STRONG"`) and optionally an `attributes` property, consisting of an object of attributes to apply to the tag (e.g. `{"class": "bold"}`).
-2. An object describing the formatting to remove, in the same format as the object given to add formatting, or `null` if you only wish to add formatting.
-3. A Range object with the range to apply the formatting changes to (or `null`/omit to apply to current selection).
-4. A boolean (defaults to `false` if omitted). If `true`, any formatting nodes that cover at least part of the selected range will be removed entirely (so will potentially be removed from text outside the selected range as well). If `false`, the formatting nodes will continue to apply to any text outside the selection. This is useful, for example, when removing links. If any of the text in the selection is part of a link, the whole link is removed, rather than the link continuing to apply to bits of text outside the selection.
-
-### modifyDocument
-
-Takes in a function that can modify the document without the modifications being treated as input.
-
-This is useful when the document needs to be changed programmatically, but those changes should not raise input events or modify the undo state.
-
-### linkRegExp
-
-This is the regular expression used to automatically mark up links when inserting HTML or after pressing space. You can change it if you want to use a custom regular expression for detecting links, or set to `null` to turn off link detection.
diff --git a/vendors/squire/build/squire-raw.js b/vendors/squire/build/squire-raw.js
deleted file mode 100644
index cecf71428..000000000
--- a/vendors/squire/build/squire-raw.js
+++ /dev/null
@@ -1,3068 +0,0 @@
-/* Copyright © 2011-2015 by Neil Jenkins. MIT Licensed. */
-/* eslint max-len: 0 */
-
-/**
-  TODO: modifyBlocks function doesn't work very good.
-  For example you have: UL > LI > [cursor here in text]
-  Then create blockquote at cursor, the result is: BLOCKQUOTE > UL > LI
-  not UL > LI > BLOCKQUOTE
-*/
-
-(() => {
-  // source/node/TreeIterator.ts
-  var SHOW_ELEMENT = 1;
-  var SHOW_TEXT = 4;
-  var SHOW_ELEMENT_OR_TEXT = 5;
-  var filterAccept = NodeFilter.FILTER_ACCEPT;
-  TreeWalker.prototype.previousPONode = function() {
-    let current = this.currentNode;
-    let node = current.lastChild;
-    while (!node && current) {
-      if (current === this.root) {
-        break;
-      }
-      node = this.previousSibling();
-      if (!node) {
-        current = this.parentNode();
-      }
-    }
-    node && (this.currentNode = node);
-    return node;
-  };
-  var createTreeWalker = (root, whatToShow, filter) => document.createTreeWalker(root, whatToShow, filter ? {
-    acceptNode: (node) => filter(node) ? filterAccept : NodeFilter.FILTER_SKIP
-  } : null);
-
-  // source/Constants.ts
-  var ELEMENT_NODE = 1;
-  var TEXT_NODE = 3;
-  var DOCUMENT_FRAGMENT_NODE = 11;
-  var ZWS = "\u200B";
-  var ua = navigator.userAgent;
-  var isMac = /Mac OS X/.test(ua);
-  var isIOS = /iP(?:ad|hone)/.test(ua) || (isMac && !!navigator.maxTouchPoints);
-  var isAndroid = /Android/.test(ua);
-  var isWebKit = /WebKit\//.test(ua);
-  var ctrlKey = isMac || isIOS ? "Meta-" : "Ctrl-";
-  var cantFocusEmptyTextNodes = isWebKit;
-  var notWS = /[^ \t\r\n]/;
-  var indexOf = (array, value) => Array.prototype.indexOf.call(array, value);
-
-  // source/node/Category.ts
-  var inlineNodeNames = /^(?:#text|A|ABBR|ACRONYM|B|BR|BD[IO]|CITE|CODE|DATA|DEL|DFN|EM|FONT|HR|I|IMG|INPUT|INS|KBD|Q|RP|RT|RUBY|S|SAMP|SMALL|SPAN|STR(IKE|ONG)|SU[BP]|TIME|U|VAR|WBR)$/;
-  var leafNodeNames = new Set(["BR", "HR", "IMG"]);
-  var listNodeNames = new Set(["OL", "UL"]);
-  var UNKNOWN = 0;
-  var INLINE = 1;
-  var BLOCK = 2;
-  var CONTAINER = 3;
-  var cache = new WeakMap();
-  var isLeaf = (node) => isElement(node) && leafNodeNames.has(node.nodeName);
-  var getNodeCategory = (node) => {
-    switch (node.nodeType) {
-      case TEXT_NODE:
-        return INLINE;
-      case ELEMENT_NODE:
-      case DOCUMENT_FRAGMENT_NODE:
-        if (cache.has(node)) {
-          return cache.get(node);
-        }
-        break;
-      default:
-        return UNKNOWN;
-    }
-    let nodeCategory = Array.prototype.every.call(node.childNodes, isInline) ? (inlineNodeNames.test(node.nodeName) ? INLINE : BLOCK) : CONTAINER;
-    cache.set(node, nodeCategory);
-    return nodeCategory;
-  };
-  var isInline = (node) => getNodeCategory(node) === INLINE;
-  var isBlock = (node) => getNodeCategory(node) === BLOCK;
-  var isContainer = (node) => getNodeCategory(node) === CONTAINER;
-
-  // source/node/Node.ts
-  var createElement = (tag, props, children) => {
-    const el = document.createElement(tag);
-    if (props instanceof Array) {
-      children = props;
-      props = null;
-    }
-    setAttributes(el, props);
-    children && el.append(...children);
-    return el;
-  };
-  var areAlike = (node, node2) => !isLeaf(node) && (node.nodeType === node2.nodeType && node.nodeName === node2.nodeName && node.nodeName !== "A" && node.className === node2.className && node.style?.cssText === node2.style?.cssText);
-  var hasTagAttributes = (node, tag, attributes) => node.nodeName === tag && Object.entries(attributes || {}).every(([k,v]) => node.getAttribute(k) === v);
-  var getNearest = (node, root, tag, attributes) => {
-    while (node && node !== root) {
-      if (hasTagAttributes(node, tag, attributes)) {
-        return node;
-      }
-      node = node.parentNode;
-    }
-    return null;
-  };
-  var getNodeBeforeOffset = (node, offset) => {
-    let children = node.childNodes;
-    while (offset && isElement(node)) {
-      node = children[offset - 1];
-      children = node.childNodes;
-      offset = children.length;
-    }
-    return node;
-  };
-  var getNodeAfterOffset = (node, offset) => {
-    if (isElement(node)) {
-      const children = node.childNodes;
-      if (offset < children.length) {
-        node = children[offset];
-      } else {
-        while (node && !node.nextSibling) {
-          node = node.parentNode;
-        }
-        node && (node = node.nextSibling);
-      }
-    }
-    return node;
-  };
-  var getLength = (node) => isElement(node) || node instanceof DocumentFragment ? node.childNodes.length : node.length || 0;
-  var empty = (node) => {
-    const frag = document.createDocumentFragment(), childNodes = node.childNodes;
-    childNodes && frag.append(...childNodes);
-    return frag;
-  };
-  var detach = (node) => node.parentNode?.removeChild(node);
-  var replaceWith = (node, node2) => node.parentNode?.replaceChild(node2, node);
-  var getClosest = (node, root, selector) => {
-    node = (node && !node.closest) ? node.parentElement : node;
-    node = node?.closest(selector);
-    return (node && root.contains(node)) ? node : null;
-  };
-  var isElement = (node) => node instanceof Element;
-  var isTextNode = (node) => node instanceof Text;
-  var isBrElement = (node) => "BR" === node?.nodeName;
-  var setAttributes = (node, props) => {
-    props && Object.entries(props).forEach(([k, v]) => {
-      if (null == v) {
-        node.removeAttribute(k);
-      } else if ("style" === k && typeof v === "object") {
-        Object.entries(v).forEach(([k2, v2]) => node.style[k2] = v2);
-      } else {
-        node.setAttribute(k, v);
-      }
-    });
-  };
-
-  // source/node/Whitespace.ts
-  var notWSTextNode = (node) => isElement(node) ? isBrElement(node) : notWS.test(node.data);
-  var isLineBreak = (br, isLBIfEmptyBlock) => {
-    let block = br.parentNode;
-    while (isInline(block)) {
-      block = block.parentNode;
-    }
-    const walker = createTreeWalker(
-      block,
-      SHOW_ELEMENT_OR_TEXT,
-      notWSTextNode
-    );
-    walker.currentNode = br;
-    return !!walker.nextNode() || (isLBIfEmptyBlock && !walker.previousNode());
-  };
-  var removeZWS = (root, keepNode) => {
-    const walker = createTreeWalker(root, SHOW_TEXT);
-    let textNode;
-    let index;
-    while (textNode = walker.nextNode()) {
-      while ((index = textNode.data.indexOf(ZWS)) > -1 && (!keepNode || textNode.parentNode !== keepNode)) {
-        if (textNode.length === 1) {
-          do {
-            let parent = textNode.parentNode;
-            textNode.remove();
-            textNode = parent;
-            walker.currentNode = parent;
-          } while (isInline(textNode) && !getLength(textNode));
-          break;
-        } else {
-          textNode.deleteData(index, 1);
-        }
-      }
-    }
-  };
-
-  // source/range/Boundaries.ts
-  var START_TO_START = 0;
-  var START_TO_END = 1;
-  var END_TO_END = 2;
-  var END_TO_START = 3;
-  var isNodeContainedInRange = (range, node, partial = true) => {
-    const nodeRange = document.createRange();
-    nodeRange.selectNode(node);
-    return partial
-      ? range.compareBoundaryPoints(END_TO_START, nodeRange) < 0
-        && range.compareBoundaryPoints(START_TO_END, nodeRange) > 0
-      : range.compareBoundaryPoints(START_TO_START, nodeRange) < 1
-        && range.compareBoundaryPoints(END_TO_END, nodeRange) > -1;
-  };
-  var moveRangeBoundariesDownTree = range => {
-    let { startContainer, startOffset, endContainer, endOffset } = range;
-    while (!isTextNode(startContainer)) {
-      let child = startContainer.childNodes[startOffset];
-      if (!child || isLeaf(child)) {
-        if (startOffset) {
-          child = startContainer.childNodes[startOffset - 1];
-          if (isTextNode(child)) {
-            let prev;
-            while (!child.length && (prev = child.previousSibling) && isTextNode(prev)) {
-              child.remove();
-              child = prev;
-            }
-            startContainer = child;
-            startOffset = child.data.length;
-          }
-        }
-        break;
-      }
-      startContainer = child;
-      startOffset = 0;
-    }
-    if (endOffset) {
-      while (!isTextNode(endContainer)) {
-        const child = endContainer.childNodes[endOffset - 1];
-        if (!child || isLeaf(child)) {
-          if (isBrElement(child) && !isLineBreak(child)) {
-            --endOffset;
-            continue;
-          }
-          break;
-        }
-        endContainer = child;
-        endOffset = getLength(endContainer);
-      }
-    } else {
-      while (!isTextNode(endContainer)) {
-        const child = endContainer.firstChild;
-        if (!child || isLeaf(child)) {
-          break;
-        }
-        endContainer = child;
-      }
-    }
-    range.setStart(startContainer, startOffset);
-    range.setEnd(endContainer, endOffset);
-  };
-  var moveRangeBoundariesUpTree = (range, startMax, endMax, root) => {
-    let startContainer = range.startContainer;
-    let startOffset = range.startOffset;
-    let endContainer = range.endContainer;
-    let endOffset = range.endOffset;
-    let parent;
-    if (!startMax) {
-      startMax = range.commonAncestorContainer;
-    }
-    if (!endMax) {
-      endMax = startMax;
-    }
-    while (!startOffset && startContainer !== startMax && startContainer !== root) {
-      parent = startContainer.parentNode;
-      startOffset = indexOf(parent.childNodes, startContainer);
-      startContainer = parent;
-    }
-    while (endContainer !== endMax && endContainer !== root) {
-      if (!isTextNode(endContainer) && isBrElement(endContainer.childNodes[endOffset]) && !isLineBreak(endContainer.childNodes[endOffset])) {
-        ++endOffset;
-      }
-      if (endOffset !== getLength(endContainer)) {
-        break;
-      }
-      parent = endContainer.parentNode;
-      endOffset = indexOf(parent.childNodes, endContainer) + 1;
-      endContainer = parent;
-    }
-    range.setStart(startContainer, startOffset);
-    range.setEnd(endContainer, endOffset);
-  };
-  var moveRangeBoundaryOutOf = (range, tag, root) => {
-    let parent = getClosest(range.endContainer, root, tag);
-    if (parent && (parent = parent.parentNode)) {
-      const clone = range.cloneRange();
-      moveRangeBoundariesUpTree(clone, parent, parent, root);
-      if (clone.endContainer === parent) {
-        range.setStart(clone.endContainer, clone.endOffset);
-        range.setEnd(clone.endContainer, clone.endOffset);
-      }
-    }
-    return range;
-  };
-
-  // source/node/MergeSplit.ts
-  var fixCursor = (node) => {
-    let fixer = null;
-    if (!isTextNode(node)) {
-      if (isInline(node)) {
-        let child = node.firstChild;
-        if (cantFocusEmptyTextNodes) {
-          while (isTextNode(child) && !child.data) {
-            node.removeChild(child);
-            child = node.firstChild;
-          }
-        }
-        if (!child) {
-          fixer = document.createTextNode(cantFocusEmptyTextNodes ? ZWS : "");
-        }
-      } else if (isElement(node) && !node.querySelector("BR")) {
-        fixer = createElement("BR");
-      }
-      if (fixer) {
-        try {
-          node.appendChild(fixer);
-        } catch (error) {
-          didError({
-            name: 'Squire: fixCursor – ' + error,
-            message: 'Parent: ' + node.nodeName + '/' + node.innerHTML +
-              ' appendChild: ' + fixer.nodeName
-          });
-        }
-      }
-    }
-    return node;
-  };
-  var fixContainer = (container, root) => {
-    let wrapper;
-    [...container.childNodes].forEach((child) => {
-      const isBR = isBrElement(child);
-      if (!isBR && child.parentNode == root && isInline(child)) {
-        wrapper = wrapper || createElement("DIV");
-        wrapper.append(child);
-      } else if (isBR || wrapper) {
-        wrapper = wrapper || createElement("DIV");
-        fixCursor(wrapper);
-        child[isBR ? "replaceWith" : "before"](wrapper);
-        wrapper = null;
-      }
-      isContainer(child) && fixContainer(child, root);
-    });
-    wrapper && container.append(fixCursor(wrapper));
-    return container;
-  };
-  var split = (node, offset, stopNode, root) => {
-    if (isTextNode(node) && node !== stopNode) {
-      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!");
-      }
-      return split(node.parentNode, node.splitText(offset), stopNode, root);
-    }
-    let nodeAfterSplit = typeof offset === "number" ? offset < node.childNodes.length ? node.childNodes[offset] : null : offset;
-    const parent = node.parentNode;
-    if (!parent || node === stopNode || !isElement(node)) {
-      return nodeAfterSplit;
-    }
-    const clone = node.cloneNode(false);
-    while (nodeAfterSplit) {
-      const next = nodeAfterSplit.nextSibling;
-      clone.append(nodeAfterSplit);
-      nodeAfterSplit = next;
-    }
-    if (node instanceof HTMLOListElement && getClosest(node, root, "BLOCKQUOTE")) {
-      clone.start = (+node.start || 1) + node.childNodes.length - 1;
-    }
-    fixCursor(node);
-    fixCursor(clone);
-    node.after(clone);
-    return split(parent, clone, stopNode, root);
-  };
-  var _mergeInlines = (node, fakeRange) => {
-    const children = node.childNodes;
-    let l = children.length;
-    let frags = [];
-    while (l--) {
-      const child = children[l];
-      const prev = l && children[l - 1];
-      if (prev && isInline(child) && areAlike(child, prev)/* && !leafNodeNames.has(child.nodeName)*/) {
-        if (fakeRange.startContainer === child) {
-          fakeRange.startContainer = prev;
-          fakeRange.startOffset += getLength(prev);
-        }
-        if (fakeRange.endContainer === child) {
-          fakeRange.endContainer = prev;
-          fakeRange.endOffset += getLength(prev);
-        }
-        if (fakeRange.startContainer === node) {
-          if (fakeRange.startOffset > l) {
-            --fakeRange.startOffset;
-          } else if (fakeRange.startOffset === l) {
-            fakeRange.startContainer = prev;
-            fakeRange.startOffset = getLength(prev);
-          }
-        }
-        if (fakeRange.endContainer === node) {
-          if (fakeRange.endOffset > l) {
-            --fakeRange.endOffset;
-          } else if (fakeRange.endOffset === l) {
-            fakeRange.endContainer = prev;
-            fakeRange.endOffset = getLength(prev);
-          }
-        }
-        detach(child);
-        if (isTextNode(child)) {
-          prev.appendData(child.data);
-        } else {
-          frags.unshift(empty(child));
-        }
-      } else if (isElement(child)) {
-        child.append(...frags);
-        frags = [];
-        _mergeInlines(child, fakeRange);
-      }
-    }
-  };
-  var mergeInlines = (node, range) => {
-    node = isTextNode(node) ? node.parentNode : node;
-    if (isElement(node)) {
-      const fakeRange = {
-        startContainer: range.startContainer,
-        startOffset: range.startOffset,
-        endContainer: range.endContainer,
-        endOffset: range.endOffset
-      };
-      _mergeInlines(node, fakeRange);
-      range.setStart(fakeRange.startContainer, fakeRange.startOffset);
-      range.setEnd(fakeRange.endContainer, fakeRange.endOffset);
-    }
-  };
-  var mergeWithBlock = (block, next, range, root) => {
-    let container = next;
-    let parent;
-    let offset;
-    while ((parent = container.parentNode) && parent !== root && isElement(parent) && parent.childNodes.length === 1) {
-      container = parent;
-    }
-    detach(container);
-    offset = block.childNodes.length;
-    const last = block.lastChild;
-    if (isBrElement(last)) {
-      last.remove();
-      --offset;
-    }
-    block.append(empty(next));
-    range.setStart(block, offset);
-    range.collapse(true);
-    mergeInlines(block, range);
-  };
-  var mergeContainers = (node, root) => {
-    const prev = node.previousSibling;
-    const first = node.firstChild;
-    const isListItem = node.nodeName === "LI";
-    if (isListItem && (!first || !listNodeNames.has(first.nodeName))) {
-      return;
-    }
-    if (prev && areAlike(prev, node)) {
-      if (!isContainer(prev)) {
-        if (!isListItem) {
-          return;
-        }
-        const block = createElement("DIV");
-        block.append(empty(prev));
-        prev.append(block);
-      }
-      detach(node);
-      const needsFix = !isContainer(node);
-      prev.append(empty(node));
-      needsFix && fixContainer(prev, root);
-      first && mergeContainers(first, root);
-    } else if (isListItem) {
-      const block = createElement("DIV");
-      node.insertBefore(block, first);
-      fixCursor(block);
-    }
-  };
-
-  // source/Clean.ts
-  var styleToSemantic = {
-    fontWeight: {
-      regexp: /^bold|^700/i,
-      replace: () => createElement("B")
-    },
-    fontStyle: {
-      regexp: /^italic/i,
-      replace: () => createElement("I")
-    },
-    fontFamily: {
-      regexp: notWS,
-      replace: (family) => createElement("SPAN", {
-        style: "font-family:" + family
-      })
-    },
-    fontSize: {
-      regexp: notWS,
-      replace: (size) => createElement("SPAN", {
-        style: "font-size:" + size
-      })
-    },
-    textDecoration: {
-      regexp: /^underline/i,
-      replace: () => createElement("U")
-    }
-  /*
-    textDecoration: {
-      regexp: /^line-through/i,
-      replace: doc => createElement("S")
-    }
-  */
-  };
-  var replaceStyles = (node) => {
-    const style = node.style;
-    let newTreeBottom;
-    let newTreeTop;
-    Object.entries(styleToSemantic).forEach(([attr, converter]) => {
-      const css = style[attr];
-      if (css && converter.regexp.test(css)) {
-        const el = converter.replace(css);
-        if (el.nodeName !== node.nodeName || el.className !== node.className) {
-          if (!newTreeTop) {
-            newTreeTop = el;
-          }
-          if (newTreeBottom) {
-            newTreeBottom.append(el);
-          }
-          newTreeBottom = el;
-          node.style.removeProperty(attr);
-        }
-      }
-    });
-    if (newTreeTop && newTreeBottom) {
-      newTreeBottom.append(empty(node));
-      if (node.style.cssText) {
-        node.append(newTreeTop);
-      } else {
-        replaceWith(node, newTreeTop);
-      }
-    }
-    return newTreeBottom || node;
-  };
-  var replaceWithTag = (tag) => (node) => {
-    const el = createElement(tag);
-    Array.prototype.forEach.call(node.attributes, (attr) => el.setAttribute(attr.name, attr.value));
-    replaceWith(node, el);
-    el.append(empty(node));
-    return el;
-  };
-  var fontSizes = {
-    1: "x-small",
-    2: "small",
-    3: "medium",
-    4: "large",
-    5: "x-large",
-    6: "xx-large",
-    7: "xxx-large",
-    "-1": "smaller",
-    "+1": "larger"
-  };
-  var stylesRewriters = {
-    STRONG: replaceWithTag("B"),
-    EM: replaceWithTag("I"),
-    INS: replaceWithTag("U"),
-    STRIKE: replaceWithTag("S"),
-    SPAN: replaceStyles,
-    FONT: (node) => {
-      const face = node.face;
-      const size = node.size;
-      let color = node.color;
-      let newTag = createElement("SPAN");
-      let css = newTag.style;
-      newTag.style.cssText = node.style.cssText;
-      if (face) {
-        css.fontFamily = face;
-      }
-      if (size) {
-        css.fontSize = fontSizes[size];
-      }
-      if (color && /^#?([\dA-F]{3}){1,2}$/i.test(color)) {
-        if (color.charAt(0) !== "#") {
-          color = "#" + color;
-        }
-        css.color = color;
-      }
-      replaceWith(node, newTag);
-      newTag.append(empty(node));
-      return newTag;
-    },
-    TT: (node) => {
-      const el = createElement("SPAN", {
-        style: 'font-family:menlo,consolas,"courier new",monospace'
-      });
-      replaceWith(node, el);
-      el.append(empty(node));
-      return el;
-    }
-  };
-  var allowedBlock = /^(?:A(?:DDRESS|RTICLE|SIDE|UDIO)|BLOCKQUOTE|CAPTION|D(?:[DLT]|IV)|F(?:IGURE|IGCAPTION|OOTER)|H[1-6]|HEADER|L(?:ABEL|EGEND|I)|O(?:L|UTPUT)|P(?:RE)?|SECTION|T(?:ABLE|BODY|D|FOOT|H|HEAD|R)|COL(?:GROUP)?|UL)$/;
-  var blacklist = new Set(["HEAD", "META", "STYLE"]);
-  var cleanTree = (node, preserveWS) => {
-    const children = node.childNodes;
-    let nonInlineParent = node;
-    while (isInline(nonInlineParent)) {
-      nonInlineParent = nonInlineParent.parentNode;
-    }
-/*
-    const walker = createTreeWalker(
-      nonInlineParent,
-      SHOW_ELEMENT_OR_TEXT
-    );
-*/
-    let i = children.length;
-    while (i--) {
-      let child = children[i];
-      const nodeName = child.nodeName;
-      if (isElement(child)) {
-        const childLength = child.childNodes.length;
-        if (stylesRewriters[nodeName]) {
-          child = stylesRewriters[nodeName](child);
-        } else if (blacklist.has(nodeName)) {
-          child.remove();
-          continue;
-        } else if (!allowedBlock.test(nodeName) && !isInline(child)) {
-          i += childLength;
-          replaceWith(child, empty(child));
-          continue;
-        }
-        if (childLength) {
-          cleanTree(child, preserveWS || (nodeName === "PRE"));
-        }
-/*
-      } else {
-        if (isTextNode(child)) {
-          let data = child.data;
-          const startsWithWS = !notWS.test(data.charAt(0));
-          const endsWithWS = !notWS.test(data.charAt(data.length - 1));
-          if (preserveWS || (!startsWithWS && !endsWithWS)) {
-            continue;
-          }
-          if (startsWithWS) {
-            walker.currentNode = child;
-            let sibling;
-            while (sibling = walker.previousPONode()) {
-              if (sibling.nodeName === "IMG" || isTextNode(sibling) && notWS.test(sibling.data)) {
-                break;
-              }
-              if (!isInline(sibling)) {
-                sibling = null;
-                break;
-              }
-            }
-            data = data.replace(/^[ \t\r\n]+/g, sibling ? " " : "");
-          }
-          if (endsWithWS) {
-            walker.currentNode = child;
-            let sibling;
-            while (sibling = walker.nextNode()) {
-              if (sibling.nodeName === "IMG" || (isTextNode(sibling) && notWS.test(sibling.data))) {
-                break;
-              }
-              if (!isInline(sibling)) {
-                sibling = null;
-                break;
-              }
-            }
-            data = data.replace(/[ \t\r\n]+$/g, sibling ? " " : "");
-          }
-          if (data) {
-            child.data = data;
-            continue;
-          }
-        }
-        node.removeChild(child);
-*/
-      }
-    }
-    return node;
-  };
-  var removeEmptyInlines = (node) => {
-    const children = node.childNodes;
-    let l = children.length;
-    while (l--) {
-      const child = children[l];
-      if (isElement(child) && !isLeaf(child)) {
-        removeEmptyInlines(child);
-        if (!child.firstChild && isInline(child)) {
-          child.remove();
-        }
-      } else if (!child.data && isTextNode(child)) {
-        node.removeChild(child);
-      }
-    }
-  };
-  var cleanupBRs = (node, root, keepForBlankLine) => {
-    const brs = node.querySelectorAll("BR");
-    let l = brs.length;
-    while (l--) {
-      const br = brs[l];
-      const parent = br.parentNode;
-      if (parent) {
-        if (!isLineBreak(br, keepForBlankLine)) {
-          detach(br);
-        } else if (!isInline(parent)) {
-          fixContainer(parent, root);
-        }
-      }
-    }
-  };
-  var escapeHTML = (text) => text.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;");
-
-  // source/node/Block.ts
-  var getBlockWalker = (node, root) => {
-    const walker = createTreeWalker(root, SHOW_ELEMENT, isBlock);
-    walker.currentNode = node;
-    return walker;
-  };
-  var getPreviousBlock = (node, root) => {
-    node = getBlockWalker(node, root).previousNode();
-    return node !== root ? node : null;
-  };
-  var getNextBlock = (node, root) => {
-    node = getBlockWalker(node, root).nextNode();
-    return node !== root ? node : null;
-  };
-  var isEmptyBlock = (block) => !block.textContent && !block.querySelector("IMG");
-
-  // source/range/Block.ts
-  var getStartBlockOfRange = (range, root) => {
-    const container = range.startContainer;
-    let block;
-    if (isInline(container)) {
-      block = getPreviousBlock(container, root);
-    } else if (container !== root && container instanceof HTMLElement && isBlock(container)) {
-      block = container;
-    } else {
-      block = getNextBlock(getNodeBeforeOffset(container, range.startOffset), root);
-    }
-    return block && isNodeContainedInRange(range, block) ? block : null;
-  };
-  var getEndBlockOfRange = (range, root) => {
-    const container = range.endContainer;
-    let block;
-    if (isInline(container)) {
-      block = getPreviousBlock(container, root);
-    } else if (container !== root && container instanceof HTMLElement && isBlock(container)) {
-      block = container;
-    } else {
-      let node = getNodeAfterOffset(container, range.endOffset);
-      if (!node || !root.contains(node)) {
-        node = root;
-        let child;
-        while (child = node.lastChild) {
-          node = child;
-        }
-      }
-      block = getPreviousBlock(node, root);
-    }
-    return block && isNodeContainedInRange(range, block) ? block : null;
-  };
-  var createContentWalker = (root) => createTreeWalker(
-    root,
-    SHOW_ELEMENT_OR_TEXT,
-    (node) => isTextNode(node) ? notWS.test(node.data) : node.nodeName === "IMG"
-  );
-  var rangeDoesStartAtBlockBoundary = (range, root) => {
-    const startContainer = range.startContainer;
-    const startOffset = range.startOffset;
-    let nodeAfterCursor;
-    if (isTextNode(startContainer)) {
-      let i = startOffset;
-      while (i--) {
-        if (startContainer.data.charAt(i) !== ZWS) {
-          return false;
-        }
-      }
-      nodeAfterCursor = startContainer;
-    } else {
-      nodeAfterCursor = getNodeAfterOffset(startContainer, startOffset);
-      if (!nodeAfterCursor || !root.contains(nodeAfterCursor)) {
-        nodeAfterCursor = getNodeBeforeOffset(startContainer, startOffset);
-        if (isTextNode(nodeAfterCursor) && nodeAfterCursor.length) {
-          return false;
-        }
-      }
-    }
-    const block = getStartBlockOfRange(range, root);
-    if (block) {
-      const contentWalker = createContentWalker(block);
-      contentWalker.currentNode = nodeAfterCursor;
-      return !contentWalker.previousNode();
-    }
-  };
-  var rangeDoesEndAtBlockBoundary = (range, root) => {
-    const endContainer = range.endContainer;
-    const endOffset = range.endOffset;
-    let currentNode;
-    if (isTextNode(endContainer)) {
-      const text = endContainer.data;
-      const length = text.length;
-      for (let i = endOffset; i < length; ++i) {
-        if (text.charAt(i) !== ZWS) {
-          return false;
-        }
-      }
-      currentNode = endContainer;
-    } else {
-      currentNode = getNodeBeforeOffset(endContainer, endOffset);
-    }
-    const block = getEndBlockOfRange(range, root);
-    if (block) {
-      const contentWalker = createContentWalker(block);
-      contentWalker.currentNode = currentNode;
-      return !contentWalker.nextNode();
-    }
-  };
-  var expandRangeToBlockBoundaries = (range, root) => {
-    const start = getStartBlockOfRange(range, root);
-    const end = getEndBlockOfRange(range, root);
-    if (start && end) {
-      range.setStart(start, 0);
-      range.setEnd(end, end.childNodes.length);
-    }
-  };
-
-  // source/range/InsertDelete.ts
-  var createRange = (startContainer, startOffset, endContainer, endOffset) => {
-    const range = document.createRange();
-    range.setStart(startContainer, startOffset);
-    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;
-    if (isTextNode(startContainer)) {
-      const parent = startContainer.parentNode;
-      children = parent.childNodes;
-      if (startOffset === startContainer.length) {
-        startOffset = indexOf(children, startContainer) + 1;
-        if (range.collapsed) {
-          endContainer = parent;
-          endOffset = startOffset;
-        }
-      } else {
-        if (startOffset) {
-          const afterSplit = startContainer.splitText(startOffset);
-          if (endContainer === startContainer) {
-            endOffset -= startOffset;
-            endContainer = afterSplit;
-          } else if (endContainer === parent) {
-            ++endOffset;
-          }
-          startContainer = afterSplit;
-        }
-        startOffset = indexOf(children, startContainer);
-      }
-      startContainer = parent;
-    } else {
-      children = startContainer.childNodes;
-    }
-    const childCount = children.length;
-    if (startOffset === childCount) {
-      startContainer.append(node);
-    } else {
-      startContainer.insertBefore(node, children[startOffset]);
-    }
-    if (startContainer === endContainer) {
-      endOffset += children.length - childCount;
-    }
-    range.setStart(startContainer, startOffset);
-    range.setEnd(endContainer, endOffset);
-  };
-  var extractContentsOfRange = (range, common, root) => {
-    common = common || range.commonAncestorContainer;
-    if (isTextNode(common)) {
-      common = common.parentNode;
-    }
-    let endNode = split(range.endContainer, range.endOffset, common, root),
-      frag = range.extractContents(),
-      startContainer = common,
-      startOffset = endNode ? indexOf(common.childNodes, endNode) : common.childNodes.length,
-      after = common.childNodes[startOffset],
-      before = after?.previousSibling,
-      beforeText, afterText;
-    if (isTextNode(before) && isTextNode(after)) {
-      startContainer = before;
-      startOffset = before.length;
-      beforeText = before.data;
-      afterText = after.data;
-      if (beforeText.charAt(beforeText.length - 1) === ' ' && afterText.charAt(0) === ' ') {
-        afterText = NBSP + afterText.slice(1);
-      }
-      before.appendData(afterText);
-      detach(after);
-    }
-    range.setStart(startContainer, startOffset);
-    range.collapse(true);
-    fixCursor(common);
-    return frag;
-  };
-  var getAdjacentInlineNode = (iterator, method, node) => {
-    iterator.currentNode = node;
-    let nextNode;
-    while (nextNode = iterator[method]()) {
-      if (isTextNode(nextNode) || isLeaf(nextNode)) {
-        return nextNode;
-      }
-      if (!isInline(nextNode)) {
-        return null;
-      }
-    }
-    return null;
-  };
-  var deleteContentsOfRange = (range, root) => {
-    const startBlock = getStartBlockOfRange(range, root);
-    let endBlock = getEndBlockOfRange(range, root);
-    const needsMerge = startBlock !== endBlock;
-    if (startBlock && endBlock) {
-      moveRangeBoundariesDownTree(range);
-      moveRangeBoundariesUpTree(range, startBlock, endBlock, root);
-    }
-    const frag = extractContentsOfRange(range, null, root);
-    moveRangeBoundariesDownTree(range);
-    if (needsMerge) {
-      endBlock = getEndBlockOfRange(range, root);
-      if (startBlock && endBlock && startBlock !== endBlock) {
-        mergeWithBlock(startBlock, endBlock, range, root);
-      }
-    }
-    if (startBlock) {
-      fixCursor(startBlock);
-    }
-    const child = root.firstChild;
-    if (!child || isBrElement(child)) {
-      fixCursor(root);
-      root.firstChild && range.selectNodeContents(root.firstChild);
-    }
-    range.collapse(true);
-    const startContainer = range.startContainer;
-    const startOffset = range.startOffset;
-    const iterator = createTreeWalker(root, SHOW_ELEMENT_OR_TEXT);
-    let afterNode = startContainer;
-    let afterOffset = startOffset;
-    if (!isTextNode(afterNode) || afterOffset === afterNode.data.length) {
-      afterNode = getAdjacentInlineNode(iterator, "nextNode", afterNode);
-      afterOffset = 0;
-    }
-    let beforeNode = startContainer;
-    let beforeOffset = startOffset - 1;
-    if (!isTextNode(beforeNode) || beforeOffset === -1) {
-      beforeNode = getAdjacentInlineNode(
-        iterator,
-        "previousPONode",
-        afterNode || (isTextNode(startContainer) ? startContainer : startContainer.childNodes[startOffset] || startContainer)
-      );
-      if (isTextNode(beforeNode)) {
-        beforeOffset = beforeNode.data.length;
-      }
-    }
-    let node = null;
-    let offset = 0;
-    if (isTextNode(afterNode) && afterNode.data.charAt(afterOffset) === " " && rangeDoesStartAtBlockBoundary(range, root)) {
-      node = afterNode;
-      offset = afterOffset;
-    } else if (isTextNode(beforeNode) && beforeNode.data.charAt(beforeOffset) === " ") {
-      if (isTextNode(afterNode) && afterNode.data.charAt(afterOffset) === " " || rangeDoesEndAtBlockBoundary(range, root)) {
-        node = beforeNode;
-        offset = beforeOffset;
-      }
-    }
-    node && node.replaceData(offset, 1, "\xA0");
-    range.setStart(startContainer, startOffset);
-    range.collapse(true);
-    return frag;
-  };
-  var insertTreeFragmentIntoRange = (range, frag, root) => {
-    const firstInFragIsInline = frag.firstChild && isInline(frag.firstChild);
-    let node, blockContentsAfterSplit;
-    fixContainer(frag, root);
-    node = frag;
-    while (node = getNextBlock(node, root)) {
-      fixCursor(node);
-    }
-    if (!range.collapsed) {
-      deleteContentsOfRange(range, root);
-    }
-    moveRangeBoundariesDownTree(range);
-    range.collapse();
-    const stopPoint = getClosest(range.endContainer, root, "BLOCKQUOTE") || root;
-    let block = getStartBlockOfRange(range, root);
-    const firstBlockInFrag = getNextBlock(frag, frag);
-    const replaceBlock = !firstInFragIsInline && !!block && isEmptyBlock(block);
-    if (block && firstBlockInFrag && !replaceBlock &&
-    !getClosest(firstBlockInFrag, frag, "PRE,TABLE")) {
-      moveRangeBoundariesUpTree(range, block, block, root);
-      range.collapse(true);
-      let container = range.endContainer;
-      let offset = range.endOffset;
-      cleanupBRs(block, root, false);
-      if (isInline(container)) {
-        const nodeAfterSplit = split(
-          container,
-          offset,
-          getPreviousBlock(container, root) || root,
-          root
-        );
-        container = nodeAfterSplit.parentNode;
-        offset = indexOf(container.childNodes, nodeAfterSplit);
-      }
-      if (
-        /*isBlock(container) && */
-        offset !== getLength(container)
-      ) {
-        blockContentsAfterSplit = document.createDocumentFragment();
-        while (node = container.childNodes[offset]) {
-          blockContentsAfterSplit.append(node);
-        }
-      }
-      mergeWithBlock(container, firstBlockInFrag, range, root);
-      offset = indexOf(container.parentNode.childNodes, container) + 1;
-      container = container.parentNode;
-      range.setEnd(container, offset);
-    }
-    if (getLength(frag)) {
-      if (replaceBlock && block) {
-        range.setEndBefore(block);
-        range.collapse();
-        detach(block);
-      }
-      moveRangeBoundariesUpTree(range, stopPoint, stopPoint, root);
-      let nodeAfterSplit = split(
-        range.endContainer,
-        range.endOffset,
-        stopPoint,
-        root
-      );
-      const nodeBeforeSplit = nodeAfterSplit ? nodeAfterSplit.previousSibling : stopPoint.lastChild;
-      stopPoint.insertBefore(frag, nodeAfterSplit);
-      if (nodeAfterSplit) {
-        range.setEndBefore(nodeAfterSplit);
-      } else {
-        range.setEnd(stopPoint, getLength(stopPoint));
-      }
-      block = getEndBlockOfRange(range, root);
-      moveRangeBoundariesDownTree(range);
-      const container = range.endContainer;
-      const offset = range.endOffset;
-      if (nodeAfterSplit && isContainer(nodeAfterSplit)) {
-        mergeContainers(nodeAfterSplit, root);
-      }
-      nodeAfterSplit = nodeBeforeSplit?.nextSibling;
-      if (nodeAfterSplit && isContainer(nodeAfterSplit)) {
-        mergeContainers(nodeAfterSplit, root);
-      }
-      range.setEnd(container, offset);
-    }
-    if (blockContentsAfterSplit && block) {
-      const tempRange = range.cloneRange();
-      mergeWithBlock(block, blockContentsAfterSplit, tempRange, root);
-      range.setEnd(tempRange.endContainer, tempRange.endOffset);
-    }
-    moveRangeBoundariesDownTree(range);
-  };
-
-  // source/range/Contents.ts
-/*
-  var getTextContentsOfRange = (range) => {
-    if (range.collapsed) {
-      return "";
-    }
-    const startContainer = range.startContainer;
-    const endContainer = range.endContainer;
-    const filter = (node2) => isNodeContainedInRange(range, node2, true);
-    const walker = createTreeWalker(
-      range.commonAncestorContainer,
-      SHOW_ELEMENT_OR_TEXT,
-      filter
-    );
-    walker.currentNode = startContainer;
-    let node = startContainer;
-    let textContent = "";
-    let addedTextInBlock = false;
-    let value;
-    if (!isElement(node) && !isTextNode(node) || !filter(node)) {
-      node = walker.nextNode();
-    }
-    while (node) {
-      if (isTextNode(node)) {
-        value = node.data;
-        if (value && /\S/.test(value)) {
-          if (node === endContainer) {
-            value = value.slice(0, range.endOffset);
-          }
-          if (node === startContainer) {
-            value = value.slice(range.startOffset);
-          }
-          textContent += value;
-          addedTextInBlock = true;
-        }
-      } else if (isBrElement(node) || addedTextInBlock && !isInline(node)) {
-        textContent += "\n";
-        addedTextInBlock = false;
-      }
-      node = walker.nextNode();
-    }
-    textContent = textContent.replace(/\xA0/g, " ");
-    return textContent;
-  };
-*/
-
-  // source/Clipboard.ts
-  var extractRangeToClipboard = (event, range, root, cut) => {
-    if (event.clipboardData) {
-      let startBlock = getStartBlockOfRange(range, root),
-        endBlock = getEndBlockOfRange(range, root),
-        copyRoot = ((startBlock === endBlock) && startBlock) || root,
-        contents, parent, newContents;
-      if (cut) {
-        contents = deleteContentsOfRange(range, root);
-      } else {
-        range = range.cloneRange();
-        moveRangeBoundariesDownTree(range);
-        moveRangeBoundariesUpTree(range, copyRoot, copyRoot, root);
-        contents = range.cloneContents();
-      }
-      parent = range.commonAncestorContainer;
-      if (isTextNode(parent)) {
-        parent = parent.parentNode;
-      }
-      while (parent && parent !== copyRoot) {
-        newContents = parent.cloneNode(false);
-        newContents.append(contents);
-        contents = newContents;
-        parent = parent.parentNode;
-      }
-      let clipboardData = event.clipboardData;
-      let body = document.body;
-      let node = createElement("div");
-      let html, text;
-      node.append(contents);
-      html = node.innerHTML;
-      cleanupBRs(node, root, true);
-      node.setAttribute("style",
-        'position:fixed;overflow:hidden;bottom:100%;right:100%;');
-      body.append(node);
-      text = (node.innerText || node.textContent).replace(NBSP, ' '); // Replace nbsp with regular space
-      node.remove();
-      if (text !== html) {
-        clipboardData.setData("text/html", html);
-      }
-      clipboardData.setData("text/plain", text);
-      event.preventDefault();
-      return true;
-    }
-  };
-  var _onCut = function(event) {
-    const range = this.getSelection();
-    const root = this._root;
-    if (range.collapsed) {
-      event.preventDefault();
-      return;
-    }
-    this.saveUndoState(range);
-    if (!extractRangeToClipboard(event, range, root, true)) {
-      setTimeout(() => {
-        try {
-          this._ensureBottomLine();
-        } catch (error) {
-          didError(error);
-        }
-      }, 0);
-    }
-    this.setSelection(range);
-  };
-  var _onCopy = function(event) {
-    extractRangeToClipboard(
-      event,
-      this.getSelection(),
-      this._root
-    );
-  };
-  var _onPaste = function(event) {
-    const clipboardData = event.clipboardData;
-    const items = clipboardData?.items;
-    let imageItem = null;
-    let plainItem = null;
-    let htmlItem = null;
-    let self = this;
-    let type;
-    if (items) {
-      [...items].forEach(item => {
-        type = item.type;
-        if (type === "text/html") {
-          htmlItem = item;
-        } else if (type === "text/plain" || type === "text/uri-list") {
-          plainItem = item;
-        } else if (item.kind === "file" && /^image\/(png|jpeg|webp)/.test(type)) {
-          imageItem = item;
-        }
-      });
-      if (htmlItem || plainItem || imageItem) {
-        event.preventDefault();
-        if (imageItem) {
-          let reader = new FileReader();
-          reader.onload = (event) => {
-            let img = createElement("img", {src: event.target.result}),
-              canvas = createElement("canvas"),
-              ctx = canvas.getContext('2d');
-            img.onload = ()=>{
-              ctx.drawImage(img, 0, 0);
-              let width = img.width, height = img.height;
-              if (width > height) {
-                if (width > 1024) {
-                  height = height * 1024 / width;
-                  width = 1024;
-                }
-              } else if (height > 1024) {
-                width = width * 1024 / height;
-                height = 1024;
-              }
-              canvas.width = width;
-              canvas.height = height;
-              ctx.drawImage(img, 0, 0, width, height);
-              self.insertHTML('<img alt="" style="width:100%;max-width:'+width+'px" src="'+canvas.toDataURL()+'">', true);
-            };
-          }
-          reader.readAsDataURL(imageItem.getAsFile());
-        } else if (htmlItem && (!self.isShiftDown || !plainItem)) {
-          htmlItem.getAsString(html => self.insertHTML(html, true));
-        } else if (plainItem) {
-          plainItem.getAsString(text => self.insertPlainText(text, true));
-        }
-      }
-    }
-  };
-
-  // source/keyboard/KeyHelpers.ts
-  var afterDelete = (self, range) => {
-    try {
-      range = range || self.getSelection();
-      let node = range.startContainer;
-      if (isTextNode(node)) {
-        node = node.parentNode;
-      }
-      let parent = node;
-      while (isInline(parent) && (!parent.textContent || parent.textContent === ZWS)) {
-        node = parent;
-        parent = node.parentNode;
-      }
-      if (node !== parent) {
-        range.setStart(
-          parent,
-          indexOf(parent.childNodes, node)
-        );
-        range.collapse(true);
-        node.remove();
-        if (!isBlock(parent)) {
-          parent = getPreviousBlock(parent, self._root) || parent;
-        }
-        fixCursor(parent);
-        moveRangeBoundariesDownTree(range);
-      }
-      if (node === self._root && (node = node.firstChild) && isBrElement(node)) {
-        detach(node);
-      }
-      self._ensureBottomLine();
-      self.setRange(range);
-    } catch (error) {
-      didError(error);
-    }
-  };
-
-  // source/keyboard/Backspace.ts
-  var Backspace = (self, event, range) => {
-    const root = self._root;
-    self._removeZWS();
-    self.saveUndoState(range);
-    if (!range.collapsed) {
-      event.preventDefault();
-      deleteContentsOfRange(range, root);
-      afterDelete(self, range);
-    } else if (rangeDoesStartAtBlockBoundary(range, root)) {
-      event.preventDefault();
-      let current = getStartBlockOfRange(range, root);
-      let previous;
-      if (!current) {
-        return;
-      }
-      fixContainer(current.parentNode, root);
-      previous = getPreviousBlock(current, root);
-      if (previous) {
-        if (!previous.isContentEditable) {
-          detachUneditableNode(previous, root);
-          return;
-        }
-        mergeWithBlock(previous, current, range, root);
-        current = previous.parentNode;
-        while (current !== root && !current.nextSibling) {
-          current = current.parentNode;
-        }
-        if (current !== root && (current = current.nextSibling)) {
-          mergeContainers(current, root);
-        }
-        self.setSelection(range);
-      } else if (current) {
-        if (decreaseLevel(self, range, current)) {
-          return;
-        }
-        self.setRange(range);
-      }
-    } else {
-      self.setSelection(range);
-      setTimeout(() => afterDelete(self), 0);
-    }
-  };
-
-  // source/keyboard/Delete.ts
-  var Delete = (self, event, range) => {
-    const root = self._root;
-    let current;
-    let next;
-    let originalRange;
-    let cursorContainer;
-    let cursorOffset;
-    let nodeAfterCursor;
-    self._removeZWS();
-    self.saveUndoState(range);
-    if (!range.collapsed) {
-      event.preventDefault();
-      deleteContentsOfRange(range, root);
-      afterDelete(self, range);
-    } else if (rangeDoesEndAtBlockBoundary(range, root)) {
-      event.preventDefault();
-      if (current = getStartBlockOfRange(range, root)) {
-        fixContainer(current.parentNode, root);
-        if (next = getNextBlock(current, root)) {
-          if (!next.isContentEditable) {
-            detachUneditableNode(next, root);
-            return;
-          }
-          mergeWithBlock(current, next, range, root);
-          next = current.parentNode;
-          while (next !== root && !next.nextSibling) {
-            next = next.parentNode;
-          }
-          if (next !== root && (next = next.nextSibling)) {
-            mergeContainers(next, root);
-          }
-          self.setRange(range);
-        }
-      }
-    } else {
-      originalRange = range.cloneRange();
-      moveRangeBoundariesUpTree(range, root, root, root);
-      cursorContainer = range.endContainer;
-      cursorOffset = range.endOffset;
-      if (isElement(cursorContainer)) {
-        nodeAfterCursor = cursorContainer.childNodes[cursorOffset];
-        if (nodeAfterCursor?.nodeName === "IMG") {
-          event.preventDefault();
-          detach(nodeAfterCursor);
-          moveRangeBoundariesDownTree(range);
-          afterDelete(self, range);
-          return;
-        }
-      }
-      self.setSelection(originalRange);
-      setTimeout(() => afterDelete(self), 0);
-    }
-  };
-
-  // source/keyboard/Tab.ts
-  var Tab = (self, event, range) => {
-    self._removeZWS();
-    range.collapsed
-      && rangeDoesStartAtBlockBoundary(range, self._root)
-      && getClosest(range.startContainer, self._root, "UL,OL,BLOCKQUOTE")
-      && self.changeIndentationLevel("increase")
-      && event.preventDefault();
-  };
-  var ShiftTab = (self, event, range) => {
-    self._removeZWS();
-    range.collapsed
-      && rangeDoesStartAtBlockBoundary(range, self._root)
-      && decreaseLevel(self, range, range.startContainer)
-      && event.preventDefault();
-  };
-
-  // source/keyboard/Space.ts
-  var Space = (self, event, range) => {
-/*
-    var _a;
-    let node;
-    const root = self._root;
-    self._recordUndoState(range);
-    self._getRangeAndRemoveBookmark(range);
-    if (!range.collapsed) {
-      deleteContentsOfRange(range, root);
-      self._ensureBottomLine();
-      self.setSelection(range);
-      self._updatePath(range, true);
-    } else if (rangeDoesEndAtBlockBoundary(range, root)) {
-      const block = getStartBlockOfRange(range, root);
-      if (block && block.nodeName !== "PRE") {
-        const text = block.textContent?.trimEnd().replace(ZWS, "");
-        if (text === "*" || text === "1.") {
-          event.preventDefault();
-          const walker = createTreeWalker(block, SHOW_TEXT);
-          let textNode;
-          while (textNode = walker.nextNode()) {
-            textNode.data = cantFocusEmptyTextNodes ? ZWS : "";
-          }
-          if (text === "*") {
-            self.makeUnorderedList();
-          } else {
-            self.makeOrderedList();
-          }
-          return;
-        }
-      }
-    }
-    node = range.endContainer;
-    if (range.endOffset === getLength(node)) {
-      do {
-        if (node.nodeName === "A") {
-          range.setStartAfter(node);
-          break;
-        }
-      } while (!node.nextSibling && (node = node.parentNode) && node !== root);
-    }
-    if (self._config.addLinks) {
-      const linkRange = range.cloneRange();
-      moveRangeBoundariesDownTree(linkRange);
-      const textNode = linkRange.startContainer;
-      const offset = linkRange.startOffset;
-      setTimeout(() => {
-        linkifyText(self, textNode, offset);
-      }, 0);
-    }
-    self.setSelection(range);
-*/
-    const root = self._root;
-    self._recordUndoState(range);
-    self._config.addLinks && addLinks(range.startContainer, root);
-    self._getRangeAndRemoveBookmark(range);
-/*
-    let node = range.endContainer;
-    if (range.collapsed && range.endOffset === getLength(node)) {
-      do {
-        if (node.nodeName === "A") {
-          range.setStartAfter(node);
-          break;
-        }
-      } while (!node.nextSibling && (node = node.parentNode) && node !== root);
-    }
-*/
-    if (!range.collapsed) {
-      deleteContentsOfRange(range, root);
-      self._ensureBottomLine();
-    }
-    self.setRange(range);
-  };
-
-  // source/keyboard/KeyHandlers.ts
-  var _onKey = function(event) {
-    if (event.defaultPrevented) {
-      return;
-    }
-    let key = event.key,
-      range = this.getSelection(),
-      root = this._root;
-    if (key !== "Backspace" && key !== "Delete") {
-      if (event.shiftKey) {
-        key = "Shift-" + key;
-      }
-      if (event[osKey]) { key = ctrlKey + key; }
-    }
-    if (this._keyHandlers[key]) {
-      this._keyHandlers[key](this, event, range);
-    } else if (!range.collapsed && !event.isComposing && !event[osKey] && key.length === 1) {
-      this.saveUndoState(range);
-      deleteContentsOfRange(range, root);
-      this._ensureBottomLine();
-      this.setRange(range);
-    } else if (range.collapsed && range.startContainer === root && root.children.length > 0) {
-      const nextElement = root.children[range.startOffset];
-      if (nextElement && !isBlock(nextElement)) {
-        range = createRange(root.insertBefore(
-          this.createDefaultBlock(), nextElement
-        ), 0);
-        if (isBrElement(nextElement)) {
-          root.removeChild(nextElement);
-        }
-        const restore = this._willRestoreSelection;
-        this.setSelection(range);
-        this._willRestoreSelection = restore;
-      }
-    }
-  };
-  var mapKeyToFormat = (tag, remove) => {
-    return (self, event) => {
-      event.preventDefault();
-      self.toggleTag(tag, remove);
-    };
-  };
-  var mapKeyTo = (method) => (self, event) => {
-    event.preventDefault();
-    self[method]();
-  };
-  var toggleList = (type, methodIfNotInList) => (self, event) => {
-    event.preventDefault();
-    let parent = self.getSelectionClosest("UL,OL");
-    if (type == parent?.nodeName) {
-      self.removeList();
-    } else {
-      self[methodIfNotInList]();
-    }
-  };
-  var changeIndentationLevel = (direction) => (self, event) => {
-    event.preventDefault();
-    self.changeIndentationLevel(direction);
-  };
-  var keyHandlers = {
-    Tab,
-    "Shift-Tab": ShiftTab,
-    Space,
-    ArrowLeft(self) {
-      self._removeZWS();
-    },
-    ArrowRight(self) {
-      self._removeZWS()
-    },
-    [ctrlKey + "b"]: mapKeyToFormat("B"),
-    [ctrlKey + "i"]: mapKeyToFormat("I"),
-    [ctrlKey + "u"]: mapKeyToFormat("U"),
-    [ctrlKey + "Shift-7"]: mapKeyToFormat("S"),
-    [ctrlKey + "Shift-5"]: mapKeyToFormat("SUB", "SUP"),
-    [ctrlKey + "Shift-6"]: mapKeyToFormat("SUP", "SUB"),
-    [ctrlKey + "Shift-8"]: toggleList("UL", "makeUnorderedList"),
-    [ctrlKey + "Shift-9"]: toggleList("OL", "makeOrderedList"),
-    [ctrlKey + "["]: changeIndentationLevel("decrease"),
-    [ctrlKey + "]"]: changeIndentationLevel("increase"),
-    [ctrlKey + "d"]: mapKeyTo("toggleCode"),
-//    [ctrlKey + "z"]: mapKeyTo("undo"), // historyUndo
-    [ctrlKey + "y"]: mapKeyTo("redo"), // historyRedo
-    [ctrlKey + "Shift-Z"]: mapKeyTo("redo"),
-    ["Redo"]: mapKeyTo("redo")
-  };
-  var blockTag = "DIV";
-  var DOCUMENT_POSITION_PRECEDING = 2;
-
-  var NBSP = '\u00A0';
-  var win = document.defaultView;
-  var osKey = isMac ? "metaKey" : "ctrlKey";
-/*
-  typeToBitArray = {
-    1: 1,
-    2: 2,
-    3: 4,
-    8: 128,
-    9: 256,
-    11: 1024
-  },
-*/
-
-  var didError = error => console.error(error);
-  var detachUneditableNode = (node, root) => {
-    let parent;
-    while (parent = node.parentNode) {
-      if (parent === root || parent.isContentEditable) {
-        break;
-      }
-      node = parent;
-    }
-    detach(node);
-  };
-
-  var mergeObjects = (base, extras, mayOverride) => {
-    base = base || {};
-    extras && Object.entries(extras).forEach(([prop,value])=>{
-      if (mayOverride || !(prop in base)) {
-        base[prop] = (value?.constructor === Object) ?
-          mergeObjects(base[prop], value, mayOverride) :
-          value;
-      }
-    });
-    return base;
-  };
-
-  var createBookmarkNodes = () => [
-    createElement("INPUT", {
-      id: startSelectionId,
-      type: "hidden"
-    }),
-    createElement("INPUT", {
-      id: endSelectionId,
-      type: "hidden"
-    })
-  ];
-
-  var getListSelection = (range, root) => {
-    let list = range.commonAncestorContainer;
-    let startLi = range.startContainer;
-    let endLi = range.endContainer;
-    while (list && list !== root && !listNodeNames.has(list.nodeName)) {
-      list = list.parentNode;
-    }
-    if (!list || list === root) {
-      return null;
-    }
-    if (startLi === list) {
-      startLi = startLi.childNodes[range.startOffset];
-    }
-    if (endLi === list) {
-      endLi = endLi.childNodes[range.endOffset];
-    }
-    while (startLi && startLi.parentNode !== list) {
-      startLi = startLi.parentNode;
-    }
-    while (endLi && endLi.parentNode !== list) {
-      endLi = endLi.parentNode;
-    }
-    return [list, startLi, endLi];
-  };
-  var setDirection = (self, frag, dir) => {
-    let walker = getBlockWalker(frag, self._root),
-      node;
-    while (node = walker.nextNode()) {
-      if (node.nodeName === "LI") {
-        node.parentNode.setAttribute("dir", dir);
-        break;
-      }
-      node.setAttribute("dir", dir);
-    }
-    return frag;
-  };
-  var decreaseLevel = (self, range, node) =>
-    getClosest(node, self._root, "UL,OL,BLOCKQUOTE") && self.changeIndentationLevel("decrease");
-  var addLinks = (frag, root) => {
-    let walker = createTreeWalker(frag, SHOW_TEXT, node => !getClosest(node, root, "A"));
-    let node, data, parent, match, index, endIndex, child;
-    while (node = walker.nextNode()) {
-      data = node.data;
-      parent = node.parentNode;
-      while (match = linkRegExp.exec(data)) {
-        index = match.index;
-        endIndex = index + match[0].length;
-        if (index) {
-          child = document.createTextNode(data.slice(0, index));
-          parent.insertBefore(child, node);
-        }
-        child = createElement("A", {
-          href: match[1]
-            ? (match[2] ? match[1] : "https://" + match[1])
-            : "mailto:" + match[0]
-        }, [data.slice(index, endIndex)]);
-        parent.insertBefore(child, node);
-        node.data = data = data.slice(endIndex);
-      }
-    }
-  };
-
-keyHandlers[ctrlKey + "b"] = mapKeyToFormat("B");
-keyHandlers[ctrlKey + "i"] = mapKeyToFormat("I");
-keyHandlers[ctrlKey + "u"] = mapKeyToFormat("U");
-keyHandlers[ctrlKey + "Shift-7"] = mapKeyToFormat("S");
-keyHandlers[ctrlKey + "Shift-5"] = mapKeyToFormat("SUB", "SUP");
-keyHandlers[ctrlKey + "Shift-6"] = mapKeyToFormat("SUP", "SUB");
-keyHandlers[ctrlKey + "Shift-8"] = toggleList("UL", "makeUnorderedList");
-keyHandlers[ctrlKey + "Shift-9"] = toggleList("OL", "makeOrderedList");
-keyHandlers[ctrlKey + "["] = changeIndentationLevel("decrease");
-keyHandlers[ctrlKey + "]"] = changeIndentationLevel("increase");
-keyHandlers[ctrlKey + "d"] = mapKeyTo("toggleCode");
-keyHandlers[ctrlKey + "y"] = mapKeyTo("redo");
-keyHandlers[ctrlKey + "Shift-Z"] = mapKeyTo("redo");
-keyHandlers["Redo"] = mapKeyTo("redo");
-
-class EditStack extends Array
-{
-    constructor(squire) {
-      super();
-      this.squire = squire;
-      this.index = -1;
-      this.inUndoState = false;
-      this.limit = 0; // -1 means no limit
-    }
-
-    clear() {
-      this.index = -1;
-      this.length = 0;
-    }
-
-    stateChanged(/*canUndo, canRedo*/) {
-      this.squire.fireEvent("undoStateChange", {
-        canUndo: this.index > 0,
-        canRedo: this.index + 1 < this.length
-      });
-      this.squire.fireEvent("input");
-    }
-
-    docWasChanged() {
-      if (this.inUndoState) {
-        this.inUndoState = false;
-        this.stateChanged(/*true, false*/);
-      } else
-        this.squire.fireEvent("input");
-    }
-
-    /**
-     * Leaves bookmark.
-     */
-    recordUndoState(range, replace) {
-      if (!this.inUndoState || replace) {
-        let undoIndex = this.index;
-        let undoLimit = this.limit;
-        let squire = this.squire;
-        replace || ++undoIndex;
-        undoIndex = Math.max(0, undoIndex);
-        this.length = Math.min(undoIndex + 1, this.length);
-        range && squire._saveRangeToBookmark(range);
-        const html = squire._getRawHTML();
-        if (undoLimit > 0 && undoIndex > undoLimit) {
-          this.splice(0, undoIndex - undoLimit);
-          undoIndex = undoLimit;
-        }
-        this[undoIndex] = html;
-        this.index = undoIndex;
-        this.inUndoState = true;
-      }
-    }
-
-    saveUndoState(range) {
-      let squire = this.squire;
-      range = range || squire.getSelection();
-      this.recordUndoState(range, true);
-      squire._getRangeAndRemoveBookmark(range);
-    }
-
-    undo() {
-      let squire = this.squire;
-      if (this.index > 0 || !this.inUndoState) {
-        this.recordUndoState(squire.getSelection());
-        const undoIndex = this.index - 1;
-        this.index = undoIndex;
-        squire._setRawHTML(this[undoIndex]);
-        let range = squire._getRangeAndRemoveBookmark();
-        if (range) {
-          squire.setSelection(range);
-        }
-        this.stateChanged(/*undoIndex > 0, true*/);
-      }
-    }
-
-    redo() {
-      let squire = this.squire,
-        undoIndex = this.index + 1;
-      if (undoIndex < this.length && this.inUndoState) {
-        this.index = undoIndex;
-        squire._setRawHTML(this[undoIndex]);
-        let range = squire._getRangeAndRemoveBookmark();
-        if (range) {
-          squire.setSelection(range);
-        }
-        this.stateChanged(/*true, undoIndex + 1 < this.length*/);
-      }
-    }
-}
-
-  // source/Editor.ts
-  var customEvents = new Set([
-    "pathChange",
-    "select",
-    "input",
-    "pasteImage",
-    "undoStateChange"
-  ]);
-  var startSelectionId = "squire-selection-start";
-  var endSelectionId = "squire-selection-end";
-  var tagAfterSplit = {
-    DT: "DD",
-    DD: "DT",
-    LI: "LI",
-    PRE: "PRE"
-  };
-  var linkRegExp = /\b(?:((https?:\/\/)?(?:www\d{0,3}\.|[a-z0-9][a-z0-9.-]*\.[a-z]{2,}\/)(?:[^\s()<>]+|\([^\s()<>]+\))+(?:[^\s?&`!()[\]{};:'".,<>«»“”‘’]|\([^\s()<>]+\)))|([\w\-.%+]+@(?:[\w-]+\.)+[a-z]{2,}\b(?:\?[^&?\s]+=[^\s?&`!()[\]{};:'".,<>«»“”‘’]+(?:&[^&?\s]+=[^\s?&`!()[\]{};:'".,<>«»“”‘’]+)*)?))/i;
-  var Squire = class {
-    constructor(root, config) {
-      this._root = root;
-      this.setConfig(config);
-      this._isFocused = false;
-      this._lastSelection = null;
-      this._willRestoreSelection = false;
-      this._mayHaveZWS = false;
-      this._path = "";
-      this._pathRange = null;
-      this._events = new Map();
-      this.editStack = new EditStack(this);
-      this._ignoreChange = false;
-      this.addEventListener("selectionchange", () => this._isFocused && this._updatePath(this.getSelection()))
-        .addEventListener("blur", () => this._willRestoreSelection = true)
-        .addEventListener("pointerdown mousedown touchstart", () => this._willRestoreSelection = false)
-        .addEventListener("focus", () => this._willRestoreSelection && this.setSelection(this._lastSelection))
-        .addEventListener("cut", _onCut)
-        .addEventListener("copy", _onCopy)
-        .addEventListener("paste", _onPaste)
-        .addEventListener("drop", (event) => {
-          let types = event.dataTransfer.types;
-          if (types.includes("text/plain") || types.includes("text/html")) {
-            this.saveUndoState();
-          }
-        })
-        .addEventListener("keydown keyup", (event) => this.isShiftDown = event.shiftKey)
-        .addEventListener("keydown", _onKey)
-        .addEventListener("pointerup keyup mouseup touchend", () => this.getSelection())
-        .addEventListener("beforeinput", this._beforeInput);
-      this._keyHandlers = Object.create(keyHandlers);
-      this._mutation = new MutationObserver(() => this._docWasChanged());
-      this._mutation.observe(root, {
-        childList: true,
-        attributes: true,
-        characterData: true,
-        subtree: true
-      });
-      root.setAttribute("contenteditable", "true");
-      this.setHTML("");
-      this._beforeInputTypes = {
-        insertText: (event) => {
-          if (isAndroid && event.data && event.data.includes("\n")) {
-            event.preventDefault();
-          }
-        },
-        insertLineBreak: (event) => {
-          event.preventDefault();
-          this.splitBlock(true);
-        },
-        insertParagraph: (event) => {
-          event.preventDefault();
-          this.splitBlock(false);
-        },
-        insertOrderedList: (event) => {
-          event.preventDefault();
-          this.makeOrderedList();
-        },
-        insertUnoderedList: (event) => {
-          event.preventDefault();
-          this.makeUnorderedList();
-        },
-        historyUndo: (event) => {
-          event.preventDefault();
-          this.undo();
-        },
-        historyRedo: (event) => {
-          event.preventDefault();
-        },
-        formatRemove: (event) => {
-          event.preventDefault();
-          this.setStyle();
-        },
-        formatSetBlockTextDirection: (event) => {
-          event.preventDefault();
-          let dir = event.data;
-          this.setTextDirection(dir === "null" ? null : dir);
-        },
-        formatBackColor: (event) => {
-          event.preventDefault();
-          this.setStyle({ backgroundColor: event.data });
-        },
-        formatFontColor: (event) => {
-          event.preventDefault();
-          this.setStyle({ color: event.data });
-        },
-        formatFontName: (event) => {
-          event.preventDefault();
-          this.setStyle({ fontFamily: event.data });
-        },
-/*
-        formatIndent: event => {
-          event.preventDefault();
-          this.changeIndentationLevel("increase");
-        },
-        formatOutdent: event => {
-          event.preventDefault();
-          this.changeIndentationLevel("decrease");
-        },
-          this.saveUndoState();
-        },
-*/
-        deleteContentBackward: (event) => {
-          Backspace(this, event, this.getSelection());
-        },
-        deleteContentForward: (event) => {
-          Delete(this, event, this.getSelection());
-        }
-      };
-    }
-
-    _beforeInput(event) {
-      let type = event.isComposing ? "" : event.inputType;
-      switch (type) {
-        case "formatBold":
-        case "formatItalic":
-        case "formatUnderline":
-        case "formatStrikeThrough":
-        case "formatSuperscript":
-        case "formatSubscript":
-          event.preventDefault();
-          this[type.slice(6).toLowerCase()]();
-          break;
-        case "formatJustifyFull":
-        case "formatJustifyCenter":
-        case "formatJustifyRight":
-        case "formatJustifyLeft": {
-          event.preventDefault();
-          let alignment = type.slice(13).toLowerCase();
-          this.setStyle({textAlign:alignment === "full" ? "justify" : alignment});
-          break;
-        }
-        default:
-          this._beforeInputTypes[type]?.(event);
-      }
-    }
-    // --- 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 (!isFocused || this._isFocused) {
-            return this;
-          }
-          this._isFocused = true;
-        } else {
-          if (isFocused || !this._isFocused) {
-            return this;
-          }
-          this._isFocused = false;
-        }
-      }
-      if (handlers) {
-        const event = detail instanceof Event ? detail : new CustomEvent(type, {
-          detail
-        });
-        handlers = handlers.slice();
-        for (const handler of handlers) {
-          try {
-            handler.handleEvent ? handler.handleEvent(event) : handler.call(this, event);
-          } catch (error) {
-            error.details = 'Squire: fireEvent error. Event type: ' + type;
-            didError(error);
-          }
-        }
-      }
-      return this;
-    }
-    addEventListener(types, fn) {
-      if (!fn) {
-        didError({
-          name: 'Squire: addEventListener with null or undefined fn',
-          message: 'Event type: ' + types
-        });
-        return this;
-      }
-      types.split(/\s+/).forEach((type) => {
-        let handlers = this._events.get(type);
-        let target = this._root;
-        if (!handlers) {
-          handlers = [];
-          this._events.set(type, handlers);
-          customEvents.has(type) || (type === "selectionchange" ? document : target).addEventListener(type, this, {capture:true,passive:"touchstart"===type});
-        }
-        handlers.push(fn);
-      });
-      return this;
-    }
-    removeEventListener(type, fn) {
-      const handlers = this._events.get(type);
-      if (handlers) {
-        if (fn) {
-          let l = handlers.length;
-          while (l--) {
-            if (handlers[l] === fn) {
-              handlers.splice(l, 1);
-            }
-          }
-        } else {
-          handlers.length = 0;
-        }
-        if (!handlers.length) {
-          this._events.delete(type);
-          customEvents.has(type) || (type === "selectionchange" ? document : this._root).removeEventListener(type, this, true);
-        }
-      }
-      return this;
-    }
-    // --- Focus
-    focus() {
-      this._root.focus({ preventScroll: true });
-      return this;
-    }
-    blur() {
-      this._root.blur();
-      return this;
-    }
-    // ---
-    _removeZWS() {
-      if (this._mayHaveZWS) {
-        removeZWS(this._root);
-        this._mayHaveZWS = false;
-      }
-    }
-    // ---
-    _saveRangeToBookmark(range) {
-      let [startNode, endNode] = createBookmarkNodes(),
-        temp;
-      insertNodeInRange(range, startNode);
-      range.collapse();
-      insertNodeInRange(range, endNode);
-      if (startNode.compareDocumentPosition(endNode) & DOCUMENT_POSITION_PRECEDING) {
-        startNode.id = endSelectionId;
-        endNode.id = startSelectionId;
-        temp = startNode;
-        startNode = endNode;
-        endNode = temp;
-      }
-      range.setStartAfter(startNode);
-      range.setEndBefore(endNode);
-    }
-    _getRangeAndRemoveBookmark(range) {
-      const root = this._root;
-      const start = root.querySelector("#" + startSelectionId);
-      const end = root.querySelector("#" + endSelectionId);
-      if (start && end) {
-        let startContainer = start.parentNode;
-        let endContainer = end.parentNode;
-        const startOffset = indexOf(startContainer.childNodes, start);
-        let endOffset = indexOf(endContainer.childNodes, end);
-        if (startContainer === endContainer) {
-          --endOffset;
-        }
-        detach(start);
-        detach(end);
-        range = range || document.createRange();
-        range.setStart(startContainer, startOffset);
-        range.setEnd(endContainer, endOffset);
-        mergeInlines(startContainer, range);
-        if (startContainer !== endContainer) {
-          mergeInlines(endContainer, range);
-        }
-        if (range.collapsed) {
-          startContainer = range.startContainer;
-          if (isTextNode(startContainer)) {
-            endContainer = startContainer.childNodes[range.startOffset];
-            if (!endContainer || !isTextNode(endContainer)) {
-              endContainer = startContainer.childNodes[range.startOffset - 1];
-            }
-            if (isTextNode(endContainer)) {
-              range.setStart(endContainer, 0);
-              range.collapse(true);
-            }
-          }
-        }
-      }
-      return range || null;
-    }
-    getSelection() {
-      const sel = win.getSelection();
-      const root = this._root;
-      let range;
-      if (this._isFocused && sel?.rangeCount) {
-        range = sel.getRangeAt(0).cloneRange();
-        const startContainer = range.startContainer;
-        const endContainer = range.endContainer;
-        if (startContainer && isLeaf(startContainer)) {
-          range.setStartBefore(startContainer);
-        }
-        if (endContainer && isLeaf(endContainer)) {
-          range.setEndBefore(endContainer);
-        }
-      }
-      if (range && root.contains(range.commonAncestorContainer)) {
-        this._lastSelection = range;
-      } else {
-        range = this._lastSelection;
-        if (!document.contains(range.commonAncestorContainer)) {
-          range = null;
-        }
-      }
-      return range || createRange(root.firstChild, 0);
-    }
-    setSelection(range) {
-      this._lastSelection = range;
-      if (this._isFocused) {
-        const selection = win.getSelection();
-        if (selection) {
-          selection.setBaseAndExtent(
-            range.startContainer,
-            range.startOffset,
-            range.endContainer,
-            range.endOffset
-          );
-        }
-      } else {
-        this._willRestoreSelection = true;
-      }
-      return this;
-    }
-    // ---
-    // --- Path
-    getPath() {
-      return this._path;
-    }
-    _updatePath(range, force) {
-      const anchor = range.startContainer,
-        focus = range.endContainer;
-      if (force || anchor !== this._pathRange.startContainer || focus !== this._pathRange.endContainer) {
-        this._pathRange = range.cloneRange();
-        let node = anchor === focus ? focus : null,
-          newPath = (anchor && focus) ? (node ? this._getPath(focus) : "(selection)") : "";
-        if (this._path !== newPath) {
-          this._path = newPath;
-          this.fireEvent("pathChange", {
-            path: newPath,
-            element: (!node || isElement(node)) ? node : node.parentElement
-          });
-        }
-      }
-      this.fireEvent(range.collapsed ? "cursor" : "select", {
-        range
-      });
-    }
-    _getPath(node) {
-      const root = this._root;
-      let path = "", style;
-      if (node && node !== root) {
-        path = this._getPath(node.parentNode, root);
-        if (isElement(node)) {
-          path += (path ? ">" : "") + node.nodeName;
-          if (node.id) {
-            path += "#" + node.id;
-          }
-          if (node.dir) {
-            path += "[dir=" + node.dir + "]";
-          }
-          if (style = node.style.cssText) {
-            path += "[style=" + style + "]";
-          }
-        }
-      }
-      return path;
-    }
-    // --- History
-    _docWasChanged() {
-      cache = new WeakMap();
-      this._mayHaveZWS = cantFocusEmptyTextNodes;
-      if (this._ignoreChange) {
-        this._ignoreChange = false;
-      } else {
-        this.editStack.docWasChanged();
-      }
-    }
-    /**
-     * Leaves bookmark.
-     */
-    _recordUndoState(range, replace) {
-      this.editStack.recordUndoState(range, replace);
-    }
-    saveUndoState(range) {
-      this.editStack.saveUndoState(range);
-    }
-    undo() {
-      this.editStack.undo();
-    }
-    redo() {
-      this.editStack.redo();
-    }
-    // --- Get and set data
-    getRoot() {
-      return this._root;
-    }
-    _getRawHTML() {
-      return this._root.innerHTML;
-    }
-    _setRawHTML(html) {
-      if (html !== undefined) {
-        const root = this._root;
-        let node = root;
-        root.innerHTML = html;
-        do {
-          fixCursor(node);
-        } while (node = getNextBlock(node, root));
-        this._ignoreChange = true;
-      }
-    }
-    getHTML(withBookMark) {
-      let html, range;
-      if (withBookMark) {
-        range = this.getSelection();
-        this._saveRangeToBookmark(range);
-      }
-      html = this._getRawHTML().replace(/\u200B/g, "");
-      withBookMark && this._getRangeAndRemoveBookmark(range);
-      return html;
-    }
-    setHTML(html) {
-      const root = this._root,
-        frag = this._config.sanitizeToDOMFragment(html, false);
-      cleanTree(frag);
-      cleanupBRs(frag, root, false);
-      fixContainer(frag, root);
-      let node, walker = getBlockWalker(frag, root);
-      while ((node = walker.nextNode()) && node !== root) {
-        fixCursor(node);
-      }
-      this._ignoreChange = true;
-      if (root.replaceChildren) {
-        root.replaceChildren(frag);
-      } else {
-        while (root.lastChild)
-          detach(root.lastChild);
-        root.append(frag);
-      }
-      fixCursor(root);
-      this.editStack.clear();
-      const range = this._getRangeAndRemoveBookmark() || createRange(root.firstElementChild || root, 0);
-      this.saveUndoState(range);
-      this.setRange(range);
-      return this;
-    }
-    /**
-     * Insert HTML at the cursor location. If the selection is not collapsed
-     * insertTreeFragmentIntoRange will delete the selection so that it is
-     * replaced by the html being inserted.
-     */
-    insertHTML(html, isPaste) {
-      let range = this.getSelection();
-      if (isPaste) {
-        let startFragmentIndex = html.indexOf("<!--StartFragment-->"),
-          endFragmentIndex = html.lastIndexOf("<!--EndFragment-->");
-        if (startFragmentIndex > -1 && endFragmentIndex > -1) {
-          html = html.slice(startFragmentIndex + 20, endFragmentIndex);
-        }
-      }
-      let frag = this._config.sanitizeToDOMFragment(html, isPaste);
-      this.saveUndoState(range);
-      try {
-        let root = this._root, node = frag;
-        addLinks(frag, frag);
-        cleanTree(frag);
-        cleanupBRs(frag, root, false);
-        removeEmptyInlines(frag);
-        frag.normalize();
-        while (node = getNextBlock(node, frag)) {
-          fixCursor(node);
-        }
-        insertTreeFragmentIntoRange(range, frag, root);
-        range.collapse();
-        moveRangeBoundaryOutOf(range, "A", root);
-        this._ensureBottomLine();
-        this.setRange(range);
-        isPaste && this.focus();
-      } catch (error) {
-        didError(error);
-      }
-      return this;
-    }
-    insertElement(el, range) {
-      range = range || this.getSelection();
-      range.collapse(true);
-      if (isInline(el)) {
-        insertNodeInRange(range, el);
-        range.setStartAfter(el);
-      } else {
-        const root = this._root;
-        let splitNode = getStartBlockOfRange(range, root) || root;
-        let nodeAfterSplit;
-        while (splitNode !== root && !splitNode.nextSibling) {
-          splitNode = splitNode.parentNode;
-        }
-        if (splitNode !== root) {
-          const parent = splitNode.parentNode;
-          nodeAfterSplit = split(parent, splitNode.nextSibling, root, root);
-        }
-        if (nodeAfterSplit) {
-          nodeAfterSplit.before(el);
-        } else {
-          root.append(el);
-          nodeAfterSplit = this.createDefaultBlock();
-          root.append(nodeAfterSplit);
-        }
-        range.setStart(nodeAfterSplit, 0);
-        range.setEnd(nodeAfterSplit, 0);
-        moveRangeBoundariesDownTree(range);
-      }
-      this.focus();
-      this.setSelection(range);
-      this._updatePath(range);
-      return this;
-    }
-    insertImage(src, attributes) {
-      const img = createElement("IMG", mergeObjects({
-        src: src
-      }, attributes, true));
-      this.insertElement(img);
-      return img;
-    }
-    insertPlainText(plainText, isPaste) {
-      const range = this.getSelection();
-      if (range.collapsed && getClosest(range.startContainer, this._root, "PRE")) {
-        let node = range.startContainer;
-        let offset = range.startOffset;
-        let text;
-        if (!isTextNode(node)) {
-          text = document.createTextNode("");
-          node?.childNodes[offset].before(text);
-          node = text;
-          offset = 0;
-        }
-        node.insertData(offset, plainText);
-        range.setStart(node, offset + plainText.length);
-        range.collapse(true);
-        this.setSelection(range);
-        return this;
-      }
-      const lines = plainText.split(/\r?\n/),
-        closeBlock = "</" + blockTag + ">",
-        openBlock = "<" + blockTag + ">";
-      lines.forEach((line, i) => {
-        line = escapeHTML(line).replace(/ (?=(?: |$))/g, NBSP);
-        lines[i] = i ? openBlock + (line || "<BR>") + closeBlock : line;
-      });
-      return this.insertHTML(lines.join(""), isPaste);
-    }
-    // --- Inline formatting
-    /**
-     * Extracts the font-family and font-size (if any) of the element
-     * holding the cursor. If there's a selection, returns an empty object.
-     */
-    getFontInfo(range) {
-      const fontInfo = {
-        color: void 0,
-        backgroundColor: void 0,
-        family: void 0,
-        size: void 0
-      };
-      range = range || this.getSelection();
-      let seenAttributes = 0;
-      let element = range.commonAncestorContainer, style, attr;
-      if (range.collapsed || isTextNode(element)) {
-        if (isTextNode(element)) {
-          element = element.parentNode;
-        }
-        while (seenAttributes < 4 && element) {
-          if (style = element.style) {
-            if (!fontInfo.color && (attr = style.color)) {
-              fontInfo.color = attr;
-              ++seenAttributes;
-            }
-            if (!fontInfo.backgroundColor && (attr = style.backgroundColor)) {
-              fontInfo.backgroundColor = attr;
-              ++seenAttributes;
-            }
-            if (!fontInfo.family && (attr = style.fontFamily)) {
-              fontInfo.family = attr;
-              ++seenAttributes;
-            }
-            if (!fontInfo.size && (attr = style.fontSize)) {
-              fontInfo.size = attr;
-              ++seenAttributes;
-            }
-          }
-          element = element.parentNode;
-        }
-      }
-      return fontInfo;
-    }
-    /**
-     * Looks for matching tag and attributes, so won't work if <strong>
-     * instead of <b> etc.
-     */
-    hasFormat(tag, attributes, range) {
-      tag = tag.toUpperCase();
-      range = range || this.getSelection();
-      if (!range.collapsed && isTextNode(range.startContainer) && range.startOffset === range.startContainer.length && range.startContainer.nextSibling) {
-        range.setStartBefore(range.startContainer.nextSibling);
-      }
-      if (!range.collapsed && isTextNode(range.endContainer) && range.endOffset === 0 && range.endContainer.previousSibling) {
-        range.setEndAfter(range.endContainer.previousSibling);
-      }
-      const root = this._root;
-      const common = range.commonAncestorContainer;
-      if (getNearest(common, root, tag, attributes)) {
-        return true;
-      }
-      if (isTextNode(common)) {
-        return false;
-      }
-      const walker = createTreeWalker(common, SHOW_TEXT, (node2) => isNodeContainedInRange(range, node2));
-      let seenNode = false;
-      let node;
-      while (node = walker.nextNode()) {
-        if (!getNearest(node, root, tag, attributes)) {
-          return false;
-        }
-        seenNode = true;
-      }
-      return seenNode;
-    }
-    changeFormat(add, remove, range, partial) {
-      range = range || this.getSelection();
-      this.saveUndoState(range);
-      if (remove) {
-        range = this._removeFormat(
-          remove.tag.toUpperCase(),
-          remove.attributes || {},
-          range,
-          partial
-        );
-      }
-      if (add) {
-        range = this._addFormat(
-          add.tag.toUpperCase(),
-          add.attributes || {},
-          range
-        );
-      }
-      this.setRange(range);
-      return this.focus();
-    }
-    _addFormat(tag, attributes, range) {
-      const root = this._root;
-      let node;
-      if (range.collapsed) {
-        const el = fixCursor(createElement(tag, attributes));
-        insertNodeInRange(range, el);
-        range.setStart(el.firstChild, el.firstChild.length);
-        range.collapse(true);
-        let block = el;
-        while (isInline(block)) {
-          block = block.parentNode;
-        }
-        removeZWS(block, el);
-      } else {
-        const filter = (node) => (isTextNode(node) || isBrElement(node) || node.nodeName === "IMG") && isNodeContainedInRange(range, node);
-        const walker = createTreeWalker(
-          range.commonAncestorContainer,
-          SHOW_ELEMENT_OR_TEXT,
-          filter
-        );
-        let { startContainer, startOffset, endContainer, endOffset } = range;
-        walker.currentNode = startContainer;
-        if (!isElement(startContainer) && !isTextNode(startContainer) || !filter(startContainer)) {
-          startContainer = walker.nextNode();
-          startOffset = 0;
-        }
-        if (startContainer) {
-          do {
-            node = walker.currentNode;
-            if (!getNearest(node, root, tag, attributes)) {
-              if (node === endContainer && node.length > endOffset) {
-                node.splitText(endOffset);
-              }
-              if (node === startContainer && startOffset) {
-                node = node.splitText(startOffset);
-                if (endContainer === startContainer) {
-                  endContainer = node;
-                  endOffset -= startOffset;
-                }
-                startContainer = node;
-                startOffset = 0;
-              }
-              const el = createElement(tag, attributes);
-              replaceWith(node, el);
-              el.append(node);
-            }
-          } while (walker.nextNode());
-          if (!isTextNode(endContainer)) {
-            if (isTextNode(node)) {
-              endContainer = node;
-              endOffset = node.length;
-            } else {
-              endContainer = node.parentNode;
-              endOffset = 1;
-            }
-          }
-          range = createRange(
-            startContainer,
-            startOffset,
-            endContainer,
-            endOffset
-          );
-        }
-      }
-      return range;
-    }
-    _removeFormat(tag, attributes, range, partial) {
-      this._saveRangeToBookmark(range);
-      let fixer;
-      if (range.collapsed) {
-        this._mayHaveZWS = cantFocusEmptyTextNodes;
-        fixer = document.createTextNode(cantFocusEmptyTextNodes ? ZWS : "");
-        insertNodeInRange(range, fixer);
-      }
-      let root = range.commonAncestorContainer;
-      while (isInline(root)) {
-        root = root.parentNode;
-      }
-      const { startContainer, startOffset, endContainer, endOffset } = range;
-      const toWrap = [];
-      const examineNode = (node, exemplar) => {
-        if (isNodeContainedInRange(range, node, false)) {
-          return;
-        }
-        let isText = isTextNode(node);
-        let child;
-        let next;
-        if (!isNodeContainedInRange(range, node)) {
-          if (node.nodeName !== "INPUT" && (!isText || node.data)) {
-            toWrap.push([exemplar, node]);
-          }
-          return;
-        }
-        if (isText) {
-          if (node === endContainer && endOffset !== node.length) {
-            toWrap.push([exemplar, node.splitText(endOffset)]);
-          }
-          if (node === startContainer && startOffset) {
-            node.splitText(startOffset);
-            toWrap.push([exemplar, node]);
-          }
-        } else {
-          for (child = node.firstChild; child; child = next) {
-            next = child.nextSibling;
-            examineNode(child, exemplar);
-          }
-        }
-      };
-      const formatTags = Array.prototype.filter.call(
-        root.getElementsByTagName(tag),
-        (el) => isNodeContainedInRange(range, el, true) && hasTagAttributes(el, tag, attributes)
-      );
-      partial || formatTags.forEach((node) => examineNode(node, node));
-      toWrap.forEach(([el, node]) => {
-        el = el.cloneNode(false);
-        replaceWith(node, el);
-        el.append(node);
-      });
-      formatTags.forEach((el) => replaceWith(el, empty(el)));
-      if (cantFocusEmptyTextNodes && fixer) {
-        fixer = fixer.parentNode;
-        let block = fixer;
-        while (block && isInline(block)) {
-          block = block.parentNode;
-        }
-        if (block) {
-          removeZWS(block, fixer);
-        }
-      }
-      this._getRangeAndRemoveBookmark(range);
-      fixer && range.collapse();
-      mergeInlines(root, range);
-      return range;
-    }
-    // ---
-    bold() {
-      this.toggleTag("B");
-    }
-    italic() {
-      this.toggleTag("I");
-    }
-    underline() {
-      this.toggleTag("U");
-    }
-    strikethrough() {
-      this.toggleTag("S");
-    }
-    subscript() {
-      this.toggleTag("SUB", "SUP");
-    }
-    superscript() {
-      this.toggleTag("SUP", "SUB");
-    }
-    // ---
-    makeLink(url, attributes) {
-      const range = this.getSelection();
-      if (range.collapsed) {
-        insertNodeInRange(
-          range,
-          document.createTextNode(url.replace(/^[^:]*:\/*/, ""))
-        );
-      }
-      attributes = mergeObjects(
-        mergeObjects({
-          href: url
-        }, attributes, true),
-        null,
-        false
-      );
-      return this.changeFormat(
-        {
-          tag: "A",
-          attributes
-        },
-        {
-          tag: "A"
-        },
-        range
-      );
-    }
-    removeLink() {
-      return this.changeFormat(
-        null,
-        {
-          tag: "A"
-        },
-        this.getSelection(),
-        true
-      );
-    }
-    // --- Block formatting
-    _ensureBottomLine() {
-      const root = this._root;
-      const last = root.lastElementChild;
-      if (!last || last.nodeName !== blockTag || !isBlock(last)) {
-        root.append(this.createDefaultBlock());
-      }
-    }
-    createDefaultBlock(children) {
-      return fixCursor(
-        createElement(blockTag, null, children)
-      );
-    }
-    splitBlock(lineBreakOnly, range) {
-      range = range || this.getSelection();
-      const root = this._root;
-      let block;
-      let parent;
-      let node;
-      let nodeAfterSplit;
-      this.editStack.inUndoState && this._docWasChanged();
-      this._recordUndoState(range);
-      this._removeZWS();
-      this._getRangeAndRemoveBookmark(range);
-      if (!range.collapsed) {
-        deleteContentsOfRange(range, root);
-      }
-      if (this._config.addLinks) {
-        moveRangeBoundariesDownTree(range);
-        setTimeout(() => {
-          addLinks(range.startContainer, root);
-        }, 0);
-      }
-      block = getStartBlockOfRange(range, root);
-      if (block && (parent = getClosest(block, root, "PRE"))) {
-        moveRangeBoundariesDownTree(range);
-        node = range.startContainer;
-        const offset2 = range.startOffset;
-        if (!isTextNode(node)) {
-          node = document.createTextNode("");
-          parent.insertBefore(node, parent.firstChild);
-        }
-        if (!lineBreakOnly && isTextNode(node) && (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,
-            offset2 && offset2 - 1,
-            root,
-            root
-          );
-          node = nodeAfterSplit.previousSibling;
-          if (!node.textContent) {
-            detach(node);
-          }
-          node = this.createDefaultBlock();
-          nodeAfterSplit.before(node);
-          if (!nodeAfterSplit.textContent) {
-            detach(nodeAfterSplit);
-          }
-          range.setStart(node, 0);
-        } else {
-          node.insertData(offset2, "\n");
-          fixCursor(parent);
-          if (node.length === offset2 + 1) {
-            range.setStartAfter(node);
-          } else {
-            range.setStart(node, offset2 + 1);
-          }
-        }
-        range.collapse(true);
-        this.setRange(range);
-        this._docWasChanged();
-        return;
-      }
-      if (!block || lineBreakOnly || /^T[HD]$/.test(block.nodeName)) {
-        moveRangeBoundaryOutOf(range, "A", root);
-        insertNodeInRange(range, createElement("BR"));
-        range.collapse();
-        this.setRange(range);
-        return;
-      }
-      block = getClosest(block, root, "LI") || block;
-      if (isEmptyBlock(block) && (parent = getClosest(block, root, "UL,OL,BLOCKQUOTE"))) {
-        return "BLOCKQUOTE" === parent.nodeName
-          ? this.modifyBlocks((/* frag */) => this.createDefaultBlock(createBookmarkNodes()), range)
-          : this.decreaseListLevel(range);
-      }
-      node = range.startContainer;
-      const offset = range.startOffset;
-      let splitTag = tagAfterSplit[block.nodeName] || blockTag;
-      nodeAfterSplit = split(
-        node,
-        offset,
-        block.parentNode,
-        root
-      );
-      if (!hasTagAttributes(nodeAfterSplit, splitTag)) {
-        block = createElement(splitTag);
-        if (nodeAfterSplit.dir) {
-          block.dir = nodeAfterSplit.dir;
-        }
-        replaceWith(nodeAfterSplit, block);
-        block.append(empty(nodeAfterSplit));
-        nodeAfterSplit = block;
-      }
-      removeZWS(block);
-      removeEmptyInlines(block);
-      fixCursor(block);
-      while (isElement(nodeAfterSplit)) {
-        let child = nodeAfterSplit.firstChild;
-        let next;
-        if (nodeAfterSplit.nodeName === "A" && (!nodeAfterSplit.textContent || nodeAfterSplit.textContent === ZWS)) {
-          child = document.createTextNode("");
-          replaceWith(nodeAfterSplit, child);
-          nodeAfterSplit = child;
-          break;
-        }
-        while (isTextNode(child) && !child.data) {
-          next = child.nextSibling;
-          if (!next || isBrElement(next)) {
-            break;
-          }
-          detach(child);
-          child = next;
-        }
-        if (!child || isBrElement(child) || isTextNode(child)) {
-          break;
-        }
-        nodeAfterSplit = child;
-      }
-      range = createRange(nodeAfterSplit, 0);
-      this.setRange(range);
-    }
-    modifyBlocks(modify, range) {
-      range = range || this.getSelection();
-      this._recordUndoState(range, true);
-      const root = this._root;
-      expandRangeToBlockBoundaries(range, root);
-      moveRangeBoundariesUpTree(range, root, root, root);
-      const frag = extractContentsOfRange(range, root, root);
-      insertNodeInRange(range, modify.call(this, frag));
-      if (range.endOffset < range.endContainer.childNodes.length) {
-        mergeContainers(
-          range.endContainer.childNodes[range.endOffset],
-          root
-        );
-      }
-      mergeContainers(
-        range.startContainer.childNodes[range.startOffset],
-        root
-      );
-      this._getRangeAndRemoveBookmark(range);
-      this.setRange(range);
-      return this;
-    }
-    // ---
-    setTextDirection(direction) {
-      return this.modifyBlocks(frag => setDirection(this, frag, direction)).focus();
-    }
-    increaseListLevel(range) {
-      range = range || this.getSelection();
-      const root = this._root;
-      const listSelection = getListSelection(range, root);
-      if (listSelection) {
-        let [list, startLi, endLi] = listSelection;
-        if (startLi && startLi !== list.firstChild) {
-          this._recordUndoState(range, true);
-          const type = list.nodeName;
-          let newParent = startLi.previousSibling;
-          let next;
-          if (newParent.nodeName !== type) {
-            newParent = createElement(type);
-            startLi.before(newParent);
-          }
-          do {
-            next = startLi === endLi ? null : startLi.nextSibling;
-            newParent.append(startLi);
-          } while (startLi = next);
-          next = newParent.nextSibling;
-          next && mergeContainers(next, root);
-          this._getRangeAndRemoveBookmark(range);
-          this.setRange(range);
-        }
-      }
-      return this.focus();
-    }
-    decreaseListLevel(range) {
-      range = range || this.getSelection();
-      const root = this._root;
-      const listSelection = getListSelection(range, root);
-      if (listSelection) {
-        let list = listSelection[0];
-        let startLi = listSelection[1] || list.firstChild;
-        let endLi = listSelection[2] || list.lastChild;
-        let next, insertBefore;
-        this._recordUndoState(range, true);
-        if (startLi) {
-          let newParent = list.parentNode;
-          insertBefore = !endLi.nextSibling ?
-            list.nextSibling :
-            split(list, endLi.nextSibling, newParent, root);
-          if (newParent !== root && newParent.nodeName === "LI") {
-            newParent = newParent.parentNode;
-            while (insertBefore) {
-              next = insertBefore.nextSibling;
-              endLi.append(insertBefore);
-              insertBefore = next;
-            }
-            insertBefore = list.parentNode.nextSibling;
-          }
-          const makeNotList = !/^[OU]L$/.test(newParent.nodeName);
-          do {
-            next = startLi === endLi ? null : startLi.nextSibling;
-            startLi.remove();
-            if (makeNotList && startLi.nodeName === "LI") {
-              startLi = this.createDefaultBlock([empty(startLi)]);
-            }
-            newParent.insertBefore(startLi, insertBefore);
-          } while (startLi = next);
-        }
-        list.firstChild || detach(list);
-        insertBefore && mergeContainers(insertBefore, root);
-        this._getRangeAndRemoveBookmark(range);
-        this.setRange(range);
-      }
-      return this.focus();
-    }
-    _makeList(frag, type) {
-      let walker = getBlockWalker(frag, this._root),
-        node, tag, prev, newLi;
-      while (node = walker.nextNode()) {
-        if (node.parentNode.nodeName === "LI") {
-          node = node.parentNode;
-          walker.currentNode = node.lastChild;
-        }
-        if (node.nodeName !== "LI") {
-          newLi = createElement("LI");
-          if (node.dir) {
-            newLi.dir = node.dir;
-          }
-          if ((prev = node.previousSibling) && prev.nodeName === type) {
-            prev.append(newLi);
-            detach(node);
-          } else {
-            replaceWith(node, createElement(type, null, [newLi]));
-          }
-          newLi.append(empty(node));
-          walker.currentNode = newLi;
-        } else {
-          node = node.parentNode;
-          tag = node.nodeName;
-          if (tag !== type && listNodeNames.has(tag)) {
-            replaceWith(node,
-              createElement(type, null, [empty(node)])
-            );
-          }
-        }
-      }
-      return frag;
-    }
-    makeUnorderedList() {
-      return this.modifyBlocks((frag) => this._makeList(frag, "UL")).focus();
-    }
-    makeOrderedList() {
-      return this.modifyBlocks((frag) => this._makeList(frag, "OL")).focus();
-    }
-    removeList() {
-      return this.modifyBlocks((frag) => {
-        const root = this._root;
-        frag.querySelectorAll("LI").forEach((item) => {
-          if (isBlock(item)) {
-            replaceWith(item, this.createDefaultBlock([empty(item)]));
-          } else {
-            fixContainer(item, root);
-            replaceWith(item, empty(item));
-          }
-        });
-        frag.querySelectorAll("UL, OL").forEach((list) => {
-          const listFrag = empty(list);
-          fixContainer(listFrag, root);
-          replaceWith(list, listFrag);
-        });
-        return frag;
-      }).focus();
-    }
-    // ---
-    increaseQuoteLevel(range) {
-      return this.modifyBlocks(
-        (frag) => createElement(
-          "BLOCKQUOTE",
-          null,
-          [frag]
-        ),
-        range
-      ).focus();
-    }
-    decreaseQuoteLevel(range) {
-      return this.modifyBlocks((frag) => {
-        Array.prototype.filter.call(
-          frag.querySelectorAll("blockquote"),
-          (el) => !getClosest(el.parentNode, frag, "BLOCKQUOTE")
-        ).forEach(
-          (el) => replaceWith(el, empty(el))
-        );
-        return frag;
-      }, range).focus();
-    }
-    // ---
-    code() {
-      const range = this.getSelection();
-      if (range.collapsed || isContainer(range.commonAncestorContainer)) {
-        return this.modifyBlocks((frag) => {
-          const root = this._root;
-          const output = document.createDocumentFragment();
-          let walker = getBlockWalker(frag, root);
-          let node;
-          while (node = walker.nextNode()) {
-            node.querySelectorAll("BR").forEach(br => {
-              if (!isLineBreak(br, false)) {
-                detach(br);
-              } else {
-                replaceWith(br, document.createTextNode("\n"));
-              }
-            });
-            node.querySelectorAll("CODE").forEach(el => detach(el));
-            if (output.childNodes.length) {
-              output.append(document.createTextNode("\n"));
-            }
-            output.append(empty(node));
-          }
-          walker = createTreeWalker(output, SHOW_TEXT);
-          while (node = walker.nextNode()) {
-            node.data = node.data.replace(NBSP, " "); // nbsp -> sp
-          }
-          output.normalize();
-          return fixCursor(
-            createElement("PRE", null, [
-              output
-            ])
-          );
-        }, range).focus();
-      }
-      return this.changeFormat({ tag: "CODE" }, null, range);
-    }
-    removeCode() {
-      const range = this.getSelection();
-      const ancestor = range.commonAncestorContainer;
-      const inPre = getClosest(ancestor, this._root, "PRE");
-      if (inPre) {
-        return this.modifyBlocks((frag) => {
-          const root = this._root;
-          const pres = frag.querySelectorAll("PRE");
-          let l = pres.length;
-          let pre, walker, node, value, contents, index;
-          while (l--) {
-            pre = pres[l];
-            walker = createTreeWalker(pre, SHOW_TEXT);
-            while (node = walker.nextNode()) {
-              value = node.data;
-              value = value.replace(/ (?=)/g, NBSP); // sp -> nbsp
-              contents = document.createDocumentFragment();
-              while ((index = value.indexOf("\n")) > -1) {
-                contents.append(
-                  document.createTextNode(value.slice(0, index))
-                );
-                contents.append(createElement("BR"));
-                value = value.slice(index + 1);
-              }
-              node.before(contents);
-              node.data = value;
-            }
-            fixContainer(pre, root);
-            replaceWith(pre, empty(pre));
-          }
-          return frag;
-        }, range).focus();
-      }
-      return this.changeFormat(null, { tag: "CODE" }, range);
-    }
-    toggleCode() {
-      return (this.hasFormat("PRE") || this.hasFormat("CODE")) ? this.removeCode() : this.code();
-    }
-    // SnappyMail
-    changeIndentationLevel(direction) {
-      let parent = this.getSelectionClosest("UL,OL,BLOCKQUOTE");
-      if (parent || "increase" === direction) {
-        direction += (!parent || "BLOCKQUOTE" === parent.nodeName) ? "Quote" : "List";
-        return this[direction + "Level"]();
-      }
-    }
-    getSelectionClosest(selector) {
-      return getClosest(this.getSelection().commonAncestorContainer, this._root, selector);
-    }
-    setAttribute(name, value) {
-      let range = this.getSelection();
-      let start = range?.startContainer || {};
-      let end = range?.endContainer || {};
-      if ("dir" == name || (isTextNode(start) && 0 === range.startOffset && start === end && end.length === range.endOffset)) {
-        this._recordUndoState(range);
-        setAttributes(start.parentNode, { [name]: value });
-        this._docWasChanged();
-      } else if (null == value) {
-        this._recordUndoState(range);
-        let node = getClosest(range.commonAncestorContainer, this._root, "*");
-        range.collapsed ? setAttributes(node, { [name]: value }) : node.querySelectorAll("*").forEach((el) => setAttributes(el, { [name]: value }));
-        this._docWasChanged();
-      } else {
-        this.changeFormat({
-          tag: "SPAN",
-          attributes: { [name]: value }
-        }, null, range);
-      }
-      return this.focus();
-    }
-    setStyle(style) {
-      this.setAttribute("style", style);
-    }
-    toggleTag(name, remove) {
-      let range = this.getSelection();
-      if (this.hasFormat(name, null, range)) {
-        this.changeFormat(null, { tag: name }, range);
-      } else {
-        this.changeFormat({ tag: name }, remove ? { tag: remove } : null, range);
-      }
-    }
-    setRange(range) {
-      this.setSelection(range);
-      this._updatePath(range, true);
-    }
-
-    setConfig(config) {
-      this._config = mergeObjects({
-        addLinks: true
-      }, config, true);
-      return this;
-    }
-  }
-
-  // source/Legacy.ts
-  win.Squire = Squire;
-})();
diff --git a/vendors/squire2/dist/squire-raw.js b/vendors/squire2/dist/squire-raw.js
new file mode 100644
index 000000000..d12426e59
--- /dev/null
+++ b/vendors/squire2/dist/squire-raw.js
@@ -0,0 +1,3735 @@
+"use strict";
+(() => {
+  // source/node/TreeIterator.ts
+  var SHOW_ELEMENT = 1;
+  var SHOW_TEXT = 4;
+  var SHOW_ELEMENT_OR_TEXT = 5;
+
+  // source/node/TreeWalker.ts
+  var FILTER_ACCEPT = NodeFilter.FILTER_ACCEPT;
+  TreeWalker.prototype.previousPONode = function() {
+    const root = this.root;
+    let current = this.currentNode;
+    let node;
+    while (true) {
+      node = current.lastChild;
+      while (!node && current) {
+        if (current === root) {
+          break;
+        }
+        node = current.previousSibling;
+        if (!node) {
+          current = current.parentNode;
+        }
+      }
+      if (!node) {
+        return null;
+      }
+      const nodeType = node.nodeType;
+      const nodeFilterType = nodeType === Node.ELEMENT_NODE ? NodeFilter.SHOW_ELEMENT : nodeType === Node.TEXT_NODE ? NodeFilter.SHOW_TEXT : 0;
+      if (!!(nodeFilterType & this.whatToShow) && FILTER_ACCEPT === this.filter.acceptNode(node)) {
+        this.currentNode = node;
+        return node;
+      }
+      current = node;
+    }
+  };
+  var createTreeWalker = (root, whatToShow, filter) => document.createTreeWalker(
+    root,
+    whatToShow,
+    {
+      acceptNode: (node) => !filter || filter(node) ? FILTER_ACCEPT : NodeFilter.FILTER_SKIP
+    }
+  );
+
+  // source/Constants.ts
+  var ELEMENT_NODE = 1;
+  var TEXT_NODE = 3;
+  var DOCUMENT_FRAGMENT_NODE = 11;
+  var ZWS = "\u200B";
+  var ua = navigator.userAgent;
+  var isMac = /Mac OS X/.test(ua);
+  var isWin = /Windows NT/.test(ua);
+  var isIOS = /iP(?:ad|hone)/.test(ua) || isMac && !!navigator.maxTouchPoints;
+  var isAndroid = /Android/.test(ua);
+  var isWebKit = /WebKit\//.test(ua);
+  var ctrlKey = isMac || isIOS ? "Meta-" : "Ctrl-";
+  var cantFocusEmptyTextNodes = isWebKit;
+  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", "IMG"]);
+  var UNKNOWN = 0;
+  var INLINE = 1;
+  var BLOCK = 2;
+  var CONTAINER = 3;
+  var cache = /* @__PURE__ */ new WeakMap();
+  var resetNodeCategoryCache = () => {
+    cache = /* @__PURE__ */ new WeakMap();
+  };
+  var isLeaf = (node) => leafNodeNames.has(node.nodeName);
+  var getNodeCategory = (node) => {
+    switch (node.nodeType) {
+      case TEXT_NODE:
+        return INLINE;
+      case ELEMENT_NODE:
+      case DOCUMENT_FRAGMENT_NODE:
+        if (cache.has(node)) {
+          return cache.get(node);
+        }
+        break;
+      default:
+        return UNKNOWN;
+    }
+    let nodeCategory;
+    if (!Array.from(node.childNodes).every(isInline)) {
+      nodeCategory = CONTAINER;
+    } else if (inlineNodeNames.test(node.nodeName)) {
+      nodeCategory = INLINE;
+    } else {
+      nodeCategory = BLOCK;
+    }
+    cache.set(node, nodeCategory);
+    return nodeCategory;
+  };
+  var isInline = (node) => getNodeCategory(node) === INLINE;
+  var isBlock = (node) => getNodeCategory(node) === BLOCK;
+  var isContainer = (node) => getNodeCategory(node) === CONTAINER;
+
+  // source/node/Node.ts
+  var createElement = (tag, props, children) => {
+    const el = document.createElement(tag);
+    if (props instanceof Array) {
+      children = props;
+      props = null;
+    }
+    setAttributes(el, props);
+    children && el.append(...children);
+    return el;
+  };
+  var areAlike = (node, node2) => {
+    if (isLeaf(node)) {
+      return false;
+    }
+    if (node.nodeType !== node2.nodeType || node.nodeName !== node2.nodeName) {
+      return false;
+    }
+    if (node instanceof HTMLElement && node2 instanceof HTMLElement) {
+      return node.nodeName !== "A" && node.className === node2.className && node.style.cssText === node2.style.cssText;
+    }
+    return true;
+  };
+  var hasTagAttributes = (node, tag, attributes) => {
+    if (node.nodeName !== tag) {
+      return false;
+    }
+    for (const attr in attributes) {
+      if (!("getAttribute" in node) || node.getAttribute(attr) !== attributes[attr]) {
+        return false;
+      }
+    }
+    return true;
+  };
+  var getNearest = (node, root, tag, attributes) => {
+    while (node && node !== root) {
+      if (hasTagAttributes(node, tag, attributes)) {
+        return node;
+      }
+      node = node.parentNode;
+    }
+    return null;
+  };
+  var getNodeBeforeOffset = (node, offset) => {
+    let children = node.childNodes;
+    while (offset && node instanceof Element) {
+      node = children[offset - 1];
+      children = node.childNodes;
+      offset = children.length;
+    }
+    return node;
+  };
+  var getNodeAfterOffset = (node, offset) => {
+    let returnNode = node;
+    if (returnNode instanceof Element) {
+      const children = returnNode.childNodes;
+      if (offset < children.length) {
+        returnNode = children[offset];
+      } else {
+        while (returnNode && !returnNode.nextSibling) {
+          returnNode = returnNode.parentNode;
+        }
+        if (returnNode) {
+          returnNode = returnNode.nextSibling;
+        }
+      }
+    }
+    return returnNode;
+  };
+  var getLength = (node) => node instanceof Element || node instanceof DocumentFragment ? node.childNodes.length : node instanceof CharacterData ? node.length : 0;
+  var empty = (node) => {
+    const frag = document.createDocumentFragment();
+    frag.append(...node.childNodes);
+    return frag;
+  };
+  var detach = (node) => {
+    node.parentNode?.removeChild(node);
+    return node;
+  };
+  var replaceWith = (node, node2) => node.parentNode?.replaceChild(node2, node);
+  var getClosest = (node, root, selector) => {
+    node = (node && !node.closest ? node.parentElement : node)?.closest(selector);
+    return node && root.contains(node) ? node : null;
+  };
+  var setAttributes = (node, props) => {
+    props && Object.entries(props).forEach(([k, v]) => {
+      if (null == v) {
+        node.removeAttribute(k);
+      } else if ("style" === k && typeof v === "object") {
+        Object.entries(v).forEach(([k2, v2]) => node.style[k2] = v2);
+      } else {
+        node.setAttribute(k, v);
+      }
+    });
+  };
+
+  // source/node/Whitespace.ts
+  var notWSTextNode = (node) => node instanceof Element ? node.nodeName === "BR" : (
+    // okay if data is 'undefined' here.
+    notWS.test(node.data)
+  );
+  var isLineBreak = (br, isLBIfEmptyBlock) => {
+    let block = br.parentNode;
+    while (isInline(block)) {
+      block = block.parentNode;
+    }
+    const walker = createTreeWalker(
+      block,
+      SHOW_ELEMENT_OR_TEXT,
+      notWSTextNode
+    );
+    walker.currentNode = br;
+    return !!walker.nextNode() || isLBIfEmptyBlock && !walker.previousNode();
+  };
+  var removeZWS = (root, keepNode) => {
+    const walker = createTreeWalker(root, SHOW_TEXT);
+    let textNode;
+    let index;
+    while (textNode = walker.nextNode()) {
+      while ((index = textNode.data.indexOf(ZWS)) > -1 && // eslint-disable-next-line no-unmodified-loop-condition
+      (!keepNode || textNode.parentNode !== keepNode)) {
+        if (textNode.length === 1) {
+          let node = textNode;
+          let parent = node.parentNode;
+          while (parent) {
+            parent.removeChild(node);
+            walker.currentNode = parent;
+            if (!isInline(parent) || getLength(parent)) {
+              break;
+            }
+            node = parent;
+            parent = node.parentNode;
+          }
+          break;
+        } else {
+          textNode.deleteData(index, 1);
+        }
+      }
+    }
+  };
+
+  // source/range/Boundaries.ts
+  var START_TO_START = 0;
+  var END_TO_END = 2;
+  var isNodeContainedInRange = (range, node, partial) => {
+    if (partial) {
+      return range.intersectsNode(node);
+    } else {
+      const nodeRange = document.createRange();
+      nodeRange.selectNode(node);
+      const nodeStartAfterStart = range.compareBoundaryPoints(START_TO_START, nodeRange) < 1;
+      const nodeEndBeforeEnd = range.compareBoundaryPoints(END_TO_END, nodeRange) > -1;
+      return nodeStartAfterStart && nodeEndBeforeEnd;
+    }
+  };
+  var moveRangeBoundariesDownTree = (range) => {
+    let { startContainer, startOffset, endContainer, endOffset } = range;
+    while (!(startContainer instanceof Text)) {
+      let child = startContainer.childNodes[startOffset];
+      if (!child || isLeaf(child)) {
+        if (startOffset) {
+          child = startContainer.childNodes[startOffset - 1];
+          if (child instanceof Text) {
+            let textChild = child;
+            let prev;
+            while (!textChild.length && (prev = textChild.previousSibling) && prev instanceof Text) {
+              textChild.remove();
+              textChild = prev;
+            }
+            startContainer = textChild;
+            startOffset = textChild.data.length;
+          }
+        }
+        break;
+      }
+      startContainer = child;
+      startOffset = 0;
+    }
+    if (endOffset) {
+      while (!(endContainer instanceof Text)) {
+        const child = endContainer.childNodes[endOffset - 1];
+        if (!child || isLeaf(child)) {
+          if (child && child.nodeName === "BR" && !isLineBreak(child, false)) {
+            --endOffset;
+            continue;
+          }
+          break;
+        }
+        endContainer = child;
+        endOffset = getLength(endContainer);
+      }
+    } else {
+      while (!(endContainer instanceof Text)) {
+        const child = endContainer.firstChild;
+        if (!child || isLeaf(child)) {
+          break;
+        }
+        endContainer = child;
+      }
+    }
+    range.setStart(startContainer, startOffset);
+    range.setEnd(endContainer, endOffset);
+  };
+  var moveRangeBoundariesUpTree = (range, startMax, endMax, root) => {
+    let startContainer = range.startContainer;
+    let startOffset = range.startOffset;
+    let endContainer = range.endContainer;
+    let endOffset = range.endOffset;
+    let parent;
+    if (!startMax) {
+      startMax = range.commonAncestorContainer;
+    }
+    if (!endMax) {
+      endMax = startMax;
+    }
+    while (!startOffset && startContainer !== startMax && startContainer !== root) {
+      parent = startContainer.parentNode;
+      startOffset = Array.from(parent.childNodes).indexOf(
+        startContainer
+      );
+      startContainer = parent;
+    }
+    while (true) {
+      if (endContainer === endMax || endContainer === root) {
+        break;
+      }
+      if (endContainer.nodeType !== TEXT_NODE && endContainer.childNodes[endOffset] && endContainer.childNodes[endOffset].nodeName === "BR" && !isLineBreak(endContainer.childNodes[endOffset], false)) {
+        ++endOffset;
+      }
+      if (endOffset !== getLength(endContainer)) {
+        break;
+      }
+      parent = endContainer.parentNode;
+      endOffset = Array.from(parent.childNodes).indexOf(endContainer) + 1;
+      endContainer = parent;
+    }
+    range.setStart(startContainer, startOffset);
+    range.setEnd(endContainer, endOffset);
+  };
+  var moveRangeBoundaryOutOf = (range, tag, root) => {
+    let parent = getClosest(range.endContainer, root, tag);
+    if (parent && (parent = parent.parentNode)) {
+      const clone = range.cloneRange();
+      moveRangeBoundariesUpTree(clone, parent, parent, root);
+      if (clone.endContainer === parent) {
+        range.setStart(clone.endContainer, clone.endOffset);
+        range.setEnd(clone.endContainer, clone.endOffset);
+      }
+    }
+    return range;
+  };
+
+  // source/node/MergeSplit.ts
+  var fixCursor = (node) => {
+    let fixer = null;
+    if (node instanceof Text) {
+      return node;
+    }
+    if (isInline(node)) {
+      let child = node.firstChild;
+      if (cantFocusEmptyTextNodes) {
+        while (child && child instanceof Text && !child.data) {
+          node.removeChild(child);
+          child = node.firstChild;
+        }
+      }
+      if (!child) {
+        if (cantFocusEmptyTextNodes) {
+          fixer = document.createTextNode(ZWS);
+        } else {
+          fixer = document.createTextNode("");
+        }
+      }
+    } 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)) {
+        parent = child;
+      }
+      node = parent;
+    }
+    if (fixer) {
+      try {
+        node.appendChild(fixer);
+      } catch (error) {
+      }
+    }
+    return node;
+  };
+  var fixContainer = (container, root) => {
+    let wrapper = null;
+    [...container.childNodes].forEach((child) => {
+      const isBR = child.nodeName === "BR";
+      if (!isBR && child.parentNode == root && isInline(child)) {
+        wrapper || (wrapper = createElement("DIV"));
+        wrapper.append(child);
+      } else if (isBR || wrapper) {
+        wrapper || (wrapper = createElement("DIV"));
+        fixCursor(wrapper);
+        if (isBR) {
+          child.replaceWith(wrapper);
+        } else {
+          container.insertBefore(wrapper, child);
+        }
+        wrapper = null;
+      }
+      isContainer(child) && fixContainer(child, root);
+    });
+    wrapper && container.append(fixCursor(wrapper));
+    return container;
+  };
+  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 (!node.parentNode) {
+        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;
+    const parent = node.parentNode;
+    if (!parent || node === stopNode || !(node instanceof Element)) {
+      return nodeAfterSplit;
+    }
+    const clone = node.cloneNode(false);
+    while (nodeAfterSplit) {
+      const next = nodeAfterSplit.nextSibling;
+      clone.append(nodeAfterSplit);
+      nodeAfterSplit = next;
+    }
+    if (node instanceof HTMLOListElement && getClosest(node, root, "BLOCKQUOTE")) {
+      clone.start = (+node.start || 1) + node.childNodes.length - 1;
+    }
+    fixCursor(node);
+    fixCursor(clone);
+    node.after(clone);
+    return split(parent, clone, stopNode, root);
+  };
+  var _mergeInlines = (node, fakeRange) => {
+    const children = node.childNodes;
+    let l = children.length;
+    const frags = [];
+    while (l--) {
+      const child = children[l];
+      const prev = l ? children[l - 1] : null;
+      if (prev && isInline(child) && areAlike(child, prev)) {
+        if (fakeRange.startContainer === child) {
+          fakeRange.startContainer = prev;
+          fakeRange.startOffset += getLength(prev);
+        }
+        if (fakeRange.endContainer === child) {
+          fakeRange.endContainer = prev;
+          fakeRange.endOffset += getLength(prev);
+        }
+        if (fakeRange.startContainer === node) {
+          if (fakeRange.startOffset > l) {
+            --fakeRange.startOffset;
+          } else if (fakeRange.startOffset === l) {
+            fakeRange.startContainer = prev;
+            fakeRange.startOffset = getLength(prev);
+          }
+        }
+        if (fakeRange.endContainer === node) {
+          if (fakeRange.endOffset > l) {
+            --fakeRange.endOffset;
+          } else if (fakeRange.endOffset === l) {
+            fakeRange.endContainer = prev;
+            fakeRange.endOffset = getLength(prev);
+          }
+        }
+        detach(child);
+        if (child instanceof Text) {
+          prev.appendData(child.data);
+        } else {
+          frags.push(empty(child));
+        }
+      } else if (child instanceof Element) {
+        let frag;
+        while (frag = frags.pop()) {
+          child.append(frag);
+        }
+        _mergeInlines(child, fakeRange);
+      }
+    }
+  };
+  var mergeInlines = (node, range) => {
+    const element = node instanceof Text ? node.parentNode : node;
+    if (element instanceof Element) {
+      const fakeRange = {
+        startContainer: range.startContainer,
+        startOffset: range.startOffset,
+        endContainer: range.endContainer,
+        endOffset: range.endOffset
+      };
+      _mergeInlines(element, fakeRange);
+      range.setStart(fakeRange.startContainer, fakeRange.startOffset);
+      range.setEnd(fakeRange.endContainer, fakeRange.endOffset);
+    }
+  };
+  var mergeWithBlock = (block, next, range, root) => {
+    let container = next;
+    let parent;
+    let offset;
+    while ((parent = container.parentNode) && parent !== root && parent instanceof Element && parent.childNodes.length === 1) {
+      container = parent;
+    }
+    detach(container);
+    offset = block.childNodes.length;
+    const last = block.lastChild;
+    if (last && last.nodeName === "BR") {
+      last.remove();
+      --offset;
+    }
+    block.append(empty(next));
+    range.setStart(block, offset);
+    range.collapse(true);
+    mergeInlines(block, range);
+  };
+  var mergeContainers = (node, root) => {
+    const prev = node.previousSibling;
+    const first = node.firstChild;
+    const isListItem = node.nodeName === "LI";
+    if (isListItem && (!first || !/^[OU]L$/.test(first.nodeName))) {
+      return;
+    }
+    if (prev && areAlike(prev, node)) {
+      if (!isContainer(prev)) {
+        if (!isListItem) {
+          return;
+        }
+        const block = createElement("DIV");
+        block.append(empty(prev));
+        prev.append(block);
+      }
+      detach(node);
+      const needsFix = !isContainer(node);
+      prev.append(empty(node));
+      needsFix && fixContainer(prev, root);
+      first && mergeContainers(first, root);
+    } else if (isListItem) {
+      const block = createElement("DIV");
+      node.insertBefore(block, first);
+      fixCursor(block);
+    }
+  };
+
+  // source/Clean.ts
+  var styleToSemantic = {
+    "font-weight": {
+      regexp: /^bold|^700/i,
+      replace() {
+        return createElement("B");
+      }
+    },
+    "font-style": {
+      regexp: /^italic/i,
+      replace() {
+        return createElement("I");
+      }
+    },
+    "font-family": {
+      regexp: notWS,
+      replace(classNames, family) {
+        return createElement("SPAN", {
+          class: classNames.fontFamily,
+          style: "font-family:" + family
+        });
+      }
+    },
+    "font-size": {
+      regexp: notWS,
+      replace(classNames, size) {
+        return createElement("SPAN", {
+          class: classNames.fontSize,
+          style: "font-size:" + size
+        });
+      }
+    },
+    "text-decoration": {
+      regexp: /^underline/i,
+      replace() {
+        return createElement("U");
+      }
+    }
+  };
+  var replaceStyles = (node, _, config) => {
+    const style = node.style;
+    let newTreeBottom;
+    let newTreeTop;
+    for (const attr in styleToSemantic) {
+      const converter = styleToSemantic[attr];
+      const css = style.getPropertyValue(attr);
+      if (css && converter.regexp.test(css)) {
+        const el = converter.replace(config.classNames, css);
+        if (el.nodeName === node.nodeName && el.className === node.className) {
+          continue;
+        }
+        if (!newTreeTop) {
+          newTreeTop = el;
+        }
+        if (newTreeBottom) {
+          newTreeBottom.append(el);
+        }
+        newTreeBottom = el;
+        node.style.removeProperty(attr);
+      }
+    }
+    if (newTreeTop && newTreeBottom) {
+      newTreeBottom.append(empty(node));
+      if (node.style.cssText) {
+        node.append(newTreeTop);
+      } else {
+        replaceWith(node, newTreeTop);
+      }
+    }
+    return newTreeBottom || node;
+  };
+  var replaceWithTag = (tag) => {
+    return (node, parent) => {
+      const el = createElement(tag);
+      const attributes = node.attributes;
+      for (let i = 0, l = attributes.length; i < l; ++i) {
+        const attribute = attributes[i];
+        el.setAttribute(attribute.name, attribute.value);
+      }
+      parent.replaceChild(el, node);
+      el.append(empty(node));
+      return el;
+    };
+  };
+  var fontSizes = {
+    "1": "x-small",
+    "2": "small",
+    "3": "medium",
+    "4": "large",
+    "5": "x-large",
+    "6": "xx-large",
+    "7": "xxx-large",
+    "-1": "smaller",
+    "+1": "larger"
+  };
+  var stylesRewriters = {
+    STRONG: replaceWithTag("B"),
+    EM: replaceWithTag("I"),
+    INS: replaceWithTag("U"),
+    STRIKE: replaceWithTag("S"),
+    SPAN: replaceStyles,
+    FONT: (node, parent, config) => {
+      const font = node;
+      const face = font.face;
+      const size = font.size;
+      let color = font.color;
+      let newTag = createElement("SPAN");
+      let css = newTag.style;
+      newTag.style.cssText = node.style.cssText;
+      if (face) {
+        css.fontFamily = face;
+      }
+      if (size) {
+        css.fontSize = fontSizes[size];
+      }
+      if (color && /^#?([\dA-F]{3}){1,2}$/i.test(color)) {
+        if (color.charAt(0) !== "#") {
+          color = "#" + color;
+        }
+        css.color = color;
+      }
+      replaceWith(node, newTag);
+      newTag.append(empty(node));
+      return newTag;
+    },
+    TT: (node, parent, config) => {
+      const el = createElement("SPAN", {
+        class: config.classNames.fontFamily,
+        style: 'font-family:menlo,consolas,"courier new",monospace'
+      });
+      replaceWith(node, el);
+      el.append(empty(node));
+      return el;
+    }
+  };
+  var allowedBlock = /^(?:A(?:DDRESS|RTICLE|SIDE|UDIO)|BLOCKQUOTE|CAPTION|D(?:[DLT]|IV)|F(?:IGURE|IGCAPTION|OOTER)|H[1-6]|HEADER|L(?:ABEL|EGEND|I)|O(?:L|UTPUT)|P(?:RE)?|SECTION|T(?:ABLE|BODY|D|FOOT|H|HEAD|R)|COL(?:GROUP)?|UL)$/;
+  var blacklist = /* @__PURE__ */ new Set(["HEAD", "META", "STYLE"]);
+  var cleanTree = (node, config, preserveWS) => {
+    const children = node.childNodes;
+    let nonInlineParent = node;
+    while (isInline(nonInlineParent)) {
+      nonInlineParent = nonInlineParent.parentNode;
+    }
+    const walker = createTreeWalker(
+      nonInlineParent,
+      SHOW_ELEMENT_OR_TEXT
+    );
+    let i = children.length;
+    while (i--) {
+      let child = children[i];
+      const nodeName = child.nodeName;
+      if (child instanceof HTMLElement) {
+        const childLength = child.childNodes.length;
+        if (stylesRewriters[nodeName]) {
+          child = stylesRewriters[nodeName](child, node, config);
+        } else if (blacklist.has(nodeName)) {
+          child.remove();
+          continue;
+        } else if (!allowedBlock.test(nodeName) && !isInline(child)) {
+          i += childLength;
+          replaceWith(child, empty(child));
+          continue;
+        }
+        if (childLength) {
+          cleanTree(child, config, preserveWS || nodeName === "PRE");
+        }
+      }
+    }
+    return node;
+  };
+  var removeEmptyInlines = (node) => {
+    const children = node.childNodes;
+    let l = children.length;
+    while (l--) {
+      const child = children[l];
+      if (child instanceof Element && !isLeaf(child)) {
+        removeEmptyInlines(child);
+        if (isInline(child) && !child.firstChild) {
+          node.removeChild(child);
+        }
+      } else if (child instanceof Text && !child.data) {
+        node.removeChild(child);
+      }
+    }
+  };
+  var cleanupBRs = (node, root, keepForBlankLine) => {
+    const brs = node.querySelectorAll("BR");
+    const brBreaksLine = [];
+    let l = brs.length;
+    for (let i = 0; i < l; ++i) {
+      brBreaksLine[i] = isLineBreak(brs[i], keepForBlankLine);
+    }
+    while (l--) {
+      const br = brs[l];
+      const parent = br.parentNode;
+      if (!parent) {
+        continue;
+      }
+      if (!brBreaksLine[l]) {
+        detach(br);
+      } else if (!isInline(parent)) {
+        fixContainer(parent, root);
+      }
+    }
+  };
+  var escapeHTML = (text) => {
+    return text.split("&").join("&amp;").split("<").join("&lt;").split(">").join("&gt;").split('"').join("&quot;");
+  };
+
+  // source/node/Block.ts
+  var getBlockWalker = (node, root) => {
+    const walker = createTreeWalker(root, SHOW_ELEMENT, isBlock);
+    walker.currentNode = node;
+    return walker;
+  };
+  var getPreviousBlock = (node, root) => {
+    const block = getBlockWalker(node, root).previousNode();
+    return block !== root ? block : null;
+  };
+  var getNextBlock = (node, root) => {
+    const block = getBlockWalker(node, root).nextNode();
+    return block !== root ? block : null;
+  };
+  var isEmptyBlock = (block) => {
+    return !block.textContent && !block.querySelector("IMG");
+  };
+
+  // source/range/Block.ts
+  var getStartBlockOfRange = (range, root) => {
+    const container = range.startContainer;
+    let block;
+    if (isInline(container)) {
+      block = getPreviousBlock(container, root);
+    } else if (container !== root && container instanceof HTMLElement && isBlock(container)) {
+      block = container;
+    } else {
+      const node = getNodeBeforeOffset(container, range.startOffset);
+      block = getNextBlock(node, root);
+    }
+    return block && isNodeContainedInRange(range, block, true) ? block : null;
+  };
+  var getEndBlockOfRange = (range, root) => {
+    const container = range.endContainer;
+    let block;
+    if (isInline(container)) {
+      block = getPreviousBlock(container, root);
+    } else if (container !== root && container instanceof HTMLElement && isBlock(container)) {
+      block = container;
+    } else {
+      let node = getNodeAfterOffset(container, range.endOffset);
+      if (!node || !root.contains(node)) {
+        node = root;
+        let child;
+        while (child = node.lastChild) {
+          node = child;
+        }
+      }
+      block = getPreviousBlock(node, root);
+    }
+    return block && isNodeContainedInRange(range, block, true) ? block : null;
+  };
+  var isContent = (node) => {
+    return node instanceof Text ? notWS.test(node.data) : node.nodeName === "IMG";
+  };
+  var rangeDoesStartAtBlockBoundary = (range, root) => {
+    const startContainer = range.startContainer;
+    const startOffset = range.startOffset;
+    let nodeAfterCursor;
+    if (startContainer instanceof Text) {
+      const text = startContainer.data;
+      for (let i = startOffset; i > 0; --i) {
+        if (text.charAt(i - 1) !== ZWS) {
+          return false;
+        }
+      }
+      nodeAfterCursor = startContainer;
+    } else {
+      nodeAfterCursor = getNodeAfterOffset(startContainer, startOffset);
+      if (nodeAfterCursor && !root.contains(nodeAfterCursor)) {
+        nodeAfterCursor = null;
+      }
+      if (!nodeAfterCursor) {
+        nodeAfterCursor = getNodeBeforeOffset(startContainer, startOffset);
+        if (nodeAfterCursor instanceof Text && nodeAfterCursor.length) {
+          return false;
+        }
+      }
+    }
+    const block = getStartBlockOfRange(range, root);
+    if (!block) {
+      return false;
+    }
+    const contentWalker = createTreeWalker(
+      block,
+      SHOW_ELEMENT_OR_TEXT,
+      isContent
+    );
+    contentWalker.currentNode = nodeAfterCursor;
+    return !contentWalker.previousNode();
+  };
+  var rangeDoesEndAtBlockBoundary = (range, root) => {
+    const endContainer = range.endContainer;
+    const endOffset = range.endOffset;
+    let currentNode;
+    if (endContainer instanceof Text) {
+      const text = endContainer.data;
+      const length = text.length;
+      for (let i = endOffset; i < length; ++i) {
+        if (text.charAt(i) !== ZWS) {
+          return false;
+        }
+      }
+      currentNode = endContainer;
+    } else {
+      currentNode = getNodeBeforeOffset(endContainer, endOffset);
+    }
+    const block = getEndBlockOfRange(range, root);
+    if (!block) {
+      return false;
+    }
+    const contentWalker = createTreeWalker(
+      block,
+      SHOW_ELEMENT_OR_TEXT,
+      isContent
+    );
+    contentWalker.currentNode = currentNode;
+    return !contentWalker.nextNode();
+  };
+  var expandRangeToBlockBoundaries = (range, root) => {
+    const start = getStartBlockOfRange(range, root);
+    const end = getEndBlockOfRange(range, root);
+    let parent;
+    if (start && end) {
+      parent = start.parentNode;
+      range.setStart(parent, Array.from(parent.childNodes).indexOf(start));
+      parent = end.parentNode;
+      range.setEnd(parent, Array.from(parent.childNodes).indexOf(end) + 1);
+    }
+  };
+
+  // source/range/InsertDelete.ts
+  function createRange(startContainer, startOffset, endContainer, endOffset) {
+    const range = document.createRange();
+    range.setStart(startContainer, startOffset);
+    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;
+    if (startContainer instanceof Text) {
+      const parent = startContainer.parentNode;
+      children = parent.childNodes;
+      if (startOffset === startContainer.length) {
+        startOffset = Array.from(children).indexOf(startContainer) + 1;
+        if (range.collapsed) {
+          endContainer = parent;
+          endOffset = startOffset;
+        }
+      } else {
+        if (startOffset) {
+          const afterSplit = startContainer.splitText(startOffset);
+          if (endContainer === startContainer) {
+            endOffset -= startOffset;
+            endContainer = afterSplit;
+          } else if (endContainer === parent) {
+            ++endOffset;
+          }
+          startContainer = afterSplit;
+        }
+        startOffset = Array.from(children).indexOf(
+          startContainer
+        );
+      }
+      startContainer = parent;
+    } else {
+      children = startContainer.childNodes;
+    }
+    const childCount = children.length;
+    if (startOffset === childCount) {
+      startContainer.append(node);
+    } else {
+      startContainer.insertBefore(node, children[startOffset]);
+    }
+    if (startContainer === endContainer) {
+      endOffset += children.length - childCount;
+    }
+    range.setStart(startContainer, startOffset);
+    range.setEnd(endContainer, endOffset);
+  };
+  var extractContentsOfRange = (range, common, root) => {
+    const frag = document.createDocumentFragment();
+    if (range.collapsed) {
+      return frag;
+    }
+    if (!common) {
+      common = range.commonAncestorContainer;
+    }
+    if (common instanceof Text) {
+      common = common.parentNode;
+    }
+    const startContainer = range.startContainer;
+    const startOffset = range.startOffset;
+    let endContainer = split(range.endContainer, range.endOffset, common, root);
+    let endOffset = 0;
+    let node = split(startContainer, startOffset, common, root);
+    while (node && node !== endContainer) {
+      const next = node.nextSibling;
+      frag.append(node);
+      node = next;
+    }
+    node = endContainer && endContainer.previousSibling;
+    if (node && node instanceof Text && endContainer instanceof Text) {
+      endOffset = node.length;
+      node.appendData(endContainer.data);
+      detach(endContainer);
+      endContainer = node;
+    }
+    range.setStart(startContainer, startOffset);
+    if (endContainer) {
+      range.setEnd(endContainer, endOffset);
+    } else {
+      range.setEnd(common, common.childNodes.length);
+    }
+    fixCursor(common);
+    return frag;
+  };
+  var getAdjacentInlineNode = (iterator, method, node) => {
+    iterator.currentNode = node;
+    let nextNode;
+    while (nextNode = iterator[method]()) {
+      if (nextNode instanceof Text || isLeaf(nextNode)) {
+        return nextNode;
+      }
+      if (!isInline(nextNode)) {
+        return null;
+      }
+    }
+    return null;
+  };
+  var deleteContentsOfRange = (range, root) => {
+    const startBlock = getStartBlockOfRange(range, root);
+    let endBlock = getEndBlockOfRange(range, root);
+    const needsMerge = startBlock !== endBlock;
+    if (startBlock && endBlock) {
+      moveRangeBoundariesDownTree(range);
+      moveRangeBoundariesUpTree(range, startBlock, endBlock, root);
+    }
+    const frag = extractContentsOfRange(range, null, root);
+    moveRangeBoundariesDownTree(range);
+    if (needsMerge) {
+      endBlock = getEndBlockOfRange(range, root);
+      if (startBlock && endBlock && startBlock !== endBlock) {
+        mergeWithBlock(startBlock, endBlock, range, root);
+      }
+    }
+    if (startBlock) {
+      fixCursor(startBlock);
+    }
+    const child = root.firstChild;
+    if (!child || child.nodeName === "BR") {
+      fixCursor(root);
+      if (root.firstChild) {
+        range.selectNodeContents(root.firstChild);
+      }
+    }
+    range.collapse(true);
+    const startContainer = range.startContainer;
+    const startOffset = range.startOffset;
+    const iterator = createTreeWalker(root, SHOW_ELEMENT_OR_TEXT);
+    let afterNode = startContainer;
+    let afterOffset = startOffset;
+    if (!(afterNode instanceof Text) || afterOffset === afterNode.data.length) {
+      afterNode = getAdjacentInlineNode(iterator, "nextNode", afterNode);
+      afterOffset = 0;
+    }
+    let beforeNode = startContainer;
+    let beforeOffset = startOffset - 1;
+    if (!(beforeNode instanceof Text) || beforeOffset === -1) {
+      beforeNode = getAdjacentInlineNode(
+        iterator,
+        "previousPONode",
+        afterNode || (startContainer instanceof Text ? startContainer : startContainer.childNodes[startOffset] || startContainer)
+      );
+      if (beforeNode instanceof Text) {
+        beforeOffset = beforeNode.data.length;
+      }
+    }
+    let node = null;
+    let offset = 0;
+    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)) {
+        node = beforeNode;
+        offset = beforeOffset;
+      }
+    }
+    if (node) {
+      node.replaceData(offset, 1, "\xA0");
+    }
+    range.setStart(startContainer, startOffset);
+    range.collapse(true);
+    return frag;
+  };
+  var insertTreeFragmentIntoRange = (range, frag, root) => {
+    const firstInFragIsInline = frag.firstChild && isInline(frag.firstChild);
+    let node;
+    fixContainer(frag, root);
+    node = frag;
+    while (node = getNextBlock(node, root)) {
+      fixCursor(node);
+    }
+    if (!range.collapsed) {
+      deleteContentsOfRange(range, root);
+    }
+    moveRangeBoundariesDownTree(range);
+    range.collapse(false);
+    const stopPoint = getClosest(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
+    !getClosest(firstBlockInFrag, frag, "PRE") && !getClosest(firstBlockInFrag, frag, "TABLE")) {
+      moveRangeBoundariesUpTree(range, block, block, root);
+      range.collapse(true);
+      let container = range.endContainer;
+      let offset = range.endOffset;
+      cleanupBRs(block, root, false);
+      if (isInline(container)) {
+        const nodeAfterSplit = split(
+          container,
+          offset,
+          getPreviousBlock(container, root) || root,
+          root
+        );
+        container = nodeAfterSplit.parentNode;
+        offset = Array.from(container.childNodes).indexOf(
+          nodeAfterSplit
+        );
+      }
+      if (
+        /*isBlock( container ) && */
+        offset !== getLength(container)
+      ) {
+        blockContentsAfterSplit = document.createDocumentFragment();
+        while (node = container.childNodes[offset]) {
+          blockContentsAfterSplit.append(node);
+        }
+      }
+      mergeWithBlock(container, firstBlockInFrag, range, root);
+      offset = Array.from(container.parentNode.childNodes).indexOf(
+        container
+      ) + 1;
+      container = container.parentNode;
+      range.setEnd(container, offset);
+    }
+    if (getLength(frag)) {
+      if (replaceBlock && block) {
+        range.setEndBefore(block);
+        range.collapse(false);
+        detach(block);
+      }
+      moveRangeBoundariesUpTree(range, stopPoint, stopPoint, root);
+      let nodeAfterSplit = split(
+        range.endContainer,
+        range.endOffset,
+        stopPoint,
+        root
+      );
+      const nodeBeforeSplit = nodeAfterSplit ? nodeAfterSplit.previousSibling : stopPoint.lastChild;
+      stopPoint.insertBefore(frag, nodeAfterSplit);
+      if (nodeAfterSplit) {
+        range.setEndBefore(nodeAfterSplit);
+      } else {
+        range.setEnd(stopPoint, getLength(stopPoint));
+      }
+      block = getEndBlockOfRange(range, root);
+      moveRangeBoundariesDownTree(range);
+      const container = range.endContainer;
+      const offset = range.endOffset;
+      if (nodeAfterSplit && isContainer(nodeAfterSplit)) {
+        mergeContainers(nodeAfterSplit, root);
+      }
+      nodeAfterSplit = nodeBeforeSplit && nodeBeforeSplit.nextSibling;
+      if (nodeAfterSplit && isContainer(nodeAfterSplit)) {
+        mergeContainers(nodeAfterSplit, root);
+      }
+      range.setEnd(container, offset);
+    }
+    if (blockContentsAfterSplit && block) {
+      const tempRange = range.cloneRange();
+      fixCursor(blockContentsAfterSplit);
+      mergeWithBlock(block, blockContentsAfterSplit, tempRange, root);
+      range.setEnd(tempRange.endContainer, tempRange.endOffset);
+    }
+    moveRangeBoundariesDownTree(range);
+  };
+
+  // source/range/Contents.ts
+  var getTextContentsOfRange = (range) => {
+    if (range.collapsed) {
+      return "";
+    }
+    const startContainer = range.startContainer;
+    const endContainer = range.endContainer;
+    const walker = createTreeWalker(
+      range.commonAncestorContainer,
+      SHOW_ELEMENT_OR_TEXT,
+      (node2) => {
+        return isNodeContainedInRange(range, node2, true);
+      }
+    );
+    walker.currentNode = startContainer;
+    let node = startContainer;
+    let textContent = "";
+    let addedTextInBlock = false;
+    let value;
+    if (!(node instanceof Element) && !(node instanceof Text) || FILTER_ACCEPT !== walker.filter.acceptNode(node)) {
+      node = walker.nextNode();
+    }
+    while (node) {
+      if (node instanceof Text) {
+        value = node.data;
+        if (value && /\S/.test(value)) {
+          if (node === endContainer) {
+            value = value.slice(0, range.endOffset);
+          }
+          if (node === startContainer) {
+            value = value.slice(range.startOffset);
+          }
+          textContent += value;
+          addedTextInBlock = true;
+        }
+      } else if (node.nodeName === "BR" || addedTextInBlock && !isInline(node)) {
+        textContent += "\n";
+        addedTextInBlock = false;
+      }
+      node = walker.nextNode();
+    }
+    textContent = textContent.replace(/ /g, " ");
+    return textContent;
+  };
+
+  // source/Clipboard.ts
+  var indexOf = Array.prototype.indexOf;
+  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 copyRoot = root;
+    if (startBlock === endBlock && startBlock?.contains(range.commonAncestorContainer)) {
+      copyRoot = startBlock;
+    }
+    let contents;
+    if (removeRangeFromDocument) {
+      contents = deleteContentsOfRange(range, root);
+    } else {
+      range = range.cloneRange();
+      moveRangeBoundariesDownTree(range);
+      moveRangeBoundariesUpTree(range, copyRoot, copyRoot, root);
+      contents = range.cloneContents();
+    }
+    let parent = range.commonAncestorContainer;
+    if (parent instanceof Text) {
+      parent = parent.parentNode;
+    }
+    while (parent && parent !== copyRoot) {
+      const newContents = parent.cloneNode(false);
+      newContents.append(contents);
+      contents = newContents;
+      parent = parent.parentNode;
+    }
+    let html;
+    if (contents.childNodes.length === 1 && contents.childNodes[0] instanceof Text) {
+      text = contents.childNodes[0].data.replace(/ /g, " ");
+      plainTextOnly = true;
+    } else {
+      const node = createElement("DIV");
+      node.append(contents);
+      html = node.innerHTML;
+      if (toCleanHTML) {
+        html = toCleanHTML(html);
+      }
+    }
+    if (toPlainText && html !== void 0) {
+      text = toPlainText(html);
+    }
+    if (isWin) {
+      text = text.replace(/\r?\n/g, "\r\n");
+    }
+    if (!plainTextOnly && html && text !== html) {
+      html = "<!-- squire -->" + html;
+      clipboardData.setData("text/html", html);
+    }
+    clipboardData.setData("text/plain", text);
+    event.preventDefault();
+    return true;
+  };
+  var _onCut = function(event) {
+    const range = this.getSelection();
+    const root = this._root;
+    if (range.collapsed) {
+      event.preventDefault();
+      return;
+    }
+    this.saveUndoState(range);
+    const handled = extractRangeToClipboard(
+      event,
+      range,
+      root,
+      true,
+      this._config.willCutCopy,
+      this._config.toPlainText,
+      false
+    );
+    if (!handled) {
+      setTimeout(() => {
+        try {
+          this._ensureBottomLine();
+        } catch (error) {
+          this._config.didError(error);
+        }
+      }, 0);
+    }
+    this.setSelection(range);
+  };
+  var _onCopy = function(event) {
+    extractRangeToClipboard(
+      event,
+      this.getSelection(),
+      this._root,
+      false,
+      this._config.willCutCopy,
+      this._config.toPlainText,
+      false
+    );
+  };
+  var _monitorShiftKey = function(event) {
+    this._isShiftDown = event.shiftKey;
+  };
+  var _onPaste = function(event) {
+    const clipboardData = event.clipboardData;
+    const items = clipboardData.items;
+    const choosePlain = this._isShiftDown;
+    let hasRTF = false;
+    let hasImage = false;
+    let plainItem = null;
+    let htmlItem = null;
+    let l = items.length;
+    while (l--) {
+      const item = items[l];
+      const type = item.type;
+      if (type === "text/html") {
+        htmlItem = item;
+      } else if (type === "text/plain" || type === "text/uri-list") {
+        plainItem = item;
+      } else if (type === "text/rtf") {
+        hasRTF = true;
+      } else if (/^image\/.*/.test(type)) {
+        hasImage = true;
+      }
+    }
+    if (hasImage && !(hasRTF && htmlItem)) {
+      event.preventDefault();
+      this.fireEvent("pasteImage", {
+        clipboardData
+      });
+      return;
+    }
+    event.preventDefault();
+    if (htmlItem && (!choosePlain || !plainItem)) {
+      htmlItem.getAsString((html) => {
+        this.insertHTML(html, true);
+      });
+    } 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);
+          isLink = !!match && match[0].length === text.length;
+        }
+        if (isLink) {
+          this.makeLink(text);
+        } else {
+          this.insertPlainText(text, true);
+        }
+      });
+    }
+  };
+  var _onDrop = function(event) {
+    if (!event.dataTransfer) {
+      return;
+    }
+    const types = event.dataTransfer.types;
+    let l = types.length;
+    let hasPlain = false;
+    let hasHTML = false;
+    while (l--) {
+      switch (types[l]) {
+        case "text/plain":
+          hasPlain = true;
+          break;
+        case "text/html":
+          hasHTML = true;
+          break;
+        default:
+          return;
+      }
+    }
+    if (hasHTML || hasPlain && this.saveUndoState) {
+      this.saveUndoState();
+    }
+  };
+
+  // source/keyboard/KeyHelpers.ts
+  var afterDelete = (self, range) => {
+    try {
+      if (!range) {
+        range = self.getSelection();
+      }
+      let node = range.startContainer;
+      if (node instanceof Text) {
+        node = node.parentNode;
+      }
+      let parent = node;
+      while (isInline(parent) && (!parent.textContent || parent.textContent === ZWS)) {
+        node = parent;
+        parent = node.parentNode;
+      }
+      if (node !== parent) {
+        range.setStart(
+          parent,
+          Array.from(parent.childNodes).indexOf(node)
+        );
+        range.collapse(true);
+        parent.removeChild(node);
+        if (!isBlock(parent)) {
+          parent = getPreviousBlock(parent, self._root) || self._root;
+        }
+        fixCursor(parent);
+        moveRangeBoundariesDownTree(range);
+      }
+      if (node === self._root && (node = node.firstChild) && node.nodeName === "BR") {
+        detach(node);
+      }
+      self._ensureBottomLine();
+      self.setSelection(range);
+      self._updatePath(range, true);
+    } catch (error) {
+      self._config.didError(error);
+    }
+  };
+  var detachUneditableNode = (node, root) => {
+    let parent;
+    while (parent = node.parentNode) {
+      if (parent === root || parent.isContentEditable) {
+        break;
+      }
+      node = parent;
+    }
+    detach(node);
+  };
+  var linkifyText = (self, textNode, offset) => {
+    if (getClosest(textNode, self._root, "A")) {
+      return;
+    }
+    const data = textNode.data || "";
+    const searchFrom = Math.max(
+      data.lastIndexOf(" ", offset - 1),
+      data.lastIndexOf("\xA0", offset - 1)
+    ) + 1;
+    const searchText = data.slice(searchFrom, offset);
+    const match = self.linkRegExp.exec(searchText);
+    if (match) {
+      const selection = self.getSelection();
+      self._docWasChanged();
+      self._recordUndoState(selection);
+      self._getRangeAndRemoveBookmark(selection);
+      const index = searchFrom + match.index;
+      const endIndex = index + match[0].length;
+      const needsSelectionUpdate = selection.startContainer === textNode;
+      const newSelectionOffset = selection.startOffset - endIndex;
+      if (index) {
+        textNode = textNode.splitText(index);
+      }
+      const defaultAttributes = self._config.tagAttributes.a;
+      const link = createElement(
+        "A",
+        Object.assign(
+          {
+            href: match[1] ? /^(?:ht|f)tps?:/i.test(match[1]) ? match[1] : "http://" + match[1] : "mailto:" + match[0]
+          },
+          defaultAttributes
+        )
+      );
+      link.textContent = data.slice(index, endIndex);
+      textNode.parentNode.insertBefore(link, textNode);
+      textNode.data = data.slice(endIndex);
+      if (needsSelectionUpdate) {
+        selection.setStart(textNode, newSelectionOffset);
+        selection.setEnd(textNode, newSelectionOffset);
+      }
+      self.setSelection(selection);
+    }
+  };
+
+  // source/keyboard/Backspace.ts
+  var Backspace = (self, event, range) => {
+    const root = self._root;
+    self._removeZWS();
+    self.saveUndoState(range);
+    if (!range.collapsed) {
+      event.preventDefault();
+      deleteContentsOfRange(range, root);
+      afterDelete(self, range);
+    } else if (rangeDoesStartAtBlockBoundary(range, root)) {
+      event.preventDefault();
+      const startBlock = getStartBlockOfRange(range, root);
+      if (!startBlock) {
+        return;
+      }
+      let current = startBlock;
+      fixContainer(current.parentNode, root);
+      const previous = getPreviousBlock(current, root);
+      if (previous) {
+        if (!previous.isContentEditable) {
+          detachUneditableNode(previous, root);
+          return;
+        }
+        mergeWithBlock(previous, current, range, root);
+        current = previous.parentNode;
+        while (current !== root && !current.nextSibling) {
+          current = current.parentNode;
+        }
+        if (current !== root && (current = current.nextSibling)) {
+          mergeContainers(current, root);
+        }
+        self.setSelection(range);
+      } else if (current) {
+        if (getClosest(current, root, "UL") || getClosest(current, root, "OL")) {
+          self.decreaseListLevel(range);
+          return;
+        } else if (getClosest(current, root, "BLOCKQUOTE")) {
+          self.removeQuote(range);
+          return;
+        }
+        self.setSelection(range);
+        self._updatePath(range, true);
+      }
+    } else {
+      moveRangeBoundariesDownTree(range);
+      const text = range.startContainer;
+      const offset = range.startOffset;
+      const a = text.parentNode;
+      if (text instanceof Text && a instanceof HTMLAnchorElement && offset && a.href.includes(text.data)) {
+        text.deleteData(offset - 1, 1);
+        self.setSelection(range);
+        self.removeLink();
+        event.preventDefault();
+      } else {
+        self.setSelection(range);
+        setTimeout(() => {
+          afterDelete(self);
+        }, 0);
+      }
+    }
+  };
+
+  // source/keyboard/Delete.ts
+  var Delete = (self, event, range) => {
+    const root = self._root;
+    let current;
+    let next;
+    let originalRange;
+    let cursorContainer;
+    let cursorOffset;
+    let nodeAfterCursor;
+    self._removeZWS();
+    self.saveUndoState(range);
+    if (!range.collapsed) {
+      event.preventDefault();
+      deleteContentsOfRange(range, root);
+      afterDelete(self, range);
+    } else if (rangeDoesEndAtBlockBoundary(range, root)) {
+      event.preventDefault();
+      current = getStartBlockOfRange(range, root);
+      if (!current) {
+        return;
+      }
+      fixContainer(current.parentNode, root);
+      next = getNextBlock(current, root);
+      if (next) {
+        if (!next.isContentEditable) {
+          detachUneditableNode(next, root);
+          return;
+        }
+        mergeWithBlock(current, next, range, root);
+        next = current.parentNode;
+        while (next !== root && !next.nextSibling) {
+          next = next.parentNode;
+        }
+        if (next !== root && (next = next.nextSibling)) {
+          mergeContainers(next, root);
+        }
+        self.setSelection(range);
+        self._updatePath(range, true);
+      }
+    } else {
+      originalRange = range.cloneRange();
+      moveRangeBoundariesUpTree(range, root, root, root);
+      cursorContainer = range.endContainer;
+      cursorOffset = range.endOffset;
+      if (cursorContainer instanceof Element) {
+        nodeAfterCursor = cursorContainer.childNodes[cursorOffset];
+        if (nodeAfterCursor && nodeAfterCursor.nodeName === "IMG") {
+          event.preventDefault();
+          detach(nodeAfterCursor);
+          moveRangeBoundariesDownTree(range);
+          afterDelete(self, range);
+          return;
+        }
+      }
+      self.setSelection(originalRange);
+      setTimeout(() => {
+        afterDelete(self);
+      }, 0);
+    }
+  };
+
+  // source/keyboard/Tab.ts
+  var Tab = (self, event, range) => {
+    const root = self._root;
+    self._removeZWS();
+    if (range.collapsed && rangeDoesStartAtBlockBoundary(range, root)) {
+      getClosest(range.startContainer, root, "UL,OL,BLOCKQUOTE") && self.changeIndentationLevel("increase") && event.preventDefault();
+    }
+  };
+  var ShiftTab = (self, event, range) => {
+    const root = self._root;
+    self._removeZWS();
+    if (range.collapsed && rangeDoesStartAtBlockBoundary(range, root)) {
+      decreaseLevel(self, range, range.startContainer) && event.preventDefault();
+    }
+  };
+
+  // source/keyboard/Space.ts
+  var Space = (self, event, range) => {
+    let node;
+    const root = self._root;
+    self._recordUndoState(range);
+    self._getRangeAndRemoveBookmark(range);
+    if (!range.collapsed) {
+      deleteContentsOfRange(range, root);
+      self._ensureBottomLine();
+      self.setSelection(range);
+      self._updatePath(range, true);
+    } else if (rangeDoesEndAtBlockBoundary(range, root)) {
+      const block = getStartBlockOfRange(range, root);
+      if (block && block.nodeName !== "PRE") {
+        const text = block.textContent?.trimEnd().replace(ZWS, "");
+        if (text === "*" || text === "1.") {
+          event.preventDefault();
+          self.insertPlainText(" ", false);
+          self._docWasChanged();
+          self.saveUndoState(range);
+          const walker = createTreeWalker(block, SHOW_TEXT);
+          let textNode;
+          while (textNode = walker.nextNode()) {
+            detach(textNode);
+          }
+          if (text === "*") {
+            self.makeUnorderedList();
+          } else {
+            self.makeOrderedList();
+          }
+          return;
+        }
+      }
+    }
+    node = range.endContainer;
+    if (range.endOffset === getLength(node)) {
+      do {
+        if (node.nodeName === "A") {
+          range.setStartAfter(node);
+          break;
+        }
+      } while (!node.nextSibling && (node = node.parentNode) && node !== root);
+    }
+    if (self._config.addLinks) {
+      const linkRange = range.cloneRange();
+      moveRangeBoundariesDownTree(linkRange);
+      const textNode = linkRange.startContainer;
+      const offset = linkRange.startOffset;
+      setTimeout(() => {
+        linkifyText(self, textNode, offset);
+      }, 0);
+    }
+    self.setSelection(range);
+  };
+
+  // source/keyboard/KeyHandlers.ts
+  var _onKey = function(event) {
+    if (event.defaultPrevented || event.isComposing) {
+      return;
+    }
+    let key = event.key;
+    let modifiers = "";
+    const code = event.code;
+    if (/^Digit\d$/.test(code)) {
+      key = code.slice(-1);
+    }
+    if (key !== "Backspace" && key !== "Delete") {
+      if (event.altKey) {
+        modifiers += "Alt-";
+      }
+      if (event.ctrlKey) {
+        modifiers += "Ctrl-";
+      }
+      if (event.metaKey) {
+        modifiers += "Meta-";
+      }
+      if (event.shiftKey) {
+        modifiers += "Shift-";
+      }
+    }
+    if (isWin && event.shiftKey && key === "Delete") {
+      modifiers += "Shift-";
+    }
+    key = modifiers + key;
+    const range = this.getSelection();
+    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);
+      this._ensureBottomLine();
+      this.setSelection(range);
+      this._updatePath(range, true);
+    }
+  };
+  var keyHandlers = {
+    "Backspace": Backspace,
+    "Delete": Delete,
+    "Tab": Tab,
+    "Shift-Tab": ShiftTab,
+    " ": Space,
+    "ArrowLeft"(self) {
+      self._removeZWS();
+    },
+    "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") {
+            let next = node.nextSibling;
+            if (!(next instanceof Text)) {
+              const textNode = document.createTextNode("\xA0");
+              node.parentNode.insertBefore(textNode, next);
+              next = textNode;
+            }
+            range.setStart(next, 1);
+            self.setSelection(range);
+            event.preventDefault();
+            break;
+          }
+        } while (!node.nextSibling && (node = node.parentNode) && node !== root);
+      }
+    }
+  };
+  if (!isMac && !isIOS) {
+    keyHandlers.PageUp = (self) => {
+      self.moveCursorToStart();
+    };
+    keyHandlers.PageDown = (self) => {
+      self.moveCursorToEnd();
+    };
+  }
+  var mapKeyToFormat = (tag, remove) => {
+    remove = remove || null;
+    return (self, event) => {
+      event.preventDefault();
+      const range = self.getSelection();
+      if (self.hasFormat(tag, null, range)) {
+        self.changeFormat(null, { tag }, range);
+      } else {
+        self.changeFormat({ tag }, remove, range);
+      }
+    };
+  };
+  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)) {
+      self.makeUnorderedList();
+    } else {
+      self.removeList();
+    }
+  };
+  keyHandlers[ctrlKey + "Shift-9"] = (self, event) => {
+    event.preventDefault();
+    const path = self.getPath();
+    if (!/(?:^|>)OL/.test(path)) {
+      self.makeOrderedList();
+    } else {
+      self.removeList();
+    }
+  };
+  keyHandlers[ctrlKey + "["] = (self, event) => {
+    event.preventDefault();
+    const path = self.getPath();
+    if (/(?:^|>)BLOCKQUOTE/.test(path) || !/(?:^|>)[OU]L/.test(path)) {
+      self.decreaseQuoteLevel();
+    } else {
+      self.decreaseListLevel();
+    }
+  };
+  keyHandlers[ctrlKey + "]"] = (self, event) => {
+    event.preventDefault();
+    const path = self.getPath();
+    if (/(?:^|>)BLOCKQUOTE/.test(path) || !/(?:^|>)[OU]L/.test(path)) {
+      self.increaseQuoteLevel();
+    } else {
+      self.increaseListLevel();
+    }
+  };
+  keyHandlers[ctrlKey + "d"] = (self, event) => {
+    event.preventDefault();
+    self.toggleCode();
+  };
+  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
+  // 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) => {
+    event.preventDefault();
+    self.redo();
+  };
+
+  // source/Editor.ts
+  var Squire = class {
+    constructor(root, config) {
+      /**
+       * Subscribing to these events won't automatically add a listener to the
+       * document node, since these events are fired in a custom manner by the
+       * editor code.
+       */
+      this.customEvents = /* @__PURE__ */ new Set([
+        "pathChange",
+        "select",
+        "input",
+        "pasteImage",
+        "undoStateChange"
+      ]);
+      // ---
+      this.startSelectionId = "squire-selection-start";
+      this.endSelectionId = "squire-selection-end";
+      /*
+      linkRegExp = new RegExp(
+          // Only look on boundaries
+          '\\b(?:' +
+          // Capture group 1: URLs
+          '(' +
+              // Add links to URLS
+              // Starts with:
+              '(?:' +
+                  // http(s):// or ftp://
+                  '(?:ht|f)tps?:\\/\\/' +
+                  // or
+                  '|' +
+                  // www.
+                  'www\\d{0,3}[.]' +
+                  // or
+                  '|' +
+                  // foo90.com/
+                  '[a-z0-9][a-z0-9.\\-]*[.][a-z]{2,}\\/' +
+              ')' +
+              // Then we get one or more:
+              '(?:' +
+                  // Run of non-spaces, non ()<>
+                  '[^\\s()<>]+' +
+                  // or
+                  '|' +
+                  // balanced parentheses (one level deep only)
+                  '\\([^\\s()<>]+\\)' +
+              ')+' +
+              // And we finish with
+              '(?:' +
+                  // Not a space or punctuation character
+                  '[^\\s?&`!()\\[\\]{};:\'".,<>«»“”‘’]' +
+                  // or
+                  '|' +
+                  // Balanced parentheses.
+                  '\\([^\\s()<>]+\\)' +
+              ')' +
+          // Capture group 2: Emails
+          ')|(' +
+              // Add links to emails
+              '[\\w\\-.%+]+@(?:[\\w\\-]+\\.)+[a-z]{2,}\\b' +
+              // Allow query parameters in the mailto: style
+              '(?:' +
+                  '[?][^&?\\s]+=[^\\s?&`!()\\[\\]{};:\'".,<>«»“”‘’]+' +
+                  '(?:&[^&?\\s]+=[^\\s?&`!()\\[\\]{};:\'".,<>«»“”‘’]+)*' +
+              ')?' +
+          '))',
+          'i'
+      );
+      */
+      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"
+      };
+      this._root = root;
+      this._config = this._makeConfig(config);
+      this._isFocused = false;
+      this._lastSelection = createRange(root, 0);
+      this._willRestoreSelection = false;
+      this._mayHaveZWS = false;
+      this._lastAnchorNode = null;
+      this._lastFocusNode = null;
+      this._path = "";
+      this._events = /* @__PURE__ */ new Map();
+      this._undoIndex = -1;
+      this._undoStack = [];
+      this._undoStackLength = 0;
+      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._isShiftDown = false;
+      this.addEventListener("cut", _onCut);
+      this.addEventListener("copy", _onCopy);
+      this.addEventListener("paste", _onPaste);
+      this.addEventListener("drop", _onDrop);
+      this.addEventListener(
+        "keydown",
+        _monitorShiftKey
+      );
+      this.addEventListener("keyup", _monitorShiftKey);
+      this.addEventListener("keydown", _onKey);
+      this._keyHandlers = Object.create(keyHandlers);
+      const mutation = new MutationObserver(() => this._docWasChanged());
+      mutation.observe(root, {
+        childList: true,
+        attributes: true,
+        characterData: true,
+        subtree: true
+      });
+      this._mutation = mutation;
+      root.setAttribute("contenteditable", "true");
+      this.addEventListener(
+        "beforeinput",
+        this._beforeInput
+      );
+      this.setHTML("");
+    }
+    destroy() {
+      this._events.forEach((_, type) => {
+        this.removeEventListener(type);
+      });
+      this._mutation.disconnect();
+      this._undoIndex = -1;
+      this._undoStack = [];
+      this._undoStackLength = 0;
+    }
+    _makeConfig(userConfig) {
+      const config = {
+        blockTag: "DIV",
+        blockAttributes: null,
+        tagAttributes: {},
+        classNames: {
+          color: "color",
+          fontFamily: "font",
+          fontSize: "size",
+          highlight: "highlight"
+        },
+        undo: {
+          documentSizeThreshold: -1,
+          // -1 means no threshold
+          undoLimit: -1
+          // -1 means no limit
+        },
+        addLinks: true,
+        willCutCopy: null,
+        toPlainText: null,
+        sanitizeToDOMFragment: (html) => {
+          const frag = DOMPurify.sanitize(html, {
+            ALLOW_UNKNOWN_PROTOCOLS: true,
+            WHOLE_DOCUMENT: false,
+            RETURN_DOM: true,
+            RETURN_DOM_FRAGMENT: true,
+            FORCE_BODY: false
+          });
+          return frag ? document.importNode(frag, true) : document.createDocumentFragment();
+        },
+        didError: (error) => console.log(error)
+      };
+      if (userConfig) {
+        Object.assign(config, userConfig);
+        config.blockTag = config.blockTag.toUpperCase();
+      }
+      return config;
+    }
+    setKeyHandler(key, fn) {
+      this._keyHandlers[key] = fn;
+      return this;
+    }
+    _beforeInput(event) {
+      switch (event.inputType) {
+        case "insertLineBreak":
+          event.preventDefault();
+          this.splitBlock(true);
+          break;
+        case "insertParagraph":
+          event.preventDefault();
+          this.splitBlock(false);
+          break;
+        case "insertOrderedList":
+          event.preventDefault();
+          this.makeOrderedList();
+          break;
+        case "insertUnoderedList":
+          event.preventDefault();
+          this.makeUnorderedList();
+          break;
+        case "historyUndo":
+          event.preventDefault();
+          this.undo();
+          break;
+        case "historyRedo":
+          event.preventDefault();
+          this.redo();
+          break;
+        case "formatBold":
+          event.preventDefault();
+          this.bold();
+          break;
+        case "formaItalic":
+          event.preventDefault();
+          this.italic();
+          break;
+        case "formatUnderline":
+          event.preventDefault();
+          this.underline();
+          break;
+        case "formatStrikeThrough":
+          event.preventDefault();
+          this.strikethrough();
+          break;
+        case "formatSuperscript":
+          event.preventDefault();
+          this.superscript();
+          break;
+        case "formatSubscript":
+          event.preventDefault();
+          this.subscript();
+          break;
+        case "formatJustifyFull":
+        case "formatJustifyCenter":
+        case "formatJustifyRight":
+        case "formatJustifyLeft": {
+          event.preventDefault();
+          let alignment = event.inputType.slice(13).toLowerCase();
+          if (alignment === "full") {
+            alignment = "justify";
+          }
+          this.setTextAlignment(alignment);
+          break;
+        }
+        case "formatRemove":
+          event.preventDefault();
+          this.setStyle();
+          break;
+        case "formatSetBlockTextDirection": {
+          event.preventDefault();
+          let dir = event.data;
+          if (dir === "null") {
+            dir = null;
+          }
+          this.setTextDirection(dir);
+          break;
+        }
+        case "formatBackColor":
+          event.preventDefault();
+          this.setStyle({ backgroundColor: event.data });
+          break;
+        case "formatFontColor":
+          event.preventDefault();
+          this.setStyle({ color: event.data });
+          break;
+        case "formatFontName":
+          event.preventDefault();
+          this.setStyle({ fontFamily: 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 (!isFocused || this._isFocused) {
+            return this;
+          }
+          this._isFocused = true;
+        } else {
+          if (isFocused || !this._isFocused) {
+            return this;
+          }
+          this._isFocused = false;
+        }
+      }
+      if (handlers) {
+        const event = detail instanceof Event ? detail : new CustomEvent(type, {
+          detail
+        });
+        handlers = handlers.slice();
+        for (const handler of handlers) {
+          try {
+            if ("handleEvent" in handler) {
+              handler.handleEvent(event);
+            } else {
+              handler.call(this, event);
+            }
+          } catch (error) {
+            this._config.didError(error);
+          }
+        }
+      }
+      return this;
+    }
+    addEventListener(type, fn) {
+      let handlers = this._events.get(type);
+      let target = this._root;
+      if (!handlers) {
+        handlers = [];
+        this._events.set(type, handlers);
+        if (!this.customEvents.has(type)) {
+          if (type === "selectionchange") {
+            target = document;
+          }
+          target.addEventListener(type, this, true);
+        }
+      }
+      handlers.push(fn);
+      return this;
+    }
+    removeEventListener(type, fn) {
+      const handlers = this._events.get(type);
+      let target = this._root;
+      if (handlers) {
+        if (fn) {
+          let l = handlers.length;
+          while (l--) {
+            if (handlers[l] === fn) {
+              handlers.splice(l, 1);
+            }
+          }
+        } else {
+          handlers.length = 0;
+        }
+        if (!handlers.length) {
+          this._events.delete(type);
+          if (!this.customEvents.has(type)) {
+            if (type === "selectionchange") {
+              target = document;
+            }
+            target.removeEventListener(type, this, true);
+          }
+        }
+      }
+      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) {
+        return;
+      }
+      removeZWS(this._root);
+      this._mayHaveZWS = false;
+    }
+    _saveRangeToBookmark(range) {
+      let startNode = createElement("INPUT", {
+        id: this.startSelectionId,
+        type: "hidden"
+      });
+      let endNode = createElement("INPUT", {
+        id: this.endSelectionId,
+        type: "hidden"
+      });
+      let temp;
+      insertNodeInRange(range, startNode);
+      range.collapse(false);
+      insertNodeInRange(range, endNode);
+      if (startNode.compareDocumentPosition(endNode) & Node.DOCUMENT_POSITION_PRECEDING) {
+        startNode.id = this.endSelectionId;
+        endNode.id = this.startSelectionId;
+        temp = startNode;
+        startNode = endNode;
+        endNode = temp;
+      }
+      range.setStartAfter(startNode);
+      range.setEndBefore(endNode);
+    }
+    _getRangeAndRemoveBookmark(range) {
+      const root = this._root;
+      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(
+          start
+        );
+        let endOffset = Array.from(endContainer.childNodes).indexOf(end);
+        if (startContainer === endContainer) {
+          --endOffset;
+        }
+        start.remove();
+        end.remove();
+        if (!range) {
+          range = document.createRange();
+        }
+        range.setStart(startContainer, startOffset);
+        range.setEnd(endContainer, endOffset);
+        mergeInlines(startContainer, range);
+        if (startContainer !== endContainer) {
+          mergeInlines(endContainer, range);
+        }
+        if (range.collapsed) {
+          startContainer = range.startContainer;
+          if (startContainer instanceof Text) {
+            endContainer = startContainer.childNodes[range.startOffset];
+            if (!endContainer || !(endContainer instanceof Text)) {
+              endContainer = startContainer.childNodes[range.startOffset - 1];
+            }
+            if (endContainer && endContainer instanceof Text) {
+              range.setStart(endContainer, 0);
+              range.collapse(true);
+            }
+          }
+        }
+      }
+      return range || null;
+    }
+    getSelection() {
+      const selection = window.getSelection();
+      const root = this._root;
+      let range = null;
+      if (this._isFocused && selection && selection.rangeCount) {
+        range = selection.getRangeAt(0).cloneRange();
+        const startContainer = range.startContainer;
+        const endContainer = range.endContainer;
+        if (startContainer && isLeaf(startContainer)) {
+          range.setStartBefore(startContainer);
+        }
+        if (endContainer && isLeaf(endContainer)) {
+          range.setEndBefore(endContainer);
+        }
+      }
+      if (range && root.contains(range.commonAncestorContainer)) {
+        this._lastSelection = range;
+      } else {
+        range = this._lastSelection;
+        if (!document.contains(range.commonAncestorContainer)) {
+          range = null;
+        }
+      }
+      return range || createRange(root.firstElementChild || root, 0);
+    }
+    setSelection(range) {
+      this._lastSelection = range;
+      if (!this._isFocused) {
+        this._enableRestoreSelection();
+      } else {
+        const selection = window.getSelection();
+        if (selection) {
+          if ("setBaseAndExtent" in Selection.prototype) {
+            selection.setBaseAndExtent(
+              range.startContainer,
+              range.startOffset,
+              range.endContainer,
+              range.endOffset
+            );
+          } else {
+            selection.removeAllRanges();
+            selection.addRange(range);
+          }
+        }
+      }
+      return this;
+    }
+    // ---
+    _moveCursorTo(toStart) {
+      const root = this._root;
+      const range = createRange(root, toStart ? 0 : root.childNodes.length);
+      moveRangeBoundariesDownTree(range);
+      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");
+        node.textContent = ZWS;
+        insertNodeInRange(range, node);
+        rect = node.getBoundingClientRect();
+        const parent = node.parentNode;
+        parent.removeChild(node);
+        mergeInlines(parent, range);
+      }
+      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;
+      let newPath;
+      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) {
+          this._path = newPath;
+          this.fireEvent("pathChange", {
+            path: newPath
+          });
+        }
+      }
+      this.fireEvent(range.collapsed ? "cursor" : "select", {
+        range
+      });
+    }
+    _getPath(node) {
+      const root = this._root;
+      const config = this._config;
+      let path = "";
+      if (node && node !== root) {
+        const parent = node.parentNode;
+        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;
+          if (id) {
+            path += "#" + id;
+          }
+          if (classNames.length) {
+            path += ".";
+            path += classNames.join(".");
+          }
+          if (dir) {
+            path += "[dir=" + dir + "]";
+          }
+          if (classList.contains(styleNames.highlight)) {
+            path += "[backgroundColor=" + node.style.backgroundColor.replace(/ /g, "") + "]";
+          }
+          if (classList.contains(styleNames.color)) {
+            path += "[color=" + node.style.color.replace(/ /g, "") + "]";
+          }
+          if (classList.contains(styleNames.fontFamily)) {
+            path += "[fontFamily=" + node.style.fontFamily.replace(/ /g, "") + "]";
+          }
+          if (classList.contains(styleNames.fontSize)) {
+            path += "[fontSize=" + node.style.fontSize + "]";
+          }
+        }
+      }
+      return path;
+    }
+    // --- History
+    modifyDocument(modificationFn) {
+      const mutation = this._mutation;
+      if (mutation) {
+        if (mutation.takeRecords().length) {
+          this._docWasChanged();
+        }
+        mutation.disconnect();
+      }
+      this._ignoreAllChanges = true;
+      modificationFn();
+      this._ignoreAllChanges = false;
+      if (mutation) {
+        mutation.observe(this._root, {
+          childList: true,
+          attributes: true,
+          characterData: true,
+          subtree: true
+        });
+        this._ignoreChange = false;
+      }
+      return this;
+    }
+    _docWasChanged() {
+      resetNodeCategoryCache();
+      this._mayHaveZWS = true;
+      if (this._ignoreAllChanges) {
+        return;
+      }
+      if (this._ignoreChange) {
+        this._ignoreChange = false;
+        return;
+      }
+      if (this._isInUndoState) {
+        this._isInUndoState = false;
+        this.fireEvent("undoStateChange", {
+          canUndo: true,
+          canRedo: false
+        });
+      }
+      this.fireEvent("input");
+    }
+    /**
+     * Leaves bookmark.
+     */
+    _recordUndoState(range, replace) {
+      const isInUndoState = this._isInUndoState;
+      if (!isInUndoState || replace) {
+        let undoIndex = this._undoIndex + 1;
+        const undoStack = this._undoStack;
+        const undoConfig = this._config.undo;
+        const undoThreshold = undoConfig.documentSizeThreshold;
+        const undoLimit = undoConfig.undoLimit;
+        if (undoIndex < this._undoStackLength) {
+          undoStack.length = this._undoStackLength = undoIndex;
+        }
+        if (range) {
+          this._saveRangeToBookmark(range);
+        }
+        if (isInUndoState) {
+          return this;
+        }
+        const html = this._getRawHTML();
+        if (replace) {
+          --undoIndex;
+        }
+        if (undoThreshold > -1 && html.length * 2 > undoThreshold) {
+          if (undoLimit > -1 && undoIndex > undoLimit) {
+            undoStack.splice(0, undoIndex - undoLimit);
+            undoIndex = undoLimit;
+            this._undoStackLength = undoLimit;
+          }
+        }
+        undoStack[undoIndex] = html;
+        this._undoIndex = undoIndex;
+        ++this._undoStackLength;
+        this._isInUndoState = true;
+      }
+      return this;
+    }
+    saveUndoState(range) {
+      range || (range = this.getSelection());
+      this._recordUndoState(range, this._isInUndoState);
+      this._getRangeAndRemoveBookmark(range);
+      return this;
+    }
+    undo() {
+      if (this._undoIndex !== 0 || !this._isInUndoState) {
+        this._recordUndoState(this.getSelection(), false);
+        --this._undoIndex;
+        this._setRawHTML(this._undoStack[this._undoIndex]);
+        const range = this._getRangeAndRemoveBookmark();
+        if (range) {
+          this.setSelection(range);
+        }
+        this._isInUndoState = true;
+        this.fireEvent("undoStateChange", {
+          canUndo: this._undoIndex !== 0,
+          canRedo: true
+        });
+        this.fireEvent("input");
+      }
+      return this.focus();
+    }
+    redo() {
+      const undoIndex = this._undoIndex;
+      const undoStackLength = this._undoStackLength;
+      if (undoIndex + 1 < undoStackLength && this._isInUndoState) {
+        ++this._undoIndex;
+        this._setRawHTML(this._undoStack[this._undoIndex]);
+        const range = this._getRangeAndRemoveBookmark();
+        if (range) {
+          this.setSelection(range);
+        }
+        this.fireEvent("undoStateChange", {
+          canUndo: true,
+          canRedo: undoIndex + 2 < undoStackLength
+        });
+        this.fireEvent("input");
+      }
+      return this.focus();
+    }
+    // --- Get and set data
+    getRoot() {
+      return this._root;
+    }
+    _getRawHTML() {
+      return this._root.innerHTML;
+    }
+    _setRawHTML(html) {
+      if (html !== void 0) {
+        const root = this._root;
+        let node = root;
+        root.innerHTML = html;
+        do {
+          fixCursor(node);
+        } while (node = getNextBlock(node, root));
+        this._ignoreChange = true;
+      }
+      return this;
+    }
+    getHTML(withBookmark) {
+      let 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) {
+      const frag = this._config.sanitizeToDOMFragment(html, this);
+      const root = this._root;
+      cleanTree(frag, this._config);
+      cleanupBRs(frag, root, false);
+      fixContainer(frag, root);
+      let node = frag;
+      let child = node.firstChild;
+      if (!child || child.nodeName === "BR") {
+        const block = this.createDefaultBlock();
+        if (child) {
+          node.replaceChild(block, child);
+        } else {
+          node.append(block);
+        }
+      } else {
+        while (node = getNextBlock(node, root)) {
+          fixCursor(node);
+        }
+      }
+      this._ignoreChange = true;
+      while (child = root.lastChild) {
+        root.removeChild(child);
+      }
+      root.append(frag);
+      this._undoIndex = -1;
+      this._undoStack.length = 0;
+      this._undoStackLength = 0;
+      this._isInUndoState = false;
+      const range = this._getRangeAndRemoveBookmark() || createRange(root.firstElementChild || root, 0);
+      this.saveUndoState(range);
+      this.setSelection(range);
+      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
+     * replaced by the html being inserted.
+     */
+    insertHTML(html, isPaste) {
+      const config = this._config;
+      let frag = config.sanitizeToDOMFragment(html, this);
+      const range = this.getSelection();
+      this.saveUndoState(range);
+      try {
+        const root = this._root;
+        if (config.addLinks) {
+          this.addDetectedLinks(frag, frag);
+        }
+        cleanTree(frag, this._config);
+        cleanupBRs(frag, root, false);
+        removeEmptyInlines(frag);
+        frag.normalize();
+        let node = frag;
+        while (node = getNextBlock(node, frag)) {
+          fixCursor(node);
+        }
+        let doInsert = true;
+        if (isPaste) {
+          const event = new CustomEvent("willPaste", {
+            cancelable: true,
+            detail: {
+              html,
+              fragment: frag
+            }
+          });
+          this.fireEvent("willPaste", event);
+          frag = event.detail.fragment;
+          doInsert = !event.defaultPrevented;
+        }
+        if (doInsert) {
+          insertTreeFragmentIntoRange(range, frag, root);
+          range.collapse(false);
+          moveRangeBoundaryOutOf(range, "A", root);
+          this._ensureBottomLine();
+        }
+        this.setSelection(range);
+        this._updatePath(range, true);
+        if (isPaste) {
+          this.focus();
+        }
+      } catch (error) {
+        this._config.didError(error);
+      }
+      return this;
+    }
+    insertElement(el, range) {
+      if (!range) {
+        range = this.getSelection();
+      }
+      range.collapse(true);
+      if (isInline(el)) {
+        insertNodeInRange(range, el);
+        range.setStartAfter(el);
+      } else {
+        const root = this._root;
+        const startNode = getStartBlockOfRange(
+          range,
+          root
+        );
+        let splitNode = startNode || root;
+        let nodeAfterSplit = null;
+        while (splitNode !== root && !splitNode.nextSibling) {
+          splitNode = splitNode.parentNode;
+        }
+        if (splitNode !== root) {
+          const parent = splitNode.parentNode;
+          nodeAfterSplit = split(
+            parent,
+            splitNode.nextSibling,
+            root,
+            root
+          );
+        }
+        if (startNode && isEmptyBlock(startNode)) {
+          detach(startNode);
+        }
+        root.insertBefore(el, nodeAfterSplit);
+        const blankLine = this.createDefaultBlock();
+        root.insertBefore(blankLine, nodeAfterSplit);
+        range.setStart(blankLine, 0);
+        range.setEnd(blankLine, 0);
+        moveRangeBoundariesDownTree(range);
+      }
+      this.focus();
+      this.setSelection(range);
+      this._updatePath(range);
+      return this;
+    }
+    insertImage(src, attributes) {
+      const img = createElement(
+        "IMG",
+        Object.assign(
+          {
+            src
+          },
+          attributes
+        )
+      );
+      this.insertElement(img);
+      return img;
+    }
+    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", {
+            cancelable: true,
+            detail: {
+              text: plainText
+            }
+          });
+          this.fireEvent("willPaste", event);
+          plainText = event.detail.text;
+          doInsert = !event.defaultPrevented;
+        }
+        if (doInsert) {
+          textNode.insertData(offset, plainText);
+          range.setStart(textNode, offset + plainText.length);
+          range.collapse(true);
+        }
+        this.setSelection(range);
+        return this;
+      }
+      const lines = plainText.split("\n");
+      const config = this._config;
+      const tag = config.blockTag;
+      const attributes = config.blockAttributes;
+      const closeBlock = "</" + tag + ">";
+      let openBlock = "<" + tag;
+      for (const attr in attributes) {
+        openBlock += " " + attr + '="' + escapeHTML(attributes[attr]) + '"';
+      }
+      openBlock += ">";
+      for (let i = 0, l = lines.length; i < l; ++i) {
+        let line = lines[i];
+        line = escapeHTML(line).replace(/ (?=(?: |$))/g, "&nbsp;");
+        if (i) {
+          line = openBlock + (line || "<BR>") + closeBlock;
+        }
+        lines[i] = line;
+      }
+      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
+     * holding the cursor. If there's a selection, returns an empty object.
+     */
+    getFontInfo(range) {
+      const fontInfo = {
+        color: void 0,
+        backgroundColor: void 0,
+        fontFamily: void 0,
+        fontSize: void 0
+      };
+      if (!range) {
+        range = this.getSelection();
+      }
+      moveRangeBoundariesDownTree(range);
+      let seenAttributes = 0;
+      let element = range.commonAncestorContainer;
+      if (range.collapsed || element instanceof Text) {
+        if (element instanceof Text) {
+          element = element.parentNode;
+        }
+        while (seenAttributes < 4 && element) {
+          const style = element.style;
+          if (style) {
+            const color = style.color;
+            if (!fontInfo.color && color) {
+              fontInfo.color = color;
+              ++seenAttributes;
+            }
+            const backgroundColor = style.backgroundColor;
+            if (!fontInfo.backgroundColor && backgroundColor) {
+              fontInfo.backgroundColor = backgroundColor;
+              ++seenAttributes;
+            }
+            const fontFamily = style.fontFamily;
+            if (!fontInfo.fontFamily && fontFamily) {
+              fontInfo.fontFamily = fontFamily;
+              ++seenAttributes;
+            }
+            const fontSize = style.fontSize;
+            if (!fontInfo.fontSize && fontSize) {
+              fontInfo.fontSize = fontSize;
+              ++seenAttributes;
+            }
+          }
+          element = element.parentNode;
+        }
+      }
+      return fontInfo;
+    }
+    /**
+     * Looks for matching tag and attributes, so won't work if <strong>
+     * instead of <b> etc.
+     */
+    hasFormat(tag, attributes, range) {
+      tag = tag.toUpperCase();
+      attributes || (attributes = {});
+      range || (range = this.getSelection());
+      if (!range.collapsed && range.startContainer instanceof Text && range.startOffset === range.startContainer.length && range.startContainer.nextSibling) {
+        range.setStartBefore(range.startContainer.nextSibling);
+      }
+      if (!range.collapsed && range.endContainer instanceof Text && range.endOffset === 0 && range.endContainer.previousSibling) {
+        range.setEndAfter(range.endContainer.previousSibling);
+      }
+      const root = this._root;
+      const common = range.commonAncestorContainer;
+      if (getNearest(common, root, tag, attributes)) {
+        return true;
+      }
+      if (common instanceof Text) {
+        return false;
+      }
+      const walker = createTreeWalker(
+        common,
+        SHOW_TEXT,
+        (node2) => isNodeContainedInRange(range, node2, true)
+      );
+      let seenNode = false;
+      let node;
+      while (node = walker.nextNode()) {
+        if (!getNearest(node, root, tag, attributes)) {
+          return false;
+        }
+        seenNode = true;
+      }
+      return seenNode;
+    }
+    changeFormat(add, remove, range, partial) {
+      if (!range) {
+        range = this.getSelection();
+      }
+      this.saveUndoState(range);
+      if (remove) {
+        range = this._removeFormat(
+          remove.tag.toUpperCase(),
+          remove.attributes || {},
+          range,
+          partial
+        );
+      }
+      if (add) {
+        range = this._addFormat(
+          add.tag.toUpperCase(),
+          add.attributes || {},
+          range
+        );
+      }
+      this.setSelection(range);
+      this._updatePath(range, true);
+      return this.focus();
+    }
+    _addFormat(tag, attributes, range) {
+      const root = this._root;
+      if (range.collapsed) {
+        const el = fixCursor(createElement(tag, attributes));
+        insertNodeInRange(range, el);
+        const focusNode = el.firstChild || el;
+        const focusOffset = focusNode instanceof Text ? focusNode.length : 0;
+        range.setStart(focusNode, focusOffset);
+        range.collapse(true);
+        let block = el;
+        while (isInline(block)) {
+          block = block.parentNode;
+        }
+        removeZWS(block, el);
+      } else {
+        const walker = createTreeWalker(
+          range.commonAncestorContainer,
+          SHOW_ELEMENT_OR_TEXT,
+          (node) => {
+            return (node instanceof Text || node.nodeName === "BR" || node.nodeName === "IMG") && isNodeContainedInRange(range, node, true);
+          }
+        );
+        let { startContainer, startOffset, endContainer, endOffset } = range;
+        walker.currentNode = startContainer;
+        if (!(startContainer instanceof Element) && !(startContainer instanceof Text) || FILTER_ACCEPT !== walker.filter.acceptNode(startContainer)) {
+          const next = walker.nextNode();
+          if (!next) {
+            return range;
+          }
+          startContainer = next;
+          startOffset = 0;
+        }
+        do {
+          let node = walker.currentNode;
+          const needsFormat = !getNearest(node, root, tag, attributes);
+          if (needsFormat) {
+            if (node === endContainer && node.length > endOffset) {
+              node.splitText(endOffset);
+            }
+            if (node === startContainer && startOffset) {
+              node = node.splitText(startOffset);
+              if (endContainer === startContainer) {
+                endContainer = node;
+                endOffset -= startOffset;
+              } else if (endContainer === startContainer.parentNode) {
+                ++endOffset;
+              }
+              startContainer = node;
+              startOffset = 0;
+            }
+            const el = createElement(tag, attributes);
+            replaceWith(node, el);
+            el.append(node);
+          }
+        } while (walker.nextNode());
+        range = createRange(
+          startContainer,
+          startOffset,
+          endContainer,
+          endOffset
+        );
+      }
+      return range;
+    }
+    _removeFormat(tag, attributes, range, partial) {
+      this._saveRangeToBookmark(range);
+      let fixer;
+      if (range.collapsed) {
+        if (cantFocusEmptyTextNodes) {
+          fixer = document.createTextNode(ZWS);
+        } else {
+          fixer = document.createTextNode("");
+        }
+        insertNodeInRange(range, fixer);
+      }
+      let root = range.commonAncestorContainer;
+      while (isInline(root)) {
+        root = root.parentNode;
+      }
+      const startContainer = range.startContainer;
+      const startOffset = range.startOffset;
+      const endContainer = range.endContainer;
+      const endOffset = range.endOffset;
+      const toWrap = [];
+      const examineNode = (node, exemplar) => {
+        if (isNodeContainedInRange(range, node, false)) {
+          return;
+        }
+        let child;
+        let next;
+        if (!isNodeContainedInRange(range, node, true)) {
+          if (!(node instanceof HTMLInputElement) && (!(node instanceof Text) || node.data)) {
+            toWrap.push([exemplar, node]);
+          }
+          return;
+        }
+        if (node instanceof Text) {
+          if (node === endContainer && endOffset !== node.length) {
+            toWrap.push([exemplar, node.splitText(endOffset)]);
+          }
+          if (node === startContainer && startOffset) {
+            node.splitText(startOffset);
+            toWrap.push([exemplar, node]);
+          }
+        } else {
+          for (child = node.firstChild; child; child = next) {
+            next = child.nextSibling;
+            examineNode(child, exemplar);
+          }
+        }
+      };
+      const formatTags = Array.from(
+        root.getElementsByTagName(tag)
+      ).filter((el) => {
+        return isNodeContainedInRange(range, el, true) && hasTagAttributes(el, tag, attributes);
+      });
+      partial || formatTags.forEach((node) => examineNode(node, node));
+      toWrap.forEach(([el, node]) => {
+        el = el.cloneNode(false);
+        replaceWith(node, el);
+        el.append(node);
+      });
+      formatTags.forEach((el) => replaceWith(el, empty(el)));
+      if (cantFocusEmptyTextNodes && fixer) {
+        fixer = fixer.parentNode;
+        let block = fixer;
+        while (block && isInline(block)) {
+          block = block.parentNode;
+        }
+        block && removeZWS(block, fixer);
+      }
+      this._getRangeAndRemoveBookmark(range);
+      fixer && range.collapse(false);
+      mergeInlines(root, range);
+      return range;
+    }
+    // ---
+    bold() {
+      this.toggleTag("B");
+    }
+    italic() {
+      this.toggleTag("I");
+    }
+    underline() {
+      this.toggleTag("U");
+    }
+    strikethrough() {
+      this.toggleTag("S");
+    }
+    subscript() {
+      this.toggleTag("SUB", "SUP");
+    }
+    superscript() {
+      this.toggleTag("SUP", "SUB");
+    }
+    // ---
+    makeLink(url, attributes) {
+      const range = this.getSelection();
+      if (range.collapsed) {
+        let protocolEnd = url.indexOf(":") + 1;
+        if (protocolEnd) {
+          while (url[protocolEnd] === "/") {
+            ++protocolEnd;
+          }
+        }
+        insertNodeInRange(
+          range,
+          document.createTextNode(url.slice(protocolEnd))
+        );
+      }
+      attributes = Object.assign(
+        {
+          href: url
+        },
+        this._config.tagAttributes.a,
+        attributes
+      );
+      return this.changeFormat(
+        {
+          tag: "A",
+          attributes
+        },
+        {
+          tag: "A"
+        },
+        range
+      );
+    }
+    removeLink() {
+      return this.changeFormat(
+        null,
+        {
+          tag: "A"
+        },
+        this.getSelection(),
+        true
+      );
+    }
+    addDetectedLinks(searchInNode, root) {
+      const walker = createTreeWalker(
+        searchInNode,
+        SHOW_TEXT,
+        (node2) => !getClosest(node2, root || this._root, "A")
+      );
+      const linkRegExp = this.linkRegExp;
+      const defaultAttributes = this._config.tagAttributes.a;
+      let node;
+      while (node = walker.nextNode()) {
+        const parent = node.parentNode;
+        let data = node.data;
+        let match;
+        while (match = linkRegExp.exec(data)) {
+          const index = match.index;
+          const endIndex = index + match[0].length;
+          if (index) {
+            parent.insertBefore(
+              document.createTextNode(data.slice(0, index)),
+              node
+            );
+          }
+          const child = createElement(
+            "A",
+            Object.assign(
+              {
+                href: match[1] ? /^(?:ht|f)tps?:/i.test(match[1]) ? match[1] : "http://" + match[1] : "mailto:" + match[0]
+              },
+              defaultAttributes
+            )
+          );
+          child.textContent = data.slice(index, endIndex);
+          parent.insertBefore(child, node);
+          node.data = data = data.slice(endIndex);
+        }
+      }
+      return this;
+    }
+    // --- Block formatting
+    _ensureBottomLine() {
+      const root = this._root;
+      const last = root.lastElementChild;
+      if (!last || last.nodeName !== this._config.blockTag || !isBlock(last)) {
+        root.append(this.createDefaultBlock());
+      }
+    }
+    createDefaultBlock(children) {
+      const config = this._config;
+      return fixCursor(
+        createElement(config.blockTag, config.blockAttributes, children)
+      );
+    }
+    splitBlock(lineBreakOnly, range) {
+      if (!range) {
+        range = this.getSelection();
+      }
+      const root = this._root;
+      let block;
+      let parent;
+      let node;
+      let nodeAfterSplit;
+      this._recordUndoState(range);
+      this._removeZWS();
+      this._getRangeAndRemoveBookmark(range);
+      if (!range.collapsed) {
+        deleteContentsOfRange(range, root);
+      }
+      if (this._config.addLinks) {
+        moveRangeBoundariesDownTree(range);
+        const textNode = range.startContainer;
+        const offset2 = range.startOffset;
+        setTimeout(() => {
+          linkifyText(this, textNode, offset2);
+        }, 0);
+      }
+      block = getStartBlockOfRange(range, root);
+      if (block && (parent = getClosest(block, root, "PRE"))) {
+        moveRangeBoundariesDownTree(range);
+        node = range.startContainer;
+        const offset2 = range.startOffset;
+        if (!(node instanceof Text)) {
+          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))) {
+          node.deleteData(offset2 && offset2 - 1, offset2 ? 2 : 1);
+          nodeAfterSplit = split(
+            node,
+            offset2 && offset2 - 1,
+            root,
+            root
+          );
+          node = nodeAfterSplit.previousSibling;
+          if (!node.textContent) {
+            detach(node);
+          }
+          node = this.createDefaultBlock();
+          nodeAfterSplit.parentNode.insertBefore(node, nodeAfterSplit);
+          if (!nodeAfterSplit.textContent) {
+            detach(nodeAfterSplit);
+          }
+          range.setStart(node, 0);
+        } else {
+          node.insertData(offset2, "\n");
+          fixCursor(parent);
+          if (node.length === offset2 + 1) {
+            range.setStartAfter(node);
+          } else {
+            range.setStart(node, offset2 + 1);
+          }
+        }
+        range.collapse(true);
+        this.setSelection(range);
+        this._updatePath(range, true);
+        this._docWasChanged();
+        return this;
+      }
+      if (!block || lineBreakOnly || /^T[HD]$/.test(block.nodeName)) {
+        moveRangeBoundaryOutOf(range, "A", root);
+        insertNodeInRange(range, createElement("BR"));
+        range.collapse(false);
+        this.setSelection(range);
+        this._updatePath(range, true);
+        return this;
+      }
+      if (parent = getClosest(block, root, "LI")) {
+        block = parent;
+      }
+      if (isEmptyBlock(block)) {
+        if (getClosest(block, root, "UL") || getClosest(block, root, "OL")) {
+          this.decreaseListLevel(range);
+          return this;
+        } else if (getClosest(block, root, "BLOCKQUOTE")) {
+          this.replaceWithBlankLine(range);
+          return this;
+        }
+      }
+      node = range.startContainer;
+      const offset = range.startOffset;
+      let splitTag = this.tagAfterSplit[block.nodeName];
+      nodeAfterSplit = split(
+        node,
+        offset,
+        block.parentNode,
+        this._root
+      );
+      const config = this._config;
+      let splitProperties = null;
+      if (!splitTag) {
+        splitTag = config.blockTag;
+        splitProperties = config.blockAttributes;
+      }
+      if (!hasTagAttributes(nodeAfterSplit, splitTag, splitProperties)) {
+        block = createElement(splitTag, splitProperties);
+        if (nodeAfterSplit.dir) {
+          block.dir = nodeAfterSplit.dir;
+        }
+        replaceWith(nodeAfterSplit, block);
+        block.append(empty(nodeAfterSplit));
+        nodeAfterSplit = block;
+      }
+      removeZWS(block);
+      removeEmptyInlines(block);
+      fixCursor(block);
+      while (nodeAfterSplit instanceof Element) {
+        let child = nodeAfterSplit.firstChild;
+        let next;
+        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") {
+            break;
+          }
+          detach(child);
+          child = next;
+        }
+        if (!child || child.nodeName === "BR" || child instanceof Text) {
+          break;
+        }
+        nodeAfterSplit = child;
+      }
+      range = createRange(nodeAfterSplit, 0);
+      this.setSelection(range);
+      this._updatePath(range, true);
+      return this;
+    }
+    forEachBlock(fn, mutates, range) {
+      if (!range) {
+        range = this.getSelection();
+      }
+      if (mutates) {
+        this.saveUndoState(range);
+      }
+      const root = this._root;
+      let start = getStartBlockOfRange(range, root);
+      const end = getEndBlockOfRange(range, root);
+      if (start && end) {
+        do {
+          if (fn(start) || start === end) {
+            break;
+          }
+        } while (start = getNextBlock(start, root));
+      }
+      if (mutates) {
+        this.setSelection(range);
+        this._updatePath(range, true);
+      }
+      return this;
+    }
+    modifyBlocks(modify, range) {
+      if (!range) {
+        range = this.getSelection();
+      }
+      this._recordUndoState(range, this._isInUndoState);
+      const root = this._root;
+      expandRangeToBlockBoundaries(range, root);
+      moveRangeBoundariesUpTree(range, root, root, root);
+      const frag = extractContentsOfRange(range, root, root);
+      if (!range.collapsed) {
+        let node = range.endContainer;
+        if (node === root) {
+          range.collapse(false);
+        } else {
+          while (node.parentNode !== root) {
+            node = node.parentNode;
+          }
+          range.setStartBefore(node);
+          range.collapse(true);
+        }
+      }
+      insertNodeInRange(range, modify.call(this, frag));
+      if (range.endOffset < range.endContainer.childNodes.length) {
+        mergeContainers(
+          range.endContainer.childNodes[range.endOffset],
+          root
+        );
+      }
+      mergeContainers(
+        range.startContainer.childNodes[range.startOffset],
+        root
+      );
+      this._getRangeAndRemoveBookmark(range);
+      this.setSelection(range);
+      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(" ");
+        if (alignment) {
+          block.className = className + " align-" + alignment;
+          block.style.textAlign = alignment;
+        } else {
+          block.className = className;
+          block.style.textAlign = "";
+        }
+      }, true);
+      return this.focus();
+    }
+    setTextDirection(direction) {
+      this.forEachBlock((block) => {
+        if (direction) {
+          block.dir = direction;
+        } else {
+          block.removeAttribute("dir");
+        }
+      }, true);
+      return this.focus();
+    }
+    // ---
+    _getListSelection(range, root) {
+      let list = range.commonAncestorContainer;
+      let startLi = range.startContainer;
+      let endLi = range.endContainer;
+      while (list && list !== root && !/^[OU]L$/.test(list.nodeName)) {
+        list = list.parentNode;
+      }
+      if (!list || list === root) {
+        return null;
+      }
+      if (startLi === list) {
+        startLi = startLi.childNodes[range.startOffset];
+      }
+      if (endLi === list) {
+        endLi = endLi.childNodes[range.endOffset];
+      }
+      while (startLi && startLi.parentNode !== list) {
+        startLi = startLi.parentNode;
+      }
+      while (endLi && endLi.parentNode !== list) {
+        endLi = endLi.parentNode;
+      }
+      return [list, startLi, endLi];
+    }
+    increaseListLevel(range) {
+      if (!range) {
+        range = this.getSelection();
+      }
+      const root = this._root;
+      const listSelection = this._getListSelection(range, root);
+      if (!listSelection) {
+        return this.focus();
+      }
+      let [list, startLi, endLi] = listSelection;
+      if (!startLi || startLi === list.firstChild) {
+        return this.focus();
+      }
+      this._recordUndoState(range, this._isInUndoState);
+      const type = list.nodeName;
+      let newParent = startLi.previousSibling;
+      let listAttrs;
+      let next;
+      if (newParent.nodeName !== type) {
+        listAttrs = this._config.tagAttributes[type.toLowerCase()];
+        newParent = createElement(type, listAttrs);
+        list.insertBefore(newParent, startLi);
+      }
+      do {
+        next = startLi === endLi ? null : startLi.nextSibling;
+        newParent.append(startLi);
+      } while (startLi = next);
+      next = newParent.nextSibling;
+      if (next) {
+        mergeContainers(next, root);
+      }
+      this._getRangeAndRemoveBookmark(range);
+      this.setSelection(range);
+      this._updatePath(range, true);
+      return this.focus();
+    }
+    decreaseListLevel(range) {
+      if (!range) {
+        range = this.getSelection();
+      }
+      const root = this._root;
+      const listSelection = this._getListSelection(range, root);
+      if (!listSelection) {
+        return this.focus();
+      }
+      let [list, startLi, endLi] = listSelection;
+      if (!startLi) {
+        startLi = list.firstChild;
+      }
+      if (!endLi) {
+        endLi = list.lastChild;
+      }
+      this._recordUndoState(range, this._isInUndoState);
+      let next;
+      let insertBefore = null;
+      if (startLi) {
+        let newParent = list.parentNode;
+        insertBefore = !endLi.nextSibling ? list.nextSibling : split(list, endLi.nextSibling, newParent, root);
+        if (newParent !== root && newParent.nodeName === "LI") {
+          newParent = newParent.parentNode;
+          while (insertBefore) {
+            next = insertBefore.nextSibling;
+            endLi.append(insertBefore);
+            insertBefore = next;
+          }
+          insertBefore = list.parentNode.nextSibling;
+        }
+        const makeNotList = !/^[OU]L$/.test(newParent.nodeName);
+        do {
+          next = startLi === endLi ? null : startLi.nextSibling;
+          list.removeChild(startLi);
+          if (makeNotList && startLi.nodeName === "LI") {
+            startLi = this.createDefaultBlock([empty(startLi)]);
+          }
+          newParent.insertBefore(startLi, insertBefore);
+        } while (startLi = next);
+      }
+      if (!list.firstChild) {
+        detach(list);
+      }
+      if (insertBefore) {
+        mergeContainers(insertBefore, root);
+      }
+      this._getRangeAndRemoveBookmark(range);
+      this.setSelection(range);
+      this._updatePath(range, true);
+      return this.focus();
+    }
+    _makeList(frag, type) {
+      const walker = getBlockWalker(frag, this._root);
+      const tagAttributes = this._config.tagAttributes;
+      const listAttrs = tagAttributes[type.toLowerCase()];
+      const listItemAttrs = tagAttributes.li;
+      let node;
+      while (node = walker.nextNode()) {
+        if (node.parentNode instanceof HTMLLIElement) {
+          node = node.parentNode;
+          walker.currentNode = node.lastChild;
+        }
+        if (!(node instanceof HTMLLIElement)) {
+          const newLi = createElement("LI", listItemAttrs);
+          if (node.dir) {
+            newLi.dir = node.dir;
+          }
+          const prev = node.previousSibling;
+          if (prev && prev.nodeName === type) {
+            prev.append(newLi);
+            detach(node);
+          } else {
+            replaceWith(node, createElement(type, listAttrs, [newLi]));
+          }
+          newLi.append(empty(node));
+          walker.currentNode = newLi;
+        } else {
+          node = node.parentNode;
+          const tag = node.nodeName;
+          if (tag !== type && /^[OU]L$/.test(tag)) {
+            replaceWith(
+              node,
+              createElement(type, listAttrs, [empty(node)])
+            );
+          }
+        }
+      }
+      return frag;
+    }
+    makeUnorderedList() {
+      this.modifyBlocks((frag) => this._makeList(frag, "UL"));
+      return this.focus();
+    }
+    makeOrderedList() {
+      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 root = this._root;
+        for (let i = 0, l = lists.length; i < l; ++i) {
+          const list = lists[i];
+          const listFrag = empty(list);
+          fixContainer(listFrag, root);
+          replaceWith(list, listFrag);
+        }
+        for (let i = 0, l = items.length; i < l; ++i) {
+          const item = items[i];
+          if (isBlock(item)) {
+            replaceWith(item, this.createDefaultBlock([empty(item)]));
+          } else {
+            fixContainer(item, root);
+            replaceWith(item, empty(item));
+          }
+        }
+        return frag;
+      });
+      return this.focus();
+    }
+    // ---
+    increaseQuoteLevel(range) {
+      this.modifyBlocks(
+        (frag) => createElement(
+          "BLOCKQUOTE",
+          this._config.tagAttributes.blockquote,
+          [frag]
+        ),
+        range
+      );
+      return this.focus();
+    }
+    decreaseQuoteLevel(range) {
+      this.modifyBlocks((frag) => {
+        Array.from(frag.querySelectorAll("blockquote")).filter((el) => {
+          return !getClosest(el.parentNode, frag, "BLOCKQUOTE");
+        }).forEach((el) => {
+          replaceWith(el, empty(el));
+        });
+        return frag;
+      }, 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", {
+            id: this.startSelectionId,
+            type: "hidden"
+          }),
+          createElement("INPUT", {
+            id: this.endSelectionId,
+            type: "hidden"
+          })
+        ]),
+        range
+      );
+      return this.focus();
+    }
+    // ---
+    code() {
+      const range = this.getSelection();
+      if (range.collapsed || isContainer(range.commonAncestorContainer)) {
+        this.modifyBlocks((frag) => {
+          const root = this._root;
+          const output = document.createDocumentFragment();
+          const blockWalker = getBlockWalker(frag, root);
+          let node;
+          while (node = blockWalker.nextNode()) {
+            let nodes = node.querySelectorAll("BR");
+            const brBreaksLine = [];
+            let l = nodes.length;
+            for (let i = 0; i < l; ++i) {
+              brBreaksLine[i] = isLineBreak(nodes[i], false);
+            }
+            while (l--) {
+              const br = nodes[l];
+              if (!brBreaksLine[l]) {
+                detach(br);
+              } else {
+                replaceWith(br, document.createTextNode("\n"));
+              }
+            }
+            nodes = node.querySelectorAll("CODE");
+            l = nodes.length;
+            while (l--) {
+              replaceWith(nodes[l], empty(nodes[l]));
+            }
+            if (output.childNodes.length) {
+              output.append(document.createTextNode("\n"));
+            }
+            output.append(empty(node));
+          }
+          const textWalker = createTreeWalker(output, SHOW_TEXT);
+          while (node = textWalker.nextNode()) {
+            node.data = node.data.replace(/ /g, " ");
+          }
+          output.normalize();
+          return fixCursor(
+            createElement("PRE", this._config.tagAttributes.pre, [
+              output
+            ])
+          );
+        }, range);
+        this.focus();
+      } else {
+        this.changeFormat(
+          {
+            tag: "CODE",
+            attributes: this._config.tagAttributes.code
+          },
+          null,
+          range
+        );
+      }
+      return this;
+    }
+    removeCode() {
+      const range = this.getSelection();
+      const ancestor = range.commonAncestorContainer;
+      const inPre = getClosest(ancestor, this._root, "PRE");
+      if (inPre) {
+        this.modifyBlocks((frag) => {
+          const root = this._root;
+          const pres = frag.querySelectorAll("PRE");
+          let l = pres.length;
+          while (l--) {
+            const pre = pres[l];
+            const walker = createTreeWalker(pre, SHOW_TEXT);
+            let node;
+            while (node = walker.nextNode()) {
+              let value = node.data;
+              value = value.replace(/ (?= )/g, "\xA0");
+              const contents = document.createDocumentFragment();
+              let index;
+              while ((index = value.indexOf("\n")) > -1) {
+                contents.append(
+                  document.createTextNode(value.slice(0, index))
+                );
+                contents.append(createElement("BR"));
+                value = value.slice(index + 1);
+              }
+              node.parentNode.insertBefore(contents, node);
+              node.data = value;
+            }
+            fixContainer(pre, root);
+            replaceWith(pre, empty(pre));
+          }
+          return frag;
+        }, range);
+        this.focus();
+      } else {
+        this.changeFormat(null, { tag: "CODE" }, range);
+      }
+      return this;
+    }
+    toggleCode() {
+      if (this.hasFormat("PRE") || this.hasFormat("CODE")) {
+        this.removeCode();
+      } else {
+        this.code();
+      }
+      return this;
+    }
+    /**
+     * SnappyMail
+     */
+    changeIndentationLevel(direction) {
+      let parent = this.getSelectionClosest("UL,OL,BLOCKQUOTE");
+      if (parent || "increase" === direction) {
+        direction += !parent || "BLOCKQUOTE" === parent.nodeName ? "Quote" : "List";
+        return this[direction + "Level"]();
+      }
+    }
+    getSelectionClosest(selector) {
+      return getClosest(this.getSelection().commonAncestorContainer, this._root, selector);
+    }
+    setAttribute(name, value) {
+      let range = this.getSelection();
+      let start = range?.startContainer || {};
+      let end = range?.endContainer || {};
+      if ("dir" == name || start instanceof Text && 0 === range.startOffset && start === end && end.length === range.endOffset) {
+        this._recordUndoState(range);
+        setAttributes(start.parentNode, { [name]: value });
+        this._docWasChanged();
+      } else if (null == value) {
+        this._recordUndoState(range);
+        let node = getClosest(range.commonAncestorContainer, this._root, "*");
+        range.collapsed ? setAttributes(node, { [name]: value }) : node.querySelectorAll("*").forEach((el) => setAttributes(el, { [name]: value }));
+        this._docWasChanged();
+      } else {
+        this.changeFormat({
+          tag: "SPAN",
+          attributes: { [name]: value }
+        }, null, range);
+      }
+      return this.focus();
+    }
+    setStyle(style) {
+      this.setAttribute("style", style);
+    }
+    toggleTag(name, remove) {
+      let range = this.getSelection();
+      if (this.hasFormat(name, null, range)) {
+        this.changeFormat(null, { tag: name }, range);
+      } else {
+        this.changeFormat({ tag: name }, remove ? { tag: remove } : null, range);
+      }
+    }
+    setRange(range) {
+      this.setSelection(range);
+      this._updatePath(range, true);
+    }
+    setConfig(config) {
+      this._config = mergeObjects({
+        addLinks: true
+      }, config, true);
+      return this;
+    }
+  };
+
+  // source/Legacy.ts
+  window.Squire = Squire;
+})();
diff --git a/vendors/turndown/turndown.js b/vendors/turndown/turndown.js
index bc5acf95c..3b6d3f6e8 100644
--- a/vendors/turndown/turndown.js
+++ b/vendors/turndown/turndown.js
@@ -211,7 +211,7 @@ const TurndownService = (() => {
         )
       ,
 
-      replacement: function (content, node, options) {
+      replacement(content, node, options) {
         var href = node.getAttribute('href');
         var title = cleanAttribute(node.getAttribute('title'));
         if (title) title = ' "' + title + '"';
@@ -239,7 +239,7 @@ const TurndownService = (() => {
 
       references: [],
 
-      append: function () {
+      append() {
         var references = '';
         if (this.references.length) {
           references = '\n\n' + this.references.join('\n') + '\n\n';
@@ -298,6 +298,11 @@ const TurndownService = (() => {
         var titlePart = title ? ' "' + title + '"' : '';
         return src ? '![' + alt + ']' + '(' + src + titlePart + ')' : ''
       }
+    },
+
+    style: {
+      filter: 'style',
+      replacement: () => ''
     }
   },
 
@@ -309,7 +314,7 @@ const TurndownService = (() => {
 
   class Rules
   {
-	constructor(options) {
+    constructor(options) {
       this.options = options;
       this._keep = [];
       this._remove = [];
@@ -639,9 +644,7 @@ const TurndownService = (() => {
 
   class TurndownService
   {
-	constructor(options) {
-      if (!(this instanceof TurndownService)) return new TurndownService(options)
-
+    constructor(options) {
       this.options = Object.assign({
         rules: rules,
         headingStyle: 'setext',
@@ -679,8 +682,8 @@ const TurndownService = (() => {
 
       if (input === '') return ''
 
-      var output = process.call(this, new RootNode(input, this.options));
-      return postProcess.call(this, output)
+      var output = this.process(RootNode(input, this.options));
+      return this.postProcess(output)
     }
 
     /**
@@ -753,71 +756,71 @@ const TurndownService = (() => {
     escape(string) {
       return escapes.reduce((accumulator, escape) => accumulator.replace(escape[0], escape[1]), string)
     }
+
+    /**
+     * Reduces a DOM node down to its Markdown string equivalent
+     * @private
+     * @param {HTMLElement} parentNode The node to convert
+     * @returns A Markdown representation of the node
+     * @type String
+     */
+
+    process(parentNode) {
+      var self = this;
+      return reduce.call(parentNode.childNodes, (output, node) => {
+        node = Node(node, self.options);
+
+        var replacement = '';
+        if (node.nodeType === 3) {
+          replacement = node.isCode ? node.nodeValue : self.escape(node.nodeValue);
+        } else if (node.nodeType === 1) {
+          replacement = self.replacementForNode(node);
+        }
+
+        return join(output, replacement)
+      }, '')
+    }
+
+    /**
+     * Appends strings as each rule requires and trims the output
+     * @private
+     * @param {String} output The conversion output
+     * @returns A trimmed version of the ouput
+     * @type String
+     */
+
+    postProcess(output) {
+      var self = this;
+      this.rules.forEach((rule) => {
+        if (typeof rule.append === 'function') {
+          output = join(output, rule.append(self.options));
+        }
+      });
+
+      return output.replace(/^[\t\r\n]+/, '').replace(/[\t\r\n\s]+$/, '')
+    }
+
+    /**
+     * Converts an element node to its Markdown equivalent
+     * @private
+     * @param {HTMLElement} node The node to convert
+     * @returns A Markdown representation of the node
+     * @type String
+     */
+
+    replacementForNode(node) {
+      var rule = this.rules.forNode(node);
+      var content = this.process(node);
+      var whitespace = node.flankingWhitespace;
+      if (whitespace.leading || whitespace.trailing) content = content.trim();
+      return (
+        whitespace.leading +
+        rule.replacement(content, node, this.options) +
+        whitespace.trailing
+      )
+    }
   }
 
-  /**
-   * Reduces a DOM node down to its Markdown string equivalent
-   * @private
-   * @param {HTMLElement} parentNode The node to convert
-   * @returns A Markdown representation of the node
-   * @type String
-   */
-
-  const process = (parentNode) => {
-    var self = this;
-    return reduce.call(parentNode.childNodes, (output, node) => {
-      node = new Node(node, self.options);
-
-      var replacement = '';
-      if (node.nodeType === 3) {
-        replacement = node.isCode ? node.nodeValue : self.escape(node.nodeValue);
-      } else if (node.nodeType === 1) {
-        replacement = replacementForNode.call(self, node);
-      }
-
-      return join(output, replacement)
-    }, '')
-  },
-
-  /**
-   * Appends strings as each rule requires and trims the output
-   * @private
-   * @param {String} output The conversion output
-   * @returns A trimmed version of the ouput
-   * @type String
-   */
-
-  postProcess = (output) => {
-    var self = this;
-    this.rules.forEach((rule) => {
-      if (typeof rule.append === 'function') {
-        output = join(output, rule.append(self.options));
-      }
-    });
-
-    return output.replace(/^[\t\r\n]+/, '').replace(/[\t\r\n\s]+$/, '')
-  },
-
-  /**
-   * Converts an element node to its Markdown equivalent
-   * @private
-   * @param {HTMLElement} node The node to convert
-   * @returns A Markdown representation of the node
-   * @type String
-   */
-
-  replacementForNode = (node) => {
-    var rule = this.rules.forNode(node);
-    var content = process.call(this, node);
-    var whitespace = node.flankingWhitespace;
-    if (whitespace.leading || whitespace.trailing) content = content.trim();
-    return (
-      whitespace.leading +
-      rule.replacement(content, node, this.options) +
-      whitespace.trailing
-    )
-  },
-
   /**
    * Joins replacement to the current output with appropriate number of new lines
    * @private
@@ -827,7 +830,7 @@ const TurndownService = (() => {
    * @type String
    */
 
-  join = (output, replacement) => {
+  const join = (output, replacement) => {
     var s1 = trimTrailingNewlines(output);
     var s2 = trimLeadingNewlines(replacement);
     var nls = Math.max(output.length - s1.length, replacement.length - s2.length);